Changeset 129160 in webkit


Ignore:
Timestamp:
Sep 20, 2012 1:34:34 PM (12 years ago)
Author:
jamesr@google.com
Message:

[chromium] Remove unused copy of chromium compositor implementation files
https://bugs.webkit.org/show_bug.cgi?id=97255

Reviewed by Adam Barth.

Source/WebCore:

Now that use_libcc_for_compositor is set to 1 these files aren't used anywhere.

  • WebCore.gyp/WebCore.gyp:
  • WebCore.gypi:
  • platform/chromium/support/CCThreadImpl.cpp: Removed.
  • platform/chromium/support/CCThreadImpl.h: Removed.
  • platform/chromium/support/WebCompositorImpl.cpp: Removed.
  • platform/chromium/support/WebCompositorImpl.h: Removed.
  • platform/graphics/chromium/BitmapCanvasLayerTextureUpdater.cpp: Removed.
  • platform/graphics/chromium/BitmapCanvasLayerTextureUpdater.h: Removed.
  • platform/graphics/chromium/BitmapSkPictureCanvasLayerTextureUpdater.cpp: Removed.
  • platform/graphics/chromium/BitmapSkPictureCanvasLayerTextureUpdater.h: Removed.
  • platform/graphics/chromium/Canvas2DLayerBridge.cpp:

(WebCore::Canvas2DLayerBridge::Canvas2DLayerBridge):
(WebCore::Canvas2DLayerBridge::~Canvas2DLayerBridge):

  • platform/graphics/chromium/CanvasLayerTextureUpdater.cpp: Removed.
  • platform/graphics/chromium/CanvasLayerTextureUpdater.h: Removed.
  • platform/graphics/chromium/ContentLayerChromium.cpp: Removed.
  • platform/graphics/chromium/ContentLayerChromium.h: Removed.
  • platform/graphics/chromium/ContentLayerChromiumClient.h: Removed.
  • platform/graphics/chromium/FrameBufferSkPictureCanvasLayerTextureUpdater.cpp: Removed.
  • platform/graphics/chromium/FrameBufferSkPictureCanvasLayerTextureUpdater.h: Removed.
  • platform/graphics/chromium/GeometryBinding.cpp: Removed.
  • platform/graphics/chromium/GeometryBinding.h: Removed.
  • platform/graphics/chromium/GraphicsLayerChromium.cpp:
  • platform/graphics/chromium/HeadsUpDisplayLayerChromium.cpp: Removed.
  • platform/graphics/chromium/HeadsUpDisplayLayerChromium.h: Removed.
  • platform/graphics/chromium/IOSurfaceLayerChromium.cpp: Removed.
  • platform/graphics/chromium/IOSurfaceLayerChromium.h: Removed.
  • platform/graphics/chromium/ImageLayerChromium.cpp: Removed.
  • platform/graphics/chromium/ImageLayerChromium.h: Removed.
  • platform/graphics/chromium/LayerChromium.cpp: Removed.
  • platform/graphics/chromium/LayerChromium.h: Removed.
  • platform/graphics/chromium/LayerTextureSubImage.cpp: Removed.
  • platform/graphics/chromium/LayerTextureSubImage.h: Removed.
  • platform/graphics/chromium/LayerTextureUpdater.h: Removed.
  • platform/graphics/chromium/PlatformColor.h: Removed.
  • platform/graphics/chromium/ProgramBinding.cpp: Removed.
  • platform/graphics/chromium/ProgramBinding.h: Removed.
  • platform/graphics/chromium/RateLimiter.cpp: Removed.
  • platform/graphics/chromium/RateLimiter.h: Removed.
  • platform/graphics/chromium/RenderSurfaceChromium.cpp: Removed.
  • platform/graphics/chromium/RenderSurfaceChromium.h: Removed.
  • platform/graphics/chromium/ScrollbarLayerChromium.cpp: Removed.
  • platform/graphics/chromium/ScrollbarLayerChromium.h: Removed.
  • platform/graphics/chromium/ShaderChromium.cpp: Removed.
  • platform/graphics/chromium/ShaderChromium.h: Removed.
  • platform/graphics/chromium/SkPictureCanvasLayerTextureUpdater.cpp: Removed.
  • platform/graphics/chromium/SkPictureCanvasLayerTextureUpdater.h: Removed.
  • platform/graphics/chromium/SolidColorLayerChromium.cpp: Removed.
  • platform/graphics/chromium/SolidColorLayerChromium.h: Removed.
  • platform/graphics/chromium/TextureCopier.cpp: Removed.
  • platform/graphics/chromium/TextureCopier.h: Removed.
  • platform/graphics/chromium/TextureLayerChromium.cpp: Removed.
  • platform/graphics/chromium/TextureLayerChromium.h: Removed.
  • platform/graphics/chromium/TextureLayerChromiumClient.h: Removed.
  • platform/graphics/chromium/ThrottledTextureUploader.cpp: Removed.
  • platform/graphics/chromium/ThrottledTextureUploader.h: Removed.
  • platform/graphics/chromium/TiledLayerChromium.cpp: Removed.
  • platform/graphics/chromium/TiledLayerChromium.h: Removed.
  • platform/graphics/chromium/TreeSynchronizer.cpp: Removed.
  • platform/graphics/chromium/TreeSynchronizer.h: Removed.
  • platform/graphics/chromium/UnthrottledTextureUploader.h: Removed.
  • platform/graphics/chromium/VideoLayerChromium.cpp: Removed.
  • platform/graphics/chromium/VideoLayerChromium.h: Removed.
  • platform/graphics/chromium/cc/CCActiveAnimation.cpp: Removed.
  • platform/graphics/chromium/cc/CCActiveAnimation.h: Removed.
  • platform/graphics/chromium/cc/CCAnimationCurve.cpp: Removed.
  • platform/graphics/chromium/cc/CCAnimationCurve.h: Removed.
  • platform/graphics/chromium/cc/CCAnimationEvents.h: Removed.
  • platform/graphics/chromium/cc/CCAppendQuadsData.h: Removed.
  • platform/graphics/chromium/cc/CCCheckerboardDrawQuad.cpp: Removed.
  • platform/graphics/chromium/cc/CCCheckerboardDrawQuad.h: Removed.
  • platform/graphics/chromium/cc/CCCompletionEvent.h: Removed.
  • platform/graphics/chromium/cc/CCDamageTracker.cpp: Removed.
  • platform/graphics/chromium/cc/CCDamageTracker.h: Removed.
  • platform/graphics/chromium/cc/CCDebugBorderDrawQuad.cpp: Removed.
  • platform/graphics/chromium/cc/CCDebugBorderDrawQuad.h: Removed.
  • platform/graphics/chromium/cc/CCDebugRectHistory.cpp: Removed.
  • platform/graphics/chromium/cc/CCDebugRectHistory.h: Removed.
  • platform/graphics/chromium/cc/CCDelayBasedTimeSource.cpp: Removed.
  • platform/graphics/chromium/cc/CCDelayBasedTimeSource.h: Removed.
  • platform/graphics/chromium/cc/CCDirectRenderer.cpp: Removed.
  • platform/graphics/chromium/cc/CCDirectRenderer.h: Removed.
  • platform/graphics/chromium/cc/CCDrawQuad.cpp: Removed.
  • platform/graphics/chromium/cc/CCDrawQuad.h: Removed.
  • platform/graphics/chromium/cc/CCFontAtlas.cpp: Removed.
  • platform/graphics/chromium/cc/CCFontAtlas.h: Removed.
  • platform/graphics/chromium/cc/CCFrameRateController.cpp: Removed.
  • platform/graphics/chromium/cc/CCFrameRateController.h: Removed.
  • platform/graphics/chromium/cc/CCFrameRateCounter.cpp: Removed.
  • platform/graphics/chromium/cc/CCFrameRateCounter.h: Removed.
  • platform/graphics/chromium/cc/CCGraphicsContext.h: Removed.
  • platform/graphics/chromium/cc/CCHeadsUpDisplayLayerImpl.cpp: Removed.
  • platform/graphics/chromium/cc/CCHeadsUpDisplayLayerImpl.h: Removed.
  • platform/graphics/chromium/cc/CCIOSurfaceDrawQuad.cpp: Removed.
  • platform/graphics/chromium/cc/CCIOSurfaceDrawQuad.h: Removed.
  • platform/graphics/chromium/cc/CCIOSurfaceLayerImpl.cpp: Removed.
  • platform/graphics/chromium/cc/CCIOSurfaceLayerImpl.h: Removed.
  • platform/graphics/chromium/cc/CCInputHandler.h: Removed.
  • platform/graphics/chromium/cc/CCKeyframedAnimationCurve.cpp: Removed.
  • platform/graphics/chromium/cc/CCKeyframedAnimationCurve.h: Removed.
  • platform/graphics/chromium/cc/CCLayerAnimationController.cpp: Removed.
  • platform/graphics/chromium/cc/CCLayerAnimationController.h: Removed.
  • platform/graphics/chromium/cc/CCLayerImpl.cpp: Removed.
  • platform/graphics/chromium/cc/CCLayerImpl.h: Removed.
  • platform/graphics/chromium/cc/CCLayerIterator.cpp: Removed.
  • platform/graphics/chromium/cc/CCLayerIterator.h: Removed.
  • platform/graphics/chromium/cc/CCLayerQuad.cpp: Removed.
  • platform/graphics/chromium/cc/CCLayerQuad.h: Removed.
  • platform/graphics/chromium/cc/CCLayerSorter.cpp: Removed.
  • platform/graphics/chromium/cc/CCLayerSorter.h: Removed.
  • platform/graphics/chromium/cc/CCLayerTilingData.cpp: Removed.
  • platform/graphics/chromium/cc/CCLayerTilingData.h: Removed.
  • platform/graphics/chromium/cc/CCLayerTreeHost.cpp: Removed.
  • platform/graphics/chromium/cc/CCLayerTreeHost.h: Removed.
  • platform/graphics/chromium/cc/CCLayerTreeHostClient.h: Removed.
  • platform/graphics/chromium/cc/CCLayerTreeHostCommon.cpp: Removed.
  • platform/graphics/chromium/cc/CCLayerTreeHostCommon.h: Removed.
  • platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp: Removed.
  • platform/graphics/chromium/cc/CCLayerTreeHostImpl.h: Removed.
  • platform/graphics/chromium/cc/CCMathUtil.cpp: Removed.
  • platform/graphics/chromium/cc/CCMathUtil.h: Removed.
  • platform/graphics/chromium/cc/CCOcclusionTracker.cpp: Removed.
  • platform/graphics/chromium/cc/CCOcclusionTracker.h: Removed.
  • platform/graphics/chromium/cc/CCOverdrawMetrics.cpp: Removed.
  • platform/graphics/chromium/cc/CCOverdrawMetrics.h: Removed.
  • platform/graphics/chromium/cc/CCPageScaleAnimation.cpp: Removed.
  • platform/graphics/chromium/cc/CCPageScaleAnimation.h: Removed.
  • platform/graphics/chromium/cc/CCPrioritizedTexture.cpp: Removed.
  • platform/graphics/chromium/cc/CCPrioritizedTexture.h: Removed.
  • platform/graphics/chromium/cc/CCPrioritizedTextureManager.cpp: Removed.
  • platform/graphics/chromium/cc/CCPrioritizedTextureManager.h: Removed.
  • platform/graphics/chromium/cc/CCPriorityCalculator.cpp: Removed.
  • platform/graphics/chromium/cc/CCPriorityCalculator.h: Removed.
  • platform/graphics/chromium/cc/CCProxy.cpp: Removed.
  • platform/graphics/chromium/cc/CCProxy.h: Removed.
  • platform/graphics/chromium/cc/CCQuadCuller.cpp: Removed.
  • platform/graphics/chromium/cc/CCQuadCuller.h: Removed.
  • platform/graphics/chromium/cc/CCQuadSink.h: Removed.
  • platform/graphics/chromium/cc/CCRenderPass.cpp: Removed.
  • platform/graphics/chromium/cc/CCRenderPass.h: Removed.
  • platform/graphics/chromium/cc/CCRenderPassDrawQuad.cpp: Removed.
  • platform/graphics/chromium/cc/CCRenderPassDrawQuad.h: Removed.
  • platform/graphics/chromium/cc/CCRenderPassSink.h: Removed.
  • platform/graphics/chromium/cc/CCRenderSurface.cpp: Removed.
  • platform/graphics/chromium/cc/CCRenderSurface.h: Removed.
  • platform/graphics/chromium/cc/CCRenderSurfaceFilters.cpp: Removed.
  • platform/graphics/chromium/cc/CCRenderSurfaceFilters.h: Removed.
  • platform/graphics/chromium/cc/CCRenderer.h: Removed.
  • platform/graphics/chromium/cc/CCRendererGL.cpp: Removed.
  • platform/graphics/chromium/cc/CCRendererGL.h: Removed.
  • platform/graphics/chromium/cc/CCRenderingStats.h: Removed.
  • platform/graphics/chromium/cc/CCResourceProvider.cpp: Removed.
  • platform/graphics/chromium/cc/CCResourceProvider.h: Removed.
  • platform/graphics/chromium/cc/CCScheduler.cpp: Removed.
  • platform/graphics/chromium/cc/CCScheduler.h: Removed.
  • platform/graphics/chromium/cc/CCSchedulerStateMachine.cpp: Removed.
  • platform/graphics/chromium/cc/CCSchedulerStateMachine.h: Removed.
  • platform/graphics/chromium/cc/CCScopedTexture.cpp: Removed.
  • platform/graphics/chromium/cc/CCScopedTexture.h: Removed.
  • platform/graphics/chromium/cc/CCScopedThreadProxy.h: Removed.
  • platform/graphics/chromium/cc/CCScrollbarAnimationController.cpp: Removed.
  • platform/graphics/chromium/cc/CCScrollbarAnimationController.h: Removed.
  • platform/graphics/chromium/cc/CCScrollbarAnimationControllerLinearFade.cpp: Removed.
  • platform/graphics/chromium/cc/CCScrollbarAnimationControllerLinearFade.h: Removed.
  • platform/graphics/chromium/cc/CCScrollbarGeometryFixedThumb.cpp: Removed.
  • platform/graphics/chromium/cc/CCScrollbarGeometryFixedThumb.h: Removed.
  • platform/graphics/chromium/cc/CCScrollbarGeometryStub.cpp: Removed.
  • platform/graphics/chromium/cc/CCScrollbarGeometryStub.h: Removed.
  • platform/graphics/chromium/cc/CCScrollbarLayerImpl.cpp: Removed.
  • platform/graphics/chromium/cc/CCScrollbarLayerImpl.h: Removed.
  • platform/graphics/chromium/cc/CCSettings.cpp: Removed.
  • platform/graphics/chromium/cc/CCSettings.h: Removed.
  • platform/graphics/chromium/cc/CCSharedQuadState.cpp: Removed.
  • platform/graphics/chromium/cc/CCSharedQuadState.h: Removed.
  • platform/graphics/chromium/cc/CCSingleThreadProxy.cpp: Removed.
  • platform/graphics/chromium/cc/CCSingleThreadProxy.h: Removed.
  • platform/graphics/chromium/cc/CCSolidColorDrawQuad.cpp: Removed.
  • platform/graphics/chromium/cc/CCSolidColorDrawQuad.h: Removed.
  • platform/graphics/chromium/cc/CCSolidColorLayerImpl.cpp: Removed.
  • platform/graphics/chromium/cc/CCSolidColorLayerImpl.h: Removed.
  • platform/graphics/chromium/cc/CCStreamVideoDrawQuad.cpp: Removed.
  • platform/graphics/chromium/cc/CCStreamVideoDrawQuad.h: Removed.
  • platform/graphics/chromium/cc/CCTexture.cpp: Removed.
  • platform/graphics/chromium/cc/CCTexture.h: Removed.
  • platform/graphics/chromium/cc/CCTextureDrawQuad.cpp: Removed.
  • platform/graphics/chromium/cc/CCTextureDrawQuad.h: Removed.
  • platform/graphics/chromium/cc/CCTextureLayerImpl.cpp: Removed.
  • platform/graphics/chromium/cc/CCTextureLayerImpl.h: Removed.
  • platform/graphics/chromium/cc/CCTextureUpdateController.cpp: Removed.
  • platform/graphics/chromium/cc/CCTextureUpdateController.h: Removed.
  • platform/graphics/chromium/cc/CCTextureUpdateQueue.cpp: Removed.
  • platform/graphics/chromium/cc/CCTextureUpdateQueue.h: Removed.
  • platform/graphics/chromium/cc/CCThread.h: Removed.
  • platform/graphics/chromium/cc/CCThreadProxy.cpp: Removed.
  • platform/graphics/chromium/cc/CCThreadProxy.h: Removed.
  • platform/graphics/chromium/cc/CCThreadTask.h: Removed.
  • platform/graphics/chromium/cc/CCTileDrawQuad.cpp: Removed.
  • platform/graphics/chromium/cc/CCTileDrawQuad.h: Removed.
  • platform/graphics/chromium/cc/CCTiledLayerImpl.cpp: Removed.
  • platform/graphics/chromium/cc/CCTiledLayerImpl.h: Removed.
  • platform/graphics/chromium/cc/CCTimeSource.h: Removed.
  • platform/graphics/chromium/cc/CCTimer.cpp: Removed.
  • platform/graphics/chromium/cc/CCTimer.h: Removed.
  • platform/graphics/chromium/cc/CCTimingFunction.cpp: Removed.
  • platform/graphics/chromium/cc/CCTimingFunction.h: Removed.
  • platform/graphics/chromium/cc/CCVideoLayerImpl.cpp: Removed.
  • platform/graphics/chromium/cc/CCVideoLayerImpl.h: Removed.
  • platform/graphics/chromium/cc/CCYUVVideoDrawQuad.cpp: Removed.
  • platform/graphics/chromium/cc/CCYUVVideoDrawQuad.h: Removed.

