Bug 871390 - Update WebGL canvases async, not 2D ones. r=mattwoodrow, a=lsblakk
authorJames Willcox <snorp@snorp.net>
Tue, 14 May 2013 21:16:07 -0400
changeset 142771 579c6a2b3e2bec12226446d627f70690f95299a8
parent 142770 e1e21759a90286241de023a3d85ec2e3fe972c27
child 142772 b31dd759578adf7483bfa75206867f9894d160cb
push id2579
push userakeybl@mozilla.com
push dateMon, 24 Jun 2013 18:52:47 +0000
treeherdermozilla-beta@b69b7de8a05a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmattwoodrow, lsblakk
bugs871390
milestone23.0a2
Bug 871390 - Update WebGL canvases async, not 2D ones. r=mattwoodrow, a=lsblakk
gfx/layers/client/CanvasClient.cpp
gfx/layers/client/CanvasClient.h
--- a/gfx/layers/client/CanvasClient.cpp
+++ b/gfx/layers/client/CanvasClient.cpp
@@ -63,17 +63,17 @@ CanvasClient2D::Update(gfx::IntSize aSiz
   mTextureClient->EnsureAllocated(aSize, contentType);
 
   gfxASurface* surface = mTextureClient->LockSurface();
   aLayer->UpdateSurface(surface);
   mTextureClient->Unlock();
 }
 
 void
-CanvasClient2D::Updated()
+CanvasClientWebGL::Updated()
 {
   mForwarder->UpdateTextureNoSwap(this, 1, mTextureClient->GetDescriptor());
 }
 
 
 CanvasClientWebGL::CanvasClientWebGL(CompositableForwarder* aFwd,
                                      TextureFlags aFlags)
 : CanvasClient(aFwd, aFlags)
--- a/gfx/layers/client/CanvasClient.h
+++ b/gfx/layers/client/CanvasClient.h
@@ -60,32 +60,31 @@ public:
                  TextureFlags aFlags);
 
   TextureInfo GetTextureInfo() const MOZ_OVERRIDE
   {
     return mTextureInfo;
   }
 
   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
 // GL backend.
 class CanvasClientWebGL : public CanvasClient
 {
 public:
   CanvasClientWebGL(CompositableForwarder* aFwd,
                     TextureFlags aFlags);
 
   TextureInfo GetTextureInfo() const MOZ_OVERRIDE
   {
     return mTextureInfo;
   }
 
   virtual void Update(gfx::IntSize aSize, ClientCanvasLayer* aLayer);
+  virtual void Updated() MOZ_OVERRIDE;
 };
 
 }
 }
 
 #endif