Added PCompositor parent to the App protocol

sailfishos · Dec 15, 2014 · 4ae94f8 · 4ae94f8
1 parent 2376234
commit 4ae94f8
Show file tree

Hide file tree

Showing 10 changed files with 61 additions and 8 deletions.
diff --git a/embedding/embedlite/PEmbedLiteApp.ipdl b/embedding/embedlite/PEmbedLiteApp.ipdl
@@ -2,12 +2,14 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+include protocol PCompositor;
 include protocol PEmbedLiteView;
 
 namespace mozilla {
 namespace embedlite {
 
 prio(normal upto high) intr protocol PEmbedLiteApp {
+  parent opens PCompositor;
   manages PEmbedLiteView;
 parent:
   Initialized();

diff --git a/embedding/embedlite/embedprocess/EmbedLiteAppProcessChild.cpp b/embedding/embedlite/embedprocess/EmbedLiteAppProcessChild.cpp
@@ -150,6 +150,13 @@ EmbedLiteAppProcessChild::AllocPEmbedLiteViewChild(const uint32_t& id, const uin
   return view;
 }
 
+PCompositorChild*
+EmbedLiteAppProcessChild::AllocPCompositorChild(Transport* aTransport, ProcessId aOtherProcess)
+{
+  LOGT();
+  return 0;
+}
+
 } // namespace embedlite
 } // namespace mozilla
 
diff --git a/embedding/embedlite/embedprocess/EmbedLiteAppProcessChild.h b/embedding/embedlite/embedprocess/EmbedLiteAppProcessChild.h
@@ -41,6 +41,8 @@ class EmbedLiteAppProcessChild : public EmbedLiteAppBaseChild
 protected:
   virtual PEmbedLiteViewChild* AllocPEmbedLiteViewChild(const uint32_t&, const uint32_t& parentId, const bool& isPrivateWindow) MOZ_OVERRIDE;
 
+  virtual PCompositorChild* AllocPCompositorChild(Transport* aTransport, ProcessId aOtherProcess);
+
   // IPDL protocol impl
   virtual void ActorDestroy(ActorDestroyReason aWhy) MOZ_OVERRIDE;
 

diff --git a/embedding/embedlite/embedprocess/EmbedLiteAppProcessParent.cpp b/embedding/embedlite/embedprocess/EmbedLiteAppProcessParent.cpp
@@ -271,6 +271,15 @@ EmbedLiteAppProcessParent::ShutDownProcess(bool aCloseWithError)
   }
 }
 
+PCompositorParent*
+EmbedLiteAppProcessParent::AllocPCompositorParent(Transport* aTransport,
+                                                  ProcessId aOtherProcess)
+{
+  LOGT();
+  return 0;
+}
+
+
 } // namespace embedlite
 } // namespace mozilla
 
diff --git a/embedding/embedlite/embedprocess/EmbedLiteAppProcessParent.h b/embedding/embedlite/embedprocess/EmbedLiteAppProcessParent.h
@@ -54,6 +54,9 @@ class EmbedLiteAppProcessParent : public PEmbedLiteAppParent
   virtual void
   ActorDestroy(ActorDestroyReason aWhy);
 
+  virtual PCompositorParent*
+  AllocPCompositorParent(Transport* aTransport, ProcessId aOtherProcess);
+
 private:
   virtual ~EmbedLiteAppProcessParent();
   void ShutDownProcess(bool aCloseWithError);

diff --git a/embedding/embedlite/embedshared/EmbedLitePuppetWidget.cpp b/embedding/embedlite/embedshared/EmbedLitePuppetWidget.cpp
@@ -104,6 +104,7 @@ EmbedLitePuppetWidget::~EmbedLitePuppetWidget()
 NS_IMETHODIMP
 EmbedLitePuppetWidget::SetParent(nsIWidget* aParent)
 {
+  LOGT();
   mParent = aParent;
   return NS_OK;
 }