Source/WebKit/chromium:

  • WebKit.gyp:
  • WebKit.gypi:
  • WebKitUnitTests.gyp:
  • src/WebAnimationCurveCommon.cpp: Removed.
  • src/WebAnimationCurveCommon.h: Removed.
  • src/WebAnimationImpl.cpp: Removed.
  • src/WebAnimationImpl.h: Removed.
  • src/WebContentLayerImpl.cpp: Removed.
  • src/WebContentLayerImpl.h: Removed.
  • src/WebExternalTextureLayerImpl.cpp: Removed.
  • src/WebExternalTextureLayerImpl.h: Removed.
  • src/WebFloatAnimationCurveImpl.cpp: Removed.
  • src/WebFloatAnimationCurveImpl.h: Removed.
  • src/WebIOSurfaceLayerImpl.cpp: Removed.
  • src/WebIOSurfaceLayerImpl.h: Removed.
  • src/WebImageLayerImpl.cpp: Removed.
  • src/WebImageLayerImpl.h: Removed.
  • src/WebLayerImpl.cpp: Removed.
  • src/WebLayerImpl.h: Removed.
  • src/WebLayerTreeViewImpl.cpp: Removed.
  • src/WebLayerTreeViewImpl.h: Removed.
  • src/WebScrollbarLayerImpl.cpp: Removed.
  • src/WebScrollbarLayerImpl.h: Removed.
  • src/WebSolidColorLayerImpl.cpp: Removed.
  • src/WebSolidColorLayerImpl.h: Removed.
  • src/WebToCCInputHandlerAdapter.cpp: Removed.
  • src/WebToCCInputHandlerAdapter.h: Removed.
  • src/WebTransformAnimationCurveImpl.cpp: Removed.
  • src/WebTransformAnimationCurveImpl.h: Removed.
  • src/WebVideoLayerImpl.cpp: Removed.
  • src/WebVideoLayerImpl.h: Removed.
  • tests/CCActiveAnimationTest.cpp: Removed.
  • tests/CCAnimationTestCommon.cpp: Removed.
  • tests/CCAnimationTestCommon.h: Removed.
  • tests/CCDamageTrackerTest.cpp: Removed.
  • tests/CCDelayBasedTimeSourceTest.cpp: Removed.
  • tests/CCDrawQuadTest.cpp: Removed.
  • tests/CCFrameRateControllerTest.cpp: Removed.
  • tests/CCGeometryTestUtils.cpp: Removed.
  • tests/CCGeometryTestUtils.h: Removed.
  • tests/CCHeadsUpDisplayTest.cpp: Removed.
  • tests/CCKeyframedAnimationCurveTest.cpp: Removed.
  • tests/CCLayerAnimationControllerTest.cpp: Removed.
  • tests/CCLayerImplTest.cpp: Removed.
  • tests/CCLayerIteratorTest.cpp: Removed.
  • tests/CCLayerQuadTest.cpp: Removed.
  • tests/CCLayerSorterTest.cpp: Removed.
  • tests/CCLayerTestCommon.cpp: Removed.
  • tests/CCLayerTestCommon.h: Removed.
  • tests/CCLayerTreeHostCommonTest.cpp: Removed.
  • tests/CCLayerTreeHostImplTest.cpp: Removed.
  • tests/CCLayerTreeHostTest.cpp: Removed.
  • tests/CCMathUtilTest.cpp: Removed.
  • tests/CCOcclusionTrackerTest.cpp: Removed.
  • tests/CCOcclusionTrackerTestCommon.h: Removed.
  • tests/CCPrioritizedTextureTest.cpp: Removed.
  • tests/CCQuadCullerTest.cpp: Removed.
  • tests/CCRenderPassTest.cpp: Removed.
  • tests/CCRenderSurfaceFiltersTest.cpp: Removed.
  • tests/CCRenderSurfaceTest.cpp: Removed.
  • tests/CCRendererGLTest.cpp: Removed.
  • tests/CCResourceProviderTest.cpp: Removed.
  • tests/CCSchedulerStateMachineTest.cpp: Removed.
  • tests/CCSchedulerTest.cpp: Removed.
  • tests/CCSchedulerTestCommon.h: Removed.
  • tests/CCScopedTextureTest.cpp: Removed.
  • tests/CCScrollbarAnimationControllerLinearFadeTest.cpp: Removed.
  • tests/CCSolidColorLayerImplTest.cpp: Removed.
  • tests/CCTestCommon.h: Removed.
  • tests/CCTextureUpdateControllerTest.cpp: Removed.
  • tests/CCThreadTaskTest.cpp: Removed.
  • tests/CCThreadedTest.cpp: Removed.
  • tests/CCThreadedTest.h: Removed.
  • tests/CCTiledLayerImplTest.cpp: Removed.
  • tests/CCTiledLayerTestCommon.cpp: Removed.
  • tests/CCTiledLayerTestCommon.h: Removed.
  • tests/CCTimerTest.cpp: Removed.
  • tests/ContentLayerChromiumTest.cpp: Removed.
  • tests/FakeCCLayerTreeHostClient.h: Removed.
  • tests/FakeGraphicsContext3DTest.cpp: Removed.
  • tests/FakeWebScrollbarThemeGeometry.h: Removed.
  • tests/FloatQuadTest.cpp: Removed.
  • tests/GraphicsLayerChromiumTest.cpp:
  • tests/ImageLayerChromiumTest.cpp:
  • tests/LayerChromiumTest.cpp: Removed.
  • tests/MockCCQuadCuller.h: Removed.
  • tests/ScrollbarLayerChromiumTest.cpp: Removed.
  • tests/TextureCopierTest.cpp: Removed.
  • tests/TextureLayerChromiumTest.cpp: Removed.
  • tests/ThrottledTextureUploaderTest.cpp: Removed.
  • tests/TiledLayerChromiumTest.cpp: Removed.
  • tests/TreeSynchronizerTest.cpp: Removed.
  • tests/WebAnimationTest.cpp: Removed.
  • tests/WebFloatAnimationCurveTest.cpp: Removed.
  • tests/WebLayerTest.cpp: Removed.
  • tests/WebLayerTreeViewTest.cpp: Removed.
  • tests/WebTransformAnimationCurveTest.cpp: Removed.
  • tests/WebTransformOperationsTest.cpp: Removed.
  • tests/WebTransformationMatrixTest.cpp: Removed.
