[chromium] Remove unused copy of chromium compositor implementation files
authorjamesr@google.com <jamesr@google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 20 Sep 2012 20:34:34 +0000 (20:34 +0000)
committerjamesr@google.com <jamesr@google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 20 Sep 2012 20:34:34 +0000 (20:34 +0000)
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.

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

308 files changed:
Source/WebCore/ChangeLog
Source/WebCore/WebCore.gyp/WebCore.gyp
Source/WebCore/WebCore.gypi
Source/WebCore/platform/chromium/support/CCThreadImpl.cpp [deleted file]
Source/WebCore/platform/chromium/support/CCThreadImpl.h [deleted file]
Source/WebCore/platform/chromium/support/WebCompositorImpl.cpp [deleted file]
Source/WebCore/platform/chromium/support/WebCompositorImpl.h [deleted file]
Source/WebCore/platform/graphics/chromium/BitmapCanvasLayerTextureUpdater.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/BitmapCanvasLayerTextureUpdater.h [deleted file]
Source/WebCore/platform/graphics/chromium/BitmapSkPictureCanvasLayerTextureUpdater.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/BitmapSkPictureCanvasLayerTextureUpdater.h [deleted file]
Source/WebCore/platform/graphics/chromium/Canvas2DLayerBridge.cpp
Source/WebCore/platform/graphics/chromium/CanvasLayerTextureUpdater.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/CanvasLayerTextureUpdater.h [deleted file]
Source/WebCore/platform/graphics/chromium/ContentLayerChromium.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/ContentLayerChromium.h [deleted file]
Source/WebCore/platform/graphics/chromium/ContentLayerChromiumClient.h [deleted file]
Source/WebCore/platform/graphics/chromium/FrameBufferSkPictureCanvasLayerTextureUpdater.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/FrameBufferSkPictureCanvasLayerTextureUpdater.h [deleted file]
Source/WebCore/platform/graphics/chromium/GeometryBinding.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/GeometryBinding.h [deleted file]
Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp
Source/WebCore/platform/graphics/chromium/HeadsUpDisplayLayerChromium.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/HeadsUpDisplayLayerChromium.h [deleted file]
Source/WebCore/platform/graphics/chromium/IOSurfaceLayerChromium.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/IOSurfaceLayerChromium.h [deleted file]
Source/WebCore/platform/graphics/chromium/ImageLayerChromium.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/ImageLayerChromium.h [deleted file]
Source/WebCore/platform/graphics/chromium/LayerChromium.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/LayerChromium.h [deleted file]
Source/WebCore/platform/graphics/chromium/LayerTextureSubImage.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/LayerTextureSubImage.h [deleted file]
Source/WebCore/platform/graphics/chromium/LayerTextureUpdater.h [deleted file]
Source/WebCore/platform/graphics/chromium/PlatformColor.h [deleted file]
Source/WebCore/platform/graphics/chromium/ProgramBinding.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/ProgramBinding.h [deleted file]
Source/WebCore/platform/graphics/chromium/RateLimiter.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/RateLimiter.h [deleted file]
Source/WebCore/platform/graphics/chromium/RenderSurfaceChromium.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/RenderSurfaceChromium.h [deleted file]
Source/WebCore/platform/graphics/chromium/ScrollbarLayerChromium.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/ScrollbarLayerChromium.h [deleted file]
Source/WebCore/platform/graphics/chromium/ShaderChromium.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/ShaderChromium.h [deleted file]
Source/WebCore/platform/graphics/chromium/SkPictureCanvasLayerTextureUpdater.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/SkPictureCanvasLayerTextureUpdater.h [deleted file]
Source/WebCore/platform/graphics/chromium/SolidColorLayerChromium.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/SolidColorLayerChromium.h [deleted file]
Source/WebCore/platform/graphics/chromium/TextureCopier.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/TextureCopier.h [deleted file]
Source/WebCore/platform/graphics/chromium/TextureLayerChromium.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/TextureLayerChromium.h [deleted file]
Source/WebCore/platform/graphics/chromium/TextureLayerChromiumClient.h [deleted file]
Source/WebCore/platform/graphics/chromium/ThrottledTextureUploader.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/ThrottledTextureUploader.h [deleted file]
Source/WebCore/platform/graphics/chromium/TiledLayerChromium.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/TiledLayerChromium.h [deleted file]
Source/WebCore/platform/graphics/chromium/TreeSynchronizer.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/TreeSynchronizer.h [deleted file]
Source/WebCore/platform/graphics/chromium/UnthrottledTextureUploader.h [deleted file]
Source/WebCore/platform/graphics/chromium/VideoLayerChromium.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/VideoLayerChromium.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCActiveAnimation.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCActiveAnimation.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCAnimationCurve.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCAnimationCurve.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCAnimationEvents.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCAppendQuadsData.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCCheckerboardDrawQuad.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCCheckerboardDrawQuad.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCCompletionEvent.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCDamageTracker.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCDamageTracker.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCDebugBorderDrawQuad.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCDebugBorderDrawQuad.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCDebugRectHistory.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCDebugRectHistory.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCDelayBasedTimeSource.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCDelayBasedTimeSource.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCDirectRenderer.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCDirectRenderer.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCDrawQuad.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCDrawQuad.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCFontAtlas.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCFontAtlas.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCFrameRateController.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCFrameRateController.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCFrameRateCounter.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCFrameRateCounter.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCGraphicsContext.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCHeadsUpDisplayLayerImpl.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCHeadsUpDisplayLayerImpl.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCIOSurfaceDrawQuad.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCIOSurfaceDrawQuad.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCIOSurfaceLayerImpl.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCIOSurfaceLayerImpl.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCInputHandler.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCKeyframedAnimationCurve.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCKeyframedAnimationCurve.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCLayerAnimationController.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCLayerAnimationController.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCLayerImpl.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCLayerImpl.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCLayerIterator.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCLayerIterator.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCLayerQuad.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCLayerQuad.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCLayerSorter.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCLayerSorter.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCLayerTilingData.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCLayerTilingData.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostClient.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostCommon.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostCommon.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCMathUtil.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCMathUtil.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCOcclusionTracker.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCOcclusionTracker.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCOverdrawMetrics.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCOverdrawMetrics.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCPageScaleAnimation.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCPageScaleAnimation.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCPrioritizedTexture.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCPrioritizedTexture.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCPrioritizedTextureManager.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCPrioritizedTextureManager.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCPriorityCalculator.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCPriorityCalculator.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCProxy.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCProxy.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCQuadCuller.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCQuadCuller.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCQuadSink.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCRenderPass.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCRenderPass.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCRenderPassDrawQuad.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCRenderPassDrawQuad.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCRenderPassSink.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCRenderSurface.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCRenderSurface.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCRenderSurfaceFilters.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCRenderSurfaceFilters.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCRenderer.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCRendererGL.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCRendererGL.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCRenderingStats.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCResourceProvider.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCResourceProvider.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCScheduler.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCScheduler.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCSchedulerStateMachine.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCSchedulerStateMachine.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCScopedTexture.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCScopedTexture.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCScopedThreadProxy.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCScrollbarAnimationController.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCScrollbarAnimationController.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCScrollbarAnimationControllerLinearFade.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCScrollbarAnimationControllerLinearFade.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCScrollbarGeometryFixedThumb.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCScrollbarGeometryFixedThumb.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCScrollbarGeometryStub.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCScrollbarGeometryStub.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCScrollbarLayerImpl.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCScrollbarLayerImpl.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCSettings.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCSettings.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCSharedQuadState.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCSharedQuadState.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCSingleThreadProxy.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCSingleThreadProxy.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCSolidColorDrawQuad.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCSolidColorDrawQuad.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCSolidColorLayerImpl.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCSolidColorLayerImpl.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCStreamVideoDrawQuad.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCStreamVideoDrawQuad.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCTexture.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCTexture.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCTextureDrawQuad.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCTextureDrawQuad.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCTextureLayerImpl.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCTextureLayerImpl.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCTextureUpdateController.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCTextureUpdateController.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCTextureUpdateQueue.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCTextureUpdateQueue.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCThread.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCThreadTask.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCTileDrawQuad.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCTileDrawQuad.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCTiledLayerImpl.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCTiledLayerImpl.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCTimeSource.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCTimer.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCTimer.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCTimingFunction.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCTimingFunction.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCVideoLayerImpl.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCVideoLayerImpl.h [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCYUVVideoDrawQuad.cpp [deleted file]
Source/WebCore/platform/graphics/chromium/cc/CCYUVVideoDrawQuad.h [deleted file]
Source/WebKit/chromium/ChangeLog
Source/WebKit/chromium/WebKit.gyp
Source/WebKit/chromium/WebKit.gypi
Source/WebKit/chromium/WebKitUnitTests.gyp
Source/WebKit/chromium/src/WebAnimationCurveCommon.cpp [deleted file]
Source/WebKit/chromium/src/WebAnimationCurveCommon.h [deleted file]
Source/WebKit/chromium/src/WebAnimationImpl.cpp [deleted file]
Source/WebKit/chromium/src/WebAnimationImpl.h [deleted file]
Source/WebKit/chromium/src/WebContentLayerImpl.cpp [deleted file]
Source/WebKit/chromium/src/WebContentLayerImpl.h [deleted file]
Source/WebKit/chromium/src/WebExternalTextureLayerImpl.cpp [deleted file]
Source/WebKit/chromium/src/WebExternalTextureLayerImpl.h [deleted file]
Source/WebKit/chromium/src/WebFloatAnimationCurveImpl.cpp [deleted file]
Source/WebKit/chromium/src/WebFloatAnimationCurveImpl.h [deleted file]
Source/WebKit/chromium/src/WebIOSurfaceLayerImpl.cpp [deleted file]
Source/WebKit/chromium/src/WebIOSurfaceLayerImpl.h [deleted file]
Source/WebKit/chromium/src/WebImageLayerImpl.cpp [deleted file]
Source/WebKit/chromium/src/WebImageLayerImpl.h [deleted file]
Source/WebKit/chromium/src/WebLayerImpl.cpp [deleted file]
Source/WebKit/chromium/src/WebLayerImpl.h [deleted file]
Source/WebKit/chromium/src/WebLayerTreeViewImpl.cpp [deleted file]
Source/WebKit/chromium/src/WebLayerTreeViewImpl.h [deleted file]
Source/WebKit/chromium/src/WebScrollbarLayerImpl.cpp [deleted file]
Source/WebKit/chromium/src/WebScrollbarLayerImpl.h [deleted file]
Source/WebKit/chromium/src/WebSolidColorLayerImpl.cpp [deleted file]
Source/WebKit/chromium/src/WebSolidColorLayerImpl.h [deleted file]
Source/WebKit/chromium/src/WebToCCInputHandlerAdapter.cpp [deleted file]
Source/WebKit/chromium/src/WebToCCInputHandlerAdapter.h [deleted file]
Source/WebKit/chromium/src/WebTransformAnimationCurveImpl.cpp [deleted file]
Source/WebKit/chromium/src/WebTransformAnimationCurveImpl.h [deleted file]
Source/WebKit/chromium/src/WebVideoLayerImpl.cpp [deleted file]
Source/WebKit/chromium/src/WebVideoLayerImpl.h [deleted file]
Source/WebKit/chromium/tests/CCActiveAnimationTest.cpp [deleted file]
Source/WebKit/chromium/tests/CCAnimationTestCommon.cpp [deleted file]
Source/WebKit/chromium/tests/CCAnimationTestCommon.h [deleted file]
Source/WebKit/chromium/tests/CCDamageTrackerTest.cpp [deleted file]
Source/WebKit/chromium/tests/CCDelayBasedTimeSourceTest.cpp [deleted file]
Source/WebKit/chromium/tests/CCDrawQuadTest.cpp [deleted file]
Source/WebKit/chromium/tests/CCFrameRateControllerTest.cpp [deleted file]
Source/WebKit/chromium/tests/CCGeometryTestUtils.cpp [deleted file]
Source/WebKit/chromium/tests/CCGeometryTestUtils.h [deleted file]
Source/WebKit/chromium/tests/CCHeadsUpDisplayTest.cpp [deleted file]
Source/WebKit/chromium/tests/CCKeyframedAnimationCurveTest.cpp [deleted file]
Source/WebKit/chromium/tests/CCLayerAnimationControllerTest.cpp [deleted file]
Source/WebKit/chromium/tests/CCLayerImplTest.cpp [deleted file]
Source/WebKit/chromium/tests/CCLayerIteratorTest.cpp [deleted file]
Source/WebKit/chromium/tests/CCLayerQuadTest.cpp [deleted file]
Source/WebKit/chromium/tests/CCLayerSorterTest.cpp [deleted file]
Source/WebKit/chromium/tests/CCLayerTestCommon.cpp [deleted file]
Source/WebKit/chromium/tests/CCLayerTestCommon.h [deleted file]
Source/WebKit/chromium/tests/CCLayerTreeHostCommonTest.cpp [deleted file]
Source/WebKit/chromium/tests/CCLayerTreeHostImplTest.cpp [deleted file]
Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp [deleted file]
Source/WebKit/chromium/tests/CCMathUtilTest.cpp [deleted file]
Source/WebKit/chromium/tests/CCOcclusionTrackerTest.cpp [deleted file]
Source/WebKit/chromium/tests/CCOcclusionTrackerTestCommon.h [deleted file]
Source/WebKit/chromium/tests/CCPrioritizedTextureTest.cpp [deleted file]
Source/WebKit/chromium/tests/CCQuadCullerTest.cpp [deleted file]
Source/WebKit/chromium/tests/CCRenderPassTest.cpp [deleted file]
Source/WebKit/chromium/tests/CCRenderSurfaceFiltersTest.cpp [deleted file]
Source/WebKit/chromium/tests/CCRenderSurfaceTest.cpp [deleted file]
Source/WebKit/chromium/tests/CCRendererGLTest.cpp [deleted file]
Source/WebKit/chromium/tests/CCResourceProviderTest.cpp [deleted file]
Source/WebKit/chromium/tests/CCSchedulerStateMachineTest.cpp [deleted file]
Source/WebKit/chromium/tests/CCSchedulerTest.cpp [deleted file]
Source/WebKit/chromium/tests/CCSchedulerTestCommon.h [deleted file]
Source/WebKit/chromium/tests/CCScopedTextureTest.cpp [deleted file]
Source/WebKit/chromium/tests/CCScrollbarAnimationControllerLinearFadeTest.cpp [deleted file]
Source/WebKit/chromium/tests/CCSolidColorLayerImplTest.cpp [deleted file]
Source/WebKit/chromium/tests/CCTestCommon.h [deleted file]
Source/WebKit/chromium/tests/CCTextureUpdateControllerTest.cpp [deleted file]
Source/WebKit/chromium/tests/CCThreadTaskTest.cpp [deleted file]
Source/WebKit/chromium/tests/CCThreadedTest.cpp [deleted file]
Source/WebKit/chromium/tests/CCThreadedTest.h [deleted file]
Source/WebKit/chromium/tests/CCTiledLayerImplTest.cpp [deleted file]
Source/WebKit/chromium/tests/CCTiledLayerTestCommon.cpp [deleted file]
Source/WebKit/chromium/tests/CCTiledLayerTestCommon.h [deleted file]
Source/WebKit/chromium/tests/CCTimerTest.cpp [deleted file]
Source/WebKit/chromium/tests/ContentLayerChromiumTest.cpp [deleted file]
Source/WebKit/chromium/tests/FakeCCLayerTreeHostClient.h [deleted file]
Source/WebKit/chromium/tests/FakeGraphicsContext3DTest.cpp [deleted file]
Source/WebKit/chromium/tests/FakeWebScrollbarThemeGeometry.h [deleted file]
Source/WebKit/chromium/tests/FloatQuadTest.cpp [deleted file]
Source/WebKit/chromium/tests/GraphicsLayerChromiumTest.cpp
Source/WebKit/chromium/tests/ImageLayerChromiumTest.cpp
Source/WebKit/chromium/tests/LayerChromiumTest.cpp [deleted file]
Source/WebKit/chromium/tests/MockCCQuadCuller.h [deleted file]
Source/WebKit/chromium/tests/ScrollbarLayerChromiumTest.cpp [deleted file]
Source/WebKit/chromium/tests/TextureCopierTest.cpp [deleted file]
Source/WebKit/chromium/tests/TextureLayerChromiumTest.cpp [deleted file]
Source/WebKit/chromium/tests/ThrottledTextureUploaderTest.cpp [deleted file]
Source/WebKit/chromium/tests/TiledLayerChromiumTest.cpp [deleted file]
Source/WebKit/chromium/tests/TreeSynchronizerTest.cpp [deleted file]
Source/WebKit/chromium/tests/WebAnimationTest.cpp [deleted file]
Source/WebKit/chromium/tests/WebFloatAnimationCurveTest.cpp [deleted file]
Source/WebKit/chromium/tests/WebLayerTest.cpp [deleted file]
Source/WebKit/chromium/tests/WebLayerTreeViewTest.cpp [deleted file]
Source/WebKit/chromium/tests/WebTransformAnimationCurveTest.cpp [deleted file]
Source/WebKit/chromium/tests/WebTransformOperationsTest.cpp [deleted file]
Source/WebKit/chromium/tests/WebTransformationMatrixTest.cpp [deleted file]

index 3d3589e..3f4d5a1 100644 (file)
@@ -1,3 +1,222 @@
+2012-09-20  James Robinson  <jamesr@chromium.org>
+
+        [chromium] Remove unused copy of chromium compositor implementation files
+        https://bugs.webkit.org/show_bug.cgi?id=97255
+
+        Reviewed by Adam Barth.
+
+        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.
+
 2012-09-20  Tony Chang  <tony@chromium.org>
 
         Implement absolutely positioned flex items
index 1712233..d2a5538 100644 (file)
@@ -46,8 +46,6 @@
     # binary and increasing the speed of gdb.
     'enable_svg%': 1,
 
-    'use_libcc_for_compositor%': 0,
-
     'enable_wexit_time_destructors': 1,
 
     'use_harfbuzz_ng%': 0,
         '<@(webcore_platform_geometry_files)',
       ],
     },
-    {
-      'target_name': 'webcore_chromium_compositor',
-      'type': 'static_library',
-      'dependencies': [
-        'webcore_prerequisites',
-      ],
-      'defines': [
-        'WEBKIT_IMPLEMENTATION=1',
-      ],
-      'sources': [
-        '<@(webcore_chromium_compositor_files)',
-      ],
-    },
     # The *NEON.cpp files fail to compile when -mthumb is passed. Force
     # them to build in ARM mode.
     # See https://bugs.webkit.org/show_bug.cgi?id=62916.
             'webcore_svg',
           ],
         }],
-        ['use_libcc_for_compositor==0', {
-          'dependencies': [
-            'webcore_chromium_compositor'
-          ],
-        }]
       ],
     },
     {
index 4d43c41..63727fa 100644 (file)
             '<(PRODUCT_DIR)/DerivedSources/WebCore/XPathGrammar.h',
         ],
         'webcore_platform_support_files': [
-            'platform/chromium/support/CCThreadImpl.cpp',
-            'platform/chromium/support/CCThreadImpl.h',
             'platform/chromium/support/Extensions3DChromium.cpp',
             'platform/chromium/support/GraphicsContext3DChromium.cpp',
             'platform/chromium/support/GraphicsContext3DPrivate.cpp',
             'platform/chromium/support/PlatformGestureCurveFactory.cpp',
             'platform/chromium/support/PlatformGestureCurveFactory.h',
             'platform/chromium/support/WebAudioBus.cpp',
-            'platform/chromium/support/WebCompositorImpl.cpp',
-            'platform/chromium/support/WebCompositorImpl.h',
             'platform/chromium/support/WebData.cpp',
             'platform/chromium/support/WebFlingAnimatorToGestureCurveAdapter.h',
             'platform/chromium/support/WebHTTPBody.cpp',
             'platform/chromium/support/WrappedResourceRequest.h',
             'platform/chromium/support/WrappedResourceResponse.h',
         ],
-        'webcore_chromium_compositor_files': [
-            'platform/graphics/chromium/BitmapCanvasLayerTextureUpdater.cpp',
-            'platform/graphics/chromium/BitmapCanvasLayerTextureUpdater.h',
-            'platform/graphics/chromium/BitmapSkPictureCanvasLayerTextureUpdater.cpp',
-            'platform/graphics/chromium/BitmapSkPictureCanvasLayerTextureUpdater.h',
-            'platform/graphics/chromium/CanvasLayerTextureUpdater.cpp',
-            'platform/graphics/chromium/CanvasLayerTextureUpdater.h',
-            'platform/graphics/chromium/ContentLayerChromium.cpp',
-            'platform/graphics/chromium/ContentLayerChromium.h',
-            'platform/graphics/chromium/ContentLayerChromiumClient.h',
-            'platform/graphics/chromium/FrameBufferSkPictureCanvasLayerTextureUpdater.cpp',
-            'platform/graphics/chromium/FrameBufferSkPictureCanvasLayerTextureUpdater.h',
-            'platform/graphics/chromium/GeometryBinding.cpp',
-            'platform/graphics/chromium/GeometryBinding.h',
-            'platform/graphics/chromium/HeadsUpDisplayLayerChromium.cpp',
-            'platform/graphics/chromium/HeadsUpDisplayLayerChromium.h',
-            'platform/graphics/chromium/IOSurfaceLayerChromium.cpp',
-            'platform/graphics/chromium/IOSurfaceLayerChromium.h',
-            'platform/graphics/chromium/ImageLayerChromium.cpp',
-            'platform/graphics/chromium/ImageLayerChromium.h',
-            'platform/graphics/chromium/LayerChromium.cpp',
-            'platform/graphics/chromium/LayerChromium.h',
-            'platform/graphics/chromium/LayerPainterChromium.h',
-            'platform/graphics/chromium/LayerTextureSubImage.cpp',
-            'platform/graphics/chromium/LayerTextureSubImage.h',
-            'platform/graphics/chromium/LayerTextureUpdater.h',
-            'platform/graphics/chromium/PlatformColor.h',
-            'platform/graphics/chromium/ProgramBinding.cpp',
-            'platform/graphics/chromium/ProgramBinding.h',
-            'platform/graphics/chromium/RateLimiter.cpp',
-            'platform/graphics/chromium/RateLimiter.h',
-            'platform/graphics/chromium/RenderSurfaceChromium.cpp',
-            'platform/graphics/chromium/RenderSurfaceChromium.h',
-            'platform/graphics/chromium/ScrollbarLayerChromium.cpp',
-            'platform/graphics/chromium/ScrollbarLayerChromium.h',
-            'platform/graphics/chromium/ShaderChromium.cpp',
-            'platform/graphics/chromium/ShaderChromium.h',
-            'platform/graphics/chromium/SkPictureCanvasLayerTextureUpdater.cpp',
-            'platform/graphics/chromium/SkPictureCanvasLayerTextureUpdater.h',
-            'platform/graphics/chromium/SolidColorLayerChromium.cpp',
-            'platform/graphics/chromium/SolidColorLayerChromium.h',
-            'platform/graphics/chromium/TextureCopier.cpp',
-            'platform/graphics/chromium/TextureCopier.h',
-            'platform/graphics/chromium/TextureLayerChromium.cpp',
-            'platform/graphics/chromium/TextureLayerChromium.h',
-            'platform/graphics/chromium/TextureLayerChromiumClient.h',
-            'platform/graphics/chromium/TextureUploader.h',
-            'platform/graphics/chromium/ThrottledTextureUploader.cpp',
-            'platform/graphics/chromium/ThrottledTextureUploader.h',
-            'platform/graphics/chromium/TiledLayerChromium.cpp',
-            'platform/graphics/chromium/TiledLayerChromium.h',
-            'platform/graphics/chromium/TreeSynchronizer.cpp',
-            'platform/graphics/chromium/TreeSynchronizer.h',
-            'platform/graphics/chromium/UnthrottledTextureUploader.h',
-            'platform/graphics/chromium/VideoLayerChromium.cpp',
-            'platform/graphics/chromium/VideoLayerChromium.h',
-            'platform/graphics/chromium/cc/CCActiveAnimation.cpp',
-            'platform/graphics/chromium/cc/CCActiveAnimation.h',
-            'platform/graphics/chromium/cc/CCAnimationCurve.cpp',
-            'platform/graphics/chromium/cc/CCAnimationCurve.h',
-            'platform/graphics/chromium/cc/CCAnimationEvents.h',
-            'platform/graphics/chromium/cc/CCCheckerboardDrawQuad.cpp',
-            'platform/graphics/chromium/cc/CCCheckerboardDrawQuad.h',
-            'platform/graphics/chromium/cc/CCCompletionEvent.h',
-            'platform/graphics/chromium/cc/CCDamageTracker.cpp',
-            'platform/graphics/chromium/cc/CCDamageTracker.h',
-            'platform/graphics/chromium/cc/CCDebugBorderDrawQuad.cpp',
-            'platform/graphics/chromium/cc/CCDebugBorderDrawQuad.h',
-            'platform/graphics/chromium/cc/CCDebugRectHistory.cpp',
-            'platform/graphics/chromium/cc/CCDebugRectHistory.h',
-            'platform/graphics/chromium/cc/CCDelayBasedTimeSource.cpp',
-            'platform/graphics/chromium/cc/CCDelayBasedTimeSource.h',
-            'platform/graphics/chromium/cc/CCDirectRenderer.h',
-            'platform/graphics/chromium/cc/CCDirectRenderer.cpp',
-            'platform/graphics/chromium/cc/CCDrawQuad.cpp',
-            'platform/graphics/chromium/cc/CCDrawQuad.h',
-            'platform/graphics/chromium/cc/CCFontAtlas.cpp',
-            'platform/graphics/chromium/cc/CCFontAtlas.h',
-            'platform/graphics/chromium/cc/CCFrameRateController.cpp',
-            'platform/graphics/chromium/cc/CCFrameRateController.h',
-            'platform/graphics/chromium/cc/CCFrameRateCounter.cpp',
-            'platform/graphics/chromium/cc/CCFrameRateCounter.h',
-            'platform/graphics/chromium/cc/CCGraphicsContext.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/CCInputHandler.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/CCLayerQuad.h',
-            'platform/graphics/chromium/cc/CCLayerSorter.cpp',
-            'platform/graphics/chromium/cc/CCLayerSorter.h',
-            'platform/graphics/chromium/cc/CCLayerTilingData.cpp',
-            'platform/graphics/chromium/cc/CCLayerTilingData.h',
-            'platform/graphics/chromium/cc/CCLayerTreeHost.cpp',
-            'platform/graphics/chromium/cc/CCLayerTreeHost.h',
-            'platform/graphics/chromium/cc/CCLayerTreeHostClient.h',
-            'platform/graphics/chromium/cc/CCLayerTreeHostCommon.cpp',
-            'platform/graphics/chromium/cc/CCLayerTreeHostCommon.h',
-            'platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp',
-            'platform/graphics/chromium/cc/CCLayerTreeHostImpl.h',
-            'platform/graphics/chromium/cc/CCMathUtil.cpp',
-            'platform/graphics/chromium/cc/CCMathUtil.h',
-            'platform/graphics/chromium/cc/CCOcclusionTracker.cpp',
-            'platform/graphics/chromium/cc/CCOcclusionTracker.h',
-            'platform/graphics/chromium/cc/CCOverdrawMetrics.cpp',
-            'platform/graphics/chromium/cc/CCOverdrawMetrics.h',
-            'platform/graphics/chromium/cc/CCPageScaleAnimation.cpp',
-            'platform/graphics/chromium/cc/CCPageScaleAnimation.h',
-            'platform/graphics/chromium/cc/CCPrioritizedTexture.cpp',
-            'platform/graphics/chromium/cc/CCPrioritizedTexture.h',
-            'platform/graphics/chromium/cc/CCPrioritizedTextureManager.cpp',
-            'platform/graphics/chromium/cc/CCPrioritizedTextureManager.h',
-            'platform/graphics/chromium/cc/CCPriorityCalculator.cpp',
-            'platform/graphics/chromium/cc/CCPriorityCalculator.h',
-            'platform/graphics/chromium/cc/CCProxy.cpp',
-            'platform/graphics/chromium/cc/CCProxy.h',
-            'platform/graphics/chromium/cc/CCQuadSink.h',
-            'platform/graphics/chromium/cc/CCQuadCuller.cpp',
-            'platform/graphics/chromium/cc/CCQuadCuller.h',
-            'platform/graphics/chromium/cc/CCRenderer.h',
-            'platform/graphics/chromium/cc/CCRendererGL.cpp',
-            'platform/graphics/chromium/cc/CCRendererGL.h',
-            '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/CCRenderPassSink.h',
-            'platform/graphics/chromium/cc/CCRenderSurface.cpp',
-            'platform/graphics/chromium/cc/CCRenderSurface.h',
-            'platform/graphics/chromium/cc/CCRenderSurfaceFilters.cpp',
-            'platform/graphics/chromium/cc/CCRenderSurfaceFilters.h',
-            'platform/graphics/chromium/cc/CCRenderer.h',
-            'platform/graphics/chromium/cc/CCRenderingStats.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/CCSchedulerStateMachine.h',
-            '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/CCScrollbarAnimationController.h',
-            '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/CCScrollbarGeometryFixedThumb.cpp',
-            'platform/graphics/chromium/cc/CCScrollbarGeometryFixedThumb.h',
-            'platform/graphics/chromium/cc/CCScrollbarGeometryStub.cpp',
-            'platform/graphics/chromium/cc/CCScrollbarGeometryStub.h',
-            'platform/graphics/chromium/cc/CCSettings.cpp',
-            'platform/graphics/chromium/cc/CCSettings.h',
-            'platform/graphics/chromium/cc/CCSharedQuadState.cpp',
-            'platform/graphics/chromium/cc/CCSharedQuadState.h',
-            '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/CCTextureUpdateQueue.h',
-            'platform/graphics/chromium/cc/CCThread.h',
-            '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/CCTimeSource.h',
-            'platform/graphics/chromium/cc/CCTimer.cpp',
-            'platform/graphics/chromium/cc/CCTimer.h',
-            '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',
-        ],
         'export_file_generator_files': [
             '<(PRODUCT_DIR)/DerivedSources/WebCore/ExportFileGenerator.cpp',
         ],
