Followup fix to the bug Bug 1004630

sailfishos · Aug 8, 2014 · 0244f2a · 0244f2a
1 parent 1611e1b
commit 0244f2a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/embedding/embedlite/utils/TabChildHelper.cpp b/embedding/embedlite/utils/TabChildHelper.cpp
@@ -157,13 +157,13 @@ TabChildHelper::Unload()
   observerService->RemoveObserver(this, DETECT_SCROLLABLE_SUBFRAME);
 }
 
-NS_INTERFACE_MAP_BEGIN(TabChildHelper)
+NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(TabChildHelper)
   NS_INTERFACE_MAP_ENTRY(nsIDOMEventListener)
   NS_INTERFACE_MAP_ENTRY(nsIObserver)
-NS_INTERFACE_MAP_END
+NS_INTERFACE_MAP_END_INHERITING(TabChildBase)
 
-NS_IMPL_ADDREF(TabChildHelper)
-NS_IMPL_RELEASE(TabChildHelper)
+NS_IMPL_ADDREF_INHERITED(TabChildHelper, TabChildBase);
+NS_IMPL_RELEASE_INHERITED(TabChildHelper, TabChildBase);
 
 bool
 TabChildHelper::InitTabChildGlobal()

diff --git a/embedding/embedlite/utils/TabChildHelper.h b/embedding/embedlite/utils/TabChildHelper.h
@@ -25,16 +25,16 @@ namespace mozilla {
 namespace embedlite {
 
 class EmbedLiteViewThreadChild;
-class TabChildHelper : public nsIDOMEventListener,
-                       public nsIObserver,
-                       public mozilla::dom::TabChildBase
+class TabChildHelper : public mozilla::dom::TabChildBase,
+                       public nsIDOMEventListener,
+                       public nsIObserver
 {
 public:
   typedef mozilla::layers::FrameMetrics::ViewID ViewID;
   TabChildHelper(EmbedLiteViewThreadChild* aView);
   virtual ~TabChildHelper();
 
-  NS_DECL_ISUPPORTS
+  NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_NSIDOMEVENTLISTENER
   NS_DECL_NSIOBSERVER