Fixing laggy chrome on a multitude of accelerated canvases

third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridge.cpp

Index: third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridge.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridge.cpp b/third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridge.cpp
index b9ce0de3eb97660edfe0a1fa28f7173b660339cf..7979ec855bc2b6467bbc36af2a56c0c3a00d87d3 100644
--- a/third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridge.cpp
+++ b/third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridge.cpp
@@ -187,6 +187,7 @@ SkSurface* Canvas2DLayerBridge::getOrCreateSurface(AccelerationHint hint)
         bool surfaceIsAccelerated;
 
         m_surface = createSkSurface(wantAccelerated ? m_contextProvider->grContext() : nullptr, m_size, m_msaaSampleCount, m_opacityMode, &surfaceIsAccelerated);
+        m_imageBuffer->updateGPUMemoryUsage();

[Justin Novosad, 2015/12/08 22:15:27]

Should call this after creating m_layer, otherwise isAccelerated may return the
wrong value.

 
         if (m_surface && surfaceIsAccelerated && !m_layer) {
             m_layer = adoptPtr(Platform::current()->compositorSupport()->createExternalTextureLayer(this));
@@ -403,6 +404,7 @@ bool Canvas2DLayerBridge::restoreSurface()
         // Therefore, we can only accept the restored surface if it is accelerated.
         if (surface.get() && surfaceIsAccelerated) {
             m_surface = surface.release();
+            m_imageBuffer->updateGPUMemoryUsage();
             // FIXME: draw sad canvas picture into new buffer crbug.com/243842
         }
     }