Hackish fix for preferences usage in Parent process. Added basic comp…

…osito initialization in Parent process
sailfishos · Jan 21, 2015 · 18b3279 · 18b3279
1 parent 83642ac
commit 18b3279
Show file tree

Hide file tree

Showing 20 changed files with 598 additions and 47 deletions.
diff --git a/dom/ipc/DOMTypes.ipdlh b/dom/ipc/DOMTypes.ipdlh
@@ -15,6 +15,9 @@ using struct mozilla::SerializedStructuredCloneBuffer
 using struct nsID
   from "nsID.h";
 
+using struct mozilla::null_t
+  from "ipc/IPCMessageUtils.h";
+
 namespace mozilla {
 namespace dom {
 
@@ -135,5 +138,22 @@ union BlobConstructorParams
   ParentBlobConstructorParams;
 };
 
+union PrefValue {
+  nsCString;
+  int32_t;
+  bool;
+};
+
+union MaybePrefValue {
+  PrefValue;
+  null_t;
+};
+
+struct PrefSetting {
+  nsCString name;
+  MaybePrefValue defaultValue;
+  MaybePrefValue userValue;
+};
+
 } // namespace dom
 } // namespace mozilla
diff --git a/dom/ipc/PContent.ipdl b/dom/ipc/PContent.ipdl
@@ -282,23 +282,6 @@ union FileSystemParams
   FileSystemRemoveParams;
 };
 
-union PrefValue {
-  nsCString;
-  int32_t;
-  bool;
-};
-
-union MaybePrefValue {
-  PrefValue;
-  null_t;
-};
-
-struct PrefSetting {
-  nsCString name;
-  MaybePrefValue defaultValue;
-  MaybePrefValue userValue;
-};
-
 struct DataStoreSetting {
   nsString name;
   nsString originURL;

diff --git a/embedding/embedlite/EmbedLiteApp.cpp b/embedding/embedlite/EmbedLiteApp.cpp
@@ -30,6 +30,7 @@
 namespace mozilla {
 namespace startup {
 extern bool sIsEmbedlite;
+extern GeckoProcessType sChildProcessType;
 }
 namespace embedlite {
 
@@ -236,6 +237,7 @@ EmbedLiteApp::StartChildThread()
   }
 
   GeckoLoader::InitEmbedding(mProfilePath);
+  mAppParent = EmbedLiteAppProcessParent::CreateEmbedLiteAppProcessParent();
 
   mAppParent = new EmbedLiteAppThreadParent();
   mAppChild = new EmbedLiteAppThreadChild(mUILoop);

diff --git a/embedding/embedlite/PEmbedLiteApp.ipdl b/embedding/embedlite/PEmbedLiteApp.ipdl
@@ -5,6 +5,8 @@
 include protocol PCompositor;
 include protocol PEmbedLiteView;
 
+include DOMTypes;
+
 namespace mozilla {
 namespace embedlite {
 
@@ -16,6 +18,7 @@ parent:
   ReadyToShutdown();
   sync CreateWindow(uint32_t parentId, nsCString uri, uint32_t chromeFlags, uint32_t contextFlags)
     returns (uint32_t createdID, bool cancel);
+  PrefsArrayInitialized(PrefSetting[] prefs);
 
 child:
   PEmbedLiteView(uint32_t id, uint32_t parentId, bool isPrivateWindow);

diff --git a/embedding/embedlite/embedprocess/EmbedLiteAppProcessChild.cpp b/embedding/embedlite/embedprocess/EmbedLiteAppProcessChild.cpp
@@ -33,6 +33,8 @@
 #include "mozilla/ModuleUtils.h"               // for NS_GENERIC_FACTORY_CONSTRUCTOR
 #include "mozilla/layers/PCompositorChild.h"
 
+#include "mozilla/Preferences.h"
+#include "mozilla/dom/PContent.h"
 
 using namespace base;
 using namespace mozilla::ipc;
@@ -119,6 +121,10 @@ EmbedLiteAppProcessChild::InitXPCOM()
   }
 
   unused << SendInitialized();
+
+  InfallibleTArray<mozilla::dom::PrefSetting> prefs;
+  Preferences::GetPreferences(&prefs);
+  SendPrefsArrayInitialized(prefs);
 }
 
 void

diff --git a/embedding/embedlite/embedprocess/EmbedLiteAppProcessParent.cpp b/embedding/embedlite/embedprocess/EmbedLiteAppProcessParent.cpp
@@ -34,6 +34,7 @@
 #include "mozilla/layers/ImageBridgeParent.h"
 
 #include "EmbedLiteViewProcessParent.h"
+#include "EmbedLiteCompositorProcessParent.h"
 
 static BrowserProcessSubThread* sIOThread;
 
@@ -74,6 +75,14 @@ class EmbedLiteAppProcessParentManager MOZ_FINAL : public mozilla::layers::Layer
   virtual void GetBackendName(nsAString_internal&) {}
 };
 
+static EmbedLiteAppProcessParent* sAppProcessParent = nullptr;
+
+EmbedLiteAppProcessParent*
+EmbedLiteAppProcessParent::GetInstance()
+{
+  return sAppProcessParent;
+}
+
 EmbedLiteAppProcessParent*
 EmbedLiteAppProcessParent::CreateEmbedLiteAppProcessParent()
 {
@@ -94,6 +103,7 @@ EmbedLiteAppProcessParent::EmbedLiteAppProcessParent()
 {
   LOGT();
   MOZ_COUNT_CTOR(EmbedLiteAppProcessParent);
+  sAppProcessParent = this;
 
   mSubprocess = new GeckoChildProcessHost(GeckoProcessType_Content, base::PRIVILEGES_DEFAULT);
 
@@ -174,17 +184,14 @@ EmbedLiteAppProcessParent::OnChannelConnected(int32_t pid)
     }
 #endif
   }
-
-  // Set a reply timeout. The only time the parent process will actually
-  // timeout is through urgent messages (which are used by CPOWs).
-  SetReplyTimeoutMs(Preferences::GetInt("dom.ipc.cpow.timeout", 3000));
 }
 
 
 bool
 EmbedLiteAppProcessParent::RecvInitialized()
 {
   LOGT();
+  PR_SetEnv("MOZ_LAYERS_PREFER_OFFSCREEN=1");
   mApp->Initialized();
   return true;
 }
