Bug 1006957 - Handle buffer ownership between SurfaceStream and CanvasClient r=nical

2014-05-24 09:14:45 -07:00
parent 131972e14a
commit 272c9282a9
33 changed files with 535 additions and 322 deletions
--- a/gfx/layers/opengl/GrallocTextureClient.h
+++ b/gfx/layers/opengl/GrallocTextureClient.h
@@ -62,7 +62,9 @@ public:

  virtual void SetReleaseFenceHandle(FenceHandle aReleaseFenceHandle) MOZ_OVERRIDE;

-  virtual void WaitReleaseFence() MOZ_OVERRIDE;
+  virtual void SetRemoveFromCompositableTracker(AsyncTransactionTracker* aTracker) MOZ_OVERRIDE;
+
+  virtual void WaitForBufferOwnership() MOZ_OVERRIDE;

  void InitWith(MaybeMagicGrallocBufferHandle aDesc, gfx::IntSize aSize);

@@ -120,6 +122,8 @@ protected:
   */
  MaybeMagicGrallocBufferHandle mGrallocHandle;

+  RefPtr<AsyncTransactionTracker> mRemoveFromCompositableTracker;
+
  android::sp<android::GraphicBuffer> mGraphicBuffer;

  /**