diff --git a/dom/ipc/TabChild.cpp b/dom/ipc/TabChild.cpp index c0d31bd70262..f4ee2f12a9f3 100644 --- a/dom/ipc/TabChild.cpp +++ b/dom/ipc/TabChild.cpp @@ -2492,7 +2492,6 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(TabChildGlobal) NS_INTERFACE_MAP_ENTRY(nsISyncMessageSender) NS_INTERFACE_MAP_ENTRY(nsIContentFrameMessageManager) NS_INTERFACE_MAP_ENTRY(nsIScriptObjectPrincipal) - NS_INTERFACE_MAP_ENTRY(nsIGlobalObject) NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(ContentFrameMessageManager) NS_INTERFACE_MAP_END_INHERITING(nsDOMEventTargetHelper) @@ -2557,20 +2556,10 @@ TabChildGlobal::GetJSContextForEventHandlers() return nsContentUtils::GetSafeJSContext(); } -nsIPrincipal* +nsIPrincipal* TabChildGlobal::GetPrincipal() { if (!mTabChild) return nullptr; return mTabChild->GetPrincipal(); } - -JSObject* -TabChildGlobal::GetGlobalJSObject() -{ - NS_ENSURE_TRUE(mTabChild, nullptr); - nsCOMPtr ref = mTabChild->GetGlobal(); - NS_ENSURE_TRUE(ref, nullptr); - return ref->GetJSObject(); -} - diff --git a/dom/ipc/TabChild.h b/dom/ipc/TabChild.h index ab77432bcde9..cf42622b8987 100644 --- a/dom/ipc/TabChild.h +++ b/dom/ipc/TabChild.h @@ -51,8 +51,7 @@ class ClonedMessageData; class TabChildGlobal : public nsDOMEventTargetHelper, public nsIContentFrameMessageManager, - public nsIScriptObjectPrincipal, - public nsIGlobalObject + public nsIScriptObjectPrincipal { public: TabChildGlobal(TabChild* aTabChild); @@ -128,7 +127,6 @@ public: virtual JSContext* GetJSContextForEventHandlers() MOZ_OVERRIDE; virtual nsIPrincipal* GetPrincipal() MOZ_OVERRIDE; - virtual JSObject* GetGlobalJSObject() MOZ_OVERRIDE; nsCOMPtr mMessageManager; TabChild* mTabChild;