Fixing laggy chrome on a multitude of accelerated canvases

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

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 169 matching lines @@
 SkSurface* Canvas2DLayerBridge::getOrCreateSurface(AccelerationHint hint)
 {
     if (!m_surface) {
         if (m_layer)
             return nullptr; // recreation will happen through restore()
 
         bool wantAccelerated = shouldAccelerate(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));
             m_layer->setOpaque(m_opacityMode == Opaque);
             m_layer->setBlendBackgroundColor(m_opacityMode != Opaque);
             GraphicsLayer::registerContentsLayer(m_layer->layer());
             m_layer->setNearestNeighbor(m_filterQuality == kNone_SkFilterQuality);
         }
     }
     return m_surface.get();
@@ skipping 196 matching lines @@
 
     if (sharedContext && !sharedContext->isContextLost()) {
         GrContext* grCtx = m_contextProvider->grContext();
         bool surfaceIsAccelerated;
         RefPtr<SkSurface> surface(createSkSurface(grCtx, m_size, m_msaaSampleCount, m_opacityMode, &surfaceIsAccelerated));
         // Current paradigm does support switching from accelerated to non-accelerated, which would be tricky
         // due to changes to the layer tree, which can only happen at specific times during the document lifecycle.
         // 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
         }
     }
 
     return m_surface;
 }
 
 bool Canvas2DLayerBridge::prepareMailbox(WebExternalTextureMailbox* outMailbox, WebExternalBitmap* bitmap)
 {
     ASSERT(isAccelerated());
@@ skipping 229 matching lines @@
 }
 
 Canvas2DLayerBridge::MailboxInfo::MailboxInfo(const MailboxInfo& other)
 {
     memcpy(&m_mailbox, &other.m_mailbox, sizeof(m_mailbox));
     m_image = other.m_image;
     m_parentLayerBridge = other.m_parentLayerBridge;
 }
 
 } // namespace blink