Index: third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DTest.cpp |
diff --git a/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DTest.cpp b/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DTest.cpp |
index 37560941691989bce939245140b9259d21f02287..fdaa4b3c18d1683b8077f62a7d714680af2ac868 100644 |
--- a/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DTest.cpp |
+++ b/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DTest.cpp |
@@ -988,10 +988,24 @@ TEST_F(CanvasRenderingContext2DTest, GetImageDataDisablesAcceleration) { |
EXPECT_EQ(720000, getGlobalGPUMemoryUsage()); |
DummyExceptionStateForTesting exceptionState; |
+ for (int i = 0; |
+ i < |
+ ExpensiveCanvasHeuristicParameters::GPUReadbackMinSuccessiveFrames - 1; |
+ i++) { |
+ context2d()->getImageData(0, 0, 1, 1, exceptionState); |
+ canvasElement().finalizeFrame(); |
+ |
+ EXPECT_FALSE(exceptionState.hadException()); |
+ EXPECT_TRUE(canvasElement().buffer()->isAccelerated()); |
+ EXPECT_EQ(1u, getGlobalAcceleratedImageBufferCount()); |
+ EXPECT_EQ(720000, getGlobalGPUMemoryUsage()); |
+ } |
+ |
context2d()->getImageData(0, 0, 1, 1, exceptionState); |
+ canvasElement().finalizeFrame(); |
EXPECT_FALSE(exceptionState.hadException()); |
- if (ExpensiveCanvasHeuristicParameters::GetImageDataForcesNoAcceleration) { |
+ if (ExpensiveCanvasHeuristicParameters::GPUReadbackForcesNoAcceleration) { |
EXPECT_FALSE(canvasElement().buffer()->isAccelerated()); |
EXPECT_EQ(0u, getGlobalAcceleratedImageBufferCount()); |
EXPECT_EQ(0, getGlobalGPUMemoryUsage()); |