diff --git a/Source/WebCore/platform/chromium/support/CCThreadImpl.cpp b/Source/WebCore/platform/chromium/support/CCThreadImpl.cpp
deleted file mode 100644 (file)
index cce1952..0000000
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "CCThreadImpl.h"
-
-#include "CCCompletionEvent.h"
-#include <public/Platform.h>
-#include <public/WebThread.h>
-
-using WebCore::CCThread;
-using WebCore::CCCompletionEvent;
-
-namespace WebKit {
-
-// Task that, when runs, places the current thread ID into the provided
-// pointer and signals a completion event.
-//
-// Does not provide a PassOwnPtr<GetThreadIDTask>::create method because
-// the resulting object is always handed into a WebThread, which does not understand
-// PassOwnPtrs.
-class GetThreadIDTask : public WebThread::Task {
-public:
-    GetThreadIDTask(ThreadIdentifier* result, CCCompletionEvent* completion)
-         : m_completion(completion)
-         , m_result(result) { }
-
-    virtual ~GetThreadIDTask() { }
-
-    virtual void run()
-    {
-        *m_result = currentThread();
-        m_completion->signal();
-    }
-
-private:
-    CCCompletionEvent* m_completion;
-    ThreadIdentifier* m_result;
-};
-
-// General adapter from a CCThread::Task to a WebThread::Task.
-class CCThreadTaskAdapter : public WebThread::Task {
-public:
-    CCThreadTaskAdapter(PassOwnPtr<CCThread::Task> task) : m_task(task) { }
-
-    virtual ~CCThreadTaskAdapter() { }
-
-    virtual void run()
-    {
-        m_task->performTask();
-    }
-
-private:
-    OwnPtr<CCThread::Task> m_task;
-};
-
-PassOwnPtr<CCThread> CCThreadImpl::create(WebThread* thread)
-{
-    return adoptPtr(new CCThreadImpl(thread));
-}
-
-CCThreadImpl::~CCThreadImpl()
-{
-}
-
-void CCThreadImpl::postTask(PassOwnPtr<CCThread::Task> task)
-{
-    m_thread->postTask(new CCThreadTaskAdapter(task));
-}
-
-void CCThreadImpl::postDelayedTask(PassOwnPtr<CCThread::Task> task, long long delayMs)
-{
-    m_thread->postDelayedTask(new CCThreadTaskAdapter(task), delayMs);
-}
-
-ThreadIdentifier CCThreadImpl::threadID() const
-{
-    return m_threadID;
-}
-
-CCThreadImpl::CCThreadImpl(WebThread* thread)
-    : m_thread(thread)
-{
-    if (thread == WebKit::Platform::current()->currentThread()) {
-        m_threadID = currentThread();
-        return;
-    }
-
-    // Get the threadId for the newly-created thread by running a task
-    // on that thread, blocking on the result.
-    m_threadID = currentThread();
-    CCCompletionEvent completion;
-    m_thread->postTask(new GetThreadIDTask(&m_threadID, &completion));
-    completion.wait();
-}
-
-} // namespace WebKit
diff --git a/Source/WebCore/platform/chromium/support/CCThreadImpl.h b/Source/WebCore/platform/chromium/support/CCThreadImpl.h
deleted file mode 100644 (file)
index 308ba80..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "CCThread.h"
-#include <wtf/OwnPtr.h>
-#include <wtf/Threading.h>
-
-#ifndef CCThreadImpl_h
-#define CCThreadImpl_h
-
-namespace WebKit {
-
-class WebThread;
-
-// Implements CCThread in terms of WebThread.
-class CCThreadImpl : public WebCore::CCThread {
-public:
-    static PassOwnPtr<WebCore::CCThread> create(WebThread*);
-    virtual ~CCThreadImpl();
-    virtual void postTask(PassOwnPtr<WebCore::CCThread::Task>);
-    virtual void postDelayedTask(PassOwnPtr<WebCore::CCThread::Task>, long long delayMs);
-    WTF::ThreadIdentifier threadID() const;
-
-private:
-    explicit CCThreadImpl(WebThread*);
-
-    WebThread* m_thread;
-    WTF::ThreadIdentifier m_threadID;
-};
-
-} // namespace WebKit
-
-#endif
diff --git a/Source/WebCore/platform/chromium/support/WebCompositorImpl.cpp b/Source/WebCore/platform/chromium/support/WebCompositorImpl.cpp
deleted file mode 100644 (file)
index 43579ce..0000000
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-
-#include "WebCompositorImpl.h"
-
-#include "CCLayerTreeHost.h"
-#include "CCProxy.h"
-#include "CCSettings.h"
-#include "CCThreadImpl.h"
-#include <public/Platform.h>
-#include <wtf/ThreadingPrimitives.h>
-
-using namespace WebCore;
-
-namespace WebKit {
-
-bool WebCompositorImpl::s_initialized = false;
-CCThread* WebCompositorImpl::s_mainThread = 0;
-CCThread* WebCompositorImpl::s_implThread = 0;
-
-void WebCompositor::initialize(WebThread* implThread)
-{
-    WebCompositorImpl::initialize(implThread);
-}
-
-bool WebCompositor::isThreadingEnabled()
-{
-    return WebCompositorImpl::isThreadingEnabled();
-}
-
-void WebCompositor::shutdown()
-{
-    WebCompositorImpl::shutdown();
-    CCSettings::reset();
-}
-
-void WebCompositor::setPerTilePaintingEnabled(bool enabled)
-{
-    ASSERT(!WebCompositorImpl::initialized());
-    CCSettings::setPerTilePaintingEnabled(enabled);
-}
-
-void WebCompositor::setPartialSwapEnabled(bool enabled)
-{
-    ASSERT(!WebCompositorImpl::initialized());
-    CCSettings::setPartialSwapEnabled(enabled);
-}
-
-void WebCompositor::setAcceleratedAnimationEnabled(bool enabled)
-{
-    ASSERT(!WebCompositorImpl::initialized());
-    CCSettings::setAcceleratedAnimationEnabled(enabled);
-}
-
-void WebCompositorImpl::initialize(WebThread* implThread)
-{
-    ASSERT(!s_initialized);
-    s_initialized = true;
-
-    s_mainThread = CCThreadImpl::create(WebKit::Platform::current()->currentThread()).leakPtr();
-    CCProxy::setMainThread(s_mainThread);
-    if (implThread) {
-        s_implThread = CCThreadImpl::create(implThread).leakPtr();
-        CCProxy::setImplThread(s_implThread);
-    } else
-        CCProxy::setImplThread(0);
-}
-
-bool WebCompositorImpl::isThreadingEnabled()
-{
-    return s_implThread;
-}
-
-bool WebCompositorImpl::initialized()
-{
-    return s_initialized;
-}
-
-void WebCompositorImpl::shutdown()
-{
-    ASSERT(s_initialized);
-    ASSERT(!CCLayerTreeHost::anyLayerTreeHostInstanceExists());
-
-    if (s_implThread) {
-        delete s_implThread;
-        s_implThread = 0;
-    }
-    delete s_mainThread;
-    s_mainThread = 0;
-    CCProxy::setImplThread(0);
-    CCProxy::setMainThread(0);
-    s_initialized = false;
-}
-
-}
diff --git a/Source/WebCore/platform/chromium/support/WebCompositorImpl.h b/Source/WebCore/platform/chromium/support/WebCompositorImpl.h
deleted file mode 100644 (file)
index 67e3a67..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WebCompositorImpl_h
-#define WebCompositorImpl_h
-
-#include <public/WebCompositor.h>
-
-#include <wtf/HashSet.h>
-#include <wtf/Noncopyable.h>
-#include <wtf/OwnPtr.h>
-
-namespace WebCore {
-class CCThread;
-}
-
-namespace WebKit {
-
-class WebThread;
-
-class WebCompositorImpl : public WebCompositor {
-    WTF_MAKE_NONCOPYABLE(WebCompositorImpl);
-public:
-    static bool initialized();
-
-private:
-
-    friend class WebCompositor;
-    static void initialize(WebThread* implThread);
-    static bool isThreadingEnabled();
-    static void shutdown();
-
-    static bool s_initialized;
-    static WebCore::CCThread* s_mainThread;
-    static WebCore::CCThread* s_implThread;
-};
-
-}
-
-#endif // WebCompositorImpl_h
diff --git a/Source/WebCore/platform/graphics/chromium/BitmapCanvasLayerTextureUpdater.cpp b/Source/WebCore/platform/graphics/chromium/BitmapCanvasLayerTextureUpdater.cpp
deleted file mode 100644 (file)
index c1210e5..0000000
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#include "config.h"
-
-#if USE(ACCELERATED_COMPOSITING)
-
-#include "BitmapCanvasLayerTextureUpdater.h"
-
-#include "LayerPainterChromium.h"
-#include "PlatformColor.h"
-#include "skia/ext/platform_canvas.h"
-
-namespace WebCore {
-
-BitmapCanvasLayerTextureUpdater::Texture::Texture(BitmapCanvasLayerTextureUpdater* textureUpdater, PassOwnPtr<CCPrioritizedTexture> texture)
-    : LayerTextureUpdater::Texture(texture)
-    , m_textureUpdater(textureUpdater)
-{
-}
-
-BitmapCanvasLayerTextureUpdater::Texture::~Texture()
-{
-}
-
-void BitmapCanvasLayerTextureUpdater::Texture::updateRect(CCResourceProvider* resourceProvider, const IntRect& sourceRect, const IntSize& destOffset)
-{
-    textureUpdater()->updateTextureRect(resourceProvider, texture(), sourceRect, destOffset);
-}
-
-PassRefPtr<BitmapCanvasLayerTextureUpdater> BitmapCanvasLayerTextureUpdater::create(PassOwnPtr<LayerPainterChromium> painter)
-{
-    return adoptRef(new BitmapCanvasLayerTextureUpdater(painter));
-}
-
-BitmapCanvasLayerTextureUpdater::BitmapCanvasLayerTextureUpdater(PassOwnPtr<LayerPainterChromium> painter)
-    : CanvasLayerTextureUpdater(painter)
-    , m_opaque(false)
-{
-}
-
-BitmapCanvasLayerTextureUpdater::~BitmapCanvasLayerTextureUpdater()
-{
-}
-
-PassOwnPtr<LayerTextureUpdater::Texture> BitmapCanvasLayerTextureUpdater::createTexture(CCPrioritizedTextureManager* manager)
-{
-    return adoptPtr(new Texture(this, CCPrioritizedTexture::create(manager)));
-}
-
-LayerTextureUpdater::SampledTexelFormat BitmapCanvasLayerTextureUpdater::sampledTexelFormat(GC3Denum textureFormat)
-{
-    // The component order may be bgra if we uploaded bgra pixels to rgba textures.
-    return PlatformColor::sameComponentOrder(textureFormat) ?
-            LayerTextureUpdater::SampledTexelFormatRGBA : LayerTextureUpdater::SampledTexelFormatBGRA;
-}
-
-void BitmapCanvasLayerTextureUpdater::prepareToUpdate(const IntRect& contentRect, const IntSize& tileSize, float contentsWidthScale, float contentsHeightScale, IntRect& resultingOpaqueRect, CCRenderingStats& stats)
-{
-    if (m_canvasSize != contentRect.size()) {
-        m_canvasSize = contentRect.size();
-        m_canvas = adoptPtr(skia::CreateBitmapCanvas(m_canvasSize.width(), m_canvasSize.height(), m_opaque));
-    }
-
-    paintContents(m_canvas.get(), contentRect, contentsWidthScale, contentsHeightScale, resultingOpaqueRect, stats);
-}
-
-void BitmapCanvasLayerTextureUpdater::updateTextureRect(CCResourceProvider* resourceProvider, CCPrioritizedTexture* texture, const IntRect& sourceRect, const IntSize& destOffset)
-{
-    const SkBitmap& bitmap = m_canvas->getDevice()->accessBitmap(false);
-    bitmap.lockPixels();
-
-    texture->upload(resourceProvider, static_cast<const uint8_t*>(bitmap.getPixels()), contentRect(), sourceRect, destOffset);
-    bitmap.unlockPixels();
-}
-
-void BitmapCanvasLayerTextureUpdater::setOpaque(bool opaque)
-{
-    if (opaque != m_opaque) {
-        m_canvas.clear();
-        m_canvasSize = IntSize();
-    }
-    m_opaque = opaque;
-}
-
-} // namespace WebCore
-#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/Source/WebCore/platform/graphics/chromium/BitmapCanvasLayerTextureUpdater.h b/Source/WebCore/platform/graphics/chromium/BitmapCanvasLayerTextureUpdater.h
deleted file mode 100644 (file)
index d54521f..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#ifndef BitmapCanvasLayerTextureUpdater_h
-#define BitmapCanvasLayerTextureUpdater_h
-
-#if USE(ACCELERATED_COMPOSITING)
-
-#include "CanvasLayerTextureUpdater.h"
-
-class SkCanvas;
-
-namespace WebCore {
-
-class LayerPainterChromium;
-
-// This class rasterizes the contentRect into a skia bitmap canvas. It then updates
-// textures by copying from the canvas into the texture, using MapSubImage if
-// possible.
-class BitmapCanvasLayerTextureUpdater : public CanvasLayerTextureUpdater {
-public:
-    class Texture : public LayerTextureUpdater::Texture {
-    public:
-        Texture(BitmapCanvasLayerTextureUpdater*, PassOwnPtr<CCPrioritizedTexture>);
-        virtual ~Texture();
-
-        virtual void updateRect(CCResourceProvider*, const IntRect& sourceRect, const IntSize& destOffset) OVERRIDE;
-
-    private:
-        BitmapCanvasLayerTextureUpdater* textureUpdater() { return m_textureUpdater; }
-
-        BitmapCanvasLayerTextureUpdater* m_textureUpdater;
-    };
-
-    static PassRefPtr<BitmapCanvasLayerTextureUpdater> create(PassOwnPtr<LayerPainterChromium>);
-    virtual ~BitmapCanvasLayerTextureUpdater();
-
-    virtual PassOwnPtr<LayerTextureUpdater::Texture> createTexture(CCPrioritizedTextureManager*) OVERRIDE;
-    virtual SampledTexelFormat sampledTexelFormat(GC3Denum textureFormat) OVERRIDE;
-    virtual void prepareToUpdate(const IntRect& contentRect, const IntSize& tileSize, float contentsWidthScale, float contentsHeightScale, IntRect& resultingOpaqueRect, CCRenderingStats&) OVERRIDE;
-    void updateTextureRect(CCResourceProvider*, CCPrioritizedTexture*, const IntRect& sourceRect, const IntSize& destOffset);
-
-    virtual void setOpaque(bool) OVERRIDE;
-
-private:
-    explicit BitmapCanvasLayerTextureUpdater(PassOwnPtr<LayerPainterChromium>);
-
-    OwnPtr<SkCanvas> m_canvas;
-    IntSize m_canvasSize;
-    bool m_opaque;
-};
-
-} // namespace WebCore
-#endif // USE(ACCELERATED_COMPOSITING)
-#endif // BitmapCanvasLayerTextureUpdater_h
diff --git a/Source/WebCore/platform/graphics/chromium/BitmapSkPictureCanvasLayerTextureUpdater.cpp b/Source/WebCore/platform/graphics/chromium/BitmapSkPictureCanvasLayerTextureUpdater.cpp
deleted file mode 100644 (file)
index 39580ff..0000000
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#include "config.h"
-
-#if USE(ACCELERATED_COMPOSITING)
-
-#include "BitmapSkPictureCanvasLayerTextureUpdater.h"
-
-#include "CCRenderingStats.h"
-#include "LayerPainterChromium.h"
-#include "PlatformColor.h"
-#include "SkCanvas.h"
-#include "SkDevice.h"
-#include <wtf/CurrentTime.h>
-
-namespace WebCore {
-
-BitmapSkPictureCanvasLayerTextureUpdater::Texture::Texture(BitmapSkPictureCanvasLayerTextureUpdater* textureUpdater, PassOwnPtr<CCPrioritizedTexture> texture)
-    : CanvasLayerTextureUpdater::Texture(texture)
-    , m_textureUpdater(textureUpdater)
-{
-}
-
-void BitmapSkPictureCanvasLayerTextureUpdater::Texture::prepareRect(const IntRect& sourceRect, CCRenderingStats& stats)
-{
-    m_bitmap.setConfig(SkBitmap::kARGB_8888_Config, sourceRect.width(), sourceRect.height());
-    m_bitmap.allocPixels();
-    m_bitmap.setIsOpaque(m_textureUpdater->layerIsOpaque());
-    SkDevice device(m_bitmap);
-    SkCanvas canvas(&device);
-    double paintBeginTime = monotonicallyIncreasingTime();
-    textureUpdater()->paintContentsRect(&canvas, sourceRect, stats);
-    stats.totalPaintTimeInSeconds += monotonicallyIncreasingTime() - paintBeginTime;
-}
-
-void BitmapSkPictureCanvasLayerTextureUpdater::Texture::updateRect(CCResourceProvider* resourceProvider, const IntRect& sourceRect, const IntSize& destOffset)
-{
-    m_bitmap.lockPixels();
-    texture()->upload(resourceProvider, static_cast<uint8_t*>(m_bitmap.getPixels()), sourceRect, sourceRect, destOffset);
-    m_bitmap.unlockPixels();
-    m_bitmap.reset();
-}
-
-PassRefPtr<BitmapSkPictureCanvasLayerTextureUpdater> BitmapSkPictureCanvasLayerTextureUpdater::create(PassOwnPtr<LayerPainterChromium> painter)
-{
-    return adoptRef(new BitmapSkPictureCanvasLayerTextureUpdater(painter));
-}
-
-BitmapSkPictureCanvasLayerTextureUpdater::BitmapSkPictureCanvasLayerTextureUpdater(PassOwnPtr<LayerPainterChromium> painter)
-    : SkPictureCanvasLayerTextureUpdater(painter)
-{
-}
-
-BitmapSkPictureCanvasLayerTextureUpdater::~BitmapSkPictureCanvasLayerTextureUpdater()
-{
-}
-
-PassOwnPtr<LayerTextureUpdater::Texture> BitmapSkPictureCanvasLayerTextureUpdater::createTexture(CCPrioritizedTextureManager* manager)
-{
-    return adoptPtr(new Texture(this, CCPrioritizedTexture::create(manager)));
-}
-
-LayerTextureUpdater::SampledTexelFormat BitmapSkPictureCanvasLayerTextureUpdater::sampledTexelFormat(GC3Denum textureFormat)
-{
-    // The component order may be bgra if we uploaded bgra pixels to rgba textures.
-    return PlatformColor::sameComponentOrder(textureFormat) ?
-            LayerTextureUpdater::SampledTexelFormatRGBA : LayerTextureUpdater::SampledTexelFormatBGRA;
-}
-
-void BitmapSkPictureCanvasLayerTextureUpdater::paintContentsRect(SkCanvas* canvas, const IntRect& sourceRect, CCRenderingStats& stats)
-{
-    // Translate the origin of contentRect to that of sourceRect.
-    canvas->translate(contentRect().x() - sourceRect.x(),
-                      contentRect().y() - sourceRect.y());
-    double rasterizeBeginTime = monotonicallyIncreasingTime();
-    drawPicture(canvas);
-    stats.totalRasterizeTimeInSeconds += monotonicallyIncreasingTime() - rasterizeBeginTime;
-}
-
-} // namespace WebCore
-#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/Source/WebCore/platform/graphics/chromium/BitmapSkPictureCanvasLayerTextureUpdater.h b/Source/WebCore/platform/graphics/chromium/BitmapSkPictureCanvasLayerTextureUpdater.h
deleted file mode 100644 (file)
index 38da53c..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#ifndef BitmapSkPictureCanvasLayerTextureUpdater_h
-#define BitmapSkPictureCanvasLayerTextureUpdater_h
-
-#if USE(ACCELERATED_COMPOSITING)
-#include "SkBitmap.h"
-#include "SkPictureCanvasLayerTextureUpdater.h"
-
-namespace WebCore {
-
-// This class records the contentRect into an SkPicture, then software rasterizes
-// the SkPicture into bitmaps for each tile. This implements CCSettings::perTilePainting.
-class BitmapSkPictureCanvasLayerTextureUpdater : public SkPictureCanvasLayerTextureUpdater {
-public:
-    class Texture : public CanvasLayerTextureUpdater::Texture {
-    public:
-        Texture(BitmapSkPictureCanvasLayerTextureUpdater*, PassOwnPtr<CCPrioritizedTexture>);
-
-        virtual void prepareRect(const IntRect& sourceRect, CCRenderingStats&) OVERRIDE;
-        virtual void updateRect(CCResourceProvider*, const IntRect& sourceRect, const IntSize& destOffset) OVERRIDE;
-
-    private:
-        BitmapSkPictureCanvasLayerTextureUpdater* textureUpdater() { return m_textureUpdater; }
-
-        SkBitmap m_bitmap;
-        BitmapSkPictureCanvasLayerTextureUpdater* m_textureUpdater;
-    };
-
-    static PassRefPtr<BitmapSkPictureCanvasLayerTextureUpdater> create(PassOwnPtr<LayerPainterChromium>);
-    virtual ~BitmapSkPictureCanvasLayerTextureUpdater();
-
-    virtual PassOwnPtr<LayerTextureUpdater::Texture> createTexture(CCPrioritizedTextureManager*) OVERRIDE;
-    virtual SampledTexelFormat sampledTexelFormat(GC3Denum textureFormat) OVERRIDE;
-    void paintContentsRect(SkCanvas*, const IntRect& sourceRect, CCRenderingStats&);
-
-private:
-    explicit BitmapSkPictureCanvasLayerTextureUpdater(PassOwnPtr<LayerPainterChromium>);
-};
-} // namespace WebCore
-#endif // USE(ACCELERATED_COMPOSITING)
-#endif // BitmapSkPictureCanvasLayerTextureUpdater_h
index 5155fbd..1250e4e 100644 (file)
@@ -27,7 +27,6 @@
 
 #include "Canvas2DLayerBridge.h"
 
-#include "CCRendererGL.h" // For the GLC() macro.
 #include "Canvas2DLayerManager.h"
 #include "GrContext.h"
 #include "GraphicsContext3D.h"
@@ -67,15 +66,15 @@ Canvas2DLayerBridge::Canvas2DLayerBridge(PassRefPtr<GraphicsContext3D> context,
 
     if (m_useDoubleBuffering) {
         m_context->makeContextCurrent();
-        GLC(m_context.get(), m_frontBufferTexture = m_context->createTexture());
-        GLC(m_context.get(), m_context->bindTexture(GraphicsContext3D::TEXTURE_2D, m_frontBufferTexture));
+        m_frontBufferTexture = m_context->createTexture();
+        m_context->bindTexture(GraphicsContext3D::TEXTURE_2D, m_frontBufferTexture);
         // Do basic linear filtering on resize.
-        GLC(m_context.get(), m_context->texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_MIN_FILTER, GraphicsContext3D::LINEAR));
-        GLC(m_context.get(), m_context->texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_MAG_FILTER, GraphicsContext3D::LINEAR));
+        m_context->texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_MIN_FILTER, GraphicsContext3D::LINEAR);
+        m_context->texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_MAG_FILTER, GraphicsContext3D::LINEAR);
         // NPOT textures in GL ES only work when the wrap mode is set to GraphicsContext3D::CLAMP_TO_EDGE.
-        GLC(m_context.get(), m_context->texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_WRAP_S, GraphicsContext3D::CLAMP_TO_EDGE));
-        GLC(m_context.get(), m_context->texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_WRAP_T, GraphicsContext3D::CLAMP_TO_EDGE));
-        GLC(m_context.get(), m_context->texImage2DResourceSafe(GraphicsContext3D::TEXTURE_2D, 0, GraphicsContext3D::RGBA, size.width(), size.height(), 0, GraphicsContext3D::RGBA, GraphicsContext3D::UNSIGNED_BYTE));
+        m_context->texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_WRAP_S, GraphicsContext3D::CLAMP_TO_EDGE);
+        m_context->texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_WRAP_T, GraphicsContext3D::CLAMP_TO_EDGE);
+        m_context->texImage2DResourceSafe(GraphicsContext3D::TEXTURE_2D, 0, GraphicsContext3D::RGBA, size.width(), size.height(), 0, GraphicsContext3D::RGBA, GraphicsContext3D::UNSIGNED_BYTE);
         if (GrContext* grContext = m_context->grContext())
             grContext->resetContext();
     }
@@ -95,7 +94,7 @@ Canvas2DLayerBridge::~Canvas2DLayerBridge()
     m_layer->setTextureId(0);
     if (m_useDoubleBuffering) {
         m_context->makeContextCurrent();
-        GLC(m_context.get(), m_context->deleteTexture(m_frontBufferTexture));
+        m_context->deleteTexture(m_frontBufferTexture);
         m_context->flush();
     }
 }
