Bug 937317 - Make TabChildGlobal implement nsIGlobalObject. (embedlit…

…e version) r=bz
sailfishos · Feb 14, 2014 · ccb7a8f · ccb7a8f
1 parent c96bb1d
commit ccb7a8f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/embedding/embedlite/utils/EmbedTabChildGlobal.cpp b/embedding/embedlite/utils/EmbedTabChildGlobal.cpp
@@ -42,6 +42,7 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(EmbedTabChildGlobal)
   NS_INTERFACE_MAP_ENTRY(nsISyncMessageSender)
   NS_INTERFACE_MAP_ENTRY(nsIContentFrameMessageManager)
   NS_INTERFACE_MAP_ENTRY(nsIScriptObjectPrincipal)
+  NS_INTERFACE_MAP_ENTRY(nsIGlobalObject)
   NS_INTERFACE_MAP_ENTRY(nsITabChild)
   NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(ContentFrameMessageManager)
 NS_INTERFACE_MAP_END_INHERITING(nsDOMEventTargetHelper)
@@ -118,6 +119,15 @@ EmbedTabChildGlobal::GetPrincipal()
   return mTabChild->GetPrincipal();
 }
 
+JSObject*
+EmbedTabChildGlobal::GetGlobalJSObject()
+{
+  NS_ENSURE_TRUE(mTabChild, nullptr);
+  nsCOMPtr<nsIXPConnectJSObjectHolder> ref = mTabChild->GetGlobal();
+  NS_ENSURE_TRUE(ref, nullptr);
+  return ref->GetJSObject();
+}
+
 NS_IMETHODIMP
 EmbedTabChildGlobal::GetMessageManager(nsIContentFrameMessageManager** aResult)
 {

diff --git a/embedding/embedlite/utils/EmbedTabChildGlobal.h b/embedding/embedlite/utils/EmbedTabChildGlobal.h
@@ -19,6 +19,7 @@ class TabChildHelper;
 class EmbedTabChildGlobal : public nsDOMEventTargetHelper,
                             public nsIContentFrameMessageManager,
                             public nsIScriptObjectPrincipal,
+                            public nsIGlobalObject,
                             public nsITabChild
 {
 public:
@@ -100,6 +101,7 @@ class EmbedTabChildGlobal : public nsDOMEventTargetHelper,
   }
   virtual JSContext* GetJSContextForEventHandlers() MOZ_OVERRIDE;
   virtual nsIPrincipal* GetPrincipal() MOZ_OVERRIDE;
+  virtual JSObject* GetGlobalJSObject() MOZ_OVERRIDE;
 
   TabChildHelper* mTabChild;
   nsRefPtr<nsFrameMessageManager> mMessageManager;