Bug 863223 - Make canvas updates asynchronous once again r=nrc

gfx/layers/client/CanvasClient.cpp

@@ -67,6 +67,13 @@ CanvasClient2D::Update(gfx::IntSize aSize, ClientCanvasLayer* aLayer)
   mTextureClient->Unlock();
 }
 
+void
+CanvasClient2D::Updated()
+{
+  mForwarder->UpdateTextureNoSwap(this, 1, mTextureClient->GetDescriptor());
+}
+
+
 CanvasClientWebGL::CanvasClientWebGL(CompositableForwarder* aFwd,
                                      TextureFlags aFlags)
 : CanvasClient(aFwd, aFlags)

gfx/layers/client/CanvasClient.h

@@ -65,6 +65,8 @@ public:
   }
 
   virtual void Update(gfx::IntSize aSize, ClientCanvasLayer* aLayer);
+
+  virtual void Updated() MOZ_OVERRIDE;
 };
 
 // Used for GL canvases where we don't need to do any readback, i.e., with a

gfx/layers/ipc/CompositableForwarder.h

@@ -84,6 +84,13 @@ public:
                              TextureIdentifier aTextureId,
                              SurfaceDescriptor* aDescriptor) = 0;
 
+  /**
+   * Same as UpdateTexture, but performs an asynchronous layer transaction (if possible)
+   */
+  virtual void UpdateTextureNoSwap(CompositableClient* aCompositable,
+                                   TextureIdentifier aTextureId,
+                                   SurfaceDescriptor* aDescriptor) = 0;
+
   /**
    * Communicate to the compositor that aRegion in the texture identified by
    * aCompositable and aIdentifier has been updated to aThebesBuffer.

gfx/layers/ipc/ImageBridgeChild.cpp

@@ -94,6 +94,23 @@ ImageBridgeChild::UpdateTexture(CompositableClient* aCompositable,
   }
 }
 
+void
+ImageBridgeChild::UpdateTextureNoSwap(CompositableClient* aCompositable,
+                                      TextureIdentifier aTextureId,
+                                      SurfaceDescriptor* aDescriptor)
+{
+  if (aDescriptor->type() != SurfaceDescriptor::T__None &&
+      aDescriptor->type() != SurfaceDescriptor::Tnull_t) {
+    MOZ_ASSERT(aCompositable);
+    MOZ_ASSERT(aCompositable->GetIPDLActor());
+    mTxn->AddNoSwapEdit(OpPaintTexture(nullptr, aCompositable->GetIPDLActor(), 1,
+                                       SurfaceDescriptor(*aDescriptor)));
+    *aDescriptor = SurfaceDescriptor();
+  } else {
+    NS_WARNING("Trying to send a null SurfaceDescriptor.");
+  }
+}
+
 void
 ImageBridgeChild::UpdatePictureRect(CompositableClient* aCompositable,
                                     const nsIntRect& aRect)

gfx/layers/ipc/ImageBridgeChild.h

@@ -244,6 +244,10 @@ public:
                              TextureIdentifier aTextureId,
                              SurfaceDescriptor* aDescriptor) MOZ_OVERRIDE;
 
+  virtual void UpdateTextureNoSwap(CompositableClient* aCompositable,
+                                   TextureIdentifier aTextureId,
+                                   SurfaceDescriptor* aDescriptor) MOZ_OVERRIDE;
+
   /**
    * Communicate the picture rect of a YUV image in aLayer to the compositor
    */

gfx/layers/ipc/ShadowLayers.cpp

@@ -316,6 +316,23 @@ ShadowLayerForwarder::UpdateTexture(CompositableClient* aCompositable,
   }
 }
 
+void
+ShadowLayerForwarder::UpdateTextureNoSwap(CompositableClient* aCompositable,
+                                          TextureIdentifier aTextureId,
+                                          SurfaceDescriptor* aDescriptor)
+{
+  if (aDescriptor->type() != SurfaceDescriptor::T__None &&
+      aDescriptor->type() != SurfaceDescriptor::Tnull_t) {
+    MOZ_ASSERT(aCompositable);
+    MOZ_ASSERT(aCompositable->GetIPDLActor());
+    mTxn->AddNoSwapPaint(OpPaintTexture(nullptr, aCompositable->GetIPDLActor(), 1,
+                                        SurfaceDescriptor(*aDescriptor)));
+    *aDescriptor = SurfaceDescriptor();
+  } else {
+    NS_WARNING("Trying to send a null SurfaceDescriptor.");
+  }
+}
+
 void
 ShadowLayerForwarder::UpdateTextureRegion(CompositableClient* aCompositable,
                                           const ThebesBufferData& aThebesBufferData,

gfx/layers/ipc/ShadowLayers.h

@@ -273,6 +273,13 @@ public:
                              TextureIdentifier aTextureId,
                              SurfaceDescriptor* aDescriptor) MOZ_OVERRIDE;
 
+  /**
+   * Same as above, but performs an asynchronous layer transaction
+   */
+  virtual void UpdateTextureNoSwap(CompositableClient* aCompositable,
+                                   TextureIdentifier aTextureId,
+                                   SurfaceDescriptor* aDescriptor) MOZ_OVERRIDE;
+
   /**
    * Communicate to the compositor that aRegion in the texture identified by aLayer
    * and aIdentifier has been updated to aThebesBuffer.