Add an heuristic for promoting canvases to GPU acceleration

third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DTest.cpp

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 43a45fe3ce004c65aca6bd64ce2f0ba626beb2d3..59ebdfbb630a58ecb760b3831009819d5780d7e9 100644
--- a/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DTest.cpp
+++ b/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DTest.cpp
@@ -1007,44 +1007,6 @@ TEST_F(CanvasRenderingContext2DTest, GetImageDataDisablesAcceleration) {
       savedFixedRenderingMode);
 }
 
-TEST_F(CanvasRenderingContext2DTest,
-       PreferNoAccelerationHintDisablesAcceleration) {
-  bool savedFixedRenderingMode =
-      RuntimeEnabledFeatures::canvas2dFixedRenderingModeEnabled();
-  RuntimeEnabledFeatures::setCanvas2dFixedRenderingModeEnabled(false);
-
-  createContext(NonOpaque);
-  FakeGLES2Interface gl;
-  std::unique_ptr<FakeWebGraphicsContext3DProvider> contextProvider(
-      new FakeWebGraphicsContext3DProvider(&gl));
-  IntSize size(300, 300);
-  RefPtr<Canvas2DLayerBridge> bridge =
-      makeBridge(std::move(contextProvider), size,
-                 Canvas2DLayerBridge::EnableAcceleration);
-  std::unique_ptr<Canvas2DImageBufferSurface> surface(
-      new Canvas2DImageBufferSurface(bridge, size));
-  canvasElement().createImageBufferUsingSurfaceForTesting(std::move(surface));
-
-  EXPECT_TRUE(canvasElement().buffer()->isAccelerated());
-  SourceImageStatus status = InvalidSourceImageStatus;
-  canvasElement().getSourceImageForCanvas(
-      &status, PreferNoAcceleration, SnapshotReasonUnitTests, FloatSize(size));
-  EXPECT_EQ(NormalSourceImageStatus, status);
-  if (ExpensiveCanvasHeuristicParameters::DisableAccelerationToAvoidReadbacks) {
-    EXPECT_FALSE(canvasElement().buffer()->isAccelerated());
-    EXPECT_EQ(0u, getGlobalAcceleratedImageBufferCount());
-    EXPECT_EQ(0, getGlobalGPUMemoryUsage());
-  } else {
-    EXPECT_TRUE(canvasElement().buffer()->isAccelerated());
-    EXPECT_EQ(1u, getGlobalAcceleratedImageBufferCount());
-    EXPECT_EQ(720000, getGlobalGPUMemoryUsage());
-  }
-
-  // Restore global state to prevent side-effects on other tests
-  RuntimeEnabledFeatures::setCanvas2dFixedRenderingModeEnabled(
-      savedFixedRenderingMode);
-}
-
 TEST_F(CanvasRenderingContext2DTest, TextureUploadHeuristics) {
   bool savedFixedRenderingMode =
       RuntimeEnabledFeatures::canvas2dFixedRenderingModeEnabled();