diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-21 10:57:44 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-21 10:57:44 +0200 |
commit | 5ef7c8a6a70875d4430752d146bdcb069605d71d (patch) | |
tree | f6256640b6c46d7da221435803cae65326817ba2 /Source/WebKit/chromium/tests/CCThreadedTest.cpp | |
parent | decad929f578d8db641febc8740649ca6c574638 (diff) | |
download | qtwebkit-5ef7c8a6a70875d4430752d146bdcb069605d71d.tar.gz |
Imported WebKit commit 356d83016b090995d08ad568f2d2c243aa55e831 (http://svn.webkit.org/repository/webkit/trunk@126147)
New snapshot including various build fixes for newer Qt 5
Diffstat (limited to 'Source/WebKit/chromium/tests/CCThreadedTest.cpp')
-rw-r--r-- | Source/WebKit/chromium/tests/CCThreadedTest.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Source/WebKit/chromium/tests/CCThreadedTest.cpp b/Source/WebKit/chromium/tests/CCThreadedTest.cpp index 89ff9cba3..cde88f8e6 100644 --- a/Source/WebKit/chromium/tests/CCThreadedTest.cpp +++ b/Source/WebKit/chromium/tests/CCThreadedTest.cpp @@ -26,22 +26,22 @@ #include "CCThreadedTest.h" +#include "CCActiveAnimation.h" #include "CCAnimationTestCommon.h" +#include "CCLayerAnimationController.h" +#include "CCLayerImpl.h" +#include "CCLayerTreeHostImpl.h" #include "CCOcclusionTrackerTestCommon.h" +#include "CCScopedThreadProxy.h" +#include "CCSingleThreadProxy.h" +#include "CCTextureUpdateQueue.h" +#include "CCThreadTask.h" #include "CCTiledLayerTestCommon.h" +#include "CCTimingFunction.h" #include "ContentLayerChromium.h" #include "FakeWebCompositorOutputSurface.h" #include "FakeWebGraphicsContext3D.h" #include "LayerChromium.h" -#include "cc/CCActiveAnimation.h" -#include "cc/CCLayerAnimationController.h" -#include "cc/CCLayerImpl.h" -#include "cc/CCLayerTreeHostImpl.h" -#include "cc/CCScopedThreadProxy.h" -#include "cc/CCSingleThreadProxy.h" -#include "cc/CCTextureUpdateQueue.h" -#include "cc/CCThreadTask.h" -#include "cc/CCTimingFunction.h" #include <gmock/gmock.h> #include <public/Platform.h> #include <public/WebCompositor.h> |