diff --git a/Source/WebCore/platform/graphics/chromium/CanvasLayerTextureUpdater.cpp b/Source/WebCore/platform/graphics/chromium/CanvasLayerTextureUpdater.cpp
deleted file mode 100644 (file)
index b87cf4c..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#include "config.h"
-
-#if USE(ACCELERATED_COMPOSITING)
-
-#include "CanvasLayerTextureUpdater.h"
-
-#include "CCRenderingStats.h"
-#include "FloatRect.h"
-#include "LayerPainterChromium.h"
-#include "SkCanvas.h"
-#include "SkPaint.h"
-#include "SkRect.h"
-#include "SkiaUtils.h"
-#include "TraceEvent.h"
-#include <wtf/CurrentTime.h>
-
-namespace WebCore {
-
-CanvasLayerTextureUpdater::CanvasLayerTextureUpdater(PassOwnPtr<LayerPainterChromium> painter)
-    : m_painter(painter)
-{
-}
-
-CanvasLayerTextureUpdater::~CanvasLayerTextureUpdater()
-{
-}
-
-void CanvasLayerTextureUpdater::paintContents(SkCanvas* canvas, const IntRect& contentRect, float contentsWidthScale, float contentsHeightScale, IntRect& resultingOpaqueRect, CCRenderingStats& stats)
-{
-    TRACE_EVENT0("cc", "CanvasLayerTextureUpdater::paintContents");
-    canvas->save();
-    canvas->translate(WebCoreFloatToSkScalar(-contentRect.x()), WebCoreFloatToSkScalar(-contentRect.y()));
-
-    IntRect layerRect = contentRect;
-
-    if (contentsWidthScale != 1 || contentsHeightScale != 1) {
-        canvas->scale(WebCoreFloatToSkScalar(contentsWidthScale), WebCoreFloatToSkScalar(contentsHeightScale));
-
-        FloatRect rect = contentRect;
-        rect.scale(1 / contentsWidthScale, 1 / contentsHeightScale);
-        layerRect = enclosingIntRect(rect);
-    }
-
-    SkPaint paint;
-    paint.setAntiAlias(false);
-    paint.setXfermodeMode(SkXfermode::kClear_Mode);
-    SkRect layerSkRect = SkRect::MakeXYWH(layerRect.x(), layerRect.y(), layerRect.width(), layerRect.height());
-    canvas->drawRect(layerSkRect, paint);
-    canvas->clipRect(layerSkRect);
-
-    FloatRect opaqueLayerRect;
-    double paintBeginTime = monotonicallyIncreasingTime();
-    m_painter->paint(canvas, layerRect, opaqueLayerRect);
-    stats.totalPaintTimeInSeconds += monotonicallyIncreasingTime() - paintBeginTime;
-    canvas->restore();
-
-    FloatRect opaqueContentRect = opaqueLayerRect;
-    opaqueContentRect.scale(contentsWidthScale, contentsHeightScale);
-    resultingOpaqueRect = enclosedIntRect(opaqueContentRect);
-
-    m_contentRect = contentRect;
-}
-
-} // namespace WebCore
-#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/Source/WebCore/platform/graphics/chromium/CanvasLayerTextureUpdater.h b/Source/WebCore/platform/graphics/chromium/CanvasLayerTextureUpdater.h
deleted file mode 100644 (file)
index c5a4fc2..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#ifndef CanvasLayerTextureUpdater_h
-#define CanvasLayerTextureUpdater_h
-
-#if USE(ACCELERATED_COMPOSITING)
-
-#include "LayerTextureUpdater.h"
-
-class SkCanvas;
-
-namespace WebCore {
-
-class LayerPainterChromium;
-
-// Base class for BitmapCanvasLayerTextureUpdater and
-// SkPictureCanvasLayerTextureUpdater that reduces code duplication between
-// their respective paintContents implementations.
-class CanvasLayerTextureUpdater : public LayerTextureUpdater {
-public:
-    virtual ~CanvasLayerTextureUpdater();
-
-protected:
-    explicit CanvasLayerTextureUpdater(PassOwnPtr<LayerPainterChromium>);
-
-    void paintContents(SkCanvas*, const IntRect& contentRect, float contentsWidthScale, float contentsHeightScale, IntRect& resultingOpaqueRect, CCRenderingStats&);
-    const IntRect& contentRect() const { return m_contentRect; }
-
-private:
-    IntRect m_contentRect;
-    OwnPtr<LayerPainterChromium> m_painter;
-};
-
-} // namespace WebCore
-#endif // USE(ACCELERATED_COMPOSITING)
-#endif // CanvasLayerTextureUpdater_h
diff --git a/Source/WebCore/platform/graphics/chromium/ContentLayerChromium.cpp b/Source/WebCore/platform/graphics/chromium/ContentLayerChromium.cpp
deleted file mode 100644 (file)
index d578117..0000000
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-
-#if USE(ACCELERATED_COMPOSITING)
-
-#include "ContentLayerChromium.h"
-
-#include "BitmapCanvasLayerTextureUpdater.h"
-#include "BitmapSkPictureCanvasLayerTextureUpdater.h"
-#include "CCLayerTreeHost.h"
-#include "CCSettings.h"
-#include "ContentLayerChromiumClient.h"
-#include "FrameBufferSkPictureCanvasLayerTextureUpdater.h"
-#include "LayerPainterChromium.h"
-#include <public/Platform.h>
-#include <wtf/CurrentTime.h>
-
-namespace WebCore {
-
-ContentLayerPainter::ContentLayerPainter(ContentLayerChromiumClient* client)
-    : m_client(client)
-{
-}
-
-PassOwnPtr<ContentLayerPainter> ContentLayerPainter::create(ContentLayerChromiumClient* client)
-{
-    return adoptPtr(new ContentLayerPainter(client));
-}
-
-void ContentLayerPainter::paint(SkCanvas* canvas, const IntRect& contentRect, FloatRect& opaque)
-{
-    double paintStart = currentTime();
-    m_client->paintContents(canvas, contentRect, opaque);
-    double paintEnd = currentTime();
-    double pixelsPerSec = (contentRect.width() * contentRect.height()) / (paintEnd - paintStart);
-    WebKit::Platform::current()->histogramCustomCounts("Renderer4.AccelContentPaintDurationMS", (paintEnd - paintStart) * 1000, 0, 120, 30);
-    WebKit::Platform::current()->histogramCustomCounts("Renderer4.AccelContentPaintMegapixPerSecond", pixelsPerSec / 1000000, 10, 210, 30);
-}
-
-PassRefPtr<ContentLayerChromium> ContentLayerChromium::create(ContentLayerChromiumClient* client)
-{
-    return adoptRef(new ContentLayerChromium(client));
-}
-
-ContentLayerChromium::ContentLayerChromium(ContentLayerChromiumClient* client)
-    : TiledLayerChromium()
-    , m_client(client)
-{
-}
-
-ContentLayerChromium::~ContentLayerChromium()
-{
-}
-
-bool ContentLayerChromium::drawsContent() const
-{
-    return TiledLayerChromium::drawsContent() && m_client;
-}
-
-void ContentLayerChromium::setTexturePriorities(const CCPriorityCalculator& priorityCalc)
-{
-    // Update the tile data before creating all the layer's tiles.
-    updateTileSizeAndTilingOption();
-
-    TiledLayerChromium::setTexturePriorities(priorityCalc);
-}
-
-void ContentLayerChromium::update(CCTextureUpdateQueue& queue, const CCOcclusionTracker* occlusion, CCRenderingStats& stats)
-{
-    createTextureUpdaterIfNeeded();
-    TiledLayerChromium::update(queue, occlusion, stats);
-    m_needsDisplay = false;
-}
-
-bool ContentLayerChromium::needMoreUpdates()
-{
-    return needsIdlePaint();
-}
-
-void ContentLayerChromium::createTextureUpdaterIfNeeded()
-{
-    if (m_textureUpdater)
-        return;
-    if (layerTreeHost()->settings().acceleratePainting)
-        m_textureUpdater = FrameBufferSkPictureCanvasLayerTextureUpdater::create(ContentLayerPainter::create(m_client));
-    else if (CCSettings::perTilePaintingEnabled())
-        m_textureUpdater = BitmapSkPictureCanvasLayerTextureUpdater::create(ContentLayerPainter::create(m_client));
-    else
-        m_textureUpdater = BitmapCanvasLayerTextureUpdater::create(ContentLayerPainter::create(m_client));
-    m_textureUpdater->setOpaque(opaque());
-
-    GC3Denum textureFormat = layerTreeHost()->rendererCapabilities().bestTextureFormat;
-    setTextureFormat(textureFormat);
-    setSampledTexelFormat(textureUpdater()->sampledTexelFormat(textureFormat));
-}
-
-void ContentLayerChromium::setOpaque(bool opaque)
-{
-    LayerChromium::setOpaque(opaque);
-    if (m_textureUpdater)
-        m_textureUpdater->setOpaque(opaque);
-}
-
-}
-#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/Source/WebCore/platform/graphics/chromium/ContentLayerChromium.h b/Source/WebCore/platform/graphics/chromium/ContentLayerChromium.h
deleted file mode 100644 (file)
index 7eb459c..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#ifndef ContentLayerChromium_h
-#define ContentLayerChromium_h
-
-#if USE(ACCELERATED_COMPOSITING)
-
-#include "LayerPainterChromium.h"
-#include "TiledLayerChromium.h"
-
-class SkCanvas;
-
-namespace WebCore {
-
-class ContentLayerChromiumClient;
-class FloatRect;
-class IntRect;
-class LayerTextureUpdater;
-
-class ContentLayerPainter : public LayerPainterChromium {
-    WTF_MAKE_NONCOPYABLE(ContentLayerPainter);
-public:
-    static PassOwnPtr<ContentLayerPainter> create(ContentLayerChromiumClient*);
-
-    virtual void paint(SkCanvas*, const IntRect& contentRect, FloatRect& opaque) OVERRIDE;
-
-private:
-    explicit ContentLayerPainter(ContentLayerChromiumClient*);
-
-    ContentLayerChromiumClient* m_client;
-};
-
-// A layer that renders its contents into an SkCanvas.
-class ContentLayerChromium : public TiledLayerChromium {
-public:
-    static PassRefPtr<ContentLayerChromium> create(ContentLayerChromiumClient*);
-
-    virtual ~ContentLayerChromium();
-
-    void clearClient() { m_client = 0; }
-
-    virtual bool drawsContent() const OVERRIDE;
-    virtual void setTexturePriorities(const CCPriorityCalculator&) OVERRIDE;
-    virtual void update(CCTextureUpdateQueue&, const CCOcclusionTracker*, CCRenderingStats&) OVERRIDE;
-    virtual bool needMoreUpdates() OVERRIDE;
-
-    virtual void setOpaque(bool) OVERRIDE;
-
-protected:
-    explicit ContentLayerChromium(ContentLayerChromiumClient*);
-
-
-private:
-    virtual LayerTextureUpdater* textureUpdater() const OVERRIDE { return m_textureUpdater.get(); }
-    virtual void createTextureUpdaterIfNeeded() OVERRIDE;
-
-    ContentLayerChromiumClient* m_client;
-    RefPtr<LayerTextureUpdater> m_textureUpdater;
-};
-
-}
-#endif // USE(ACCELERATED_COMPOSITING)
-
-#endif
diff --git a/Source/WebCore/platform/graphics/chromium/ContentLayerChromiumClient.h b/Source/WebCore/platform/graphics/chromium/ContentLayerChromiumClient.h
deleted file mode 100644 (file)
index d956a5d..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2012 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef ContentLayerChromiumClient_h
-#define ContentLayerChromiumClient_h
-
-class SkCanvas;
-
-namespace WebCore {
-class FloatRect;
-class IntRect;
-
-class ContentLayerChromiumClient {
-public:
-    virtual void paintContents(SkCanvas*, const IntRect& clip, FloatRect& opaque) = 0;
-
-protected:
-    virtual ~ContentLayerChromiumClient() { }
-};
-
-}
-
-#endif // ContentLayerChromiumClient_h
diff --git a/Source/WebCore/platform/graphics/chromium/FrameBufferSkPictureCanvasLayerTextureUpdater.cpp b/Source/WebCore/platform/graphics/chromium/FrameBufferSkPictureCanvasLayerTextureUpdater.cpp
deleted file mode 100644 (file)
index 4bc6390..0000000
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#include "config.h"
-
-#if USE(ACCELERATED_COMPOSITING)
-
-#include "FrameBufferSkPictureCanvasLayerTextureUpdater.h"
-
-#include "CCProxy.h"
-#include "LayerPainterChromium.h"
-#include "SkCanvas.h"
-#include "SkGpuDevice.h"
-#include <public/WebGraphicsContext3D.h>
-#include <public/WebSharedGraphicsContext3D.h>
-
-using WebKit::WebGraphicsContext3D;
-using WebKit::WebSharedGraphicsContext3D;
-
-namespace WebCore {
-
-static PassOwnPtr<SkCanvas> createAcceleratedCanvas(GrContext* grContext,
-                                                    IntSize canvasSize,
-                                                    unsigned textureId)
-{
-    GrPlatformTextureDesc textureDesc;
-    textureDesc.fFlags = kRenderTarget_GrPlatformTextureFlag;
-    textureDesc.fWidth = canvasSize.width();
-    textureDesc.fHeight = canvasSize.height();
-    textureDesc.fConfig = kSkia8888_GrPixelConfig;
-    textureDesc.fTextureHandle = textureId;
-    SkAutoTUnref<GrTexture> target(grContext->createPlatformTexture(textureDesc));
-    SkAutoTUnref<SkDevice> device(new SkGpuDevice(grContext, target.get()));
-    return adoptPtr(new SkCanvas(device.get()));
-}
-
-FrameBufferSkPictureCanvasLayerTextureUpdater::Texture::Texture(FrameBufferSkPictureCanvasLayerTextureUpdater* textureUpdater, PassOwnPtr<CCPrioritizedTexture> texture)
-    : LayerTextureUpdater::Texture(texture)
-    , m_textureUpdater(textureUpdater)
-{
-}
-
-FrameBufferSkPictureCanvasLayerTextureUpdater::Texture::~Texture()
-{
-}
-
-void FrameBufferSkPictureCanvasLayerTextureUpdater::Texture::updateRect(CCResourceProvider* resourceProvider, const IntRect& sourceRect, const IntSize& destOffset)
-{
-    WebGraphicsContext3D* sharedContext = CCProxy::hasImplThread() ? WebSharedGraphicsContext3D::compositorThreadContext() : WebSharedGraphicsContext3D::mainThreadContext();
-    GrContext* sharedGrContext = CCProxy::hasImplThread() ? WebSharedGraphicsContext3D::compositorThreadGrContext() : WebSharedGraphicsContext3D::mainThreadGrContext();
-    if (!sharedContext || !sharedGrContext)
-        return;
-    textureUpdater()->updateTextureRect(sharedContext, sharedGrContext, resourceProvider, texture(), sourceRect, destOffset);
-}
-
-PassRefPtr<FrameBufferSkPictureCanvasLayerTextureUpdater> FrameBufferSkPictureCanvasLayerTextureUpdater::create(PassOwnPtr<LayerPainterChromium> painter)
-{
-    return adoptRef(new FrameBufferSkPictureCanvasLayerTextureUpdater(painter));
-}
-
-FrameBufferSkPictureCanvasLayerTextureUpdater::FrameBufferSkPictureCanvasLayerTextureUpdater(PassOwnPtr<LayerPainterChromium> painter)
-    : SkPictureCanvasLayerTextureUpdater(painter)
-{
-}
-
-FrameBufferSkPictureCanvasLayerTextureUpdater::~FrameBufferSkPictureCanvasLayerTextureUpdater()
-{
-}
-
-PassOwnPtr<LayerTextureUpdater::Texture> FrameBufferSkPictureCanvasLayerTextureUpdater::createTexture(CCPrioritizedTextureManager* manager)
-{
-    return adoptPtr(new Texture(this, CCPrioritizedTexture::create(manager)));
-}
-
-LayerTextureUpdater::SampledTexelFormat FrameBufferSkPictureCanvasLayerTextureUpdater::sampledTexelFormat(GC3Denum textureFormat)
-{
-    // Here we directly render to the texture, so the component order is always correct.
-    return LayerTextureUpdater::SampledTexelFormatRGBA;
-}
-
-void FrameBufferSkPictureCanvasLayerTextureUpdater::updateTextureRect(WebGraphicsContext3D* context, GrContext* grContext, CCResourceProvider* resourceProvider, CCPrioritizedTexture* texture, const IntRect& sourceRect, const IntSize& destOffset)
-{
-    texture->acquireBackingTexture(resourceProvider);
-    // Flush the context in which the backing texture is created so that it
-    // is available in other shared contexts. It is important to do here
-    // because the backing texture is created in one context while it is
-    // being written to in another.
-    resourceProvider->flush();
-    CCResourceProvider::ScopedWriteLockGL lock(resourceProvider, texture->resourceId());
-
-    // Make sure ganesh uses the correct GL context.
-    context->makeContextCurrent();
-    // Create an accelerated canvas to draw on.
-    OwnPtr<SkCanvas> canvas = createAcceleratedCanvas(grContext, texture->size(), lock.textureId());
-
-    // The compositor expects the textures to be upside-down so it can flip
-    // the final composited image. Ganesh renders the image upright so we
-    // need to do a y-flip.
-    canvas->translate(0.0, texture->size().height());
-    canvas->scale(1.0, -1.0);
-    // Clip to the destination on the texture that must be updated.
-    canvas->clipRect(SkRect::MakeXYWH(destOffset.width(), destOffset.height(), sourceRect.width(), sourceRect.height()));
-    // Translate the origin of contentRect to that of destRect.
-    // Note that destRect is defined relative to sourceRect.
-    canvas->translate(contentRect().x() - sourceRect.x() + destOffset.width(),
-                      contentRect().y() - sourceRect.y() + destOffset.height());
-    drawPicture(canvas.get());
-
-    // Flush ganesh context so that all the rendered stuff appears on the texture.
-    grContext->flush();
-
-    // Flush the GL context so rendering results from this context are visible in the compositor's context.
-    context->flush();
-}
-
-} // namespace WebCore
-#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/Source/WebCore/platform/graphics/chromium/FrameBufferSkPictureCanvasLayerTextureUpdater.h b/Source/WebCore/platform/graphics/chromium/FrameBufferSkPictureCanvasLayerTextureUpdater.h
deleted file mode 100644 (file)
index 05a9dfe..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#ifndef FrameBufferSkPictureCanvasLayerTextureUpdater_h
-#define FrameBufferSkPictureCanvasLayerTextureUpdater_h
-
-#if USE(ACCELERATED_COMPOSITING)
-
-#include "SkPictureCanvasLayerTextureUpdater.h"
-
-class GrContext;
-
-namespace WebKit {
-class WebGraphicsContext3D;
-class WebSharedGraphicsContext3D;
-}
-
-namespace WebCore {
-
-// This class records the contentRect into an SkPicture, then uses accelerated
-// drawing to update the texture. The accelerated drawing goes to an
-// intermediate framebuffer and then is copied to the destination texture once done.
-class FrameBufferSkPictureCanvasLayerTextureUpdater : public SkPictureCanvasLayerTextureUpdater {
-public:
-    class Texture : public LayerTextureUpdater::Texture {
-    public:
-        Texture(FrameBufferSkPictureCanvasLayerTextureUpdater*, PassOwnPtr<CCPrioritizedTexture>);
-        virtual ~Texture();
-
-        virtual void updateRect(CCResourceProvider*, const IntRect& sourceRect, const IntSize& destOffset) OVERRIDE;
-
-    private:
-        FrameBufferSkPictureCanvasLayerTextureUpdater* textureUpdater() { return m_textureUpdater; }
-
-        FrameBufferSkPictureCanvasLayerTextureUpdater* m_textureUpdater;
-    };
-
-    static PassRefPtr<FrameBufferSkPictureCanvasLayerTextureUpdater> create(PassOwnPtr<LayerPainterChromium>);
-    virtual ~FrameBufferSkPictureCanvasLayerTextureUpdater();
-
-    virtual PassOwnPtr<LayerTextureUpdater::Texture> createTexture(CCPrioritizedTextureManager*) OVERRIDE;
-    virtual SampledTexelFormat sampledTexelFormat(GC3Denum textureFormat) OVERRIDE;
-    void updateTextureRect(WebKit::WebGraphicsContext3D*, GrContext*, CCResourceProvider*, CCPrioritizedTexture*, const IntRect& sourceRect, const IntSize& destOffset);
-
-private:
-    explicit FrameBufferSkPictureCanvasLayerTextureUpdater(PassOwnPtr<LayerPainterChromium>);
-};
-} // namespace WebCore
-#endif // USE(ACCELERATED_COMPOSITING)
-#endif // FrameBufferSkPictureCanvasLayerTextureUpdater_h
diff --git a/Source/WebCore/platform/graphics/chromium/GeometryBinding.cpp b/Source/WebCore/platform/graphics/chromium/GeometryBinding.cpp
deleted file mode 100644 (file)
index 960ef95..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-
-#if USE(ACCELERATED_COMPOSITING)
-
-#include "GeometryBinding.h"
-
-#include "CCRendererGL.h" // For the GLC() macro.
-#include "GraphicsContext3D.h"
-#include <public/WebGraphicsContext3D.h>
-
-namespace WebCore {
-
-GeometryBinding::GeometryBinding(WebKit::WebGraphicsContext3D* context, const FloatRect& quadVertexRect)
-    : m_context(context)
-    , m_quadVerticesVbo(0)
-    , m_quadElementsVbo(0)
-    , m_initialized(false)
-{
-    // Vertex positions and texture coordinates for the 4 corners of a 1x1 quad.
-    float vertices[] = { quadVertexRect.x(), quadVertexRect.maxY(), 0.0f, 0.0f,  1.0f,
-                         quadVertexRect.x(), quadVertexRect.y(), 0.0f, 0.0f,  0.0f,
-                         quadVertexRect.maxX(), quadVertexRect.y(), 0.0f, 1.0f,  0.0f,
-                         quadVertexRect.maxX(),  quadVertexRect.maxY(), 0.0f, 1.0f,  1.0f };
-    uint16_t indices[] = { 0, 1, 2, 0, 2, 3, // The two triangles that make up the layer quad.
-                           0, 1, 2, 3}; // A line path for drawing the layer border.
-
-    GLC(m_context, m_quadVerticesVbo = m_context->createBuffer());
-    GLC(m_context, m_quadElementsVbo = m_context->createBuffer());
-    GLC(m_context, m_context->bindBuffer(GraphicsContext3D::ARRAY_BUFFER, m_quadVerticesVbo));
-    GLC(m_context, m_context->bufferData(GraphicsContext3D::ARRAY_BUFFER, sizeof(vertices), vertices, GraphicsContext3D::STATIC_DRAW));
-    GLC(m_context, m_context->bindBuffer(GraphicsContext3D::ELEMENT_ARRAY_BUFFER, m_quadElementsVbo));
-    GLC(m_context, m_context->bufferData(GraphicsContext3D::ELEMENT_ARRAY_BUFFER, sizeof(indices), indices, GraphicsContext3D::STATIC_DRAW));
-
-    m_initialized = true;
-}
-
-GeometryBinding::~GeometryBinding()
-{
-    GLC(m_context, m_context->deleteBuffer(m_quadVerticesVbo));
-    GLC(m_context, m_context->deleteBuffer(m_quadElementsVbo));
-}
-
-void GeometryBinding::prepareForDraw()
-{
-    GLC(m_context, m_context->bindBuffer(GraphicsContext3D::ARRAY_BUFFER, quadVerticesVbo()));
-    GLC(m_context, m_context->bindBuffer(GraphicsContext3D::ELEMENT_ARRAY_BUFFER, quadElementsVbo()));
-    unsigned offset = 0;
-    GLC(m_context, m_context->vertexAttribPointer(positionAttribLocation(), 3, GraphicsContext3D::FLOAT, false, 5 * sizeof(float), offset));
-    offset += 3 * sizeof(float);
-    GLC(m_context, m_context->vertexAttribPointer(texCoordAttribLocation(), 2, GraphicsContext3D::FLOAT, false, 5 * sizeof(float), offset));
-    GLC(m_context, m_context->enableVertexAttribArray(positionAttribLocation()));
-    GLC(m_context, m_context->enableVertexAttribArray(texCoordAttribLocation()));
-}
-
-} // namespace WebCore
-
-#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/Source/WebCore/platform/graphics/chromium/GeometryBinding.h b/Source/WebCore/platform/graphics/chromium/GeometryBinding.h
deleted file mode 100644 (file)
index 0af146c..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef GeometryBinding_h
-#define GeometryBinding_h
-
-#include "FloatRect.h"
-
-#if USE(ACCELERATED_COMPOSITING)
-
-namespace WebKit {
-class WebGraphicsContext3D;
-}
-
-namespace WebCore {
-
-class GeometryBinding {
-public:
-    GeometryBinding(WebKit::WebGraphicsContext3D*, const FloatRect& quadVertexRect);
-    ~GeometryBinding();
-
-    bool initialized() const { return m_initialized; }
-
-    WebKit::WebGraphicsContext3D* context() const { return m_context; }
-    unsigned quadVerticesVbo() const { return m_quadVerticesVbo; }
-    unsigned quadElementsVbo() const { return m_quadElementsVbo; }
-
-    void prepareForDraw();
-
-    // All layer shaders share the same attribute locations for the vertex
-    // positions and texture coordinates. This allows switching shaders without
-    // rebinding attribute arrays.
-    static int positionAttribLocation() { return 0; }
-    static int texCoordAttribLocation() { return 1; }
-
-private:
-    WebKit::WebGraphicsContext3D* m_context;
-    unsigned m_quadVerticesVbo;
-    unsigned m_quadElementsVbo;
-    bool m_initialized;
-};
-
-} // namespace WebCore
-
-#endif // USE(ACCELERATED_COMPOSITING)
-
-#endif
index 0aa145b..47c03cb 100644 (file)
@@ -46,7 +46,6 @@
 #include "GraphicsLayerChromium.h"
 
 #include "AnimationTranslationUtil.h"
-#include "ContentLayerChromium.h"
 #include "FloatConversion.h"
 #include "FloatRect.h"
 #include "GraphicsContext.h"
@@ -70,6 +69,7 @@
 #include <wtf/HashSet.h>
 #include <wtf/StringExtras.h>
 #include <wtf/text/CString.h>
+#include <wtf/text/StringHash.h>
 #include <wtf/text/WTFString.h>
 
 using namespace std;
