Added partial implementation for context suspend/resume functionality

sailfishos · Sep 4, 2014 · 2aa5a2a · 2aa5a2a
1 parent 9db54f7
commit 2aa5a2a
Show file tree

Hide file tree

Showing 7 changed files with 83 additions and 1 deletion.
diff --git a/embedding/embedlite/EmbedLiteView.cpp b/embedding/embedlite/EmbedLiteView.cpp
@@ -296,6 +296,20 @@ EmbedLiteView::ScheduleRender()
   mViewImpl->ScheduleRender();
 }
 
+void
+EmbedLiteView::SuspendRendering()
+{
+  NS_ENSURE_TRUE(mViewImpl, );
+  mViewImpl->SuspendRendering();
+}
+
+void
+EmbedLiteView::ResumeRendering()
+{
+  NS_ENSURE_TRUE(mViewImpl, );
+  mViewImpl->ResumeRendering();
+}
+
 void
 EmbedLiteView::ReceiveInputEvent(const InputData& aEvent)
 {

diff --git a/embedding/embedlite/EmbedLiteView.h b/embedding/embedlite/EmbedLiteView.h
@@ -133,6 +133,9 @@ class EmbedLiteView
   virtual bool GetPendingTexture(EmbedLiteRenderTarget* aContextWrapper, int* textureID, int* width, int* height, int* textureTarget = 0);
   virtual void* GetPlatformImage(int* width, int* height);
 
+  virtual void SuspendRendering();
+  virtual void ResumeRendering();
+
 private:
   friend class EmbedLiteViewThreadParent;
   friend class EmbedLiteCompositorParent;

diff --git a/embedding/embedlite/embedhelpers/EmbedLiteViewIface.idl b/embedding/embedlite/embedhelpers/EmbedLiteViewIface.idl
@@ -60,4 +60,6 @@ interface EmbedLiteViewIface
     void GetUniqueID(out uint32_t aId);
     void GetPendingTexture(in EmbedLiteRenderTarget aContextWrapper, out int32_t aTextureID, out int32_t aTextureTarget, out int32_t aWidth, out int32_t aHeight);
     void GetPlatformImage(out PlatformImage aImage, out int32_t aWidth, out int32_t aHeight);
+    void SuspendRendering();
+    void ResumeRendering();
 };
diff --git a/embedding/embedlite/embedthread/EmbedLiteCompositorParent.cpp b/embedding/embedlite/embedthread/EmbedLiteCompositorParent.cpp
@@ -226,7 +226,8 @@ EmbedLiteCompositorParent::GetPlatformImage(int* width, int* height)
   NS_ENSURE_TRUE(state && state->mLayerManager, nullptr);
 
   GLContext* context = static_cast<CompositorOGL*>(state->mLayerManager->GetCompositor())->gl();
-  NS_ENSURE_TRUE(context && context->IsOffscreen(), nullptr);
+  NS_ENSURE_TRUE(context, nullptr);
+  NS_ENSURE_TRUE(context->IsOffscreen(), nullptr);
 
   SharedSurface* sharedSurf = context->RequestFrame();
   NS_ENSURE_TRUE(sharedSurf, nullptr);
@@ -242,6 +243,34 @@ EmbedLiteCompositorParent::GetPlatformImage(int* width, int* height)
   return nullptr;
 }
 
+void
+EmbedLiteCompositorParent::SuspendRendering()
+{
+  if (!CompositorParent::IsInCompositorThread()) {
+    CancelableTask* pauseTask = NewRunnableMethod(this, &EmbedLiteCompositorParent::SuspendRendering);
+    CompositorLoop()->PostTask(FROM_HERE, pauseTask);
+    return;
+  }
+
+  const CompositorParent::LayerTreeState* state = CompositorParent::GetIndirectShadowTree(RootLayerTreeId());
+  NS_ENSURE_TRUE(state && state->mLayerManager, );
+  static_cast<CompositorOGL*>(state->mLayerManager->GetCompositor())->Pause();
+}
+
+void
+EmbedLiteCompositorParent::ResumeRendering()
+{
+  if (!CompositorParent::IsInCompositorThread()) {
+    CancelableTask* pauseTask = NewRunnableMethod(this, &EmbedLiteCompositorParent::ResumeRendering);
+    CompositorLoop()->PostTask(FROM_HERE, pauseTask);
+    return;
+  }
+
+  const CompositorParent::LayerTreeState* state = CompositorParent::GetIndirectShadowTree(RootLayerTreeId());
+  NS_ENSURE_TRUE(state && state->mLayerManager, );
+  static_cast<CompositorOGL*>(state->mLayerManager->GetCompositor())->Resume();
+}
+
 } // namespace embedlite
 } // namespace mozilla
 
diff --git a/embedding/embedlite/embedthread/EmbedLiteCompositorParent.h b/embedding/embedlite/embedthread/EmbedLiteCompositorParent.h
@@ -27,6 +27,8 @@ class EmbedLiteCompositorParent : public mozilla::layers::CompositorParent
   bool RenderToContext(gfx::DrawTarget* aTarget);
   void SetSurfaceSize(int width, int height);
   void* GetPlatformImage(int* width, int* height);
+  virtual void SuspendRendering();
+  virtual void ResumeRendering();
 
 protected:
   virtual ~EmbedLiteCompositorParent();

diff --git a/embedding/embedlite/embedthread/EmbedLiteViewThreadParent.cpp b/embedding/embedlite/embedthread/EmbedLiteViewThreadParent.cpp
@@ -565,6 +565,26 @@ EmbedLiteViewThreadParent::ScheduleRender()
   return NS_OK;
 }
 
+NS_IMETHODIMP
+EmbedLiteViewThreadParent::ResumeRendering()
+{
+  if (mCompositor) {
+    mCompositor->ResumeRendering();
+  }
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+EmbedLiteViewThreadParent::SuspendRendering()
+{
+  if (mCompositor) {
+    mCompositor->SuspendRendering();
+  }
+
+  return NS_OK;
+}
+
 NS_IMETHODIMP
 EmbedLiteViewThreadParent::ReceiveInputEvent(const mozilla::InputData& aEvent)
 {

diff --git a/gfx/layers/opengl/CompositorOGL.cpp b/gfx/layers/opengl/CompositorOGL.cpp
@@ -1512,6 +1512,12 @@ CompositorOGL::Pause()
 
   // ReleaseSurface internally calls MakeCurrent.
   gl()->ReleaseSurface();
+#else
+  if (!gl() || gl()->IsDestroyed())
+    return;
+
+  // TODO: call Layers->SetCompositor(nullptr);
+  CleanupResources();
 #endif
 }
 
@@ -1524,6 +1530,12 @@ CompositorOGL::Resume()
 
   // RenewSurface internally calls MakeCurrent.
   return gl()->RenewSurface();
+#else
+  if (gl() && !gl()->IsDestroyed())
+    return false;
+
+  Initialize();
+  // TODO: call Layers->SetCompositor(thisOD);
 #endif
   return true;
 }