Add DrawWindowUnderlay implementation for embedlite. rainemak

sailfishos · May 19, 2015 · 7a5ccc5 · 7a5ccc5
1 parent b36d353
commit 7a5ccc5
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 2 deletions.
diff --git a/embedding/embedlite/EmbedLiteView.h b/embedding/embedlite/EmbedLiteView.h
@@ -65,8 +65,12 @@ class EmbedLiteViewListener
   virtual bool SendAsyncScrollDOMEvent(const gfxRect& aContentRect,
                                        const gfxSize& aScrollableSize) { return false; }
 
+  // Will be always called from the compositor thread.
+  virtual void DrawUnderlay() {}
+
   // 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
@@ -585,6 +585,14 @@ EmbedLitePuppetWidget::HasGLContext()
   return parent->RequestGLContext();
 }
 
+void
+EmbedLitePuppetWidget::DrawWindowUnderlay(LayerManagerComposite *aManager, nsIntRect aRect)
+{
+  EmbedLiteCompositorParent* parent =
+    static_cast<EmbedLiteCompositorParent*>(mCompositorParent.get());
+  parent->DrawWindowUnderlay(aManager, aRect);
+}
+
 void
 EmbedLitePuppetWidget::DrawWindowOverlay(LayerManagerComposite *aManager, nsIntRect aRect)
 {

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 before the LayerManager draws the layer tree.
+   *
+   * Always called from the compositing thread. Puppet Widget passes the call
+   * forward to the EmbedLiteCompositorParent.
+   */
+  virtual void DrawWindowUnderlay(LayerManagerComposite* aManager, nsIntRect aRect);
+
   /**
    * Called after the LayerManager draws the layer tree
    *

diff --git a/embedding/embedlite/embedthread/EmbedLiteCompositorParent.cpp b/embedding/embedlite/embedthread/EmbedLiteCompositorParent.cpp
@@ -339,6 +339,14 @@ bool EmbedLiteCompositorParent::RequestGLContext()
   return view ? view->GetListener()->RequestCurrentGLContext() : false;
 }
 
+void EmbedLiteCompositorParent::DrawWindowUnderlay(LayerManagerComposite *aManager, nsIntRect aRect)
+{
+  EmbedLiteView* view = EmbedLiteApp::GetInstance()->GetViewByID(mId);
+  if (view) {
+    view->GetListener()->DrawUnderlay();
+  }
+}
+
 void EmbedLiteCompositorParent::DrawWindowOverlay(LayerManagerComposite *aManager, nsIntRect aRect)
 {
   EmbedLiteView* view = EmbedLiteApp::GetInstance()->GetViewByID(mId);

diff --git a/embedding/embedlite/embedthread/EmbedLiteCompositorParent.h b/embedding/embedlite/embedthread/EmbedLiteCompositorParent.h
@@ -39,6 +39,7 @@ class EmbedLiteCompositorParent : public mozilla::layers::CompositorParent
 
   virtual bool RequestGLContext();
 
+  void DrawWindowUnderlay(mozilla::layers::LayerManagerComposite *aManager, nsIntRect aRect);
   void DrawWindowOverlay(mozilla::layers::LayerManagerComposite *aManager, nsIntRect aRect);
 
 protected:

diff --git a/gfx/layers/opengl/CompositorOGL.cpp b/gfx/layers/opengl/CompositorOGL.cpp
@@ -648,8 +648,10 @@ CompositorOGL::BeginFrame(const nsIntRegion& aInvalidRegion,
   // DrawWindowUnderlay. Make sure the bits used here match up with those used
   // in mobile/android/base/gfx/LayerRenderer.java
 #ifndef MOZ_WIDGET_ANDROID
-  mGLContext->fClearColor(0.0, 0.0, 0.0, 0.0);
-  mGLContext->fClear(LOCAL_GL_COLOR_BUFFER_BIT | LOCAL_GL_DEPTH_BUFFER_BIT);
+  if (gfxPrefs::ClearCompoisitorContext()) {
+    mGLContext->fClearColor(0.0, 0.0, 0.0, 0.0);
+    mGLContext->fClear(LOCAL_GL_COLOR_BUFFER_BIT | LOCAL_GL_DEPTH_BUFFER_BIT);
+  }
 #endif
 }
 

diff --git a/gfx/thebes/gfxPrefs.h b/gfx/thebes/gfxPrefs.h
@@ -196,6 +196,8 @@ class gfxPrefs final
   DECL_GFX_PREF(Once, "gfx.canvas.skiagl.cache-size",          CanvasSkiaGLCacheSize, int32_t, 96);
   DECL_GFX_PREF(Once, "gfx.canvas.skiagl.cache-items",         CanvasSkiaGLCacheItems, int32_t, 256);
 
+  DECL_GFX_PREF(Once, "gfx.compositor.clear-context",          ClearCompoisitorContext, bool, true);
+
   DECL_GFX_PREF(Live, "gfx.color_management.enablev4",         CMSEnableV4, bool, false);
   DECL_GFX_PREF(Live, "gfx.color_management.mode",             CMSMode, int32_t,-1);
   // The zero default here should match QCMS_INTENT_DEFAULT from qcms.h