Fixed embedlite compilation

sailfishos · Oct 10, 2014 · 7a9e3f4 · 7a9e3f4
1 parent f19aac3
commit 7a9e3f4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/embedding/embedlite/embedhelpers/EmbedLiteSubThread.h b/embedding/embedlite/embedhelpers/EmbedLiteSubThread.h
@@ -23,15 +23,15 @@ class EmbedLiteSubThread : public base::Thread
   public:
     NS_INLINE_DECL_THREADSAFE_REFCOUNTING(EmbedLiteSubThread)
     explicit EmbedLiteSubThread(EmbedLiteApp*);
-    ~EmbedLiteSubThread();
-
     bool StartEmbedThread();
 
   protected:
     virtual void Init();
     virtual void CleanUp();
 
   private:
+    virtual ~EmbedLiteSubThread();
+
     MessageLoop* mParentLoop;
     EmbedLiteApp* mApp;
 };

diff --git a/gfx/layers/ipc/CompositorParent.h b/gfx/layers/ipc/CompositorParent.h
@@ -87,8 +87,8 @@ class CompositorThreadHolder MOZ_FINAL
   friend class CompositorParent;
 };
 
-class CompositorParent MOZ_FINAL : public PCompositorParent,
-                                   public ShadowLayersManager
+class CompositorParent : public PCompositorParent,
+                         public ShadowLayersManager
 {
   NS_INLINE_DECL_THREADSAFE_REFCOUNTING_WITH_MAIN_THREAD_DESTRUCTION(CompositorParent)