[embedlite] Add RequestGLContext back to EmbedLitePuppetWidget

This gives higher layer in the stack a possibility to customize gl context creation.
sailfishos · May 19, 2015 · b36d353 · b36d353
1 parent ff4fa4f
commit b36d353
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/embedding/embedlite/embedshared/EmbedLitePuppetWidget.cpp b/embedding/embedlite/embedshared/EmbedLitePuppetWidget.cpp
@@ -580,7 +580,9 @@ EmbedLitePuppetWidget::GetNaturalBounds()
 bool
 EmbedLitePuppetWidget::HasGLContext()
 {
-  return true;
+  EmbedLiteCompositorParent* parent =
+    static_cast<EmbedLiteCompositorParent*>(mCompositorParent.get());
+  return parent->RequestGLContext();
 }
 
 void

diff --git a/embedding/embedlite/embedthread/EmbedLiteCompositorParent.cpp b/embedding/embedlite/embedthread/EmbedLiteCompositorParent.cpp
@@ -333,6 +333,12 @@ EmbedLiteCompositorParent::ResumeRendering()
   static_cast<CompositorOGL*>(state->mLayerManager->GetCompositor())->Resume();
 }
 
+bool EmbedLiteCompositorParent::RequestGLContext()
+{
+  EmbedLiteView* view = EmbedLiteApp::GetInstance()->GetViewByID(mId);
+  return view ? view->GetListener()->RequestCurrentGLContext() : false;
+}
+
 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
@@ -37,6 +37,8 @@ class EmbedLiteCompositorParent : public mozilla::layers::CompositorParent
   virtual void SuspendRendering();
   virtual void ResumeRendering();
 
+  virtual bool RequestGLContext();
+
   void DrawWindowOverlay(mozilla::layers::LayerManagerComposite *aManager, nsIntRect aRect);
 
 protected: