[chromium] Add Source/WebCore/platform/graphics/chromium/cc/ to include path and...
authorjamesr@google.com <jamesr@google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 17 Aug 2012 20:58:46 +0000 (20:58 +0000)
committerjamesr@google.com <jamesr@google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 17 Aug 2012 20:58:46 +0000 (20:58 +0000)
https://bugs.webkit.org/show_bug.cgi?id=94279

Reviewed by Adam Barth.

Source/WebCore:

This brings us more in line with the rest of the WebKit repo and avoids potential header collisions during
transition.

* WebCore.gyp/WebCore.gyp:
* platform/chromium/support/CCThreadImpl.cpp:
* platform/chromium/support/CCThreadImpl.h:
* platform/chromium/support/WebCompositorImpl.cpp:
* platform/graphics/chromium/BitmapSkPictureCanvasLayerTextureUpdater.cpp:
* platform/graphics/chromium/CanvasLayerTextureUpdater.cpp:
* platform/graphics/chromium/ContentLayerChromium.cpp:
* platform/graphics/chromium/FrameBufferSkPictureCanvasLayerTextureUpdater.cpp:
* platform/graphics/chromium/HeadsUpDisplayLayerChromium.cpp:
* platform/graphics/chromium/HeadsUpDisplayLayerChromium.h:
* platform/graphics/chromium/IOSurfaceLayerChromium.cpp:
* platform/graphics/chromium/ImageLayerChromium.cpp:
* platform/graphics/chromium/LayerChromium.cpp:
* platform/graphics/chromium/LayerChromium.h:
* platform/graphics/chromium/LayerRendererChromium.cpp:
* platform/graphics/chromium/LayerRendererChromium.h:
* platform/graphics/chromium/LayerTextureUpdater.h:
* platform/graphics/chromium/LinkHighlight.cpp:
* platform/graphics/chromium/RateLimiter.cpp:
* platform/graphics/chromium/RenderSurfaceChromium.cpp:
* platform/graphics/chromium/ScrollbarLayerChromium.cpp:
* platform/graphics/chromium/SolidColorLayerChromium.cpp:
* platform/graphics/chromium/TextureLayerChromium.cpp:
* platform/graphics/chromium/TiledLayerChromium.cpp:
* platform/graphics/chromium/TiledLayerChromium.h:
* platform/graphics/chromium/TreeSynchronizer.cpp:
* platform/graphics/chromium/VideoLayerChromium.cpp:
* platform/graphics/chromium/cc/CCActiveAnimation.cpp:
* platform/graphics/chromium/cc/CCActiveGestureAnimation.cpp:
* platform/graphics/chromium/cc/CCAnimationCurve.cpp:
* platform/graphics/chromium/cc/CCAnimationEvents.h:
* platform/graphics/chromium/cc/CCCheckerboardDrawQuad.cpp:
* platform/graphics/chromium/cc/CCCheckerboardDrawQuad.h:
* platform/graphics/chromium/cc/CCDamageTracker.cpp:
* platform/graphics/chromium/cc/CCDebugBorderDrawQuad.cpp:
* platform/graphics/chromium/cc/CCDebugBorderDrawQuad.h:
* platform/graphics/chromium/cc/CCDelayBasedTimeSource.cpp:
* platform/graphics/chromium/cc/CCDelayBasedTimeSource.h:
* platform/graphics/chromium/cc/CCDrawQuad.cpp:
* platform/graphics/chromium/cc/CCDrawQuad.h:
* platform/graphics/chromium/cc/CCFontAtlas.cpp:
* platform/graphics/chromium/cc/CCFrameRateController.cpp:
* platform/graphics/chromium/cc/CCFrameRateController.h:
* platform/graphics/chromium/cc/CCHeadsUpDisplayLayerImpl.cpp:
* platform/graphics/chromium/cc/CCHeadsUpDisplayLayerImpl.h:
* platform/graphics/chromium/cc/CCIOSurfaceDrawQuad.cpp:
* platform/graphics/chromium/cc/CCIOSurfaceDrawQuad.h:
* platform/graphics/chromium/cc/CCIOSurfaceLayerImpl.cpp:
* platform/graphics/chromium/cc/CCIOSurfaceLayerImpl.h:
* platform/graphics/chromium/cc/CCKeyframedAnimationCurve.cpp:
* platform/graphics/chromium/cc/CCKeyframedAnimationCurve.h:
* platform/graphics/chromium/cc/CCLayerAnimationController.cpp:
* platform/graphics/chromium/cc/CCLayerAnimationController.h:
* platform/graphics/chromium/cc/CCLayerImpl.cpp:
* platform/graphics/chromium/cc/CCLayerImpl.h:
* platform/graphics/chromium/cc/CCLayerIterator.cpp:
* platform/graphics/chromium/cc/CCLayerIterator.h:
* platform/graphics/chromium/cc/CCLayerQuad.cpp:
* platform/graphics/chromium/cc/CCLayerSorter.cpp:
* platform/graphics/chromium/cc/CCLayerSorter.h:
* platform/graphics/chromium/cc/CCLayerTilingData.cpp:
* platform/graphics/chromium/cc/CCLayerTreeHost.cpp:
* platform/graphics/chromium/cc/CCLayerTreeHost.h:
* platform/graphics/chromium/cc/CCLayerTreeHostCommon.cpp:
* platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp:
* platform/graphics/chromium/cc/CCLayerTreeHostImpl.h:
* platform/graphics/chromium/cc/CCMathUtil.cpp:
* platform/graphics/chromium/cc/CCOcclusionTracker.cpp:
* platform/graphics/chromium/cc/CCOcclusionTracker.h:
* platform/graphics/chromium/cc/CCOverdrawMetrics.cpp:
* platform/graphics/chromium/cc/CCPageScaleAnimation.cpp:
* platform/graphics/chromium/cc/CCPrioritizedTexture.h:
* platform/graphics/chromium/cc/CCProxy.cpp:
* platform/graphics/chromium/cc/CCQuadCuller.cpp:
* platform/graphics/chromium/cc/CCRenderPass.cpp:
* platform/graphics/chromium/cc/CCRenderPass.h:
* platform/graphics/chromium/cc/CCRenderPassDrawQuad.cpp:
* platform/graphics/chromium/cc/CCRenderPassDrawQuad.h:
* platform/graphics/chromium/cc/CCRenderSurface.cpp:
* platform/graphics/chromium/cc/CCRenderSurface.h:
* platform/graphics/chromium/cc/CCRenderSurfaceFilters.cpp:
* platform/graphics/chromium/cc/CCRenderer.h:
* platform/graphics/chromium/cc/CCResourceProvider.cpp:
* platform/graphics/chromium/cc/CCResourceProvider.h:
* platform/graphics/chromium/cc/CCScheduler.cpp:
* platform/graphics/chromium/cc/CCScheduler.h:
* platform/graphics/chromium/cc/CCSchedulerStateMachine.cpp:
* platform/graphics/chromium/cc/CCScopedTexture.cpp:
* platform/graphics/chromium/cc/CCScopedTexture.h:
* platform/graphics/chromium/cc/CCScopedThreadProxy.h:
* platform/graphics/chromium/cc/CCScrollbarAnimationController.cpp:
* platform/graphics/chromium/cc/CCScrollbarAnimationControllerLinearFade.cpp:
* platform/graphics/chromium/cc/CCScrollbarAnimationControllerLinearFade.h:
* platform/graphics/chromium/cc/CCScrollbarLayerImpl.cpp:
* platform/graphics/chromium/cc/CCScrollbarLayerImpl.h:
* platform/graphics/chromium/cc/CCSettings.cpp:
* platform/graphics/chromium/cc/CCSharedQuadState.cpp:
* platform/graphics/chromium/cc/CCSingleThreadProxy.cpp:
* platform/graphics/chromium/cc/CCSingleThreadProxy.h:
* platform/graphics/chromium/cc/CCSolidColorDrawQuad.cpp:
* platform/graphics/chromium/cc/CCSolidColorDrawQuad.h:
* platform/graphics/chromium/cc/CCSolidColorLayerImpl.cpp:
* platform/graphics/chromium/cc/CCSolidColorLayerImpl.h:
* platform/graphics/chromium/cc/CCStreamVideoDrawQuad.cpp:
* platform/graphics/chromium/cc/CCStreamVideoDrawQuad.h:
* platform/graphics/chromium/cc/CCTexture.cpp:
* platform/graphics/chromium/cc/CCTexture.h:
* platform/graphics/chromium/cc/CCTextureDrawQuad.cpp:
* platform/graphics/chromium/cc/CCTextureDrawQuad.h:
* platform/graphics/chromium/cc/CCTextureLayerImpl.cpp:
* platform/graphics/chromium/cc/CCTextureLayerImpl.h:
* platform/graphics/chromium/cc/CCTextureUpdateController.cpp:
* platform/graphics/chromium/cc/CCTextureUpdateController.h:
* platform/graphics/chromium/cc/CCTextureUpdateQueue.cpp:
* platform/graphics/chromium/cc/CCThreadProxy.cpp:
* platform/graphics/chromium/cc/CCThreadProxy.h:
* platform/graphics/chromium/cc/CCThreadTask.h:
* platform/graphics/chromium/cc/CCTileDrawQuad.cpp:
* platform/graphics/chromium/cc/CCTileDrawQuad.h:
* platform/graphics/chromium/cc/CCTiledLayerImpl.cpp:
* platform/graphics/chromium/cc/CCTiledLayerImpl.h:
* platform/graphics/chromium/cc/CCTimer.cpp:
* platform/graphics/chromium/cc/CCTimingFunction.cpp:
* platform/graphics/chromium/cc/CCTimingFunction.h:
* platform/graphics/chromium/cc/CCVideoLayerImpl.cpp:
* platform/graphics/chromium/cc/CCVideoLayerImpl.h:
* platform/graphics/chromium/cc/CCYUVVideoDrawQuad.cpp:
* platform/graphics/chromium/cc/CCYUVVideoDrawQuad.h:
* platform/graphics/gpu/SharedGraphicsContext3D.cpp:

Source/WebKit/chromium:

* src/WebAnimationCurveCommon.cpp:
* src/WebAnimationImpl.cpp:
* src/WebCompositorInputHandlerImpl.cpp:
* src/WebCompositorInputHandlerImpl.h:
* src/WebExternalTextureLayer.cpp:
* src/WebFloatAnimationCurve.cpp:
* src/WebLayerTreeView.cpp:
* src/WebLayerTreeViewImpl.cpp:
* src/WebTransformAnimationCurve.cpp:
* tests/CCActiveAnimationTest.cpp:
* tests/CCAnimationTestCommon.cpp:
* tests/CCAnimationTestCommon.h:
* tests/CCDamageTrackerTest.cpp:
* tests/CCDelayBasedTimeSourceTest.cpp:
* tests/CCFrameRateControllerTest.cpp:
* tests/CCKeyframedAnimationCurveTest.cpp:
* tests/CCLayerAnimationControllerTest.cpp:
* tests/CCLayerImplTest.cpp:
* tests/CCLayerIteratorTest.cpp:
* tests/CCLayerQuadTest.cpp:
* tests/CCLayerSorterTest.cpp:
* tests/CCLayerTestCommon.cpp:
* tests/CCLayerTestCommon.h:
* tests/CCLayerTreeHostCommonTest.cpp:
* tests/CCLayerTreeHostImplTest.cpp:
* tests/CCLayerTreeHostTest.cpp:
* tests/CCMathUtilTest.cpp:
* tests/CCOcclusionTrackerTest.cpp:
* tests/CCOcclusionTrackerTestCommon.h:
* tests/CCPrioritizedTextureTest.cpp:
* tests/CCQuadCullerTest.cpp:
* tests/CCRenderSurfaceFiltersTest.cpp:
* tests/CCRenderSurfaceTest.cpp:
* tests/CCResourceProviderTest.cpp:
* tests/CCSchedulerStateMachineTest.cpp:
* tests/CCSchedulerTest.cpp:
* tests/CCSchedulerTestCommon.h:
* tests/CCScopedTextureTest.cpp:
* tests/CCScrollbarAnimationControllerLinearFadeTest.cpp:
* tests/CCSolidColorLayerImplTest.cpp:
* tests/CCTestCommon.h:
* tests/CCTextureUpdateControllerTest.cpp:
* tests/CCThreadTaskTest.cpp:
* tests/CCThreadedTest.cpp:
* tests/CCThreadedTest.h:
* tests/CCTiledLayerImplTest.cpp:
* tests/CCTiledLayerTestCommon.h:
* tests/CCTimerTest.cpp:
* tests/ContentLayerChromiumTest.cpp:
* tests/FakeCCGraphicsContext.h:
* tests/FakeCCLayerTreeHostClient.h:
* tests/FloatQuadTest.cpp:
* tests/GraphicsLayerChromiumTest.cpp:
* tests/LayerChromiumTest.cpp:
* tests/LayerRendererChromiumTest.cpp:
* tests/MockCCQuadCuller.h:
* tests/PlatformGestureCurveTest.cpp:
* tests/ScrollbarLayerChromiumTest.cpp:
* tests/TextureLayerChromiumTest.cpp:
* tests/TiledLayerChromiumTest.cpp:
* tests/TreeSynchronizerTest.cpp:
* tests/WebCompositorInputHandlerImplTest.cpp:
* tests/WebFloatAnimationCurveTest.cpp:
* tests/WebTransformAnimationCurveTest.cpp:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@125932 268f45cc-cd09-0410-ab3c-d52691b4dbfc