Location:
trunk/Source
Files:
297 deleted
11 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r129154 r129160  
     12012-09-20  James Robinson  <jamesr@chromium.org>
     2
     3        [chromium] Remove unused copy of chromium compositor implementation files
     4        https://bugs.webkit.org/show_bug.cgi?id=97255
     5
     6        Reviewed by Adam Barth.
     7
     8        Now that use_libcc_for_compositor is set to 1 these files aren't used anywhere.
     9
     10        * WebCore.gyp/WebCore.gyp:
     11        * WebCore.gypi:
     12        * platform/chromium/support/CCThreadImpl.cpp: Removed.
     13        * platform/chromium/support/CCThreadImpl.h: Removed.
     14        * platform/chromium/support/WebCompositorImpl.cpp: Removed.
     15        * platform/chromium/support/WebCompositorImpl.h: Removed.
     16        * platform/graphics/chromium/BitmapCanvasLayerTextureUpdater.cpp: Removed.
     17        * platform/graphics/chromium/BitmapCanvasLayerTextureUpdater.h: Removed.
     18        * platform/graphics/chromium/BitmapSkPictureCanvasLayerTextureUpdater.cpp: Removed.
     19        * platform/graphics/chromium/BitmapSkPictureCanvasLayerTextureUpdater.h: Removed.
     20        * platform/graphics/chromium/Canvas2DLayerBridge.cpp:
     21        (WebCore::Canvas2DLayerBridge::Canvas2DLayerBridge):
     22        (WebCore::Canvas2DLayerBridge::~Canvas2DLayerBridge):
     23        * platform/graphics/chromium/CanvasLayerTextureUpdater.cpp: Removed.
     24        * platform/graphics/chromium/CanvasLayerTextureUpdater.h: Removed.
     25        * platform/graphics/chromium/ContentLayerChromium.cpp: Removed.
     26        * platform/graphics/chromium/ContentLayerChromium.h: Removed.
     27        * platform/graphics/chromium/ContentLayerChromiumClient.h: Removed.
     28        * platform/graphics/chromium/FrameBufferSkPictureCanvasLayerTextureUpdater.cpp: Removed.
     29        * platform/graphics/chromium/FrameBufferSkPictureCanvasLayerTextureUpdater.h: Removed.
     30        * platform/graphics/chromium/GeometryBinding.cpp: Removed.
     31        * platform/graphics/chromium/GeometryBinding.h: Removed.
     32        * platform/graphics/chromium/GraphicsLayerChromium.cpp:
     33        * platform/graphics/chromium/HeadsUpDisplayLayerChromium.cpp: Removed.
     34        * platform/graphics/chromium/HeadsUpDisplayLayerChromium.h: Removed.
     35        * platform/graphics/chromium/IOSurfaceLayerChromium.cpp: Removed.
     36        * platform/graphics/chromium/IOSurfaceLayerChromium.h: Removed.
     37        * platform/graphics/chromium/ImageLayerChromium.cpp: Removed.
     38        * platform/graphics/chromium/ImageLayerChromium.h: Removed.
     39        * platform/graphics/chromium/LayerChromium.cpp: Removed.
     40        * platform/graphics/chromium/LayerChromium.h: Removed.
     41        * platform/graphics/chromium/LayerTextureSubImage.cpp: Removed.
     42        * platform/graphics/chromium/LayerTextureSubImage.h: Removed.
     43        * platform/graphics/chromium/LayerTextureUpdater.h: Removed.
     44        * platform/graphics/chromium/PlatformColor.h: Removed.
     45        * platform/graphics/chromium/ProgramBinding.cpp: Removed.
     46        * platform/graphics/chromium/ProgramBinding.h: Removed.
     47        * platform/graphics/chromium/RateLimiter.cpp: Removed.
     48        * platform/graphics/chromium/RateLimiter.h: Removed.
     49        * platform/graphics/chromium/RenderSurfaceChromium.cpp: Removed.
     50        * platform/graphics/chromium/RenderSurfaceChromium.h: Removed.
     51        * platform/graphics/chromium/ScrollbarLayerChromium.cpp: Removed.
     52        * platform/graphics/chromium/ScrollbarLayerChromium.h: Removed.
     53        * platform/graphics/chromium/ShaderChromium.cpp: Removed.
     54        * platform/graphics/chromium/ShaderChromium.h: Removed.
     55        * platform/graphics/chromium/SkPictureCanvasLayerTextureUpdater.cpp: Removed.
     56        * platform/graphics/chromium/SkPictureCanvasLayerTextureUpdater.h: Removed.
     57        * platform/graphics/chromium/SolidColorLayerChromium.cpp: Removed.
     58        * platform/graphics/chromium/SolidColorLayerChromium.h: Removed.
     59        * platform/graphics/chromium/TextureCopier.cpp: Removed.
     60        * platform/graphics/chromium/TextureCopier.h: Removed.
     61        * platform/graphics/chromium/TextureLayerChromium.cpp: Removed.
     62        * platform/graphics/chromium/TextureLayerChromium.h: Removed.
     63        * platform/graphics/chromium/TextureLayerChromiumClient.h: Removed.
     64        * platform/graphics/chromium/ThrottledTextureUploader.cpp: Removed.
     65        * platform/graphics/chromium/ThrottledTextureUploader.h: Removed.
     66        * platform/graphics/chromium/TiledLayerChromium.cpp: Removed.
     67        * platform/graphics/chromium/TiledLayerChromium.h: Removed.
     68        * platform/graphics/chromium/TreeSynchronizer.cpp: Removed.
     69        * platform/graphics/chromium/TreeSynchronizer.h: Removed.
     70        * platform/graphics/chromium/UnthrottledTextureUploader.h: Removed.
     71        * platform/graphics/chromium/VideoLayerChromium.cpp: Removed.
     72        * platform/graphics/chromium/VideoLayerChromium.h: Removed.
     73        * platform/graphics/chromium/cc/CCActiveAnimation.cpp: Removed.
     74        * platform/graphics/chromium/cc/CCActiveAnimation.h: Removed.
     75        * platform/graphics/chromium/cc/CCAnimationCurve.cpp: Removed.
     76        * platform/graphics/chromium/cc/CCAnimationCurve.h: Removed.
     77        * platform/graphics/chromium/cc/CCAnimationEvents.h: Removed.
     78        * platform/graphics/chromium/cc/CCAppendQuadsData.h: Removed.
     79        * platform/graphics/chromium/cc/CCCheckerboardDrawQuad.cpp: Removed.
     80        * platform/graphics/chromium/cc/CCCheckerboardDrawQuad.h: Removed.
     81        * platform/graphics/chromium/cc/CCCompletionEvent.h: Removed.
     82        * platform/graphics/chromium/cc/CCDamageTracker.cpp: Removed.
     83        * platform/graphics/chromium/cc/CCDamageTracker.h: Removed.
     84        * platform/graphics/chromium/cc/CCDebugBorderDrawQuad.cpp: Removed.
     85        * platform/graphics/chromium/cc/CCDebugBorderDrawQuad.h: Removed.
     86        * platform/graphics/chromium/cc/CCDebugRectHistory.cpp: Removed.
     87        * platform/graphics/chromium/cc/CCDebugRectHistory.h: Removed.
     88        * platform/graphics/chromium/cc/CCDelayBasedTimeSource.cpp: Removed.
     89        * platform/graphics/chromium/cc/CCDelayBasedTimeSource.h: Removed.
     90        * platform/graphics/chromium/cc/CCDirectRenderer.cpp: Removed.
     91        * platform/graphics/chromium/cc/CCDirectRenderer.h: Removed.
     92        * platform/graphics/chromium/cc/CCDrawQuad.cpp: Removed.
     93        * platform/graphics/chromium/cc/CCDrawQuad.h: Removed.
     94        * platform/graphics/chromium/cc/CCFontAtlas.cpp: Removed.
     95        * platform/graphics/chromium/cc/CCFontAtlas.h: Removed.
     96        * platform/graphics/chromium/cc/CCFrameRateController.cpp: Removed.
     97        * platform/graphics/chromium/cc/CCFrameRateController.h: Removed.
     98        * platform/graphics/chromium/cc/CCFrameRateCounter.cpp: Removed.
     99        * platform/graphics/chromium/cc/CCFrameRateCounter.h: Removed.
     100        * platform/graphics/chromium/cc/CCGraphicsContext.h: Removed.
     101        * platform/graphics/chromium/cc/CCHeadsUpDisplayLayerImpl.cpp: Removed.
     102        * platform/graphics/chromium/cc/CCHeadsUpDisplayLayerImpl.h: Removed.
     103        * platform/graphics/chromium/cc/CCIOSurfaceDrawQuad.cpp: Removed.
     104        * platform/graphics/chromium/cc/CCIOSurfaceDrawQuad.h: Removed.
     105        * platform/graphics/chromium/cc/CCIOSurfaceLayerImpl.cpp: Removed.
     106        * platform/graphics/chromium/cc/CCIOSurfaceLayerImpl.h: Removed.
     107        * platform/graphics/chromium/cc/CCInputHandler.h: Removed.
     108        * platform/graphics/chromium/cc/CCKeyframedAnimationCurve.cpp: Removed.
     109        * platform/graphics/chromium/cc/CCKeyframedAnimationCurve.h: Removed.
     110        * platform/graphics/chromium/cc/CCLayerAnimationController.cpp: Removed.
     111        * platform/graphics/chromium/cc/CCLayerAnimationController.h: Removed.
     112        * platform/graphics/chromium/cc/CCLayerImpl.cpp: Removed.
     113        * platform/graphics/chromium/cc/CCLayerImpl.h: Removed.
     114        * platform/graphics/chromium/cc/CCLayerIterator.cpp: Removed.
     115        * platform/graphics/chromium/cc/CCLayerIterator.h: Removed.
     116        * platform/graphics/chromium/cc/CCLayerQuad.cpp: Removed.
     117        * platform/graphics/chromium/cc/CCLayerQuad.h: Removed.
     118        * platform/graphics/chromium/cc/CCLayerSorter.cpp: Removed.
     119        * platform/graphics/chromium/cc/CCLayerSorter.h: Removed.
     120        * platform/graphics/chromium/cc/CCLayerTilingData.cpp: Removed.
     121        * platform/graphics/chromium/cc/CCLayerTilingData.h: Removed.
     122        * platform/graphics/chromium/cc/CCLayerTreeHost.cpp: Removed.
     123        * platform/graphics/chromium/cc/CCLayerTreeHost.h: Removed.
     124        * platform/graphics/chromium/cc/CCLayerTreeHostClient.h: Removed.
     125        * platform/graphics/chromium/cc/CCLayerTreeHostCommon.cpp: Removed.
     126        * platform/graphics/chromium/cc/CCLayerTreeHostCommon.h: Removed.
     127        * platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp: Removed.
     128        * platform/graphics/chromium/cc/CCLayerTreeHostImpl.h: Removed.
     129        * platform/graphics/chromium/cc/CCMathUtil.cpp: Removed.
     130        * platform/graphics/chromium/cc/CCMathUtil.h: Removed.
     131        * platform/graphics/chromium/cc/CCOcclusionTracker.cpp: Removed.
     132        * platform/graphics/chromium/cc/CCOcclusionTracker.h: Removed.
     133        * platform/graphics/chromium/cc/CCOverdrawMetrics.cpp: Removed.
     134        * platform/graphics/chromium/cc/CCOverdrawMetrics.h: Removed.
     135        * platform/graphics/chromium/cc/CCPageScaleAnimation.cpp: Removed.
     136        * platform/graphics/chromium/cc/CCPageScaleAnimation.h: Removed.
     137        * platform/graphics/chromium/cc/CCPrioritizedTexture.cpp: Removed.
     138        * platform/graphics/chromium/cc/CCPrioritizedTexture.h: Removed.
     139        * platform/graphics/chromium/cc/CCPrioritizedTextureManager.cpp: Removed.
     140        * platform/graphics/chromium/cc/CCPrioritizedTextureManager.h: Removed.
     141        * platform/graphics/chromium/cc/CCPriorityCalculator.cpp: Removed.
     142        * platform/graphics/chromium/cc/CCPriorityCalculator.h: Removed.
     143        * platform/graphics/chromium/cc/CCProxy.cpp: Removed.
     144        * platform/graphics/chromium/cc/CCProxy.h: Removed.
     145        * platform/graphics/chromium/cc/CCQuadCuller.cpp: Removed.
     146        * platform/graphics/chromium/cc/CCQuadCuller.h: Removed.
     147        * platform/graphics/chromium/cc/CCQuadSink.h: Removed.
     148        * platform/graphics/chromium/cc/CCRenderPass.cpp: Removed.
     149        * platform/graphics/chromium/cc/CCRenderPass.h: Removed.
     150        * platform/graphics/chromium/cc/CCRenderPassDrawQuad.cpp: Removed.
     151        * platform/graphics/chromium/cc/CCRenderPassDrawQuad.h: Removed.
     152        * platform/graphics/chromium/cc/CCRenderPassSink.h: Removed.
     153        * platform/graphics/chromium/cc/CCRenderSurface.cpp: Removed.
     154        * platform/graphics/chromium/cc/CCRenderSurface.h: Removed.
     155        * platform/graphics/chromium/cc/CCRenderSurfaceFilters.cpp: Removed.
     156        * platform/graphics/chromium/cc/CCRenderSurfaceFilters.h: Removed.
     157        * platform/graphics/chromium/cc/CCRenderer.h: Removed.
     158        * platform/graphics/chromium/cc/CCRendererGL.cpp: Removed.
     159        * platform/graphics/chromium/cc/CCRendererGL.h: Removed.
     160        * platform/graphics/chromium/cc/CCRenderingStats.h: Removed.
     161        * platform/graphics/chromium/cc/CCResourceProvider.cpp: Removed.
     162        * platform/graphics/chromium/cc/CCResourceProvider.h: Removed.
     163        * platform/graphics/chromium/cc/CCScheduler.cpp: Removed.
     164        * platform/graphics/chromium/cc/CCScheduler.h: Removed.
     165        * platform/graphics/chromium/cc/CCSchedulerStateMachine.cpp: Removed.
     166        * platform/graphics/chromium/cc/CCSchedulerStateMachine.h: Removed.
     167        * platform/graphics/chromium/cc/CCScopedTexture.cpp: Removed.
     168        * platform/graphics/chromium/cc/CCScopedTexture.h: Removed.
     169        * platform/graphics/chromium/cc/CCScopedThreadProxy.h: Removed.
     170        * platform/graphics/chromium/cc/CCScrollbarAnimationController.cpp: Removed.
     171        * platform/graphics/chromium/cc/CCScrollbarAnimationController.h: Removed.
     172        * platform/graphics/chromium/cc/CCScrollbarAnimationControllerLinearFade.cpp: Removed.
     173        * platform/graphics/chromium/cc/CCScrollbarAnimationControllerLinearFade.h: Removed.
     174        * platform/graphics/chromium/cc/CCScrollbarGeometryFixedThumb.cpp: Removed.
     175        * platform/graphics/chromium/cc/CCScrollbarGeometryFixedThumb.h: Removed.
     176        * platform/graphics/chromium/cc/CCScrollbarGeometryStub.cpp: Removed.
     177        * platform/graphics/chromium/cc/CCScrollbarGeometryStub.h: Removed.
     178        * platform/graphics/chromium/cc/CCScrollbarLayerImpl.cpp: Removed.
     179        * platform/graphics/chromium/cc/CCScrollbarLayerImpl.h: Removed.
     180        * platform/graphics/chromium/cc/CCSettings.cpp: Removed.
     181        * platform/graphics/chromium/cc/CCSettings.h: Removed.
     182        * platform/graphics/chromium/cc/CCSharedQuadState.cpp: Removed.
     183        * platform/graphics/chromium/cc/CCSharedQuadState.h: Removed.
     184        * platform/graphics/chromium/cc/CCSingleThreadProxy.cpp: Removed.
     185        * platform/graphics/chromium/cc/CCSingleThreadProxy.h: Removed.
     186        * platform/graphics/chromium/cc/CCSolidColorDrawQuad.cpp: Removed.
     187        * platform/graphics/chromium/cc/CCSolidColorDrawQuad.h: Removed.
     188        * platform/graphics/chromium/cc/CCSolidColorLayerImpl.cpp: Removed.
     189        * platform/graphics/chromium/cc/CCSolidColorLayerImpl.h: Removed.
     190        * platform/graphics/chromium/cc/CCStreamVideoDrawQuad.cpp: Removed.
     191        * platform/graphics/chromium/cc/CCStreamVideoDrawQuad.h: Removed.
     192        * platform/graphics/chromium/cc/CCTexture.cpp: Removed.
     193        * platform/graphics/chromium/cc/CCTexture.h: Removed.
     194        * platform/graphics/chromium/cc/CCTextureDrawQuad.cpp: Removed.
     195        * platform/graphics/chromium/cc/CCTextureDrawQuad.h: Removed.
     196        * platform/graphics/chromium/cc/CCTextureLayerImpl.cpp: Removed.
     197        * platform/graphics/chromium/cc/CCTextureLayerImpl.h: Removed.
     198        * platform/graphics/chromium/cc/CCTextureUpdateController.cpp: Removed.
     199        * platform/graphics/chromium/cc/CCTextureUpdateController.h: Removed.
     200        * platform/graphics/chromium/cc/CCTextureUpdateQueue.cpp: Removed.
     201        * platform/graphics/chromium/cc/CCTextureUpdateQueue.h: Removed.
     202        * platform/graphics/chromium/cc/CCThread.h: Removed.
     203        * platform/graphics/chromium/cc/CCThreadProxy.cpp: Removed.
     204        * platform/graphics/chromium/cc/CCThreadProxy.h: Removed.
     205        * platform/graphics/chromium/cc/CCThreadTask.h: Removed.
     206        * platform/graphics/chromium/cc/CCTileDrawQuad.cpp: Removed.
     207        * platform/graphics/chromium/cc/CCTileDrawQuad.h: Removed.
     208        * platform/graphics/chromium/cc/CCTiledLayerImpl.cpp: Removed.
     209        * platform/graphics/chromium/cc/CCTiledLayerImpl.h: Removed.
     210        * platform/graphics/chromium/cc/CCTimeSource.h: Removed.
     211        * platform/graphics/chromium/cc/CCTimer.cpp: Removed.
     212        * platform/graphics/chromium/cc/CCTimer.h: Removed.
     213        * platform/graphics/chromium/cc/CCTimingFunction.cpp: Removed.
     214        * platform/graphics/chromium/cc/CCTimingFunction.h: Removed.
     215        * platform/graphics/chromium/cc/CCVideoLayerImpl.cpp: Removed.
     216        * platform/graphics/chromium/cc/CCVideoLayerImpl.h: Removed.
     217        * platform/graphics/chromium/cc/CCYUVVideoDrawQuad.cpp: Removed.
     218        * platform/graphics/chromium/cc/CCYUVVideoDrawQuad.h: Removed.
     219
    12202012-09-20  Tony Chang  <tony@chromium.org>
    2221
  • trunk/Source/WebCore/WebCore.gyp/WebCore.gyp

    r128992 r129160  
    4646    # binary and increasing the speed of gdb.
    4747    'enable_svg%': 1,
    48 
    49     'use_libcc_for_compositor%': 0,
    5048
    5149    'enable_wexit_time_destructors': 1,
     
    19111909      ],
    19121910    },
    1913     {
    1914       'target_name': 'webcore_chromium_compositor',
    1915       'type': 'static_library',
    1916       'dependencies': [
    1917         'webcore_prerequisites',
    1918       ],
    1919       'defines': [
    1920         'WEBKIT_IMPLEMENTATION=1',
    1921       ],
    1922       'sources': [
    1923         '<@(webcore_chromium_compositor_files)',
    1924       ],
    1925     },
    19261911    # The *NEON.cpp files fail to compile when -mthumb is passed. Force
    19271912    # them to build in ARM mode.
     
    22112196          ],
    22122197        }],
    2213         ['use_libcc_for_compositor==0', {
    2214           'dependencies': [
    2215             'webcore_chromium_compositor'
    2216           ],
    2217         }]
    22182198      ],
    22192199    },
  • trunk/Source/WebCore/WebCore.gypi

    r128992 r129160  
    83588358        ],
    83598359        'webcore_platform_support_files': [
    8360             'platform/chromium/support/CCThreadImpl.cpp',
    8361             'platform/chromium/support/CCThreadImpl.h',
    83628360            'platform/chromium/support/Extensions3DChromium.cpp',
    83638361            'platform/chromium/support/GraphicsContext3DChromium.cpp',
     
    83678365            'platform/chromium/support/PlatformGestureCurveFactory.h',
    83688366            'platform/chromium/support/WebAudioBus.cpp',
    8369             'platform/chromium/support/WebCompositorImpl.cpp',
    8370             'platform/chromium/support/WebCompositorImpl.h',
    83718367            'platform/chromium/support/WebData.cpp',
    83728368            'platform/chromium/support/WebFlingAnimatorToGestureCurveAdapter.h',
     
    84048400            'platform/chromium/support/WrappedResourceResponse.h',
    84058401        ],
    8406         'webcore_chromium_compositor_files': [
    8407             'platform/graphics/chromium/BitmapCanvasLayerTextureUpdater.cpp',
    8408             'platform/graphics/chromium/BitmapCanvasLayerTextureUpdater.h',
    8409             'platform/graphics/chromium/BitmapSkPictureCanvasLayerTextureUpdater.cpp',
    8410             'platform/graphics/chromium/BitmapSkPictureCanvasLayerTextureUpdater.h',
    8411             'platform/graphics/chromium/CanvasLayerTextureUpdater.cpp',
    8412             'platform/graphics/chromium/CanvasLayerTextureUpdater.h',
    8413             'platform/graphics/chromium/ContentLayerChromium.cpp',
    8414             'platform/graphics/chromium/ContentLayerChromium.h',
    8415             'platform/graphics/chromium/ContentLayerChromiumClient.h',
    8416             'platform/graphics/chromium/FrameBufferSkPictureCanvasLayerTextureUpdater.cpp',
    8417             'platform/graphics/chromium/FrameBufferSkPictureCanvasLayerTextureUpdater.h',
    8418             'platform/graphics/chromium/GeometryBinding.cpp',
    8419             'platform/graphics/chromium/GeometryBinding.h',
    8420             'platform/graphics/chromium/HeadsUpDisplayLayerChromium.cpp',
    8421             'platform/graphics/chromium/HeadsUpDisplayLayerChromium.h',
    8422             'platform/graphics/chromium/IOSurfaceLayerChromium.cpp',
    8423             'platform/graphics/chromium/IOSurfaceLayerChromium.h',
    8424             'platform/graphics/chromium/ImageLayerChromium.cpp',
    8425             'platform/graphics/chromium/ImageLayerChromium.h',
    8426             'platform/graphics/chromium/LayerChromium.cpp',
    8427             'platform/graphics/chromium/LayerChromium.h',
    8428             'platform/graphics/chromium/LayerPainterChromium.h',
    8429             'platform/graphics/chromium/LayerTextureSubImage.cpp',
    8430             'platform/graphics/chromium/LayerTextureSubImage.h',
    8431             'platform/graphics/chromium/LayerTextureUpdater.h',
    8432             'platform/graphics/chromium/PlatformColor.h',
    8433             'platform/graphics/chromium/ProgramBinding.cpp',
    8434             'platform/graphics/chromium/ProgramBinding.h',
    8435             'platform/graphics/chromium/RateLimiter.cpp',
    8436             'platform/graphics/chromium/RateLimiter.h',
    8437             'platform/graphics/chromium/RenderSurfaceChromium.cpp',
    8438             'platform/graphics/chromium/RenderSurfaceChromium.h',
    8439             'platform/graphics/chromium/ScrollbarLayerChromium.cpp',
    8440             'platform/graphics/chromium/ScrollbarLayerChromium.h',
    8441             'platform/graphics/chromium/ShaderChromium.cpp',
    8442             'platform/graphics/chromium/ShaderChromium.h',
    8443             'platform/graphics/chromium/SkPictureCanvasLayerTextureUpdater.cpp',
    8444             'platform/graphics/chromium/SkPictureCanvasLayerTextureUpdater.h',
    8445             'platform/graphics/chromium/SolidColorLayerChromium.cpp',
    8446             'platform/graphics/chromium/SolidColorLayerChromium.h',
    8447             'platform/graphics/chromium/TextureCopier.cpp',
    8448             'platform/graphics/chromium/TextureCopier.h',
    8449             'platform/graphics/chromium/TextureLayerChromium.cpp',
    8450             'platform/graphics/chromium/TextureLayerChromium.h',
    8451             'platform/graphics/chromium/TextureLayerChromiumClient.h',
    8452             'platform/graphics/chromium/TextureUploader.h',
    8453             'platform/graphics/chromium/ThrottledTextureUploader.cpp',
    8454             'platform/graphics/chromium/ThrottledTextureUploader.h',
    8455             'platform/graphics/chromium/TiledLayerChromium.cpp',
    8456             'platform/graphics/chromium/TiledLayerChromium.h',
    8457             'platform/graphics/chromium/TreeSynchronizer.cpp',
    8458             'platform/graphics/chromium/TreeSynchronizer.h',
    8459             'platform/graphics/chromium/UnthrottledTextureUploader.h',
    8460             'platform/graphics/chromium/VideoLayerChromium.cpp',
    8461             'platform/graphics/chromium/VideoLayerChromium.h',
    8462             'platform/graphics/chromium/cc/CCActiveAnimation.cpp',
    8463             'platform/graphics/chromium/cc/CCActiveAnimation.h',
    8464             'platform/graphics/chromium/cc/CCAnimationCurve.cpp',
    8465             'platform/graphics/chromium/cc/CCAnimationCurve.h',
    8466             'platform/graphics/chromium/cc/CCAnimationEvents.h',
    8467             'platform/graphics/chromium/cc/CCCheckerboardDrawQuad.cpp',
    8468             'platform/graphics/chromium/cc/CCCheckerboardDrawQuad.h',
    8469             'platform/graphics/chromium/cc/CCCompletionEvent.h',
    8470             'platform/graphics/chromium/cc/CCDamageTracker.cpp',
    8471             'platform/graphics/chromium/cc/CCDamageTracker.h',
    8472             'platform/graphics/chromium/cc/CCDebugBorderDrawQuad.cpp',
    8473             'platform/graphics/chromium/cc/CCDebugBorderDrawQuad.h',
    8474             'platform/graphics/chromium/cc/CCDebugRectHistory.cpp',
    8475             'platform/graphics/chromium/cc/CCDebugRectHistory.h',
    8476             'platform/graphics/chromium/cc/CCDelayBasedTimeSource.cpp',
    8477             'platform/graphics/chromium/cc/CCDelayBasedTimeSource.h',
    8478             'platform/graphics/chromium/cc/CCDirectRenderer.h',
    8479             'platform/graphics/chromium/cc/CCDirectRenderer.cpp',
    8480             'platform/graphics/chromium/cc/CCDrawQuad.cpp',
    8481             'platform/graphics/chromium/cc/CCDrawQuad.h',
    8482             'platform/graphics/chromium/cc/CCFontAtlas.cpp',
    8483             'platform/graphics/chromium/cc/CCFontAtlas.h',
    8484             'platform/graphics/chromium/cc/CCFrameRateController.cpp',
    8485             'platform/graphics/chromium/cc/CCFrameRateController.h',
    8486             'platform/graphics/chromium/cc/CCFrameRateCounter.cpp',
    8487             'platform/graphics/chromium/cc/CCFrameRateCounter.h',
    8488             'platform/graphics/chromium/cc/CCGraphicsContext.h',
    8489             'platform/graphics/chromium/cc/CCHeadsUpDisplayLayerImpl.cpp',
    8490             'platform/graphics/chromium/cc/CCHeadsUpDisplayLayerImpl.h',
    8491             'platform/graphics/chromium/cc/CCIOSurfaceDrawQuad.cpp',
    8492             'platform/graphics/chromium/cc/CCIOSurfaceDrawQuad.h',
    8493             'platform/graphics/chromium/cc/CCIOSurfaceLayerImpl.cpp',
    8494             'platform/graphics/chromium/cc/CCIOSurfaceLayerImpl.h',
    8495             'platform/graphics/chromium/cc/CCInputHandler.h',
    8496             'platform/graphics/chromium/cc/CCKeyframedAnimationCurve.cpp',
    8497             'platform/graphics/chromium/cc/CCKeyframedAnimationCurve.h',
    8498             'platform/graphics/chromium/cc/CCLayerAnimationController.cpp',
    8499             'platform/graphics/chromium/cc/CCLayerAnimationController.h',
    8500             'platform/graphics/chromium/cc/CCLayerImpl.cpp',
    8501             'platform/graphics/chromium/cc/CCLayerImpl.h',
    8502             'platform/graphics/chromium/cc/CCLayerIterator.cpp',
    8503             'platform/graphics/chromium/cc/CCLayerIterator.h',
    8504             'platform/graphics/chromium/cc/CCLayerQuad.cpp',
    8505             'platform/graphics/chromium/cc/CCLayerQuad.h',
    8506             'platform/graphics/chromium/cc/CCLayerSorter.cpp',
    8507             'platform/graphics/chromium/cc/CCLayerSorter.h',
    8508             'platform/graphics/chromium/cc/CCLayerTilingData.cpp',
    8509             'platform/graphics/chromium/cc/CCLayerTilingData.h',
    8510             'platform/graphics/chromium/cc/CCLayerTreeHost.cpp',
    8511             'platform/graphics/chromium/cc/CCLayerTreeHost.h',
    8512             'platform/graphics/chromium/cc/CCLayerTreeHostClient.h',
    8513             'platform/graphics/chromium/cc/CCLayerTreeHostCommon.cpp',
    8514             'platform/graphics/chromium/cc/CCLayerTreeHostCommon.h',
    8515             'platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp',
    8516             'platform/graphics/chromium/cc/CCLayerTreeHostImpl.h',
    8517             'platform/graphics/chromium/cc/CCMathUtil.cpp',
    8518             'platform/graphics/chromium/cc/CCMathUtil.h',
    8519             'platform/graphics/chromium/cc/CCOcclusionTracker.cpp',
    8520             'platform/graphics/chromium/cc/CCOcclusionTracker.h',
    8521             'platform/graphics/chromium/cc/CCOverdrawMetrics.cpp',
    8522             'platform/graphics/chromium/cc/CCOverdrawMetrics.h',
    8523             'platform/graphics/chromium/cc/CCPageScaleAnimation.cpp',
    8524             'platform/graphics/chromium/cc/CCPageScaleAnimation.h',
    8525             'platform/graphics/chromium/cc/CCPrioritizedTexture.cpp',
    8526             'platform/graphics/chromium/cc/CCPrioritizedTexture.h',
    8527             'platform/graphics/chromium/cc/CCPrioritizedTextureManager.cpp',
    8528             'platform/graphics/chromium/cc/CCPrioritizedTextureManager.h',
    8529             'platform/graphics/chromium/cc/CCPriorityCalculator.cpp',
    8530             'platform/graphics/chromium/cc/CCPriorityCalculator.h',
    8531             'platform/graphics/chromium/cc/CCProxy.cpp',
    8532             'platform/graphics/chromium/cc/CCProxy.h',
    8533             'platform/graphics/chromium/cc/CCQuadSink.h',
    8534             'platform/graphics/chromium/cc/CCQuadCuller.cpp',
    8535             'platform/graphics/chromium/cc/CCQuadCuller.h',
    8536             'platform/graphics/chromium/cc/CCRenderer.h',
    8537             'platform/graphics/chromium/cc/CCRendererGL.cpp',
    8538             'platform/graphics/chromium/cc/CCRendererGL.h',
    8539             'platform/graphics/chromium/cc/CCRenderPass.cpp',
    8540             'platform/graphics/chromium/cc/CCRenderPass.h',
    8541             'platform/graphics/chromium/cc/CCRenderPassDrawQuad.cpp',
    8542             'platform/graphics/chromium/cc/CCRenderPassDrawQuad.h',
    8543             'platform/graphics/chromium/cc/CCRenderPassSink.h',
    8544             'platform/graphics/chromium/cc/CCRenderSurface.cpp',
    8545             'platform/graphics/chromium/cc/CCRenderSurface.h',
    8546             'platform/graphics/chromium/cc/CCRenderSurfaceFilters.cpp',
    8547             'platform/graphics/chromium/cc/CCRenderSurfaceFilters.h',
    8548             'platform/graphics/chromium/cc/CCRenderer.h',
    8549             'platform/graphics/chromium/cc/CCRenderingStats.h',
    8550             'platform/graphics/chromium/cc/CCResourceProvider.cpp',
    8551             'platform/graphics/chromium/cc/CCResourceProvider.h',
    8552             'platform/graphics/chromium/cc/CCScheduler.cpp',
    8553             'platform/graphics/chromium/cc/CCScheduler.h',
    8554             'platform/graphics/chromium/cc/CCSchedulerStateMachine.cpp',
    8555             'platform/graphics/chromium/cc/CCSchedulerStateMachine.h',
    8556             'platform/graphics/chromium/cc/CCScopedTexture.cpp',
    8557             'platform/graphics/chromium/cc/CCScopedTexture.h',
    8558             'platform/graphics/chromium/cc/CCScopedThreadProxy.h',
    8559             'platform/graphics/chromium/cc/CCScrollbarAnimationController.cpp',
    8560             'platform/graphics/chromium/cc/CCScrollbarAnimationController.h',
    8561             'platform/graphics/chromium/cc/CCScrollbarAnimationControllerLinearFade.cpp',
    8562             'platform/graphics/chromium/cc/CCScrollbarAnimationControllerLinearFade.h',
    8563             'platform/graphics/chromium/cc/CCScrollbarLayerImpl.cpp',
    8564             'platform/graphics/chromium/cc/CCScrollbarLayerImpl.h',
    8565             'platform/graphics/chromium/cc/CCScrollbarGeometryFixedThumb.cpp',
    8566             'platform/graphics/chromium/cc/CCScrollbarGeometryFixedThumb.h',
    8567             'platform/graphics/chromium/cc/CCScrollbarGeometryStub.cpp',
    8568             'platform/graphics/chromium/cc/CCScrollbarGeometryStub.h',
    8569             'platform/graphics/chromium/cc/CCSettings.cpp',
    8570             'platform/graphics/chromium/cc/CCSettings.h',
    8571             'platform/graphics/chromium/cc/CCSharedQuadState.cpp',
    8572             'platform/graphics/chromium/cc/CCSharedQuadState.h',
    8573             'platform/graphics/chromium/cc/CCSingleThreadProxy.cpp',
    8574             'platform/graphics/chromium/cc/CCSingleThreadProxy.h',
    8575             'platform/graphics/chromium/cc/CCSolidColorDrawQuad.cpp',
    8576             'platform/graphics/chromium/cc/CCSolidColorDrawQuad.h',
    8577             'platform/graphics/chromium/cc/CCSolidColorLayerImpl.cpp',
    8578             'platform/graphics/chromium/cc/CCSolidColorLayerImpl.h',
    8579             'platform/graphics/chromium/cc/CCStreamVideoDrawQuad.cpp',
    8580             'platform/graphics/chromium/cc/CCStreamVideoDrawQuad.h',
    8581             'platform/graphics/chromium/cc/CCTexture.cpp',
    8582             'platform/graphics/chromium/cc/CCTexture.h',
    8583             'platform/graphics/chromium/cc/CCTextureDrawQuad.cpp',
    8584             'platform/graphics/chromium/cc/CCTextureDrawQuad.h',
    8585             'platform/graphics/chromium/cc/CCTextureLayerImpl.cpp',
    8586             'platform/graphics/chromium/cc/CCTextureLayerImpl.h',
    8587             'platform/graphics/chromium/cc/CCTextureUpdateController.cpp',
    8588             'platform/graphics/chromium/cc/CCTextureUpdateController.h',
    8589             'platform/graphics/chromium/cc/CCTextureUpdateQueue.cpp',
    8590             'platform/graphics/chromium/cc/CCTextureUpdateQueue.h',
    8591             'platform/graphics/chromium/cc/CCThread.h',
    8592             'platform/graphics/chromium/cc/CCThreadProxy.cpp',
    8593             'platform/graphics/chromium/cc/CCThreadProxy.h',
    8594             'platform/graphics/chromium/cc/CCThreadTask.h',
    8595             'platform/graphics/chromium/cc/CCTileDrawQuad.cpp',
    8596             'platform/graphics/chromium/cc/CCTileDrawQuad.h',
    8597             'platform/graphics/chromium/cc/CCTiledLayerImpl.cpp',
    8598             'platform/graphics/chromium/cc/CCTiledLayerImpl.h',
    8599             'platform/graphics/chromium/cc/CCTimeSource.h',
    8600             'platform/graphics/chromium/cc/CCTimer.cpp',
    8601             'platform/graphics/chromium/cc/CCTimer.h',
    8602             'platform/graphics/chromium/cc/CCTimingFunction.cpp',
    8603             'platform/graphics/chromium/cc/CCTimingFunction.h',
    8604             'platform/graphics/chromium/cc/CCVideoLayerImpl.cpp',
    8605             'platform/graphics/chromium/cc/CCVideoLayerImpl.h',
    8606             'platform/graphics/chromium/cc/CCYUVVideoDrawQuad.cpp',
    8607             'platform/graphics/chromium/cc/CCYUVVideoDrawQuad.h',
    8608         ],
    86098402        'export_file_generator_files': [
    86108403            '<(PRODUCT_DIR)/DerivedSources/WebCore/ExportFileGenerator.cpp',
  • trunk/Source/WebCore/platform/graphics/chromium/Canvas2DLayerBridge.cpp

    r128785 r129160  
    2828#include "Canvas2DLayerBridge.h"
    2929
    30 #include "CCRendererGL.h" // For the GLC() macro.
    3130#include "Canvas2DLayerManager.h"
    3231#include "GrContext.h"
     
    6867    if (m_useDoubleBuffering) {
    6968        m_context->makeContextCurrent();
    70         GLC(m_context.get(), m_frontBufferTexture = m_context->createTexture());
    71         GLC(m_context.get(), m_context->bindTexture(GraphicsContext3D::TEXTURE_2D, m_frontBufferTexture));
     69        m_frontBufferTexture = m_context->createTexture();
     70        m_context->bindTexture(GraphicsContext3D::TEXTURE_2D, m_frontBufferTexture);
    7271        // Do basic linear filtering on resize.
    73         GLC(m_context.get(), m_context->texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_MIN_FILTER, GraphicsContext3D::LINEAR));
    74         GLC(m_context.get(), m_context->texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_MAG_FILTER, GraphicsContext3D::LINEAR));
     72        m_context->texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_MIN_FILTER, GraphicsContext3D::LINEAR);
     73        m_context->texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_MAG_FILTER, GraphicsContext3D::LINEAR);
    7574        // NPOT textures in GL ES only work when the wrap mode is set to GraphicsContext3D::CLAMP_TO_EDGE.
    76         GLC(m_context.get(), m_context->texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_WRAP_S, GraphicsContext3D::CLAMP_TO_EDGE));
    77         GLC(m_context.get(), m_context->texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_WRAP_T, GraphicsContext3D::CLAMP_TO_EDGE));
    78         GLC(m_context.get(), m_context->texImage2DResourceSafe(GraphicsContext3D::TEXTURE_2D, 0, GraphicsContext3D::RGBA, size.width(), size.height(), 0, GraphicsContext3D::RGBA, GraphicsContext3D::UNSIGNED_BYTE));
     75        m_context->texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_WRAP_S, GraphicsContext3D::CLAMP_TO_EDGE);
     76        m_context->texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_WRAP_T, GraphicsContext3D::CLAMP_TO_EDGE);
     77        m_context->texImage2DResourceSafe(GraphicsContext3D::TEXTURE_2D, 0, GraphicsContext3D::RGBA, size.width(), size.height(), 0, GraphicsContext3D::RGBA, GraphicsContext3D::UNSIGNED_BYTE);
    7978        if (GrContext* grContext = m_context->grContext())
    8079            grContext->resetContext();
     
    9695    if (m_useDoubleBuffering) {
    9796        m_context->makeContextCurrent();
    98         GLC(m_context.get(), m_context->deleteTexture(m_frontBufferTexture));
     97        m_context->deleteTexture(m_frontBufferTexture);
    9998        m_context->flush();
    10099    }
  • trunk/Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp

    r127952 r129160  
    4747
    4848#include "AnimationTranslationUtil.h"
    49 #include "ContentLayerChromium.h"
    5049#include "FloatConversion.h"
    5150#include "FloatRect.h"
     
    7170#include <wtf/StringExtras.h>
    7271#include <wtf/text/CString.h>
     72#include <wtf/text/StringHash.h>
    7373#include <wtf/text/WTFString.h>
    7474
  • trunk/Source/WebKit/chromium/ChangeLog

    r129145 r129160  
     12012-09-20  James Robinson  <jamesr@chromium.org>
     2
     3        [chromium] Remove unused copy of chromium compositor implementation files
     4        https://bugs.webkit.org/show_bug.cgi?id=97255
     5
     6        Reviewed by Adam Barth.
     7
     8        * WebKit.gyp:
     9        * WebKit.gypi:
     10        * WebKitUnitTests.gyp:
     11        * src/WebAnimationCurveCommon.cpp: Removed.
     12        * src/WebAnimationCurveCommon.h: Removed.
     13        * src/WebAnimationImpl.cpp: Removed.
     14        * src/WebAnimationImpl.h: Removed.
     15        * src/WebContentLayerImpl.cpp: Removed.
     16        * src/WebContentLayerImpl.h: Removed.
     17        * src/WebExternalTextureLayerImpl.cpp: Removed.
     18        * src/WebExternalTextureLayerImpl.h: Removed.
     19        * src/WebFloatAnimationCurveImpl.cpp: Removed.
     20        * src/WebFloatAnimationCurveImpl.h: Removed.
     21        * src/WebIOSurfaceLayerImpl.cpp: Removed.
     22        * src/WebIOSurfaceLayerImpl.h: Removed.
     23        * src/WebImageLayerImpl.cpp: Removed.
     24        * src/WebImageLayerImpl.h: Removed.
     25        * src/WebLayerImpl.cpp: Removed.
     26        * src/WebLayerImpl.h: Removed.
     27        * src/WebLayerTreeViewImpl.cpp: Removed.
     28        * src/WebLayerTreeViewImpl.h: Removed.
     29        * src/WebScrollbarLayerImpl.cpp: Removed.
     30        * src/WebScrollbarLayerImpl.h: Removed.
     31        * src/WebSolidColorLayerImpl.cpp: Removed.
     32        * src/WebSolidColorLayerImpl.h: Removed.
     33        * src/WebToCCInputHandlerAdapter.cpp: Removed.
     34        * src/WebToCCInputHandlerAdapter.h: Removed.
     35        * src/WebTransformAnimationCurveImpl.cpp: Removed.
     36        * src/WebTransformAnimationCurveImpl.h: Removed.
     37        * src/WebVideoLayerImpl.cpp: Removed.
     38        * src/WebVideoLayerImpl.h: Removed.
     39        * tests/CCActiveAnimationTest.cpp: Removed.
     40        * tests/CCAnimationTestCommon.cpp: Removed.
     41        * tests/CCAnimationTestCommon.h: Removed.
     42        * tests/CCDamageTrackerTest.cpp: Removed.
     43        * tests/CCDelayBasedTimeSourceTest.cpp: Removed.
     44        * tests/CCDrawQuadTest.cpp: Removed.
     45        * tests/CCFrameRateControllerTest.cpp: Removed.
     46        * tests/CCGeometryTestUtils.cpp: Removed.
     47        * tests/CCGeometryTestUtils.h: Removed.
     48        * tests/CCHeadsUpDisplayTest.cpp: Removed.
     49        * tests/CCKeyframedAnimationCurveTest.cpp: Removed.
     50        * tests/CCLayerAnimationControllerTest.cpp: Removed.
     51        * tests/CCLayerImplTest.cpp: Removed.
     52        * tests/CCLayerIteratorTest.cpp: Removed.
     53        * tests/CCLayerQuadTest.cpp: Removed.
     54        * tests/CCLayerSorterTest.cpp: Removed.
     55        * tests/CCLayerTestCommon.cpp: Removed.
     56        * tests/CCLayerTestCommon.h: Removed.
     57        * tests/CCLayerTreeHostCommonTest.cpp: Removed.
     58        * tests/CCLayerTreeHostImplTest.cpp: Removed.
     59        * tests/CCLayerTreeHostTest.cpp: Removed.
     60        * tests/CCMathUtilTest.cpp: Removed.
     61        * tests/CCOcclusionTrackerTest.cpp: Removed.
     62        * tests/CCOcclusionTrackerTestCommon.h: Removed.
     63        * tests/CCPrioritizedTextureTest.cpp: Removed.
     64        * tests/CCQuadCullerTest.cpp: Removed.
     65        * tests/CCRenderPassTest.cpp: Removed.
     66        * tests/CCRenderSurfaceFiltersTest.cpp: Removed.
     67        * tests/CCRenderSurfaceTest.cpp: Removed.
     68        * tests/CCRendererGLTest.cpp: Removed.
     69        * tests/CCResourceProviderTest.cpp: Removed.
     70        * tests/CCSchedulerStateMachineTest.cpp: Removed.
     71        * tests/CCSchedulerTest.cpp: Removed.
     72        * tests/CCSchedulerTestCommon.h: Removed.
     73        * tests/CCScopedTextureTest.cpp: Removed.
     74        * tests/CCScrollbarAnimationControllerLinearFadeTest.cpp: Removed.
     75        * tests/CCSolidColorLayerImplTest.cpp: Removed.
     76        * tests/CCTestCommon.h: Removed.
     77        * tests/CCTextureUpdateControllerTest.cpp: Removed.
     78        * tests/CCThreadTaskTest.cpp: Removed.
     79        * tests/CCThreadedTest.cpp: Removed.
     80        * tests/CCThreadedTest.h: Removed.
     81        * tests/CCTiledLayerImplTest.cpp: Removed.
     82        * tests/CCTiledLayerTestCommon.cpp: Removed.
     83        * tests/CCTiledLayerTestCommon.h: Removed.
     84        * tests/CCTimerTest.cpp: Removed.
     85        * tests/ContentLayerChromiumTest.cpp: Removed.
     86        * tests/FakeCCLayerTreeHostClient.h: Removed.
     87        * tests/FakeGraphicsContext3DTest.cpp: Removed.
     88        * tests/FakeWebScrollbarThemeGeometry.h: Removed.
     89        * tests/FloatQuadTest.cpp: Removed.
     90        * tests/GraphicsLayerChromiumTest.cpp:
     91        * tests/ImageLayerChromiumTest.cpp:
     92        * tests/LayerChromiumTest.cpp: Removed.
     93        * tests/MockCCQuadCuller.h: Removed.
     94        * tests/ScrollbarLayerChromiumTest.cpp: Removed.
     95        * tests/TextureCopierTest.cpp: Removed.
     96        * tests/TextureLayerChromiumTest.cpp: Removed.
     97        * tests/ThrottledTextureUploaderTest.cpp: Removed.
     98        * tests/TiledLayerChromiumTest.cpp: Removed.
     99        * tests/TreeSynchronizerTest.cpp: Removed.
     100        * tests/WebAnimationTest.cpp: Removed.
     101        * tests/WebFloatAnimationCurveTest.cpp: Removed.
     102        * tests/WebLayerTest.cpp: Removed.
     103        * tests/WebLayerTreeViewTest.cpp: Removed.
     104        * tests/WebTransformAnimationCurveTest.cpp: Removed.
     105        * tests/WebTransformOperationsTest.cpp: Removed.
     106        * tests/WebTransformationMatrixTest.cpp: Removed.
     107
    11082012-09-20  Tommy Widenflycht  <tommyw@google.com>
    2109
  • trunk/Source/WebKit/chromium/WebKit.gyp

    r129039 r129160  
    5454        # stored as is. Otherwise, a concatenated file is stored.
    5555        'debug_devtools%': 0,
    56 
    57         # If set to 1, uses the compositor bindings provided by PlatformSupport
    58         # instead of the compositor-implementation binding files in WebKit/chromium/src.
    59         'use_libcc_for_compositor%': 0,
    6056
    6157        # List of DevTools source files, ordered by dependencies. It is used both
     
    742738                                    },
    743739                                }],
    744                                 ['use_libcc_for_compositor==0', {
    745                                     'sources': [
    746                                         '<@(webkit_compositor_unittest_files)',
    747                                     ],
    748                                 }],
    749740                            ],
    750741                            'msvs_settings': {
     
    840831                        'WARNING_CFLAGS': ['-Wglobal-constructors'],
    841832                    },
    842                 }],
    843                 ['use_libcc_for_compositor==1', {
    844                     'sources!': [
    845                         '../../WebCore/platform/chromium/support/CCThreadImpl.cpp',
    846                         '../../WebCore/platform/chromium/support/CCThreadImpl.h',
    847                         '../../WebCore/platform/chromium/support/WebCompositorImpl.cpp',
    848                         '../../WebCore/platform/chromium/support/WebCompositorImpl.h',
    849                     ],
    850                 }, { # else: use_libcc_for_compositor==0
    851                     'sources': [
    852                         '<@(webkit_compositor_bindings_files)',
    853                     ]
    854833                }],
    855834            ],
  • trunk/Source/WebKit/chromium/WebKit.gypi

    r129032 r129160  
    5959            'tests/Canvas2DLayerManagerTest.cpp',
    6060            'tests/ClipboardChromiumTest.cpp',
     61            'tests/CompositorFakeWebGraphicsContext3D.h',
    6162            'tests/DateTimeFormatTest.cpp',
    6263            'tests/DecimalTest.cpp',
    6364            'tests/DragImageTest.cpp',
    6465            'tests/EventListenerTest.cpp',
     66            'tests/FakeWebCompositorOutputSurface.h',
     67            'tests/FakeWebGraphicsContext3D.h',
    6568            'tests/FilterOperationsTest.cpp',
    6669            'tests/FrameLoaderClientImplTest.cpp',
     
    7679            'tests/IDBRequestTest.cpp',
    7780            'tests/ImageLayerChromiumTest.cpp',
     81            'tests/KURLTest.cpp',
    7882            'tests/KeyboardTest.cpp',
    79             'tests/KURLTest.cpp',
     83            'tests/LayerPainterChromium.h',
    8084            'tests/LevelDBTest.cpp',
    8185            'tests/LinkHighlightTest.cpp',
     
    8589            'tests/OpaqueRectTrackingContentLayerDelegateTest.cpp',
    8690            'tests/OpenTypeVerticalDataTest.cpp',
    87             'tests/PaintAggregatorTest.cpp',
    88             'tests/PlatformGestureCurveTest.cpp',
    89             'tests/PlatformContextSkiaTest.cpp',
    9091            'tests/PODArenaTest.cpp',
    9192            'tests/PODIntervalTreeTest.cpp',
    9293            'tests/PODRedBlackTreeTest.cpp',
     94            'tests/PaintAggregatorTest.cpp',
     95            'tests/PlatformContextSkiaTest.cpp',
     96            'tests/PlatformGestureCurveTest.cpp',
    9397            'tests/PopupContainerTest.cpp',
    9498            'tests/RegionTest.cpp',
     
    103107            'tests/WebCompositorInputHandlerImplTest.cpp',
    104108            'tests/WebFrameTest.cpp',
     109            'tests/WebImageTest.cpp',
    105110            'tests/WebInputEventConversionTest.cpp',
    106             'tests/WebImageTest.cpp',
    107111            'tests/WebMediaPlayerClientImplTest.cpp',
    108112            'tests/WebPageNewSerializerTest.cpp',
     
    113117            'tests/WebURLResponseTest.cpp',
    114118            'tests/WebViewTest.cpp',
    115         ],
    116 
    117         'webkit_compositor_unittest_files': [
    118             'tests/CCActiveAnimationTest.cpp',
    119             'tests/CCAnimationTestCommon.cpp',
    120             'tests/CCAnimationTestCommon.h',
    121             'tests/CCDamageTrackerTest.cpp',
    122             'tests/CCDelayBasedTimeSourceTest.cpp',
    123             'tests/CCDrawQuadTest.cpp',
    124             'tests/CCFrameRateControllerTest.cpp',
    125             'tests/CCGeometryTestUtils.cpp',
    126             'tests/CCGeometryTestUtils.h',
    127             'tests/CCHeadsUpDisplayTest.cpp',
    128             'tests/CCKeyframedAnimationCurveTest.cpp',
    129             'tests/CCLayerAnimationControllerTest.cpp',
    130             'tests/CCLayerImplTest.cpp',
    131             'tests/CCLayerIteratorTest.cpp',
    132             'tests/CCLayerQuadTest.cpp',
    133             'tests/CCLayerSorterTest.cpp',
    134             'tests/CCLayerTestCommon.cpp',
    135             'tests/CCLayerTestCommon.h',
    136             'tests/CCLayerTreeHostCommonTest.cpp',
    137             'tests/CCLayerTreeHostImplTest.cpp',
    138             'tests/CCLayerTreeHostTest.cpp',
    139             'tests/CCMathUtilTest.cpp',
    140             'tests/CCOcclusionTrackerTest.cpp',
    141             'tests/CCOcclusionTrackerTestCommon.h',
    142             'tests/CCPrioritizedTextureTest.cpp',
    143             'tests/CCQuadCullerTest.cpp',
    144             'tests/CCRenderPassTest.cpp',
    145             'tests/CCRenderSurfaceFiltersTest.cpp',
    146             'tests/CCRenderSurfaceTest.cpp',
    147             'tests/CCRendererGLTest.cpp',
    148             'tests/CCResourceProviderTest.cpp',
    149             'tests/CCSchedulerStateMachineTest.cpp',
    150             'tests/CCSchedulerTest.cpp',
    151             'tests/CCSchedulerTestCommon.h',
    152             'tests/CCScopedTextureTest.cpp',
    153             'tests/CCScrollbarAnimationControllerLinearFadeTest.cpp',
    154             'tests/CCSolidColorLayerImplTest.cpp',
    155             'tests/CCTestCommon.h',
    156             'tests/CCTextureUpdateControllerTest.cpp',
    157             'tests/CCThreadTaskTest.cpp',
    158             'tests/CCThreadedTest.cpp',
    159             'tests/CCThreadedTest.h',
    160             'tests/CCTiledLayerImplTest.cpp',
    161             'tests/CCTiledLayerTestCommon.cpp',
    162             'tests/CCTiledLayerTestCommon.h',
    163             'tests/CCTimerTest.cpp',
    164             'tests/CompositorFakeWebGraphicsContext3D.h',
    165             'tests/ContentLayerChromiumTest.cpp',
    166             'tests/FakeCCLayerTreeHostClient.h',
    167             'tests/FakeGraphicsContext3DTest.cpp',
    168             'tests/FakeWebCompositorOutputSurface.h',
    169             'tests/FakeWebGraphicsContext3D.h',
    170             'tests/FakeWebScrollbarThemeGeometry.h',
    171             'tests/FloatQuadTest.cpp',
    172             'tests/LayerChromiumTest.cpp',
    173             'tests/MockCCQuadCuller.h',
    174             'tests/ScrollbarLayerChromiumTest.cpp',
    175             'tests/TextureCopierTest.cpp',
    176             'tests/TextureLayerChromiumTest.cpp',
    177             'tests/ThrottledTextureUploaderTest.cpp',
    178             'tests/TiledLayerChromiumTest.cpp',
    179             'tests/TreeSynchronizerTest.cpp',
    180             'tests/WebAnimationTest.cpp',
    181             'tests/WebFloatAnimationCurveTest.cpp',
    182             'tests/WebLayerTest.cpp',
    183             'tests/WebLayerTreeViewTest.cpp',
    184             'tests/WebLayerTreeViewTestCommon.h',
    185             'tests/WebTransformAnimationCurveTest.cpp',
    186             'tests/WebTransformOperationsTest.cpp',
    187             'tests/WebTransformationMatrixTest.cpp',
    188         ],
    189 
    190         'webkit_compositor_bindings_files': [
    191             'src/WebAnimationCurveCommon.cpp',
    192             'src/WebAnimationCurveCommon.h',
    193             'src/WebAnimationImpl.cpp',
    194             'src/WebAnimationImpl.h',
    195             'src/WebContentLayerImpl.cpp',
    196             'src/WebContentLayerImpl.h',
    197             'src/WebExternalTextureLayerImpl.cpp',
    198             'src/WebExternalTextureLayerImpl.h',
    199             'src/WebFloatAnimationCurveImpl.cpp',
    200             'src/WebFloatAnimationCurveImpl.h',
    201             'src/WebIOSurfaceLayerImpl.cpp',
    202             'src/WebIOSurfaceLayerImpl.h',
    203             'src/WebImageLayerImpl.cpp',
    204             'src/WebImageLayerImpl.h',
    205             'src/WebLayerImpl.cpp',
    206             'src/WebLayerImpl.h',
    207             'src/WebToCCInputHandlerAdapter.cpp',
    208             'src/WebToCCInputHandlerAdapter.h',
    209             'src/WebLayerTreeViewImpl.cpp',
    210             'src/WebLayerTreeViewImpl.h',
    211             'src/WebScrollbarLayerImpl.cpp',
    212             'src/WebScrollbarLayerImpl.h',
    213             'src/WebSolidColorLayerImpl.cpp',
    214             'src/WebSolidColorLayerImpl.h',
    215             'src/WebTransformAnimationCurveImpl.cpp',
    216             'src/WebTransformAnimationCurveImpl.h',
    217             'src/WebVideoLayerImpl.cpp',
    218             'src/WebVideoLayerImpl.h',
    219119        ],
    220120
  • trunk/Source/WebKit/chromium/WebKitUnitTests.gyp

    r128628 r129160  
    4747            }],
    4848        ],
    49 
    50         'use_libcc_for_compositor%': 0,
    5149    },
    5250    'targets': [
     
    104102                            'chromium_code': 1,
    105103                            },
    106                         }],
    107                         ['use_libcc_for_compositor==0', {
    108                             'sources': [
    109                                 '<@(webkit_compositor_unittest_files)',
    110                             ],
    111104                        }],
    112105                    ],
  • trunk/Source/WebKit/chromium/tests/GraphicsLayerChromiumTest.cpp

    r128134 r129160  
    2727#include "GraphicsLayerChromium.h"
    2828
    29 #include "CCLayerTreeHost.h"
    30 #include "CCLayerTreeHostImpl.h"
    31 #include "CCSingleThreadProxy.h"
    3229#include "CompositorFakeWebGraphicsContext3D.h"
    3330#include "GraphicsLayer.h"
     
    4340#include <public/WebGraphicsContext3D.h>
    4441#include <public/WebLayerTreeView.h>
     42#include <public/WebTransformationMatrix.h>
    4543#include <wtf/PassOwnPtr.h>
    4644
  • trunk/Source/WebKit/chromium/tests/ImageLayerChromiumTest.cpp

    r126378 r129160  
    2424
    2525#include "config.h"
    26 
    27 #include "ImageLayerChromium.h"
    2826
    2927#include "GraphicsLayer.h"
Note: See TracChangeset for help on using the changeset viewer.