Fixing Canvas2DLayerBridge to handle lost graphics contexts

Source/WebKit/chromium/tests/Canvas2DLayerBridgeTest.cpp

 /*
  * Copyright (C) 2011 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
  *     notice, this list of conditions and the following disclaimer in the
@@ skipping 40 matching lines @@
     MOCK_METHOD1(deleteTexture, void(unsigned));
 
     virtual GrGLInterface* onCreateGrGLInterface() OVERRIDE { return 0; }
 };
 
 class MockWebTextureUpdater : public WebTextureUpdater {
 public:
     MOCK_METHOD3(appendCopy, void(unsigned, unsigned, WebSize));
 };
 
+class FakeCanvas2DLayerBridge : public Canvas2DLayerBridge {
+public:
+    static PassOwnPtr<FakeCanvas2DLayerBridge> create(PassRefPtr<GraphicsContext3D> context, SkDeferredCanvas* canvas, OpacityMode opacityMode, ThreadMode threadMode)
+    {
+        return adoptPtr(new FakeCanvas2DLayerBridge(context, canvas, opacityMode, threadMode));
+    }
+
+    void setFakeSharedContext(PassRefPtr<GraphicsContext3D> context)
+    {
+        m_fakeSharedContext = context;
+    }
+protected:
+    virtual PassRefPtr<GraphicsContext3D> getSharedContext() const OVERRIDE
+    {
+        return m_fakeSharedContext;
+    }
+
+    FakeCanvas2DLayerBridge(PassRefPtr<GraphicsContext3D> context, SkDeferredCanvas* canvas, OpacityMode opacityMode, ThreadMode threadMode) :
+        Canvas2DLayerBridge(context, canvas, opacityMode, threadMode)
+    {
+        m_fakeSharedContext = m_context;
+    }
+
+    RefPtr<GraphicsContext3D> m_fakeSharedContext;
+};
+
 } // namespace
 
 class Canvas2DLayerBridgeTest : public Test {
 protected:
     void fullLifecycleTest(Canvas2DLayerBridge::ThreadMode threadMode)
     {
         RefPtr<GraphicsContext3D> mainContext = GraphicsContext3D::createGraphicsContextFromWebContext(adoptPtr(new MockCanvasContext));
 
         MockCanvasContext& mainMock = *static_cast<MockCanvasContext*>(mainContext->webContext());
 
         MockWebTextureUpdater updater;
 
         SkDevice device(SkBitmap::kARGB_8888_Config, 300, 150);
         SkDeferredCanvas canvas(&device);
 
         ::testing::Mock::VerifyAndClearExpectations(&mainMock);
 
-        OwnPtr<Canvas2DLayerBridge> bridge = Canvas2DLayerBridge::create(mainContext.release(), &canvas, Canvas2DLayerBridge::NonOpaque, threadMode);
+        OwnPtr<Canvas2DLayerBridge> bridge = FakeCanvas2DLayerBridge::create(mainContext.release(), &canvas, Canvas2DLayerBridge::NonOpaque, threadMode);
 
         ::testing::Mock::VerifyAndClearExpectations(&mainMock);
 
         EXPECT_CALL(mainMock, flush());
         unsigned textureId = bridge->backBufferTexture();
         EXPECT_TRUE(textureId == 0);
 
         ::testing::Mock::VerifyAndClearExpectations(&mainMock);
 
         bridge.clear();
 
         ::testing::Mock::VerifyAndClearExpectations(&mainMock);
         ::testing::Mock::VerifyAndClearExpectations(&updater);
     }
+
+    void contextLostTest()
+    {
+        // This test fakes a context loss by substituting the shared context for a new one.
+        // This simulates what happens when the shared context successfully recoveres

[Stephen White, 2013/05/31 17:13:34]

Nit: recovers

+        // after a graphics reset.
+        RefPtr<GraphicsContext3D> mainContext = GraphicsContext3D::createGraphicsContextFromWebContext(adoptPtr(new MockCanvasContext));
+        MockCanvasContext& mainMock = *static_cast<MockCanvasContext*>(mainContext->webContext());
+
+        RefPtr<GraphicsContext3D> substituteContext = GraphicsContext3D::createGraphicsContextFromWebContext(adoptPtr(new MockCanvasContext));
+        MockCanvasContext& substituteMock = *static_cast<MockCanvasContext*>(mainContext->webContext());
+
+        MockWebTextureUpdater updater;
+
+        SkDevice device(SkBitmap::kARGB_8888_Config, 300, 150);
+        SkDeferredCanvas canvas(&device);
+        OwnPtr<FakeCanvas2DLayerBridge> bridge = FakeCanvas2DLayerBridge::create(mainContext, &canvas, Canvas2DLayerBridge::NonOpaque, Canvas2DLayerBridge::SingleThread);
+
+        EXPECT_TRUE(bridge->m_context == mainContext);
+        bridge->prepareForDraw();
+        EXPECT_TRUE(bridge->m_context == mainContext);
+
+        bridge->setFakeSharedContext(substituteContext); // installing an alternat
+        bridge->prepareForDraw();
+        // m_context set to 0 shows that bridge detected lost context and attempted
+        // to recover. Recovery aborts because the fake context does not provide a grContext.

[jamesr, 2013/05/31 18:15:45]

hmm, so are there any tests that cover a successful(ish) recovery?

+        EXPECT_EQ(bridge->m_context.get(), (WebCore::GraphicsContext3D*)0);
+
+        ::testing::Mock::VerifyAndClearExpectations(&mainMock);
+        ::testing::Mock::VerifyAndClearExpectations(&substituteMock);
+    }
 };
 
 namespace {
 
 TEST_F(Canvas2DLayerBridgeTest, testFullLifecycleSingleThreaded)
 {
     fullLifecycleTest(Canvas2DLayerBridge::SingleThread);
 }
 
 TEST_F(Canvas2DLayerBridgeTest, testFullLifecycleThreaded)
 {
     fullLifecycleTest(Canvas2DLayerBridge::Threaded);
 }
 
+TEST_F(Canvas2DLayerBridgeTest, testContextLost)
+{
+    contextLostTest();
+}
+
 } // namespace