@@ -320,9 +327,23 @@ EmbedLiteAppProcessParent::AllocPCompositorParent(Transport* aTransport,
 {
   LOGT();
   RefPtr<EmbedLiteAppProcessParentManager> mgr = new EmbedLiteAppProcessParentManager(); // Dummy manager in order to initialize layers log, fix me by creating proper manager for this process type
-  return CompositorParent::Create(aTransport, aOtherProcess);
+//  return CompositorParent::Create(aTransport, aOtherProcess);
+  return EmbedLiteCompositorProcessParent::Create(aTransport, aOtherProcess, 480, 800, 1);
 }
 
+bool
+EmbedLiteAppProcessParent::RecvPrefsArrayInitialized(const nsTArray<mozilla::dom::PrefSetting>& prefs)
+{
+  LOGT();
+  mPrefs = prefs;
+  return true;
+}
+
+void
+EmbedLiteAppProcessParent::GetPrefs(InfallibleTArray<PrefSetting>* prefs)
+{
+  prefs = &mPrefs;
+}
 
 } // namespace embedlite
 } // namespace mozilla

diff --git a/embedding/embedlite/embedprocess/EmbedLiteAppProcessParent.h b/embedding/embedlite/embedprocess/EmbedLiteAppProcessParent.h
@@ -12,8 +12,12 @@ namespace mozilla {
 namespace ipc {
 class GeckoChildProcessHost;
 }
+namespace dom {
+class PrefSetting;
+}
 namespace embedlite {
 
+class EmbedLiteApp;
 class EmbedLiteAppProcessParent : public PEmbedLiteAppParent
 {
   NS_INLINE_DECL_THREADSAFE_REFCOUNTING(EmbedLiteAppProcessParent)
@@ -22,6 +26,10 @@ class EmbedLiteAppProcessParent : public PEmbedLiteAppParent
 public:
   static EmbedLiteAppProcessParent* CreateEmbedLiteAppProcessParent();
 
+  static EmbedLiteAppProcessParent* GetInstance();
+
+  void GetPrefs(InfallibleTArray<PrefSetting>* prefs);
+
 protected:
   void OnChannelConnected(int32_t pid) MOZ_OVERRIDE;
 
@@ -57,12 +65,16 @@ class EmbedLiteAppProcessParent : public PEmbedLiteAppParent
   virtual PCompositorParent*
   AllocPCompositorParent(Transport* aTransport, ProcessId aOtherProcess);
 
+  virtual bool
+  RecvPrefsArrayInitialized(const nsTArray<mozilla::dom::PrefSetting>& prefs);
+
 private:
   virtual ~EmbedLiteAppProcessParent();
   void ShutDownProcess(bool aCloseWithError);
 
   EmbedLiteApp* mApp;
   mozilla::ipc::GeckoChildProcessHost* mSubprocess;
+  InfallibleTArray<PrefSetting> mPrefs;
 
   DISALLOW_EVIL_CONSTRUCTORS(EmbedLiteAppProcessParent);
 };