Index: third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridgeTest.cpp |
diff --git a/third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridgeTest.cpp b/third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridgeTest.cpp |
index 75010c0d27f4e8400609d57aef59c2ca32ddd8d2..d234255b3d382790ce924e30ee659c249e282e85 100644 |
--- a/third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridgeTest.cpp |
+++ b/third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridgeTest.cpp |
@@ -240,9 +240,7 @@ class Canvas2DLayerBridgeTest : public Test { |
Canvas2DLayerBridge::ForceAccelerationForTesting, |
gfx::ColorSpace::CreateSRGB(), false, kN32_SkColorType))); |
- // TODO(junov): The PrepareTextureMailbox() method will fail a DCHECK if we |
- // don't do this before calling it the first time when the context is lost. |
- bridge->prepareSurfaceForPaintingIfNeeded(); |
+ EXPECT_TRUE(bridge->isAccelerated()); |
// When the context is lost we are not sure if we should still be producing |
// GL frames for the compositor or not, so fail to generate frames. |
@@ -263,10 +261,8 @@ class Canvas2DLayerBridgeTest : public Test { |
Canvas2DLayerBridge::ForceAccelerationForTesting, |
gfx::ColorSpace::CreateSRGB(), false, kN32_SkColorType))); |
- // TODO(junov): The PrepareTextureMailbox() method will fail a DCHECK if we |
- // don't do this before calling it the first time when the context is lost. |
- bridge->prepareSurfaceForPaintingIfNeeded(); |
- |
+ bridge->getOrCreateSurface(); |
+ EXPECT_TRUE(bridge->checkSurfaceValid()); |
// When the context is lost we are not sure if we should still be producing |
// GL frames for the compositor or not, so fail to generate frames. |
gl.setIsContextLost(true); |
@@ -420,7 +416,7 @@ void runCreateBridgeTask(Canvas2DLayerBridgePtr* bridgePtr, |
Canvas2DLayerBridge::EnableAcceleration); |
// draw+flush to trigger the creation of a GPU surface |
(*bridgePtr)->didDraw(FloatRect(0, 0, 1, 1)); |
- (*bridgePtr)->finalizeFrame(FloatRect(0, 0, 1, 1)); |
+ (*bridgePtr)->finalizeFrame(); |
(*bridgePtr)->flush(); |
doneEvent->signal(); |
} |
@@ -679,7 +675,7 @@ TEST_F(Canvas2DLayerBridgeTest, |
void runRenderingTask(Canvas2DLayerBridge* bridge, WaitableEvent* doneEvent) { |
bridge->didDraw(FloatRect(0, 0, 1, 1)); |
- bridge->finalizeFrame(FloatRect(0, 0, 1, 1)); |
+ bridge->finalizeFrame(); |
bridge->flush(); |
doneEvent->signal(); |
} |