Reland: Make 2D canvas disable gpu acceleration when getImageData is called

third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridgeTest.cpp

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 f30fd8ade08bdd3c9d3cf414c1d2ef29d9afea54..26caab848749971d9438ef78aae609d62579946f 100644
--- a/third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridgeTest.cpp
+++ b/third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridgeTest.cpp
@@ -32,9 +32,9 @@
 #include "platform/graphics/ImageBuffer.h"
 #include "platform/graphics/UnacceleratedImageBufferSurface.h"
 #include "platform/graphics/test/FakeGLES2Interface.h"
+#include "platform/graphics/test/FakeWebGraphicsContext3DProvider.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebExternalBitmap.h"
-#include "public/platform/WebGraphicsContext3DProvider.h"
 #include "public/platform/WebScheduler.h"
 #include "public/platform/WebTaskRunner.h"
 #include "public/platform/WebThread.h"
@@ -44,8 +44,6 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkCanvas.h"
-#include "third_party/skia/include/gpu/GrContext.h"
-#include "third_party/skia/include/gpu/gl/GrGLInterface.h"
 #include "third_party/skia/include/gpu/gl/GrGLTypes.h"
 #include "wtf/PtrUtil.h"
 #include "wtf/RefPtr.h"
@@ -62,40 +60,6 @@ namespace blink {
 
 namespace {
 
-class FakeWebGraphicsContext3DProvider : public WebGraphicsContext3DProvider {
-public:
-    FakeWebGraphicsContext3DProvider(gpu::gles2::GLES2Interface* gl)
-        : m_gl(gl)
-    {
-        RefPtr<const GrGLInterface> glInterface = adoptRef(GrGLCreateNullInterface());
-        m_grContext = adoptRef(GrContext::Create(kOpenGL_GrBackend, reinterpret_cast<GrBackendContext>(glInterface.get())));
-    }
-
-    GrContext* grContext() override
-    {
-        return m_grContext.get();
-    }
-
-    gpu::Capabilities getCapabilities()
-    {
-        return gpu::Capabilities();
-    }
-
-    gpu::gles2::GLES2Interface* contextGL() override
-    {
-        return m_gl;
-    }
-
-    bool bindToCurrentThread() override { return false; }
-
-    void setLostContextCallback(WebClosure) override {}
-    void setErrorMessageCallback(WebFunction<void(const char*, int32_t id)>) {}
-
-private:
-    gpu::gles2::GLES2Interface* m_gl;
-    RefPtr<GrContext> m_grContext;
-};
-
 class Canvas2DLayerBridgePtr {
 public:
     Canvas2DLayerBridgePtr() { }
@@ -1100,5 +1064,4 @@ TEST_F(Canvas2DLayerBridgeTest, DISABLED_PrepareMailboxWhileBackgroundRendering)
     postAndWaitDestroyBridgeTask(BLINK_FROM_HERE, testThread.get(), &bridge);
 }
 
-
 } // namespace blink