195 files changed:
Source/WebCore/ChangeLog
Source/WebCore/WebCore.gyp/WebCore.gyp
Source/WebCore/platform/chromium/support/CCThreadImpl.cpp
Source/WebCore/platform/chromium/support/CCThreadImpl.h
Source/WebCore/platform/chromium/support/WebCompositorImpl.cpp
Source/WebCore/platform/graphics/chromium/BitmapSkPictureCanvasLayerTextureUpdater.cpp
Source/WebCore/platform/graphics/chromium/CanvasLayerTextureUpdater.cpp
Source/WebCore/platform/graphics/chromium/ContentLayerChromium.cpp
Source/WebCore/platform/graphics/chromium/FrameBufferSkPictureCanvasLayerTextureUpdater.cpp
Source/WebCore/platform/graphics/chromium/HeadsUpDisplayLayerChromium.cpp
Source/WebCore/platform/graphics/chromium/HeadsUpDisplayLayerChromium.h
Source/WebCore/platform/graphics/chromium/IOSurfaceLayerChromium.cpp
Source/WebCore/platform/graphics/chromium/ImageLayerChromium.cpp
Source/WebCore/platform/graphics/chromium/LayerChromium.cpp
Source/WebCore/platform/graphics/chromium/LayerChromium.h
Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp
Source/WebCore/platform/graphics/chromium/LayerRendererChromium.h
Source/WebCore/platform/graphics/chromium/LayerTextureUpdater.h
Source/WebCore/platform/graphics/chromium/LinkHighlight.cpp
Source/WebCore/platform/graphics/chromium/RateLimiter.cpp
Source/WebCore/platform/graphics/chromium/RenderSurfaceChromium.cpp
Source/WebCore/platform/graphics/chromium/ScrollbarLayerChromium.cpp
Source/WebCore/platform/graphics/chromium/SolidColorLayerChromium.cpp
Source/WebCore/platform/graphics/chromium/TextureLayerChromium.cpp
Source/WebCore/platform/graphics/chromium/TiledLayerChromium.cpp
Source/WebCore/platform/graphics/chromium/TiledLayerChromium.h
Source/WebCore/platform/graphics/chromium/TreeSynchronizer.cpp
Source/WebCore/platform/graphics/chromium/VideoLayerChromium.cpp
Source/WebCore/platform/graphics/chromium/cc/CCActiveAnimation.cpp
Source/WebCore/platform/graphics/chromium/cc/CCActiveGestureAnimation.cpp
Source/WebCore/platform/graphics/chromium/cc/CCAnimationCurve.cpp
Source/WebCore/platform/graphics/chromium/cc/CCAnimationEvents.h
Source/WebCore/platform/graphics/chromium/cc/CCCheckerboardDrawQuad.cpp
Source/WebCore/platform/graphics/chromium/cc/CCCheckerboardDrawQuad.h
Source/WebCore/platform/graphics/chromium/cc/CCDamageTracker.cpp
Source/WebCore/platform/graphics/chromium/cc/CCDebugBorderDrawQuad.cpp
Source/WebCore/platform/graphics/chromium/cc/CCDebugBorderDrawQuad.h
Source/WebCore/platform/graphics/chromium/cc/CCDelayBasedTimeSource.cpp
Source/WebCore/platform/graphics/chromium/cc/CCDelayBasedTimeSource.h
Source/WebCore/platform/graphics/chromium/cc/CCDrawQuad.cpp
Source/WebCore/platform/graphics/chromium/cc/CCDrawQuad.h
Source/WebCore/platform/graphics/chromium/cc/CCFontAtlas.cpp
Source/WebCore/platform/graphics/chromium/cc/CCFrameRateController.cpp
Source/WebCore/platform/graphics/chromium/cc/CCFrameRateController.h
Source/WebCore/platform/graphics/chromium/cc/CCHeadsUpDisplayLayerImpl.cpp
Source/WebCore/platform/graphics/chromium/cc/CCHeadsUpDisplayLayerImpl.h
Source/WebCore/platform/graphics/chromium/cc/CCIOSurfaceDrawQuad.cpp
Source/WebCore/platform/graphics/chromium/cc/CCIOSurfaceDrawQuad.h
Source/WebCore/platform/graphics/chromium/cc/CCIOSurfaceLayerImpl.cpp
Source/WebCore/platform/graphics/chromium/cc/CCIOSurfaceLayerImpl.h
Source/WebCore/platform/graphics/chromium/cc/CCKeyframedAnimationCurve.cpp
Source/WebCore/platform/graphics/chromium/cc/CCKeyframedAnimationCurve.h
Source/WebCore/platform/graphics/chromium/cc/CCLayerAnimationController.cpp
Source/WebCore/platform/graphics/chromium/cc/CCLayerAnimationController.h
Source/WebCore/platform/graphics/chromium/cc/CCLayerImpl.cpp
Source/WebCore/platform/graphics/chromium/cc/CCLayerImpl.h
Source/WebCore/platform/graphics/chromium/cc/CCLayerIterator.cpp
Source/WebCore/platform/graphics/chromium/cc/CCLayerIterator.h
Source/WebCore/platform/graphics/chromium/cc/CCLayerQuad.cpp
Source/WebCore/platform/graphics/chromium/cc/CCLayerSorter.cpp
Source/WebCore/platform/graphics/chromium/cc/CCLayerSorter.h
Source/WebCore/platform/graphics/chromium/cc/CCLayerTilingData.cpp
Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.cpp
Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.h
Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostCommon.cpp
Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp
Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.h
Source/WebCore/platform/graphics/chromium/cc/CCMathUtil.cpp
Source/WebCore/platform/graphics/chromium/cc/CCOcclusionTracker.cpp
Source/WebCore/platform/graphics/chromium/cc/CCOcclusionTracker.h
Source/WebCore/platform/graphics/chromium/cc/CCOverdrawMetrics.cpp
Source/WebCore/platform/graphics/chromium/cc/CCPageScaleAnimation.cpp
Source/WebCore/platform/graphics/chromium/cc/CCPrioritizedTexture.h
Source/WebCore/platform/graphics/chromium/cc/CCProxy.cpp
Source/WebCore/platform/graphics/chromium/cc/CCQuadCuller.cpp
Source/WebCore/platform/graphics/chromium/cc/CCRenderPass.cpp
Source/WebCore/platform/graphics/chromium/cc/CCRenderPass.h
Source/WebCore/platform/graphics/chromium/cc/CCRenderPassDrawQuad.cpp
Source/WebCore/platform/graphics/chromium/cc/CCRenderPassDrawQuad.h
Source/WebCore/platform/graphics/chromium/cc/CCRenderSurface.cpp
Source/WebCore/platform/graphics/chromium/cc/CCRenderSurface.h
Source/WebCore/platform/graphics/chromium/cc/CCRenderSurfaceFilters.cpp
Source/WebCore/platform/graphics/chromium/cc/CCRenderer.h
Source/WebCore/platform/graphics/chromium/cc/CCResourceProvider.cpp
Source/WebCore/platform/graphics/chromium/cc/CCResourceProvider.h
Source/WebCore/platform/graphics/chromium/cc/CCScheduler.cpp
Source/WebCore/platform/graphics/chromium/cc/CCScheduler.h
Source/WebCore/platform/graphics/chromium/cc/CCSchedulerStateMachine.cpp
Source/WebCore/platform/graphics/chromium/cc/CCScopedTexture.cpp
Source/WebCore/platform/graphics/chromium/cc/CCScopedTexture.h
Source/WebCore/platform/graphics/chromium/cc/CCScopedThreadProxy.h
Source/WebCore/platform/graphics/chromium/cc/CCScrollbarAnimationController.cpp
Source/WebCore/platform/graphics/chromium/cc/CCScrollbarAnimationControllerLinearFade.cpp
Source/WebCore/platform/graphics/chromium/cc/CCScrollbarAnimationControllerLinearFade.h
Source/WebCore/platform/graphics/chromium/cc/CCScrollbarLayerImpl.cpp
Source/WebCore/platform/graphics/chromium/cc/CCScrollbarLayerImpl.h
Source/WebCore/platform/graphics/chromium/cc/CCSettings.cpp
Source/WebCore/platform/graphics/chromium/cc/CCSharedQuadState.cpp
Source/WebCore/platform/graphics/chromium/cc/CCSingleThreadProxy.cpp
Source/WebCore/platform/graphics/chromium/cc/CCSingleThreadProxy.h
Source/WebCore/platform/graphics/chromium/cc/CCSolidColorDrawQuad.cpp
Source/WebCore/platform/graphics/chromium/cc/CCSolidColorDrawQuad.h
Source/WebCore/platform/graphics/chromium/cc/CCSolidColorLayerImpl.cpp
Source/WebCore/platform/graphics/chromium/cc/CCSolidColorLayerImpl.h
Source/WebCore/platform/graphics/chromium/cc/CCStreamVideoDrawQuad.cpp
Source/WebCore/platform/graphics/chromium/cc/CCStreamVideoDrawQuad.h
Source/WebCore/platform/graphics/chromium/cc/CCTexture.cpp
Source/WebCore/platform/graphics/chromium/cc/CCTexture.h
Source/WebCore/platform/graphics/chromium/cc/CCTextureDrawQuad.cpp
Source/WebCore/platform/graphics/chromium/cc/CCTextureDrawQuad.h
Source/WebCore/platform/graphics/chromium/cc/CCTextureLayerImpl.cpp
Source/WebCore/platform/graphics/chromium/cc/CCTextureLayerImpl.h
Source/WebCore/platform/graphics/chromium/cc/CCTextureUpdateController.cpp
Source/WebCore/platform/graphics/chromium/cc/CCTextureUpdateController.h
Source/WebCore/platform/graphics/chromium/cc/CCTextureUpdateQueue.cpp
Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.cpp
Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.h
Source/WebCore/platform/graphics/chromium/cc/CCThreadTask.h
Source/WebCore/platform/graphics/chromium/cc/CCTileDrawQuad.cpp
Source/WebCore/platform/graphics/chromium/cc/CCTileDrawQuad.h
Source/WebCore/platform/graphics/chromium/cc/CCTiledLayerImpl.cpp
Source/WebCore/platform/graphics/chromium/cc/CCTiledLayerImpl.h
Source/WebCore/platform/graphics/chromium/cc/CCTimer.cpp
Source/WebCore/platform/graphics/chromium/cc/CCTimingFunction.cpp
Source/WebCore/platform/graphics/chromium/cc/CCTimingFunction.h
Source/WebCore/platform/graphics/chromium/cc/CCVideoLayerImpl.cpp
Source/WebCore/platform/graphics/chromium/cc/CCVideoLayerImpl.h
Source/WebCore/platform/graphics/chromium/cc/CCYUVVideoDrawQuad.cpp
Source/WebCore/platform/graphics/chromium/cc/CCYUVVideoDrawQuad.h
Source/WebCore/platform/graphics/gpu/SharedGraphicsContext3D.cpp
Source/WebKit/chromium/ChangeLog
Source/WebKit/chromium/src/WebAnimationCurveCommon.cpp
Source/WebKit/chromium/src/WebAnimationImpl.cpp
Source/WebKit/chromium/src/WebCompositorInputHandlerImpl.cpp
Source/WebKit/chromium/src/WebCompositorInputHandlerImpl.h
Source/WebKit/chromium/src/WebExternalTextureLayer.cpp
Source/WebKit/chromium/src/WebFloatAnimationCurve.cpp
Source/WebKit/chromium/src/WebLayerTreeView.cpp
Source/WebKit/chromium/src/WebLayerTreeViewImpl.cpp
Source/WebKit/chromium/src/WebTransformAnimationCurve.cpp
Source/WebKit/chromium/tests/CCActiveAnimationTest.cpp
Source/WebKit/chromium/tests/CCAnimationTestCommon.cpp
Source/WebKit/chromium/tests/CCAnimationTestCommon.h
Source/WebKit/chromium/tests/CCDamageTrackerTest.cpp
Source/WebKit/chromium/tests/CCDelayBasedTimeSourceTest.cpp
Source/WebKit/chromium/tests/CCFrameRateControllerTest.cpp
Source/WebKit/chromium/tests/CCKeyframedAnimationCurveTest.cpp
Source/WebKit/chromium/tests/CCLayerAnimationControllerTest.cpp
Source/WebKit/chromium/tests/CCLayerImplTest.cpp
Source/WebKit/chromium/tests/CCLayerIteratorTest.cpp
Source/WebKit/chromium/tests/CCLayerQuadTest.cpp
Source/WebKit/chromium/tests/CCLayerSorterTest.cpp
Source/WebKit/chromium/tests/CCLayerTestCommon.cpp
Source/WebKit/chromium/tests/CCLayerTestCommon.h
Source/WebKit/chromium/tests/CCLayerTreeHostCommonTest.cpp
Source/WebKit/chromium/tests/CCLayerTreeHostImplTest.cpp
Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp
Source/WebKit/chromium/tests/CCMathUtilTest.cpp
Source/WebKit/chromium/tests/CCOcclusionTrackerTest.cpp
Source/WebKit/chromium/tests/CCOcclusionTrackerTestCommon.h
Source/WebKit/chromium/tests/CCPrioritizedTextureTest.cpp
Source/WebKit/chromium/tests/CCQuadCullerTest.cpp
Source/WebKit/chromium/tests/CCRenderSurfaceFiltersTest.cpp
Source/WebKit/chromium/tests/CCRenderSurfaceTest.cpp
Source/WebKit/chromium/tests/CCResourceProviderTest.cpp
Source/WebKit/chromium/tests/CCSchedulerStateMachineTest.cpp
Source/WebKit/chromium/tests/CCSchedulerTest.cpp
Source/WebKit/chromium/tests/CCSchedulerTestCommon.h
Source/WebKit/chromium/tests/CCScopedTextureTest.cpp
Source/WebKit/chromium/tests/CCScrollbarAnimationControllerLinearFadeTest.cpp
Source/WebKit/chromium/tests/CCSolidColorLayerImplTest.cpp
Source/WebKit/chromium/tests/CCTestCommon.h
Source/WebKit/chromium/tests/CCTextureUpdateControllerTest.cpp
Source/WebKit/chromium/tests/CCThreadTaskTest.cpp
Source/WebKit/chromium/tests/CCThreadedTest.cpp
Source/WebKit/chromium/tests/CCThreadedTest.h
Source/WebKit/chromium/tests/CCTiledLayerImplTest.cpp
Source/WebKit/chromium/tests/CCTiledLayerTestCommon.h
Source/WebKit/chromium/tests/CCTimerTest.cpp
Source/WebKit/chromium/tests/ContentLayerChromiumTest.cpp
Source/WebKit/chromium/tests/FakeCCGraphicsContext.h
Source/WebKit/chromium/tests/FakeCCLayerTreeHostClient.h
Source/WebKit/chromium/tests/FloatQuadTest.cpp
Source/WebKit/chromium/tests/GraphicsLayerChromiumTest.cpp
Source/WebKit/chromium/tests/LayerChromiumTest.cpp
Source/WebKit/chromium/tests/LayerRendererChromiumTest.cpp
Source/WebKit/chromium/tests/MockCCQuadCuller.h
Source/WebKit/chromium/tests/PlatformGestureCurveTest.cpp
Source/WebKit/chromium/tests/ScrollbarLayerChromiumTest.cpp
Source/WebKit/chromium/tests/TextureLayerChromiumTest.cpp
Source/WebKit/chromium/tests/TiledLayerChromiumTest.cpp
Source/WebKit/chromium/tests/TreeSynchronizerTest.cpp
Source/WebKit/chromium/tests/WebCompositorInputHandlerImplTest.cpp
Source/WebKit/chromium/tests/WebFloatAnimationCurveTest.cpp
Source/WebKit/chromium/tests/WebTransformAnimationCurveTest.cpp

