Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (125094 => 125095)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-08-08 21:56:24 UTC (rev 125094)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-08-08 21:57:53 UTC (rev 125095)
@@ -1,3 +1,29 @@
+2012-08-08 James Robinson <jam...@chromium.org>
+
+ [chromium] Clean up includes in compositor unit tests
+ https://bugs.webkit.org/show_bug.cgi?id=93531
+
+ Reviewed by Adrienne Walker.
+
+ This removes unused includes and updates Platform API headers to use the <public/Web...> style paths.
+
+ * tests/CCAnimationTestCommon.cpp:
+ * tests/CCKeyframedAnimationCurveTest.cpp:
+ * tests/CCLayerAnimationControllerTest.cpp:
+ * tests/CCLayerTreeHostCommonTest.cpp:
+ * tests/CCLayerTreeHostTest.cpp:
+ (WTF::CCLayerTreeHostTestLayerAddedWithAnimation::beginTest):
+ * tests/CCOcclusionTrackerTest.cpp:
+ * tests/CCTextureUpdateControllerTest.cpp:
+ * tests/CCThreadedTest.cpp:
+ * tests/FakeWebGraphicsContext3D.h:
+ * tests/LayerChromiumTest.cpp:
+ * tests/LayerRendererChromiumTest.cpp:
+ * tests/TiledLayerChromiumTest.cpp:
+ * tests/WebCompositorInputHandlerImplTest.cpp:
+ * tests/WebLayerTest.cpp:
+ * tests/WebLayerTreeViewTest.cpp:
+
2012-08-07 James Robinson <jam...@chromium.org>
[chromium] Only use public Platform API in NonCompositedContentHost
Modified: trunk/Source/WebKit/chromium/tests/CCAnimationTestCommon.cpp (125094 => 125095)
--- trunk/Source/WebKit/chromium/tests/CCAnimationTestCommon.cpp 2012-08-08 21:56:24 UTC (rev 125094)
+++ trunk/Source/WebKit/chromium/tests/CCAnimationTestCommon.cpp 2012-08-08 21:57:53 UTC (rev 125095)
@@ -26,9 +26,7 @@
#include "CCAnimationTestCommon.h"
-#include "GraphicsLayer.h"
#include "LayerChromium.h"
-#include "TranslateTransformOperation.h"
#include "cc/CCKeyframedAnimationCurve.h"
#include "cc/CCLayerAnimationController.h"
#include "cc/CCLayerImpl.h"
Modified: trunk/Source/WebKit/chromium/tests/CCKeyframedAnimationCurveTest.cpp (125094 => 125095)
--- trunk/Source/WebKit/chromium/tests/CCKeyframedAnimationCurveTest.cpp 2012-08-08 21:56:24 UTC (rev 125094)
+++ trunk/Source/WebKit/chromium/tests/CCKeyframedAnimationCurveTest.cpp 2012-08-08 21:57:53 UTC (rev 125095)
@@ -26,9 +26,6 @@
#include "cc/CCKeyframedAnimationCurve.h"
-#include "Length.h"
-#include "TranslateTransformOperation.h"
-
#include <gmock/gmock.h>
#include <gtest/gtest.h>
#include <public/WebTransformOperations.h>
Modified: trunk/Source/WebKit/chromium/tests/CCLayerAnimationControllerTest.cpp (125094 => 125095)
--- trunk/Source/WebKit/chromium/tests/CCLayerAnimationControllerTest.cpp 2012-08-08 21:56:24 UTC (rev 125094)
+++ trunk/Source/WebKit/chromium/tests/CCLayerAnimationControllerTest.cpp 2012-08-08 21:57:53 UTC (rev 125095)
@@ -27,8 +27,6 @@
#include "cc/CCLayerAnimationController.h"
#include "CCAnimationTestCommon.h"
-#include "GraphicsLayer.h"
-#include "Length.h"
#include "cc/CCActiveAnimation.h"
#include "cc/CCAnimationCurve.h"
Modified: trunk/Source/WebKit/chromium/tests/CCLayerTreeHostCommonTest.cpp (125094 => 125095)
--- trunk/Source/WebKit/chromium/tests/CCLayerTreeHostCommonTest.cpp 2012-08-08 21:56:24 UTC (rev 125094)
+++ trunk/Source/WebKit/chromium/tests/CCLayerTreeHostCommonTest.cpp 2012-08-08 21:57:53 UTC (rev 125095)
@@ -30,7 +30,6 @@
#include "CCLayerTreeTestCommon.h"
#include "ContentLayerChromium.h"
#include "LayerChromium.h"
-#include "TranslateTransformOperation.h"
#include "cc/CCLayerAnimationController.h"
#include "cc/CCLayerImpl.h"
#include "cc/CCLayerSorter.h"
Modified: trunk/Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp (125094 => 125095)
--- trunk/Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp 2012-08-08 21:56:24 UTC (rev 125094)
+++ trunk/Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp 2012-08-08 21:57:53 UTC (rev 125095)
@@ -26,20 +26,18 @@
#include "cc/CCLayerTreeHost.h"
-#include "AnimationIdVendor.h"
#include "CCOcclusionTrackerTestCommon.h"
#include "CCThreadedTest.h"
#include "ContentLayerChromium.h"
-#include "GraphicsContext3DPrivate.h"
#include "cc/CCGraphicsContext.h"
#include "cc/CCLayerTreeHostImpl.h"
#include "cc/CCSettings.h"
#include "cc/CCTextureUpdateQueue.h"
#include "cc/CCTimingFunction.h"
-#include "platform/WebThread.h"
#include <gmock/gmock.h>
#include <gtest/gtest.h>
#include <public/Platform.h>
+#include <public/WebThread.h>
#include <wtf/MainThread.h>
#include <wtf/OwnArrayPtr.h>
@@ -2140,7 +2138,7 @@
// Any valid CCAnimationCurve will do here.
OwnPtr<CCAnimationCurve> curve(CCEaseTimingFunction::create());
- OwnPtr<CCActiveAnimation> animation(CCActiveAnimation::create(curve.release(), AnimationIdVendor::getNextAnimationId(), AnimationIdVendor::getNextGroupId(), CCActiveAnimation::Opacity));
+ OwnPtr<CCActiveAnimation> animation(CCActiveAnimation::create(curve.release(), 1, 1, CCActiveAnimation::Opacity));
layer->layerAnimationController()->addAnimation(animation.release());
// We add the animation *before* attaching the layer to the tree.
Modified: trunk/Source/WebKit/chromium/tests/CCOcclusionTrackerTest.cpp (125094 => 125095)
--- trunk/Source/WebKit/chromium/tests/CCOcclusionTrackerTest.cpp 2012-08-08 21:56:24 UTC (rev 125094)
+++ trunk/Source/WebKit/chromium/tests/CCOcclusionTrackerTest.cpp 2012-08-08 21:57:53 UTC (rev 125095)
@@ -31,7 +31,6 @@
#include "CCOcclusionTrackerTestCommon.h"
#include "LayerChromium.h"
#include "Region.h"
-#include "TranslateTransformOperation.h"
#include "cc/CCLayerAnimationController.h"
#include "cc/CCLayerImpl.h"
#include "cc/CCLayerTreeHostCommon.h"
Modified: trunk/Source/WebKit/chromium/tests/CCTextureUpdateControllerTest.cpp (125094 => 125095)
--- trunk/Source/WebKit/chromium/tests/CCTextureUpdateControllerTest.cpp 2012-08-08 21:56:24 UTC (rev 125094)
+++ trunk/Source/WebKit/chromium/tests/CCTextureUpdateControllerTest.cpp 2012-08-08 21:57:53 UTC (rev 125095)
@@ -29,10 +29,9 @@
#include "CCSchedulerTestCommon.h"
#include "CCTiledLayerTestCommon.h"
#include "FakeWebGraphicsContext3D.h"
-#include "GraphicsContext3DPrivate.h"
-#include "WebCompositor.h"
#include "cc/CCSingleThreadProxy.h" // For DebugScopedSetImplThread
-#include "platform/WebThread.h"
+#include <public/WebCompositor.h>
+#include <public/WebThread.h>
#include <gtest/gtest.h>
#include <wtf/RefPtr.h>
Modified: trunk/Source/WebKit/chromium/tests/CCThreadedTest.cpp (125094 => 125095)
--- trunk/Source/WebKit/chromium/tests/CCThreadedTest.cpp 2012-08-08 21:56:24 UTC (rev 125094)
+++ trunk/Source/WebKit/chromium/tests/CCThreadedTest.cpp 2012-08-08 21:57:53 UTC (rev 125095)
@@ -26,16 +26,12 @@
#include "CCThreadedTest.h"
-#include "AnimationIdVendor.h"
#include "CCAnimationTestCommon.h"
#include "CCOcclusionTrackerTestCommon.h"
#include "CCTiledLayerTestCommon.h"
#include "ContentLayerChromium.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/CCLayerImpl.h"
@@ -45,11 +41,12 @@
#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>
Modified: trunk/Source/WebKit/chromium/tests/FakeWebGraphicsContext3D.h (125094 => 125095)
--- trunk/Source/WebKit/chromium/tests/FakeWebGraphicsContext3D.h 2012-08-08 21:56:24 UTC (rev 125094)
+++ trunk/Source/WebKit/chromium/tests/FakeWebGraphicsContext3D.h 2012-08-08 21:57:53 UTC (rev 125095)
@@ -27,7 +27,7 @@
#define FakeWebGraphicsContext3D_h
#include "GraphicsContext3D.h"
-#include "platform/WebGraphicsContext3D.h"
+#include <public/WebGraphicsContext3D.h>
namespace WebKit {
Modified: trunk/Source/WebKit/chromium/tests/LayerChromiumTest.cpp (125094 => 125095)
--- trunk/Source/WebKit/chromium/tests/LayerChromiumTest.cpp 2012-08-08 21:56:24 UTC (rev 125094)
+++ trunk/Source/WebKit/chromium/tests/LayerChromiumTest.cpp 2012-08-08 21:57:53 UTC (rev 125095)
@@ -29,13 +29,12 @@
#include "CCLayerTreeTestCommon.h"
#include "FakeCCLayerTreeHostClient.h"
#include "LayerPainterChromium.h"
-#include "NonCompositedContentHost.h"
-#include "WebCompositor.h"
#include "cc/CCLayerImpl.h"
#include "cc/CCLayerTreeHost.h"
#include "cc/CCSingleThreadProxy.h"
#include <gmock/gmock.h>
#include <gtest/gtest.h>
+#include <public/WebCompositor.h>
#include <public/WebTransformationMatrix.h>
using namespace WebCore;
Modified: trunk/Source/WebKit/chromium/tests/LayerRendererChromiumTest.cpp (125094 => 125095)
--- trunk/Source/WebKit/chromium/tests/LayerRendererChromiumTest.cpp 2012-08-08 21:56:24 UTC (rev 125094)
+++ trunk/Source/WebKit/chromium/tests/LayerRendererChromiumTest.cpp 2012-08-08 21:57:53 UTC (rev 125095)
@@ -28,11 +28,11 @@
#include "CCTestCommon.h"
#include "FakeWebGraphicsContext3D.h"
#include "GraphicsContext3D.h"
-#include "WebCompositor.h"
#include "cc/CCDrawQuad.h"
#include "cc/CCPrioritizedTextureManager.h"
#include "cc/CCSettings.h"
#include "cc/CCSingleThreadProxy.h"
+#include <public/WebCompositor.h>
#include <gmock/gmock.h>
#include <gtest/gtest.h>
Modified: trunk/Source/WebKit/chromium/tests/TiledLayerChromiumTest.cpp (125094 => 125095)
--- trunk/Source/WebKit/chromium/tests/TiledLayerChromiumTest.cpp 2012-08-08 21:56:24 UTC (rev 125094)
+++ trunk/Source/WebKit/chromium/tests/TiledLayerChromiumTest.cpp 2012-08-08 21:57:53 UTC (rev 125095)
@@ -33,12 +33,12 @@
#include "FakeCCGraphicsContext.h"
#include "FakeCCLayerTreeHostClient.h"
#include "LayerPainterChromium.h"
-#include "WebCompositor.h"
#include "cc/CCOverdrawMetrics.h"
#include "cc/CCRenderingStats.h"
#include "cc/CCSingleThreadProxy.h" // For DebugScopedSetImplThread
#include "cc/CCTextureUpdateController.h"
#include <gtest/gtest.h>
+#include <public/WebCompositor.h>
#include <public/WebTransformationMatrix.h>
using namespace WebCore;
Modified: trunk/Source/WebKit/chromium/tests/WebCompositorInputHandlerImplTest.cpp (125094 => 125095)
--- trunk/Source/WebKit/chromium/tests/WebCompositorInputHandlerImplTest.cpp 2012-08-08 21:56:24 UTC (rev 125094)
+++ trunk/Source/WebKit/chromium/tests/WebCompositorInputHandlerImplTest.cpp 2012-08-08 21:57:53 UTC (rev 125095)
@@ -27,14 +27,14 @@
#include "WebCompositorInputHandlerImpl.h"
-#include "WebCompositor.h"
#include "WebCompositorInputHandlerClient.h"
#include "WebInputEvent.h"
#include "cc/CCActiveGestureAnimation.h"
#include "cc/CCInputHandler.h"
#include "cc/CCSingleThreadProxy.h"
-#include "platform/WebFloatPoint.h"
-#include "platform/WebPoint.h"
+#include <public/WebCompositor.h>
+#include <public/WebFloatPoint.h>
+#include <public/WebPoint.h>
#include <gmock/gmock.h>
#include <gtest/gtest.h>
Modified: trunk/Source/WebKit/chromium/tests/WebLayerTest.cpp (125094 => 125095)
--- trunk/Source/WebKit/chromium/tests/WebLayerTest.cpp 2012-08-08 21:56:24 UTC (rev 125094)
+++ trunk/Source/WebKit/chromium/tests/WebLayerTest.cpp 2012-08-08 21:57:53 UTC (rev 125095)
@@ -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>
Modified: trunk/Source/WebKit/chromium/tests/WebLayerTreeViewTest.cpp (125094 => 125095)
--- trunk/Source/WebKit/chromium/tests/WebLayerTreeViewTest.cpp 2012-08-08 21:56:24 UTC (rev 125094)
+++ trunk/Source/WebKit/chromium/tests/WebLayerTreeViewTest.cpp 2012-08-08 21:57:53 UTC (rev 125095)
@@ -24,15 +24,15 @@
#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 <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;
