Created base class for ViewChild versions

Make it compile overall
sailfishos · Dec 11, 2014 · 6acecfe · 6acecfe
1 parent a275fea
commit 6acecfe
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 7 deletions.
diff --git a/embedding/embedlite/embedprocess/EmbedLiteAppProcessChild.h b/embedding/embedlite/embedprocess/EmbedLiteAppProcessChild.h
@@ -7,8 +7,9 @@
 #define MOZ_APP_EMBED_PROCESS_CHILD_H
 
 #include "mozilla/embedlite/PEmbedLiteAppChild.h"  // for PEmbedLiteAppChild
-#include "EmbedLiteAppChildIface.h"
+#include "mozilla/embedlite/EmbedLiteAppChildIface.h"
 
+class EmbedLiteAppService;
 namespace mozilla {
 namespace embedlite {
 
@@ -45,7 +46,7 @@ class EmbedLiteAppProcessChild : public PEmbedLiteAppChild,
     return mAppInfo;
   }
 
-  ::EmbedLiteAppService* AppService();
+  EmbedLiteAppService* AppService();
 
 /*--------------------------------*/
   virtual EmbedLiteViewChildIface* GetViewByID(uint32_t aId);

diff --git a/embedding/embedlite/embedprocess/EmbedLiteViewProcessChild.cpp b/embedding/embedlite/embedprocess/EmbedLiteViewProcessChild.cpp
@@ -20,6 +20,7 @@ namespace embedlite {
 
 MOZ_IMPLICIT
 EmbedLiteViewProcessChild::EmbedLiteViewProcessChild(const uint32_t& id, const uint32_t& parentId)
+  : EmbedLiteViewBaseChild(id, parentId)
 {
   LOGT();
   MOZ_COUNT_CTOR(EmbedLiteViewProcessChild);
@@ -110,8 +111,7 @@ EmbedLiteViewProcessChild::InitGeckoWindow(const uint32_t& parentId)
   nsCOMPtr<nsIDOMWindowUtils> utils = do_GetInterface(mDOMWindow);
   utils->GetOuterWindowID(&mOuterId);
 
-#warning "Return me back"
-  //AppChild()->AppService()->RegisterView(mId);
+  AppChild()->AppService()->RegisterView(mId);
 
   nsCOMPtr<nsIObserverService> observerService =
     do_GetService(NS_OBSERVERSERVICE_CONTRACTID);

diff --git a/embedding/embedlite/embedprocess/EmbedLiteViewProcessChild.h b/embedding/embedlite/embedprocess/EmbedLiteViewProcessChild.h
@@ -15,13 +15,15 @@
 #include "nsIEmbedBrowserChromeListener.h"
 #include "TabChildHelper.h"
 #include "EmbedLiteViewChildIface.h"
+#include "EmbedLiteViewBaseChild.h"
 
 namespace mozilla {
 namespace embedlite {
 
 class EmbedLiteViewProcessChild : public PEmbedLiteViewChild,
                                   public nsIEmbedBrowserChromeListener,
-                                  public EmbedLiteViewChildIface
+                                  public EmbedLiteViewChildIface,
+                                  public EmbedLiteViewBaseChild
 {
   NS_INLINE_DECL_REFCOUNTING(EmbedLiteViewProcessChild)
 public:

diff --git a/embedding/embedlite/embedthread/EmbedLiteViewThreadChild.cpp b/embedding/embedlite/embedthread/EmbedLiteViewThreadChild.cpp
@@ -76,7 +76,8 @@ static void ReadAZPCPrefs()
 }
 
 EmbedLiteViewThreadChild::EmbedLiteViewThreadChild(const uint32_t& aId, const uint32_t& parentId)
-  : mId(aId)
+  : EmbedLiteViewBaseChild(aId, parentId)
+  , mId(aId)
   , mOuterId(0)
   , mViewSize(0, 0)
   , mViewResized(false)

diff --git a/embedding/embedlite/embedthread/EmbedLiteViewThreadChild.h b/embedding/embedlite/embedthread/EmbedLiteViewThreadChild.h
@@ -15,6 +15,7 @@
 #include "nsIEmbedBrowserChromeListener.h"
 #include "TabChildHelper.h"
 #include "EmbedLiteViewChildIface.h"
+#include "EmbedLiteViewBaseChild.h"
 
 namespace mozilla {
 namespace embedlite {
@@ -25,7 +26,8 @@ class EmbedLiteAppThreadChild;
 
 class EmbedLiteViewThreadChild : public PEmbedLiteViewChild,
                                  public nsIEmbedBrowserChromeListener,
-                                 public EmbedLiteViewChildIface
+                                 public EmbedLiteViewChildIface,
+                                 public EmbedLiteViewBaseChild
 {
   NS_INLINE_DECL_REFCOUNTING(EmbedLiteViewThreadChild)
 public:

diff --git a/embedding/embedlite/moz.build b/embedding/embedlite/moz.build
@@ -22,6 +22,8 @@ XPIDL_SOURCES += [
 XPIDL_MODULE = 'embedLite'
 
 EXPORTS.mozilla.embedlite += [
+    'embedhelpers/EmbedLiteAppChildIface.h',
+    'embedhelpers/EmbedLiteViewChildIface.h',
     'EmbedInitGlue.h',
     'EmbedLiteAPI.h',
     'EmbedLiteApp.h',
@@ -37,6 +39,7 @@ EXPORTS.ipc = ['embedhelpers/InputDataIPC.h']
 UNIFIED_SOURCES += [
     'embedhelpers/EmbedLiteSubThread.cpp',
     'embedhelpers/EmbedLiteUILoop.cpp',
+    'embedhelpers/EmbedLiteViewBaseChild.cpp',
     'EmbedLiteApp.cpp',
     'EmbedLiteMessagePump.cpp',
     'EmbedLiteView.cpp',