diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-12 09:27:39 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-12 09:27:39 +0200 |
| commit | 3749d61e1f7a59f5ec5067e560af1eb610c82015 (patch) | |
| tree | 73dc228333948738bbe02976cacca8cd382bc978 /Source/WebKit/chromium/tests/WebLayerTest.cpp | |
| parent | b32b4dcd9a51ab8de6afc53d9e17f8707e1f7a5e (diff) | |
| download | qtwebkit-3749d61e1f7a59f5ec5067e560af1eb610c82015.tar.gz | |
Imported WebKit commit a77350243e054f3460d1137301d8b3faee3d2052 (http://svn.webkit.org/repository/webkit/trunk@125365)
New snapshot with build fixes for latest API changes in Qt and all WK1 Win MSVC fixes upstream
Diffstat (limited to 'Source/WebKit/chromium/tests/WebLayerTest.cpp')
| -rw-r--r-- | Source/WebKit/chromium/tests/WebLayerTest.cpp | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/Source/WebKit/chromium/tests/WebLayerTest.cpp b/Source/WebKit/chromium/tests/WebLayerTest.cpp index 12deb5991..5381173ef 100644 --- a/Source/WebKit/chromium/tests/WebLayerTest.cpp +++ b/Source/WebKit/chromium/tests/WebLayerTest.cpp @@ -23,19 +23,19 @@ */ #include "config.h" -#include "platform/WebLayer.h" +#include <public/WebLayer.h> #include "CompositorFakeWebGraphicsContext3D.h" -#include "WebCompositor.h" -#include "platform/WebContentLayer.h" -#include "platform/WebContentLayerClient.h" -#include "platform/WebExternalTextureLayer.h" -#include "platform/WebFloatPoint.h" -#include "platform/WebFloatRect.h" -#include "platform/WebLayerTreeView.h" -#include "platform/WebLayerTreeViewClient.h" -#include "platform/WebRect.h" -#include "platform/WebSize.h" +#include <public/WebCompositor.h> +#include <public/WebContentLayer.h> +#include <public/WebContentLayerClient.h> +#include <public/WebExternalTextureLayer.h> +#include <public/WebFloatPoint.h> +#include <public/WebFloatRect.h> +#include <public/WebLayerTreeView.h> +#include <public/WebLayerTreeViewClient.h> +#include <public/WebRect.h> +#include <public/WebSize.h> #include <gmock/gmock.h> @@ -58,6 +58,8 @@ public: virtual void applyScrollAndScale(const WebSize& scrollDelta, float scaleFactor) { } virtual WebGraphicsContext3D* createContext3D() { return CompositorFakeWebGraphicsContext3D::create(WebGraphicsContext3D::Attributes()).leakPtr(); } virtual void didRebindGraphicsContext(bool success) { } + virtual WebCompositorOutputSurface* createOutputSurface() { return 0; } + virtual void didRecreateOutputSurface(bool success) { } virtual void willCommit() { } virtual void didCommitAndDrawFrame() { } virtual void didCompleteSwapBuffers() { } |