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/CCThreadedTest.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/CCThreadedTest.cpp')
| -rw-r--r-- | Source/WebKit/chromium/tests/CCThreadedTest.cpp | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/Source/WebKit/chromium/tests/CCThreadedTest.cpp b/Source/WebKit/chromium/tests/CCThreadedTest.cpp index 2e2c1a06f..89ff9cba3 100644 --- a/Source/WebKit/chromium/tests/CCThreadedTest.cpp +++ b/Source/WebKit/chromium/tests/CCThreadedTest.cpp @@ -26,31 +26,28 @@ #include "CCThreadedTest.h" -#include "AnimationIdVendor.h" #include "CCAnimationTestCommon.h" #include "CCOcclusionTrackerTestCommon.h" #include "CCTiledLayerTestCommon.h" #include "ContentLayerChromium.h" +#include "FakeWebCompositorOutputSurface.h" #include "FakeWebGraphicsContext3D.h" -#include "GraphicsContext3DPrivate.h" #include "LayerChromium.h" -#include "WebCompositor.h" -#include "WebKit.h" #include "cc/CCActiveAnimation.h" #include "cc/CCLayerAnimationController.h" -#include "cc/CCLayerAnimationDelegate.h" #include "cc/CCLayerImpl.h" #include "cc/CCLayerTreeHostImpl.h" #include "cc/CCScopedThreadProxy.h" #include "cc/CCSingleThreadProxy.h" -#include "cc/CCTextureUpdater.h" +#include "cc/CCTextureUpdateQueue.h" #include "cc/CCThreadTask.h" #include "cc/CCTimingFunction.h" -#include "platform/WebThread.h" #include <gmock/gmock.h> #include <public/Platform.h> +#include <public/WebCompositor.h> #include <public/WebFilterOperation.h> #include <public/WebFilterOperations.h> +#include <public/WebThread.h> #include <wtf/Locker.h> #include <wtf/MainThread.h> #include <wtf/PassRefPtr.h> @@ -102,9 +99,9 @@ CompositorFakeWebGraphicsContext3DWithTextureTracking::CompositorFakeWebGraphics { } -PassOwnPtr<WebGraphicsContext3D> TestHooks::createContext() +PassOwnPtr<WebCompositorOutputSurface> TestHooks::createOutputSurface() { - return CompositorFakeWebGraphicsContext3DWithTextureTracking::create(WebGraphicsContext3D::Attributes()); + return FakeWebCompositorOutputSurface::create(CompositorFakeWebGraphicsContext3DWithTextureTracking::create(WebGraphicsContext3D::Attributes())); } PassOwnPtr<MockLayerTreeHostImpl> MockLayerTreeHostImpl::create(TestHooks* testHooks, const CCLayerTreeSettings& settings, CCLayerTreeHostImplClient* client) @@ -167,7 +164,7 @@ public: layerTreeHost->setRootLayer(rootLayer); // LayerTreeHostImpl won't draw if it has 1x1 viewport. - layerTreeHost->setViewportSize(IntSize(1, 1)); + layerTreeHost->setViewportSize(IntSize(1, 1), IntSize(1, 1)); layerTreeHost->rootLayer()->setLayerAnimationDelegate(testHooks); @@ -226,9 +223,9 @@ public: m_testHooks->applyScrollAndScale(scrollDelta, scale); } - virtual PassOwnPtr<WebGraphicsContext3D> createContext3D() OVERRIDE + virtual PassOwnPtr<WebCompositorOutputSurface> createOutputSurface() OVERRIDE { - return m_testHooks->createContext(); + return m_testHooks->createOutputSurface(); } virtual void willCommit() OVERRIDE @@ -249,9 +246,9 @@ public: { } - virtual void didRecreateContext(bool succeeded) OVERRIDE + virtual void didRecreateOutputSurface(bool succeeded) OVERRIDE { - m_testHooks->didRecreateContext(succeeded); + m_testHooks->didRecreateOutputSurface(succeeded); } virtual void scheduleComposite() OVERRIDE |