diff options
Diffstat (limited to 'Source/WebKit/chromium/tests/WebLayerTreeViewTest.cpp')
| -rw-r--r-- | Source/WebKit/chromium/tests/WebLayerTreeViewTest.cpp | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/Source/WebKit/chromium/tests/WebLayerTreeViewTest.cpp b/Source/WebKit/chromium/tests/WebLayerTreeViewTest.cpp index 2df259f76..4f0330035 100644 --- a/Source/WebKit/chromium/tests/WebLayerTreeViewTest.cpp +++ b/Source/WebKit/chromium/tests/WebLayerTreeViewTest.cpp @@ -24,15 +24,16 @@ #include "config.h" -#include "platform/WebLayerTreeView.h" +#include <public/WebLayerTreeView.h> #include "CompositorFakeWebGraphicsContext3D.h" -#include "WebCompositor.h" -#include "public/WebLayer.h" -#include "public/WebLayerTreeViewClient.h" -#include "public/WebThread.h" +#include "FakeWebCompositorOutputSurface.h" #include <gmock/gmock.h> #include <public/Platform.h> +#include <public/WebCompositor.h> +#include <public/WebLayer.h> +#include <public/WebLayerTreeViewClient.h> +#include <public/WebThread.h> using namespace WebKit; using testing::Mock; @@ -48,8 +49,13 @@ public: MOCK_METHOD0(didBeginFrame, void()); virtual void layout() OVERRIDE { } virtual void applyScrollAndScale(const WebSize& scrollDelta, float scaleFactor) OVERRIDE { } - virtual WebGraphicsContext3D* createContext3D() OVERRIDE { return CompositorFakeWebGraphicsContext3D::create(WebGraphicsContext3D::Attributes()).leakPtr(); } - virtual void didRebindGraphicsContext(bool success) OVERRIDE { } + + virtual WebCompositorOutputSurface* createOutputSurface() OVERRIDE + { + return FakeWebCompositorOutputSurface::create(CompositorFakeWebGraphicsContext3D::create(WebGraphicsContext3D::Attributes())).leakPtr(); + } + virtual void didRecreateOutputSurface(bool) OVERRIDE { } + MOCK_METHOD0(willCommit, void()); MOCK_METHOD0(didCommit, void()); virtual void didCommitAndDrawFrame() OVERRIDE { } |