Added basic composito allocation

sailfishos · Dec 28, 2014 · 8e0c14b · 8e0c14b
1 parent b3b6d44
commit 8e0c14b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/embedding/embedlite/embedprocess/EmbedLiteAppProcessChild.cpp b/embedding/embedlite/embedprocess/EmbedLiteAppProcessChild.cpp
@@ -32,6 +32,8 @@
 #include "nsIFactory.h"
 #include "mozilla/GenericFactory.h"
 #include "mozilla/ModuleUtils.h"               // for NS_GENERIC_FACTORY_CONSTRUCTOR
+#include "mozilla/layers/PCompositorChild.h"
+
 
 using namespace base;
 using namespace mozilla::ipc;
@@ -154,7 +156,7 @@ PCompositorChild*
 EmbedLiteAppProcessChild::AllocPCompositorChild(Transport* aTransport, ProcessId aOtherProcess)
 {
   LOGT();
-  return 0;
+  return CompositorChild::Create(aTransport, aOtherProcess);
 }
 
 } // namespace embedlite

diff --git a/embedding/embedlite/embedprocess/EmbedLiteAppProcessParent.cpp b/embedding/embedlite/embedprocess/EmbedLiteAppProcessParent.cpp
@@ -30,6 +30,8 @@
 #include "base/command_line.h"
 #include "nsDirectoryService.h"
 #include "nsDirectoryServiceDefs.h"
+#include "mozilla/layers/CompositorParent.h"
+#include "mozilla/layers/ImageBridgeParent.h"
 
 #include "EmbedLiteViewProcessParent.h"
 
@@ -98,6 +100,15 @@ EmbedLiteAppProcessParent::EmbedLiteAppProcessParent()
   extraArgs.push_back("-embedlite");
   mSubprocess->LaunchAndWaitForProcessHandle(extraArgs);
   Open(mSubprocess->GetChannel(), mSubprocess->GetOwnedChildProcessHandle());
+
+  mozilla::layers::CompositorParent::StartUp();
+  bool useOffMainThreadCompositing = !!CompositorParent::CompositorLoop();
+  LOGT("useOffMainThreadCompositing:%i", useOffMainThreadCompositing);
+  if (useOffMainThreadCompositing)
+  {
+    DebugOnly<bool> opened = PCompositor::Open(this);
+    MOZ_ASSERT(opened);
+  }
 }
 
 EmbedLiteAppProcessParent::~EmbedLiteAppProcessParent()
@@ -276,7 +287,7 @@ EmbedLiteAppProcessParent::AllocPCompositorParent(Transport* aTransport,
                                                   ProcessId aOtherProcess)
 {
   LOGT();
-  return 0;
+  return CompositorParent::Create(aTransport, aOtherProcess);
 }
 
 

diff --git a/xpcom/base/nsTraceRefcnt.cpp b/xpcom/base/nsTraceRefcnt.cpp
@@ -128,7 +128,7 @@ struct nsTraceRefcntStats
   double mObjsOutstandingSquared;
 };
 
-#ifdef DEBUG
+#ifndef DEBUG
 static const char kStaticCtorDtorWarning[] =
   "XPCOM objects created/destroyed from static ctor/dtor";