| 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 1a0c7ffd02a3d55f39f215c56c366c01a2c96cbf..9a0fc752c8ccb02c390670963b4a7107c2c4b495 100644
|
| --- a/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DTest.cpp
|
| +++ b/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DTest.cpp
|
| @@ -783,9 +783,15 @@ TEST_F(CanvasRenderingContext2DTest, GetImageDataDisablesAcceleration)
|
| context2d()->getImageData(0, 0, 1, 1, exceptionState);
|
|
|
| EXPECT_FALSE(exceptionState.hadException());
|
| - EXPECT_FALSE(bridge->isAccelerated());
|
| - EXPECT_EQ(0u, getGlobalAcceleratedImageBufferCount());
|
| - EXPECT_EQ(0, getGlobalGPUMemoryUsage());
|
| + if (ExpensiveCanvasHeuristicParameters::GetImageDataForcesNoAcceleration) {
|
| + EXPECT_FALSE(bridge->isAccelerated());
|
| + EXPECT_EQ(0u, getGlobalAcceleratedImageBufferCount());
|
| + EXPECT_EQ(0, getGlobalGPUMemoryUsage());
|
| + } else {
|
| + EXPECT_TRUE(bridge->isAccelerated());
|
| + EXPECT_EQ(1u, getGlobalAcceleratedImageBufferCount());
|
| + EXPECT_EQ(720000, getGlobalGPUMemoryUsage());
|
| + }
|
|
|
| // Restore global state to prevent side-effects on other tests
|
| RuntimeEnabledFeatures::setCanvas2dFixedRenderingModeEnabled(savedFixedRenderingMode);
|
|
|