Fixing Canvas2DLayerBridge to handle lost graphics contexts

Source/WebKit/chromium/tests/Canvas2DLayerBridgeTest.cpp

Index: Source/WebKit/chromium/tests/Canvas2DLayerBridgeTest.cpp
diff --git a/Source/WebKit/chromium/tests/Canvas2DLayerBridgeTest.cpp b/Source/WebKit/chromium/tests/Canvas2DLayerBridgeTest.cpp
index b1cc9829d8cb2f6f82c428037fa4da0cf8d375dc..4ae00aa5c4fc512ff1177e3d05758d5ae3e09d54 100644
--- a/Source/WebKit/chromium/tests/Canvas2DLayerBridgeTest.cpp
+++ b/Source/WebKit/chromium/tests/Canvas2DLayerBridgeTest.cpp
@@ -58,6 +58,25 @@ public:
     MOCK_METHOD3(appendCopy, void(unsigned, unsigned, WebSize));
 };
 
+class FakeCanvas2DLayerBridge : public Canvas2DLayerBridge {
+public:
+    static PassOwnPtr<Canvas2DLayerBridge> create(PassRefPtr<GraphicsContext3D> context, SkDeferredCanvas* canvas, OpacityMode opacityMode, ThreadMode threadMode)
+    {
+        return adoptPtr(new FakeCanvas2DLayerBridge(context, canvas, opacityMode, threadMode));
+    }
+
+    virtual bool isValid() OVERRIDE

[Stephen White, 2013/05/28 18:05:43]

Now that we have a virtual isValid(), maybe we could use it for testing for the
correct behaviour in the lost-context case.

+    {
+        return true;
+    }
+protected:
+    FakeCanvas2DLayerBridge(PassRefPtr<GraphicsContext3D> context, SkDeferredCanvas* canvas, OpacityMode opacityMode, ThreadMode threadMode) :
+        Canvas2DLayerBridge(context, canvas)
+    {
+        init(opacityMode, threadMode);
+    }
+};
+
 } // namespace
 
 class Canvas2DLayerBridgeTest : public Test {
@@ -75,7 +94,7 @@ protected:
 
         ::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);