Fixed static compilation assert on desktop builds

sailfishos · Jul 10, 2014 · e5ce4ee · e5ce4ee
1 parent f24e2a5
commit e5ce4ee
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/embedding/embedlite/embedthread/EmbedLiteAppThreadChild.h b/embedding/embedlite/embedthread/EmbedLiteAppThreadChild.h
@@ -24,8 +24,6 @@ class EmbedLiteAppThreadChild : public PEmbedLiteAppChild,
   NS_DECL_NSIOBSERVER
 
   EmbedLiteAppThreadChild(MessageLoop* aParentLoop);
-  virtual ~EmbedLiteAppThreadChild();
-
   void Init(MessageChannel* aParentChannel);
   static EmbedLiteAppThreadChild* GetInstance();
   EmbedLiteViewThreadChild* GetViewByID(uint32_t aId);
@@ -35,6 +33,8 @@ class EmbedLiteAppThreadChild : public PEmbedLiteAppChild,
   virtual bool RecvCreateView(const uint32_t& id, const uint32_t& parentId);
 
 protected:
+  virtual ~EmbedLiteAppThreadChild();
+
   // Embed API ipdl interface
   virtual bool RecvSetBoolPref(const nsCString&, const bool&);
   virtual bool RecvSetCharPref(const nsCString&, const nsCString&);

diff --git a/embedding/embedlite/embedthread/EmbedLiteAppThreadParent.h b/embedding/embedlite/embedthread/EmbedLiteAppThreadParent.h
@@ -16,8 +16,6 @@ class EmbedLiteAppThreadParent : public PEmbedLiteAppParent
 {
   NS_INLINE_DECL_THREADSAFE_REFCOUNTING(EmbedLiteAppThreadParent)
 public:
-  virtual ~EmbedLiteAppThreadParent();
-
   // IPDL
   virtual bool
   RecvInitialized();
@@ -43,6 +41,8 @@ class EmbedLiteAppThreadParent : public PEmbedLiteAppParent
   virtual bool DeallocPEmbedLiteViewParent(PEmbedLiteViewParent*);
 
 private:
+  virtual ~EmbedLiteAppThreadParent();
+
   EmbedLiteAppThreadParent();
 
   EmbedLiteApp* mApp;

diff --git a/embedding/embedlite/embedthread/EmbedLiteViewThreadChild.h b/embedding/embedlite/embedthread/EmbedLiteViewThreadChild.h
@@ -30,7 +30,6 @@ class EmbedLiteViewThreadChild : public PEmbedLiteViewChild,
   NS_INLINE_DECL_REFCOUNTING(EmbedLiteViewThreadChild)
 public:
   EmbedLiteViewThreadChild(const uint32_t& id, const uint32_t& parentId);
-  virtual ~EmbedLiteViewThreadChild();
 
   NS_DECL_NSIEMBEDBROWSERCHROMELISTENER
 
@@ -64,6 +63,8 @@ class EmbedLiteViewThreadChild : public PEmbedLiteViewChild,
                                 const nsString& aData);
 
 protected:
+  virtual ~EmbedLiteViewThreadChild();
+
   virtual void ActorDestroy(ActorDestroyReason aWhy) MOZ_OVERRIDE;
   virtual bool RecvDestroy();
   virtual bool RecvLoadURL(const nsString&);

diff --git a/embedding/embedlite/embedthread/EmbedLiteViewThreadParent.h b/embedding/embedlite/embedthread/EmbedLiteViewThreadParent.h
@@ -22,13 +22,13 @@ class EmbedLiteViewThreadParent : public PEmbedLiteViewParent,
   NS_INLINE_DECL_THREADSAFE_REFCOUNTING(EmbedLiteViewThreadParent)
 public:
   EmbedLiteViewThreadParent(const uint32_t& id, const uint32_t& parentId);
-  virtual ~EmbedLiteViewThreadParent();
 
   NS_DECL_EMBEDLITEVIEWIFACE
 
   EmbedLiteCompositorParent* GetCompositor() { return mCompositor.get(); };
 
 protected:
+  virtual ~EmbedLiteViewThreadParent();
   virtual void ActorDestroy(ActorDestroyReason aWhy) MOZ_OVERRIDE;
   virtual bool RecvInitialized();