Refactoring Canvas2DLayerBridge to make it easier to write unit tests

Source/core/platform/graphics/chromium/Canvas2DLayerBridgeTestHelper.h

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 10 matching lines @@
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "config.h"
+#ifndef Canvas2DLayerBridgeTestHelper_h
+#define Canvas2DLayerBridgeTestHelper_h
 
-#include "core/platform/graphics/gpu/DrawingBuffer.h"
-
+#include "SkSurface.h"
 #include "core/platform/graphics/GraphicsContext3D.h"
+#include "core/platform/graphics/chromium/Canvas2DLayerBridge.h"
 #include "core/tests/FakeWebGraphicsContext3D.h"
-#include "public/platform/Platform.h"
-#include "wtf/RefPtr.h"
 
 #include <gmock/gmock.h>
-#include <gtest/gtest.h>
 
-using namespace WebCore;
-using namespace WebKit;
-using testing::Test;
-using testing::_;
+class MockCanvasContext : public WebKit::FakeWebGraphicsContext3D {
+public:
+    MOCK_METHOD0(flush, void(void));
 
-namespace {
-
-class FakeContextEvictionManager : public ContextEvictionManager {
-public:
-    void forciblyLoseOldestContext(const String& reason) { }
-    IntSize oldestContextSize() { return IntSize(); }
+    virtual GrGLInterface* onCreateGrGLInterface() OVERRIDE { return 0; }
 };
 
-} // namespace
+class Canvas2DLayerBridgeTestHelper : public WebCore::Canvas2DLayerBridge::Helper {
+public:
+    Canvas2DLayerBridgeTestHelper() : m_context(WebCore::GraphicsContext3D::createGraphicsContextFromWebContext(adoptPtr(new MockCanvasContext)))
+    { }
 
-class DrawingBufferTest : public Test {
-protected:
-    virtual void SetUp()
+    virtual WTF::PassRefPtr<WebCore::GraphicsContext3D> getContext() OVERRIDE

[jamesr, 2013/08/05 22:56:36]

You don't need WTF:: here (you basically never do, all the WTF headers for
common types have using statements that pull symbols into the global namespace)

     {
-        RefPtr<FakeContextEvictionManager> contextEvictionManager = adoptRef(new FakeContextEvictionManager());
-        RefPtr<GraphicsContext3D> context = GraphicsContext3D::createGraphicsContextFromWebContext(adoptPtr(new FakeWebGraphicsContext3D));
-        const IntSize size(100, 100);
-        m_drawingBuffer = DrawingBuffer::create(context.get(), size, DrawingBuffer::Discard, contextEvictionManager.release());
+        return m_context;
     }
 
-    RefPtr<DrawingBuffer> m_drawingBuffer;
+    virtual SkSurface* createSurface(WebCore::GraphicsContext3D* context3D, const WebCore::IntSize& size) OVERRIDE
+    {
+        SkImage::Info info;
+        info.fWidth = size.width();
+        info.fHeight = size.height();
+        info.fColorType = SkImage::kPMColor_ColorType;
+        info.fAlphaType = SkImage::kPremul_AlphaType;
+        return SkSurface::NewRaster(info);
+    }
+
+    void regenerateContext()
+    {
+        m_context = WebCore::GraphicsContext3D::createGraphicsContextFromWebContext(adoptPtr(new MockCanvasContext));
+    }
+
+    MockCanvasContext& mock()
+    {
+        return *static_cast<MockCanvasContext*>(m_context->webContext());
+    }
+
+private:
+    RefPtr<WebCore::GraphicsContext3D> m_context;
 };
 
-namespace {
-
-TEST_F(DrawingBufferTest, verifyNoNewBuffersAfterContextLostWithMailboxes)
-{
-    // Tell the buffer its contents changed and context was lost.
-    m_drawingBuffer->markContentsChanged();
-    m_drawingBuffer->releaseResources();
-
-    WebKit::WebExternalTextureMailbox mailbox;
-    EXPECT_FALSE(m_drawingBuffer->prepareMailbox(&mailbox, 0));
-}
-
-} // namespace
+#endif