index 1a9dd5d..54292b2 100644 (file)
@@ -1,3 +1,143 @@
+2012-08-16  James Robinson  <jamesr@chromium.org>
+
+        [chromium] Add Source/WebCore/platform/graphics/chromium/cc/ to include path and remove cc/ prefix from includes
+        https://bugs.webkit.org/show_bug.cgi?id=94279
+
+        Reviewed by Adam Barth.
+
+        This brings us more in line with the rest of the WebKit repo and avoids potential header collisions during
+        transition.
+
+        * WebCore.gyp/WebCore.gyp:
+        * platform/chromium/support/CCThreadImpl.cpp:
+        * platform/chromium/support/CCThreadImpl.h:
+        * platform/chromium/support/WebCompositorImpl.cpp:
+        * platform/graphics/chromium/BitmapSkPictureCanvasLayerTextureUpdater.cpp:
+        * platform/graphics/chromium/CanvasLayerTextureUpdater.cpp:
+        * platform/graphics/chromium/ContentLayerChromium.cpp:
+        * platform/graphics/chromium/FrameBufferSkPictureCanvasLayerTextureUpdater.cpp:
+        * platform/graphics/chromium/HeadsUpDisplayLayerChromium.cpp:
+        * platform/graphics/chromium/HeadsUpDisplayLayerChromium.h:
+        * platform/graphics/chromium/IOSurfaceLayerChromium.cpp:
+        * platform/graphics/chromium/ImageLayerChromium.cpp:
+        * platform/graphics/chromium/LayerChromium.cpp:
+        * platform/graphics/chromium/LayerChromium.h:
+        * platform/graphics/chromium/LayerRendererChromium.cpp:
+        * platform/graphics/chromium/LayerRendererChromium.h:
+        * platform/graphics/chromium/LayerTextureUpdater.h:
+        * platform/graphics/chromium/LinkHighlight.cpp:
+        * platform/graphics/chromium/RateLimiter.cpp:
+        * platform/graphics/chromium/RenderSurfaceChromium.cpp:
+        * platform/graphics/chromium/ScrollbarLayerChromium.cpp:
+        * platform/graphics/chromium/SolidColorLayerChromium.cpp:
+        * platform/graphics/chromium/TextureLayerChromium.cpp:
+        * platform/graphics/chromium/TiledLayerChromium.cpp:
+        * platform/graphics/chromium/TiledLayerChromium.h:
+        * platform/graphics/chromium/TreeSynchronizer.cpp:
+        * platform/graphics/chromium/VideoLayerChromium.cpp:
+        * platform/graphics/chromium/cc/CCActiveAnimation.cpp:
+        * platform/graphics/chromium/cc/CCActiveGestureAnimation.cpp:
+        * platform/graphics/chromium/cc/CCAnimationCurve.cpp:
+        * platform/graphics/chromium/cc/CCAnimationEvents.h:
+        * platform/graphics/chromium/cc/CCCheckerboardDrawQuad.cpp:
+        * platform/graphics/chromium/cc/CCCheckerboardDrawQuad.h:
+        * platform/graphics/chromium/cc/CCDamageTracker.cpp:
+        * platform/graphics/chromium/cc/CCDebugBorderDrawQuad.cpp:
+        * platform/graphics/chromium/cc/CCDebugBorderDrawQuad.h:
+        * platform/graphics/chromium/cc/CCDelayBasedTimeSource.cpp:
+        * platform/graphics/chromium/cc/CCDelayBasedTimeSource.h:
+        * platform/graphics/chromium/cc/CCDrawQuad.cpp:
+        * platform/graphics/chromium/cc/CCDrawQuad.h:
+        * platform/graphics/chromium/cc/CCFontAtlas.cpp:
+        * platform/graphics/chromium/cc/CCFrameRateController.cpp:
+        * platform/graphics/chromium/cc/CCFrameRateController.h:
+        * platform/graphics/chromium/cc/CCHeadsUpDisplayLayerImpl.cpp:
+        * platform/graphics/chromium/cc/CCHeadsUpDisplayLayerImpl.h:
+        * platform/graphics/chromium/cc/CCIOSurfaceDrawQuad.cpp:
+        * platform/graphics/chromium/cc/CCIOSurfaceDrawQuad.h:
+        * platform/graphics/chromium/cc/CCIOSurfaceLayerImpl.cpp:
+        * platform/graphics/chromium/cc/CCIOSurfaceLayerImpl.h:
+        * platform/graphics/chromium/cc/CCKeyframedAnimationCurve.cpp:
+        * platform/graphics/chromium/cc/CCKeyframedAnimationCurve.h:
+        * platform/graphics/chromium/cc/CCLayerAnimationController.cpp:
+        * platform/graphics/chromium/cc/CCLayerAnimationController.h:
+        * platform/graphics/chromium/cc/CCLayerImpl.cpp:
+        * platform/graphics/chromium/cc/CCLayerImpl.h:
+        * platform/graphics/chromium/cc/CCLayerIterator.cpp:
+        * platform/graphics/chromium/cc/CCLayerIterator.h:
+        * platform/graphics/chromium/cc/CCLayerQuad.cpp:
+        * platform/graphics/chromium/cc/CCLayerSorter.cpp:
+        * platform/graphics/chromium/cc/CCLayerSorter.h:
+        * platform/graphics/chromium/cc/CCLayerTilingData.cpp:
+        * platform/graphics/chromium/cc/CCLayerTreeHost.cpp:
+        * platform/graphics/chromium/cc/CCLayerTreeHost.h:
+        * platform/graphics/chromium/cc/CCLayerTreeHostCommon.cpp:
+        * platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp:
+        * platform/graphics/chromium/cc/CCLayerTreeHostImpl.h:
+        * platform/graphics/chromium/cc/CCMathUtil.cpp:
+        * platform/graphics/chromium/cc/CCOcclusionTracker.cpp:
+        * platform/graphics/chromium/cc/CCOcclusionTracker.h:
+        * platform/graphics/chromium/cc/CCOverdrawMetrics.cpp:
+        * platform/graphics/chromium/cc/CCPageScaleAnimation.cpp:
+        * platform/graphics/chromium/cc/CCPrioritizedTexture.h:
+        * platform/graphics/chromium/cc/CCProxy.cpp:
+        * platform/graphics/chromium/cc/CCQuadCuller.cpp:
+        * platform/graphics/chromium/cc/CCRenderPass.cpp:
+        * platform/graphics/chromium/cc/CCRenderPass.h:
+        * platform/graphics/chromium/cc/CCRenderPassDrawQuad.cpp:
+        * platform/graphics/chromium/cc/CCRenderPassDrawQuad.h:
+        * platform/graphics/chromium/cc/CCRenderSurface.cpp:
+        * platform/graphics/chromium/cc/CCRenderSurface.h:
+        * platform/graphics/chromium/cc/CCRenderSurfaceFilters.cpp:
+        * platform/graphics/chromium/cc/CCRenderer.h:
+        * platform/graphics/chromium/cc/CCResourceProvider.cpp:
+        * platform/graphics/chromium/cc/CCResourceProvider.h:
+        * platform/graphics/chromium/cc/CCScheduler.cpp:
+        * platform/graphics/chromium/cc/CCScheduler.h:
+        * platform/graphics/chromium/cc/CCSchedulerStateMachine.cpp:
+        * platform/graphics/chromium/cc/CCScopedTexture.cpp:
+        * platform/graphics/chromium/cc/CCScopedTexture.h:
+        * platform/graphics/chromium/cc/CCScopedThreadProxy.h:
+        * platform/graphics/chromium/cc/CCScrollbarAnimationController.cpp:
+        * platform/graphics/chromium/cc/CCScrollbarAnimationControllerLinearFade.cpp:
+        * platform/graphics/chromium/cc/CCScrollbarAnimationControllerLinearFade.h:
+        * platform/graphics/chromium/cc/CCScrollbarLayerImpl.cpp:
+        * platform/graphics/chromium/cc/CCScrollbarLayerImpl.h:
+        * platform/graphics/chromium/cc/CCSettings.cpp:
+        * platform/graphics/chromium/cc/CCSharedQuadState.cpp:
+        * platform/graphics/chromium/cc/CCSingleThreadProxy.cpp:
+        * platform/graphics/chromium/cc/CCSingleThreadProxy.h:
+        * platform/graphics/chromium/cc/CCSolidColorDrawQuad.cpp:
+        * platform/graphics/chromium/cc/CCSolidColorDrawQuad.h:
+        * platform/graphics/chromium/cc/CCSolidColorLayerImpl.cpp:
+        * platform/graphics/chromium/cc/CCSolidColorLayerImpl.h:
+        * platform/graphics/chromium/cc/CCStreamVideoDrawQuad.cpp:
+        * platform/graphics/chromium/cc/CCStreamVideoDrawQuad.h:
+        * platform/graphics/chromium/cc/CCTexture.cpp:
+        * platform/graphics/chromium/cc/CCTexture.h:
+        * platform/graphics/chromium/cc/CCTextureDrawQuad.cpp:
+        * platform/graphics/chromium/cc/CCTextureDrawQuad.h:
+        * platform/graphics/chromium/cc/CCTextureLayerImpl.cpp:
+        * platform/graphics/chromium/cc/CCTextureLayerImpl.h:
+        * platform/graphics/chromium/cc/CCTextureUpdateController.cpp:
+        * platform/graphics/chromium/cc/CCTextureUpdateController.h:
+        * platform/graphics/chromium/cc/CCTextureUpdateQueue.cpp:
+        * platform/graphics/chromium/cc/CCThreadProxy.cpp:
+        * platform/graphics/chromium/cc/CCThreadProxy.h:
+        * platform/graphics/chromium/cc/CCThreadTask.h:
+        * platform/graphics/chromium/cc/CCTileDrawQuad.cpp:
+        * platform/graphics/chromium/cc/CCTileDrawQuad.h:
+        * platform/graphics/chromium/cc/CCTiledLayerImpl.cpp:
+        * platform/graphics/chromium/cc/CCTiledLayerImpl.h:
+        * platform/graphics/chromium/cc/CCTimer.cpp:
+        * platform/graphics/chromium/cc/CCTimingFunction.cpp:
+        * platform/graphics/chromium/cc/CCTimingFunction.h:
+        * platform/graphics/chromium/cc/CCVideoLayerImpl.cpp:
+        * platform/graphics/chromium/cc/CCVideoLayerImpl.h:
+        * platform/graphics/chromium/cc/CCYUVVideoDrawQuad.cpp:
+        * platform/graphics/chromium/cc/CCYUVVideoDrawQuad.h:
+        * platform/graphics/gpu/SharedGraphicsContext3D.cpp:
+
 2012-08-17  Ojan Vafai  <ojan@chromium.org>
 
         Delete dead code in deprecated flexbox for RTL line-clamp
index d944b2c..db04f41 100644 (file)
       '../platform/chromium/support',
       '../platform/graphics',
       '../platform/graphics/chromium',
+      '../platform/graphics/chromium/cc',
       '../platform/graphics/filters',
       '../platform/graphics/filters/arm',
       '../platform/graphics/gpu',
index a81df1b..cce1952 100644 (file)
@@ -25,7 +25,7 @@
 #include "config.h"
 #include "CCThreadImpl.h"
 
-#include "cc/CCCompletionEvent.h"
+#include "CCCompletionEvent.h"
 #include <public/Platform.h>
 #include <public/WebThread.h>
 
index d69b801..308ba80 100644 (file)
@@ -22,7 +22,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "cc/CCThread.h"
+#include "CCThread.h"
 #include <wtf/OwnPtr.h>
 #include <wtf/Threading.h>
 
index e757c40..a0bd1c8 100644 (file)
 
 #include "WebCompositorImpl.h"
 
+#include "CCLayerTreeHost.h"
+#include "CCProxy.h"
+#include "CCSettings.h"
 #include "CCThreadImpl.h"
-#include "cc/CCLayerTreeHost.h"
-#include "cc/CCProxy.h"
-#include "cc/CCSettings.h"
 #include <public/Platform.h>
 #include <wtf/ThreadingPrimitives.h>
 
index 55f97dd..39580ff 100644 (file)
 
 #include "BitmapSkPictureCanvasLayerTextureUpdater.h"
 
+#include "CCRenderingStats.h"
 #include "LayerPainterChromium.h"
 #include "PlatformColor.h"
 #include "SkCanvas.h"
 #include "SkDevice.h"
