[embedlite] Add DrawWindowOverlay implementation for embedlite

JB#27803
sailfishos · May 19, 2015 · ff4fa4f · ff4fa4f
1 parent 044ef5f
commit ff4fa4f
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 0 deletions.
diff --git a/embedding/embedlite/EmbedLiteView.h b/embedding/embedlite/EmbedLiteView.h
@@ -64,6 +64,9 @@ class EmbedLiteViewListener
   virtual bool AcknowledgeScrollUpdate(const uint32_t& aViewID, const uint32_t& aScrollGeneration) { return false; }
   virtual bool SendAsyncScrollDOMEvent(const gfxRect& aContentRect,
                                        const gfxSize& aScrollableSize) { return false; }
+
+  // Will be always called from the compositor thread.
+  virtual void DrawOverlay(const nsIntRect& aRect) {}
 };
 
 class EmbedLiteApp;

diff --git a/embedding/embedlite/embedshared/EmbedLitePuppetWidget.cpp b/embedding/embedlite/embedshared/EmbedLitePuppetWidget.cpp
@@ -583,5 +583,13 @@ EmbedLitePuppetWidget::HasGLContext()
   return true;
 }
 
+void
+EmbedLitePuppetWidget::DrawWindowOverlay(LayerManagerComposite *aManager, nsIntRect aRect)
+{
+  EmbedLiteCompositorParent* parent =
+    static_cast<EmbedLiteCompositorParent*>(mCompositorParent.get());
+  parent->DrawWindowOverlay(aManager, aRect);
+}
+
 }  // namespace widget
 }  // namespace mozilla
diff --git a/embedding/embedlite/embedshared/EmbedLitePuppetWidget.h b/embedding/embedlite/embedshared/EmbedLitePuppetWidget.h
@@ -147,6 +147,14 @@ class EmbedLitePuppetWidget : public nsBaseWidget
   virtual nsIntRect GetNaturalBounds();
   virtual bool HasGLContext();
 
+  /**
+   * Called after the LayerManager draws the layer tree
+   *
+   * Always called from the compositing thread. Puppet Widget passes the call
+   * forward to the EmbedLiteCompositorParent.
+   */
+  virtual void DrawWindowOverlay(LayerManagerComposite* aManager, nsIntRect aRect);
+
   NS_IMETHOD         SetParent(nsIWidget* aNewParent);
   virtual nsIWidget *GetParent(void);
 

diff --git a/embedding/embedlite/embedthread/EmbedLiteCompositorParent.cpp b/embedding/embedlite/embedthread/EmbedLiteCompositorParent.cpp
@@ -333,6 +333,14 @@ EmbedLiteCompositorParent::ResumeRendering()
   static_cast<CompositorOGL*>(state->mLayerManager->GetCompositor())->Resume();
 }
 
+void EmbedLiteCompositorParent::DrawWindowOverlay(LayerManagerComposite *aManager, nsIntRect aRect)
+{
+  EmbedLiteView* view = EmbedLiteApp::GetInstance()->GetViewByID(mId);
+  if (view) {
+    view->GetListener()->DrawOverlay(aRect);
+  }
+}
+
 } // namespace embedlite
 } // namespace mozilla
 
diff --git a/embedding/embedlite/embedthread/EmbedLiteCompositorParent.h b/embedding/embedlite/embedthread/EmbedLiteCompositorParent.h
@@ -15,6 +15,11 @@
 #include "EmbedLiteViewThreadParent.h"
 
 namespace mozilla {
+
+namespace layers {
+class LayerManagerComposite;
+}
+
 namespace embedlite {
 
 class EmbedLiteCompositorParent : public mozilla::layers::CompositorParent
@@ -32,6 +37,8 @@ class EmbedLiteCompositorParent : public mozilla::layers::CompositorParent
   virtual void SuspendRendering();
   virtual void ResumeRendering();
 
+  void DrawWindowOverlay(mozilla::layers::LayerManagerComposite *aManager, nsIntRect aRect);
+
 protected:
   virtual ~EmbedLiteCompositorParent();
   virtual PLayerTransactionParent*