diff --git a/Source/WebCore/platform/graphics/chromium/HeadsUpDisplayLayerChromium.cpp b/Source/WebCore/platform/graphics/chromium/HeadsUpDisplayLayerChromium.cpp
deleted file mode 100644 (file)
index dc71d27..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (C) 2012 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-
-#include "HeadsUpDisplayLayerChromium.h"
-
-#include "CCHeadsUpDisplayLayerImpl.h"
-#include "CCLayerTreeHost.h"
-#include "TraceEvent.h"
-
-namespace WebCore {
-
-PassRefPtr<HeadsUpDisplayLayerChromium> HeadsUpDisplayLayerChromium::create()
-{
-    return adoptRef(new HeadsUpDisplayLayerChromium());
-}
-
-HeadsUpDisplayLayerChromium::HeadsUpDisplayLayerChromium()
-    : LayerChromium()
-{
-
-    setBounds(IntSize(512, 128));
-}
-
-HeadsUpDisplayLayerChromium::~HeadsUpDisplayLayerChromium()
-{
-}
-
-void HeadsUpDisplayLayerChromium::update(CCTextureUpdateQueue&, const CCOcclusionTracker*, CCRenderingStats&)
-{
-    const CCLayerTreeSettings& settings = layerTreeHost()->settings();
-    int maxTextureSize = layerTreeHost()->rendererCapabilities().maxTextureSize;
-
-    IntSize bounds;
-    if (settings.showPlatformLayerTree || settings.showDebugRects()) {
-        bounds.setWidth(std::min(maxTextureSize, layerTreeHost()->deviceViewportSize().width()));
-        bounds.setHeight(std::min(maxTextureSize, layerTreeHost()->deviceViewportSize().height()));
-    } else {
-        bounds.setWidth(512);
-        bounds.setHeight(128);
-    }
-
-    setBounds(bounds);
-}
-
-void HeadsUpDisplayLayerChromium::setFontAtlas(PassOwnPtr<CCFontAtlas> fontAtlas)
-{
-    m_fontAtlas = fontAtlas;
-    setNeedsCommit();
-}
-
-PassOwnPtr<CCLayerImpl> HeadsUpDisplayLayerChromium::createCCLayerImpl()
-{
-    return CCHeadsUpDisplayLayerImpl::create(m_layerId);
-}
-
-void HeadsUpDisplayLayerChromium::pushPropertiesTo(CCLayerImpl* layerImpl)
-{
-    LayerChromium::pushPropertiesTo(layerImpl);
-
-    if (!m_fontAtlas)
-        return;
-
-    CCHeadsUpDisplayLayerImpl* hudLayerImpl = static_cast<CCHeadsUpDisplayLayerImpl*>(layerImpl);
-    hudLayerImpl->setFontAtlas(m_fontAtlas.release());
-}
-
-}
diff --git a/Source/WebCore/platform/graphics/chromium/HeadsUpDisplayLayerChromium.h b/Source/WebCore/platform/graphics/chromium/HeadsUpDisplayLayerChromium.h
deleted file mode 100644 (file)
index 775720e..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2012 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#ifndef HeadsUpDisplayLayerChromium_h
-#define HeadsUpDisplayLayerChromium_h
-
-#include "CCFontAtlas.h"
-#include "IntSize.h"
-#include "LayerChromium.h"
-
-namespace WebCore {
-
-class HeadsUpDisplayLayerChromium : public LayerChromium {
-public:
-    static PassRefPtr<HeadsUpDisplayLayerChromium> create();
-    virtual ~HeadsUpDisplayLayerChromium();
-
-    virtual void update(CCTextureUpdateQueue&, const CCOcclusionTracker*, CCRenderingStats&) OVERRIDE;
-    virtual bool drawsContent() const OVERRIDE { return true; }
-
-    void setFontAtlas(PassOwnPtr<CCFontAtlas>);
-
-    virtual PassOwnPtr<CCLayerImpl> createCCLayerImpl() OVERRIDE;
-    virtual void pushPropertiesTo(CCLayerImpl*) OVERRIDE;
-
-protected:
-    HeadsUpDisplayLayerChromium();
-
-private:
-    OwnPtr<CCFontAtlas> m_fontAtlas;
-};
-
-}
-#endif
diff --git a/Source/WebCore/platform/graphics/chromium/IOSurfaceLayerChromium.cpp b/Source/WebCore/platform/graphics/chromium/IOSurfaceLayerChromium.cpp
deleted file mode 100644 (file)
index 38dd877..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (C) 2012 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-
-#if USE(ACCELERATED_COMPOSITING)
-
-#include "IOSurfaceLayerChromium.h"
-
-#include "CCIOSurfaceLayerImpl.h"
-
-namespace WebCore {
-
-PassRefPtr<IOSurfaceLayerChromium> IOSurfaceLayerChromium::create()
-{
-    return adoptRef(new IOSurfaceLayerChromium());
-}
-
-IOSurfaceLayerChromium::IOSurfaceLayerChromium()
-    : LayerChromium()
-    , m_ioSurfaceId(0)
-{
-}
-
-IOSurfaceLayerChromium::~IOSurfaceLayerChromium()
-{
-}
-
-void IOSurfaceLayerChromium::setIOSurfaceProperties(uint32_t ioSurfaceId, const IntSize& size)
-{
-    m_ioSurfaceId = ioSurfaceId;
-    m_ioSurfaceSize = size;
-    setNeedsCommit();
-}
-
-PassOwnPtr<CCLayerImpl> IOSurfaceLayerChromium::createCCLayerImpl()
-{
-    return CCIOSurfaceLayerImpl::create(m_layerId);
-}
-
-bool IOSurfaceLayerChromium::drawsContent() const
-{
-    return m_ioSurfaceId && LayerChromium::drawsContent();
-}
-
-void IOSurfaceLayerChromium::pushPropertiesTo(CCLayerImpl* layer)
-{
-    LayerChromium::pushPropertiesTo(layer);
-
-    CCIOSurfaceLayerImpl* textureLayer = static_cast<CCIOSurfaceLayerImpl*>(layer);
-    textureLayer->setIOSurfaceProperties(m_ioSurfaceId, m_ioSurfaceSize);
-}
-
-}
-#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/Source/WebCore/platform/graphics/chromium/IOSurfaceLayerChromium.h b/Source/WebCore/platform/graphics/chromium/IOSurfaceLayerChromium.h
deleted file mode 100644 (file)
index 17f943b..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2012 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#ifndef IOSurfaceLayerChromium_h
-#define IOSurfaceLayerChromium_h
-
-#if USE(ACCELERATED_COMPOSITING)
-
-#include "LayerChromium.h"
-
-namespace WebCore {
-
-class IOSurfaceLayerChromium : public LayerChromium {
-public:
-    static PassRefPtr<IOSurfaceLayerChromium> create();
-    virtual ~IOSurfaceLayerChromium();
-
-    void setIOSurfaceProperties(uint32_t ioSurfaceId, const IntSize&);
-
-    virtual PassOwnPtr<CCLayerImpl> createCCLayerImpl() OVERRIDE;
-    virtual bool drawsContent() const OVERRIDE;
-    virtual void pushPropertiesTo(CCLayerImpl*) OVERRIDE;
-
-protected:
-    IOSurfaceLayerChromium();
-
-private:
-
-    uint32_t m_ioSurfaceId;
-    IntSize m_ioSurfaceSize;
-};
-
-}
-#endif // USE(ACCELERATED_COMPOSITING)
-
-#endif
diff --git a/Source/WebCore/platform/graphics/chromium/ImageLayerChromium.cpp b/Source/WebCore/platform/graphics/chromium/ImageLayerChromium.cpp
deleted file mode 100644 (file)
index 1049e03..0000000
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-
-#if USE(ACCELERATED_COMPOSITING)
-
-#include "ImageLayerChromium.h"
-
-#include "CCLayerTreeHost.h"
-#include "LayerTextureUpdater.h"
-#include "PlatformColor.h"
-
-namespace WebCore {
-
-class ImageLayerTextureUpdater : public LayerTextureUpdater {
-public:
-    class Texture : public LayerTextureUpdater::Texture {
-    public:
-        Texture(ImageLayerTextureUpdater* textureUpdater, PassOwnPtr<CCPrioritizedTexture> texture)
-            : LayerTextureUpdater::Texture(texture)
-            , m_textureUpdater(textureUpdater)
-        {
-        }
-
-        virtual void updateRect(CCResourceProvider* resourceProvider, const IntRect& sourceRect, const IntSize& destOffset) OVERRIDE
-        {
-            textureUpdater()->updateTextureRect(resourceProvider, texture(), sourceRect, destOffset);
-        }
-
-    private:
-        ImageLayerTextureUpdater* textureUpdater() { return m_textureUpdater; }
-
-        ImageLayerTextureUpdater* m_textureUpdater;
-    };
-
-    static PassRefPtr<ImageLayerTextureUpdater> create()
-    {
-        return adoptRef(new ImageLayerTextureUpdater());
-    }
-
-    virtual ~ImageLayerTextureUpdater() { }
-
-    virtual PassOwnPtr<LayerTextureUpdater::Texture> createTexture(CCPrioritizedTextureManager* manager)
-    {
-        return adoptPtr(new Texture(this, CCPrioritizedTexture::create(manager)));
-    }
-
-    virtual SampledTexelFormat sampledTexelFormat(GC3Denum textureFormat) OVERRIDE
-    {
-        return PlatformColor::sameComponentOrder(textureFormat) ?
-                LayerTextureUpdater::SampledTexelFormatRGBA : LayerTextureUpdater::SampledTexelFormatBGRA;
-    }
-
-    void updateTextureRect(CCResourceProvider* resourceProvider, CCPrioritizedTexture* texture, const IntRect& sourceRect, const IntSize& destOffset)
-    {
-        // Source rect should never go outside the image pixels, even if this
-        // is requested because the texture extends outside the image.
-        IntRect clippedSourceRect = sourceRect;
-        IntRect imageRect = IntRect(0, 0, m_bitmap.width(), m_bitmap.height());
-        clippedSourceRect.intersect(imageRect);
-
-        IntSize clippedDestOffset = destOffset + IntSize(clippedSourceRect.location() - sourceRect.location());
-
-        SkAutoLockPixels lock(m_bitmap);
-        texture->upload(resourceProvider, static_cast<const uint8_t*>(m_bitmap.getPixels()), imageRect, clippedSourceRect, clippedDestOffset);
-    }
-
-    void setBitmap(const SkBitmap& bitmap)
-    {
-        m_bitmap = bitmap;
-    }
-
-private:
-    ImageLayerTextureUpdater() { }
-
-    SkBitmap m_bitmap;
-};
-
-PassRefPtr<ImageLayerChromium> ImageLayerChromium::create()
-{
-    return adoptRef(new ImageLayerChromium());
-}
-
-ImageLayerChromium::ImageLayerChromium()
-    : TiledLayerChromium()
-{
-}
-
-ImageLayerChromium::~ImageLayerChromium()
-{
-}
-
-void ImageLayerChromium::setBitmap(const SkBitmap& bitmap)
-{
-    // setBitmap() currently gets called whenever there is any
-    // style change that affects the layer even if that change doesn't
-    // affect the actual contents of the image (e.g. a CSS animation).
-    // With this check in place we avoid unecessary texture uploads.
-    if (bitmap.pixelRef() && bitmap.pixelRef() == m_bitmap.pixelRef())
-        return;
-
-    m_bitmap = bitmap;
-    setNeedsDisplay();
-}
-
-void ImageLayerChromium::setTexturePriorities(const CCPriorityCalculator& priorityCalc)
-{
-    // Update the tile data before creating all the layer's tiles.
-    updateTileSizeAndTilingOption();
-
-    TiledLayerChromium::setTexturePriorities(priorityCalc);
-}
-
-void ImageLayerChromium::update(CCTextureUpdateQueue& queue, const CCOcclusionTracker* occlusion, CCRenderingStats& stats)
-{
-    createTextureUpdaterIfNeeded();
-    if (m_needsDisplay) {
-        m_textureUpdater->setBitmap(m_bitmap);
-        updateTileSizeAndTilingOption();
-        invalidateContentRect(IntRect(IntPoint(), contentBounds()));
-        m_needsDisplay = false;
-    }
-    TiledLayerChromium::update(queue, occlusion, stats);
-}
-
-void ImageLayerChromium::createTextureUpdaterIfNeeded()
-{
-    if (m_textureUpdater)
-        return;
-
-    m_textureUpdater = ImageLayerTextureUpdater::create();
-    GC3Denum textureFormat = layerTreeHost()->rendererCapabilities().bestTextureFormat;
-    setTextureFormat(textureFormat);
-    setSampledTexelFormat(textureUpdater()->sampledTexelFormat(textureFormat));
-}
-
-LayerTextureUpdater* ImageLayerChromium::textureUpdater() const
-{
-    return m_textureUpdater.get();
-}
-
-IntSize ImageLayerChromium::contentBounds() const
-{
-    return IntSize(m_bitmap.width(), m_bitmap.height());
-}
-
-bool ImageLayerChromium::drawsContent() const
-{
-    return !m_bitmap.isNull() && TiledLayerChromium::drawsContent();
-}
-
-bool ImageLayerChromium::needsContentsScale() const
-{
-    // Contents scale is not need for image layer because this can be done in compositor more efficiently.
-    return false;
-}
-
-}
-#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/Source/WebCore/platform/graphics/chromium/ImageLayerChromium.h b/Source/WebCore/platform/graphics/chromium/ImageLayerChromium.h
deleted file mode 100644 (file)
index b50e5e7..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#ifndef ImageLayerChromium_h
-#define ImageLayerChromium_h
-
-#if USE(ACCELERATED_COMPOSITING)
-
-#include "ContentLayerChromium.h"
-#include "SkBitmap.h"
-
-namespace WebCore {
-
-class ImageLayerTextureUpdater;
-
-// A Layer that contains only an Image element.
-class ImageLayerChromium : public TiledLayerChromium {
-public:
-    static PassRefPtr<ImageLayerChromium> create();
-    virtual ~ImageLayerChromium();
-
-    virtual bool drawsContent() const OVERRIDE;
-    virtual void setTexturePriorities(const CCPriorityCalculator&) OVERRIDE;
-    virtual void update(CCTextureUpdateQueue&, const CCOcclusionTracker*, CCRenderingStats&) OVERRIDE;
-    virtual bool needsContentsScale() const OVERRIDE;
-
-    void setBitmap(const SkBitmap& image);
-
-private:
-    ImageLayerChromium();
-
-    void setTilingOption(TilingOption);
-
-    virtual LayerTextureUpdater* textureUpdater() const OVERRIDE;
-    virtual void createTextureUpdaterIfNeeded() OVERRIDE;
-    virtual IntSize contentBounds() const OVERRIDE;
-
-    SkBitmap m_bitmap;
-
-    RefPtr<ImageLayerTextureUpdater> m_textureUpdater;
-};
-
-}
-#endif // USE(ACCELERATED_COMPOSITING)
-
-#endif
diff --git a/Source/WebCore/platform/graphics/chromium/LayerChromium.cpp b/Source/WebCore/platform/graphics/chromium/LayerChromium.cpp
deleted file mode 100644 (file)
index 2418fde..0000000
+++ /dev/null
@@ -1,751 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-
-#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 <public/WebAnimationDelegate.h>
-#include <public/WebLayerScrollClient.h>
-#include <public/WebSize.h>
-
-using namespace std;
-using WebKit::WebTransformationMatrix;
-
-namespace WebCore {
-
-static int s_nextLayerId = 1;
-
-PassRefPtr<LayerChromium> LayerChromium::create()
-{
-    return adoptRef(new LayerChromium());
-}
-
-LayerChromium::LayerChromium()
-    : m_needsDisplay(false)
-    , m_stackingOrderChanged(false)
-    , m_layerId(s_nextLayerId++)
-    , m_parent(0)
-    , m_layerTreeHost(0)
-    , m_layerAnimationController(CCLayerAnimationController::create(this))
-    , m_scrollable(false)
-    , m_shouldScrollOnMainThread(false)
-    , m_haveWheelEventHandlers(false)
-    , m_nonFastScrollableRegionChanged(false)
-    , m_anchorPoint(0.5, 0.5)
-    , m_backgroundColor(0)
-    , m_debugBorderColor(0)
-    , m_debugBorderWidth(0)
-    , m_opacity(1.0)
-    , m_anchorPointZ(0)
-    , m_isContainerForFixedPositionLayers(false)
-    , m_fixedToContainerLayer(false)
-    , m_isDrawable(false)
-    , m_masksToBounds(false)
-    , m_opaque(false)
-    , m_doubleSided(true)
-    , m_useLCDText(false)
-    , m_preserves3D(false)
-    , m_useParentBackfaceVisibility(false)
-    , m_drawCheckerboardForMissingTiles(false)
-    , m_forceRenderSurface(false)
-    , m_replicaLayer(0)
-    , m_drawOpacity(0)
-    , m_drawOpacityIsAnimating(false)
-    , m_renderTarget(0)
-    , m_drawTransformIsAnimating(false)
-    , m_screenSpaceTransformIsAnimating(false)
-    , m_contentsScale(1.0)
-    , m_boundsContainPageScale(false)
-    , m_layerAnimationDelegate(0)
-    , m_layerScrollClient(0)
-{
-    if (m_layerId < 0) {
-        s_nextLayerId = 1;
-        m_layerId = s_nextLayerId++;
-    }
-}
-
-LayerChromium::~LayerChromium()
-{
-    // Our parent should be holding a reference to us so there should be no
-    // way for us to be destroyed while we still have a parent.
-    ASSERT(!parent());
-
-    // Remove the parent reference from all children.
-    removeAllChildren();
-}
-
-void LayerChromium::setUseLCDText(bool useLCDText)
-{
-    m_useLCDText = useLCDText;
-}
-
-void LayerChromium::setLayerTreeHost(CCLayerTreeHost* host)
-{
-    if (m_layerTreeHost == host)
-        return;
-
-    m_layerTreeHost = host;
-
-    for (size_t i = 0; i < m_children.size(); ++i)
-        m_children[i]->setLayerTreeHost(host);
-
-    if (m_maskLayer)
-        m_maskLayer->setLayerTreeHost(host);
-    if (m_replicaLayer)
-        m_replicaLayer->setLayerTreeHost(host);
-
-    // If this layer already has active animations, the host needs to be notified.
-    if (host && m_layerAnimationController->hasActiveAnimation())
-        host->didAddAnimation();
-}
-
-void LayerChromium::setNeedsCommit()
-{
-    if (m_layerTreeHost)
-        m_layerTreeHost->setNeedsCommit();
-}
-
-void LayerChromium::setParent(LayerChromium* layer)
-{
-    ASSERT(!layer || !layer->hasAncestor(this));
-    m_parent = layer;
-    setLayerTreeHost(m_parent ? m_parent->layerTreeHost() : 0);
-}
-
-bool LayerChromium::hasAncestor(LayerChromium* ancestor) const
-{
-    for (LayerChromium* layer = parent(); layer; layer = layer->parent()) {
-        if (layer == ancestor)
-            return true;
-    }
-    return false;
-}
-
-void LayerChromium::addChild(PassRefPtr<LayerChromium> child)
-{
-    insertChild(child, numChildren());
-}
-
-void LayerChromium::insertChild(PassRefPtr<LayerChromium> child, size_t index)
-{
-    index = min(index, m_children.size());
-    child->removeFromParent();
-    child->setParent(this);
-    child->m_stackingOrderChanged = true;
-    m_children.insert(index, child);
-    setNeedsCommit();
-}
-
-void LayerChromium::removeFromParent()
-{
-    if (m_parent)
-        m_parent->removeChild(this);
-}
-
-void LayerChromium::removeChild(LayerChromium* child)
-{
-    int foundIndex = indexOfChild(child);
-    if (foundIndex == -1)
-        return;
-
-    child->setParent(0);
-    m_children.remove(foundIndex);
-    setNeedsCommit();
-}
-
-void LayerChromium::replaceChild(LayerChromium* reference, PassRefPtr<LayerChromium> newLayer)
-{
-    ASSERT_ARG(reference, reference);
-    ASSERT_ARG(reference, reference->parent() == this);
-
-    if (reference == newLayer)
-        return;
-
-    int referenceIndex = indexOfChild(reference);
-    if (referenceIndex == -1) {
-        ASSERT_NOT_REACHED();
-        return;
-    }
-
-    reference->removeFromParent();
-
-    if (newLayer) {
-        newLayer->removeFromParent();
-        insertChild(newLayer, referenceIndex);
-    }
-}
-
-int LayerChromium::indexOfChild(const LayerChromium* reference)
-{
-    for (size_t i = 0; i < m_children.size(); i++) {
-        if (m_children[i] == reference)
-            return i;
-    }
-    return -1;
-}
-
-void LayerChromium::setBounds(const IntSize& size)
-{
-    if (bounds() == size)
-        return;
-
-    bool firstResize = bounds().isEmpty() && !size.isEmpty();
-
-    m_bounds = size;
-
-    if (firstResize)
-        setNeedsDisplay();
-    else
-        setNeedsCommit();
-}
-
-LayerChromium* LayerChromium::rootLayer()
-{
-    LayerChromium* layer = this;
-    while (layer->parent())
-        layer = layer->parent();
-    return layer;
-}
-
-void LayerChromium::removeAllChildren()
-{
-    while (m_children.size()) {
-        LayerChromium* layer = m_children[0].get();
-        ASSERT(layer->parent());
-        layer->removeFromParent();
-    }
-}
-
-void LayerChromium::setChildren(const Vector<RefPtr<LayerChromium> >& children)
-{
-    if (children == m_children)
-        return;
-
-    removeAllChildren();
-    size_t listSize = children.size();
-    for (size_t i = 0; i < listSize; i++)
-        addChild(children[i]);
-}
-
-void LayerChromium::setAnchorPoint(const FloatPoint& anchorPoint)
-{
-    if (m_anchorPoint == anchorPoint)
-        return;
-    m_anchorPoint = anchorPoint;
-    setNeedsCommit();
-}
-
-void LayerChromium::setAnchorPointZ(float anchorPointZ)
-{
-    if (m_anchorPointZ == anchorPointZ)
-        return;
-    m_anchorPointZ = anchorPointZ;
-    setNeedsCommit();
-}
-
-void LayerChromium::setBackgroundColor(SkColor backgroundColor)
-{
-    if (m_backgroundColor == backgroundColor)
-        return;
-    m_backgroundColor = backgroundColor;
-    setNeedsCommit();
-}
-
-void LayerChromium::setMasksToBounds(bool masksToBounds)
-{
-    if (m_masksToBounds == masksToBounds)
-        return;
-    m_masksToBounds = masksToBounds;
-    setNeedsCommit();
-}
-
-void LayerChromium::setMaskLayer(LayerChromium* maskLayer)
-{
-    if (m_maskLayer == maskLayer)
-        return;
-    if (m_maskLayer)
-        m_maskLayer->setLayerTreeHost(0);
-    m_maskLayer = maskLayer;
-    if (m_maskLayer) {
-        m_maskLayer->setLayerTreeHost(m_layerTreeHost);
-        m_maskLayer->setIsMask(true);
-    }
-    setNeedsCommit();
-}
-
-void LayerChromium::setReplicaLayer(LayerChromium* layer)
-{
-    if (m_replicaLayer == layer)
-        return;
-    if (m_replicaLayer)
-        m_replicaLayer->setLayerTreeHost(0);
-    m_replicaLayer = layer;
-    if (m_replicaLayer)
-        m_replicaLayer->setLayerTreeHost(m_layerTreeHost);
-    setNeedsCommit();
-}
-
-void LayerChromium::setFilters(const WebKit::WebFilterOperations& filters)
-{
-    if (m_filters == filters)
-        return;
-    m_filters = filters;
-    setNeedsCommit();
-    if (!filters.isEmpty())
-        CCLayerTreeHost::setNeedsFilterContext(true);
-}
-
-void LayerChromium::setBackgroundFilters(const WebKit::WebFilterOperations& backgroundFilters)
-{
-    if (m_backgroundFilters == backgroundFilters)
-        return;
-    m_backgroundFilters = backgroundFilters;
-    setNeedsCommit();
-    if (!backgroundFilters.isEmpty())
-        CCLayerTreeHost::setNeedsFilterContext(true);
-}
-
-void LayerChromium::setOpacity(float opacity)
-{
-    if (m_opacity == opacity)
-        return;
-    m_opacity = opacity;
-    setNeedsCommit();
-}
-
-bool LayerChromium::opacityIsAnimating() const
-{
-    return m_layerAnimationController->isAnimatingProperty(CCActiveAnimation::Opacity);
-}
-
-void LayerChromium::setOpaque(bool opaque)
-{
-    if (m_opaque == opaque)
-        return;
-    m_opaque = opaque;
-    setNeedsDisplay();
-}
-
-void LayerChromium::setPosition(const FloatPoint& position)
-{
-    if (m_position == position)
-        return;
-    m_position = position;
-    setNeedsCommit();
-}
-
-void LayerChromium::setSublayerTransform(const WebTransformationMatrix& sublayerTransform)
-{
-    if (m_sublayerTransform == sublayerTransform)
-        return;
-    m_sublayerTransform = sublayerTransform;
-    setNeedsCommit();
-}
-
-void LayerChromium::setTransform(const WebTransformationMatrix& transform)
-{
-    if (m_transform == transform)
-        return;
-    m_transform = transform;
-    setNeedsCommit();
-}
-
-bool LayerChromium::transformIsAnimating() const
-{
-    return m_layerAnimationController->isAnimatingProperty(CCActiveAnimation::Transform);
-}
-
-void LayerChromium::setScrollPosition(const IntPoint& scrollPosition)
-{
-    if (m_scrollPosition == scrollPosition)
-        return;
-    m_scrollPosition = scrollPosition;
-    if (m_layerScrollClient)
-        m_layerScrollClient->didScroll();
-    setNeedsCommit();
-}
-
-void LayerChromium::setMaxScrollPosition(const IntSize& maxScrollPosition)
-{
-    if (m_maxScrollPosition == maxScrollPosition)
-        return;
-    m_maxScrollPosition = maxScrollPosition;
-    setNeedsCommit();
-}
-
-void LayerChromium::setScrollable(bool scrollable)
-{
-    if (m_scrollable == scrollable)
-        return;
-    m_scrollable = scrollable;
-    setNeedsCommit();
-}
-
-void LayerChromium::setShouldScrollOnMainThread(bool shouldScrollOnMainThread)
-{
-    if (m_shouldScrollOnMainThread == shouldScrollOnMainThread)
-        return;
-    m_shouldScrollOnMainThread = shouldScrollOnMainThread;
-    setNeedsCommit();
-}
-
-void LayerChromium::setHaveWheelEventHandlers(bool haveWheelEventHandlers)
-{
-    if (m_haveWheelEventHandlers == haveWheelEventHandlers)
-        return;
-    m_haveWheelEventHandlers = haveWheelEventHandlers;
-    setNeedsCommit();
-}
-
-void LayerChromium::setNonFastScrollableRegion(const Region& region)
-{
-    if (m_nonFastScrollableRegion == region)
-        return;
-    m_nonFastScrollableRegion = region;
-    m_nonFastScrollableRegionChanged = true;
-    setNeedsCommit();
-}
-
-void LayerChromium::setDrawCheckerboardForMissingTiles(bool checkerboard)
-{
-    if (m_drawCheckerboardForMissingTiles == checkerboard)
-        return;
-    m_drawCheckerboardForMissingTiles = checkerboard;
-    setNeedsCommit();
-}
-
-void LayerChromium::setForceRenderSurface(bool force)
-{
-    if (m_forceRenderSurface == force)
-        return;
-    m_forceRenderSurface = force;
-    setNeedsCommit();
-}
-
-void LayerChromium::setDoubleSided(bool doubleSided)
-{
-    if (m_doubleSided == doubleSided)
-        return;
-    m_doubleSided = doubleSided;
-    setNeedsCommit();
-}
-
-void LayerChromium::setIsDrawable(bool isDrawable)
-{
-    if (m_isDrawable == isDrawable)
-        return;
-
-    m_isDrawable = isDrawable;
-    setNeedsCommit();
-}
-
-LayerChromium* LayerChromium::parent() const
-{
-    return m_parent;
-}
-
-void LayerChromium::setNeedsDisplayRect(const FloatRect& dirtyRect)
-{
-    m_updateRect.unite(dirtyRect);
-
-    // Simply mark the contents as dirty. For non-root layers, the call to
-    // setNeedsCommit will schedule a fresh compositing pass.
-    // For the root layer, setNeedsCommit has no effect.
-    if (!dirtyRect.isEmpty())
-        m_needsDisplay = true;
-
-    setNeedsCommit();
-}
-
-bool LayerChromium::descendantIsFixedToContainerLayer() const
-{
-    for (size_t i = 0; i < m_children.size(); ++i) {
-        if (m_children[i]->fixedToContainerLayer() || m_children[i]->descendantIsFixedToContainerLayer())
-            return true;
-    }
-    return false;
-}
-
-void LayerChromium::setIsContainerForFixedPositionLayers(bool isContainerForFixedPositionLayers)
-{
-    if (m_isContainerForFixedPositionLayers == isContainerForFixedPositionLayers)
-        return;
-    m_isContainerForFixedPositionLayers = isContainerForFixedPositionLayers;
-
-    if (m_layerTreeHost && m_layerTreeHost->commitRequested())
-        return;
-
-    // Only request a commit if we have a fixed positioned descendant.
-    if (descendantIsFixedToContainerLayer())
-        setNeedsCommit();
-}
-
-void LayerChromium::setFixedToContainerLayer(bool fixedToContainerLayer)
-{
-    if (m_fixedToContainerLayer == fixedToContainerLayer)
-        return;
-    m_fixedToContainerLayer = fixedToContainerLayer;
-    setNeedsCommit();
-}
-
-void LayerChromium::pushPropertiesTo(CCLayerImpl* layer)
-{
-    layer->setAnchorPoint(m_anchorPoint);
-    layer->setAnchorPointZ(m_anchorPointZ);
-    layer->setBackgroundColor(m_backgroundColor);
-    layer->setBounds(m_bounds);
-    layer->setContentBounds(contentBounds());
-    layer->setDebugBorderColor(m_debugBorderColor);
-    layer->setDebugBorderWidth(m_debugBorderWidth);
-    layer->setDebugName(m_debugName.isolatedCopy()); // We have to use isolatedCopy() here to safely pass ownership to another thread.
-    layer->setDoubleSided(m_doubleSided);
-    layer->setDrawCheckerboardForMissingTiles(m_drawCheckerboardForMissingTiles);
-    layer->setForceRenderSurface(m_forceRenderSurface);
-    layer->setDrawsContent(drawsContent());
-    layer->setFilters(filters());
-    layer->setBackgroundFilters(backgroundFilters());
-    layer->setUseLCDText(m_useLCDText);
-    layer->setMasksToBounds(m_masksToBounds);
-    layer->setScrollable(m_scrollable);
-    layer->setShouldScrollOnMainThread(m_shouldScrollOnMainThread);
-    layer->setHaveWheelEventHandlers(m_haveWheelEventHandlers);
-    // Copying a Region is more expensive than most layer properties, since it involves copying two Vectors that may be
-    // arbitrarily large depending on page content, so we only push the property if it's changed.
-    if (m_nonFastScrollableRegionChanged) {
-        layer->setNonFastScrollableRegion(m_nonFastScrollableRegion);
-        m_nonFastScrollableRegionChanged = false;
-    }
-    layer->setOpaque(m_opaque);
-    if (!opacityIsAnimating())
-        layer->setOpacity(m_opacity);
-    layer->setPosition(m_position);
-    layer->setIsContainerForFixedPositionLayers(m_isContainerForFixedPositionLayers);
-    layer->setFixedToContainerLayer(m_fixedToContainerLayer);
-    layer->setPreserves3D(preserves3D());
-    layer->setUseParentBackfaceVisibility(m_useParentBackfaceVisibility);
-    layer->setScrollPosition(m_scrollPosition);
-    layer->setMaxScrollPosition(m_maxScrollPosition);
-    layer->setSublayerTransform(m_sublayerTransform);
-    if (!transformIsAnimating())
-        layer->setTransform(m_transform);
-
-    // If the main thread commits multiple times before the impl thread actually draws, then damage tracking
-    // will become incorrect if we simply clobber the updateRect here. The CCLayerImpl's updateRect needs to
-    // accumulate (i.e. union) any update changes that have occurred on the main thread.
-    m_updateRect.uniteIfNonZero(layer->updateRect());
-    layer->setUpdateRect(m_updateRect);
-
-    layer->setScrollDelta(layer->scrollDelta() - layer->sentScrollDelta());
-    layer->setSentScrollDelta(IntSize());
-
-    layer->setStackingOrderChanged(m_stackingOrderChanged);
-
-    if (maskLayer())
-        maskLayer()->pushPropertiesTo(layer->maskLayer());
-    if (replicaLayer())
-        replicaLayer()->pushPropertiesTo(layer->replicaLayer());
-
-    m_layerAnimationController->pushAnimationUpdatesTo(layer->layerAnimationController());
-
-    // Reset any state that should be cleared for the next update.
-    m_stackingOrderChanged = false;
-    m_updateRect = FloatRect();
-}
-
-PassOwnPtr<CCLayerImpl> LayerChromium::createCCLayerImpl()
-{
-    return CCLayerImpl::create(m_layerId);
-}
-
-void LayerChromium::setDebugBorderColor(SkColor color)
-{
-    m_debugBorderColor = color;
-    setNeedsCommit();
-}
-
-void LayerChromium::setDebugBorderWidth(float width)
-{
-    m_debugBorderWidth = width;
-    setNeedsCommit();
-}
-
-void LayerChromium::setDebugName(const String& debugName)
-{
-    m_debugName = debugName;
-    setNeedsCommit();
-}
-
-void LayerChromium::setContentsScale(float contentsScale)
-{
-    if (!needsContentsScale() || m_contentsScale == contentsScale)
-        return;
-    m_contentsScale = contentsScale;
-
-    setNeedsDisplay();
-}
-
-void LayerChromium::setBoundsContainPageScale(bool boundsContainPageScale)
-{
-    if (boundsContainPageScale == m_boundsContainPageScale)
-        return;
-
-    m_boundsContainPageScale = boundsContainPageScale;
-    setNeedsDisplay();
-}
-
-void LayerChromium::createRenderSurface()
-{
-    ASSERT(!m_renderSurface);
-    m_renderSurface = adoptPtr(new RenderSurfaceChromium(this));
-    setRenderTarget(this);
-}
-
-bool LayerChromium::descendantDrawsContent()
-{
-    for (size_t i = 0; i < m_children.size(); ++i) {
-        if (m_children[i]->drawsContent() || m_children[i]->descendantDrawsContent())
-            return true;
-    }
-    return false;
-}
-
-void LayerChromium::setOpacityFromAnimation(float opacity)
-{
-    // This is called due to an ongoing accelerated animation. Since this animation is
-    // also being run on the impl thread, there is no need to request a commit to push
-    // this value over, so set the value directly rather than calling setOpacity.
-    m_opacity = opacity;
-}
-
-void LayerChromium::setTransformFromAnimation(const WebTransformationMatrix& transform)
-{
-    // This is called due to an ongoing accelerated animation. Since this animation is
-    // also being run on the impl thread, there is no need to request a commit to push
-    // this value over, so set this value directly rather than calling setTransform.
-    m_transform = transform;
-}
-
-bool LayerChromium::addAnimation(PassOwnPtr<CCActiveAnimation> animation)
-{
-    if (!CCSettings::acceleratedAnimationEnabled())
-        return false;
-
-    m_layerAnimationController->addAnimation(animation);
-    if (m_layerTreeHost) {
-        m_layerTreeHost->didAddAnimation();
-        setNeedsCommit();
-    }
-    return true;
-}
-
-void LayerChromium::pauseAnimation(int animationId, double timeOffset)
-{
-    m_layerAnimationController->pauseAnimation(animationId, timeOffset);
-    setNeedsCommit();
-}
-
-void LayerChromium::removeAnimation(int animationId)
-{
-    m_layerAnimationController->removeAnimation(animationId);
-    setNeedsCommit();
-}
-
-void LayerChromium::suspendAnimations(double monotonicTime)
-{
-    m_layerAnimationController->suspendAnimations(monotonicTime);
-    setNeedsCommit();
-}
-
-void LayerChromium::resumeAnimations(double monotonicTime)
-{
-    m_layerAnimationController->resumeAnimations(monotonicTime);
-    setNeedsCommit();
-}
-
-void LayerChromium::setLayerAnimationController(PassOwnPtr<CCLayerAnimationController> layerAnimationController)
-{
-    m_layerAnimationController = layerAnimationController;
-    if (m_layerAnimationController) {
-        m_layerAnimationController->setClient(this);
-        m_layerAnimationController->setForceSync();
-    }
-    setNeedsCommit();
-}
-
-PassOwnPtr<CCLayerAnimationController> LayerChromium::releaseLayerAnimationController()
-{
-    OwnPtr<CCLayerAnimationController> toReturn = m_layerAnimationController.release();
-    m_layerAnimationController = CCLayerAnimationController::create(this);
-    return toReturn.release();
-}
-
-bool LayerChromium::hasActiveAnimation() const
-{
-    return m_layerAnimationController->hasActiveAnimation();
-}
-
-void LayerChromium::notifyAnimationStarted(const CCAnimationEvent& event, double wallClockTime)
-{
-    m_layerAnimationController->notifyAnimationStarted(event);
-    if (m_layerAnimationDelegate)
-        m_layerAnimationDelegate->notifyAnimationStarted(wallClockTime);
-}
-
-void LayerChromium::notifyAnimationFinished(double wallClockTime)
-{
-    if (m_layerAnimationDelegate)
-        m_layerAnimationDelegate->notifyAnimationFinished(wallClockTime);
-}
-
-Region LayerChromium::visibleContentOpaqueRegion() const
-{
-    if (opaque())
-        return visibleContentRect();
-    return Region();
-}
-
-void sortLayers(Vector<RefPtr<LayerChromium> >::iterator, Vector<RefPtr<LayerChromium> >::iterator, void*)
-{
-    // Currently we don't use z-order to decide what to paint, so there's no need to actually sort LayerChromiums.
-}
-
-}
-#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/Source/WebCore/platform/graphics/chromium/LayerChromium.h b/Source/WebCore/platform/graphics/chromium/LayerChromium.h
deleted file mode 100644 (file)
index ee0ea77..0000000
+++ /dev/null
@@ -1,403 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#ifndef LayerChromium_h
-#define LayerChromium_h
-
-#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 <public/WebFilterOperations.h>
-#include <public/WebTransformationMatrix.h>
-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
-#include <wtf/PassRefPtr.h>
-#include <wtf/RefCounted.h>
-#include <wtf/Vector.h>
-#include <wtf/text/StringHash.h>
-#include <wtf/text/WTFString.h>
-
-namespace WebKit {
-class WebAnimationDelegate;
-class WebLayerScrollClient;
-}
-
-namespace WebCore {
-
-class CCActiveAnimation;
-struct CCAnimationEvent;
-class CCLayerAnimationDelegate;
-class CCLayerImpl;
-class CCLayerTreeHost;
-class CCTextureUpdateQueue;
-class ScrollbarLayerChromium;
-struct CCAnimationEvent;
-struct CCRenderingStats;
-
-// Base class for composited layers. Special layer types are derived from
-// this class.
-class LayerChromium : public RefCounted<LayerChromium>, public CCLayerAnimationControllerClient {
-public:
-    static PassRefPtr<LayerChromium> create();
-
-    virtual ~LayerChromium();
-
-    // CCLayerAnimationControllerClient implementation
-    virtual int id() const OVERRIDE { return m_layerId; }
-    virtual void setOpacityFromAnimation(float) OVERRIDE;
-    virtual float opacity() const OVERRIDE { return m_opacity; }
-    virtual void setTransformFromAnimation(const WebKit::WebTransformationMatrix&) OVERRIDE;
-    // A layer's transform operates layer space. That is, entirely in logical,
-    // non-page-scaled pixels (that is, they have page zoom baked in, but not page scale).
-    // The root layer is a special case -- it operates in physical pixels.
-    virtual const WebKit::WebTransformationMatrix& transform() const OVERRIDE { return m_transform; }
-
-    LayerChromium* rootLayer();
-    LayerChromium* parent() const;
-    void addChild(PassRefPtr<LayerChromium>);
-    void insertChild(PassRefPtr<LayerChromium>, size_t index);
-    void replaceChild(LayerChromium* reference, PassRefPtr<LayerChromium> newLayer);
-    void removeFromParent();
-    void removeAllChildren();
-    void setChildren(const Vector<RefPtr<LayerChromium> >&);
-    const Vector<RefPtr<LayerChromium> >& children() const { return m_children; }
-
-    void setAnchorPoint(const FloatPoint&);
-    FloatPoint anchorPoint() const { return m_anchorPoint; }
-
-    void setAnchorPointZ(float);
-    float anchorPointZ() const { return m_anchorPointZ; }
-
-    void setBackgroundColor(SkColor);
-    SkColor backgroundColor() const { return m_backgroundColor; }
-
-    // A layer's bounds are in logical, non-page-scaled pixels (however, the
-    // root layer's bounds are in physical pixels).
-    void setBounds(const IntSize&);
-    const IntSize& bounds() const { return m_bounds; }
-    virtual IntSize contentBounds() const { return bounds(); }
-
-    void setMasksToBounds(bool);
-    bool masksToBounds() const { return m_masksToBounds; }
-
-    void setMaskLayer(LayerChromium*);
-    LayerChromium* maskLayer() const { return m_maskLayer.get(); }
-
-    virtual void setNeedsDisplayRect(const FloatRect& dirtyRect);
-    void setNeedsDisplay() { setNeedsDisplayRect(FloatRect(FloatPoint(), bounds())); }
-    virtual bool needsDisplay() const { return m_needsDisplay; }
-
-    void setOpacity(float);
-    bool opacityIsAnimating() const;
-
-    void setFilters(const WebKit::WebFilterOperations&);
-    const WebKit::WebFilterOperations& filters() const { return m_filters; }
-
-    // Background filters are filters applied to what is behind this layer, when they are viewed through non-opaque
-    // regions in this layer. They are used through the WebLayer interface, and are not exposed to HTML.
-    void setBackgroundFilters(const WebKit::WebFilterOperations&);
-    const WebKit::WebFilterOperations& backgroundFilters() const { return m_backgroundFilters; }
-
-    virtual void setOpaque(bool);
-    bool opaque() const { return m_opaque; }
-
-    void setPosition(const FloatPoint&);
-    FloatPoint position() const { return m_position; }
-
-    void setIsContainerForFixedPositionLayers(bool);
-    bool isContainerForFixedPositionLayers() const { return m_isContainerForFixedPositionLayers; }
-
-    void setFixedToContainerLayer(bool);
-    bool fixedToContainerLayer() const { return m_fixedToContainerLayer; }
-
-    void setSublayerTransform(const WebKit::WebTransformationMatrix&);
-    const WebKit::WebTransformationMatrix& sublayerTransform() const { return m_sublayerTransform; }
-
-    void setTransform(const WebKit::WebTransformationMatrix&);
-    bool transformIsAnimating() const;
-
-    const IntRect& visibleContentRect() const { return m_visibleContentRect; }
-    void setVisibleContentRect(const IntRect& visibleContentRect) { m_visibleContentRect = visibleContentRect; }
-
-    void setScrollPosition(const IntPoint&);
-    const IntPoint& scrollPosition() const { return m_scrollPosition; }
-
-    void setMaxScrollPosition(const IntSize&);
-    const IntSize& maxScrollPosition() const { return m_maxScrollPosition; }
-
-    void setScrollable(bool);
-    bool scrollable() const { return m_scrollable; }
-    void setShouldScrollOnMainThread(bool);
-    void setHaveWheelEventHandlers(bool);
-    const Region& nonFastScrollableRegion() { return m_nonFastScrollableRegion; }
-    void setNonFastScrollableRegion(const Region&);
-    void setNonFastScrollableRegionChanged() { m_nonFastScrollableRegionChanged = true; }
-    void setLayerScrollClient(WebKit::WebLayerScrollClient* layerScrollClient) { m_layerScrollClient = layerScrollClient; }
-
-    void setDrawCheckerboardForMissingTiles(bool);
-    bool drawCheckerboardForMissingTiles() const { return m_drawCheckerboardForMissingTiles; }
-
-    bool forceRenderSurface() const { return m_forceRenderSurface; }
-    void setForceRenderSurface(bool);
-
-    IntSize scrollDelta() const { return IntSize(); }
-
-    float pageScaleDelta() const { return 1; }
-
-    void setDoubleSided(bool);
-    bool doubleSided() const { return m_doubleSided; }
-
-    void setPreserves3D(bool preserve3D) { m_preserves3D = preserve3D; }
-    bool preserves3D() const { return m_preserves3D; }
-
-    void setUseParentBackfaceVisibility(bool useParentBackfaceVisibility) { m_useParentBackfaceVisibility = useParentBackfaceVisibility; }
-    bool useParentBackfaceVisibility() const { return m_useParentBackfaceVisibility; }
-
-    virtual void setUseLCDText(bool);
-    bool useLCDText() const { return m_useLCDText; }
-
-    virtual void setLayerTreeHost(CCLayerTreeHost*);
-
-    void setIsDrawable(bool);
-
-    void setReplicaLayer(LayerChromium*);
-    LayerChromium* replicaLayer() const { return m_replicaLayer.get(); }
-
-    bool hasMask() const { return m_maskLayer; }
-    bool hasReplica() const { return m_replicaLayer; }
-    bool replicaHasMask() const { return m_replicaLayer && (m_maskLayer || m_replicaLayer->m_maskLayer); }
-
-    // These methods typically need to be overwritten by derived classes.
-    virtual bool drawsContent() const { return m_isDrawable; }
-    virtual void update(CCTextureUpdateQueue&, const CCOcclusionTracker*, CCRenderingStats&) { }
-    virtual bool needMoreUpdates() { return false; }
-    virtual void setIsMask(bool) { }
-    virtual void bindContentsTexture() { }
-    virtual bool needsContentsScale() const { return false; }
-
-    void setDebugBorderColor(SkColor);
-    void setDebugBorderWidth(float);
-    void setDebugName(const String&);
-
-    virtual void pushPropertiesTo(CCLayerImpl*);
-
-    void clearRenderSurface() { m_renderSurface.clear(); }
-    RenderSurfaceChromium* renderSurface() const { return m_renderSurface.get(); }
-    void createRenderSurface();
-
-    float drawOpacity() const { return m_drawOpacity; }
-    void setDrawOpacity(float opacity) { m_drawOpacity = opacity; }
-
-    bool drawOpacityIsAnimating() const { return m_drawOpacityIsAnimating; }
-    void setDrawOpacityIsAnimating(bool drawOpacityIsAnimating) { m_drawOpacityIsAnimating = drawOpacityIsAnimating; }
-
-    LayerChromium* renderTarget() const { ASSERT(!m_renderTarget || m_renderTarget->renderSurface()); return m_renderTarget; }
-    void setRenderTarget(LayerChromium* target) { m_renderTarget = target; }
-
-    bool drawTransformIsAnimating() const { return m_drawTransformIsAnimating; }
-    void setDrawTransformIsAnimating(bool animating) { m_drawTransformIsAnimating = animating; }
-    bool screenSpaceTransformIsAnimating() const { return m_screenSpaceTransformIsAnimating; }
-    void setScreenSpaceTransformIsAnimating(bool animating) { m_screenSpaceTransformIsAnimating = animating; }
-
-    // This moves from layer space, with origin in the center to target space with origin in the top left.
-    // That is, it converts from logical, non-page-scaled, to target pixels (and if the target is the
-    // root render surface, then this converts to physical pixels).
-    const WebKit::WebTransformationMatrix& drawTransform() const { return m_drawTransform; }
-    void setDrawTransform(const WebKit::WebTransformationMatrix& matrix) { m_drawTransform = matrix; }
-    // This moves from content space, with origin the top left to screen space with origin in the top left.
-    // It converts logical, non-page-scaled pixels to physical pixels.
-    const WebKit::WebTransformationMatrix& screenSpaceTransform() const { return m_screenSpaceTransform; }
-    void setScreenSpaceTransform(const WebKit::WebTransformationMatrix& matrix) { m_screenSpaceTransform = matrix; }
-    const IntRect& drawableContentRect() const { return m_drawableContentRect; }
-    void setDrawableContentRect(const IntRect& rect) { m_drawableContentRect = rect; }
-    // The contentsScale converts from logical, non-page-scaled pixels to target pixels.
-    // The contentsScale is 1 for the root layer as it is already in physical pixels.
-    float contentsScale() const { return m_contentsScale; }
-    void setContentsScale(float);
-
-    // When true, the layer's contents are not scaled by the current page scale factor.
-    void setBoundsContainPageScale(bool);
-    bool boundsContainPageScale() const { return m_boundsContainPageScale; }
-
-    // Returns true if any of the layer's descendants has content to draw.
-    bool descendantDrawsContent();
-
-    CCLayerTreeHost* layerTreeHost() const { return m_layerTreeHost; }
-
-    // Set the priority of all desired textures in this layer.
-    virtual void setTexturePriorities(const CCPriorityCalculator&) { }
-
-    bool addAnimation(PassOwnPtr<CCActiveAnimation>);
-    void pauseAnimation(int animationId, double timeOffset);
-    void removeAnimation(int animationId);
-
-    void suspendAnimations(double monotonicTime);
-    void resumeAnimations(double monotonicTime);
-
-    CCLayerAnimationController* layerAnimationController() { return m_layerAnimationController.get(); }
-    void setLayerAnimationController(PassOwnPtr<CCLayerAnimationController>);
-    PassOwnPtr<CCLayerAnimationController> releaseLayerAnimationController();
-
-    void setLayerAnimationDelegate(WebKit::WebAnimationDelegate* layerAnimationDelegate) { m_layerAnimationDelegate = layerAnimationDelegate; }
-
-    bool hasActiveAnimation() const;
-
-    virtual void notifyAnimationStarted(const CCAnimationEvent&, double wallClockTime);
-    virtual void notifyAnimationFinished(double wallClockTime);
-
-    virtual Region visibleContentOpaqueRegion() const;
-
-    virtual ScrollbarLayerChromium* toScrollbarLayerChromium() { return 0; }
-
-protected:
-    friend class CCLayerImpl;
-    friend class TreeSynchronizer;
-
-    LayerChromium();
-
-    void setNeedsCommit();
-
-    // This flag is set when layer need repainting/updating.
-    bool m_needsDisplay;
-
-    // Tracks whether this layer may have changed stacking order with its siblings.
-    bool m_stackingOrderChanged;
-
-    // The update rect is the region of the compositor resource that was actually updated by the compositor.
-    // For layers that may do updating outside the compositor's control (i.e. plugin layers), this information
-    // is not available and the update rect will remain empty.
-    // Note this rect is in layer space (not content space).
-    FloatRect m_updateRect;
-
-    RefPtr<LayerChromium> m_maskLayer;
-
-    // Constructs a CCLayerImpl of the correct runtime type for this LayerChromium type.
-    virtual PassOwnPtr<CCLayerImpl> createCCLayerImpl();
-    int m_layerId;
-
-private:
-    void setParent(LayerChromium*);
-    bool hasAncestor(LayerChromium*) const;
-    bool descendantIsFixedToContainerLayer() const;
-
-    size_t numChildren() const { return m_children.size(); }
-
-    // Returns the index of the child or -1 if not found.
-    int indexOfChild(const LayerChromium*);
-
-    // This should only be called from removeFromParent.
-    void removeChild(LayerChromium*);
-
-    Vector<RefPtr<LayerChromium> > m_children;
-    LayerChromium* m_parent;
-
-    // LayerChromium instances have a weak pointer to their CCLayerTreeHost.
-    // This pointer value is nil when a LayerChromium is not in a tree and is
-    // updated via setLayerTreeHost() if a layer moves between trees.
-    CCLayerTreeHost* m_layerTreeHost;
-
-    OwnPtr<CCLayerAnimationController> m_layerAnimationController;
-
-    // Layer properties.
-    IntSize m_bounds;
-
-    // Uses layer's content space.
-    IntRect m_visibleContentRect;
-
-    IntPoint m_scrollPosition;
-    IntSize m_maxScrollPosition;
-    bool m_scrollable;
-    bool m_shouldScrollOnMainThread;
-    bool m_haveWheelEventHandlers;
-    Region m_nonFastScrollableRegion;
-    bool m_nonFastScrollableRegionChanged;
-    FloatPoint m_position;
-    FloatPoint m_anchorPoint;
-    SkColor m_backgroundColor;
-    SkColor m_debugBorderColor;
-    float m_debugBorderWidth;
-    String m_debugName;
-    float m_opacity;
-    WebKit::WebFilterOperations m_filters;
-    WebKit::WebFilterOperations m_backgroundFilters;
-    float m_anchorPointZ;
-    bool m_isContainerForFixedPositionLayers;
-    bool m_fixedToContainerLayer;
-    bool m_isDrawable;
-    bool m_masksToBounds;
-    bool m_opaque;
-    bool m_doubleSided;
-    bool m_useLCDText;
-    bool m_preserves3D;
-    bool m_useParentBackfaceVisibility;
-    bool m_drawCheckerboardForMissingTiles;
-    bool m_forceRenderSurface;
-
-    WebKit::WebTransformationMatrix m_transform;
-    WebKit::WebTransformationMatrix m_sublayerTransform;
-
-    // Replica layer used for reflections.
-    RefPtr<LayerChromium> m_replicaLayer;
-
-    // Transient properties.
-    OwnPtr<RenderSurfaceChromium> m_renderSurface;
-    float m_drawOpacity;
-    bool m_drawOpacityIsAnimating;
-
-    LayerChromium* m_renderTarget;
-
-    WebKit::WebTransformationMatrix m_drawTransform;
-    WebKit::WebTransformationMatrix m_screenSpaceTransform;
-    bool m_drawTransformIsAnimating;
-    bool m_screenSpaceTransformIsAnimating;
-
-    // Uses target surface space.
-    IntRect m_drawableContentRect;
-    float m_contentsScale;
-    bool m_boundsContainPageScale;
-
-    WebKit::WebAnimationDelegate* m_layerAnimationDelegate;
-    WebKit::WebLayerScrollClient* m_layerScrollClient;
-};
-
-void sortLayers(Vector<RefPtr<LayerChromium> >::iterator, Vector<RefPtr<LayerChromium> >::iterator, void*);
-
-}
-#endif // USE(ACCELERATED_COMPOSITING)
-
-#endif
diff --git a/Source/WebCore/platform/graphics/chromium/LayerTextureSubImage.cpp b/Source/WebCore/platform/graphics/chromium/LayerTextureSubImage.cpp
deleted file mode 100644 (file)
index 5c8960e..0000000
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-
-#if USE(ACCELERATED_COMPOSITING)
-
-#include "LayerTextureSubImage.h"
-
-#include "CCRendererGL.h" // For the GLC() macro.
-#include "Extensions3DChromium.h"
-#include "TraceEvent.h"
-#include <public/WebGraphicsContext3D.h>
-
-using WebKit::WebGraphicsContext3D;
-
-namespace WebCore {
-
-LayerTextureSubImage::LayerTextureSubImage(bool useMapTexSubImage)
-    : m_useMapTexSubImage(useMapTexSubImage)
-    , m_subImageSize(0)
-{
-}
-
-LayerTextureSubImage::~LayerTextureSubImage()
-{
-}
-
-void LayerTextureSubImage::upload(const uint8_t* image, const IntRect& imageRect,
-                                  const IntRect& sourceRect, const IntSize& destOffset,
-                                  GC3Denum format, WebGraphicsContext3D* context)
-{
-    if (m_useMapTexSubImage)
-        uploadWithMapTexSubImage(image, imageRect, sourceRect, destOffset, format, context);
-    else
-        uploadWithTexSubImage(image, imageRect, sourceRect, destOffset, format, context);
-}
-
-void LayerTextureSubImage::uploadWithTexSubImage(const uint8_t* image, const IntRect& imageRect,
-                                                 const IntRect& sourceRect, const IntSize& destOffset,
-                                                 GC3Denum format, WebGraphicsContext3D* context)
-{
-    TRACE_EVENT0("cc", "LayerTextureSubImage::uploadWithTexSubImage");
-
-    // Offset from image-rect to source-rect.
-    IntPoint offset(sourceRect.x() - imageRect.x(), sourceRect.y() - imageRect.y());
-
-    const uint8_t* pixelSource;
-    if (imageRect.width() == sourceRect.width() && !offset.x())
-        pixelSource = &image[4 * offset.y() * imageRect.width()];
-    else {
-        size_t neededSize = 4 * sourceRect.width() * sourceRect.height();
-        if (m_subImageSize < neededSize) {
-          m_subImage = adoptArrayPtr(new uint8_t[neededSize]);
-          m_subImageSize = neededSize;
-        }
-        // Strides not equal, so do a row-by-row memcpy from the
-        // paint results into a temp buffer for uploading.
-        for (int row = 0; row < sourceRect.height(); ++row)
-            memcpy(&m_subImage[sourceRect.width() * 4 * row],
-                   &image[4 * (offset.x() + (offset.y() + row) * imageRect.width())],
-                   sourceRect.width() * 4);
-
-        pixelSource = &m_subImage[0];
-    }
-
-    GLC(context, context->texSubImage2D(GraphicsContext3D::TEXTURE_2D, 0, destOffset.width(), destOffset.height(), sourceRect.width(), sourceRect.height(), format, GraphicsContext3D::UNSIGNED_BYTE, pixelSource));
-}
-
-void LayerTextureSubImage::uploadWithMapTexSubImage(const uint8_t* image, const IntRect& imageRect,
-                                                    const IntRect& sourceRect, const IntSize& destOffset,
-                                                    GC3Denum format, WebGraphicsContext3D* context)
-{
-    TRACE_EVENT0("cc", "LayerTextureSubImage::uploadWithMapTexSubImage");
-    // Offset from image-rect to source-rect.
-    IntPoint offset(sourceRect.x() - imageRect.x(), sourceRect.y() - imageRect.y());
-
-    // Upload tile data via a mapped transfer buffer
-    uint8_t* pixelDest = static_cast<uint8_t*>(context->mapTexSubImage2DCHROMIUM(GraphicsContext3D::TEXTURE_2D, 0, destOffset.width(), destOffset.height(), sourceRect.width(), sourceRect.height(), format, GraphicsContext3D::UNSIGNED_BYTE, Extensions3DChromium::WRITE_ONLY));
-
-    if (!pixelDest) {
-        uploadWithTexSubImage(image, imageRect, sourceRect, destOffset, format, context);
-        return;
-    }
-
-    unsigned int componentsPerPixel;
-    unsigned int bytesPerComponent;
-    if (!GraphicsContext3D::computeFormatAndTypeParameters(format, GraphicsContext3D::UNSIGNED_BYTE, &componentsPerPixel, &bytesPerComponent)) {
-        ASSERT_NOT_REACHED();
-        return;
-    }
-
-    if (imageRect.width() == sourceRect.width() && !offset.x())
-        memcpy(pixelDest, &image[offset.y() * imageRect.width() * componentsPerPixel * bytesPerComponent], imageRect.width() * sourceRect.height() * componentsPerPixel * bytesPerComponent);
-    else {
-        // Strides not equal, so do a row-by-row memcpy from the
-        // paint results into the pixelDest
-        for (int row = 0; row < sourceRect.height(); ++row)
-            memcpy(&pixelDest[sourceRect.width() * row * componentsPerPixel * bytesPerComponent],
-                   &image[4 * (offset.x() + (offset.y() + row) * imageRect.width())],
-                   sourceRect.width() * componentsPerPixel * bytesPerComponent);
-    }
-    GLC(context, context->unmapTexSubImage2DCHROMIUM(pixelDest));
-}
-
-} // namespace WebCore
-
-#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/Source/WebCore/platform/graphics/chromium/LayerTextureSubImage.h b/Source/WebCore/platform/graphics/chromium/LayerTextureSubImage.h
deleted file mode 100644 (file)
index e2a739a..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#ifndef LayerTextureSubImage_h
-#define LayerTextureSubImage_h
-
-#if USE(ACCELERATED_COMPOSITING)
-
-#include "GraphicsTypes3D.h"
-#include "IntRect.h"
-#include "IntSize.h"
-#include <wtf/OwnArrayPtr.h>
-
-namespace WebKit {
-class WebGraphicsContext3D;
-}
-
-namespace WebCore {
-
-class LayerTextureSubImage {
-public:
-    explicit LayerTextureSubImage(bool useMapSubForUpload);
-    ~LayerTextureSubImage();
-
-    void upload(const uint8_t* image, const IntRect& imageRect,
-                const IntRect& sourceRect, const IntSize& destOffset,
-                GC3Denum format, WebKit::WebGraphicsContext3D*);
-
-private:
-    void uploadWithTexSubImage(const uint8_t* image, const IntRect& imageRect,
-                               const IntRect& sourceRect, const IntSize& destOffset,
-                               GC3Denum format, WebKit::WebGraphicsContext3D*);
-    void uploadWithMapTexSubImage(const uint8_t* image, const IntRect& imageRect,
-                                  const IntRect& sourceRect, const IntSize& destOffset,
-                                  GC3Denum format, WebKit::WebGraphicsContext3D*);
-
-    bool m_useMapTexSubImage;
-    size_t m_subImageSize;
-    OwnArrayPtr<uint8_t> m_subImage;
-};
-
-} // namespace WebCore
-#endif // USE(ACCELERATED_COMPOSITING)
-#endif // LayerTextureSubImage_h
diff --git a/Source/WebCore/platform/graphics/chromium/LayerTextureUpdater.h b/Source/WebCore/platform/graphics/chromium/LayerTextureUpdater.h
deleted file mode 100644 (file)
index 1ad61c8..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#ifndef LayerTextureUpdater_h
-#define LayerTextureUpdater_h
-
-#if USE(ACCELERATED_COMPOSITING)
-
-#include "CCPrioritizedTexture.h"
-#include "GraphicsTypes3D.h"
-#include <wtf/RefCounted.h>
-
-namespace WebCore {
-
-class IntRect;
-class IntSize;
-class TextureManager;
-struct CCRenderingStats;
-
-class LayerTextureUpdater : public RefCounted<LayerTextureUpdater> {
-public:
-    // Allows texture uploaders to store per-tile resources.
-    class Texture {
-    public:
-        virtual ~Texture() { }
-
-        CCPrioritizedTexture* texture() { return m_texture.get(); }
-        void swapTextureWith(OwnPtr<CCPrioritizedTexture>& texture) { m_texture.swap(texture); }
-        virtual void prepareRect(const IntRect& /* sourceRect */, CCRenderingStats&) { }
-        virtual void updateRect(CCResourceProvider*, const IntRect& sourceRect, const IntSize& destOffset) = 0;
-    protected:
-        explicit Texture(PassOwnPtr<CCPrioritizedTexture> texture) : m_texture(texture) { }
-
-    private:
-        OwnPtr<CCPrioritizedTexture> m_texture;
-    };
-
-    virtual ~LayerTextureUpdater() { }
-
-    enum SampledTexelFormat {
-        SampledTexelFormatRGBA,
-        SampledTexelFormatBGRA,
-        SampledTexelFormatInvalid,
-    };
-    virtual PassOwnPtr<Texture> createTexture(CCPrioritizedTextureManager*) = 0;
-    // Returns the format of the texel uploaded by this interface.
-    // This format should not be confused by texture internal format.
-    // This format specifies the component order in the sampled texel.
-    // If the format is TexelFormatBGRA, vec4.x is blue and vec4.z is red.
-    virtual SampledTexelFormat sampledTexelFormat(GC3Denum textureFormat) = 0;
-    // The |resultingOpaqueRect| gives back a region of the layer that was painted opaque. If the layer is marked opaque in the updater,
-    // then this region should be ignored in preference for the entire layer's area.
-    virtual void prepareToUpdate(const IntRect& contentRect, const IntSize& tileSize, float contentsWidthScale, float contentsHeightScale, IntRect& resultingOpaqueRect, CCRenderingStats&) { }
-
-    // Set true by the layer when it is known that the entire output is going to be opaque.
-    virtual void setOpaque(bool) { }
-};
-
-} // namespace WebCore
-#endif // USE(ACCELERATED_COMPOSITING)
-#endif // LayerTextureUpdater_h
diff --git a/Source/WebCore/platform/graphics/chromium/PlatformColor.h b/Source/WebCore/platform/graphics/chromium/PlatformColor.h
deleted file mode 100644 (file)
index a855215..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef PlatformColor_h
-#define PlatformColor_h
-
-#include "Extensions3D.h"
-#include "GraphicsContext3D.h"
-#include "SkTypes.h" 
-#include <public/WebGraphicsContext3D.h>
-
-namespace WebCore {
-
-class PlatformColor {
-public:
-    static GraphicsContext3D::SourceDataFormat format()
-    {
-        return SK_B32_SHIFT ? GraphicsContext3D::SourceFormatRGBA8 : GraphicsContext3D::SourceFormatBGRA8;
-    }
-
-    // Returns the most efficient texture format for this platform.
-    static GC3Denum bestTextureFormat(WebKit::WebGraphicsContext3D* context, bool supportsBGRA8888)
-    {
-        GC3Denum textureFormat = GraphicsContext3D::RGBA;
-        switch (format()) {
-        case GraphicsContext3D::SourceFormatRGBA8:
-            break;
-        case GraphicsContext3D::SourceFormatBGRA8:
-            if (supportsBGRA8888)
-                textureFormat = Extensions3D::BGRA_EXT;
-            break;
-        default:
-            ASSERT_NOT_REACHED();
-            break;
-        }
-        return textureFormat;
-    }
-
-    // Return true if the given texture format has the same component order
-    // as the color on this platform.
-    static bool sameComponentOrder(GC3Denum textureFormat)
-    {
-        switch (format()) {
-        case GraphicsContext3D::SourceFormatRGBA8:
-            return textureFormat == GraphicsContext3D::RGBA;
-        case GraphicsContext3D::SourceFormatBGRA8:
-            return textureFormat == Extensions3D::BGRA_EXT;
-        default:
-            ASSERT_NOT_REACHED();
-            return false;
-        }
-    }
-};
-
-} // namespace WebCore
-
-#endif
diff --git a/Source/WebCore/platform/graphics/chromium/ProgramBinding.cpp b/Source/WebCore/platform/graphics/chromium/ProgramBinding.cpp
deleted file mode 100644 (file)
index ccc1487..0000000
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-
-#if USE(ACCELERATED_COMPOSITING)
-
-#include "ProgramBinding.h"
-
-#include "CCRendererGL.h" // For the GLC() macro.
-#include "GeometryBinding.h"
-#include "GraphicsContext3D.h"
-#include "TraceEvent.h"
-#include <public/WebGraphicsContext3D.h>
-#include <wtf/text/CString.h>
-
-using WebKit::WebGraphicsContext3D;
-
-namespace WebCore {
-
-ProgramBindingBase::ProgramBindingBase()
-    : m_program(0)
-    , m_vertexShaderId(0)
-    , m_fragmentShaderId(0)
-    , m_initialized(false)
-{
-}
-
-ProgramBindingBase::~ProgramBindingBase()
-{
-    // If you hit these asserts, you initialized but forgot to call cleanup().
-    ASSERT(!m_program);
-    ASSERT(!m_vertexShaderId);
-    ASSERT(!m_fragmentShaderId);
-    ASSERT(!m_initialized);
-}
-
-static bool contextLost(WebGraphicsContext3D* context)
-{
-    return (context->getGraphicsResetStatusARB() != GraphicsContext3D::NO_ERROR);
-}
-
-
-void ProgramBindingBase::init(WebGraphicsContext3D* context, const String& vertexShader, const String& fragmentShader)
-{
-    TRACE_EVENT0("cc", "ProgramBindingBase::init");
-    m_vertexShaderId = loadShader(context, GraphicsContext3D::VERTEX_SHADER, vertexShader);
-    if (!m_vertexShaderId) {
-        if (!contextLost(context))
-            LOG_ERROR("Failed to create vertex shader");
-        return;
-    }
-
-    m_fragmentShaderId = loadShader(context, GraphicsContext3D::FRAGMENT_SHADER, fragmentShader);
-    if (!m_fragmentShaderId) {
-        GLC(context, context->deleteShader(m_vertexShaderId));
-        m_vertexShaderId = 0;
-        if (!contextLost(context))
-            LOG_ERROR("Failed to create fragment shader");
-        return;
-    }
-
-    m_program = createShaderProgram(context, m_vertexShaderId, m_fragmentShaderId);
-    ASSERT(m_program || contextLost(context));
-}
-
-void ProgramBindingBase::link(WebGraphicsContext3D* context)
-{
-    GLC(context, context->linkProgram(m_program));
-    cleanupShaders(context);
-#ifndef NDEBUG
-    int linked = 0;
-    GLC(context, context->getProgramiv(m_program, GraphicsContext3D::LINK_STATUS, &linked));
-    if (!linked) {
-        if (!contextLost(context))
-            LOG_ERROR("Failed to link shader program");
-        GLC(context, context->deleteProgram(m_program));
-        return;
-    }
-#endif
-}
-
-void ProgramBindingBase::cleanup(WebGraphicsContext3D* context)
-{
-    m_initialized = false;
-    if (!m_program)
-        return;
-
-    ASSERT(context);
-    GLC(context, context->deleteProgram(m_program));
-    m_program = 0;
-
-    cleanupShaders(context);
-}
-
-unsigned ProgramBindingBase::loadShader(WebGraphicsContext3D* context, unsigned type, const String& shaderSource)
-{
-    unsigned shader = context->createShader(type);
-    if (!shader)
-        return 0;
-    String sourceString(shaderSource);
-    GLC(context, context->shaderSource(shader, sourceString.utf8().data()));
-    GLC(context, context->compileShader(shader));
-#ifndef NDEBUG
-    int compiled = 0;
-    GLC(context, context->getShaderiv(shader, GraphicsContext3D::COMPILE_STATUS, &compiled));
-    if (!compiled) {
-        GLC(context, context->deleteShader(shader));
-        return 0;
-    }
-#endif
-    return shader;
-}
-
-unsigned ProgramBindingBase::createShaderProgram(WebGraphicsContext3D* context, unsigned vertexShader, unsigned fragmentShader)
-{
-    unsigned programObject = context->createProgram();
-    if (!programObject) {
-        if (!contextLost(context))
-            LOG_ERROR("Failed to create shader program");
-        return 0;
-    }
-
-    GLC(context, context->attachShader(programObject, vertexShader));
-    GLC(context, context->attachShader(programObject, fragmentShader));
-
-    // Bind the common attrib locations.
-    GLC(context, context->bindAttribLocation(programObject, GeometryBinding::positionAttribLocation(), "a_position"));
-    GLC(context, context->bindAttribLocation(programObject, GeometryBinding::texCoordAttribLocation(), "a_texCoord"));
-
-    return programObject;
-}
-
-void ProgramBindingBase::cleanupShaders(WebGraphicsContext3D* context)
-{
-    if (m_vertexShaderId) {
-        GLC(context, context->deleteShader(m_vertexShaderId));
-        m_vertexShaderId = 0;
-    }
-    if (m_fragmentShaderId) {
-        GLC(context, context->deleteShader(m_fragmentShaderId));
-        m_fragmentShaderId = 0;
-    }
-}
-
-} // namespace WebCore
-
-#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/Source/WebCore/platform/graphics/chromium/ProgramBinding.h b/Source/WebCore/platform/graphics/chromium/ProgramBinding.h
deleted file mode 100644 (file)
index c2d47df..0000000
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef ProgramBinding_h
-#define ProgramBinding_h
-
-#if USE(ACCELERATED_COMPOSITING)
-
-#include <wtf/text/WTFString.h>
-
-namespace WebKit {
-class WebGraphicsContext3D;
-}
-
-namespace WebCore {
-
-class ProgramBindingBase {
-public:
-    ProgramBindingBase();
-    ~ProgramBindingBase();
-
-    void init(WebKit::WebGraphicsContext3D*, const String& vertexShader, const String& fragmentShader);
-    void link(WebKit::WebGraphicsContext3D*);
-    void cleanup(WebKit::WebGraphicsContext3D*);
-
-    unsigned program() const { ASSERT(m_initialized); return m_program; }
-    bool initialized() const { return m_initialized; }
-
-protected:
-
-    unsigned loadShader(WebKit::WebGraphicsContext3D*, unsigned type, const String& shaderSource);
-    unsigned createShaderProgram(WebKit::WebGraphicsContext3D*, unsigned vertexShader, unsigned fragmentShader);
-    void cleanupShaders(WebKit::WebGraphicsContext3D*);
-
-    unsigned m_program;
-    unsigned m_vertexShaderId;
-    unsigned m_fragmentShaderId;
-    bool m_initialized;
-};
-
-template<class VertexShader, class FragmentShader>
-class ProgramBinding : public ProgramBindingBase {
-public:
-    explicit ProgramBinding(WebKit::WebGraphicsContext3D* context)
-    {
-        ProgramBindingBase::init(context, m_vertexShader.getShaderString(), m_fragmentShader.getShaderString());
-    }
-
-    void initialize(WebKit::WebGraphicsContext3D* context, bool usingBindUniform)
-    {
-        ASSERT(context);
-        ASSERT(m_program);
-        ASSERT(!m_initialized);
-
-        // Need to bind uniforms before linking
-        if (!usingBindUniform)
-            link(context);
-
-        int baseUniformIndex = 0;
-        m_vertexShader.init(context, m_program, usingBindUniform, &baseUniformIndex);
-        m_fragmentShader.init(context, m_program, usingBindUniform, &baseUniformIndex);
-
-        // Link after binding uniforms
-        if (usingBindUniform)
-            link(context);
-
-        m_initialized = true;
-    }
-
-    const VertexShader& vertexShader() const { return m_vertexShader; }
-    const FragmentShader& fragmentShader() const { return m_fragmentShader; }
-
-private:
-
-    VertexShader m_vertexShader;
-    FragmentShader m_fragmentShader;
-};
-
-} // namespace WebCore
-
-#endif // USE(ACCELERATED_COMPOSITING)
-
-#endif
diff --git a/Source/WebCore/platform/graphics/chromium/RateLimiter.cpp b/Source/WebCore/platform/graphics/chromium/RateLimiter.cpp
deleted file mode 100644 (file)
index c9d5f51..0000000
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-
-#if USE(ACCELERATED_COMPOSITING)
-#include "RateLimiter.h"
-
-#include "CCProxy.h"
-#include "CCThread.h"
-#include "TraceEvent.h"
-#include <public/WebGraphicsContext3D.h>
-
-namespace WebCore {
-
-class RateLimiter::Task : public CCThread::Task {
-public:
-    static PassOwnPtr<Task> create(RateLimiter* rateLimiter)
-    {
-        return adoptPtr(new Task(rateLimiter));
-    }
-    virtual ~Task() { }
-
-private:
-    explicit Task(RateLimiter* rateLimiter)
-        : CCThread::Task(this)
-        , m_rateLimiter(rateLimiter)
-    {
-    }
-
-    virtual void performTask() OVERRIDE
-    {
-        m_rateLimiter->rateLimitContext();
-    }
-
-    RefPtr<RateLimiter> m_rateLimiter;
-};
-
-PassRefPtr<RateLimiter> RateLimiter::create(WebKit::WebGraphicsContext3D* context, RateLimiterClient *client)
-{
-    return adoptRef(new RateLimiter(context, client));
-}
-
-RateLimiter::RateLimiter(WebKit::WebGraphicsContext3D* context, RateLimiterClient *client)
-    : m_context(context)
-    , m_active(false)
-    , m_client(client)
-{
-    ASSERT(context);
-}
-
-RateLimiter::~RateLimiter()
-{
-}
-
-void RateLimiter::start()
-{
-    if (m_active)
-        return;
-
-    TRACE_EVENT0("cc", "RateLimiter::start");
-    m_active = true;
-    CCProxy::mainThread()->postTask(RateLimiter::Task::create(this));
-}
-
-void RateLimiter::stop()
-{
-    TRACE_EVENT0("cc", "RateLimiter::stop");
-    m_client = 0;
-}
-
-void RateLimiter::rateLimitContext()
-{
-    if (!m_client)
-        return;
-
-    TRACE_EVENT0("cc", "RateLimiter::rateLimitContext");
-
-    m_active = false;
-    m_client->rateLimit();
-    m_context->rateLimitOffscreenContextCHROMIUM();
-}
-
-}
-#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/Source/WebCore/platform/graphics/chromium/RateLimiter.h b/Source/WebCore/platform/graphics/chromium/RateLimiter.h
deleted file mode 100644 (file)
index 0548fde..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef RateLimiter_h
-#define RateLimiter_h
-
-#if USE(ACCELERATED_COMPOSITING)
-
-#include <wtf/PassRefPtr.h>
-#include <wtf/RefCounted.h>
-
-namespace WebKit {
-class WebGraphicsContext3D;
-}
-
-namespace WebCore {
-
-class RateLimiterClient {
-public:
-    virtual void rateLimit() = 0;
-};
-
-// A RateLimiter can be used to make sure that a single context does not dominate all execution time.
-// To use, construct a RateLimiter class around the context and call start() whenever calls are made on the
-// context outside of normal flow control. RateLimiter will block if the context is too far ahead of the
-// compositor.
-class RateLimiter : public RefCounted<RateLimiter> {
-public:
-    static PassRefPtr<RateLimiter> create(WebKit::WebGraphicsContext3D*, RateLimiterClient*);
-    ~RateLimiter();
-
-    void start();
-
-    // Context and client will not be accessed after stop().
-    void stop();
-
-private:
-    RateLimiter(WebKit::WebGraphicsContext3D*, RateLimiterClient*);
-
-    class Task;
-    friend class Task;
-    void rateLimitContext();
-
-    WebKit::WebGraphicsContext3D* m_context;
-    bool m_active;
-    RateLimiterClient *m_client;
-};
-
-}
-#endif // USE(ACCELERATED_COMPOSITING)
-
-#endif
diff --git a/Source/WebCore/platform/graphics/chromium/RenderSurfaceChromium.cpp b/Source/WebCore/platform/graphics/chromium/RenderSurfaceChromium.cpp
deleted file mode 100644 (file)
index 263b601..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-
-#if USE(ACCELERATED_COMPOSITING)
-
-#include "RenderSurfaceChromium.h"
-
-#include "CCMathUtil.h"
-#include "LayerChromium.h"
-#include <public/WebTransformationMatrix.h>
-#include <wtf/text/CString.h>
-
-using WebKit::WebTransformationMatrix;
-
-namespace WebCore {
-
-RenderSurfaceChromium::RenderSurfaceChromium(LayerChromium* owningLayer)
-    : m_owningLayer(owningLayer)
-    , m_drawOpacity(1)
-    , m_drawOpacityIsAnimating(false)
-    , m_targetSurfaceTransformsAreAnimating(false)
-    , m_screenSpaceTransformsAreAnimating(false)
-    , m_nearestAncestorThatMovesPixels(0)
-{
-}
-
-RenderSurfaceChromium::~RenderSurfaceChromium()
-{
-}
-
-FloatRect RenderSurfaceChromium::drawableContentRect() const
-{
-    FloatRect drawableContentRect = CCMathUtil::mapClippedRect(m_drawTransform, m_contentRect);
-    if (m_owningLayer->hasReplica())
-        drawableContentRect.unite(CCMathUtil::mapClippedRect(m_replicaDrawTransform, m_contentRect));
-    return drawableContentRect;
-}
-
-}
-#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/Source/WebCore/platform/graphics/chromium/RenderSurfaceChromium.h b/Source/WebCore/platform/graphics/chromium/RenderSurfaceChromium.h
deleted file mode 100644 (file)
index 787eaae..0000000
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#ifndef RenderSurfaceChromium_h
-#define RenderSurfaceChromium_h
-
-#if USE(ACCELERATED_COMPOSITING)
-
-#include "FloatRect.h"
-#include "IntRect.h"
-#include <public/WebTransformationMatrix.h>
-#include <wtf/Noncopyable.h>
-
-namespace WebCore {
-
-class LayerChromium;
-
-class RenderSurfaceChromium {
-    WTF_MAKE_NONCOPYABLE(RenderSurfaceChromium);
-public:
-    explicit RenderSurfaceChromium(LayerChromium*);
-    ~RenderSurfaceChromium();
-
-    // Returns the rect that encloses the RenderSurface including any reflection.
-    FloatRect drawableContentRect() const;
-
-    const IntRect& contentRect() const { return m_contentRect; }
-    void setContentRect(const IntRect& contentRect) { m_contentRect = contentRect; }
-
-    float drawOpacity() const { return m_drawOpacity; }
-    void setDrawOpacity(float drawOpacity) { m_drawOpacity = drawOpacity; }
-
-    bool drawOpacityIsAnimating() const { return m_drawOpacityIsAnimating; }
-    void setDrawOpacityIsAnimating(bool drawOpacityIsAnimating) { m_drawOpacityIsAnimating = drawOpacityIsAnimating; }
-
-    // This goes from content space with the origin in the center of the rect being transformed to the target space with the origin in the top left of the
-    // rect being transformed. Position the rect so that the origin is in the center of it before applying this transform.
-    const WebKit::WebTransformationMatrix& drawTransform() const { return m_drawTransform; }
-    void setDrawTransform(const WebKit::WebTransformationMatrix& drawTransform) { m_drawTransform = drawTransform; }
-
-    const WebKit::WebTransformationMatrix& screenSpaceTransform() const { return m_screenSpaceTransform; }
-    void setScreenSpaceTransform(const WebKit::WebTransformationMatrix& screenSpaceTransform) { m_screenSpaceTransform = screenSpaceTransform; }
-
-    const WebKit::WebTransformationMatrix& replicaDrawTransform() const { return m_replicaDrawTransform; }
-    void setReplicaDrawTransform(const WebKit::WebTransformationMatrix& replicaDrawTransform) { m_replicaDrawTransform = replicaDrawTransform; }
-
-    const WebKit::WebTransformationMatrix& replicaScreenSpaceTransform() const { return m_replicaScreenSpaceTransform; }
-    void setReplicaScreenSpaceTransform(const WebKit::WebTransformationMatrix& replicaScreenSpaceTransform) { m_replicaScreenSpaceTransform = replicaScreenSpaceTransform; }
-
-    bool targetSurfaceTransformsAreAnimating() const { return m_targetSurfaceTransformsAreAnimating; }
-    void setTargetSurfaceTransformsAreAnimating(bool animating) { m_targetSurfaceTransformsAreAnimating = animating; }
-    bool screenSpaceTransformsAreAnimating() const { return m_screenSpaceTransformsAreAnimating; }
-    void setScreenSpaceTransformsAreAnimating(bool animating) { m_screenSpaceTransformsAreAnimating = animating; }
-
-    const IntRect& clipRect() const { return m_clipRect; }
-    void setClipRect(const IntRect& clipRect) { m_clipRect = clipRect; }
-
-    void clearLayerList() { m_layerList.clear(); }
-    Vector<RefPtr<LayerChromium> >& layerList() { return m_layerList; }
-
-    void setNearestAncestorThatMovesPixels(RenderSurfaceChromium* surface) { m_nearestAncestorThatMovesPixels = surface; }
-    const RenderSurfaceChromium* nearestAncestorThatMovesPixels() const { return m_nearestAncestorThatMovesPixels; }
-
-private:
-    LayerChromium* m_owningLayer;
-
-    // Uses this surface's space.
-    IntRect m_contentRect;
-
-    float m_drawOpacity;
-    bool m_drawOpacityIsAnimating;
-    WebKit::WebTransformationMatrix m_drawTransform;
-    WebKit::WebTransformationMatrix m_screenSpaceTransform;
-    WebKit::WebTransformationMatrix m_replicaDrawTransform;
-    WebKit::WebTransformationMatrix m_replicaScreenSpaceTransform;
-    bool m_targetSurfaceTransformsAreAnimating;
-    bool m_screenSpaceTransformsAreAnimating;
-
-    // Uses the space of the surface's target surface.
-    IntRect m_clipRect;
-
-    Vector<RefPtr<LayerChromium> > m_layerList;
-
-    // The nearest ancestor target surface that will contain the contents of this surface, and that is going
-    // to move pixels within the surface (such as with a blur). This can point to itself.
-    RenderSurfaceChromium* m_nearestAncestorThatMovesPixels;
-
-    // For CCLayerIteratorActions
-    int m_targetRenderSurfaceLayerIndexHistory;
-    int m_currentLayerIndexHistory;
-    friend struct CCLayerIteratorActions;
-};
-
-}
-#endif // USE(ACCELERATED_COMPOSITING)
-
-#endif
diff --git a/Source/WebCore/platform/graphics/chromium/ScrollbarLayerChromium.cpp b/Source/WebCore/platform/graphics/chromium/ScrollbarLayerChromium.cpp
deleted file mode 100644 (file)
index eff14dd..0000000
+++ /dev/null
@@ -1,281 +0,0 @@
-/*
- * Copyright (C) 2012 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-
-#if USE(ACCELERATED_COMPOSITING)
-
-#include "ScrollbarLayerChromium.h"
-
-#include "BitmapCanvasLayerTextureUpdater.h"
-#include "CCLayerTreeHost.h"
-#include "CCScrollbarLayerImpl.h"
-#include "CCTextureUpdateQueue.h"
-#include "LayerPainterChromium.h"
-#include <public/WebRect.h>
-
-using WebKit::WebRect;
-
-namespace WebCore {
-
-PassOwnPtr<CCLayerImpl> ScrollbarLayerChromium::createCCLayerImpl()
-{
-    return CCScrollbarLayerImpl::create(id());
-}
-
-PassRefPtr<ScrollbarLayerChromium> ScrollbarLayerChromium::create(PassOwnPtr<WebKit::WebScrollbar> scrollbar, WebKit::WebScrollbarThemePainter painter, PassOwnPtr<WebKit::WebScrollbarThemeGeometry> geometry, int scrollLayerId)
-{
-    return adoptRef(new ScrollbarLayerChromium(scrollbar, painter, geometry, scrollLayerId));
-}
-
-ScrollbarLayerChromium::ScrollbarLayerChromium(PassOwnPtr<WebKit::WebScrollbar> scrollbar, WebKit::WebScrollbarThemePainter painter, PassOwnPtr<WebKit::WebScrollbarThemeGeometry> geometry, int scrollLayerId)
-    : m_scrollbar(scrollbar)
-    , m_painter(painter)
-    , m_geometry(geometry)
-    , m_scrollLayerId(scrollLayerId)
-    , m_textureFormat(GraphicsContext3D::INVALID_ENUM)
-{
-}
-
-void ScrollbarLayerChromium::pushPropertiesTo(CCLayerImpl* layer)
-{
-    LayerChromium::pushPropertiesTo(layer);
-
-    CCScrollbarLayerImpl* scrollbarLayer = static_cast<CCScrollbarLayerImpl*>(layer);
-
-    if (!scrollbarLayer->scrollbarGeometry())
-        scrollbarLayer->setScrollbarGeometry(CCScrollbarGeometryFixedThumb::create(adoptPtr(m_geometry->clone())));
-
-    scrollbarLayer->setScrollbarData(m_scrollbar.get());
-
-    if (m_backTrack && m_backTrack->texture()->haveBackingTexture())
-        scrollbarLayer->setBackTrackResourceId(m_backTrack->texture()->resourceId());
-    else
-        scrollbarLayer->setBackTrackResourceId(0);
-
-    if (m_foreTrack && m_foreTrack->texture()->haveBackingTexture())
-        scrollbarLayer->setForeTrackResourceId(m_foreTrack->texture()->resourceId());
-    else
-        scrollbarLayer->setForeTrackResourceId(0);
-
-    if (m_thumb && m_thumb->texture()->haveBackingTexture())
-        scrollbarLayer->setThumbResourceId(m_thumb->texture()->resourceId());
-    else
-        scrollbarLayer->setThumbResourceId(0);
-}
-
-class ScrollbarBackgroundPainter : public LayerPainterChromium {
-    WTF_MAKE_NONCOPYABLE(ScrollbarBackgroundPainter);
-public:
-    static PassOwnPtr<ScrollbarBackgroundPainter> create(WebKit::WebScrollbar* scrollbar, WebKit::WebScrollbarThemePainter painter, WebKit::WebScrollbarThemeGeometry* geometry, WebKit::WebScrollbar::ScrollbarPart trackPart)
-    {
-        return adoptPtr(new ScrollbarBackgroundPainter(scrollbar, painter, geometry, trackPart));
-    }
-
-    virtual void paint(SkCanvas* skCanvas, const IntRect& contentRect, FloatRect&) OVERRIDE
-    {
-        WebKit::WebCanvas* canvas = skCanvas;
-        // The following is a simplification of ScrollbarThemeComposite::paint.
-        WebKit::WebRect contentWebRect(contentRect.x(), contentRect.y(), contentRect.width(), contentRect.height());
-        m_painter.paintScrollbarBackground(canvas, contentWebRect);
-
-        if (m_geometry->hasButtons(m_scrollbar)) {
-            WebRect backButtonStartPaintRect = m_geometry->backButtonStartRect(m_scrollbar);
-            m_painter.paintBackButtonStart(canvas, backButtonStartPaintRect);
-
-            WebRect backButtonEndPaintRect = m_geometry->backButtonEndRect(m_scrollbar);
-            m_painter.paintBackButtonEnd(canvas, backButtonEndPaintRect);
-
-            WebRect forwardButtonStartPaintRect = m_geometry->forwardButtonStartRect(m_scrollbar);
-            m_painter.paintForwardButtonStart(canvas, forwardButtonStartPaintRect);
-
-            WebRect forwardButtonEndPaintRect = m_geometry->forwardButtonEndRect(m_scrollbar);
-            m_painter.paintForwardButtonEnd(canvas, forwardButtonEndPaintRect);
-        }
-
-        WebRect trackPaintRect = m_geometry->trackRect(m_scrollbar);
-        m_painter.paintTrackBackground(canvas, trackPaintRect);
-
-        bool thumbPresent = m_geometry->hasThumb(m_scrollbar);
-        if (thumbPresent) {
-            if (m_trackPart == WebKit::WebScrollbar::ForwardTrackPart)
-                m_painter.paintForwardTrackPart(canvas, trackPaintRect);
-            else
-                m_painter.paintBackTrackPart(canvas, trackPaintRect);
-        }
-
-        m_painter.paintTickmarks(canvas, trackPaintRect);
-    }
-private:
-    ScrollbarBackgroundPainter(WebKit::WebScrollbar* scrollbar, WebKit::WebScrollbarThemePainter painter, WebKit::WebScrollbarThemeGeometry* geometry, WebKit::WebScrollbar::ScrollbarPart trackPart)
-        : m_scrollbar(scrollbar)
-        , m_painter(painter)
-        , m_geometry(geometry)
-        , m_trackPart(trackPart)
-    {
-    }
-
-    WebKit::WebScrollbar* m_scrollbar;
-    WebKit::WebScrollbarThemePainter m_painter;
-    WebKit::WebScrollbarThemeGeometry* m_geometry;
-    WebKit::WebScrollbar::ScrollbarPart m_trackPart;
-};
-
-class ScrollbarThumbPainter : public LayerPainterChromium {
-    WTF_MAKE_NONCOPYABLE(ScrollbarThumbPainter);
-public:
-    static PassOwnPtr<ScrollbarThumbPainter> create(WebKit::WebScrollbar* scrollbar, WebKit::WebScrollbarThemePainter painter, WebKit::WebScrollbarThemeGeometry* geometry)
-    {
-        return adoptPtr(new ScrollbarThumbPainter(scrollbar, painter, geometry));
-    }
-
-    virtual void paint(SkCanvas* skCanvas, const IntRect& contentRect, FloatRect& opaque) OVERRIDE
-    {
-        WebKit::WebCanvas* canvas = skCanvas;
-
-        // Consider the thumb to be at the origin when painting.
-        WebRect thumbRect = m_geometry->thumbRect(m_scrollbar);
-        thumbRect.x = 0;
-        thumbRect.y = 0;
-        m_painter.paintThumb(canvas, thumbRect);
-    }
-
-private:
-    ScrollbarThumbPainter(WebKit::WebScrollbar* scrollbar, WebKit::WebScrollbarThemePainter painter, WebKit::WebScrollbarThemeGeometry* geometry)
-        : m_scrollbar(scrollbar)
-        , m_painter(painter)
-        , m_geometry(geometry)
-    {
-    }
-
-    WebKit::WebScrollbar* m_scrollbar;
-    WebKit::WebScrollbarThemePainter m_painter;
-    WebKit::WebScrollbarThemeGeometry* m_geometry;
-};
-
-void ScrollbarLayerChromium::setLayerTreeHost(CCLayerTreeHost* host)
-{
-    if (!host || host != layerTreeHost()) {
-        m_backTrackUpdater.clear();
-        m_backTrack.clear();
-        m_thumbUpdater.clear();
-        m_thumb.clear();
-    }
-
-    LayerChromium::setLayerTreeHost(host);
-}
-
-void ScrollbarLayerChromium::createTextureUpdaterIfNeeded()
-{
-    m_textureFormat = layerTreeHost()->rendererCapabilities().bestTextureFormat;
-
-    if (!m_backTrackUpdater)
-        m_backTrackUpdater = BitmapCanvasLayerTextureUpdater::create(ScrollbarBackgroundPainter::create(m_scrollbar.get(), m_painter, m_geometry.get(), WebKit::WebScrollbar::BackTrackPart));
-    if (!m_backTrack)
-        m_backTrack = m_backTrackUpdater->createTexture(layerTreeHost()->contentsTextureManager());
-
-    // Only create two-part track if we think the two parts could be different in appearance.
-    if (m_scrollbar->isCustomScrollbar()) {
-        if (!m_foreTrackUpdater)
-            m_foreTrackUpdater = BitmapCanvasLayerTextureUpdater::create(ScrollbarBackgroundPainter::create(m_scrollbar.get(), m_painter, m_geometry.get(), WebKit::WebScrollbar::ForwardTrackPart));
-        if (!m_foreTrack)
-            m_foreTrack = m_foreTrackUpdater->createTexture(layerTreeHost()->contentsTextureManager());
-    }
-
-    if (!m_thumbUpdater)
-        m_thumbUpdater = BitmapCanvasLayerTextureUpdater::create(ScrollbarThumbPainter::create(m_scrollbar.get(), m_painter, m_geometry.get()));
-    if (!m_thumb)
-        m_thumb = m_thumbUpdater->createTexture(layerTreeHost()->contentsTextureManager());
-}
-
-void ScrollbarLayerChromium::updatePart(LayerTextureUpdater* painter, LayerTextureUpdater::Texture* texture, const IntRect& rect, CCTextureUpdateQueue& queue, CCRenderingStats& stats)
-{
-    // Skip painting and uploading if there are no invalidations and
-    // we already have valid texture data.
-    if (texture->texture()->haveBackingTexture()
-            && texture->texture()->size() == rect.size()
-            && m_updateRect.isEmpty())
-        return;
-
-    // We should always have enough memory for UI.
-    ASSERT(texture->texture()->canAcquireBackingTexture());
-    if (!texture->texture()->canAcquireBackingTexture())
-        return;
-
-    // Paint and upload the entire part.
-    IntRect paintedOpaqueRect;
-    painter->prepareToUpdate(rect, rect.size(), 1, 1, paintedOpaqueRect, stats);
-    texture->prepareRect(rect, stats);
-
-    IntSize destOffset(0, 0);
-    TextureUploader::Parameters upload = { texture, rect, destOffset };
-    queue.appendFullUpload(upload);
-}
-
-
-void ScrollbarLayerChromium::setTexturePriorities(const CCPriorityCalculator&)
-{
-    if (contentBounds().isEmpty())
-        return;
-
-    createTextureUpdaterIfNeeded();
-
-    bool drawsToRoot = !renderTarget()->parent();
-    if (m_backTrack) {
-        m_backTrack->texture()->setDimensions(contentBounds(), m_textureFormat);
-        m_backTrack->texture()->setRequestPriority(CCPriorityCalculator::uiPriority(drawsToRoot));
-    }
-    if (m_foreTrack) {
-        m_foreTrack->texture()->setDimensions(contentBounds(), m_textureFormat);
-        m_foreTrack->texture()->setRequestPriority(CCPriorityCalculator::uiPriority(drawsToRoot));
-    }
-    if (m_thumb) {
-        WebKit::WebRect thumbRect = m_geometry->thumbRect(m_scrollbar.get());
-        m_thumb->texture()->setDimensions(IntSize(thumbRect.width, thumbRect.height), m_textureFormat);
-        m_thumb->texture()->setRequestPriority(CCPriorityCalculator::uiPriority(drawsToRoot));
-    }
-}
-
-void ScrollbarLayerChromium::update(CCTextureUpdateQueue& queue, const CCOcclusionTracker*, CCRenderingStats& stats)
-{
-    if (contentBounds().isEmpty())
-        return;
-
-    createTextureUpdaterIfNeeded();
-
-    IntPoint scrollbarOrigin(m_scrollbar->location().x, m_scrollbar->location().y);
-    IntRect contentRect(scrollbarOrigin, contentBounds());
-    updatePart(m_backTrackUpdater.get(), m_backTrack.get(), contentRect, queue, stats);
-    if (m_foreTrack && m_foreTrackUpdater)
-        updatePart(m_foreTrackUpdater.get(), m_foreTrack.get(), contentRect, queue, stats);
-
-    // Consider the thumb to be at the origin when painting.
-    WebKit::WebRect thumbRect = m_geometry->thumbRect(m_scrollbar.get());
-    IntRect originThumbRect = IntRect(0, 0, thumbRect.width, thumbRect.height);
-    if (!originThumbRect.isEmpty())
-        updatePart(m_thumbUpdater.get(), m_thumb.get(), originThumbRect, queue, stats);
-}
-
-}
-#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/Source/WebCore/platform/graphics/chromium/ScrollbarLayerChromium.h b/Source/WebCore/platform/graphics/chromium/ScrollbarLayerChromium.h
deleted file mode 100644 (file)
index 115fb66..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (C) 2012 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#ifndef ScrollbarLayerChromium_h
-#define ScrollbarLayerChromium_h
-
-#if USE(ACCELERATED_COMPOSITING)
-
-#include "LayerChromium.h"
-#include "LayerTextureUpdater.h"
-#include <public/WebScrollbar.h>
-#include <public/WebScrollbarThemeGeometry.h>
-#include <public/WebScrollbarThemePainter.h>
-
-namespace WebCore {
-
-class Scrollbar;
-class ScrollbarThemeComposite;
-class CCTextureUpdateQueue;
-
-class ScrollbarLayerChromium : public LayerChromium {
-public:
-    virtual PassOwnPtr<CCLayerImpl> createCCLayerImpl() OVERRIDE;
-    static PassRefPtr<ScrollbarLayerChromium> create(PassOwnPtr<WebKit::WebScrollbar>, WebKit::WebScrollbarThemePainter, PassOwnPtr<WebKit::WebScrollbarThemeGeometry>, int scrollLayerId);
-
-    // LayerChromium interface
-    virtual void setTexturePriorities(const CCPriorityCalculator&) OVERRIDE;
-    virtual void update(CCTextureUpdateQueue&, const CCOcclusionTracker*, CCRenderingStats&) OVERRIDE;
-    virtual void setLayerTreeHost(CCLayerTreeHost*) OVERRIDE;
-    virtual void pushPropertiesTo(CCLayerImpl*) OVERRIDE;
-
-    int scrollLayerId() const { return m_scrollLayerId; }
-    void setScrollLayerId(int id) { m_scrollLayerId = id; }
-
-    virtual ScrollbarLayerChromium* toScrollbarLayerChromium() OVERRIDE { return this; }
-
-protected:
-    ScrollbarLayerChromium(PassOwnPtr<WebKit::WebScrollbar>, WebKit::WebScrollbarThemePainter, PassOwnPtr<WebKit::WebScrollbarThemeGeometry>, int scrollLayerId);
-
-private:
-    void updatePart(LayerTextureUpdater*, LayerTextureUpdater::Texture*, const IntRect&, CCTextureUpdateQueue&, CCRenderingStats&);
-    void createTextureUpdaterIfNeeded();
-
-    OwnPtr<WebKit::WebScrollbar> m_scrollbar;
-    WebKit::WebScrollbarThemePainter m_painter;
-    OwnPtr<WebKit::WebScrollbarThemeGeometry> m_geometry;
-    int m_scrollLayerId;
-
-    GC3Denum m_textureFormat;
-
-    RefPtr<LayerTextureUpdater> m_backTrackUpdater;
-    RefPtr<LayerTextureUpdater> m_foreTrackUpdater;
-    RefPtr<LayerTextureUpdater> m_thumbUpdater;
-
-    // All the parts of the scrollbar except the thumb
-    OwnPtr<LayerTextureUpdater::Texture> m_backTrack;
-    OwnPtr<LayerTextureUpdater::Texture> m_foreTrack;
-    OwnPtr<LayerTextureUpdater::Texture> m_thumb;
-};
-
-}
-#endif // USE(ACCELERATED_COMPOSITING)
-
-#endif
diff --git a/Source/WebCore/platform/graphics/chromium/ShaderChromium.cpp b/Source/WebCore/platform/graphics/chromium/ShaderChromium.cpp
deleted file mode 100644 (file)
index 8823d1a..0000000
+++ /dev/null
@@ -1,905 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-
-#if USE(ACCELERATED_COMPOSITING)
-
-#include "ShaderChromium.h"
-
-#include <public/WebGraphicsContext3D.h>
-
-#define SHADER0(Src) #Src
-#define SHADER(Src) SHADER0(Src)
-
-using WebKit::WebGraphicsContext3D;
-
-namespace WebCore {
-
-namespace {
-
-static void getProgramUniformLocations(WebGraphicsContext3D* context, unsigned program, const char** shaderUniforms, size_t count, size_t maxLocations, int* locations, bool usingBindUniform, int* baseUniformIndex)
-{
-    for (size_t uniformIndex = 0; uniformIndex < count; uniformIndex ++) {
-        ASSERT(uniformIndex < maxLocations);
-
-        if (usingBindUniform) {
-            locations[uniformIndex] = (*baseUniformIndex)++;
-            context->bindUniformLocationCHROMIUM(program, locations[uniformIndex], shaderUniforms[uniformIndex]);
-        } else
-            locations[uniformIndex] = context->getUniformLocation(program, shaderUniforms[uniformIndex]);
-    }
-}
-
-}
-
-VertexShaderPosTex::VertexShaderPosTex()
-    : m_matrixLocation(-1)
-{
-}
-
-void VertexShaderPosTex::init(WebGraphicsContext3D* context, unsigned program, bool usingBindUniform, int* baseUniformIndex)
-{
-    static const char* shaderUniforms[] = {
-        "matrix",
-    };
-    int locations[1];
-
-    getProgramUniformLocations(context, program, shaderUniforms, WTF_ARRAY_LENGTH(shaderUniforms), WTF_ARRAY_LENGTH(locations), locations, usingBindUniform, baseUniformIndex);
-
-    m_matrixLocation = locations[0];
-    ASSERT(m_matrixLocation != -1);
-}
-
-String VertexShaderPosTex::getShaderString() const
-{
-    return SHADER(
-        attribute vec4 a_position;
-        attribute vec2 a_texCoord;
-        uniform mat4 matrix;
-        varying vec2 v_texCoord;
-        void main()
-        {
-            gl_Position = matrix * a_position;
-            v_texCoord = a_texCoord;
-        }
-    );
-}
-
-VertexShaderPosTexYUVStretch::VertexShaderPosTexYUVStretch()
-    : m_matrixLocation(-1)
-    , m_yWidthScaleFactorLocation(-1)
-    , m_uvWidthScaleFactorLocation(-1)
-{
-}
-
-void VertexShaderPosTexYUVStretch::init(WebGraphicsContext3D* context, unsigned program, bool usingBindUniform, int* baseUniformIndex)
-{
-    static const char* shaderUniforms[] = {
-        "matrix",
-        "y_widthScaleFactor",
-        "uv_widthScaleFactor",
-    };
-    int locations[3];
-
-    getProgramUniformLocations(context, program, shaderUniforms, WTF_ARRAY_LENGTH(shaderUniforms), WTF_ARRAY_LENGTH(locations), locations, usingBindUniform, baseUniformIndex);
-
-    m_matrixLocation = locations[0];
-    m_yWidthScaleFactorLocation = locations[1];
-    m_uvWidthScaleFactorLocation = locations[2];
-    ASSERT(m_matrixLocation != -1 && m_yWidthScaleFactorLocation != -1 && m_uvWidthScaleFactorLocation != -1);
-}
-
-String VertexShaderPosTexYUVStretch::getShaderString() const
-{
-    return SHADER(
-        precision mediump float;
-        attribute vec4 a_position;
-        attribute vec2 a_texCoord;
-        uniform mat4 matrix;
-        varying vec2 y_texCoord;
-        varying vec2 uv_texCoord;
-        uniform float y_widthScaleFactor;
-        uniform float uv_widthScaleFactor;
-        void main()
-        {
-            gl_Position = matrix * a_position;
-            y_texCoord = vec2(y_widthScaleFactor * a_texCoord.x, a_texCoord.y);
-            uv_texCoord = vec2(uv_widthScaleFactor * a_texCoord.x, a_texCoord.y);
-        }
-    );
-}
-
-VertexShaderPos::VertexShaderPos()
-    : m_matrixLocation(-1)
-{
-}
-
-void VertexShaderPos::init(WebGraphicsContext3D* context, unsigned program, bool usingBindUniform, int* baseUniformIndex)
-{
-    static const char* shaderUniforms[] = {
-        "matrix",
-    };
-    int locations[1];
-
-    getProgramUniformLocations(context, program, shaderUniforms, WTF_ARRAY_LENGTH(shaderUniforms), WTF_ARRAY_LENGTH(locations), locations, usingBindUniform, baseUniformIndex);
-
-    m_matrixLocation = locations[0];
-    ASSERT(m_matrixLocation != -1);
-}
-
-String VertexShaderPos::getShaderString() const
-{
-    return SHADER(
-        attribute vec4 a_position;
-        uniform mat4 matrix;
-        void main()
-        {
-            gl_Position = matrix * a_position;
-        }
-    );
-}
-
-VertexShaderPosTexTransform::VertexShaderPosTexTransform()
-    : m_matrixLocation(-1)
-    , m_texTransformLocation(-1)
-{
-}
-
-void VertexShaderPosTexTransform::init(WebGraphicsContext3D* context, unsigned program, bool usingBindUniform, int* baseUniformIndex)
-{
-    static const char* shaderUniforms[] = {
-        "matrix",
-        "texTransform",
-    };
-    int locations[2];
-
-    getProgramUniformLocations(context, program, shaderUniforms, WTF_ARRAY_LENGTH(shaderUniforms), WTF_ARRAY_LENGTH(locations), locations, usingBindUniform, baseUniformIndex);
-
-    m_matrixLocation = locations[0];
-    m_texTransformLocation = locations[1];
-    ASSERT(m_matrixLocation != -1 && m_texTransformLocation != -1);
-}
-
-String VertexShaderPosTexTransform::getShaderString() const
-{
-    return SHADER(
-        attribute vec4 a_position;
-        attribute vec2 a_texCoord;
-        uniform mat4 matrix;
-        uniform vec4 texTransform;
-        varying vec2 v_texCoord;
-        void main()
-        {
-            gl_Position = matrix * a_position;
-            v_texCoord = a_texCoord * texTransform.zw + texTransform.xy;
-        }
-    );
-}
-
-VertexShaderQuad::VertexShaderQuad()
-    : m_matrixLocation(-1)
-    , m_pointLocation(-1)
-{
-}
-
-String VertexShaderPosTexIdentity::getShaderString() const
-{
-    return SHADER(
-        attribute vec4 a_position;
-        varying vec2 v_texCoord;
-        void main()
-        {
-            gl_Position = a_position;
-            v_texCoord = (a_position.xy + vec2(1.0)) * 0.5;
-        }
-    );
-}
-
-void VertexShaderQuad::init(WebGraphicsContext3D* context, unsigned program, bool usingBindUniform, int* baseUniformIndex)
-{
-    static const char* shaderUniforms[] = {
-        "matrix",
-        "point",
-    };
-    int locations[2];
-
-    getProgramUniformLocations(context, program, shaderUniforms, WTF_ARRAY_LENGTH(shaderUniforms), WTF_ARRAY_LENGTH(locations), locations, usingBindUniform, baseUniformIndex);
-
-    m_matrixLocation = locations[0];
-    m_pointLocation = locations[1];
-    ASSERT(m_matrixLocation != -1 && m_pointLocation != -1);
-}
-
-String VertexShaderQuad::getShaderString() const
-{
-    return SHADER(
-        attribute vec4 a_position;
-        attribute vec2 a_texCoord;
-        uniform mat4 matrix;
-        uniform vec2 point[4];
-        varying vec2 v_texCoord;
-        void main()
-        {
-            vec2 complement = abs(a_texCoord - 1.0);
-            vec4 pos = vec4(0.0, 0.0, a_position.z, a_position.w);
-            pos.xy += (complement.x * complement.y) * point[0];
-            pos.xy += (a_texCoord.x * complement.y) * point[1];
-            pos.xy += (a_texCoord.x * a_texCoord.y) * point[2];
-            pos.xy += (complement.x * a_texCoord.y) * point[3];
-            gl_Position = matrix * pos;
-            v_texCoord = pos.xy + vec2(0.5);
-        }
-    );
-}
-
-VertexShaderTile::VertexShaderTile()
-    : m_matrixLocation(-1)
-    , m_pointLocation(-1)
-    , m_vertexTexTransformLocation(-1)
-{
-}
-
-void VertexShaderTile::init(WebGraphicsContext3D* context, unsigned program, bool usingBindUniform, int* baseUniformIndex)
-{
-    static const char* shaderUniforms[] = {
-        "matrix",
-        "point",
-        "vertexTexTransform",
-    };
-    int locations[3];
-
-    getProgramUniformLocations(context, program, shaderUniforms, WTF_ARRAY_LENGTH(shaderUniforms), WTF_ARRAY_LENGTH(locations), locations, usingBindUniform, baseUniformIndex);
-
-    m_matrixLocation = locations[0];
-    m_pointLocation = locations[1];
-    m_vertexTexTransformLocation = locations[2];
-    ASSERT(m_matrixLocation != -1 && m_pointLocation != -1 && m_vertexTexTransformLocation != -1);
-}
-
-String VertexShaderTile::getShaderString() const
-{
-    return SHADER(
-        attribute vec4 a_position;
-        attribute vec2 a_texCoord;
-        uniform mat4 matrix;
-        uniform vec2 point[4];
-        uniform vec4 vertexTexTransform;
-        varying vec2 v_texCoord;
-        void main()
-        {
-            vec2 complement = abs(a_texCoord - 1.0);
-            vec4 pos = vec4(0.0, 0.0, a_position.z, a_position.w);
-            pos.xy += (complement.x * complement.y) * point[0];
-            pos.xy += (a_texCoord.x * complement.y) * point[1];
-            pos.xy += (a_texCoord.x * a_texCoord.y) * point[2];
-            pos.xy += (complement.x * a_texCoord.y) * point[3];
-            gl_Position = matrix * pos;
-            v_texCoord = pos.xy * vertexTexTransform.zw + vertexTexTransform.xy;
-        }
-    );
-}
-
-VertexShaderVideoTransform::VertexShaderVideoTransform()
-    : m_matrixLocation(-1)
-    , m_texMatrixLocation(-1)
-{
-}
-
-bool VertexShaderVideoTransform::init(WebGraphicsContext3D* context, unsigned program, bool usingBindUniform, int* baseUniformIndex)
-{
-    static const char* shaderUniforms[] = {
-        "matrix",
-        "texMatrix",
-    };
-    int locations[2];
-
-    getProgramUniformLocations(context, program, shaderUniforms, WTF_ARRAY_LENGTH(shaderUniforms), WTF_ARRAY_LENGTH(locations), locations, usingBindUniform, baseUniformIndex);
-
-    m_matrixLocation = locations[0];
-    m_texMatrixLocation = locations[1];
-    return m_matrixLocation != -1 && m_texMatrixLocation != -1;
-}
-
-String VertexShaderVideoTransform::getShaderString() const
-{
-    return SHADER(
-        attribute vec4 a_position;
-        attribute vec2 a_texCoord;
-        uniform mat4 matrix;
-        uniform mat4 texMatrix;
-        varying vec2 v_texCoord;
-        void main()
-        {
-            gl_Position = matrix * a_position;
-            v_texCoord = vec2(texMatrix * vec4(a_texCoord.x, 1.0 - a_texCoord.y, 0.0, 1.0));
-        }
-    );
-}
-
-FragmentTexAlphaBinding::FragmentTexAlphaBinding()
-    : m_samplerLocation(-1)
-    , m_alphaLocation(-1)
-{
-}
-
-void FragmentTexAlphaBinding::init(WebGraphicsContext3D* context, unsigned program, bool usingBindUniform, int* baseUniformIndex)
-{
-    static const char* shaderUniforms[] = {
-        "s_texture",
-        "alpha",
-    };
-    int locations[2];
-
-    getProgramUniformLocations(context, program, shaderUniforms, WTF_ARRAY_LENGTH(shaderUniforms), WTF_ARRAY_LENGTH(locations), locations, usingBindUniform, baseUniformIndex);
-
-    m_samplerLocation = locations[0];
-    m_alphaLocation = locations[1];
-    ASSERT(m_samplerLocation != -1 && m_alphaLocation != -1);
-}
-
-FragmentTexOpaqueBinding::FragmentTexOpaqueBinding()
-    : m_samplerLocation(-1)
-{
-}
-
-void FragmentTexOpaqueBinding::init(WebGraphicsContext3D* context, unsigned program, bool usingBindUniform, int* baseUniformIndex)
-{
-    static const char* shaderUniforms[] = {
-        "s_texture",
-    };
-    int locations[1];
-
-    getProgramUniformLocations(context, program, shaderUniforms, WTF_ARRAY_LENGTH(shaderUniforms), WTF_ARRAY_LENGTH(locations), locations, usingBindUniform, baseUniformIndex);
-
-    m_samplerLocation = locations[0];
-    ASSERT(m_samplerLocation != -1);
-}
-
-String FragmentShaderRGBATexFlipAlpha::getShaderString() const
-{
-    return SHADER(
-        precision mediump float;
-        varying vec2 v_texCoord;
-        uniform sampler2D s_texture;
-        uniform float alpha;
-        void main()
-        {
-            vec4 texColor = texture2D(s_texture, vec2(v_texCoord.x, 1.0 - v_texCoord.y));
-            gl_FragColor = vec4(texColor.x, texColor.y, texColor.z, texColor.w) * alpha;
-        }
-    );
-}
-
-bool FragmentShaderOESImageExternal::init(WebGraphicsContext3D* context, unsigned program, bool usingBindUniform, int* baseUniformIndex)
-{
-    static const char* shaderUniforms[] = {
-        "s_texture",
-    };
-    int locations[1];
-
-    getProgramUniformLocations(context, program, shaderUniforms, WTF_ARRAY_LENGTH(shaderUniforms), WTF_ARRAY_LENGTH(locations), locations, usingBindUniform, baseUniformIndex);
-
-    m_samplerLocation = locations[0];
-    return m_samplerLocation != -1;
-}
-
-String FragmentShaderOESImageExternal::getShaderString() const
-{
-    // Cannot use the SHADER() macro because of the '#' char
-    return "#extension GL_OES_EGL_image_external : require \n"
-           "precision mediump float;\n"
-           "varying vec2 v_texCoord;\n"
-           "uniform samplerExternalOES s_texture;\n"
-           "void main()\n"
-           "{\n"
-           "    vec4 texColor = texture2D(s_texture, v_texCoord);\n"
-           "    gl_FragColor = vec4(texColor.x, texColor.y, texColor.z, texColor.w);\n"
-           "}\n";
-}
-
-String FragmentShaderRGBATexAlpha::getShaderString() const
-{
-    return SHADER(
-        precision mediump float;
-        varying vec2 v_texCoord;
-        uniform sampler2D s_texture;
-        uniform float alpha;
-        void main()
-        {
-            vec4 texColor = texture2D(s_texture, v_texCoord);
-            gl_FragColor = texColor * alpha;
-        }
-    );
-}
-
-String FragmentShaderRGBATexRectFlipAlpha::getShaderString() const
-{
-    // This must be paired with VertexShaderPosTexTransform to pick up the texTransform uniform.
-    // The necessary #extension preprocessing directive breaks the SHADER and SHADER0 macros.
-    return "#extension GL_ARB_texture_rectangle : require\n"
-            "precision mediump float;\n"
-            "varying vec2 v_texCoord;\n"
-            "uniform vec4 texTransform;\n"
-            "uniform sampler2DRect s_texture;\n"
-            "uniform float alpha;\n"
-            "void main()\n"
-            "{\n"
-            "    vec4 texColor = texture2DRect(s_texture, vec2(v_texCoord.x, texTransform.w - v_texCoord.y));\n"
-            "    gl_FragColor = vec4(texColor.x, texColor.y, texColor.z, texColor.w) * alpha;\n"
-            "}\n";
-}
-
-String FragmentShaderRGBATexRectAlpha::getShaderString() const
-{
-    return "#extension GL_ARB_texture_rectangle : require\n"
-            "precision mediump float;\n"
-            "varying vec2 v_texCoord;\n"
-            "uniform sampler2DRect s_texture;\n"
-            "uniform float alpha;\n"
-            "void main()\n"
-            "{\n"
-            "    vec4 texColor = texture2DRect(s_texture, v_texCoord);\n"
-            "    gl_FragColor = texColor * alpha;\n"
-            "}\n";
-}
-
-String FragmentShaderRGBATexOpaque::getShaderString() const
-{
-    return SHADER(
-        precision mediump float;
-        varying vec2 v_texCoord;
-        uniform sampler2D s_texture;
-        void main()
-        {
-            vec4 texColor = texture2D(s_texture, v_texCoord);
-            gl_FragColor = vec4(texColor.rgb, 1.0);
-        }
-    );
-}
-
-String FragmentShaderRGBATex::getShaderString() const
-{
-    return SHADER(
-        precision mediump float;
-        varying vec2 v_texCoord;
-        uniform sampler2D s_texture;
-        void main()
-        {
-            gl_FragColor = texture2D(s_texture, v_texCoord);
-        }
-    );
-}
-
-String FragmentShaderRGBATexSwizzleAlpha::getShaderString() const
-{
-    return SHADER(
-        precision mediump float;
-        varying vec2 v_texCoord;
-        uniform sampler2D s_texture;
-        uniform float alpha;
-        void main()
-        {
-            vec4 texColor = texture2D(s_texture, v_texCoord);
-            gl_FragColor = vec4(texColor.z, texColor.y, texColor.x, texColor.w) * alpha;
-        }
-    );
-}
-
-String FragmentShaderRGBATexSwizzleOpaque::getShaderString() const
-{
-    return SHADER(
-        precision mediump float;
-        varying vec2 v_texCoord;
-        uniform sampler2D s_texture;
-        void main()
-        {
-            vec4 texColor = texture2D(s_texture, v_texCoord);
-            gl_FragColor = vec4(texColor.z, texColor.y, texColor.x, 1.0);
-        }
-    );
-}
-
-FragmentShaderRGBATexAlphaAA::FragmentShaderRGBATexAlphaAA()
-    : m_samplerLocation(-1)
-    , m_alphaLocation(-1)
-    , m_edgeLocation(-1)
-{
-}
-
-void FragmentShaderRGBATexAlphaAA::init(WebGraphicsContext3D* context, unsigned program, bool usingBindUniform, int* baseUniformIndex)
-{
-    static const char* shaderUniforms[] = {
-        "s_texture",
-        "alpha",
-        "edge",
-    };
-    int locations[3];
-
-    getProgramUniformLocations(context, program, shaderUniforms, WTF_ARRAY_LENGTH(shaderUniforms), WTF_ARRAY_LENGTH(locations), locations, usingBindUniform, baseUniformIndex);
-
-    m_samplerLocation = locations[0];
-    m_alphaLocation = locations[1];
-    m_edgeLocation = locations[2];
-    ASSERT(m_samplerLocation != -1 && m_alphaLocation != -1 && m_edgeLocation != -1);
-}
-
-String FragmentShaderRGBATexAlphaAA::getShaderString() const
-{
-    return SHADER(
-        precision mediump float;
-        varying vec2 v_texCoord;
-        uniform sampler2D s_texture;
-        uniform float alpha;
-        uniform vec3 edge[8];
-        void main()
-        {
-            vec4 texColor = texture2D(s_texture, v_texCoord);
-            vec3 pos = vec3(gl_FragCoord.xy, 1);
-            float a0 = clamp(dot(edge[0], pos), 0.0, 1.0);
-            float a1 = clamp(dot(edge[1], pos), 0.0, 1.0);
-            float a2 = clamp(dot(edge[2], pos), 0.0, 1.0);
-            float a3 = clamp(dot(edge[3], pos), 0.0, 1.0);
-            float a4 = clamp(dot(edge[4], pos), 0.0, 1.0);
-            float a5 = clamp(dot(edge[5], pos), 0.0, 1.0);
-            float a6 = clamp(dot(edge[6], pos), 0.0, 1.0);
-            float a7 = clamp(dot(edge[7], pos), 0.0, 1.0);
-            gl_FragColor = texColor * alpha * min(min(a0, a2) * min(a1, a3), min(a4, a6) * min(a5, a7));
-        }
-    );
-}
-
-FragmentTexClampAlphaAABinding::FragmentTexClampAlphaAABinding()
-    : m_samplerLocation(-1)
-    , m_alphaLocation(-1)
-    , m_fragmentTexTransformLocation(-1)
-    , m_edgeLocation(-1)
-{
-}
-
-void FragmentTexClampAlphaAABinding::init(WebGraphicsContext3D* context, unsigned program, bool usingBindUniform, int* baseUniformIndex)
-{
-    static const char* shaderUniforms[] = {
-        "s_texture",
-        "alpha",
-        "fragmentTexTransform",
-        "edge",
-    };
-    int locations[4];
-
-    getProgramUniformLocations(context, program, shaderUniforms, WTF_ARRAY_LENGTH(shaderUniforms), WTF_ARRAY_LENGTH(locations), locations, usingBindUniform, baseUniformIndex);
-
-    m_samplerLocation = locations[0];
-    m_alphaLocation = locations[1];
-    m_fragmentTexTransformLocation = locations[2];
-    m_edgeLocation = locations[3];
-    ASSERT(m_samplerLocation != -1 && m_alphaLocation != -1 && m_fragmentTexTransformLocation != -1 && m_edgeLocation != -1);
-}
-
-String FragmentShaderRGBATexClampAlphaAA::getShaderString() const
-{
-    return SHADER(
-        precision mediump float;
-        varying vec2 v_texCoord;
-        uniform sampler2D s_texture;
-        uniform float alpha;
-        uniform vec4 fragmentTexTransform;
-        uniform vec3 edge[8];
-        void main()
-        {
-            vec2 texCoord = clamp(v_texCoord, 0.0, 1.0) * fragmentTexTransform.zw + fragmentTexTransform.xy;
-            vec4 texColor = texture2D(s_texture, texCoord);
-            vec3 pos = vec3(gl_FragCoord.xy, 1);
-            float a0 = clamp(dot(edge[0], pos), 0.0, 1.0);
-            float a1 = clamp(dot(edge[1], pos), 0.0, 1.0);
-            float a2 = clamp(dot(edge[2], pos), 0.0, 1.0);
-            float a3 = clamp(dot(edge[3], pos), 0.0, 1.0);
-            float a4 = clamp(dot(edge[4], pos), 0.0, 1.0);
-            float a5 = clamp(dot(edge[5], pos), 0.0, 1.0);
-            float a6 = clamp(dot(edge[6], pos), 0.0, 1.0);
-            float a7 = clamp(dot(edge[7], pos), 0.0, 1.0);
-            gl_FragColor = texColor * alpha * min(min(a0, a2) * min(a1, a3), min(a4, a6) * min(a5, a7));
-        }
-    );
-}
-
-String FragmentShaderRGBATexClampSwizzleAlphaAA::getShaderString() const
-{
-    return SHADER(
-        precision mediump float;
-        varying vec2 v_texCoord;
-        uniform sampler2D s_texture;
-        uniform float alpha;
-        uniform vec4 fragmentTexTransform;
-        uniform vec3 edge[8];
-        void main()
-        {
-            vec2 texCoord = clamp(v_texCoord, 0.0, 1.0) * fragmentTexTransform.zw + fragmentTexTransform.xy;
-            vec4 texColor = texture2D(s_texture, texCoord);
-            vec3 pos = vec3(gl_FragCoord.xy, 1);
-            float a0 = clamp(dot(edge[0], pos), 0.0, 1.0);
-            float a1 = clamp(dot(edge[1], pos), 0.0, 1.0);
-            float a2 = clamp(dot(edge[2], pos), 0.0, 1.0);
-            float a3 = clamp(dot(edge[3], pos), 0.0, 1.0);
-            float a4 = clamp(dot(edge[4], pos), 0.0, 1.0);
-            float a5 = clamp(dot(edge[5], pos), 0.0, 1.0);
-            float a6 = clamp(dot(edge[6], pos), 0.0, 1.0);
-            float a7 = clamp(dot(edge[7], pos), 0.0, 1.0);
-            gl_FragColor = vec4(texColor.z, texColor.y, texColor.x, texColor.w) * alpha * min(min(a0, a2) * min(a1, a3), min(a4, a6) * min(a5, a7));
-        }
-    );
-}
-
-FragmentShaderRGBATexAlphaMask::FragmentShaderRGBATexAlphaMask()
-    : m_samplerLocation(-1)
-    , m_maskSamplerLocation(-1)
-    , m_alphaLocation(-1)
-    , m_maskTexCoordScaleLocation(-1)
-{
-}
-
-void FragmentShaderRGBATexAlphaMask::init(WebGraphicsContext3D* context, unsigned program, bool usingBindUniform, int* baseUniformIndex)
-{
-    static const char* shaderUniforms[] = {
-        "s_texture",
-        "s_mask",
-        "alpha",
-        "maskTexCoordScale",
-        "maskTexCoordOffset",
-    };
-    int locations[5];
-
-    getProgramUniformLocations(context, program, shaderUniforms, WTF_ARRAY_LENGTH(shaderUniforms), WTF_ARRAY_LENGTH(locations), locations, usingBindUniform, baseUniformIndex);
-
-    m_samplerLocation = locations[0];
-    m_maskSamplerLocation = locations[1];
-    m_alphaLocation = locations[2];
-    m_maskTexCoordScaleLocation = locations[3];
-    m_maskTexCoordOffsetLocation = locations[4];
-    ASSERT(m_samplerLocation != -1 && m_maskSamplerLocation != -1 && m_alphaLocation != -1);
-}
-
-String FragmentShaderRGBATexAlphaMask::getShaderString() const
-{
-    return SHADER(
-        precision mediump float;
-        varying vec2 v_texCoord;
-        uniform sampler2D s_texture;
-        uniform sampler2D s_mask;
-        uniform vec2 maskTexCoordScale;
-        uniform vec2 maskTexCoordOffset;
-        uniform float alpha;
-        void main()
-        {
-            vec4 texColor = texture2D(s_texture, v_texCoord);
-            vec2 maskTexCoord = vec2(maskTexCoordOffset.x + v_texCoord.x * maskTexCoordScale.x, maskTexCoordOffset.y + v_texCoord.y * maskTexCoordScale.y);
-            vec4 maskColor = texture2D(s_mask, maskTexCoord);
-            gl_FragColor = vec4(texColor.x, texColor.y, texColor.z, texColor.w) * alpha * maskColor.w;
-        }
-    );
-}
-
-FragmentShaderRGBATexAlphaMaskAA::FragmentShaderRGBATexAlphaMaskAA()
-    : m_samplerLocation(-1)
-    , m_maskSamplerLocation(-1)
-    , m_alphaLocation(-1)
-    , m_edgeLocation(-1)
-    , m_maskTexCoordScaleLocation(-1)
-{
-}
-
-void FragmentShaderRGBATexAlphaMaskAA::init(WebGraphicsContext3D* context, unsigned program, bool usingBindUniform, int* baseUniformIndex)
-{
-    static const char* shaderUniforms[] = {
-        "s_texture",
-        "s_mask",
-        "alpha",
-        "edge",
-        "maskTexCoordScale",
-        "maskTexCoordOffset",
-    };
-    int locations[6];
-
-    getProgramUniformLocations(context, program, shaderUniforms, WTF_ARRAY_LENGTH(shaderUniforms), WTF_ARRAY_LENGTH(locations), locations, usingBindUniform, baseUniformIndex);
-
-    m_samplerLocation = locations[0];
-    m_maskSamplerLocation = locations[1];
-    m_alphaLocation = locations[2];
-    m_edgeLocation = locations[3];
-    m_maskTexCoordScaleLocation = locations[4];
-    m_maskTexCoordOffsetLocation = locations[5];
-    ASSERT(m_samplerLocation != -1 && m_maskSamplerLocation != -1 && m_alphaLocation != -1 && m_edgeLocation != -1);
-}
-
-String FragmentShaderRGBATexAlphaMaskAA::getShaderString() const
-{
-    return SHADER(
-        precision mediump float;
-        varying vec2 v_texCoord;
-        uniform sampler2D s_texture;
-        uniform sampler2D s_mask;
-        uniform vec2 maskTexCoordScale;
-        uniform vec2 maskTexCoordOffset;
-        uniform float alpha;
-        uniform vec3 edge[8];
-        void main()
-        {
-            vec4 texColor = texture2D(s_texture, v_texCoord);
-            vec2 maskTexCoord = vec2(maskTexCoordOffset.x + v_texCoord.x * maskTexCoordScale.x, maskTexCoordOffset.y + v_texCoord.y * maskTexCoordScale.y);
-            vec4 maskColor = texture2D(s_mask, maskTexCoord);
-            vec3 pos = vec3(gl_FragCoord.xy, 1);
-            float a0 = clamp(dot(edge[0], pos), 0.0, 1.0);
-            float a1 = clamp(dot(edge[1], pos), 0.0, 1.0);
-            float a2 = clamp(dot(edge[2], pos), 0.0, 1.0);
-            float a3 = clamp(dot(edge[3], pos), 0.0, 1.0);
-            float a4 = clamp(dot(edge[4], pos), 0.0, 1.0);
-            float a5 = clamp(dot(edge[5], pos), 0.0, 1.0);
-            float a6 = clamp(dot(edge[6], pos), 0.0, 1.0);
-            float a7 = clamp(dot(edge[7], pos), 0.0, 1.0);
-            gl_FragColor = vec4(texColor.x, texColor.y, texColor.z, texColor.w) * alpha * maskColor.w * min(min(a0, a2) * min(a1, a3), min(a4, a6) * min(a5, a7));
-        }
-    );
-}
-
-FragmentShaderYUVVideo::FragmentShaderYUVVideo()
-    : m_yTextureLocation(-1)
-    , m_uTextureLocation(-1)
-    , m_vTextureLocation(-1)
-    , m_alphaLocation(-1)
-    , m_ccMatrixLocation(-1)
-    , m_yuvAdjLocation(-1)
-{
-}
-
-void FragmentShaderYUVVideo::init(WebGraphicsContext3D* context, unsigned program, bool usingBindUniform, int* baseUniformIndex)
-{
-    static const char* shaderUniforms[] = {
-        "y_texture",
-        "u_texture",
-        "v_texture",
-        "alpha",
-        "cc_matrix",
-        "yuv_adj",
-    };
-    int locations[6];
-
-    getProgramUniformLocations(context, program, shaderUniforms, WTF_ARRAY_LENGTH(shaderUniforms), WTF_ARRAY_LENGTH(locations), locations, usingBindUniform, baseUniformIndex);
-
-    m_yTextureLocation = locations[0];
-    m_uTextureLocation = locations[1];
-    m_vTextureLocation = locations[2];
-    m_alphaLocation = locations[3];
-    m_ccMatrixLocation = locations[4];
-    m_yuvAdjLocation = locations[5];
-
-    ASSERT(m_yTextureLocation != -1 && m_uTextureLocation != -1 && m_vTextureLocation != -1
-           && m_alphaLocation != -1 && m_ccMatrixLocation != -1 && m_yuvAdjLocation != -1);
-}
-
-String FragmentShaderYUVVideo::getShaderString() const
-{
-    return SHADER(
-        precision mediump float;
-        precision mediump int;
-        varying vec2 y_texCoord;
-        varying vec2 uv_texCoord;
-        uniform sampler2D y_texture;
-        uniform sampler2D u_texture;
-        uniform sampler2D v_texture;
-        uniform float alpha;
-        uniform vec3 yuv_adj;
-        uniform mat3 cc_matrix;
-        void main()
-        {
-            float y_raw = texture2D(y_texture, y_texCoord).x;
-            float u_unsigned = texture2D(u_texture, uv_texCoord).x;
-            float v_unsigned = texture2D(v_texture, uv_texCoord).x;
-            vec3 yuv = vec3(y_raw, u_unsigned, v_unsigned) + yuv_adj;
-            vec3 rgb = cc_matrix * yuv;
-            gl_FragColor = vec4(rgb, float(1)) * alpha;
-        }
-    );
-}
-
-FragmentShaderColor::FragmentShaderColor()
-    : m_colorLocation(-1)
-{
-}
-
-void FragmentShaderColor::init(WebGraphicsContext3D* context, unsigned program, bool usingBindUniform, int* baseUniformIndex)
-{
-    static const char* shaderUniforms[] = {
-        "color",
-    };
-    int locations[1];
-
-    getProgramUniformLocations(context, program, shaderUniforms, WTF_ARRAY_LENGTH(shaderUniforms), WTF_ARRAY_LENGTH(locations), locations, usingBindUniform, baseUniformIndex);
-
-    m_colorLocation = locations[0];
-    ASSERT(m_colorLocation != -1);
-}
-
-String FragmentShaderColor::getShaderString() const
-{
-    return SHADER(
-        precision mediump float;
-        uniform vec4 color;
-        void main()
-        {
-            gl_FragColor = color;
-        }
-    );
-}
-
-FragmentShaderCheckerboard::FragmentShaderCheckerboard()
-    : m_alphaLocation(-1)
-    , m_texTransformLocation(-1)
-    , m_frequencyLocation(-1)
-{
-}
-
-void FragmentShaderCheckerboard::init(WebGraphicsContext3D* context, unsigned program, bool usingBindUniform, int* baseUniformIndex)
-{
-    static const char* shaderUniforms[] = {
-        "alpha",
-        "texTransform",
-        "frequency",
-    };
-    int locations[3];
-
-    getProgramUniformLocations(context, program, shaderUniforms, WTF_ARRAY_LENGTH(shaderUniforms), WTF_ARRAY_LENGTH(locations), locations, usingBindUniform, baseUniformIndex);
-
-    m_alphaLocation = locations[0];
-    m_texTransformLocation = locations[1];
-    m_frequencyLocation = locations[2];
-    ASSERT(m_alphaLocation != -1 && m_texTransformLocation != -1 && m_frequencyLocation != -1);
-}
-
-String FragmentShaderCheckerboard::getShaderString() const
-{
-    // Shader based on Example 13-17 of "OpenGL ES 2.0 Programming Guide"
-    // by Munshi, Ginsburg, Shreiner.
-    return SHADER(
-        precision mediump float;
-        precision mediump int;
-        varying vec2 v_texCoord;
-        uniform float alpha;
-        uniform float frequency;
-        uniform vec4 texTransform;
-        void main()
-        {
-            vec4 color1 = vec4(1.0, 1.0, 1.0, 1.0);
-            vec4 color2 = vec4(0.945, 0.945, 0.945, 1.0);
-            vec2 texCoord = clamp(v_texCoord, 0.0, 1.0) * texTransform.zw + texTransform.xy;
-            vec2 coord = mod(floor(texCoord * frequency * 2.0), 2.0);
-            float picker = abs(coord.x - coord.y);
-            gl_FragColor = mix(color1, color2, picker) * alpha;
-        }
-    );
-}
-
-} // namespace WebCore
-
-#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/Source/WebCore/platform/graphics/chromium/ShaderChromium.h b/Source/WebCore/platform/graphics/chromium/ShaderChromium.h
deleted file mode 100644 (file)
index 5af95d8..0000000
+++ /dev/null
@@ -1,372 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef ShaderChromium_h
-#define ShaderChromium_h
-
-#if USE(ACCELERATED_COMPOSITING)
-
-#include "SkColorPriv.h"
-#include <wtf/text/WTFString.h>
-
-namespace WebKit {
-class WebGraphicsContext3D;
-}
-
-namespace WebCore {
-
-class VertexShaderPosTex {
-public:
-    VertexShaderPosTex();
-
-    void init(WebKit::WebGraphicsContext3D*, unsigned program, bool usingBindUniform, int* baseUniformIndex);
-    String getShaderString() const;
-
-    int matrixLocation() const { return m_matrixLocation; }
-
-private:
-    int m_matrixLocation;
-};
-
-class VertexShaderPosTexYUVStretch {
-public:
-    VertexShaderPosTexYUVStretch();
-
-    void init(WebKit::WebGraphicsContext3D*, unsigned program, bool usingBindUniform, int* baseUniformIndex);
-    String getShaderString() const;
-
-    int matrixLocation() const { return m_matrixLocation; }
-    int yWidthScaleFactorLocation() const { return m_yWidthScaleFactorLocation; }
-    int uvWidthScaleFactorLocation() const { return m_uvWidthScaleFactorLocation; }
-
-private:
-    int m_matrixLocation;
-    int m_yWidthScaleFactorLocation;
-    int m_uvWidthScaleFactorLocation;
-};
-
-class VertexShaderPos {
-public:
-    VertexShaderPos();
-
-    void init(WebKit::WebGraphicsContext3D*, unsigned program, bool usingBindUniform, int* baseUniformIndex);
-    String getShaderString() const;
-
-    int matrixLocation() const { return m_matrixLocation; }
-
-private:
-    int m_matrixLocation;
-};
-
-class VertexShaderPosTexIdentity {
-public:
-    void init(WebKit::WebGraphicsContext3D*, unsigned program, bool usingBindUniform, int* baseUniformIndex) { }
-    String getShaderString() const;
-};
-
-class VertexShaderPosTexTransform {
-public:
-    VertexShaderPosTexTransform();
-
-    void init(WebKit::WebGraphicsContext3D*, unsigned program, bool usingBindUniform, int* baseUniformIndex);
-    String getShaderString() const;
-
-    int matrixLocation() const { return m_matrixLocation; }
-    int texTransformLocation() const { return m_texTransformLocation; }
-
-private:
-    int m_matrixLocation;
-    int m_texTransformLocation;
-};
-
-class VertexShaderQuad {
-public:
-    VertexShaderQuad();
-
-    void init(WebKit::WebGraphicsContext3D*, unsigned program, bool usingBindUniform, int* baseUniformIndex);
-    String getShaderString() const;
-
-    int matrixLocation() const { return m_matrixLocation; }
-    int pointLocation() const { return m_pointLocation; }
-
-private:
-    int m_matrixLocation;
-    int m_pointLocation;
-};
-
-class VertexShaderTile {
-public:
-    VertexShaderTile();
-
-    void init(WebKit::WebGraphicsContext3D*, unsigned program, bool usingBindUniform, int* baseUniformIndex);
-    String getShaderString() const;
-
-    int matrixLocation() const { return m_matrixLocation; }
-    int pointLocation() const { return m_pointLocation; }
-    int vertexTexTransformLocation() const { return m_vertexTexTransformLocation; }
-
-private:
-    int m_matrixLocation;
-    int m_pointLocation;
-    int m_vertexTexTransformLocation;
-};
-
-class VertexShaderVideoTransform {
-public:
-    VertexShaderVideoTransform();
-
-    bool init(WebKit::WebGraphicsContext3D*, unsigned program, bool usingBindUniform, int* baseUniformIndex);
-    String getShaderString() const;
-
-    int matrixLocation() const { return m_matrixLocation; }
-    int texMatrixLocation() const { return m_texMatrixLocation; }
-
-private:
-    int m_matrixLocation;
-    int m_texMatrixLocation;
-};
-
-class FragmentTexAlphaBinding {
-public:
-    FragmentTexAlphaBinding();
-
-    void init(WebKit::WebGraphicsContext3D*, unsigned program, bool usingBindUniform, int* baseUniformIndex);
-    int alphaLocation() const { return m_alphaLocation; }
-    int edgeLocation() const { return -1; }
-    int fragmentTexTransformLocation() const { return -1; }
-    int samplerLocation() const { return m_samplerLocation; }
-
-private:
-    int m_samplerLocation;
-    int m_alphaLocation;
-};
-
-class FragmentTexOpaqueBinding {
-public:
-    FragmentTexOpaqueBinding();
-
-    void init(WebKit::WebGraphicsContext3D*, unsigned program, bool usingBindUniform, int* baseUniformIndex);
-    int alphaLocation() const { return -1; }
-    int edgeLocation() const { return -1; }
-    int fragmentTexTransformLocation() const { return -1; }
-    int samplerLocation() const { return m_samplerLocation; }
-
-private:
-    int m_samplerLocation;
-};
-
-class FragmentShaderRGBATexFlipAlpha : public FragmentTexAlphaBinding {
-public:
-    String getShaderString() const;
-};
-
-class FragmentShaderRGBATexAlpha : public FragmentTexAlphaBinding {
-public:
-    String getShaderString() const;
-};
-
-class FragmentShaderRGBATexRectFlipAlpha : public FragmentTexAlphaBinding {
-public:
-    String getShaderString() const;
-};
-
-class FragmentShaderRGBATexRectAlpha : public FragmentTexAlphaBinding {
-public:
-    String getShaderString() const;
-};
-
-class FragmentShaderRGBATexOpaque : public FragmentTexOpaqueBinding {
-public:
-    String getShaderString() const;
-};
-
-class FragmentShaderRGBATex : public FragmentTexOpaqueBinding {
-public:
-    String getShaderString() const;
-};
-
-// Swizzles the red and blue component of sampled texel with alpha.
-class FragmentShaderRGBATexSwizzleAlpha : public FragmentTexAlphaBinding {
-public:
-    String getShaderString() const;
-};
-
-// Swizzles the red and blue component of sampled texel without alpha.
-class FragmentShaderRGBATexSwizzleOpaque : public FragmentTexOpaqueBinding {
-public:
-    String getShaderString() const;
-};
-
-// Fragment shader for external textures.
-class FragmentShaderOESImageExternal : public FragmentTexAlphaBinding {
-public:
-    String getShaderString() const;
-    bool init(WebKit::WebGraphicsContext3D*, unsigned program, bool usingBindUniform, int* baseUniformIndex);
-private:
-    int m_samplerLocation;
-};
-
-class FragmentShaderRGBATexAlphaAA {
-public:
-    FragmentShaderRGBATexAlphaAA();
-
-    void init(WebKit::WebGraphicsContext3D*, unsigned program, bool usingBindUniform, int* baseUniformIndex);
-    String getShaderString() const;
-
-    int alphaLocation() const { return m_alphaLocation; }
-    int samplerLocation() const { return m_samplerLocation; }
-    int edgeLocation() const { return m_edgeLocation; }
-
-private:
-    int m_samplerLocation;
-    int m_alphaLocation;
-    int m_edgeLocation;
-};
-
-class FragmentTexClampAlphaAABinding {
-public:
-    FragmentTexClampAlphaAABinding();
-
-    void init(WebKit::WebGraphicsContext3D*, unsigned program, bool usingBindUniform, int* baseUniformIndex);
-    int alphaLocation() const { return m_alphaLocation; }
-    int samplerLocation() const { return m_samplerLocation; }
-    int fragmentTexTransformLocation() const { return m_fragmentTexTransformLocation; }
-    int edgeLocation() const { return m_edgeLocation; }
-
-private:
-    int m_samplerLocation;
-    int m_alphaLocation;
-    int m_fragmentTexTransformLocation;
-    int m_edgeLocation;
-};
-
-class FragmentShaderRGBATexClampAlphaAA : public FragmentTexClampAlphaAABinding {
-public:
-    String getShaderString() const;
-};
-
-// Swizzles the red and blue component of sampled texel.
-class FragmentShaderRGBATexClampSwizzleAlphaAA : public FragmentTexClampAlphaAABinding {
-public:
-    String getShaderString() const;
-};
-
-class FragmentShaderRGBATexAlphaMask {
-public:
-    FragmentShaderRGBATexAlphaMask();
-    String getShaderString() const;
-
-    void init(WebKit::WebGraphicsContext3D*, unsigned program, bool usingBindUniform, int* baseUniformIndex);
-    int alphaLocation() const { return m_alphaLocation; }
-    int samplerLocation() const { return m_samplerLocation; }
-    int maskSamplerLocation() const { return m_maskSamplerLocation; }
-    int maskTexCoordScaleLocation() const { return m_maskTexCoordScaleLocation; }
-    int maskTexCoordOffsetLocation() const { return m_maskTexCoordOffsetLocation; }
-
-private:
-    int m_samplerLocation;
-    int m_maskSamplerLocation;
-    int m_alphaLocation;
-    int m_maskTexCoordScaleLocation;
-    int m_maskTexCoordOffsetLocation;
-};
-
-class FragmentShaderRGBATexAlphaMaskAA {
-public:
-    FragmentShaderRGBATexAlphaMaskAA();
-    String getShaderString() const;
-
-    void init(WebKit::WebGraphicsContext3D*, unsigned program, bool usingBindUniform, int* baseUniformIndex);
-    int alphaLocation() const { return m_alphaLocation; }
-    int samplerLocation() const { return m_samplerLocation; }
-    int maskSamplerLocation() const { return m_maskSamplerLocation; }
-    int edgeLocation() const { return m_edgeLocation; }
-    int maskTexCoordScaleLocation() const { return m_maskTexCoordScaleLocation; }
-    int maskTexCoordOffsetLocation() const { return m_maskTexCoordOffsetLocation; }
-
-private:
-    int m_samplerLocation;
-    int m_maskSamplerLocation;
-    int m_alphaLocation;
-    int m_edgeLocation;
-    int m_maskTexCoordScaleLocation;
-    int m_maskTexCoordOffsetLocation;
-};
-
-class FragmentShaderYUVVideo {
-public:
-    FragmentShaderYUVVideo();
-    String getShaderString() const;
-
-    void init(WebKit::WebGraphicsContext3D*, unsigned program, bool usingBindUniform, int* baseUniformIndex);
-
-    int yTextureLocation() const { return m_yTextureLocation; }
-    int uTextureLocation() const { return m_uTextureLocation; }
-    int vTextureLocation() const { return m_vTextureLocation; }
-    int alphaLocation() const { return m_alphaLocation; }
-    int ccMatrixLocation() const { return m_ccMatrixLocation; }
-    int yuvAdjLocation() const { return m_yuvAdjLocation; }
-
-private:
-    int m_yTextureLocation;
-    int m_uTextureLocation;
-    int m_vTextureLocation;
-    int m_alphaLocation;
-    int m_ccMatrixLocation;
-    int m_yuvAdjLocation;
-};
-
-class FragmentShaderColor {
-public:
-    FragmentShaderColor();
-    String getShaderString() const;
-
-    void init(WebKit::WebGraphicsContext3D*, unsigned program, bool usingBindUniform, int* baseUniformIndex);
-    int colorLocation() const { return m_colorLocation; }
-
-private:
-    int m_colorLocation;
-};
-
-class FragmentShaderCheckerboard {
-public:
-    FragmentShaderCheckerboard();
-    String getShaderString() const;
-
-    void init(WebKit::WebGraphicsContext3D*, unsigned program, bool usingBindUniform, int* baseUniformIndex);
-    int alphaLocation() const { return m_alphaLocation; }
-    int texTransformLocation() const { return m_texTransformLocation; }
-    int frequencyLocation() const { return m_frequencyLocation; }
-private:
-    int m_alphaLocation;
-    int m_texTransformLocation;
-    int m_frequencyLocation;
-};
-
-} // namespace WebCore
-
-#endif // USE(ACCELERATED_COMPOSITING)
-
-#endif
diff --git a/Source/WebCore/platform/graphics/chromium/SkPictureCanvasLayerTextureUpdater.cpp b/Source/WebCore/platform/graphics/chromium/SkPictureCanvasLayerTextureUpdater.cpp
deleted file mode 100644 (file)
index d45c989..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#include "config.h"
-
-#if USE(ACCELERATED_COMPOSITING)
-
-#include "SkPictureCanvasLayerTextureUpdater.h"
-
-#include "LayerPainterChromium.h"
-#include "SkCanvas.h"
-#include "TraceEvent.h"
-
-namespace WebCore {
-
-SkPictureCanvasLayerTextureUpdater::SkPictureCanvasLayerTextureUpdater(PassOwnPtr<LayerPainterChromium> painter)
-    : CanvasLayerTextureUpdater(painter)
-    , m_layerIsOpaque(false)
-{
-}
-
-SkPictureCanvasLayerTextureUpdater::~SkPictureCanvasLayerTextureUpdater()
-{
-}
-
-void SkPictureCanvasLayerTextureUpdater::prepareToUpdate(const IntRect& contentRect, const IntSize&, float contentsWidthScale, float contentsHeightScale, IntRect& resultingOpaqueRect, CCRenderingStats& stats)
-{
-    SkCanvas* canvas = m_picture.beginRecording(contentRect.width(), contentRect.height());
-    paintContents(canvas, contentRect, contentsWidthScale, contentsHeightScale, resultingOpaqueRect, stats);
-    m_picture.endRecording();
-}
-
-void SkPictureCanvasLayerTextureUpdater::drawPicture(SkCanvas* canvas)
-{
-    TRACE_EVENT0("cc", "SkPictureCanvasLayerTextureUpdater::drawPicture");
-    canvas->drawPicture(m_picture);
-}
-
-void SkPictureCanvasLayerTextureUpdater::setOpaque(bool opaque)
-{
-    m_layerIsOpaque = opaque;
-}
-
-} // namespace WebCore
-#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/Source/WebCore/platform/graphics/chromium/SkPictureCanvasLayerTextureUpdater.h b/Source/WebCore/platform/graphics/chromium/SkPictureCanvasLayerTextureUpdater.h
deleted file mode 100644 (file)
index 9287ca0..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#ifndef SkPictureCanvasLayerTextureUpdater_h
-#define SkPictureCanvasLayerTextureUpdater_h
-
-#if USE(ACCELERATED_COMPOSITING)
-
-#include "CanvasLayerTextureUpdater.h"
-#include "SkPicture.h"
-
-class SkCanvas;
-
-namespace WebCore {
-
-class LayerPainterChromium;
-
-// This class records the contentRect into an SkPicture. Subclasses, provide
-// different implementations of tile updating based on this recorded picture.
-// The BitmapSkPictureCanvasLayerTextureUpdater and
-// FrameBufferSkPictureCanvasLayerTextureUpdater are two examples of such
-// implementations.
-class SkPictureCanvasLayerTextureUpdater : public CanvasLayerTextureUpdater {
-public:
-    virtual ~SkPictureCanvasLayerTextureUpdater();
-
-    virtual void setOpaque(bool) OVERRIDE;
-
-protected:
-    explicit SkPictureCanvasLayerTextureUpdater(PassOwnPtr<LayerPainterChromium>);
-
-    virtual void prepareToUpdate(const IntRect& contentRect, const IntSize& tileSize, float contentsWidthScale, float contentsHeightScale, IntRect& resultingOpaqueRect, CCRenderingStats&) OVERRIDE;
-    void drawPicture(SkCanvas*);
-
-    bool layerIsOpaque() const { return m_layerIsOpaque; }
-
-private:
-    // Recording canvas.
-    SkPicture m_picture;
-    // True when it is known that all output pixels will be opaque.
-    bool m_layerIsOpaque;
-};
-
-} // namespace WebCore
-#endif // USE(ACCELERATED_COMPOSITING)
-#endif // SkPictureCanvasLayerTextureUpdater_h
diff --git a/Source/WebCore/platform/graphics/chromium/SolidColorLayerChromium.cpp b/Source/WebCore/platform/graphics/chromium/SolidColorLayerChromium.cpp
deleted file mode 100644 (file)
index 0da6324..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2012 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-
-#if USE(ACCELERATED_COMPOSITING)
-
-#include "SolidColorLayerChromium.h"
-
-#include "CCSolidColorLayerImpl.h"
-
-namespace WebCore {
-
-PassOwnPtr<CCLayerImpl> SolidColorLayerChromium::createCCLayerImpl()
-{
-    return CCSolidColorLayerImpl::create(id());
-}
-
-PassRefPtr<SolidColorLayerChromium> SolidColorLayerChromium::create()
-{
-    return adoptRef(new SolidColorLayerChromium());
-}
-
-SolidColorLayerChromium::SolidColorLayerChromium()
-    : LayerChromium()
-{
-}
-
-SolidColorLayerChromium::~SolidColorLayerChromium()
-{
-}
-
-} // namespace WebCore
-
-#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/Source/WebCore/platform/graphics/chromium/SolidColorLayerChromium.h b/Source/WebCore/platform/graphics/chromium/SolidColorLayerChromium.h
deleted file mode 100644 (file)
index 4a64e55..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2012 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#ifndef SolidColorLayerChromium_h
-#define SolidColorLayerChromium_h
-
-#if USE(ACCELERATED_COMPOSITING)
-
-#include "LayerChromium.h"
-
-namespace WebCore {
-
-// A Layer that renders a solid color. The color is specified by using
-// setBackgroundColor() on the base class.
-class SolidColorLayerChromium : public LayerChromium {
-public:
-    virtual PassOwnPtr<CCLayerImpl> createCCLayerImpl() OVERRIDE;
-    static PassRefPtr<SolidColorLayerChromium> create();
-
-    virtual ~SolidColorLayerChromium();
-
-protected:
-    SolidColorLayerChromium();
-};
-
-}
-#endif // USE(ACCELERATED_COMPOSITING)
-
-#endif
-
diff --git a/Source/WebCore/platform/graphics/chromium/TextureCopier.cpp b/Source/WebCore/platform/graphics/chromium/TextureCopier.cpp
deleted file mode 100644 (file)
index e20c323..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright (C) 2012, Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-
-#include "TextureCopier.h"
-
-#include "CCRendererGL.h" // For the GLC() macro.
-#include "GraphicsContext3D.h"
-#include "TraceEvent.h"
-#include <public/WebGraphicsContext3D.h>
-
-namespace WebCore {
-
-#if USE(ACCELERATED_COMPOSITING)
-AcceleratedTextureCopier::AcceleratedTextureCopier(WebKit::WebGraphicsContext3D* context, bool usingBindUniforms)
-    : m_context(context)
-    , m_usingBindUniforms(usingBindUniforms)
-{
-    ASSERT(m_context);
-    GLC(m_context, m_fbo = m_context->createFramebuffer());
-    GLC(m_context, m_positionBuffer = m_context->createBuffer());
-
-    static const float kPositions[4][4] = {
-        {-1, -1, 0, 1},
-        { 1, -1, 0, 1},
-        { 1, 1, 0, 1},
-        {-1, 1, 0, 1}
-    };
-
-    GLC(m_context, m_context->bindBuffer(GraphicsContext3D::ARRAY_BUFFER, m_positionBuffer));
-    GLC(m_context, m_context->bufferData(GraphicsContext3D::ARRAY_BUFFER, sizeof(kPositions), kPositions, GraphicsContext3D::STATIC_DRAW));
-    GLC(m_context, m_context->bindBuffer(GraphicsContext3D::ARRAY_BUFFER, 0));
-
-    m_blitProgram = adoptPtr(new BlitProgram(m_context));
-}
-
-AcceleratedTextureCopier::~AcceleratedTextureCopier()
-{
-    if (m_blitProgram)
-        m_blitProgram->cleanup(m_context);
-    if (m_positionBuffer)
-        GLC(m_context, m_context->deleteBuffer(m_positionBuffer));
-    if (m_fbo)
-        GLC(m_context, m_context->deleteFramebuffer(m_fbo));
-}
-
-void AcceleratedTextureCopier::copyTexture(Parameters parameters)
-{
-    TRACE_EVENT0("cc", "TextureCopier::copyTexture");
-
-    // Note: this code does not restore the viewport, bound program, 2D texture, framebuffer, buffer or blend enable.
-    GLC(m_context, m_context->bindFramebuffer(GraphicsContext3D::FRAMEBUFFER, m_fbo));
-    GLC(m_context, m_context->framebufferTexture2D(GraphicsContext3D::FRAMEBUFFER, GraphicsContext3D::COLOR_ATTACHMENT0, GraphicsContext3D::TEXTURE_2D, parameters.destTexture, 0));
-
-#if OS(ANDROID)
-    // Clear destination to improve performance on tiling GPUs.
-    // TODO: Use EXT_discard_framebuffer or skip clearing if it isn't available.
-    GLC(m_context, m_context->clear(GraphicsContext3D::COLOR_BUFFER_BIT));
-#endif
-
-    GLC(m_context, m_context->bindTexture(GraphicsContext3D::TEXTURE_2D, parameters.sourceTexture));
-    GLC(m_context, m_context->texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_MIN_FILTER, GraphicsContext3D::NEAREST));
-    GLC(m_context, m_context->texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_MAG_FILTER, GraphicsContext3D::NEAREST));
-
-    if (!m_blitProgram->initialized())
-        m_blitProgram->initialize(m_context, m_usingBindUniforms);
-
-    // TODO: Use EXT_framebuffer_blit if available.
-    GLC(m_context, m_context->useProgram(m_blitProgram->program()));
-
-    const int kPositionAttribute = 0;
-    GLC(m_context, m_context->bindBuffer(GraphicsContext3D::ARRAY_BUFFER, m_positionBuffer));
-    GLC(m_context, m_context->vertexAttribPointer(kPositionAttribute, 4, GraphicsContext3D::FLOAT, false, 0, 0));
-    GLC(m_context, m_context->enableVertexAttribArray(kPositionAttribute));
-    GLC(m_context, m_context->bindBuffer(GraphicsContext3D::ARRAY_BUFFER, 0));
-
-    GLC(m_context, m_context->viewport(0, 0, parameters.size.width(), parameters.size.height()));
-    GLC(m_context, m_context->disable(GraphicsContext3D::BLEND));
-    GLC(m_context, m_context->drawArrays(GraphicsContext3D::TRIANGLE_FAN, 0, 4));
-
-    GLC(m_context, m_context->texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_MIN_FILTER, GraphicsContext3D::LINEAR));
-    GLC(m_context, m_context->texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_MAG_FILTER, GraphicsContext3D::LINEAR));
-    GLC(m_context, m_context->disableVertexAttribArray(kPositionAttribute));
-
-    GLC(m_context, m_context->useProgram(0));
-
-    GLC(m_context, m_context->framebufferTexture2D(GraphicsContext3D::FRAMEBUFFER, GraphicsContext3D::COLOR_ATTACHMENT0, GraphicsContext3D::TEXTURE_2D, 0, 0));
-    GLC(m_context, m_context->bindFramebuffer(GraphicsContext3D::FRAMEBUFFER, 0));
-    GLC(m_context, m_context->bindTexture(GraphicsContext3D::TEXTURE_2D, 0));
-}
-
-void AcceleratedTextureCopier::flush()
-{
-    GLC(m_context, m_context->flush());
-}
-
-}
-
-#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/Source/WebCore/platform/graphics/chromium/TextureCopier.h b/Source/WebCore/platform/graphics/chromium/TextureCopier.h
deleted file mode 100644 (file)
index 68b0f16..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (C) 2012, Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef TextureCopier_h
-#define TextureCopier_h
-
-#include "GraphicsContext3D.h"
-#include "ProgramBinding.h"
-#include "ShaderChromium.h"
-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
-
-namespace WebKit {
-class WebGraphicsContext3D;
-}
-
-namespace WebCore {
-class IntSize;
-
-class TextureCopier {
-public:
-    struct Parameters {
-        unsigned sourceTexture;
-        unsigned destTexture;
-        IntSize size;
-    };
-    // Copy the base level contents of |sourceTexture| to |destTexture|. Both texture objects
-    // must be complete and have a base level of |size| dimensions. The color formats do not need
-    // to match, but |destTexture| must have a renderable format.
-    virtual void copyTexture(Parameters) = 0;
-    virtual void flush() = 0;
-
-    virtual ~TextureCopier() { }
-};
-
-#if USE(ACCELERATED_COMPOSITING)
-
-class AcceleratedTextureCopier : public TextureCopier {
-    WTF_MAKE_NONCOPYABLE(AcceleratedTextureCopier);
-public:
-    static PassOwnPtr<AcceleratedTextureCopier> create(WebKit::WebGraphicsContext3D* context, bool usingBindUniforms)
-    {
-        return adoptPtr(new AcceleratedTextureCopier(context, usingBindUniforms));
-    }
-    virtual ~AcceleratedTextureCopier();
-
-    virtual void copyTexture(Parameters) OVERRIDE;
-    virtual void flush() OVERRIDE;
-
-protected:
-    AcceleratedTextureCopier(WebKit::WebGraphicsContext3D*, bool usingBindUniforms);
-
-private:
-    typedef ProgramBinding<VertexShaderPosTexIdentity, FragmentShaderRGBATex> BlitProgram;
-
-    WebKit::WebGraphicsContext3D* m_context;
-    Platform3DObject m_fbo;
-    Platform3DObject m_positionBuffer;
-    OwnPtr<BlitProgram> m_blitProgram;
-    bool m_usingBindUniforms;
-};
-
-#endif // USE(ACCELERATED_COMPOSITING)
-
-}
-
-#endif
diff --git a/Source/WebCore/platform/graphics/chromium/TextureLayerChromium.cpp b/Source/WebCore/platform/graphics/chromium/TextureLayerChromium.cpp
deleted file mode 100644 (file)
index 34fd026..0000000
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-
-#if USE(ACCELERATED_COMPOSITING)
-
-#include "TextureLayerChromium.h"
-
-#include "CCLayerTreeHost.h"
-#include "CCTextureLayerImpl.h"
-#include "TextureLayerChromiumClient.h"
-#include <public/WebGraphicsContext3D.h>
-
-namespace WebCore {
-
-PassRefPtr<TextureLayerChromium> TextureLayerChromium::create(TextureLayerChromiumClient* client)
-{
-    return adoptRef(new TextureLayerChromium(client));
-}
-
-TextureLayerChromium::TextureLayerChromium(TextureLayerChromiumClient* client)
-    : LayerChromium()
-    , m_client(client)
-    , m_flipped(true)
-    , m_uvRect(0, 0, 1, 1)
-    , m_premultipliedAlpha(true)
-    , m_rateLimitContext(false)
-    , m_contextLost(false)
-    , m_textureId(0)
-{
-}
-
-TextureLayerChromium::~TextureLayerChromium()
-{
-    if (layerTreeHost()) {
-        if (m_textureId)
-            layerTreeHost()->acquireLayerTextures();
-        if (m_rateLimitContext && m_client)
-            layerTreeHost()->stopRateLimiter(m_client->context());
-    }
-}
-
-PassOwnPtr<CCLayerImpl> TextureLayerChromium::createCCLayerImpl()
-{
-    return CCTextureLayerImpl::create(m_layerId);
-}
-
-void TextureLayerChromium::setFlipped(bool flipped)
-{
-    m_flipped = flipped;
-    setNeedsCommit();
-}
-
-void TextureLayerChromium::setUVRect(const FloatRect& rect)
-{
-    m_uvRect = rect;
-    setNeedsCommit();
-}
-
-void TextureLayerChromium::setPremultipliedAlpha(bool premultipliedAlpha)
-{
-    m_premultipliedAlpha = premultipliedAlpha;
-    setNeedsCommit();
-}
-
-void TextureLayerChromium::setRateLimitContext(bool rateLimit)
-{
-    if (!rateLimit && m_rateLimitContext && m_client && layerTreeHost())
-        layerTreeHost()->stopRateLimiter(m_client->context());
-
-    m_rateLimitContext = rateLimit;
-}
-
-void TextureLayerChromium::setTextureId(unsigned id)
-{
-    if (m_textureId == id)
-        return;
-    if (m_textureId && layerTreeHost())
-        layerTreeHost()->acquireLayerTextures();
-    m_textureId = id;
-    setNeedsCommit();
-}
-
-void TextureLayerChromium::willModifyTexture()
-{
-    if (layerTreeHost())
-        layerTreeHost()->acquireLayerTextures();
-}
-
-void TextureLayerChromium::setNeedsDisplayRect(const FloatRect& dirtyRect)
-{
-    LayerChromium::setNeedsDisplayRect(dirtyRect);
-
-    if (m_rateLimitContext && m_client && layerTreeHost())
-        layerTreeHost()->startRateLimiter(m_client->context());
-}
-
-void TextureLayerChromium::setLayerTreeHost(CCLayerTreeHost* host)
-{
-    if (m_textureId && layerTreeHost() && host != layerTreeHost())
-        layerTreeHost()->acquireLayerTextures();
-    LayerChromium::setLayerTreeHost(host);
-}
-
-bool TextureLayerChromium::drawsContent() const
-{
-    return (m_client || m_textureId) && !m_contextLost && LayerChromium::drawsContent();
-}
-
-void TextureLayerChromium::update(CCTextureUpdateQueue& queue, const CCOcclusionTracker*, CCRenderingStats&)
-{
-    if (m_client) {
-        m_textureId = m_client->prepareTexture(queue);
-        m_contextLost = m_client->context()->getGraphicsResetStatusARB() != GraphicsContext3D::NO_ERROR;
-    }
-
-    m_needsDisplay = false;
-}
-
-void TextureLayerChromium::pushPropertiesTo(CCLayerImpl* layer)
-{
-    LayerChromium::pushPropertiesTo(layer);
-
-    CCTextureLayerImpl* textureLayer = static_cast<CCTextureLayerImpl*>(layer);
-    textureLayer->setFlipped(m_flipped);
-    textureLayer->setUVRect(m_uvRect);
-    textureLayer->setPremultipliedAlpha(m_premultipliedAlpha);
-    textureLayer->setTextureId(m_textureId);
-}
-
-}
-#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/Source/WebCore/platform/graphics/chromium/TextureLayerChromium.h b/Source/WebCore/platform/graphics/chromium/TextureLayerChromium.h
deleted file mode 100644 (file)
index fd639f6..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef TextureLayerChromium_h
-#define TextureLayerChromium_h
-
-#if USE(ACCELERATED_COMPOSITING)
-
-#include "LayerChromium.h"
-
-namespace WebKit {
-class WebGraphicsContext3D;
-}
-
-namespace WebCore {
-
-class TextureLayerChromiumClient;
-
-// A Layer containing a the rendered output of a plugin instance.
-class TextureLayerChromium : public LayerChromium {
-public:
-    // If this texture layer requires special preparation logic for each frame driven by
-    // the compositor, pass in a non-nil client. Pass in a nil client pointer if texture updates
-    // are driven by an external process.
-    static PassRefPtr<TextureLayerChromium> create(TextureLayerChromiumClient*);
-    virtual ~TextureLayerChromium();
-
-    void clearClient() { m_client = 0; }
-
-    virtual PassOwnPtr<CCLayerImpl> createCCLayerImpl() OVERRIDE;
-
-    // Sets whether this texture should be Y-flipped at draw time. Defaults to true.
-    void setFlipped(bool);
-
-    // Sets a UV transform to be used at draw time. Defaults to (0, 0, 1, 1).
-    void setUVRect(const FloatRect&);
-
-    // Sets whether the alpha channel is premultiplied or unpremultiplied. Defaults to true.
-    void setPremultipliedAlpha(bool);
-
-    // Sets whether this context should rate limit on damage to prevent too many frames from
-    // being queued up before the compositor gets a chance to run. Requires a non-nil client.
-    // Defaults to false.