Fixing Canvas2DLayerBridge to handle lost graphics contexts

Source/core/platform/graphics/chromium/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 16 matching lines @@
 
 #include "core/platform/graphics/chromium/Canvas2DLayerBridge.h"
 
 #include "GrContext.h"
 #include "SkDevice.h"
 #include "SkSurface.h"
 #include "core/platform/chromium/TraceEvent.h"
 #include "core/platform/graphics/GraphicsContext3D.h"
 #include "core/platform/graphics/chromium/Canvas2DLayerManager.h"
 #include "core/platform/graphics/chromium/GraphicsLayerChromium.h"
+#include "core/platform/graphics/gpu/SharedGraphicsContext3D.h"
 #include <public/Platform.h>
 #include <public/WebCompositorSupport.h>
 #include <public/WebGraphicsContext3D.h>
 
 using WebKit::WebExternalTextureLayer;
 using WebKit::WebGraphicsContext3D;
 using WebKit::WebTextureUpdater;
 
 namespace WebCore {
 
-Canvas2DLayerBridge::Canvas2DLayerBridge(PassRefPtr<GraphicsContext3D> context, SkDeferredCanvas* canvas, OpacityMode opacityMode, ThreadMode threadMode)
+static SkSurface* createSurface(GraphicsContext3D* context3D, const IntSize& size)
+{
+    ASSERT(!context3D->webContext()->isContextLost());
+    GrContext* gr = context3D->grContext();
+    if (!gr)
+        return 0;
+    gr->resetContext();
+    SkImage::Info info;
+    info.fWidth = size.width();
+    info.fHeight = size.height();
+    info.fColorType = SkImage::kPMColor_ColorType;
+    info.fAlphaType = SkImage::kPremul_AlphaType;
+    return SkSurface::NewRenderTarget(gr, info);
+}
+
+PassOwnPtr<Canvas2DLayerBridge> Canvas2DLayerBridge::create(PassRefPtr<GraphicsContext3D> context, const IntSize& size, OpacityMode opacityMode, ThreadMode threading)
+{
+    SkAutoTUnref<SkSurface> surface(createSurface(context.get(), size));
+    if (!surface.get())
+        return PassOwnPtr<Canvas2DLayerBridge>();
+    SkDeferredCanvas* canvas = new SkDeferredCanvas(surface);
+    OwnPtr<Canvas2DLayerBridge> layerBridge = adoptPtr(new Canvas2DLayerBridge(context, canvas));
+    layerBridge->init(opacityMode, threading);
+    return layerBridge.release();
+}
+
+Canvas2DLayerBridge::Canvas2DLayerBridge(PassRefPtr<GraphicsContext3D> context, SkDeferredCanvas* canvas)
     : m_canvas(canvas)
     , m_context(context)
     , m_bytesAllocated(0)
     , m_didRecordDrawCommand(false)
     , m_framesPending(0)
     , m_next(0)
     , m_prev(0)
 #if ENABLE(CANVAS_USES_MAILBOX)
     , m_lastImageId(0)
 #endif
 {
+}
+
+Canvas2DLayerBridge::~Canvas2DLayerBridge()
+{
+    ASSERT(m_layer);
+    GraphicsLayerChromium::unregisterContentsLayer(m_layer->layer());
+    Canvas2DLayerManager::get().layerToBeDestroyed(this);
+    m_canvas->setNotificationClient(0);
+#if ENABLE(CANVAS_USES_MAILBOX)
+    m_mailboxes.clear();
+#endif
+    m_layer->clearTexture();
+}
+
+void Canvas2DLayerBridge::init(OpacityMode opacityMode, ThreadMode threadMode)
+{
     ASSERT(m_canvas);
     // Used by browser tests to detect the use of a Canvas2DLayerBridge.
-    TRACE_EVENT_INSTANT0("test_gpu", "Canvas2DLayerBridgeCreation");
+    TRACE_EVENT_INSTANT0("test_gpu", "Canvas2DLayerBridge::init()");
     m_canvas->setNotificationClient(this);

[Stephen White, 2013/05/31 15:06:18]

As discussed, let's make one last attempt to get rid of init() by putting this
call last in the constructor (with a comment).

 #if ENABLE(CANVAS_USES_MAILBOX)
     m_layer = adoptPtr(WebKit::Platform::current()->compositorSupport()->createExternalTextureLayerForMailbox(this));
 #else
     m_layer = adoptPtr(WebKit::Platform::current()->compositorSupport()->createExternalTextureLayer(this));
     m_layer->setRateLimitContext(threadMode == SingleThread);
     GrRenderTarget* renderTarget = reinterpret_cast<GrRenderTarget*>(m_canvas->getDevice()->accessRenderTarget());
     if (renderTarget) {
         m_layer->setTextureId(renderTarget->asTexture()->getTextureHandle());
     }
 #endif
     m_layer->setOpaque(opacityMode == Opaque);
     GraphicsLayerChromium::registerContentsLayer(m_layer->layer());
 }
 
-Canvas2DLayerBridge::~Canvas2DLayerBridge()
-{
-    GraphicsLayerChromium::unregisterContentsLayer(m_layer->layer());
-    Canvas2DLayerManager::get().layerToBeDestroyed(this);
-    m_canvas->setNotificationClient(0);
-#if ENABLE(CANVAS_USES_MAILBOX)
-    m_mailboxes.clear();
-#endif
-    m_layer->clearTexture();
-}
-
 void Canvas2DLayerBridge::limitPendingFrames()
 {
     if (m_didRecordDrawCommand) {
         m_framesPending++;
         m_didRecordDrawCommand = false;
         if (m_framesPending > 1)
             flush();
     }
 }
 
 void Canvas2DLayerBridge::prepareForDraw()
 {
+    ASSERT(m_layer);
+    if (!isValid()) {
+        if (m_canvas) {
+            // drop pending commands because there is no surface to draw to
+            m_canvas->silentFlush();
+        }
+        return;
+    }
 #if !ENABLE(CANVAS_USES_MAILBOX)
     m_layer->willModifyTexture();
 #endif
     m_context->makeContextCurrent();
 }
 
 void Canvas2DLayerBridge::storageAllocatedForRecordingChanged(size_t bytesAllocated)
 {
     intptr_t delta = (intptr_t)bytesAllocated - (intptr_t)m_bytesAllocated;
     m_bytesAllocated = bytesAllocated;
@@ skipping 26 matching lines @@
 }
 
 void Canvas2DLayerBridge::flush()
 {
     if (m_canvas->hasPendingCommands())
         m_canvas->flush();
 }
 
 unsigned Canvas2DLayerBridge::prepareTexture(WebTextureUpdater& updater)
 {
+    if (!isValid())
+        return 0;
 #if ENABLE(CANVAS_USES_MAILBOX)
     ASSERT_NOT_REACHED();
     return 0;
 #else
     m_context->makeContextCurrent();
 
     TRACE_EVENT0("cc", "Canvas2DLayerBridge::SkCanvas::flush");
     m_canvas->flush();
     m_context->flush();
 
     // Notify skia that the state of the backing store texture object will be touched by the compositor
     GrRenderTarget* renderTarget = reinterpret_cast<GrRenderTarget*>(m_canvas->getDevice()->accessRenderTarget());
     if (renderTarget) {
         GrTexture* texture = renderTarget->asTexture();
         texture->invalidateCachedState();
         return texture->getTextureHandle();
     }
     return 0;
 #endif  // !ENABLE(CANVAS_USES_MAILBOX)
 }
 
 WebGraphicsContext3D* Canvas2DLayerBridge::context()
 {
+    ASSERT(m_context.get());
     return m_context->webContext();
 }
 
+PassRefPtr<GraphicsContext3D> Canvas2DLayerBridge::getSharedContext() const
+{
+    return SharedGraphicsContext3D::get();
+}
+
+bool Canvas2DLayerBridge::isValid()
+{
+    ASSERT(m_layer);
+    RefPtr<GraphicsContext3D> sharedContext = getSharedContext();
+    if (!sharedContext || sharedContext->webContext()->isContextLost()) {
+        // Context was lost since last call to isValid and
+        // SharedGraphicsContext3D has not recovered.
+        m_context.clear();
+        m_layer->clearTexture();
+        return false;
+    }
+    if (m_context != sharedContext) {
+        ASSERT(sharedContext.get());
+        // Old context was lost and sharedContext has recovered.
+        // Use the new context to recover the layer
+        m_context = sharedContext;
+        m_layer->clearTexture();
+        IntSize size(m_canvas->getTopDevice()->width(), m_canvas->getTopDevice()->height());
+        SkAutoTUnref<SkSurface> surface(createSurface(m_context.get(), size));
+        if (surface.get()) {
+            m_canvas->setSurface(surface.get());
+            // FIXME: draw sad canvas picture into new buffer crbug.com/243842
+        } else {
+            // Surface allocation failed. Reset m_context to trigger subsequent retry
+            m_context.clear();
+            return false;
+        }
+#if !ENABLE(CANVAS_USES_MAILBOX)
+        GrRenderTarget* renderTarget = reinterpret_cast<GrRenderTarget*>(m_canvas->getDevice()->accessRenderTarget());
+        if (renderTarget)
+            m_layer->setTextureId(renderTarget->asTexture()->getTextureHandle());
+#endif
+    }
+    return true;
+}
+
 bool Canvas2DLayerBridge::prepareMailbox(WebKit::WebExternalTextureMailbox* outMailbox)
 {
 #if ENABLE(CANVAS_USES_MAILBOX)
+    if (!m_canvas.get() || !isValid())
+        return false;
     // Release to skia textures that were previouosly released by the
     // compositor. We do this before acquiring the next snapshot in
     // order to cap maximum gpu memory consumption.
     m_context->makeContextCurrent();
     Vector<MailboxInfo>::iterator mailboxInfo;
     for (mailboxInfo = m_mailboxes.begin(); mailboxInfo < m_mailboxes.end(); mailboxInfo++) {
         if (mailboxInfo->m_status == MailboxReleased) {
             if (mailboxInfo->m_mailbox.syncPoint) {
                 context()->waitSyncPoint(mailboxInfo->m_mailbox.syncPoint);
                 mailboxInfo->m_mailbox.syncPoint = 0;
@@ skipping 72 matching lines @@
              mailboxInfo->m_status = MailboxReleased;
              return;
          }
      }
 #endif
      ASSERT_NOT_REACHED();
 }
 
 WebKit::WebLayer* Canvas2DLayerBridge::layer()
 {
+    ASSERT(m_layer);
     return m_layer->layer();
 }
 
 void Canvas2DLayerBridge::contextAcquired()
 {
     Canvas2DLayerManager::get().layerDidDraw(this);
     m_didRecordDrawCommand = true;
 }
 
 unsigned Canvas2DLayerBridge::backBufferTexture()
@@ skipping 13 matching lines @@
     // This copy constructor should only be used for Vector reallocation
     // Assuming 'other' is to be destroyed, we swap m_image ownership
     // rather than do a refcount dance.
     memcpy(&m_mailbox, &other.m_mailbox, sizeof(m_mailbox));
     m_image.swap(const_cast<SkAutoTUnref<SkImage>*>(&other.m_image));
     m_status = other.m_status;
 }
 #endif
 
 }