-#include "cc/CCRenderingStats.h"
 #include <wtf/CurrentTime.h>
 
 namespace WebCore {
index b5c651c..b87cf4c 100644 (file)
@@ -30,6 +30,7 @@
 
 #include "CanvasLayerTextureUpdater.h"
 
+#include "CCRenderingStats.h"
 #include "FloatRect.h"
 #include "LayerPainterChromium.h"
 #include "SkCanvas.h"
@@ -37,7 +38,6 @@
 #include "SkRect.h"
 #include "SkiaUtils.h"
 #include "TraceEvent.h"
-#include "cc/CCRenderingStats.h"
 #include <wtf/CurrentTime.h>
 
 namespace WebCore {
index 1f9ad21..0dc960b 100644 (file)
 
 #include "BitmapCanvasLayerTextureUpdater.h"
 #include "BitmapSkPictureCanvasLayerTextureUpdater.h"
+#include "CCLayerTreeHost.h"
+#include "CCSettings.h"
 #include "FrameBufferSkPictureCanvasLayerTextureUpdater.h"
 #include "LayerPainterChromium.h"
-#include "cc/CCLayerTreeHost.h"
-#include "cc/CCSettings.h"
 #include <public/Platform.h>
 #include <wtf/CurrentTime.h>
 
index 00044c7..da2ecc6 100644 (file)
 
 #include "FrameBufferSkPictureCanvasLayerTextureUpdater.h"
 
+#include "CCProxy.h"
 #include "LayerPainterChromium.h"
 #include "SkCanvas.h"
 #include "SkGpuDevice.h"
-#include "cc/CCProxy.h"
 #include <public/WebGraphicsContext3D.h>
 #include <public/WebSharedGraphicsContext3D.h>
 
index c6e759b..2ae58ab 100644 (file)
@@ -27,9 +27,9 @@
 
 #include "HeadsUpDisplayLayerChromium.h"
 
+#include "CCHeadsUpDisplayLayerImpl.h"
+#include "CCLayerTreeHost.h"
 #include "TraceEvent.h"
-#include "cc/CCHeadsUpDisplayLayerImpl.h"
-#include "cc/CCLayerTreeHost.h"
 
 namespace WebCore {
 
index e6a9830..775720e 100644 (file)
@@ -27,9 +27,9 @@
 #ifndef HeadsUpDisplayLayerChromium_h
 #define HeadsUpDisplayLayerChromium_h
 
+#include "CCFontAtlas.h"
 #include "IntSize.h"
 #include "LayerChromium.h"
-#include "cc/CCFontAtlas.h"
 
 namespace WebCore {
 
index df6d6c8..38dd877 100644 (file)
@@ -29,7 +29,7 @@
 
 #include "IOSurfaceLayerChromium.h"
 
-#include "cc/CCIOSurfaceLayerImpl.h"
+#include "CCIOSurfaceLayerImpl.h"
 
 namespace WebCore {
 
index 54911fb..f7e603e 100644 (file)
@@ -34,9 +34,9 @@
 
 #include "ImageLayerChromium.h"
 
+#include "CCLayerTreeHost.h"
 #include "LayerTextureUpdater.h"
 #include "PlatformColor.h"
-#include "cc/CCLayerTreeHost.h"
 
 namespace WebCore {
 
index 9b0e534..30c81b6 100644 (file)
 #if USE(ACCELERATED_COMPOSITING)
 #include "LayerChromium.h"
 
+#include "CCActiveAnimation.h"
+#include "CCAnimationEvents.h"
+#include "CCLayerAnimationController.h"
+#include "CCLayerImpl.h"
+#include "CCLayerTreeHost.h"
+#include "CCSettings.h"
 #include "TextStream.h"
-#include "cc/CCActiveAnimation.h"
-#include "cc/CCAnimationEvents.h"
-#include "cc/CCLayerAnimationController.h"
-#include "cc/CCLayerImpl.h"
-#include "cc/CCLayerTreeHost.h"
-#include "cc/CCSettings.h"
 
 #include <public/WebAnimationDelegate.h>
 
index 54ab83a..ec14a51 100644 (file)
 
 #if USE(ACCELERATED_COMPOSITING)
 
+#include "CCLayerAnimationController.h"
+#include "CCOcclusionTracker.h"
+#include "CCPrioritizedTexture.h"
 #include "FloatPoint.h"
 #include "Region.h"
 #include "RenderSurfaceChromium.h"
 #include "SkColor.h"
-#include "cc/CCLayerAnimationController.h"
-#include "cc/CCOcclusionTracker.h"
-#include "cc/CCPrioritizedTexture.h"
 
 #include <public/WebFilterOperations.h>
 #include <public/WebTransformationMatrix.h>
index 085f4bb..b932800 100644 (file)
 #if USE(ACCELERATED_COMPOSITING)
 #include "LayerRendererChromium.h"
 
+#include "CCDamageTracker.h"
+#include "CCLayerQuad.h"
+#include "CCMathUtil.h"
+#include "CCProxy.h"
+#include "CCRenderPass.h"
+#include "CCRenderSurfaceFilters.h"
+#include "CCScopedTexture.h"
+#include "CCSettings.h"
+#include "CCSingleThreadProxy.h"
+#include "CCVideoLayerImpl.h"
 #include "Extensions3D.h"
 #include "FloatQuad.h"
 #include "GeometryBinding.h"
 #include "SkColor.h"
 #include "ThrottledTextureUploader.h"
 #include "TraceEvent.h"
-#include "cc/CCDamageTracker.h"
-#include "cc/CCLayerQuad.h"
-#include "cc/CCMathUtil.h"
-#include "cc/CCProxy.h"
-#include "cc/CCRenderPass.h"
-#include "cc/CCRenderSurfaceFilters.h"
-#include "cc/CCScopedTexture.h"
-#include "cc/CCSettings.h"
-#include "cc/CCSingleThreadProxy.h"
-#include "cc/CCVideoLayerImpl.h"
 #include <public/WebGraphicsContext3D.h>
 #include <public/WebSharedGraphicsContext3D.h>
 #include <public/WebVideoFrame.h>
index 1791033..fb51f84 100644 (file)
 
 #if USE(ACCELERATED_COMPOSITING)
 
+#include "CCCheckerboardDrawQuad.h"
+#include "CCDebugBorderDrawQuad.h"
+#include "CCIOSurfaceDrawQuad.h"
+#include "CCRenderPassDrawQuad.h"
+#include "CCRenderer.h"
+#include "CCSolidColorDrawQuad.h"
+#include "CCStreamVideoDrawQuad.h"
+#include "CCTextureDrawQuad.h"
+#include "CCTileDrawQuad.h"
+#include "CCYUVVideoDrawQuad.h"
 #include "Extensions3DChromium.h"
 #include "TextureCopier.h"
-#include "cc/CCCheckerboardDrawQuad.h"
-#include "cc/CCDebugBorderDrawQuad.h"
-#include "cc/CCIOSurfaceDrawQuad.h"
-#include "cc/CCRenderPassDrawQuad.h"
-#include "cc/CCRenderer.h"
-#include "cc/CCSolidColorDrawQuad.h"
-#include "cc/CCStreamVideoDrawQuad.h"
-#include "cc/CCTextureDrawQuad.h"
-#include "cc/CCTileDrawQuad.h"
-#include "cc/CCYUVVideoDrawQuad.h"
 #include <wtf/PassOwnPtr.h>
 
 namespace WebKit {
index cc7536b..1ad61c8 100644 (file)
@@ -29,8 +29,8 @@
 
 #if USE(ACCELERATED_COMPOSITING)
 
+#include "CCPrioritizedTexture.h"
 #include "GraphicsTypes3D.h"
-#include "cc/CCPrioritizedTexture.h"
 #include <wtf/RefCounted.h>
 
 namespace WebCore {
index 1b2c61e..1d44730 100644 (file)
@@ -27,9 +27,9 @@
 
 #include "LinkHighlight.h"
 
+#include "CCKeyframedAnimationCurve.h"
 #include "GraphicsLayerChromium.h"
 #include "PlatformContextSkia.h"
-#include "cc/CCKeyframedAnimationCurve.h"
 #include <wtf/CurrentTime.h>
 #include <wtf/OwnPtr.h>
 
index 55a1902..c9d5f51 100644 (file)
 #include "config.h"
 
 #if USE(ACCELERATED_COMPOSITING)
-
 #include "RateLimiter.h"
+
+#include "CCProxy.h"
+#include "CCThread.h"
 #include "TraceEvent.h"
-#include "cc/CCProxy.h"
-#include "cc/CCThread.h"
 #include <public/WebGraphicsContext3D.h>
 
 namespace WebCore {
index ee9be67..263b601 100644 (file)
@@ -29,8 +29,8 @@
 
 #include "RenderSurfaceChromium.h"
 
+#include "CCMathUtil.h"
 #include "LayerChromium.h"
-#include "cc/CCMathUtil.h"
 #include <public/WebTransformationMatrix.h>
 #include <wtf/text/CString.h>
 
index b417e33..67fbd36 100644 (file)
 #include "ScrollbarLayerChromium.h"
 
 #include "BitmapCanvasLayerTextureUpdater.h"
+#include "CCLayerTreeHost.h"
+#include "CCScrollbarLayerImpl.h"
+#include "CCTextureUpdateQueue.h"
 #include "LayerPainterChromium.h"
-#include "cc/CCLayerTreeHost.h"
-#include "cc/CCScrollbarLayerImpl.h"
-#include "cc/CCTextureUpdateQueue.h"
 #include <public/WebRect.h>
 
 using WebKit::WebRect;
index 0dc77ad..0da6324 100644 (file)
@@ -29,7 +29,7 @@
 
 #include "SolidColorLayerChromium.h"
 
-#include "cc/CCSolidColorLayerImpl.h"
+#include "CCSolidColorLayerImpl.h"
 
 namespace WebCore {
 
index 7d575d3..d2f469e 100644 (file)
@@ -29,8 +29,8 @@
 
 #include "TextureLayerChromium.h"
 
-#include "cc/CCLayerTreeHost.h"
-#include "cc/CCTextureLayerImpl.h"
+#include "CCLayerTreeHost.h"
+#include "CCTextureLayerImpl.h"
 #include <public/WebGraphicsContext3D.h>
 
 namespace WebCore {
index 2ae1720..cce1635 100644 (file)
 
 #include "TiledLayerChromium.h"
 
+#include "CCLayerImpl.h"
+#include "CCLayerTreeHost.h"
+#include "CCOverdrawMetrics.h"
+#include "CCTextureUpdateQueue.h"
+#include "CCTiledLayerImpl.h"
 #include "GraphicsContext3D.h"
 #include "Region.h"
 #include "TextStream.h"
-
-#include "cc/CCLayerImpl.h"
-#include "cc/CCLayerTreeHost.h"
-#include "cc/CCOverdrawMetrics.h"
-#include "cc/CCTextureUpdateQueue.h"
-#include "cc/CCTiledLayerImpl.h"
-
 #include <wtf/CurrentTime.h>
 #include <wtf/MathExtras.h>
 
index 13d345e..33263e5 100644 (file)
@@ -28,9 +28,9 @@
 
 #if USE(ACCELERATED_COMPOSITING)
 
+#include "CCLayerTilingData.h"
 #include "LayerChromium.h"
 #include "LayerTextureUpdater.h"
-#include "cc/CCLayerTilingData.h"
 
 namespace WebCore {
 class UpdatableTile;
index 88b2c11..247d0c4 100644 (file)
 
 #include "TreeSynchronizer.h"
 
+#include "CCLayerImpl.h"
+#include "CCScrollbarAnimationController.h"
+#include "CCScrollbarLayerImpl.h"
 #include "LayerChromium.h"
 #include "ScrollbarLayerChromium.h"
-#include "cc/CCLayerImpl.h"
-#include "cc/CCScrollbarAnimationController.h"
-#include "cc/CCScrollbarLayerImpl.h"
 #include <wtf/RefPtr.h>
 
 namespace WebCore {
index e70c9eb..62337d3 100644 (file)
@@ -32,7 +32,8 @@
 
 #if USE(ACCELERATED_COMPOSITING)
 #include "VideoLayerChromium.h"
-#include "cc/CCVideoLayerImpl.h"
+
+#include "CCVideoLayerImpl.h"
 
 namespace WebCore {
 
index ff6e733..31f33aa 100644 (file)
 
 #include "config.h"
 
-#include "cc/CCActiveAnimation.h"
-
-#include "cc/CCAnimationCurve.h"
+#include "CCActiveAnimation.h"
 
+#include "CCAnimationCurve.h"
 #include <cmath>
 
 namespace WebCore {
index 50f4ad8..7c6f8e4 100644 (file)
 
 #include "config.h"
 
-#include "cc/CCActiveGestureAnimation.h"
+#include "CCActiveGestureAnimation.h"
 
+#include "CCGestureCurve.h"
 #include "TraceEvent.h"
-#include "cc/CCGestureCurve.h"
 
 namespace WebCore {
 
index ef80117..f21f3d0 100644 (file)
@@ -25,7 +25,7 @@
 #ifndef CCAnimationEvents_h
 #define CCAnimationEvents_h
 
-#include "cc/CCActiveAnimation.h"
+#include "CCActiveAnimation.h"
 
 #include <wtf/PassOwnPtr.h>
 #include <wtf/Vector.h>
index c6c8701..7e1105d 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef CCCheckerboardDrawQuad_h
 #define CCCheckerboardDrawQuad_h
 
-#include "cc/CCDrawQuad.h"
+#include "CCDrawQuad.h"
 #include <wtf/PassOwnPtr.h>
 
 namespace WebCore {
index 5d5855c..114499b 100644 (file)
 
 #if USE(ACCELERATED_COMPOSITING)
 
-#include "cc/CCDamageTracker.h"
+#include "CCDamageTracker.h"
 
-#include "cc/CCLayerImpl.h"
-#include "cc/CCLayerTreeHostCommon.h"
-#include "cc/CCMathUtil.h"
-#include "cc/CCRenderSurface.h"
+#include "CCLayerImpl.h"
+#include "CCLayerTreeHostCommon.h"
+#include "CCMathUtil.h"
+#include "CCRenderSurface.h"
 #include <public/WebFilterOperations.h>
 
 using WebKit::WebTransformationMatrix;
index 3a53900..027a88c 100644 (file)
@@ -26,8 +26,8 @@
 #ifndef CCDebugBorderDrawQuad_h
 #define CCDebugBorderDrawQuad_h
 
+#include "CCDrawQuad.h"
 #include "SkColor.h"
-#include "cc/CCDrawQuad.h"
 #include <wtf/PassOwnPtr.h>
 
 namespace WebCore {
index bf50994..2711740 100644 (file)
@@ -24,7 +24,7 @@
 
 #include "config.h"
 
-#include "cc/CCDelayBasedTimeSource.h"
+#include "CCDelayBasedTimeSource.h"
 
 #include "TraceEvent.h"
 #include <algorithm>
index bf46378..f998374 100644 (file)
@@ -25,9 +25,8 @@
 #ifndef CCDelayBasedTimeSource_h
 #define CCDelayBasedTimeSource_h
 
-#include "cc/CCTimeSource.h"
-#include "cc/CCTimer.h"
-
+#include "CCTimeSource.h"
+#include "CCTimer.h"
 #include <wtf/PassRefPtr.h>
 
 namespace WebCore {
index 3b0699d..4584d49 100644 (file)
  */
 
 #include "config.h"
-#include "cc/CCDrawQuad.h"
+#include "CCDrawQuad.h"
 
+#include "CCCheckerboardDrawQuad.h"
+#include "CCDebugBorderDrawQuad.h"
+#include "CCIOSurfaceDrawQuad.h"
+#include "CCRenderPassDrawQuad.h"
+#include "CCSolidColorDrawQuad.h"
+#include "CCStreamVideoDrawQuad.h"
+#include "CCTextureDrawQuad.h"
+#include "CCTileDrawQuad.h"
+#include "CCYUVVideoDrawQuad.h"
 #include "IntRect.h"
-#include "cc/CCCheckerboardDrawQuad.h"
-#include "cc/CCDebugBorderDrawQuad.h"
-#include "cc/CCIOSurfaceDrawQuad.h"
-#include "cc/CCRenderPassDrawQuad.h"
-#include "cc/CCSolidColorDrawQuad.h"
-#include "cc/CCStreamVideoDrawQuad.h"
-#include "cc/CCTextureDrawQuad.h"
-#include "cc/CCTileDrawQuad.h"
-#include "cc/CCYUVVideoDrawQuad.h"
 
 namespace WebCore {
 
index bcda345..d4b0cc3 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef CCDrawQuad_h
 #define CCDrawQuad_h
 
-#include "cc/CCSharedQuadState.h"
+#include "CCSharedQuadState.h"
 
 namespace WebCore {
 
index 388d43f..8636a1a 100644 (file)
@@ -27,8 +27,8 @@
 #if USE(ACCELERATED_COMPOSITING)
 #include "CCFontAtlas.h"
 
+#include "CCProxy.h"
 #include "SkCanvas.h"
-#include "cc/CCProxy.h"
 
 namespace WebCore {
 
index 82dec64..a28bcda 100644 (file)
 
 #include "config.h"
 
-#include "cc/CCFrameRateController.h"
+#include "CCFrameRateController.h"
 
+#include "CCDelayBasedTimeSource.h"
+#include "CCTimeSource.h"
 #include "TraceEvent.h"
-#include "cc/CCDelayBasedTimeSource.h"
-#include "cc/CCTimeSource.h"
+#include <wtf/CurrentTime.h>
 
 namespace WebCore {
 
index 69c9037..34cc8a4 100644 (file)
@@ -25,7 +25,7 @@
 #ifndef CCFrameRateController_h
 #define CCFrameRateController_h
 
-#include "cc/CCTimer.h"
+#include "CCTimer.h"
 
 #include <wtf/CurrentTime.h>
 #include <wtf/Deque.h>
index edc5645..ddb40f3 100644 (file)
 
 #include "config.h"
 
-#include "cc/CCHeadsUpDisplayLayerImpl.h"
-
+#include "CCHeadsUpDisplayLayerImpl.h"
+
+#include "CCDebugRectHistory.h"
+#include "CCFontAtlas.h"
+#include "CCFrameRateCounter.h"
+#include "CCLayerTreeHostImpl.h"
+#include "CCQuadSink.h"
+#include "CCTextureDrawQuad.h"
 #include "Extensions3DChromium.h"
 #include "GraphicsContext3D.h"
 #include "LayerRendererChromium.h"
 #include "SkBitmap.h"
 #include "SkColorMatrixFilter.h"
 #include "SkPaint.h"
-#include "cc/CCDebugRectHistory.h"
-#include "cc/CCFontAtlas.h"
-#include "cc/CCFrameRateCounter.h"
-#include "cc/CCLayerTreeHostImpl.h"
-#include "cc/CCQuadSink.h"
-#include "cc/CCTextureDrawQuad.h"
 #include "skia/ext/platform_canvas.h"
 #include <wtf/text/WTFString.h>
 
index f722816..7cdac88 100644 (file)
@@ -26,9 +26,9 @@
 #ifndef CCHeadsUpDisplayLayerImpl_h
 #define CCHeadsUpDisplayLayerImpl_h
 
-#include "cc/CCFontAtlas.h"
-#include "cc/CCLayerImpl.h"
-#include "cc/CCScopedTexture.h"
+#include "CCFontAtlas.h"
+#include "CCLayerImpl.h"
+#include "CCScopedTexture.h"
 
 class SkCanvas;
 
index 7ce7c06..6abbed1 100644 (file)
@@ -26,8 +26,8 @@
 #ifndef CCIOSurfaceDrawQuad_h
 #define CCIOSurfaceDrawQuad_h
 
+#include "CCDrawQuad.h"
 #include "IntSize.h"
-#include "cc/CCDrawQuad.h"
 #include <wtf/PassOwnPtr.h>
 
 namespace WebCore {
index 473de25..283b7c9 100644 (file)
 
 #if USE(ACCELERATED_COMPOSITING)
 
-#include "cc/CCIOSurfaceLayerImpl.h"
+#include "CCIOSurfaceLayerImpl.h"
 
+#include "CCGraphicsContext.h"
+#include "CCIOSurfaceDrawQuad.h"
+#include "CCLayerTreeHostImpl.h"
+#include "CCQuadSink.h"
 #include "Extensions3D.h"
 #include "LayerRendererChromium.h"
 #include "TextStream.h"
-#include "cc/CCGraphicsContext.h"
-#include "cc/CCIOSurfaceDrawQuad.h"
-#include "cc/CCLayerTreeHostImpl.h"
-#include "cc/CCQuadSink.h"
 #include <public/WebGraphicsContext3D.h>
 
 namespace WebCore {
index 018804e..019b8fe 100644 (file)
@@ -26,8 +26,8 @@
 #ifndef CCIOSurfaceLayerImpl_h
 #define CCIOSurfaceLayerImpl_h
 
+#include "CCLayerImpl.h"
 #include "IntSize.h"
-#include "cc/CCLayerImpl.h"
 
 namespace WebCore {
 
index 111ca81..1cad604 100644 (file)
 #ifndef CCKeyframedAnimationCurve_h
 #define CCKeyframedAnimationCurve_h
 
-#include "cc/CCAnimationCurve.h"
-#include "cc/CCTimingFunction.h"
-
+#include "CCAnimationCurve.h"
+#include "CCTimingFunction.h"
 #include <public/WebTransformOperations.h>
-
 #include <wtf/OwnPtr.h>
 #include <wtf/PassOwnPtr.h>
 #include <wtf/Vector.h>
index bd3e6e6..bc2eb34 100644 (file)
 
 #include "config.h"
 
-#include "cc/CCLayerAnimationController.h"
+#include "CCLayerAnimationController.h"
 
-#include "cc/CCActiveAnimation.h"
-#include "cc/CCKeyframedAnimationCurve.h"
+#include "CCActiveAnimation.h"
+#include "CCKeyframedAnimationCurve.h"
 #include <public/WebTransformationMatrix.h>
 #include <wtf/CurrentTime.h>
 #include <wtf/HashMap.h>
index c6ebbe2..3435970 100644 (file)
@@ -25,7 +25,7 @@
 #ifndef CCLayerAnimationController_h
 #define CCLayerAnimationController_h
 
-#include "cc/CCAnimationEvents.h"
+#include "CCAnimationEvents.h"
 
 #include <wtf/HashSet.h>
 #include <wtf/Noncopyable.h>
index a11dcd2..8444d1d 100644 (file)
 
 #if USE(ACCELERATED_COMPOSITING)
 
-#include "cc/CCLayerImpl.h"
-
+#include "CCLayerImpl.h"
+
+#include "CCDebugBorderDrawQuad.h"
+#include "CCLayerSorter.h"
+#include "CCMathUtil.h"
+#include "CCProxy.h"
+#include "CCQuadSink.h"
+#include "CCScrollbarAnimationController.h"
 #include "TextStream.h"
 #include "TraceEvent.h"
-#include "cc/CCDebugBorderDrawQuad.h"
-#include "cc/CCLayerSorter.h"
-#include "cc/CCMathUtil.h"
-#include "cc/CCProxy.h"
-#include "cc/CCQuadSink.h"
-#include "cc/CCScrollbarAnimationController.h"
 #include <wtf/text/WTFString.h>
 
 using WebKit::WebTransformationMatrix;
index ff089b5..e951c5d 100644 (file)
 #ifndef CCLayerImpl_h
 #define CCLayerImpl_h
 
+#include "CCInputHandler.h"
+#include "CCLayerAnimationController.h"
+#include "CCRenderSurface.h"
+#include "CCResourceProvider.h"
+#include "CCSharedQuadState.h"
 #include "FloatRect.h"
 #include "IntRect.h"
 #include "Region.h"
 #include "SkColor.h"
 #include "TextStream.h"
-#include "cc/CCInputHandler.h"
-#include "cc/CCLayerAnimationController.h"
-#include "cc/CCRenderSurface.h"
-#include "cc/CCResourceProvider.h"
-#include "cc/CCSharedQuadState.h"
 #include <public/WebFilterOperations.h>
 #include <public/WebTransformationMatrix.h>
 #include <wtf/OwnPtr.h>
index 2d6d2f7..bb5929f 100644 (file)
 
 #if USE(ACCELERATED_COMPOSITING)
 
-#include "cc/CCLayerIterator.h"
+#include "CCLayerIterator.h"
 
+#include "CCLayerImpl.h"
+#include "CCRenderSurface.h"
 #include "LayerChromium.h"
 #include "RenderSurfaceChromium.h"
-#include "cc/CCLayerImpl.h"
-#include "cc/CCRenderSurface.h"
 
 namespace WebCore {
 
index 2f5ad2c..9e71c4d 100644 (file)
@@ -25,7 +25,7 @@
 #ifndef CCLayerIterator_h
 #define CCLayerIterator_h
 
-#include "cc/CCLayerTreeHostCommon.h"
+#include "CCLayerTreeHostCommon.h"
 
 #include <wtf/PassOwnPtr.h>
 #include <wtf/RefPtr.h>
index 2c5f7ec..e8c6da2 100644 (file)
@@ -28,7 +28,7 @@
 
 #if USE(ACCELERATED_COMPOSITING)
 
-#include "cc/CCLayerQuad.h"
+#include "CCLayerQuad.h"
 
 namespace WebCore {
 
index 0cb703b..c5240cc 100644 (file)
 
 #include "config.h"
 
-#include "cc/CCLayerSorter.h"
+#include "CCLayerSorter.h"
 
-#include "cc/CCMathUtil.h"
-#include "cc/CCRenderSurface.h"
+#include "CCMathUtil.h"
+#include "CCRenderSurface.h"
 #include <limits.h>
 #include <public/WebTransformationMatrix.h>
 #include <wtf/Deque.h>
index cb88e85..3592cad 100644 (file)
 #ifndef CCLayerSorter_h
 #define CCLayerSorter_h
 
+#include "CCLayerImpl.h"
 #include "FloatPoint3D.h"
 #include "FloatQuad.h"
 #include "FloatRect.h"
-#include "cc/CCLayerImpl.h"
 #include <wtf/HashMap.h>
 #include <wtf/Noncopyable.h>
 #include <wtf/Vector.h>
index 31f534f..9b55156 100644 (file)
@@ -28,7 +28,7 @@
 
 #if USE(ACCELERATED_COMPOSITING)
 
-#include "cc/CCLayerTilingData.h"
+#include "CCLayerTilingData.h"
 
 using namespace std;
 
index e793932..5131949 100644 (file)
 
 #include "config.h"
 
-#include "cc/CCLayerTreeHost.h"
-
+#include "CCLayerTreeHost.h"
+
+#include "CCFontAtlas.h"
+#include "CCGraphicsContext.h"
+#include "CCLayerAnimationController.h"
+#include "CCLayerIterator.h"
+#include "CCLayerTreeHostCommon.h"
+#include "CCLayerTreeHostImpl.h"
+#include "CCOcclusionTracker.h"
+#include "CCOverdrawMetrics.h"
+#include "CCSettings.h"
+#include "CCSingleThreadProxy.h"
+#include "CCThreadProxy.h"
 #include "HeadsUpDisplayLayerChromium.h"
 #include "LayerChromium.h"
 #include "Region.h"
 #include "TraceEvent.h"
 #include "TreeSynchronizer.h"
-#include "cc/CCFontAtlas.h"
-#include "cc/CCGraphicsContext.h"
-#include "cc/CCLayerAnimationController.h"
-#include "cc/CCLayerIterator.h"
-#include "cc/CCLayerTreeHostCommon.h"
-#include "cc/CCLayerTreeHostImpl.h"
-#include "cc/CCOcclusionTracker.h"
-#include "cc/CCOverdrawMetrics.h"
-#include "cc/CCSettings.h"
-#include "cc/CCSingleThreadProxy.h"
-#include "cc/CCThreadProxy.h"
 
 using namespace std;
 using WebKit::WebTransformationMatrix;
index 6a2d7e6..baee9e5 100644 (file)
 #ifndef CCLayerTreeHost_h
 #define CCLayerTreeHost_h
 
+#include "CCAnimationEvents.h"
+#include "CCGraphicsContext.h"
+#include "CCLayerTreeHostCommon.h"
+#include "CCOcclusionTracker.h"
+#include "CCPrioritizedTextureManager.h"
+#include "CCProxy.h"
+#include "CCRenderingStats.h"
 #include "IntRect.h"
 #include "RateLimiter.h"
 #include "SkColor.h"
-#include "cc/CCAnimationEvents.h"
-#include "cc/CCGraphicsContext.h"
-#include "cc/CCLayerTreeHostCommon.h"
-#include "cc/CCOcclusionTracker.h"
-#include "cc/CCPrioritizedTextureManager.h"
-#include "cc/CCProxy.h"
-#include "cc/CCRenderingStats.h"
-
-
 #include <limits>
 #include <wtf/HashMap.h>
 #include <wtf/OwnPtr.h>
index 81e565d..6898c97 100644 (file)
 
 #include "config.h"
 
-#include "cc/CCLayerTreeHostCommon.h"
+#include "CCLayerTreeHostCommon.h"
 
+#include "CCLayerImpl.h"
+#include "CCLayerIterator.h"
+#include "CCLayerSorter.h"
+#include "CCMathUtil.h"
+#include "CCRenderSurface.h"
 #include "FloatQuad.h"
 #include "IntRect.h"
 #include "LayerChromium.h"
 #include "RenderSurfaceChromium.h"
-#include "cc/CCLayerImpl.h"
-#include "cc/CCLayerIterator.h"
-#include "cc/CCLayerSorter.h"
-#include "cc/CCMathUtil.h"
-#include "cc/CCRenderSurface.h"
 #include <public/WebTransformationMatrix.h>
 
 using WebKit::WebTransformationMatrix;
index ff6a00a..a5138ea 100644 (file)
 
 #include "config.h"
 
-#include "cc/CCLayerTreeHostImpl.h"
-
+#include "CCLayerTreeHostImpl.h"
+
+#include "CCActiveGestureAnimation.h"
+#include "CCDamageTracker.h"
+#include "CCDebugRectHistory.h"
+#include "CCDelayBasedTimeSource.h"
+#include "CCFontAtlas.h"
+#include "CCFrameRateCounter.h"
+#include "CCLayerIterator.h"
+#include "CCLayerTreeHost.h"
+#include "CCLayerTreeHostCommon.h"
+#include "CCOverdrawMetrics.h"
+#include "CCPageScaleAnimation.h"
+#include "CCPrioritizedTextureManager.h"
+#include "CCRenderPassDrawQuad.h"
+#include "CCRenderingStats.h"
+#include "CCScrollbarAnimationController.h"
+#include "CCScrollbarLayerImpl.h"
+#include "CCSettings.h"
+#include "CCSingleThreadProxy.h"
 #include "LayerRendererChromium.h"
 #include "TextStream.h"
 #include "TraceEvent.h"
-#include "cc/CCActiveGestureAnimation.h"
-#include "cc/CCDamageTracker.h"
-#include "cc/CCDebugRectHistory.h"
-#include "cc/CCDelayBasedTimeSource.h"
-#include "cc/CCFontAtlas.h"
-#include "cc/CCFrameRateCounter.h"
-#include "cc/CCLayerIterator.h"
-#include "cc/CCLayerTreeHost.h"
-#include "cc/CCLayerTreeHostCommon.h"
-#include "cc/CCOverdrawMetrics.h"
-#include "cc/CCPageScaleAnimation.h"
-#include "cc/CCPrioritizedTextureManager.h"
-#include "cc/CCRenderPassDrawQuad.h"
-#include "cc/CCRenderingStats.h"
-#include "cc/CCScrollbarAnimationController.h"
-#include "cc/CCScrollbarLayerImpl.h"
-#include "cc/CCSettings.h"
-#include "cc/CCSingleThreadProxy.h"
 #include <wtf/CurrentTime.h>
 
 using WebKit::WebTransformationMatrix;
index c600b5d..8a8685f 100644 (file)
 #ifndef CCLayerTreeHostImpl_h
 #define CCLayerTreeHostImpl_h
 
+#include "CCAnimationEvents.h"
+#include "CCInputHandler.h"
+#include "CCLayerSorter.h"
+#include "CCRenderPass.h"
+#include "CCRenderer.h"
 #include "SkColor.h"
-#include "cc/CCAnimationEvents.h"
-#include "cc/CCInputHandler.h"
-#include "cc/CCLayerSorter.h"
-#include "cc/CCRenderPass.h"
-#include "cc/CCRenderer.h"
 #include <public/WebCompositorOutputSurfaceClient.h>
 #include <wtf/PassOwnPtr.h>
 #include <wtf/RefPtr.h>
index 4d5ec93..b378ce3 100644 (file)
@@ -24,7 +24,7 @@
 
 #include "config.h"
 
-#include "cc/CCMathUtil.h"
+#include "CCMathUtil.h"
 
 #include "FloatPoint.h"
 #include "FloatQuad.h"
index ae490b7..a0f0e24 100644 (file)
 
 #if USE(ACCELERATED_COMPOSITING)
 
-#include "cc/CCOcclusionTracker.h"
+#include "CCOcclusionTracker.h"
 
+#include "CCLayerImpl.h"
+#include "CCMathUtil.h"
+#include "CCOverdrawMetrics.h"
 #include "LayerChromium.h"
-#include "cc/CCLayerImpl.h"
-#include "cc/CCMathUtil.h"
-#include "cc/CCOverdrawMetrics.h"
-
 #include <algorithm>
 
 using namespace std;
index d2f4a00..7877319 100644 (file)
@@ -26,9 +26,9 @@
 #ifndef CCOcclusionTracker_h
 #define CCOcclusionTracker_h
 
+#include "CCLayerIterator.h"
 #include "FloatQuad.h"
 #include "Region.h"
-#include "cc/CCLayerIterator.h"
 
 namespace WebCore {
 class CCOverdrawMetrics;
index c5b6f3a..dc90c5d 100644 (file)
 
 #if USE(ACCELERATED_COMPOSITING)
 
-#include "cc/CCOverdrawMetrics.h"
+#include "CCOverdrawMetrics.h"
 
+#include "CCLayerTreeHost.h"
+#include "CCLayerTreeHostImpl.h"
+#include "CCMathUtil.h"
 #include "FloatQuad.h"
 #include "IntRect.h"
 #include "TraceEvent.h"
-#include "cc/CCLayerTreeHost.h"
-#include "cc/CCLayerTreeHostImpl.h"
-#include "cc/CCMathUtil.h"
 #include <public/Platform.h>
 #include <public/WebTransformationMatrix.h>
 
index e45c00f..508851f 100644 (file)
@@ -27,7 +27,7 @@
 
 #include "config.h"
 
-#include "cc/CCPageScaleAnimation.h"
+#include "CCPageScaleAnimation.h"
 
 #include "FloatRect.h"
 #include "FloatSize.h"
index 4d47b63..3789d7f 100644 (file)
 #ifndef CCPrioritizedTexture_h
 #define CCPrioritizedTexture_h
 
+#include "CCPriorityCalculator.h"
+#include "CCResourceProvider.h"
+#include "CCTexture.h"
 #include "GraphicsContext3D.h"
 #include "IntRect.h"
 #include "IntSize.h"
-#include "cc/CCPriorityCalculator.h"
-#include "cc/CCResourceProvider.h"
-#include "cc/CCTexture.h"
 
 namespace WebCore {
 
index 506a993..05752f0 100644 (file)
@@ -24,9 +24,9 @@
 
 #include "config.h"
 
-#include "cc/CCProxy.h"
+#include "CCProxy.h"
 
-#include "cc/CCThreadTask.h"
+#include "CCThreadTask.h"
 #include <wtf/MainThread.h>
 
 using namespace WTF;
index 0684f3e..f2e9e9f 100644 (file)
 
 #if USE(ACCELERATED_COMPOSITING)
 
-#include "cc/CCQuadCuller.h"
+#include "CCQuadCuller.h"
 
+#include "CCDebugBorderDrawQuad.h"
+#include "CCLayerImpl.h"
+#include "CCOcclusionTracker.h"
+#include "CCOverdrawMetrics.h"
+#include "CCRenderPass.h"
 #include "Region.h"
 #include "SkColor.h"
-#include "cc/CCDebugBorderDrawQuad.h"
-#include "cc/CCLayerImpl.h"
-#include "cc/CCOcclusionTracker.h"
-#include "cc/CCOverdrawMetrics.h"
-#include "cc/CCRenderPass.h"
 #include <public/WebTransformationMatrix.h>
 
 using namespace std;
index 49dc902..3133e23 100644 (file)
 
 #include "config.h"
 
-#include "cc/CCRenderPass.h"
-
-#include "cc/CCLayerImpl.h"
-#include "cc/CCMathUtil.h"
-#include "cc/CCOcclusionTracker.h"
-#include "cc/CCQuadCuller.h"
-#include "cc/CCSharedQuadState.h"
-#include "cc/CCSolidColorDrawQuad.h"
+#include "CCRenderPass.h"
+
+#include "CCLayerImpl.h"
+#include "CCMathUtil.h"
+#include "CCOcclusionTracker.h"
+#include "CCQuadCuller.h"
+#include "CCSharedQuadState.h"
+#include "CCSolidColorDrawQuad.h"
 
 using WebKit::WebTransformationMatrix;
 
index e2a480e..67ecb43 100644 (file)
 #ifndef CCRenderPass_h
 #define CCRenderPass_h
 
+#include "CCDrawQuad.h"
+#include "CCOcclusionTracker.h"
+#include "CCSharedQuadState.h"
 #include "SkColor.h"
-#include "cc/CCDrawQuad.h"
-#include "cc/CCOcclusionTracker.h"
-#include "cc/CCSharedQuadState.h"
 #include <public/WebFilterOperations.h>
 #include <public/WebTransformationMatrix.h>
 #include <wtf/HashMap.h>
index df8ce0c..0d2caf9 100644 (file)
@@ -26,9 +26,9 @@
 #ifndef CCRenderPassDrawQuad_h
 #define CCRenderPassDrawQuad_h
 
+#include "CCDrawQuad.h"
+#include "CCResourceProvider.h"
 #include "IntRect.h"
-#include "cc/CCDrawQuad.h"
-#include "cc/CCResourceProvider.h"
 #include <wtf/PassOwnPtr.h>
 
 namespace WebCore {
index ed9675e..11edbfa 100644 (file)
 
 #if USE(ACCELERATED_COMPOSITING)
 
-#include "cc/CCRenderSurface.h"
-
+#include "CCRenderSurface.h"
+
+#include "CCDamageTracker.h"
+#include "CCDebugBorderDrawQuad.h"
+#include "CCLayerImpl.h"
+#include "CCMathUtil.h"
+#include "CCQuadSink.h"
+#include "CCRenderPassDrawQuad.h"
+#include "CCSharedQuadState.h"
 #include "GraphicsContext3D.h"
 #include "LayerRendererChromium.h"
 #include "TextStream.h"
-#include "cc/CCDamageTracker.h"
-#include "cc/CCDebugBorderDrawQuad.h"
-#include "cc/CCLayerImpl.h"
-#include "cc/CCMathUtil.h"
-#include "cc/CCQuadSink.h"
-#include "cc/CCRenderPassDrawQuad.h"
-#include "cc/CCSharedQuadState.h"
 #include <public/WebTransformationMatrix.h>
 #include <wtf/text/CString.h>
 
index eb53af2..0e518b2 100644 (file)
@@ -29,9 +29,9 @@
 
 #if USE(ACCELERATED_COMPOSITING)
 
+#include "CCSharedQuadState.h"
 #include "FloatRect.h"
 #include "IntRect.h"
-#include "cc/CCSharedQuadState.h"
 #include <public/WebTransformationMatrix.h>
 #include <wtf/Noncopyable.h>
 #include <wtf/text/WTFString.h>
index 1dba8d3..bc3e5db 100644 (file)
@@ -27,7 +27,7 @@
 
 #if USE(ACCELERATED_COMPOSITING)
 
-#include "cc/CCRenderSurfaceFilters.h"
+#include "CCRenderSurfaceFilters.h"
 
 #include "FloatSize.h"
 #include "SkBlurImageFilter.h"
index 6664b7f..40ab241 100644 (file)
 #ifndef CCRenderer_h
 #define CCRenderer_h
 
+#include "CCLayerTreeHost.h"
+#include "CCRenderPass.h"
 #include "FloatQuad.h"
 #include "IntRect.h"
-#include "cc/CCLayerTreeHost.h"
-#include "cc/CCRenderPass.h"
 #include <wtf/Noncopyable.h>
 #include <wtf/PassRefPtr.h>
 
index 8a9e290..8a5d6af 100644 (file)
 
 #include "config.h"
 
-#include "cc/CCResourceProvider.h"
+#include "CCResourceProvider.h"
 
+#include "CCProxy.h"
 #include "Extensions3DChromium.h"
 #include "IntRect.h"
 #include "LayerRendererChromium.h" // For the GLC() macro
 #include "LayerTextureSubImage.h"
-#include "cc/CCProxy.h"
 #include <public/WebGraphicsContext3D.h>
 #include <wtf/HashSet.h>
 
index 3a038be..b8733a1 100644 (file)
@@ -27,9 +27,9 @@
 #ifndef CCResourceProvider_h
 #define CCResourceProvider_h
 
+#include "CCGraphicsContext.h"
 #include "GraphicsContext3D.h"
 #include "IntSize.h"
-#include "cc/CCGraphicsContext.h"
 #include <wtf/Deque.h>
 #include <wtf/HashMap.h>
 #include <wtf/OwnPtr.h>
index 2c1b505..4d9ed36 100644 (file)
@@ -24,7 +24,8 @@
 
 #include "config.h"
 
-#include "cc/CCScheduler.h"
+#include "CCScheduler.h"
+
 #include "TraceEvent.h"
 
 namespace WebCore {
index a7d8b03..c6ef4d5 100644 (file)
@@ -25,8 +25,8 @@
 #ifndef CCScheduler_h
 #define CCScheduler_h
 
-#include "cc/CCFrameRateController.h"
-#include "cc/CCSchedulerStateMachine.h"
+#include "CCFrameRateController.h"
+#include "CCSchedulerStateMachine.h"
 
 #include <wtf/Noncopyable.h>
 #include <wtf/PassOwnPtr.h>
index c729d50..ffcd5e9 100644 (file)
@@ -24,9 +24,7 @@
 
 #include "config.h"
 
-#include "cc/CCSchedulerStateMachine.h"
-
-#include <stdio.h>
+#include "CCSchedulerStateMachine.h"
 
 namespace WebCore {
 
index 734420e..2716d16 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef CCScopedTexture_h
 #define CCScopedTexture_h
 
-#include "cc/CCTexture.h"
+#include "CCTexture.h"
 
 #if !ASSERT_DISABLED
 #include <wtf/MainThread.h>
index bd724a3..0e4530e 100644 (file)
@@ -25,7 +25,7 @@
 #ifndef CCScopedThreadProxy_h
 #define CCScopedThreadProxy_h
 
-#include "cc/CCThreadTask.h"
+#include "CCThreadTask.h"
 #include <wtf/ThreadSafeRefCounted.h>
 
 namespace WebCore {
index 3c0aac1..bb15f6c 100644 (file)
 
 #include "config.h"
 
-#include "cc/CCScrollbarAnimationController.h"
+#include "CCScrollbarAnimationController.h"
 
-#include "cc/CCScrollbarLayerImpl.h"
+#include "CCScrollbarLayerImpl.h"
 #include <wtf/CurrentTime.h>
 
 #if OS(ANDROID)
-#include "cc/CCScrollbarAnimationControllerLinearFade.h"
+#include "CCScrollbarAnimationControllerLinearFade.h"
 #endif
 
 namespace WebCore {
index 820f229..ea97b13 100644 (file)
@@ -24,9 +24,9 @@
 
 #include "config.h"
 
-#include "cc/CCScrollbarAnimationControllerLinearFade.h"
+#include "CCScrollbarAnimationControllerLinearFade.h"
 
-#include "cc/CCScrollbarLayerImpl.h"
+#include "CCScrollbarLayerImpl.h"
 
 namespace WebCore {
 
index eb9d81e..cd9e0f3 100644 (file)
@@ -25,7 +25,7 @@
 #ifndef CCScrollbarAnimationControllerLinearFade_h
 #define CCScrollbarAnimationControllerLinearFade_h
 
-#include "cc/CCScrollbarAnimationController.h"
+#include "CCScrollbarAnimationController.h"
 
 namespace WebCore {
 
index ec05895..e299318 100644 (file)
@@ -29,9 +29,9 @@
 
 #include "CCScrollbarLayerImpl.h"
 
-#include "cc/CCQuadSink.h"
-#include "cc/CCScrollbarAnimationController.h"
-#include "cc/CCTextureDrawQuad.h"
+#include "CCQuadSink.h"
+#include "CCScrollbarAnimationController.h"
+#include "CCTextureDrawQuad.h"
 
 using WebKit::WebRect;
 using WebKit::WebScrollbar;
index 5b8dac2..ca40d09 100644 (file)
@@ -28,7 +28,7 @@
 
 #if USE(ACCELERATED_COMPOSITING)
 
-#include "cc/CCLayerImpl.h"
+#include "CCLayerImpl.h"
 #include <public/WebRect.h>
 #include <public/WebScrollbar.h>
 #include <public/WebScrollbarThemeGeometry.h>
index e6ef551..1bcab74 100644 (file)
@@ -24,7 +24,7 @@
 
 #include "config.h"
 
-#include "cc/CCSettings.h"
+#include "CCSettings.h"
 
 namespace {
 static bool s_perTilePaintingEnabled = false;
index 361b515..88a8ffb 100644 (file)
 
 #include "config.h"
 
-#include "cc/CCSingleThreadProxy.h"
+#include "CCSingleThreadProxy.h"
 
+#include "CCDrawQuad.h"
+#include "CCGraphicsContext.h"
+#include "CCLayerTreeHost.h"
+#include "CCTextureUpdateController.h"
+#include "CCTimer.h"
 #include "TraceEvent.h"
-#include "cc/CCDrawQuad.h"
-#include "cc/CCGraphicsContext.h"
-#include "cc/CCLayerTreeHost.h"
-#include "cc/CCTextureUpdateController.h"
-#include "cc/CCTimer.h"
 #include <wtf/CurrentTime.h>
 
 using namespace WTF;
index 319d335..7f80478 100644 (file)
@@ -25,9 +25,9 @@
 #ifndef CCSingleThreadProxy_h
 #define CCSingleThreadProxy_h
 
-#include "cc/CCAnimationEvents.h"
-#include "cc/CCLayerTreeHostImpl.h"
-#include "cc/CCProxy.h"
+#include "CCAnimationEvents.h"
+#include "CCLayerTreeHostImpl.h"
+#include "CCProxy.h"
 #include <limits>
 #include <wtf/OwnPtr.h>
 
index 59bc8fe..2d9c6e5 100644 (file)
@@ -26,9 +26,8 @@
 #ifndef CCSolidColorDrawQuad_h
 #define CCSolidColorDrawQuad_h
 
+#include "CCDrawQuad.h"
 #include "SkColor.h"
-#include "cc/CCDrawQuad.h"
-
 #include <wtf/PassOwnPtr.h>
 
 namespace WebCore {
index f52c797..23984f9 100644 (file)
 
 #if USE(ACCELERATED_COMPOSITING)
 
-#include "cc/CCSolidColorLayerImpl.h"
+#include "CCSolidColorLayerImpl.h"
 
-#include "cc/CCQuadSink.h"
-#include "cc/CCSolidColorDrawQuad.h"
+#include "CCQuadSink.h"
+#include "CCSolidColorDrawQuad.h"
 #include <wtf/MathExtras.h>
 #include <wtf/text/WTFString.h>
 
index 7153f21..d19a230 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef CCSolidColorLayerImpl_h
 #define CCSolidColorLayerImpl_h
 
-#include "cc/CCLayerImpl.h"
+#include "CCLayerImpl.h"
 #include <public/WebTransformationMatrix.h>
 
 namespace WebCore {
index c935db7..477995b 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef CCStreamVideoDrawQuad_h
 #define CCStreamVideoDrawQuad_h
 
-#include "cc/CCDrawQuad.h"
+#include "CCDrawQuad.h"
 #include <public/WebTransformationMatrix.h>
 
 #include <wtf/PassOwnPtr.h>
index d3e4b8f..f7ba07f 100644 (file)
 #ifndef CCTexture_h
 #define CCTexture_h
 
+#include "CCResourceProvider.h"
+#include "CCTexture.h"
 #include "GraphicsContext3D.h"
 #include "IntSize.h"
-#include "cc/CCResourceProvider.h"
-#include "cc/CCTexture.h"
 
 namespace WebCore {
 
index 20d5c9d..0141893 100644 (file)
@@ -26,8 +26,8 @@
 #ifndef CCTextureDrawQuad_h
 #define CCTextureDrawQuad_h
 
+#include "CCDrawQuad.h"
 #include "FloatRect.h"
-#include "cc/CCDrawQuad.h"
 #include <wtf/PassOwnPtr.h>
 
 namespace WebCore {
index 7cbbece..4ad96e1 100644 (file)
 
 #if USE(ACCELERATED_COMPOSITING)
 
-#include "cc/CCTextureLayerImpl.h"
+#include "CCTextureLayerImpl.h"
 
+#include "CCQuadSink.h"
+#include "CCRenderer.h"
+#include "CCTextureDrawQuad.h"
 #include "TextStream.h"
-#include "cc/CCQuadSink.h"
-#include "cc/CCRenderer.h"
-#include "cc/CCTextureDrawQuad.h"
 
 namespace WebCore {
 
index e545314..153eb91 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef CCTextureLayerImpl_h
 #define CCTextureLayerImpl_h
 
-#include "cc/CCLayerImpl.h"
+#include "CCLayerImpl.h"
 
 namespace WebCore {
 
index dde8949..584d5f8 100644 (file)
@@ -25,7 +25,7 @@
 
 #include "config.h"
 
-#include "cc/CCTextureUpdateController.h"
+#include "CCTextureUpdateController.h"
 
 #include "GraphicsContext3D.h"
 #include "TextureCopier.h"
index d6cda59..3d4f198 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef CCTextureUpdateController_h
 #define CCTextureUpdateController_h
 
-#include "cc/CCTextureUpdateQueue.h"
+#include "CCTextureUpdateQueue.h"
 #include <wtf/Noncopyable.h>
 #include <wtf/OwnPtr.h>
 
index 6c650f9..8f58fcb 100644 (file)
@@ -27,7 +27,7 @@
 
 #if USE(ACCELERATED_COMPOSITING)
 
-#include "cc/CCTextureUpdateQueue.h"
+#include "CCTextureUpdateQueue.h"
 
 namespace WebCore {
 
index 7d5d4b6..a0ac028 100644 (file)
 
 #include "config.h"
 
-#include "cc/CCThreadProxy.h"
-
+#include "CCThreadProxy.h"
+
+#include "CCDelayBasedTimeSource.h"
+#include "CCDrawQuad.h"
+#include "CCFrameRateController.h"
+#include "CCGraphicsContext.h"
+#include "CCInputHandler.h"
+#include "CCLayerTreeHost.h"
+#include "CCScheduler.h"
+#include "CCScopedThreadProxy.h"
+#include "CCTextureUpdateController.h"
+#include "CCThreadTask.h"
 #include "TraceEvent.h"
-#include "cc/CCDelayBasedTimeSource.h"
-#include "cc/CCDrawQuad.h"
-#include "cc/CCFrameRateController.h"
-#include "cc/CCGraphicsContext.h"
-#include "cc/CCInputHandler.h"
-#include "cc/CCLayerTreeHost.h"
-#include "cc/CCScheduler.h"
-#include "cc/CCScopedThreadProxy.h"
-#include "cc/CCTextureUpdateController.h"
-#include "cc/CCThreadTask.h"
 #include <public/WebSharedGraphicsContext3D.h>
 #include <wtf/CurrentTime.h>
 #include <wtf/MainThread.h>
index ddb4d90..1170016 100644 (file)
 #ifndef CCThreadProxy_h
 #define CCThreadProxy_h
 
-#include "cc/CCAnimationEvents.h"
-#include "cc/CCCompletionEvent.h"
-#include "cc/CCLayerTreeHostImpl.h"
-#include "cc/CCProxy.h"
-#include "cc/CCScheduler.h"
+#include "CCAnimationEvents.h"
+#include "CCCompletionEvent.h"
+#include "CCLayerTreeHostImpl.h"
+#include "CCProxy.h"
+#include "CCScheduler.h"
 #include <wtf/OwnPtr.h>
 
 namespace WebCore {
index c931594..bd520d2 100644 (file)
@@ -24,7 +24,7 @@
 #ifndef CCThreadTask_h
 #define CCThreadTask_h
 
-#include "cc/CCThread.h"
+#include "CCThread.h"
 #include <wtf/PassOwnPtr.h>
 #include <wtf/PassRefPtr.h>
 
index 7943bc9..53f2c88 100644 (file)
 #ifndef CCTileDrawQuad_h
 #define CCTileDrawQuad_h
 
+#include "CCDrawQuad.h"
 #include "GraphicsTypes3D.h"
 #include "IntPoint.h"
 #include "IntSize.h"
-#include "cc/CCDrawQuad.h"
 #include <wtf/PassOwnPtr.h>
 
 namespace WebCore {
index 74eb2dc..9ed4d9b 100644 (file)
 
 #if USE(ACCELERATED_COMPOSITING)
 
-#include "cc/CCTiledLayerImpl.h"
-
+#include "CCTiledLayerImpl.h"
+
+#include "CCCheckerboardDrawQuad.h"
+#include "CCDebugBorderDrawQuad.h"
+#include "CCLayerTilingData.h"
+#include "CCMathUtil.h"
+#include "CCQuadSink.h"
+#include "CCSolidColorDrawQuad.h"
+#include "CCTileDrawQuad.h"
 #include "GraphicsContext3D.h"
 #include "SkColor.h"
 #include "TextStream.h"
-#include "cc/CCCheckerboardDrawQuad.h"
-#include "cc/CCDebugBorderDrawQuad.h"
-#include "cc/CCLayerTilingData.h"
-#include "cc/CCMathUtil.h"
-#include "cc/CCQuadSink.h"
-#include "cc/CCSolidColorDrawQuad.h"
-#include "cc/CCTileDrawQuad.h"
 #include <wtf/text/WTFString.h>
 
 using namespace std;
index 015fdc3..6b877b3 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef CCTiledLayerImpl_h
 #define CCTiledLayerImpl_h
 
-#include "cc/CCLayerImpl.h"
+#include "CCLayerImpl.h"
 #include <public/WebTransformationMatrix.h>
 
 namespace WebCore {
index 396d81a..a5586ad 100644 (file)
@@ -30,9 +30,9 @@
 
 #include "config.h"
 
-#include "cc/CCTimer.h"
+#include "CCTimer.h"
 
-#include "cc/CCThread.h"
+#include "CCThread.h"
 
 namespace WebCore {
 
index 272997e..6a79363 100644 (file)
@@ -25,9 +25,8 @@
 #ifndef CCTimingFunction_h
 #define CCTimingFunction_h
 
+#include "CCAnimationCurve.h"
 #include "UnitBezier.h"
-#include "cc/CCAnimationCurve.h"
-
 #include <wtf/PassOwnPtr.h>
 
 namespace WebCore {
index 47b3c6f..14cb327 100644 (file)
 
 #if USE(ACCELERATED_COMPOSITING)
 
-#include "cc/CCVideoLayerImpl.h"
-
+#include "CCVideoLayerImpl.h"
+
+#include "CCIOSurfaceDrawQuad.h"
+#include "CCLayerTreeHostImpl.h"
+#include "CCProxy.h"
+#include "CCQuadSink.h"
+#include "CCResourceProvider.h"
+#include "CCStreamVideoDrawQuad.h"
+#include "CCTextureDrawQuad.h"
+#include "CCYUVVideoDrawQuad.h"
 #include "Extensions3DChromium.h"
 #include "GraphicsContext3D.h"
 #include "NotImplemented.h"
 #include "TextStream.h"
-#include "cc/CCIOSurfaceDrawQuad.h"
-#include "cc/CCLayerTreeHostImpl.h"
-#include "cc/CCProxy.h"
-#include "cc/CCQuadSink.h"
-#include "cc/CCResourceProvider.h"
-#include "cc/CCStreamVideoDrawQuad.h"
-#include "cc/CCTextureDrawQuad.h"
-#include "cc/CCYUVVideoDrawQuad.h"
 #include <public/WebVideoFrame.h>
 #include <wtf/text/WTFString.h>
 
index 414ca68..30070c8 100644 (file)
@@ -26,9 +26,9 @@
 #ifndef CCVideoLayerImpl_h
 #define CCVideoLayerImpl_h
 
+#include "CCLayerImpl.h"
 #include "GraphicsContext3D.h"
 #include "IntSize.h"
-#include "cc/CCLayerImpl.h"
 #include <public/WebTransformationMatrix.h>
 #include <public/WebVideoFrameProvider.h>
 
index 456a96f..b564e9f 100644 (file)
@@ -26,8 +26,8 @@
 #ifndef CCYUVVideoDrawQuad_h
 #define CCYUVVideoDrawQuad_h
 
-#include "cc/CCDrawQuad.h"
-#include "cc/CCVideoLayerImpl.h"
+#include "CCDrawQuad.h"
+#include "CCVideoLayerImpl.h"
 #include <wtf/PassOwnPtr.h>
 
 namespace WebCore {
index 6cd9ee5..7d476f3 100644 (file)
@@ -27,8 +27,9 @@
 #include "config.h"
 
 #include "SharedGraphicsContext3D.h"
+
+#include "CCProxy.h"
 #include "Extensions3D.h"
-#include "cc/CCProxy.h"
 
 namespace WebCore {
 
index 7555d12..2e0b82f 100644 (file)
@@ -1,3 +1,75 @@
+2012-08-16  James Robinson  <jamesr@chromium.org>
+
+        [chromium] Add Source/WebCore/platform/graphics/chromium/cc/ to include path and remove cc/ prefix from includes
+        https://bugs.webkit.org/show_bug.cgi?id=94279
+
+        Reviewed by Adam Barth.
+
+        * src/WebAnimationCurveCommon.cpp:
+        * src/WebAnimationImpl.cpp:
+        * src/WebCompositorInputHandlerImpl.cpp:
+        * src/WebCompositorInputHandlerImpl.h:
+        * src/WebExternalTextureLayer.cpp:
+        * src/WebFloatAnimationCurve.cpp:
+        * src/WebLayerTreeView.cpp:
+        * src/WebLayerTreeViewImpl.cpp:
+        * src/WebTransformAnimationCurve.cpp:
+        * tests/CCActiveAnimationTest.cpp:
+        * tests/CCAnimationTestCommon.cpp:
+        * tests/CCAnimationTestCommon.h:
+        * tests/CCDamageTrackerTest.cpp:
+        * tests/CCDelayBasedTimeSourceTest.cpp:
+        * tests/CCFrameRateControllerTest.cpp:
+        * tests/CCKeyframedAnimationCurveTest.cpp:
+        * tests/CCLayerAnimationControllerTest.cpp:
+        * tests/CCLayerImplTest.cpp:
+        * tests/CCLayerIteratorTest.cpp:
+        * tests/CCLayerQuadTest.cpp:
+        * tests/CCLayerSorterTest.cpp:
+        * tests/CCLayerTestCommon.cpp:
+        * tests/CCLayerTestCommon.h:
+        * tests/CCLayerTreeHostCommonTest.cpp:
+        * tests/CCLayerTreeHostImplTest.cpp:
+        * tests/CCLayerTreeHostTest.cpp:
+        * tests/CCMathUtilTest.cpp:
+        * tests/CCOcclusionTrackerTest.cpp:
+        * tests/CCOcclusionTrackerTestCommon.h:
+        * tests/CCPrioritizedTextureTest.cpp:
+        * tests/CCQuadCullerTest.cpp:
+        * tests/CCRenderSurfaceFiltersTest.cpp:
+        * tests/CCRenderSurfaceTest.cpp:
+        * tests/CCResourceProviderTest.cpp:
+        * tests/CCSchedulerStateMachineTest.cpp:
+        * tests/CCSchedulerTest.cpp:
+        * tests/CCSchedulerTestCommon.h:
+        * tests/CCScopedTextureTest.cpp:
+        * tests/CCScrollbarAnimationControllerLinearFadeTest.cpp:
+        * tests/CCSolidColorLayerImplTest.cpp:
+        * tests/CCTestCommon.h:
+        * tests/CCTextureUpdateControllerTest.cpp:
+        * tests/CCThreadTaskTest.cpp:
+        * tests/CCThreadedTest.cpp:
+        * tests/CCThreadedTest.h:
+        * tests/CCTiledLayerImplTest.cpp:
+        * tests/CCTiledLayerTestCommon.h:
+        * tests/CCTimerTest.cpp:
+        * tests/ContentLayerChromiumTest.cpp:
+        * tests/FakeCCGraphicsContext.h:
+        * tests/FakeCCLayerTreeHostClient.h:
+        * tests/FloatQuadTest.cpp:
+        * tests/GraphicsLayerChromiumTest.cpp:
+        * tests/LayerChromiumTest.cpp:
+        * tests/LayerRendererChromiumTest.cpp:
+        * tests/MockCCQuadCuller.h:
+        * tests/PlatformGestureCurveTest.cpp:
+        * tests/ScrollbarLayerChromiumTest.cpp:
+        * tests/TextureLayerChromiumTest.cpp:
+        * tests/TiledLayerChromiumTest.cpp:
+        * tests/TreeSynchronizerTest.cpp:
+        * tests/WebCompositorInputHandlerImplTest.cpp:
+        * tests/WebFloatAnimationCurveTest.cpp:
+        * tests/WebTransformAnimationCurveTest.cpp:
+
 2012-08-17  Pavel Feldman  <pfeldman@chromium.org>
 
         Web Inspector: make profiles panel a lazily loaded module.
index b5b98b0..2b7be03 100644 (file)
@@ -26,7 +26,7 @@
 
 #include "WebAnimationCurveCommon.h"
 
-#include "cc/CCTimingFunction.h"
+#include "CCTimingFunction.h"
 
 #include <wtf/OwnPtr.h>
 #include <wtf/PassOwnPtr.h>
index 3d3b702..32e44a3 100644 (file)
@@ -27,8 +27,8 @@
 #include "WebAnimationImpl.h"
 
 #include "AnimationIdVendor.h"
-#include "cc/CCActiveAnimation.h"
-#include "cc/CCAnimationCurve.h"
+#include "CCActiveAnimation.h"
+#include "CCAnimationCurve.h"
 #include <public/WebAnimation.h>
 #include <public/WebAnimationCurve.h>
 #include <wtf/OwnPtr.h>
index 25b31d5..2f79bd8 100644 (file)
 
 #include "WebCompositorInputHandlerImpl.h"
 
+#include "CCActiveGestureAnimation.h"
+#include "CCProxy.h"
 #include "PlatformGestureCurveTarget.h"
 #include "TouchpadFlingPlatformGestureCurve.h"
 #include "TraceEvent.h"
 #include "WebCompositorImpl.h"
 #include "WebCompositorInputHandlerClient.h"
 #include "WebInputEvent.h"
-#include "cc/CCActiveGestureAnimation.h"
-#include "cc/CCProxy.h"
 #include <wtf/ThreadingPrimitives.h>
 
 using namespace WebCore;
index 6bb09ab..9474b21 100644 (file)
 #ifndef WebCompositorInputHandlerImpl_h
 #define WebCompositorInputHandlerImpl_h
 
+#include "CCGestureCurve.h"
+#include "CCInputHandler.h"
 #include "WebActiveWheelFlingParameters.h"
 #include "WebCompositorInputHandler.h"
 #include "WebInputEvent.h"
-#include "cc/CCGestureCurve.h"
-#include "cc/CCInputHandler.h"
 #include <public/WebCompositor.h>
 #include <wtf/HashSet.h>
 #include <wtf/Noncopyable.h>
index bbd1f8d..d4aff57 100644 (file)
@@ -26,8 +26,8 @@
 #include "config.h"
 #include <public/WebExternalTextureLayer.h>
 
+#include "CCTextureUpdateQueue.h"
 #include "TextureLayerChromium.h"
-#include "cc/CCTextureUpdateQueue.h"
 #include <public/WebExternalTextureLayerClient.h>
 #include <public/WebFloatRect.h>
 #include <public/WebSize.h>
index d8cc9bb..e8cf7c2 100644 (file)
@@ -26,9 +26,9 @@
 
 #include <public/WebFloatAnimationCurve.h>
 
+#include "CCKeyframedAnimationCurve.h"
+#include "CCTimingFunction.h"
 #include "WebAnimationCurveCommon.h"
-#include "cc/CCKeyframedAnimationCurve.h"
-#include "cc/CCTimingFunction.h"
 #include <wtf/OwnPtr.h>
 #include <wtf/PassOwnPtr.h>
 
index edd43df..f397e53 100644 (file)
 #include "config.h"
 #include <public/WebLayerTreeView.h>
 
+#include "CCFontAtlas.h"
+#include "CCGraphicsContext.h"
+#include "CCLayerTreeHost.h"
+#include "CCRenderingStats.h"
 #include "LayerChromium.h"
 #include "WebLayerTreeViewImpl.h"
-#include "cc/CCFontAtlas.h"
-#include "cc/CCGraphicsContext.h"
-#include "cc/CCLayerTreeHost.h"
-#include "cc/CCRenderingStats.h"
 #include <public/WebLayer.h>
 #include <public/WebPoint.h>
 #include <public/WebRect.h>
index a7bf64d..1f1933f 100644 (file)
@@ -26,9 +26,9 @@
 #include "config.h"
 #include "WebLayerTreeViewImpl.h"
 
+#include "CCLayerTreeHost.h"
+#include "CCThreadProxy.h"
 #include "LayerChromium.h"
-#include "cc/CCLayerTreeHost.h"
-#include "cc/CCThreadProxy.h"
 #include <public/WebGraphicsContext3D.h>
 #include <public/WebLayer.h>
 #include <public/WebLayerTreeView.h>
index ca95fa3..dad0849 100644 (file)
@@ -26,9 +26,9 @@
 
 #include <public/WebTransformAnimationCurve.h>
 
+#include "CCKeyframedAnimationCurve.h"
+#include "CCTimingFunction.h"
 #include "WebAnimationCurveCommon.h"
-#include "cc/CCKeyframedAnimationCurve.h"
-#include "cc/CCTimingFunction.h"
 #include <wtf/OwnPtr.h>
 #include <wtf/PassOwnPtr.h>
 
index af9fde1..899dd37 100644 (file)
@@ -24,9 +24,9 @@
 
 #include "config.h"
 
-#include "cc/CCActiveAnimation.h"
-#include "CCAnimationTestCommon.h"
+#include "CCActiveAnimation.h"
 
+#include "CCAnimationTestCommon.h"
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include <wtf/Vector.h>
index f210c1b..76d1c0a 100644 (file)
 
 #include "CCAnimationTestCommon.h"
 
+#include "CCKeyframedAnimationCurve.h"
+#include "CCLayerAnimationController.h"
+#include "CCLayerImpl.h"
 #include "LayerChromium.h"
-#include "cc/CCKeyframedAnimationCurve.h"
-#include "cc/CCLayerAnimationController.h"
-#include "cc/CCLayerImpl.h"
-
 #include <public/WebTransformOperations.h>
 
 using namespace WebCore;
index 4bbd601..f2564e5 100644 (file)
 #ifndef CCAnimationTestCommon_h
 #define CCAnimationTestCommon_h
 
+#include "CCAnimationCurve.h"
+#include "CCLayerAnimationController.h"
 #include "IntSize.h"
-#include "cc/CCAnimationCurve.h"
-#include "cc/CCLayerAnimationController.h"
-
 #include <wtf/OwnPtr.h>
 
 namespace WebCore {
index 8f813b9..f9eecdb 100644 (file)
 
 #include "config.h"
 
-#include "cc/CCDamageTracker.h"
+#include "CCDamageTracker.h"
 
+#include "CCLayerImpl.h"
+#include "CCLayerSorter.h"
+#include "CCLayerTreeHostCommon.h"
 #include "CCLayerTreeTestCommon.h"
-#include "cc/CCLayerImpl.h"
-#include "cc/CCLayerSorter.h"
-#include "cc/CCLayerTreeHostCommon.h"
-#include "cc/CCMathUtil.h"
-#include "cc/CCSingleThreadProxy.h"
+#include "CCMathUtil.h"
+#include "CCSingleThreadProxy.h"
 #include <gtest/gtest.h>
 #include <public/WebFilterOperation.h>
 #include <public/WebFilterOperations.h>
index 930439f..1197a31 100644 (file)
 
 #include "config.h"
 
-#include "cc/CCDelayBasedTimeSource.h"
+#include "CCDelayBasedTimeSource.h"
 
 #include "CCSchedulerTestCommon.h"
-#include "cc/CCThread.h"
+#include "CCThread.h"
 #include <gtest/gtest.h>
 #include <wtf/RefPtr.h>
 
index ab365a5..347ca9e 100644 (file)
@@ -24,7 +24,7 @@
 
 #include "config.h"
 
-#include "cc/CCFrameRateController.h"
+#include "CCFrameRateController.h"
 
 #include "CCSchedulerTestCommon.h"
 #include <gtest/gtest.h>
index 4d2c4dd..571eee1 100644 (file)
@@ -24,7 +24,7 @@
 
 #include "config.h"
 
-#include "cc/CCKeyframedAnimationCurve.h"
+#include "CCKeyframedAnimationCurve.h"
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
index 2ce33a5..80e120f 100644 (file)
 
 #include "config.h"
 
-#include "cc/CCLayerAnimationController.h"
+#include "CCLayerAnimationController.h"
 
+#include "CCActiveAnimation.h"
+#include "CCAnimationCurve.h"
 #include "CCAnimationTestCommon.h"
-#include "cc/CCActiveAnimation.h"
-#include "cc/CCAnimationCurve.h"
-
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include <public/WebTransformationMatrix.h>
index 27c4a91..965a211 100644 (file)
@@ -24,9 +24,9 @@
 
 #include "config.h"
 
-#include "cc/CCLayerImpl.h"
+#include "CCLayerImpl.h"
 
-#include "cc/CCSingleThreadProxy.h"
+#include "CCSingleThreadProxy.h"
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include <public/WebFilterOperation.h>
index b5e2269..a8db367 100644 (file)
 
 #include "config.h"
 
-#include "cc/CCLayerIterator.h"
+#include "CCLayerIterator.h"
 
+#include "CCLayerTreeHostCommon.h"
 #include "LayerChromium.h"
-#include "cc/CCLayerTreeHostCommon.h"
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include <public/WebTransformationMatrix.h>
index ece2420..59bf8ee 100644 (file)
@@ -24,7 +24,7 @@
 
 #include "config.h"
 
-#include "cc/CCLayerQuad.h"
+#include "CCLayerQuad.h"
 
 #include <gtest/gtest.h>
 
index 8ffcea2..b2cb479 100644 (file)
 
 #include "config.h"
 
-#include "cc/CCLayerSorter.h"
+#include "CCLayerSorter.h"
 
-#include "cc/CCLayerImpl.h"
-#include "cc/CCMathUtil.h"
-#include "cc/CCSingleThreadProxy.h"
+#include "CCLayerImpl.h"
+#include "CCMathUtil.h"
+#include "CCSingleThreadProxy.h"
 #include <gtest/gtest.h>
 #include <public/WebTransformationMatrix.h>
 
index 6cc4d2c..b2b6df5 100644 (file)
@@ -25,7 +25,7 @@
 #include "config.h"
 
 #include "CCLayerTestCommon.h"
-#include "cc/CCDrawQuad.h"
+#include "CCDrawQuad.h"
 
 #include <gtest/gtest.h>
 #include <wtf/Vector.h>
index 052d44b..8b048b7 100644 (file)
@@ -25,9 +25,9 @@
 #ifndef CCLayerTestCommon_h
 #define CCLayerTestCommon_h
 
+#include "CCRenderPass.h"
 #include "IntRect.h"
 #include "Region.h"
-#include "cc/CCRenderPass.h"
 
 namespace CCLayerTestCommon {
 
index 1e6a598..ac04b50 100644 (file)
 
 #include "config.h"
 
-#include "cc/CCLayerTreeHostCommon.h"
+#include "CCLayerTreeHostCommon.h"
 
 #include "CCAnimationTestCommon.h"
+#include "CCLayerAnimationController.h"
+#include "CCLayerImpl.h"
+#include "CCLayerSorter.h"
 #include "CCLayerTreeTestCommon.h"
+#include "CCMathUtil.h"
+#include "CCProxy.h"
+#include "CCSingleThreadProxy.h"
+#include "CCThread.h"
 #include "ContentLayerChromium.h"
 #include "LayerChromium.h"
-#include "cc/CCLayerAnimationController.h"
-#include "cc/CCLayerImpl.h"
-#include "cc/CCLayerSorter.h"
-#include "cc/CCMathUtil.h"
-#include "cc/CCProxy.h"
-#include "cc/CCSingleThreadProxy.h"
-#include "cc/CCThread.h"
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
index 2941811..c85a6b8 100644 (file)
 
 #include "config.h"
 
-#include "cc/CCLayerTreeHostImpl.h"
+#include "CCLayerTreeHostImpl.h"
 
 #include "CCAnimationTestCommon.h"
+#include "CCHeadsUpDisplayLayerImpl.h"
+#include "CCIOSurfaceLayerImpl.h"
+#include "CCLayerImpl.h"
 #include "CCLayerTestCommon.h"
+#include "CCLayerTilingData.h"
 #include "CCLayerTreeTestCommon.h"
+#include "CCQuadCuller.h"
+#include "CCRenderPassDrawQuad.h"
+#include "CCScrollbarLayerImpl.h"
+#include "CCSettings.h"
+#include "CCSingleThreadProxy.h"
+#include "CCSolidColorDrawQuad.h"
 #include "CCTestCommon.h"
+#include "CCTextureLayerImpl.h"
+#include "CCTileDrawQuad.h"
+#include "CCTiledLayerImpl.h"
+#include "CCVideoLayerImpl.h"
 #include "FakeWebCompositorOutputSurface.h"
 #include "FakeWebGraphicsContext3D.h"
 #include "FakeWebScrollbarThemeGeometry.h"
 #include "LayerRendererChromium.h"
-#include "cc/CCHeadsUpDisplayLayerImpl.h"
-#include "cc/CCIOSurfaceLayerImpl.h"
-#include "cc/CCLayerImpl.h"
-#include "cc/CCLayerTilingData.h"
-#include "cc/CCQuadCuller.h"
-#include "cc/CCRenderPassDrawQuad.h"
-#include "cc/CCScrollbarLayerImpl.h"
-#include "cc/CCSettings.h"
-#include "cc/CCSingleThreadProxy.h"
-#include "cc/CCSolidColorDrawQuad.h"
-#include "cc/CCTextureLayerImpl.h"
-#include "cc/CCTileDrawQuad.h"
-#include "cc/CCTiledLayerImpl.h"
-#include "cc/CCVideoLayerImpl.h"
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include <public/WebVideoFrame.h>
index 59baeac..86c8ae6 100644 (file)
 
 #include "config.h"
 
-#include "cc/CCLayerTreeHost.h"
+#include "CCLayerTreeHost.h"
 
+#include "CCGraphicsContext.h"
+#include "CCLayerTreeHostImpl.h"
 #include "CCOcclusionTrackerTestCommon.h"
+#include "CCSettings.h"
+#include "CCTextureUpdateQueue.h"
 #include "CCThreadedTest.h"
+#include "CCTimingFunction.h"
 #include "ContentLayerChromium.h"
-#include "cc/CCGraphicsContext.h"
-#include "cc/CCLayerTreeHostImpl.h"
-#include "cc/CCSettings.h"
-#include "cc/CCTextureUpdateQueue.h"
-#include "cc/CCTimingFunction.h"
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include <public/Platform.h>
index 44a68b9..7c5d5a3 100644 (file)
@@ -24,7 +24,7 @@
 
 #include "config.h"
 
-#include "cc/CCMathUtil.h"
+#include "CCMathUtil.h"
 
 #include "CCLayerTreeTestCommon.h"
 #include "FloatRect.h"
index 9d51c99..4e5f9dc 100644 (file)
 
 #include "config.h"
 
-#include "cc/CCOcclusionTracker.h"
+#include "CCOcclusionTracker.h"
 
 #include "CCAnimationTestCommon.h"
+#include "CCLayerAnimationController.h"
+#include "CCLayerImpl.h"
+#include "CCLayerTreeHostCommon.h"
 #include "CCLayerTreeTestCommon.h"
+#include "CCMathUtil.h"
 #include "CCOcclusionTrackerTestCommon.h"
+#include "CCOverdrawMetrics.h"
+#include "CCSingleThreadProxy.h"
 #include "LayerChromium.h"
 #include "Region.h"
-#include "cc/CCLayerAnimationController.h"
-#include "cc/CCLayerImpl.h"
-#include "cc/CCLayerTreeHostCommon.h"
-#include "cc/CCMathUtil.h"
-#include "cc/CCOverdrawMetrics.h"
-#include "cc/CCSingleThreadProxy.h"
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include <public/WebFilterOperation.h>
index fcdc3ed..cf38c5a 100644 (file)
 #ifndef CCOcclusionTrackerTestCommon_h
 #define CCOcclusionTrackerTestCommon_h
 
+#include "CCOcclusionTracker.h"
+#include "CCRenderSurface.h"
 #include "IntRect.h"
 #include "Region.h"
 #include "RenderSurfaceChromium.h"
-#include "cc/CCOcclusionTracker.h"
-#include "cc/CCRenderSurface.h"
 
 namespace WebKitTests {
 
index 9702709..4bcaccd 100644 (file)
 
 #include "config.h"
 
-#include "cc/CCPrioritizedTexture.h"
+#include "CCPrioritizedTexture.h"
 
+#include "CCPrioritizedTextureManager.h"
+#include "CCSingleThreadProxy.h" // For DebugScopedSetImplThread
+#include "CCTexture.h"
 #include "CCTiledLayerTestCommon.h"
 #include "FakeCCGraphicsContext.h"
-#include "cc/CCPrioritizedTextureManager.h"
-#include "cc/CCSingleThreadProxy.h" // For DebugScopedSetImplThread
-#include "cc/CCTexture.h"
 #include <gtest/gtest.h>
 
 using namespace WebCore;
index 8279a3a..f732cdc 100644 (file)
 
 #include "config.h"
 
-#include "cc/CCQuadCuller.h"
-
-#include "cc/CCLayerTilingData.h"
-#include "cc/CCMathUtil.h"
-#include "cc/CCOcclusionTracker.h"
-#include "cc/CCOverdrawMetrics.h"
-#include "cc/CCSingleThreadProxy.h"
-#include "cc/CCTiledLayerImpl.h"
-#include "cc/CCTileDrawQuad.h"
+#include "CCQuadCuller.h"
+
+#include "CCLayerTilingData.h"
+#include "CCMathUtil.h"
+#include "CCOcclusionTracker.h"
+#include "CCOverdrawMetrics.h"
+#include "CCSingleThreadProxy.h"
+#include "CCTileDrawQuad.h"
+#include "CCTiledLayerImpl.h"
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include <public/WebTransformationMatrix.h>
index 1d2a9c5..1b56c20 100644 (file)
@@ -24,7 +24,7 @@
 
 #include "config.h"
 
-#include "cc/CCRenderSurfaceFilters.h"
+#include "CCRenderSurfaceFilters.h"
 
 #include "CompositorFakeWebGraphicsContext3D.h"
 #include <gtest/gtest.h>
index ad8df25..a6a422e 100644 (file)
 
 #include "config.h"
 
-#include "cc/CCRenderSurface.h"
+#include "CCRenderSurface.h"
 
-#include "cc/CCLayerImpl.h"
-#include "cc/CCSharedQuadState.h"
-#include "cc/CCSingleThreadProxy.h"
+#include "CCLayerImpl.h"
+#include "CCSharedQuadState.h"
+#include "CCSingleThreadProxy.h"
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include <public/WebTransformationMatrix.h>
index 1933ee6..9e8599c 100644 (file)
 
 #include "config.h"
 
-#include "cc/CCResourceProvider.h"
+#include "CCResourceProvider.h"
 
+#include "CCGraphicsContext.h"
+#include "CCSingleThreadProxy.h" // For DebugScopedSetImplThread
 #include "CompositorFakeWebGraphicsContext3D.h"
 #include "Extensions3DChromium.h"
 #include "FakeWebCompositorOutputSurface.h"
-#include "cc/CCGraphicsContext.h"
-#include "cc/CCSingleThreadProxy.h" // For DebugScopedSetImplThread
 #include <gtest/gtest.h>
 #include <public/WebGraphicsContext3D.h>
 #include <wtf/HashMap.h>
index 2e31d44..563c2c0 100644 (file)
@@ -24,7 +24,7 @@
 
 #include "config.h"
 
-#include "cc/CCSchedulerStateMachine.h"
+#include "CCSchedulerStateMachine.h"
 
 #include <gtest/gtest.h>
 #include <wtf/text/CString.h>
index 4125088..280cef2 100644 (file)
@@ -24,7 +24,7 @@
 
 #include "config.h"
 
-#include "cc/CCScheduler.h"
+#include "CCScheduler.h"
 
 #include "CCSchedulerTestCommon.h"
 #include <gmock/gmock.h>
index 2f39324..fb6099c 100644 (file)
@@ -25,9 +25,9 @@
 #ifndef CCSchedulerTestCommon_h
 #define CCSchedulerTestCommon_h
 
-#include "cc/CCDelayBasedTimeSource.h"
-#include "cc/CCFrameRateController.h"
-#include "cc/CCThread.h"
+#include "CCDelayBasedTimeSource.h"
+#include "CCFrameRateController.h"
+#include "CCThread.h"
 #include <gtest/gtest.h>
 #include <wtf/OwnPtr.h>
 
index 505ae96..56568f8 100644 (file)
 
 #include "config.h"
 
-#include "cc/CCScopedTexture.h"
+#include "CCScopedTexture.h"
 
+#include "CCRenderer.h"
+#include "CCSingleThreadProxy.h" // For DebugScopedSetImplThread
 #include "CCTiledLayerTestCommon.h"
 #include "FakeCCGraphicsContext.h"
 #include "GraphicsContext3D.h"
-#include "cc/CCRenderer.h"
-#include "cc/CCSingleThreadProxy.h" // For DebugScopedSetImplThread
-
 #include <gtest/gtest.h>
 
 using namespace WebCore;
index 4287d36..61e5f44 100644 (file)
 
 #include "config.h"
 
-#include "cc/CCScrollbarAnimationControllerLinearFade.h"
+#include "CCScrollbarAnimationControllerLinearFade.h"
 
-#include "cc/CCScrollbarLayerImpl.h"
-#include "cc/CCSingleThreadProxy.h"
+#include "CCScrollbarLayerImpl.h"
+#include "CCSingleThreadProxy.h"
 #include <gtest/gtest.h>
 #include <wtf/OwnPtr.h>
 
index 141a963..1eba991 100644 (file)
 
 #include "config.h"
 
-#include "cc/CCSolidColorLayerImpl.h"
+#include "CCSolidColorLayerImpl.h"
 
 #include "CCLayerTestCommon.h"
+#include "CCSingleThreadProxy.h"
+#include "CCSolidColorDrawQuad.h"
 #include "MockCCQuadCuller.h"
-#include "cc/CCSingleThreadProxy.h"
-#include "cc/CCSolidColorDrawQuad.h"
-
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
index 89fce98..d2c830c 100644 (file)
@@ -25,7 +25,7 @@
 #ifndef CCTestCommon_h
 #define CCTestCommon_h
 
-#include "cc/CCSettings.h"
+#include "CCSettings.h"
 
 namespace WebKitTests {
 
index 46e7c00..5f3f542 100644 (file)
 
 #include "config.h"
 
-#include "cc/CCTextureUpdateController.h"
+#include "CCTextureUpdateController.h"
 
 #include "CCSchedulerTestCommon.h"
+#include "CCSingleThreadProxy.h" // For DebugScopedSetImplThread
 #include "CCTiledLayerTestCommon.h"
 #include "FakeWebCompositorOutputSurface.h"
 #include "FakeWebGraphicsContext3D.h"
-#include "cc/CCSingleThreadProxy.h" // For DebugScopedSetImplThread
+#include <gtest/gtest.h>
 #include <public/WebCompositor.h>
 #include <public/WebThread.h>
-
-#include <gtest/gtest.h>
 #include <wtf/RefPtr.h>
 
 using namespace WebCore;
index d9943e7..820a7b7 100644 (file)
@@ -24,7 +24,7 @@
 
 #include "config.h"
 
-#include "cc/CCThreadTask.h"
+#include "CCThreadTask.h"
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
index 89ff9cb..cde88f8 100644 (file)
 
 #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>
index 0ad6f3d..0f87de1 100644 (file)
 #ifndef CCThreadedTest_h
 #define CCThreadedTest_h
 
+#include "CCLayerTreeHost.h"
+#include "CCLayerTreeHostImpl.h"
+#include "CCScopedThreadProxy.h"
 #include "CompositorFakeWebGraphicsContext3D.h"
-#include "cc/CCLayerTreeHost.h"
-#include "cc/CCLayerTreeHostImpl.h"
-#include "cc/CCScopedThreadProxy.h"
 #include <gtest/gtest.h>
 #include <public/WebAnimationDelegate.h>
 
index 8d3ca42..62336bb 100644 (file)
 
 #include "config.h"
 
-#include "cc/CCTiledLayerImpl.h"
+#include "CCTiledLayerImpl.h"
 
 #include "CCLayerTestCommon.h"
+#include "CCLayerTilingData.h"
+#include "CCSingleThreadProxy.h"
+#include "CCTileDrawQuad.h"
 #include "MockCCQuadCuller.h"
-#include "cc/CCLayerTilingData.h"
-#include "cc/CCSingleThreadProxy.h"
-#include "cc/CCTileDrawQuad.h"
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
index 27c7caa..5de1c5f 100644 (file)
 #ifndef CCTiledLayerTestCommon_h
 #define CCTiledLayerTestCommon_h
 
+#include "CCGraphicsContext.h"
+#include "CCPrioritizedTexture.h"
+#include "CCResourceProvider.h"
+#include "CCTextureUpdateQueue.h"
+#include "CCTiledLayerImpl.h"
 #include "IntRect.h"
 #include "IntSize.h"
 #include "LayerTextureUpdater.h"
 #include "TextureCopier.h"
 #include "TextureUploader.h"
 #include "TiledLayerChromium.h"
-#include "cc/CCGraphicsContext.h"
-#include "cc/CCPrioritizedTexture.h"
-#include "cc/CCResourceProvider.h"
-#include "cc/CCTextureUpdateQueue.h"
-#include "cc/CCTiledLayerImpl.h"
 
 namespace WebKitTests {
 
index c1b2efb..8525588 100644 (file)
@@ -30,7 +30,7 @@
 
 #include "config.h"
 
-#include "cc/CCTimer.h"
+#include "CCTimer.h"
 
 #include "CCSchedulerTestCommon.h"
 #include <gtest/gtest.h>
index 007bea4..fd35e22 100644 (file)
 
 #include "BitmapCanvasLayerTextureUpdater.h"
 #include "CCLayerTreeTestCommon.h"
+#include "CCRenderingStats.h"
 #include "GraphicsContext.h"
 #include "OpaqueRectTrackingContentLayerDelegate.h"
-#include "cc/CCRenderingStats.h"
 #include "skia/ext/platform_canvas.h"
-
 #include <gtest/gtest.h>
 #include <public/WebFloatRect.h>
 #include <public/WebRect.h>
index 33c4b30..e849ec2 100644 (file)
@@ -26,9 +26,9 @@
 #ifndef FakeCCGraphicsContext_h
 #define FakeCCGraphicsContext_h
 
+#include "CCGraphicsContext.h"
 #include "CompositorFakeWebGraphicsContext3D.h"
 #include "FakeWebCompositorOutputSurface.h"
-#include "cc/CCGraphicsContext.h"
 #include <public/WebCompositorOutputSurface.h>
 
 namespace WebKit {
index 84804da..b87305a 100755 (executable)
 
 #include "config.h"
 
+#include "CCLayerTreeHost.h"
 #include "CompositorFakeWebGraphicsContext3D.h"
 #include "FakeWebCompositorOutputSurface.h"
 
-#include "cc/CCLayerTreeHost.h"
-
 namespace WebCore {
 
 class FakeCCLayerTreeHostClient : public CCLayerTreeHostClient {
index 3e2f9bc..671894a 100644 (file)
@@ -25,7 +25,7 @@
 
 #include "config.h"
 
-#include "cc/CCMathUtil.h"
+#include "CCMathUtil.h"
 #include "FloatQuad.h"
 #include <gtest/gtest.h>
 #include <public/WebTransformationMatrix.h>
index e61a5a7..26627ec 100644 (file)
 
 #include "GraphicsLayerChromium.h"
 
+#include "CCLayerTreeHost.h"
+#include "CCLayerTreeHostImpl.h"
+#include "CCSingleThreadProxy.h"
 #include "CompositorFakeWebGraphicsContext3D.h"
 #include "GraphicsLayer.h"
 #include "Matrix3DTransformOperation.h"
 #include "RotateTransformOperation.h"
 #include "TranslateTransformOperation.h"
 #include "WebLayerTreeViewTestCommon.h"
-#include "cc/CCLayerTreeHost.h"
-#include "cc/CCLayerTreeHostImpl.h"
-#include "cc/CCSingleThreadProxy.h"
 #include <gtest/gtest.h>
 #include <public/WebCompositor.h>
 #include <public/WebFloatAnimationCurve.h>
index 9c652d2..b9025b4 100644 (file)
 
 #include "LayerChromium.h"
 
+#include "CCLayerImpl.h"
+#include "CCLayerTreeHost.h"
 #include "CCLayerTreeTestCommon.h"
+#include "CCSingleThreadProxy.h"
 #include "FakeCCLayerTreeHostClient.h"
 #include "LayerPainterChromium.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>
index c4bddc5..36eddc5 100644 (file)
 #include "config.h"
 #include "LayerRendererChromium.h"
 
+#include "CCDrawQuad.h"
+#include "CCPrioritizedTextureManager.h"
+#include "CCSettings.h"
+#include "CCSingleThreadProxy.h"
 #include "CCTestCommon.h"
 #include "FakeWebCompositorOutputSurface.h"
 #include "FakeWebGraphicsContext3D.h"
 #include "GraphicsContext3D.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>
+#include <public/WebCompositor.h>
 
 using namespace WebCore;
 using namespace WebKit;
index 15cb19d..7f6e0f8 100644 (file)
@@ -25,9 +25,9 @@
 #ifndef MockCCQuadCuller_h
 #define MockCCQuadCuller_h
 
+#include "CCDrawQuad.h"
+#include "CCQuadSink.h"
 #include "IntRect.h"
-#include "cc/CCDrawQuad.h"
-#include "cc/CCQuadSink.h"
 #include <wtf/PassOwnPtr.h>
 
 namespace WebCore {
index 362727c..4f0a227 100644 (file)
 #include "PlatformGestureCurve.h"
 
 #include "ActivePlatformGestureAnimation.h"
+#include "CCActiveGestureAnimation.h"
+#include "CCGestureCurve.h"
 #include "PlatformGestureCurveTarget.h"
 #include "TouchpadFlingPlatformGestureCurve.h"
 #include "WheelFlingPlatformGestureCurve.h"
-#include "cc/CCActiveGestureAnimation.h"
-#include "cc/CCGestureCurve.h"
 #include <gtest/gtest.h>
 #include <wtf/OwnPtr.h>
 
index 0e3b1fb..6242043 100644 (file)
 
 #include "ScrollbarLayerChromium.h"
 
+#include "CCScrollbarAnimationController.h"
+#include "CCScrollbarLayerImpl.h"
+#include "CCSingleThreadProxy.h"
 #include "FakeWebScrollbarThemeGeometry.h"
 #include "Scrollbar.h"
 #include "Settings.h"
 #include "TreeSynchronizer.h"
-#include "cc/CCScrollbarAnimationController.h"
-#include "cc/CCScrollbarLayerImpl.h"
-#include "cc/CCSingleThreadProxy.h"
 #include <gtest/gtest.h>
 #include <public/WebScrollbar.h>
 #include <public/WebScrollbarThemeGeometry.h>
index 54e2539..a4830e5 100644 (file)
@@ -26,8 +26,8 @@
 
 #include "TextureLayerChromium.h"
 
+#include "CCLayerTreeHost.h"
 #include "FakeCCLayerTreeHostClient.h"
-#include "cc/CCLayerTreeHost.h"
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include <public/WebCompositor.h>
index e2caa10..689b817 100644 (file)
 #include "BitmapCanvasLayerTextureUpdater.h"
 #include "CCAnimationTestCommon.h"
 #include "CCLayerTreeTestCommon.h"
+#include "CCOverdrawMetrics.h"
+#include "CCRenderingStats.h"
+#include "CCSingleThreadProxy.h" // For DebugScopedSetImplThread
+#include "CCTextureUpdateController.h"
 #include "CCTiledLayerTestCommon.h"
 #include "FakeCCGraphicsContext.h"
 #include "FakeCCLayerTreeHostClient.h"
 #include "LayerPainterChromium.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>
index 08597f1..20e378f 100644 (file)
 #include "TreeSynchronizer.h"
 
 #include "CCAnimationTestCommon.h"
+#include "CCLayerAnimationController.h"
+#include "CCLayerImpl.h"
+#include "CCProxy.h"
+#include "CCSingleThreadProxy.h"
 #include "LayerChromium.h"
 #include "Region.h"
-#include "cc/CCLayerAnimationController.h"
-#include "cc/CCLayerImpl.h"
-#include "cc/CCProxy.h"
-#include "cc/CCSingleThreadProxy.h"
 #include <gtest/gtest.h>
 
 using namespace WebCore;
index 295b242..36e1b86 100644 (file)
 
 #include "WebCompositorInputHandlerImpl.h"
 
+#include "CCActiveGestureAnimation.h"
+#include "CCInputHandler.h"
+#include "CCSingleThreadProxy.h"
 #include "WebCompositorInputHandlerClient.h"
 #include "WebInputEvent.h"
-#include "cc/CCActiveGestureAnimation.h"
-#include "cc/CCInputHandler.h"
-#include "cc/CCSingleThreadProxy.h"
 #include <public/WebCompositor.h>
 #include <public/WebFloatPoint.h>
 #include <public/WebPoint.h>
index bdfe4ec..3cac764 100644 (file)
@@ -26,7 +26,7 @@
 
 #include <public/WebFloatAnimationCurve.h>
 
-#include "cc/CCTimingFunction.h"
+#include "CCTimingFunction.h"
 
 #include <gtest/gtest.h>
 #include <wtf/OwnPtr.h>
index f18f87b..2f4de73 100644 (file)
@@ -26,7 +26,7 @@
 
 #include <public/WebTransformAnimationCurve.h>
 
-#include "cc/CCTimingFunction.h"
+#include "CCTimingFunction.h"
 
 #include <gtest/gtest.h>
 #include <public/WebTransformOperations.h>