X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fthird_party%2FWebKit%2FSource%2Fweb%2Ftests%2FCanvas2DLayerBridgeTest.cpp;h=9d1b37cd55e68c0787697f6e0d1641e29e7eae1b;hb=ff3e2503a20db9193d323c1d19c38c68004dec4a;hp=341aa324b4af1e578c76864ff6c58c6c83e1d699;hpb=7338fba38ba696536d1cc9d389afd716a6ab2fe6;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/third_party/WebKit/Source/web/tests/Canvas2DLayerBridgeTest.cpp b/src/third_party/WebKit/Source/web/tests/Canvas2DLayerBridgeTest.cpp index 341aa32..9d1b37c 100644 --- a/src/third_party/WebKit/Source/web/tests/Canvas2DLayerBridgeTest.cpp +++ b/src/third_party/WebKit/Source/web/tests/Canvas2DLayerBridgeTest.cpp @@ -30,6 +30,7 @@ #include "SkSurface.h" #include "platform/graphics/ImageBuffer.h" #include "public/platform/Platform.h" +#include "public/platform/WebGraphicsContext3DProvider.h" #include "public/platform/WebThread.h" #include "third_party/skia/include/core/SkDevice.h" #include "web/tests/MockWebGraphicsContext3D.h" @@ -53,6 +54,25 @@ public: MOCK_METHOD1(deleteTexture, void(unsigned)); }; +class MockWebGraphicsContext3DProvider : public WebGraphicsContext3DProvider { +public: + MockWebGraphicsContext3DProvider(WebGraphicsContext3D* context3d) + : m_context3d(context3d) { } + + WebGraphicsContext3D* context3d() + { + return m_context3d; + } + + GrContext* grContext() + { + return 0; + } + +private: + WebGraphicsContext3D* m_context3d; +}; + class Canvas2DLayerBridgePtr { public: Canvas2DLayerBridgePtr(PassRefPtr layerBridge) @@ -77,14 +97,13 @@ protected: void fullLifecycleTest() { MockCanvasContext mainMock; - RefPtr mainContext = GraphicsContext3D::createContextSupport(&mainMock); - + OwnPtr mainMockProvider = adoptPtr(new MockWebGraphicsContext3DProvider(&mainMock)); OwnPtr canvas = adoptPtr(SkDeferredCanvas::Create(SkSurface::NewRasterPMColor(300, 150))); ::testing::Mock::VerifyAndClearExpectations(&mainMock); { - Canvas2DLayerBridgePtr bridge(adoptRef(new Canvas2DLayerBridge(mainContext.release(), canvas.release(), 0, NonOpaque))); + Canvas2DLayerBridgePtr bridge(adoptRef(new Canvas2DLayerBridge(mainMockProvider.release(), canvas.release(), 0, NonOpaque))); ::testing::Mock::VerifyAndClearExpectations(&mainMock);