Re-enable canvas optimization for getImageData with new codepath

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "modules/canvas2d/CanvasRenderingContext2D.h"
 
 #include "core/fetch/MemoryCache.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/ImageBitmap.h"
 #include "core/html/HTMLCanvasElement.h"
@@ skipping 761 matching lines @@
     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(bridge->isAccelerated());
+    EXPECT_TRUE(canvasElement().buffer()->isAccelerated());
     EXPECT_EQ(1u, getGlobalAcceleratedImageBufferCount());
     EXPECT_EQ(720000, getGlobalGPUMemoryUsage());
 
     TrackExceptionState exceptionState;
     context2d()->getImageData(0, 0, 1, 1, exceptionState);
 
     EXPECT_FALSE(exceptionState.hadException());
     if (ExpensiveCanvasHeuristicParameters::GetImageDataForcesNoAcceleration) {
-        EXPECT_FALSE(bridge->isAccelerated());
+        EXPECT_FALSE(canvasElement().buffer()->isAccelerated());
         EXPECT_EQ(0u, getGlobalAcceleratedImageBufferCount());
         EXPECT_EQ(0, getGlobalGPUMemoryUsage());
     } else {
-        EXPECT_TRUE(bridge->isAccelerated());
+        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, IsAccelerationOptimalForCanvasContentHeuristic)
 {
@@ skipping 41 matching lines @@
     EXPECT_FALSE(canvasElement().buffer()->isAccelerated());
 
     context->fillRect(10, 10, 100, 100);
 
     EXPECT_EQ(0, getCurrentGPUMemoryUsage());
     EXPECT_EQ(0, getGlobalGPUMemoryUsage());
     EXPECT_EQ(0u, getGlobalAcceleratedImageBufferCount());
 }
 
 } // namespace blink