@@ -164,12 +165,11 @@ EmbedLitePuppetWidget::CreateChild(const nsIntRect&  aRect,
 NS_IMETHODIMP
 EmbedLitePuppetWidget::Destroy()
 {
+  LOGT();
   if (mOnDestroyCalled) {
     return NS_OK;
   }
 
-  LOGF();
-
   mOnDestroyCalled = true;
 
   nsIWidget* topWidget = GetTopLevelWidget();
@@ -192,7 +192,7 @@ EmbedLitePuppetWidget::Destroy()
 NS_IMETHODIMP
 EmbedLitePuppetWidget::Show(bool aState)
 {
-  LOGF("t:%p, state: %i, LM:%p", this, aState, mLayerManager.get());
+  LOGT("t:%p, state: %i, LM:%p", this, aState, mLayerManager.get());
   NS_ASSERTION(mEnabled,
                "does it make sense to Show()/Hide() a disabled widget?");
 
@@ -222,7 +222,7 @@ EmbedLitePuppetWidget::Resize(double aWidth,
                               bool    aRepaint)
 {
   nsIntRect oldBounds = mBounds;
-  LOGF("sz[%i,%i]->[%g,%g]", oldBounds.width, oldBounds.height, aWidth, aHeight);
+  LOGT("sz[%i,%i]->[%g,%g]", oldBounds.width, oldBounds.height, aWidth, aHeight);
   mBounds.SizeTo(nsIntSize(NSToIntRound(aWidth), NSToIntRound(aHeight)));
   nsIWidget* topWidget = GetTopLevelWidget();
   if (topWidget)
@@ -252,7 +252,7 @@ EmbedLitePuppetWidget::Resize(double aWidth,
 NS_IMETHODIMP
 EmbedLitePuppetWidget::SetFocus(bool aRaise)
 {
-  LOGNI();
+  LOGT();
   return NS_OK;
 }
 
@@ -322,6 +322,7 @@ EmbedLitePuppetWidget::DispatchEvent(WidgetGUIEvent* event, nsEventStatus& aStat
 NS_IMETHODIMP
 EmbedLitePuppetWidget::ResetInputState()
 {
+  LOGT();
   RemoveIMEComposition();
   return NS_OK;
 }
@@ -331,7 +332,7 @@ NS_IMETHODIMP_(void)
 EmbedLitePuppetWidget::SetInputContext(const InputContext& aContext,
                                        const InputContextAction& aAction)
 {
-  LOGF("IME: SetInputContext: s=0x%X, 0x%X, action=0x%X, 0x%X",
+  LOGT("IME: SetInputContext: s=0x%X, 0x%X, action=0x%X, 0x%X",
        aContext.mIMEState.mEnabled, aContext.mIMEState.mOpen,
        aAction.mCause, aAction.mFocusChange);
 
@@ -379,7 +380,7 @@ EmbedLitePuppetWidget::GetInputContext()
 
 NS_IMETHODIMP EmbedLitePuppetWidget::OnIMEFocusChange(bool aFocus)
 {
-  LOGF("aFocus:%i", aFocus);
+  LOGT("aFocus:%i", aFocus);
   if (!aFocus) {
     mIMEComposing = false;
     mIMEComposingText.Truncate();
@@ -439,7 +440,7 @@ EmbedLitePuppetWidget::GetLayerManager(PLayerTransactionChild* aShadowManager,
     return mLayerManager;
   }
 
-  LOGF();
+  LOGT();
 
   nsIWidget* topWidget = GetTopLevelWidget();
   if (topWidget != this) {
@@ -490,12 +491,14 @@ EmbedLitePuppetWidget::GetLayerManager(PLayerTransactionChild* aShadowManager,
 CompositorParent*
 EmbedLitePuppetWidget::NewCompositorParent(int aSurfaceWidth, int aSurfaceHeight)
 {
+  LOGT();
   gfxPlatform::GetPlatform();
   return new EmbedLiteCompositorParent(this, true, aSurfaceWidth, aSurfaceHeight, mId);
 }
 
 void EmbedLitePuppetWidget::CreateCompositor()
 {
+  LOGT();
   gfxSize glSize = mEmbed->GetGLViewSize();
   CreateCompositor(glSize.width, glSize.height);
 }
@@ -515,6 +518,7 @@ CheckForBasicBackends(nsTArray<LayersBackend>& aHints)
 
 void EmbedLitePuppetWidget::CreateCompositor(int aWidth, int aHeight)
 {
+  LOGT();
   mCompositorParent = NewCompositorParent(aWidth, aHeight);
   MessageChannel* parentChannel = mCompositorParent->GetIPCChannel();
   nsRefPtr<ClientLayerManager> lm = new ClientLayerManager(this);

diff --git a/embedding/embedlite/embedthread/EmbedLiteAppThreadChild.cpp b/embedding/embedlite/embedthread/EmbedLiteAppThreadChild.cpp
@@ -40,6 +40,13 @@ EmbedLiteAppThreadChild::AllocPEmbedLiteViewChild(const uint32_t& id, const uint
   return view;
 }
 
+PCompositorChild*
+EmbedLiteAppThreadChild::AllocPCompositorChild(Transport* aTransport, ProcessId aOtherProcess)
+{
+  LOGT();
+  return 0;
+}
+
 } // namespace embedlite
 } // namespace mozilla
 
diff --git a/embedding/embedlite/embedthread/EmbedLiteAppThreadChild.h b/embedding/embedlite/embedthread/EmbedLiteAppThreadChild.h
@@ -21,6 +21,7 @@ class EmbedLiteAppThreadChild : public EmbedLiteAppBaseChild
   virtual ~EmbedLiteAppThreadChild();
 
   virtual PEmbedLiteViewChild* AllocPEmbedLiteViewChild(const uint32_t&, const uint32_t& parentId, const bool& isPrivateWindow) MOZ_OVERRIDE;
+  virtual PCompositorChild* AllocPCompositorChild(Transport* aTransport, ProcessId aOtherProcess);
 
 private:
   DISALLOW_EVIL_CONSTRUCTORS(EmbedLiteAppThreadChild);

diff --git a/embedding/embedlite/embedthread/EmbedLiteAppThreadParent.cpp b/embedding/embedlite/embedthread/EmbedLiteAppThreadParent.cpp
@@ -8,11 +8,13 @@
 #include "EmbedLiteViewThreadParent.h"
 #include "EmbedLiteAppThreadParent.h"
 #include "EmbedLiteApp.h"
+#include "mozilla/layers/PCompositorParent.h"
 
 #include "mozilla/unused.h"
 
 using namespace base;
 using namespace mozilla::ipc;
+using namespace mozilla::layers;
 
 namespace mozilla {
 namespace embedlite {
@@ -105,6 +107,14 @@ EmbedLiteAppThreadParent::RecvObserve(const nsCString& topic,
   return true;
 }
 
+PCompositorParent*
+EmbedLiteAppThreadParent::AllocPCompositorParent(Transport* aTransport,
+                                                  ProcessId aOtherProcess)
+{
+  LOGT();
+  return 0;
+}
+
 } // namespace embedlite
 } // namespace mozilla
 
diff --git a/embedding/embedlite/embedthread/EmbedLiteAppThreadParent.h b/embedding/embedlite/embedthread/EmbedLiteAppThreadParent.h
@@ -9,6 +9,11 @@
 #include "mozilla/embedlite/PEmbedLiteAppParent.h"
 
 namespace mozilla {
+
+namespace layers {
+class PCompositorParent;
+} // namespace layers
+
 namespace embedlite {
 
 class EmbedLiteApp;
@@ -41,6 +46,9 @@ class EmbedLiteAppThreadParent : public PEmbedLiteAppParent
           uint32_t* createdID,
           bool* cancel) MOZ_OVERRIDE;
 
+  virtual PCompositorParent*
+  AllocPCompositorParent(Transport* aTransport, ProcessId aOtherProcess);
+
 private:
   virtual ~EmbedLiteAppThreadParent();