Remove the ACCELERATED_COMPOSITING flag
authorabucur@adobe.com <abucur@adobe.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 30 Jan 2014 10:22:36 +0000 (10:22 +0000)
committerabucur@adobe.com <abucur@adobe.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 30 Jan 2014 10:22:36 +0000 (10:22 +0000)
https://bugs.webkit.org/show_bug.cgi?id=127833

Reviewed by Antti Koivisto.

Remove the USE(ACCELERATED_COMPOSITING) conditionals from the code base and make AC
mandatory.

Source/WebCore:

Tests: No new tests, no functional change.

* css/MediaQueryEvaluator.cpp:
(WebCore::transform_3dMediaFeatureEval):
* css/StyleResolver.cpp:
(WebCore::StyleResolver::canShareStyleWithElement):
* dom/Document.cpp:
(WebCore::Document::setVisualUpdatesAllowed):
(WebCore::Document::recalcStyle):
(WebCore::Document::createRenderTree):
(WebCore::Document::documentWillBecomeInactive):
(WebCore::Document::documentDidResumeFromPageCache):
(WebCore::Document::windowScreenDidChange):
* dom/PseudoElement.cpp:
(WebCore::PseudoElement::~PseudoElement):
* history/CachedFrame.cpp:
(WebCore::CachedFrameBase::CachedFrameBase):
(WebCore::CachedFrameBase::restore):
(WebCore::CachedFrame::CachedFrame):
* history/CachedFrame.h:
* history/CachedPage.cpp:
(WebCore::CachedPage::restore):
* history/CachedPage.h:
* history/PageCache.cpp:
(WebCore::PageCache::PageCache):
(WebCore::PageCache::markPagesForDeviceScaleChanged):
* history/PageCache.h:
* html/HTMLCanvasElement.cpp:
(WebCore::HTMLCanvasElement::getContext):
(WebCore::HTMLCanvasElement::reset):
(WebCore::HTMLCanvasElement::paintsIntoCanvasBuffer):
(WebCore::HTMLCanvasElement::createImageBuffer):
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::parseAttribute):
* html/HTMLMediaElement.h:
* html/canvas/CanvasRenderingContext.h:
* html/canvas/CanvasRenderingContext2D.cpp:
(WebCore::CanvasRenderingContext2D::didDraw):
* html/canvas/CanvasRenderingContext2D.h:
* html/canvas/WebGLRenderingContext.cpp:
(WebCore::WebGLRenderingContext::markContextChanged):
(WebCore::WebGLRenderingContext::reshape):
(WebCore::WebGLRenderingContext::platformLayer):
* html/canvas/WebGLRenderingContext.h:
* inspector/InspectorController.cpp:
(WebCore::InspectorController::InspectorController):
* inspector/InspectorInstrumentation.cpp:
(WebCore::InspectorInstrumentation::didCommitLoadImpl):
(WebCore::InspectorInstrumentation::pseudoElementDestroyedImpl):
* inspector/InspectorInstrumentation.h:
(WebCore::InspectorInstrumentation::pseudoElementDestroyed):
* inspector/InspectorLayerTreeAgent.cpp:
* inspector/InstrumentingAgents.cpp:
(WebCore::InstrumentingAgents::InstrumentingAgents):
(WebCore::InstrumentingAgents::reset):
* inspector/InstrumentingAgents.h:
* loader/EmptyClients.h:
* page/ChromeClient.h:
* page/Frame.cpp:
(WebCore::Frame::layerTreeAsText):
(WebCore::Frame::deviceOrPageScaleFactorChanged):
* page/Frame.h:
* page/FrameView.cpp:
(WebCore::FrameView::setFrameRect):
(WebCore::FrameView::scheduleLayerFlushAllowingThrottling):
(WebCore::FrameView::hasCompositedContent):
(WebCore::FrameView::hasCompositedContentIncludingDescendants):
(WebCore::FrameView::hasCompositingAncestor):
(WebCore::FrameView::enterCompositingMode):
(WebCore::FrameView::isEnclosedInCompositingLayer):
(WebCore::FrameView::flushCompositingStateIncludingSubframes):
(WebCore::FrameView::isSoftwareRenderable):
(WebCore::FrameView::layout):
(WebCore::FrameView::contentsInCompositedLayer):
(WebCore::FrameView::scrollContentsFastPath):
(WebCore::FrameView::scrollContentsSlowPath):
(WebCore::FrameView::setIsOverlapped):
(WebCore::FrameView::delegatesScrollingDidChange):
(WebCore::FrameView::scrollPositionChanged):
(WebCore::FrameView::updateCompositingLayersAfterScrolling):
(WebCore::FrameView::visibleContentsResized):
(WebCore::FrameView::addedOrRemovedScrollbar):
(WebCore::FrameView::disableLayerFlushThrottlingTemporarilyForInteraction):
(WebCore::FrameView::updateLayerFlushThrottlingInAllFrames):
(WebCore::FrameView::adjustTiledBackingCoverage):
(WebCore::FrameView::hasExtendedBackground):
(WebCore::FrameView::extendedBackgroundRect):
(WebCore::FrameView::setBackgroundExtendsBeyondPage):
(WebCore::FrameView::performPostLayoutTasks):
(WebCore::FrameView::paintContents):
(WebCore::FrameView::setTracksRepaints):
(WebCore::FrameView::resetTrackedRepaints):
(WebCore::FrameView::setScrollingPerformanceLoggingEnabled):
(WebCore::FrameView::setExposedRect):
* page/FrameView.h:
* page/Page.cpp:
(WebCore::Page::setPageScaleFactor):
(WebCore::Page::setDeviceScaleFactor):
* page/Settings.cpp:
(WebCore::Settings::setBackgroundShouldExtendBeyondPage):
* page/animation/AnimationBase.cpp:
(WebCore::AnimationBase::freezeAtTime):
* page/animation/AnimationController.cpp:
(WebCore::AnimationController::supportsAcceleratedAnimationOfProperty):
* page/animation/CSSPropertyAnimation.cpp:
(WebCore::CSSPropertyAnimationWrapperMap::CSSPropertyAnimationWrapperMap):
(WebCore::CSSPropertyAnimation::blendProperties):
(WebCore::CSSPropertyAnimation::animationOfPropertyIsAccelerated):
* page/animation/CSSPropertyAnimation.h:
* page/animation/CompositeAnimation.cpp:
(WebCore::CompositeAnimation::updateTransitions):
* page/animation/ImplicitAnimation.cpp:
(WebCore::ImplicitAnimation::animate):
(WebCore::ImplicitAnimation::startAnimation):
(WebCore::ImplicitAnimation::pauseAnimation):
(WebCore::ImplicitAnimation::endAnimation):
(WebCore::ImplicitAnimation::timeToNextService):
* page/animation/KeyframeAnimation.cpp:
(WebCore::KeyframeAnimation::animate):
(WebCore::KeyframeAnimation::startAnimation):
(WebCore::KeyframeAnimation::pauseAnimation):
(WebCore::KeyframeAnimation::endAnimation):
(WebCore::KeyframeAnimation::timeToNextService):
* page/ios/FrameIOS.mm:
(WebCore::Frame::viewportOffsetChanged):
(WebCore::Frame::containsTiledBackingLayers):
* page/scrolling/AsyncScrollingCoordinator.cpp:
(WebCore::AsyncScrollingCoordinator::updateScrollPositionAfterAsyncScroll):
* page/scrolling/ScrollingCoordinator.cpp:
(WebCore::ScrollingCoordinator::coordinatesScrollingForFrameView):
(WebCore::ScrollingCoordinator::computeNonFastScrollableRegion):
(WebCore::ScrollingCoordinator::verticalScrollbarLayerForScrollableArea):
(WebCore::ScrollingCoordinator::scrollLayerForFrameView):
(WebCore::ScrollingCoordinator::headerLayerForFrameView):
(WebCore::ScrollingCoordinator::footerLayerForFrameView):
(WebCore::ScrollingCoordinator::counterScrollingLayerForFrameView):
(WebCore::ScrollingCoordinator::hasVisibleSlowRepaintViewportConstrainedObjects):
* page/scrolling/ScrollingCoordinator.h:
* platform/ScrollView.cpp:
(WebCore::positionScrollCornerLayer):
(WebCore::ScrollView::positionScrollbarLayers):
(WebCore::ScrollView::paintScrollbars):
(WebCore::ScrollView::paint):
* platform/ScrollableArea.cpp:
(WebCore::ScrollableArea::invalidateScrollbar):
(WebCore::ScrollableArea::invalidateScrollCorner):
(WebCore::ScrollableArea::horizontalScrollbarLayerDidChange):
(WebCore::ScrollableArea::hasLayerForHorizontalScrollbar):
(WebCore::ScrollableArea::hasLayerForVerticalScrollbar):
(WebCore::ScrollableArea::hasLayerForScrollCorner):
* platform/ScrollableArea.h:
* platform/ScrollbarTheme.h:
* platform/efl/EflScreenUtilities.cpp:
(WebCore::applyFallbackCursor):
* platform/graphics/GraphicsContext3D.h:
* platform/graphics/GraphicsContext3DPrivate.cpp:
(WebCore::GraphicsContext3DPrivate::~GraphicsContext3DPrivate):
(WebCore::GraphicsContext3DPrivate::paintToTextureMapper):
* platform/graphics/GraphicsContext3DPrivate.h:
* platform/graphics/GraphicsLayer.cpp:
* platform/graphics/GraphicsLayer.h:
* platform/graphics/GraphicsLayerAnimation.cpp:
* platform/graphics/GraphicsLayerAnimation.h:
* platform/graphics/GraphicsLayerClient.h:
* platform/graphics/GraphicsLayerFactory.h:
* platform/graphics/GraphicsLayerUpdater.cpp:
* platform/graphics/GraphicsLayerUpdater.h:
* platform/graphics/ImageBuffer.cpp:
* platform/graphics/ImageBuffer.h:
* platform/graphics/MediaPlayer.cpp:
(WebCore::MediaPlayer::platformLayer):
(WebCore::MediaPlayer::supportsAcceleratedRendering):
* platform/graphics/MediaPlayer.h:
* platform/graphics/MediaPlayerPrivate.h:
* platform/graphics/PlatformLayer.h:
* platform/graphics/TextTrackRepresentation.cpp:
* platform/graphics/TextTrackRepresentation.h:
* platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:
(WebCore::MediaPlayerPrivateAVFoundation::currentRenderingMode):
(WebCore::MediaPlayerPrivateAVFoundation::preferredRenderingMode):
(WebCore::MediaPlayerPrivateAVFoundation::setUpVideoRendering):
(WebCore::MediaPlayerPrivateAVFoundation::tearDownVideoRendering):
* platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::platformLayer):
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::acceleratedRenderingStateChanged):
* platform/graphics/ca/GraphicsLayerCA.cpp:
* platform/graphics/ca/GraphicsLayerCA.h:
* platform/graphics/ca/LayerFlushScheduler.cpp:
* platform/graphics/ca/LayerFlushScheduler.h:
* platform/graphics/ca/LayerFlushSchedulerClient.h:
* platform/graphics/ca/PlatformCAAnimation.h:
* platform/graphics/ca/PlatformCAFilters.h:
* platform/graphics/ca/PlatformCALayer.h:
* platform/graphics/ca/PlatformCALayerClient.h:
* platform/graphics/ca/mac/LayerFlushSchedulerMac.cpp:
* platform/graphics/ca/mac/PlatformCAAnimationMac.mm:
(PlatformCAAnimation::copyTimingFunctionsFrom):
* platform/graphics/ca/mac/PlatformCAFiltersMac.mm:
* platform/graphics/ca/mac/PlatformCALayerMac.h:
* platform/graphics/ca/mac/PlatformCALayerMac.mm:
(PlatformCALayerMac::enumerateRectsBeingDrawn):
* platform/graphics/ca/win/AbstractCACFLayerTreeHost.h:
* platform/graphics/ca/win/CACFLayerTreeHost.cpp:
* platform/graphics/ca/win/CACFLayerTreeHost.h:
* platform/graphics/ca/win/CACFLayerTreeHostClient.h:
* platform/graphics/ca/win/LayerChangesFlusher.cpp:
* platform/graphics/ca/win/LayerChangesFlusher.h:
* platform/graphics/ca/win/LegacyCACFLayerTreeHost.cpp:
* platform/graphics/ca/win/LegacyCACFLayerTreeHost.h:
* platform/graphics/ca/win/PlatformCAAnimationWin.cpp:
(PlatformCAAnimation::copyTimingFunctionsFrom):
* platform/graphics/ca/win/PlatformCAFiltersWin.cpp:
* platform/graphics/ca/win/PlatformCALayerWin.cpp:
(PlatformCALayerWin::createCompatibleLayer):
* platform/graphics/ca/win/PlatformCALayerWin.h:
* platform/graphics/ca/win/PlatformCALayerWinInternal.cpp:
(PlatformCALayerWinInternal::drawTile):
* platform/graphics/ca/win/PlatformCALayerWinInternal.h:
* platform/graphics/ca/win/WKCACFViewLayerTreeHost.cpp:
* platform/graphics/ca/win/WKCACFViewLayerTreeHost.h:
* platform/graphics/cairo/DrawingBufferCairo.cpp:
(WebCore::DrawingBuffer::paintCompositedResultsToCanvas):
* platform/graphics/cairo/GraphicsContext3DCairo.cpp:
(WebCore::GraphicsContext3D::platformLayer):
* platform/graphics/cairo/ImageBufferCairo.cpp:
(WebCore::ImageBuffer::platformLayer):
* platform/graphics/efl/GraphicsContext3DEfl.cpp:
(WebCore::GraphicsContext3D::platformLayer):
* platform/graphics/efl/GraphicsContext3DPrivate.cpp:
* platform/graphics/efl/GraphicsContext3DPrivate.h:
* platform/graphics/gpu/DrawingBuffer.h:
* platform/graphics/gpu/LoopBlinnMathUtils.cpp:
* platform/graphics/gpu/TilingData.cpp:
* platform/graphics/gpu/mac/DrawingBufferMac.mm:
(WebCore::DrawingBuffer::frontColorBuffer):
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
(WebCore::MediaPlayerPrivateGStreamerBase::triggerRepaint):
(WebCore::MediaPlayerPrivateGStreamerBase::paint):
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h:
* platform/graphics/ios/MediaPlayerPrivateIOS.h:
* platform/graphics/ios/MediaPlayerPrivateIOS.mm:
(WebCore::MediaPlayerPrivateIOS::supportsAcceleratedRendering):
* platform/graphics/mac/MediaPlayerPrivateQTKit.h:
* platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
(WebCore::MediaPlayerPrivateQTKit::createQTMovieLayer):
(WebCore::MediaPlayerPrivateQTKit::destroyQTMovieLayer):
(WebCore::MediaPlayerPrivateQTKit::preferredRenderingMode):
(WebCore::MediaPlayerPrivateQTKit::platformLayer):
(WebCore::MediaPlayerPrivateQTKit::setClosedCaptionsVisible):
(WebCore::MediaPlayerPrivateQTKit::layerHostChanged):
(WebCore::MediaPlayerPrivateQTKit::acceleratedRenderingStateChanged):
(-[WebCoreMovieObserver layerHostChanged:]):
* platform/graphics/mac/WebGLLayer.h:
* platform/graphics/mac/WebGLLayer.mm:
* platform/graphics/mac/WebLayer.h:
* platform/graphics/mac/WebLayer.mm:
* platform/graphics/mac/WebTiledLayer.h:
* platform/graphics/mac/WebTiledLayer.mm:
* platform/graphics/opengl/GLDefs.h:
* platform/graphics/opengl/GLPlatformContext.cpp:
* platform/graphics/opengl/GLPlatformContext.h:
* platform/graphics/opengl/GLPlatformSurface.cpp:
* platform/graphics/opengl/GLPlatformSurface.h:
* platform/graphics/surfaces/GLTransportSurface.cpp:
* platform/graphics/surfaces/GLTransportSurface.h:
* platform/graphics/surfaces/glx/GLXConfigSelector.h:
* platform/graphics/surfaces/glx/GLXContext.cpp:
* platform/graphics/surfaces/glx/GLXContext.h:
* platform/graphics/surfaces/glx/GLXSurface.cpp:
* platform/graphics/surfaces/glx/GLXSurface.h:
* platform/graphics/texmap/TextureMapper.cpp:
* platform/graphics/texmap/TextureMapper.h:
* platform/graphics/texmap/TextureMapperBackingStore.cpp:
* platform/graphics/texmap/TextureMapperBackingStore.h:
* platform/graphics/texmap/TextureMapperFPSCounter.cpp:
* platform/graphics/texmap/TextureMapperFPSCounter.h:
* platform/graphics/texmap/TextureMapperGL.cpp:
* platform/graphics/texmap/TextureMapperGL.h:
* platform/graphics/texmap/TextureMapperLayer.cpp:
* platform/graphics/texmap/TextureMapperLayer.h:
* platform/graphics/texmap/TextureMapperShaderProgram.cpp:
* platform/graphics/texmap/TextureMapperSurfaceBackingStore.cpp:
* platform/graphics/texmap/TextureMapperSurfaceBackingStore.h:
* platform/graphics/texmap/TextureMapperTile.cpp:
* platform/graphics/texmap/TextureMapperTile.h:
* platform/graphics/texmap/TextureMapperTiledBackingStore.cpp:
* platform/graphics/texmap/TextureMapperTiledBackingStore.h:
* platform/graphics/win/GraphicsContext3DWin.cpp:
(WebCore::GraphicsContext3D::platformLayer):
* platform/graphics/win/MediaPlayerPrivateFullscreenWindow.cpp:
(WebCore::MediaPlayerPrivateFullscreenWindow::createWindow):
(WebCore::MediaPlayerPrivateFullscreenWindow::wndProc):
* platform/graphics/win/MediaPlayerPrivateFullscreenWindow.h:
* platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp:
(WebCore::MediaPlayerPrivateQuickTimeVisualContext::LayerClient::platformCALayerLayoutSublayersOfLayer):
(WebCore::MediaPlayerPrivateQuickTimeVisualContext::MediaPlayerPrivateQuickTimeVisualContext):
(WebCore::MediaPlayerPrivateQuickTimeVisualContext::supportsFullscreen):
(WebCore::MediaPlayerPrivateQuickTimeVisualContext::platformMedia):
(WebCore::MediaPlayerPrivateQuickTimeVisualContext::platformLayer):
(WebCore::MediaPlayerPrivateQuickTimeVisualContext::naturalSize):
(WebCore::MediaPlayerPrivateQuickTimeVisualContext::paint):
(WebCore::CreateCGImageFromPixelBuffer):
(WebCore::MediaPlayerPrivateQuickTimeVisualContext::retrieveCurrentImage):
(WebCore::MediaPlayerPrivateQuickTimeVisualContext::currentRenderingMode):
(WebCore::MediaPlayerPrivateQuickTimeVisualContext::preferredRenderingMode):
(WebCore::MediaPlayerPrivateQuickTimeVisualContext::setUpVideoRendering):
(WebCore::MediaPlayerPrivateQuickTimeVisualContext::tearDownVideoRendering):
(WebCore::MediaPlayerPrivateQuickTimeVisualContext::hasSetUpVideoRendering):
(WebCore::MediaPlayerPrivateQuickTimeVisualContext::retrieveAndResetMovieTransform):
(WebCore::MediaPlayerPrivateQuickTimeVisualContext::createLayerForMovie):
(WebCore::MediaPlayerPrivateQuickTimeVisualContext::destroyLayerForMovie):
(WebCore::MediaPlayerPrivateQuickTimeVisualContext::setPrivateBrowsingMode):
* platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.h:
* platform/graphics/win/WKCAImageQueue.cpp:
* platform/graphics/win/WKCAImageQueue.h:
* platform/mac/ScrollbarThemeMac.h:
* platform/mac/ScrollbarThemeMac.mm:
* plugins/PluginViewBase.h:
* rendering/FlowThreadController.cpp:
(WebCore::FlowThreadController::updateRenderFlowThreadLayersIfNeeded):
* rendering/FlowThreadController.h:
* rendering/RenderBox.cpp:
(WebCore::RenderBox::styleWillChange):
(WebCore::isCandidateForOpaquenessTest):
(WebCore::layersUseImage):
(WebCore::RenderBox::imageChanged):
* rendering/RenderBoxModelObject.cpp:
(WebCore::RenderBoxModelObject::suspendAnimations):
(WebCore::RenderBoxModelObject::fixedBackgroundPaintsInLocalCoordinates):
* rendering/RenderBoxModelObject.h:
* rendering/RenderElement.cpp:
(WebCore::RenderElement::adjustStyleDifference):
(WebCore::RenderElement::setStyle):
(WebCore::RenderElement::styleWillChange):
* rendering/RenderEmbeddedObject.cpp:
(WebCore::RenderEmbeddedObject::allowsAcceleratedCompositing):
* rendering/RenderEmbeddedObject.h:
* rendering/RenderFlowThread.cpp:
(WebCore::RenderFlowThread::RenderFlowThread):
(WebCore::RenderFlowThread::layout):
(WebCore::RenderFlowThread::updateAllLayerToRegionMappings):
* rendering/RenderFlowThread.h:
* rendering/RenderFullScreen.cpp:
* rendering/RenderImage.cpp:
(WebCore::RenderImage::imageDimensionsChanged):
(WebCore::RenderImage::notifyFinished):
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::RenderLayer):
(WebCore::RenderLayer::~RenderLayer):
(WebCore::RenderLayer::canRender3DTransforms):
(WebCore::RenderLayer::paintsWithFilters):
(WebCore::RenderLayer::updateLayerPositions):
(WebCore::RenderLayer::updateDescendantsAreContiguousInStackingOrderRecursive):
(WebCore::RenderLayer::currentTransform):
(WebCore::RenderLayer::updateDescendantDependentFlags):
(WebCore::RenderLayer::checkIfDescendantClippingContextNeedsUpdate):
(WebCore::RenderLayer::shouldRepaintAfterLayout):
(WebCore::RenderLayer::enclosingFilterRepaintLayer):
(WebCore::RenderLayer::setFilterBackendNeedsRepaintingInRect):
(WebCore::RenderLayer::clippingRootForPainting):
(WebCore::RenderLayer::addChild):
(WebCore::RenderLayer::removeChild):
(WebCore::RenderLayer::removeOnlyThisLayer):
(WebCore::RenderLayer::scrollTo):
(WebCore::RenderLayer::updateCompositingLayersAfterScroll):
(WebCore::RenderLayer::invalidateScrollbarRect):
(WebCore::RenderLayer::invalidateScrollCornerRect):
(WebCore::RenderLayer::positionOverflowControls):
(WebCore::RenderLayer::updateScrollInfoAfterLayout):
(WebCore::RenderLayer::paintOverflowControls):
(WebCore::shouldDoSoftwarePaint):
(WebCore::RenderLayer::paintLayer):
(WebCore::RenderLayer::calculateClipRects):
* rendering/RenderLayer.h:
* rendering/RenderLayerBacking.cpp:
* rendering/RenderLayerBacking.h:
* rendering/RenderLayerCompositor.cpp:
* rendering/RenderLayerCompositor.h:
* rendering/RenderNamedFlowThread.cpp:
(WebCore::RenderNamedFlowThread::collectsGraphicsLayersUnderRegions):
* rendering/RenderNamedFlowThread.h:
* rendering/RenderObject.cpp:
(WebCore::RenderObject::containerForRepaint):
(WebCore::RenderObject::repaintUsingContainer):
* rendering/RenderTreeAsText.cpp:
(WebCore::write):
* rendering/RenderVideo.cpp:
(WebCore::RenderVideo::updatePlayer):
(WebCore::RenderVideo::acceleratedRenderingStateChanged):
* rendering/RenderVideo.h:
* rendering/RenderView.cpp:
(WebCore::RenderView::paintBoxDecorations):
(WebCore::RenderView::repaintRootContents):
(WebCore::RenderView::repaintRectangleInViewAndCompositedLayers):
(WebCore::RenderView::repaintViewAndCompositedLayers):
(WebCore::RenderView::setMaximalOutlineSize):
(WebCore::RenderView::compositor):
(WebCore::RenderView::setIsInWindow):
* rendering/RenderView.h:
* rendering/RenderWidget.cpp:
(WebCore::RenderWidget::setWidgetGeometry):
(WebCore::RenderWidget::requiresAcceleratedCompositing):
* rendering/RenderWidget.h:
* rendering/style/RenderStyle.cpp:
(WebCore::RenderStyle::changeRequiresLayout):
(WebCore::RenderStyle::changeRequiresLayerRepaint):
(WebCore::RenderStyle::changeRequiresRecompositeLayer):
(WebCore::RenderStyle::diff):
* rendering/style/RenderStyle.h:
* rendering/style/RenderStyleConstants.h:
* rendering/style/StyleRareNonInheritedData.cpp:
(WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
(WebCore::StyleRareNonInheritedData::operator==):
* rendering/style/StyleRareNonInheritedData.h:
* testing/Internals.cpp:
(WebCore::Internals::resetToConsistentState):
(WebCore::Internals::setHeaderHeight):
(WebCore::Internals::setFooterHeight):

Source/WebKit/efl:

Another patch will be required to remove the flag support from the EFL build system.

* WebCoreSupport/AcceleratedCompositingContextEfl.cpp:
* WebCoreSupport/AcceleratedCompositingContextEfl.h:
* WebCoreSupport/ChromeClientEfl.cpp:
(WebCore::ChromeClientEfl::allowedCompositingTriggers):
* WebCoreSupport/ChromeClientEfl.h:
* WebCoreSupport/PageClientEfl.cpp:
(PageClientEfl::acceleratedCompositingContext):
* WebCoreSupport/PageClientEfl.h:
* ewk/ewk_private.h:
* ewk/ewk_view.cpp:
(_ewk_view_priv_new):
(_ewk_view_priv_del):
(ewk_view_mark_for_sync):
* ewk/ewk_view_private.h:

Source/WebKit/gtk:

Another patch will be required to remove the flag support from the GTK build system.

* WebCoreSupport/AcceleratedCompositingContext.h:
* WebCoreSupport/AcceleratedCompositingContextGL.cpp:
* WebCoreSupport/ChromeClientGtk.cpp:
(WebKit::ChromeClient::widgetSizeChanged):
(WebKit::ChromeClient::forcePaint):
(WebKit::ChromeClient::invalidateContentsAndRootView):
(WebKit::ChromeClient::invalidateContentsForSlowScroll):
(WebKit::ChromeClient::scroll):
(WebKit::ChromeClient::allowedCompositingTriggers):
* WebCoreSupport/ChromeClientGtk.h:
* webkit/webkitwebview.cpp:
(webkit_web_view_update_settings):
(webkit_web_view_settings_notify):
(webkit_web_view_init):
* webkit/webkitwebviewprivate.h:

Source/WebKit/ios:

* WebCoreSupport/WebChromeClientIOS.h:
* WebCoreSupport/WebChromeClientIOS.mm:
(WebChromeClientIOS::attachRootGraphicsLayer):
* WebView/WebUIKitDelegate.h:

Source/WebKit/mac:

* Plugins/Hosted/WebHostedNetscapePluginView.mm:
(-[WebHostedNetscapePluginView createPlugin]):
(-[WebHostedNetscapePluginView createPluginLayer]):
* Plugins/WebNetscapePluginView.mm:
(-[WebNetscapePluginView createPlugin]):
(-[WebNetscapePluginView getVariable:value:]):
* Plugins/WebPluginController.mm:
(-[WebPluginController superlayerForPluginView:]):
* WebCoreSupport/WebChromeClient.h:
(WebChromeClient::allowedCompositingTriggers):
* WebCoreSupport/WebChromeClient.mm:
* WebCoreSupport/WebFrameLoaderClient.mm:
(PluginWidgetIOS::detachPluginLayer):
(NetscapePluginWidget::platformLayer):
* WebView/WebClipView.mm:
(-[WebClipView _immediateScrollToPoint:]):
* WebView/WebHTMLView.mm:
(setNeedsDisplayInRect):
(+[WebHTMLViewPrivate initialize]):
(-[WebHTMLViewPrivate clear]):
(-[WebHTMLView _setAsideSubviews]):
(-[WebHTMLView hitTest:]):
(-[WebHTMLView _isUsingAcceleratedCompositing]):
(-[WebHTMLView _compositingLayersHostingView]):
(-[WebHTMLView viewDidMoveToSuperview]):
(-[WebHTMLView drawRect:]):
* WebView/WebHTMLViewInternal.h:
* WebView/WebRenderLayer.mm:
(+[WebRenderLayer compositingInfoForLayer:]):
* WebView/WebView.mm:
(-[WebView _close]):
(-[WebView _setMediaLayer:forPluginView:]):
(-[WebView _postsAcceleratedCompositingNotifications]):
(-[WebView _setPostsAcceleratedCompositingNotifications:]):
(-[WebView _isUsingAcceleratedCompositing]):
(-[WebView _isSoftwareRenderable]):
(-[WebView close]):
* WebView/WebViewData.h:
* WebView/WebViewData.mm:
(WebViewLayerFlushScheduler::WebViewLayerFlushScheduler):
* WebView/WebViewInternal.h:

Source/WebKit/win:

Another patch will be required to remove the flag support from the Win build system.

* FullscreenVideoController.cpp:
(FullscreenVideoController::LayerClient::platformCALayerLayoutSublayersOfLayer):
(FullscreenVideoController::FullscreenVideoController):
(FullscreenVideoController::~FullscreenVideoController):
(FullscreenVideoController::enterFullscreen):
* FullscreenVideoController.h:
* WebCoreSupport/WebChromeClient.cpp:
(WebChromeClient::scheduleCompositingLayerFlush):
* WebCoreSupport/WebChromeClient.h:
(WebChromeClient::setNeedsOneShotDrawingSynchronization):
* WebPreferences.cpp:
(WebPreferences::acceleratedCompositingEnabled):
* WebView.cpp:
(WebView::WebView):
(WebView::~WebView):
(WebView::close):
(WebView::repaint):
(WebView::addToDirtyRegion):
(WebView::scrollBackingStore):
(WebView::sizeChanged):
(WebView::updateBackingStore):
(WebView::paint):
(WebView::setShouldInvertColors):
(WebView::WebViewWndProc):
(WebView::notifyPreferencesChanged):
(WebView::setAcceleratedCompositing):
* WebView.h:

Source/WebKit/wince:

Another patch will be required to remove the flag support from the WinCE build system.

* WebCoreSupport/ChromeClientWinCE.cpp:
(WebKit::ChromeClientWinCE::scheduleCompositingLayerFlush):
* WebCoreSupport/ChromeClientWinCE.h:

Source/WebKit2:

* PluginProcess/PluginControllerProxy.cpp:
(WebKit::PluginControllerProxy::PluginControllerProxy):
* PluginProcess/PluginCreationParameters.cpp:
(WebKit::PluginCreationParameters::PluginCreationParameters):
(WebKit::PluginCreationParameters::encode):
(WebKit::PluginCreationParameters::decode):
* PluginProcess/PluginCreationParameters.h:
* PluginProcess/PluginProcess.h:
* Shared/WebRenderLayer.cpp:
(WebKit::WebRenderLayer::WebRenderLayer):
* Shared/mac/RemoteLayerBackingStore.h:
* Shared/mac/RemoteLayerBackingStore.mm:
(RemoteLayerBackingStore::enumerateRectsBeingDrawn):
* UIProcess/API/efl/EvasGLContext.cpp:
* UIProcess/API/efl/EvasGLContext.h:
* UIProcess/API/efl/EvasGLSurface.cpp:
* UIProcess/API/efl/EvasGLSurface.h:
* UIProcess/API/efl/EwkView.cpp:
(EwkView::EwkView):
(EwkView::displayTimerFired):
(EwkView::createGLSurface):
(EwkView::handleEvasObjectCalculate):
(EwkView::handleEvasObjectShow):
(EwkView::takeSnapshot):
* UIProcess/API/efl/EwkView.h:
* UIProcess/API/efl/SnapshotImageGL.cpp:
(getImageSurfaceFromFrameBuffer):
* UIProcess/API/efl/SnapshotImageGL.h:
* UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestBase.cpp:
(EWK2UnitTest::EWK2UnitTestBase::SetUp):
* UIProcess/API/gtk/PageClientImpl.cpp:
(WebKit::PageClientImpl::updateAcceleratedCompositingMode):
* UIProcess/API/gtk/PageClientImpl.h:
* UIProcess/API/ios/PageClientImplIOS.h:
* UIProcess/API/ios/PageClientImplIOS.mm:
(WebKit::PageClientImpl::acceleratedCompositingRootLayer):
* UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.cpp:
(WebKit::CoordinatedDrawingAreaProxy::~CoordinatedDrawingAreaProxy):
(WebKit::CoordinatedDrawingAreaProxy::visibilityDidChange):
(WebKit::CoordinatedDrawingAreaProxy::didUpdateBackingStoreState):
(WebKit::CoordinatedDrawingAreaProxy::enterAcceleratedCompositingMode):
(WebKit::CoordinatedDrawingAreaProxy::exitAcceleratedCompositingMode):
(WebKit::CoordinatedDrawingAreaProxy::updateAcceleratedCompositingMode):
(WebKit::CoordinatedDrawingAreaProxy::sendUpdateBackingStoreState):
(WebKit::CoordinatedDrawingAreaProxy::waitForAndDispatchDidUpdateBackingStoreState):
* UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.h:
* UIProcess/CoordinatedGraphics/PageViewportController.cpp:
* UIProcess/CoordinatedGraphics/PageViewportController.h:
* UIProcess/CoordinatedGraphics/WebView.cpp:
(WebKit::WebView::setVisible):
* UIProcess/DrawingAreaProxy.h:
* UIProcess/DrawingAreaProxy.messages.in:
* UIProcess/DrawingAreaProxyImpl.cpp:
(WebKit::DrawingAreaProxyImpl::~DrawingAreaProxyImpl):
(WebKit::DrawingAreaProxyImpl::didUpdateBackingStoreState):
(WebKit::DrawingAreaProxyImpl::enterAcceleratedCompositingMode):
(WebKit::DrawingAreaProxyImpl::exitAcceleratedCompositingMode):
(WebKit::DrawingAreaProxyImpl::updateAcceleratedCompositingMode):
(WebKit::DrawingAreaProxyImpl::sendUpdateBackingStoreState):
(WebKit::DrawingAreaProxyImpl::waitForAndDispatchDidUpdateBackingStoreState):
* UIProcess/DrawingAreaProxyImpl.h:
* UIProcess/PageClient.h:
* UIProcess/Plugins/mac/PluginProcessProxyMac.mm:
(WebKit::PluginProcessProxy::platformInitializePluginProcess):
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::updateAcceleratedCompositingMode):
* UIProcess/WebPageProxy.h:
* UIProcess/efl/PageLoadClientEfl.cpp:
(WebKit::PageLoadClientEfl::didCommitLoadForFrame):
* UIProcess/efl/PageViewportControllerClientEfl.cpp:
* UIProcess/efl/ViewClientEfl.cpp:
(WebKit::ViewClientEfl::didChangeContentsSize):
(WebKit::ViewClientEfl::didChangeContentsPosition):
(WebKit::ViewClientEfl::didRenderFrame):
(WebKit::ViewClientEfl::didCompletePageTransition):
(WebKit::ViewClientEfl::didChangeViewportAttributes):
* UIProcess/mac/WebContextMac.mm:
(WebKit::WebContext::platformInitializeWebProcess):
* WebProcess/FullScreen/WebFullScreenManager.cpp:
(WebKit::screenRectOfContents):
* WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
(WebKit::NetscapePlugin::isAcceleratedCompositingEnabled):
* WebProcess/Plugins/PluginController.h:
* WebProcess/Plugins/PluginProxy.cpp:
(WebKit::PluginProxy::initialize):
* WebProcess/WebCoreSupport/WebChromeClient.cpp:
(WebKit::WebChromeClient::layerTreeStateIsFrozen):
* WebProcess/WebCoreSupport/WebChromeClient.h:
* WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.cpp:
(WebKit::CoordinatedDrawingArea::layerHostDidFlushLayers):
(WebKit::CoordinatedDrawingArea::scheduleCompositingLayerFlush):
* WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.h:
* WebProcess/WebPage/DrawingArea.h:
* WebProcess/WebPage/DrawingAreaImpl.cpp:
(WebKit::DrawingAreaImpl::layerHostDidFlushLayers):
(WebKit::DrawingAreaImpl::scheduleCompositingLayerFlush):
(WebKit::DrawingAreaImpl::exitAcceleratedCompositingMode):
* WebProcess/WebPage/DrawingAreaImpl.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::exitAcceleratedCompositingMode):
(WebKit::WebPage::mainFrameDidLayout):
(WebKit::WebPage::didReceiveMessage):
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/mac/GraphicsLayerCARemote.cpp:
* WebProcess/WebPage/mac/GraphicsLayerCARemote.h:
* WebProcess/WebPage/mac/PlatformCALayerRemote.cpp:
(PlatformCALayerRemote::hostingContextID):
* WebProcess/WebPage/mac/PlatformCALayerRemote.h:
* WebProcess/WebPage/mac/PlatformCALayerRemoteCustom.h:
* WebProcess/WebPage/mac/PlatformCALayerRemoteCustom.mm:
(PlatformCALayerRemoteCustom::hostingContextID):
* WebProcess/WebPage/mac/PlatformCALayerRemoteTiledBacking.cpp:
(PlatformCALayerRemoteTiledBacking::setBorderColor):
* WebProcess/WebPage/mac/PlatformCALayerRemoteTiledBacking.h:
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::WebProcess):
* WebProcess/WebProcess.h:

Source/WTF:

* wtf/OwnPtrCommon.h:
* wtf/Platform.h:
* wtf/efl/OwnPtrEfl.cpp:
(WTF::deleteOwnedPtr):

Tools:

* DumpRenderTree/efl/DumpRenderTree.cpp:
(initEcoreEvas):
* EWebLauncher/main.c:
(windowCreate):
* MiniBrowser/efl/main.c:
(elm_main):
* TestWebKitAPI/efl/PlatformWebView.cpp:
(TestWebKitAPI::initEcoreEvas):
* WebKitTestRunner/cairo/TestInvocationCairo.cpp:
(WTR::TestInvocation::dumpPixelsAndCompareWithExpected):
* WebKitTestRunner/efl/PlatformWebViewEfl.cpp:
(WTR::initEcoreEvas):

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

316 files changed:
Source/WTF/ChangeLog
Source/WTF/wtf/OwnPtrCommon.h
Source/WTF/wtf/Platform.h
Source/WTF/wtf/efl/OwnPtrEfl.cpp
Source/WebCore/ChangeLog
Source/WebCore/css/MediaQueryEvaluator.cpp
Source/WebCore/css/StyleResolver.cpp
Source/WebCore/dom/Document.cpp
Source/WebCore/dom/PseudoElement.cpp
Source/WebCore/history/CachedFrame.cpp
Source/WebCore/history/CachedFrame.h
Source/WebCore/history/CachedPage.cpp
Source/WebCore/history/CachedPage.h
Source/WebCore/history/PageCache.cpp
Source/WebCore/history/PageCache.h
Source/WebCore/html/HTMLCanvasElement.cpp
Source/WebCore/html/HTMLMediaElement.cpp
Source/WebCore/html/HTMLMediaElement.h
Source/WebCore/html/canvas/CanvasRenderingContext.h
Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp
Source/WebCore/html/canvas/CanvasRenderingContext2D.h
Source/WebCore/html/canvas/WebGLRenderingContext.cpp
Source/WebCore/html/canvas/WebGLRenderingContext.h
Source/WebCore/inspector/InspectorController.cpp
Source/WebCore/inspector/InspectorInstrumentation.cpp
Source/WebCore/inspector/InspectorInstrumentation.h
Source/WebCore/inspector/InspectorLayerTreeAgent.cpp
Source/WebCore/inspector/InstrumentingAgents.cpp
Source/WebCore/inspector/InstrumentingAgents.h
Source/WebCore/loader/EmptyClients.h
Source/WebCore/page/ChromeClient.h
Source/WebCore/page/Frame.cpp
Source/WebCore/page/Frame.h
Source/WebCore/page/FrameView.cpp
Source/WebCore/page/FrameView.h
Source/WebCore/page/Page.cpp
Source/WebCore/page/Settings.cpp
Source/WebCore/page/animation/AnimationBase.cpp
Source/WebCore/page/animation/AnimationController.cpp
Source/WebCore/page/animation/CSSPropertyAnimation.cpp
Source/WebCore/page/animation/CSSPropertyAnimation.h
Source/WebCore/page/animation/CompositeAnimation.cpp
Source/WebCore/page/animation/ImplicitAnimation.cpp
Source/WebCore/page/animation/KeyframeAnimation.cpp
Source/WebCore/page/ios/FrameIOS.mm
Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp
Source/WebCore/page/scrolling/ScrollingCoordinator.cpp
Source/WebCore/page/scrolling/ScrollingCoordinator.h
Source/WebCore/platform/ScrollView.cpp
Source/WebCore/platform/ScrollableArea.cpp
Source/WebCore/platform/ScrollableArea.h
Source/WebCore/platform/ScrollbarTheme.h
Source/WebCore/platform/efl/EflScreenUtilities.cpp
Source/WebCore/platform/graphics/GraphicsContext3D.h
Source/WebCore/platform/graphics/GraphicsContext3DPrivate.cpp
Source/WebCore/platform/graphics/GraphicsContext3DPrivate.h
Source/WebCore/platform/graphics/GraphicsLayer.cpp
Source/WebCore/platform/graphics/GraphicsLayer.h
Source/WebCore/platform/graphics/GraphicsLayerAnimation.cpp
Source/WebCore/platform/graphics/GraphicsLayerAnimation.h
Source/WebCore/platform/graphics/GraphicsLayerClient.h
Source/WebCore/platform/graphics/GraphicsLayerFactory.h
Source/WebCore/platform/graphics/GraphicsLayerUpdater.cpp
Source/WebCore/platform/graphics/GraphicsLayerUpdater.h
Source/WebCore/platform/graphics/ImageBuffer.cpp
Source/WebCore/platform/graphics/ImageBuffer.h
Source/WebCore/platform/graphics/MediaPlayer.cpp
Source/WebCore/platform/graphics/MediaPlayer.h
Source/WebCore/platform/graphics/MediaPlayerPrivate.h
Source/WebCore/platform/graphics/PlatformLayer.h
Source/WebCore/platform/graphics/TextTrackRepresentation.cpp
Source/WebCore/platform/graphics/TextTrackRepresentation.h
Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp
Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h
Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h
Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm
Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp
Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h
Source/WebCore/platform/graphics/ca/LayerFlushScheduler.cpp
Source/WebCore/platform/graphics/ca/LayerFlushScheduler.h
Source/WebCore/platform/graphics/ca/LayerFlushSchedulerClient.h
Source/WebCore/platform/graphics/ca/PlatformCAAnimation.h
Source/WebCore/platform/graphics/ca/PlatformCAFilters.h
Source/WebCore/platform/graphics/ca/PlatformCALayer.h
Source/WebCore/platform/graphics/ca/PlatformCALayerClient.h
Source/WebCore/platform/graphics/ca/mac/LayerFlushSchedulerMac.cpp
Source/WebCore/platform/graphics/ca/mac/PlatformCAAnimationMac.mm
Source/WebCore/platform/graphics/ca/mac/PlatformCAFiltersMac.mm
Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.h
Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm
Source/WebCore/platform/graphics/ca/win/AbstractCACFLayerTreeHost.h
Source/WebCore/platform/graphics/ca/win/CACFLayerTreeHost.cpp
Source/WebCore/platform/graphics/ca/win/CACFLayerTreeHost.h
Source/WebCore/platform/graphics/ca/win/CACFLayerTreeHostClient.h
Source/WebCore/platform/graphics/ca/win/LayerChangesFlusher.cpp
Source/WebCore/platform/graphics/ca/win/LayerChangesFlusher.h
Source/WebCore/platform/graphics/ca/win/LegacyCACFLayerTreeHost.cpp
Source/WebCore/platform/graphics/ca/win/LegacyCACFLayerTreeHost.h
Source/WebCore/platform/graphics/ca/win/PlatformCAAnimationWin.cpp
Source/WebCore/platform/graphics/ca/win/PlatformCAFiltersWin.cpp
Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp
Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.h
Source/WebCore/platform/graphics/ca/win/PlatformCALayerWinInternal.cpp
Source/WebCore/platform/graphics/ca/win/PlatformCALayerWinInternal.h
Source/WebCore/platform/graphics/ca/win/WKCACFViewLayerTreeHost.cpp
Source/WebCore/platform/graphics/ca/win/WKCACFViewLayerTreeHost.h
Source/WebCore/platform/graphics/cairo/DrawingBufferCairo.cpp
Source/WebCore/platform/graphics/cairo/GraphicsContext3DCairo.cpp
Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp
Source/WebCore/platform/graphics/efl/GraphicsContext3DEfl.cpp
Source/WebCore/platform/graphics/efl/GraphicsContext3DPrivate.cpp
Source/WebCore/platform/graphics/efl/GraphicsContext3DPrivate.h
Source/WebCore/platform/graphics/gpu/DrawingBuffer.h
Source/WebCore/platform/graphics/gpu/LoopBlinnMathUtils.cpp
Source/WebCore/platform/graphics/gpu/TilingData.cpp
Source/WebCore/platform/graphics/gpu/mac/DrawingBufferMac.mm
Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h
Source/WebCore/platform/graphics/ios/MediaPlayerPrivateIOS.h
Source/WebCore/platform/graphics/ios/MediaPlayerPrivateIOS.mm
Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h
Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm
Source/WebCore/platform/graphics/mac/WebGLLayer.h
Source/WebCore/platform/graphics/mac/WebGLLayer.mm
Source/WebCore/platform/graphics/mac/WebLayer.h
Source/WebCore/platform/graphics/mac/WebLayer.mm
Source/WebCore/platform/graphics/mac/WebTiledLayer.h
Source/WebCore/platform/graphics/mac/WebTiledLayer.mm
Source/WebCore/platform/graphics/opengl/GLDefs.h
Source/WebCore/platform/graphics/opengl/GLPlatformContext.cpp
Source/WebCore/platform/graphics/opengl/GLPlatformContext.h
Source/WebCore/platform/graphics/opengl/GLPlatformSurface.cpp
Source/WebCore/platform/graphics/opengl/GLPlatformSurface.h
Source/WebCore/platform/graphics/surfaces/GLTransportSurface.cpp
Source/WebCore/platform/graphics/surfaces/GLTransportSurface.h
Source/WebCore/platform/graphics/surfaces/glx/GLXConfigSelector.h
Source/WebCore/platform/graphics/surfaces/glx/GLXContext.cpp
Source/WebCore/platform/graphics/surfaces/glx/GLXContext.h
Source/WebCore/platform/graphics/surfaces/glx/GLXSurface.cpp
Source/WebCore/platform/graphics/surfaces/glx/GLXSurface.h
Source/WebCore/platform/graphics/texmap/TextureMapper.cpp
Source/WebCore/platform/graphics/texmap/TextureMapper.h
Source/WebCore/platform/graphics/texmap/TextureMapperBackingStore.cpp
Source/WebCore/platform/graphics/texmap/TextureMapperBackingStore.h
Source/WebCore/platform/graphics/texmap/TextureMapperFPSCounter.cpp
Source/WebCore/platform/graphics/texmap/TextureMapperFPSCounter.h
Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp
Source/WebCore/platform/graphics/texmap/TextureMapperGL.h
Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp
Source/WebCore/platform/graphics/texmap/TextureMapperLayer.h
Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp
Source/WebCore/platform/graphics/texmap/TextureMapperSurfaceBackingStore.cpp
Source/WebCore/platform/graphics/texmap/TextureMapperSurfaceBackingStore.h
Source/WebCore/platform/graphics/texmap/TextureMapperTile.cpp
Source/WebCore/platform/graphics/texmap/TextureMapperTile.h
Source/WebCore/platform/graphics/texmap/TextureMapperTiledBackingStore.cpp
Source/WebCore/platform/graphics/texmap/TextureMapperTiledBackingStore.h
Source/WebCore/platform/graphics/win/GraphicsContext3DWin.cpp
Source/WebCore/platform/graphics/win/MediaPlayerPrivateFullscreenWindow.cpp
Source/WebCore/platform/graphics/win/MediaPlayerPrivateFullscreenWindow.h
Source/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp
Source/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.h
Source/WebCore/platform/graphics/win/WKCAImageQueue.cpp
Source/WebCore/platform/graphics/win/WKCAImageQueue.h
Source/WebCore/platform/mac/ScrollbarThemeMac.h
Source/WebCore/platform/mac/ScrollbarThemeMac.mm
Source/WebCore/plugins/PluginViewBase.h
Source/WebCore/rendering/FlowThreadController.cpp
Source/WebCore/rendering/FlowThreadController.h
Source/WebCore/rendering/RenderBox.cpp
Source/WebCore/rendering/RenderBoxModelObject.cpp
Source/WebCore/rendering/RenderBoxModelObject.h
Source/WebCore/rendering/RenderElement.cpp
Source/WebCore/rendering/RenderEmbeddedObject.cpp
Source/WebCore/rendering/RenderEmbeddedObject.h
Source/WebCore/rendering/RenderFlowThread.cpp
Source/WebCore/rendering/RenderFlowThread.h
Source/WebCore/rendering/RenderFullScreen.cpp
Source/WebCore/rendering/RenderImage.cpp
Source/WebCore/rendering/RenderLayer.cpp
Source/WebCore/rendering/RenderLayer.h
Source/WebCore/rendering/RenderLayerBacking.cpp
Source/WebCore/rendering/RenderLayerBacking.h
Source/WebCore/rendering/RenderLayerCompositor.cpp
Source/WebCore/rendering/RenderLayerCompositor.h
Source/WebCore/rendering/RenderNamedFlowThread.cpp
Source/WebCore/rendering/RenderNamedFlowThread.h
Source/WebCore/rendering/RenderObject.cpp
Source/WebCore/rendering/RenderTreeAsText.cpp
Source/WebCore/rendering/RenderVideo.cpp
Source/WebCore/rendering/RenderVideo.h
Source/WebCore/rendering/RenderView.cpp
Source/WebCore/rendering/RenderView.h
Source/WebCore/rendering/RenderWidget.cpp
Source/WebCore/rendering/RenderWidget.h
Source/WebCore/rendering/style/RenderStyle.cpp
Source/WebCore/rendering/style/RenderStyle.h
Source/WebCore/rendering/style/RenderStyleConstants.h
Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp
Source/WebCore/rendering/style/StyleRareNonInheritedData.h
Source/WebCore/testing/Internals.cpp
Source/WebKit/efl/ChangeLog
Source/WebKit/efl/WebCoreSupport/AcceleratedCompositingContextEfl.cpp
Source/WebKit/efl/WebCoreSupport/AcceleratedCompositingContextEfl.h
Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp
Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.h
Source/WebKit/efl/WebCoreSupport/PageClientEfl.cpp
Source/WebKit/efl/WebCoreSupport/PageClientEfl.h
Source/WebKit/efl/ewk/ewk_private.h
Source/WebKit/efl/ewk/ewk_view.cpp
Source/WebKit/efl/ewk/ewk_view_private.h
Source/WebKit/gtk/ChangeLog
Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContext.h
Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContextGL.cpp
Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp
Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.h
Source/WebKit/gtk/webkit/webkitwebview.cpp
Source/WebKit/gtk/webkit/webkitwebviewprivate.h
Source/WebKit/ios/ChangeLog
Source/WebKit/ios/WebCoreSupport/WebChromeClientIOS.h
Source/WebKit/ios/WebCoreSupport/WebChromeClientIOS.mm
Source/WebKit/ios/WebView/WebUIKitDelegate.h
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm
Source/WebKit/mac/Plugins/WebNetscapePluginView.mm
Source/WebKit/mac/Plugins/WebPluginController.mm
Source/WebKit/mac/WebCoreSupport/WebChromeClient.h
Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm
Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm
Source/WebKit/mac/WebView/WebClipView.mm
Source/WebKit/mac/WebView/WebHTMLView.mm
Source/WebKit/mac/WebView/WebHTMLViewInternal.h
Source/WebKit/mac/WebView/WebRenderLayer.mm
Source/WebKit/mac/WebView/WebView.mm
Source/WebKit/mac/WebView/WebViewData.h
Source/WebKit/mac/WebView/WebViewData.mm
Source/WebKit/mac/WebView/WebViewInternal.h
Source/WebKit/win/ChangeLog
Source/WebKit/win/FullscreenVideoController.cpp
Source/WebKit/win/FullscreenVideoController.h
Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp
Source/WebKit/win/WebCoreSupport/WebChromeClient.h
Source/WebKit/win/WebPreferences.cpp
Source/WebKit/win/WebView.cpp
Source/WebKit/win/WebView.h
Source/WebKit/wince/ChangeLog
Source/WebKit/wince/WebCoreSupport/ChromeClientWinCE.cpp
Source/WebKit/wince/WebCoreSupport/ChromeClientWinCE.h
Source/WebKit2/ChangeLog
Source/WebKit2/PluginProcess/PluginControllerProxy.cpp
Source/WebKit2/PluginProcess/PluginCreationParameters.cpp
Source/WebKit2/PluginProcess/PluginCreationParameters.h
Source/WebKit2/PluginProcess/PluginProcess.h
Source/WebKit2/Shared/WebRenderLayer.cpp
Source/WebKit2/Shared/mac/RemoteLayerBackingStore.h
Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm
Source/WebKit2/UIProcess/API/efl/EvasGLContext.cpp
Source/WebKit2/UIProcess/API/efl/EvasGLContext.h
Source/WebKit2/UIProcess/API/efl/EvasGLSurface.cpp
Source/WebKit2/UIProcess/API/efl/EvasGLSurface.h
Source/WebKit2/UIProcess/API/efl/EwkView.cpp
Source/WebKit2/UIProcess/API/efl/EwkView.h
Source/WebKit2/UIProcess/API/efl/SnapshotImageGL.cpp
Source/WebKit2/UIProcess/API/efl/SnapshotImageGL.h
Source/WebKit2/UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestBase.cpp
Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp
Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h
Source/WebKit2/UIProcess/API/ios/PageClientImplIOS.h
Source/WebKit2/UIProcess/API/ios/PageClientImplIOS.mm
Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.cpp
Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.h
Source/WebKit2/UIProcess/CoordinatedGraphics/PageViewportController.cpp
Source/WebKit2/UIProcess/CoordinatedGraphics/PageViewportController.h
Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp
Source/WebKit2/UIProcess/DrawingAreaProxy.h
Source/WebKit2/UIProcess/DrawingAreaProxy.messages.in
Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp
Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h
Source/WebKit2/UIProcess/PageClient.h
Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm
Source/WebKit2/UIProcess/WebPageProxy.cpp
Source/WebKit2/UIProcess/WebPageProxy.h
Source/WebKit2/UIProcess/efl/PageLoadClientEfl.cpp
Source/WebKit2/UIProcess/efl/PageViewportControllerClientEfl.cpp
Source/WebKit2/UIProcess/efl/ViewClientEfl.cpp
Source/WebKit2/UIProcess/mac/WebContextMac.mm
Source/WebKit2/WebProcess/FullScreen/WebFullScreenManager.cpp
Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp
Source/WebKit2/WebProcess/Plugins/PluginController.h
Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp
Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h
Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.cpp
Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedDrawingArea.h
Source/WebKit2/WebProcess/WebPage/DrawingArea.h
Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp
Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h
Source/WebKit2/WebProcess/WebPage/WebPage.cpp
Source/WebKit2/WebProcess/WebPage/WebPage.h
Source/WebKit2/WebProcess/WebPage/mac/GraphicsLayerCARemote.cpp
Source/WebKit2/WebProcess/WebPage/mac/GraphicsLayerCARemote.h
Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp
Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.h
Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemoteCustom.h
Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemoteCustom.mm
Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemoteTiledBacking.cpp
Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemoteTiledBacking.h
Source/WebKit2/WebProcess/WebProcess.cpp
Source/WebKit2/WebProcess/WebProcess.h
Tools/ChangeLog
Tools/DumpRenderTree/efl/DumpRenderTree.cpp
Tools/EWebLauncher/main.c
Tools/MiniBrowser/efl/main.c
Tools/TestWebKitAPI/efl/PlatformWebView.cpp
Tools/WebKitTestRunner/cairo/TestInvocationCairo.cpp
Tools/WebKitTestRunner/efl/PlatformWebViewEfl.cpp

index a1721c6..ddd89be 100644 (file)
@@ -1,3 +1,18 @@
+2014-01-30  Andrei Bucur  <abucur@adobe.com>
+
+        Remove the ACCELERATED_COMPOSITING flag
+        https://bugs.webkit.org/show_bug.cgi?id=127833
+
+        Reviewed by Antti Koivisto.
+
+        Remove the USE(ACCELERATED_COMPOSITING) conditionals from the code base and make AC
+        mandatory.
+
+        * wtf/OwnPtrCommon.h:
+        * wtf/Platform.h:
+        * wtf/efl/OwnPtrEfl.cpp:
+        (WTF::deleteOwnedPtr):
+
 2014-01-28  Michael Saboff  <msaboff@apple.com>
 
         Merge the jsCStack branch
index c31847b..a19621e 100644 (file)
@@ -39,10 +39,8 @@ typedef struct _Eo_Opaque Evas_Object;
 #else
 typedef struct _Evas_Object Evas_Object;
 #endif
-#if USE(ACCELERATED_COMPOSITING)
 typedef struct _Evas_GL Evas_GL;
 #endif
-#endif
 
 namespace WTF {
 
@@ -60,10 +58,8 @@ namespace WTF {
     WTF_EXPORT_PRIVATE void deleteOwnedPtr(Eina_Hash*);
     WTF_EXPORT_PRIVATE void deleteOwnedPtr(Eina_Module*);
     WTF_EXPORT_PRIVATE void deleteOwnedPtr(Evas_Object*);
-#if USE(ACCELERATED_COMPOSITING)
     WTF_EXPORT_PRIVATE void deleteOwnedPtr(Evas_GL*);
 #endif
-#endif
 
 } // namespace WTF
 
index a0da559..dd112e3 100644 (file)
 #endif
 #endif
 
-/* Accelerated compositing */
-#if PLATFORM(MAC) || PLATFORM(IOS) || (PLATFORM(WIN) && !USE(WINGDI) && !PLATFORM(WIN_CAIRO))
-#define WTF_USE_ACCELERATED_COMPOSITING 1
-#endif
-
 #if ENABLE(WEBGL) && !defined(WTF_USE_3D_GRAPHICS)
 #define WTF_USE_3D_GRAPHICS 1
 #endif
 #define GST_API_VERSION_1 1
 #endif
 
-#if USE(ACCELERATED_COMPOSITING) && PLATFORM(WIN_CAIRO)
+#if PLATFORM(WIN_CAIRO)
 #define WTF_USE_TEXTURE_MAPPER 1
 #endif
 
index 4b289f8..2634bcf 100644 (file)
 #include <Ecore_IMF.h>
 #include <Eina.h>
 #include <Evas.h>
-
-#if USE(ACCELERATED_COMPOSITING)
 #include <Evas_GL.h>
-#endif
 
 namespace WTF {
 
@@ -69,12 +66,10 @@ void deleteOwnedPtr(Ecore_IMF_Context* ptr)
         ecore_imf_context_del(ptr);
 }
 
-#if USE(ACCELERATED_COMPOSITING)
 void deleteOwnedPtr(Evas_GL* ptr)
 {
     if (ptr)
         evas_gl_free(ptr);
 }
-#endif
 
 }
index d79fa3f..8b00978 100644 (file)
@@ -1,3 +1,434 @@
+2014-01-30  Andrei Bucur  <abucur@adobe.com>
+
+        Remove the ACCELERATED_COMPOSITING flag
+        https://bugs.webkit.org/show_bug.cgi?id=127833
+
+        Reviewed by Antti Koivisto.
+
+        Remove the USE(ACCELERATED_COMPOSITING) conditionals from the code base and make AC
+        mandatory.
+
+        Tests: No new tests, no functional change.
+
+        * css/MediaQueryEvaluator.cpp:
+        (WebCore::transform_3dMediaFeatureEval):
+        * css/StyleResolver.cpp:
+        (WebCore::StyleResolver::canShareStyleWithElement):
+        * dom/Document.cpp:
+        (WebCore::Document::setVisualUpdatesAllowed):
+        (WebCore::Document::recalcStyle):
+        (WebCore::Document::createRenderTree):
+        (WebCore::Document::documentWillBecomeInactive):
+        (WebCore::Document::documentDidResumeFromPageCache):
+        (WebCore::Document::windowScreenDidChange):
+        * dom/PseudoElement.cpp:
+        (WebCore::PseudoElement::~PseudoElement):
+        * history/CachedFrame.cpp:
+        (WebCore::CachedFrameBase::CachedFrameBase):
+        (WebCore::CachedFrameBase::restore):
+        (WebCore::CachedFrame::CachedFrame):
+        * history/CachedFrame.h:
+        * history/CachedPage.cpp:
+        (WebCore::CachedPage::restore):
+        * history/CachedPage.h:
+        * history/PageCache.cpp:
+        (WebCore::PageCache::PageCache):
+        (WebCore::PageCache::markPagesForDeviceScaleChanged):
+        * history/PageCache.h:
+        * html/HTMLCanvasElement.cpp:
+        (WebCore::HTMLCanvasElement::getContext):
+        (WebCore::HTMLCanvasElement::reset):
+        (WebCore::HTMLCanvasElement::paintsIntoCanvasBuffer):
+        (WebCore::HTMLCanvasElement::createImageBuffer):
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::parseAttribute):
+        * html/HTMLMediaElement.h:
+        * html/canvas/CanvasRenderingContext.h:
+        * html/canvas/CanvasRenderingContext2D.cpp:
+        (WebCore::CanvasRenderingContext2D::didDraw):
+        * html/canvas/CanvasRenderingContext2D.h:
+        * html/canvas/WebGLRenderingContext.cpp:
+        (WebCore::WebGLRenderingContext::markContextChanged):
+        (WebCore::WebGLRenderingContext::reshape):
+        (WebCore::WebGLRenderingContext::platformLayer):
+        * html/canvas/WebGLRenderingContext.h:
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::InspectorController):
+        * inspector/InspectorInstrumentation.cpp:
+        (WebCore::InspectorInstrumentation::didCommitLoadImpl):
+        (WebCore::InspectorInstrumentation::pseudoElementDestroyedImpl):
+        * inspector/InspectorInstrumentation.h:
+        (WebCore::InspectorInstrumentation::pseudoElementDestroyed):
+        * inspector/InspectorLayerTreeAgent.cpp:
+        * inspector/InstrumentingAgents.cpp:
+        (WebCore::InstrumentingAgents::InstrumentingAgents):
+        (WebCore::InstrumentingAgents::reset):
+        * inspector/InstrumentingAgents.h:
+        * loader/EmptyClients.h:
+        * page/ChromeClient.h:
+        * page/Frame.cpp:
+        (WebCore::Frame::layerTreeAsText):
+        (WebCore::Frame::deviceOrPageScaleFactorChanged):
+        * page/Frame.h:
+        * page/FrameView.cpp:
+        (WebCore::FrameView::setFrameRect):
+        (WebCore::FrameView::scheduleLayerFlushAllowingThrottling):
+        (WebCore::FrameView::hasCompositedContent):
+        (WebCore::FrameView::hasCompositedContentIncludingDescendants):
+        (WebCore::FrameView::hasCompositingAncestor):
+        (WebCore::FrameView::enterCompositingMode):
+        (WebCore::FrameView::isEnclosedInCompositingLayer):
+        (WebCore::FrameView::flushCompositingStateIncludingSubframes):
+        (WebCore::FrameView::isSoftwareRenderable):
+        (WebCore::FrameView::layout):
+        (WebCore::FrameView::contentsInCompositedLayer):
+        (WebCore::FrameView::scrollContentsFastPath):
+        (WebCore::FrameView::scrollContentsSlowPath):
+        (WebCore::FrameView::setIsOverlapped):
+        (WebCore::FrameView::delegatesScrollingDidChange):
+        (WebCore::FrameView::scrollPositionChanged):
+        (WebCore::FrameView::updateCompositingLayersAfterScrolling):
+        (WebCore::FrameView::visibleContentsResized):
+        (WebCore::FrameView::addedOrRemovedScrollbar):
+        (WebCore::FrameView::disableLayerFlushThrottlingTemporarilyForInteraction):
+        (WebCore::FrameView::updateLayerFlushThrottlingInAllFrames):
+        (WebCore::FrameView::adjustTiledBackingCoverage):
+        (WebCore::FrameView::hasExtendedBackground):
+        (WebCore::FrameView::extendedBackgroundRect):
+        (WebCore::FrameView::setBackgroundExtendsBeyondPage):
+        (WebCore::FrameView::performPostLayoutTasks):
+        (WebCore::FrameView::paintContents):
+        (WebCore::FrameView::setTracksRepaints):
+        (WebCore::FrameView::resetTrackedRepaints):
+        (WebCore::FrameView::setScrollingPerformanceLoggingEnabled):
+        (WebCore::FrameView::setExposedRect):
+        * page/FrameView.h:
+        * page/Page.cpp:
+        (WebCore::Page::setPageScaleFactor):
+        (WebCore::Page::setDeviceScaleFactor):
+        * page/Settings.cpp:
+        (WebCore::Settings::setBackgroundShouldExtendBeyondPage):
+        * page/animation/AnimationBase.cpp:
+        (WebCore::AnimationBase::freezeAtTime):
+        * page/animation/AnimationController.cpp:
+        (WebCore::AnimationController::supportsAcceleratedAnimationOfProperty):
+        * page/animation/CSSPropertyAnimation.cpp:
+        (WebCore::CSSPropertyAnimationWrapperMap::CSSPropertyAnimationWrapperMap):
+        (WebCore::CSSPropertyAnimation::blendProperties):
+        (WebCore::CSSPropertyAnimation::animationOfPropertyIsAccelerated):
+        * page/animation/CSSPropertyAnimation.h:
+        * page/animation/CompositeAnimation.cpp:
+        (WebCore::CompositeAnimation::updateTransitions):
+        * page/animation/ImplicitAnimation.cpp:
+        (WebCore::ImplicitAnimation::animate):
+        (WebCore::ImplicitAnimation::startAnimation):
+        (WebCore::ImplicitAnimation::pauseAnimation):
+        (WebCore::ImplicitAnimation::endAnimation):
+        (WebCore::ImplicitAnimation::timeToNextService):
+        * page/animation/KeyframeAnimation.cpp:
+        (WebCore::KeyframeAnimation::animate):
+        (WebCore::KeyframeAnimation::startAnimation):
+        (WebCore::KeyframeAnimation::pauseAnimation):
+        (WebCore::KeyframeAnimation::endAnimation):
+        (WebCore::KeyframeAnimation::timeToNextService):
+        * page/ios/FrameIOS.mm:
+        (WebCore::Frame::viewportOffsetChanged):
+        (WebCore::Frame::containsTiledBackingLayers):
+        * page/scrolling/AsyncScrollingCoordinator.cpp:
+        (WebCore::AsyncScrollingCoordinator::updateScrollPositionAfterAsyncScroll):
+        * page/scrolling/ScrollingCoordinator.cpp:
+        (WebCore::ScrollingCoordinator::coordinatesScrollingForFrameView):
+        (WebCore::ScrollingCoordinator::computeNonFastScrollableRegion):
+        (WebCore::ScrollingCoordinator::verticalScrollbarLayerForScrollableArea):
+        (WebCore::ScrollingCoordinator::scrollLayerForFrameView):
+        (WebCore::ScrollingCoordinator::headerLayerForFrameView):
+        (WebCore::ScrollingCoordinator::footerLayerForFrameView):
+        (WebCore::ScrollingCoordinator::counterScrollingLayerForFrameView):
+        (WebCore::ScrollingCoordinator::hasVisibleSlowRepaintViewportConstrainedObjects):
+        * page/scrolling/ScrollingCoordinator.h:
+        * platform/ScrollView.cpp:
+        (WebCore::positionScrollCornerLayer):
+        (WebCore::ScrollView::positionScrollbarLayers):
+        (WebCore::ScrollView::paintScrollbars):
+        (WebCore::ScrollView::paint):
+        * platform/ScrollableArea.cpp:
+        (WebCore::ScrollableArea::invalidateScrollbar):
+        (WebCore::ScrollableArea::invalidateScrollCorner):
+        (WebCore::ScrollableArea::horizontalScrollbarLayerDidChange):
+        (WebCore::ScrollableArea::hasLayerForHorizontalScrollbar):
+        (WebCore::ScrollableArea::hasLayerForVerticalScrollbar):
+        (WebCore::ScrollableArea::hasLayerForScrollCorner):
+        * platform/ScrollableArea.h:
+        * platform/ScrollbarTheme.h:
+        * platform/efl/EflScreenUtilities.cpp:
+        (WebCore::applyFallbackCursor):
+        * platform/graphics/GraphicsContext3D.h:
+        * platform/graphics/GraphicsContext3DPrivate.cpp:
+        (WebCore::GraphicsContext3DPrivate::~GraphicsContext3DPrivate):
+        (WebCore::GraphicsContext3DPrivate::paintToTextureMapper):
+        * platform/graphics/GraphicsContext3DPrivate.h:
+        * platform/graphics/GraphicsLayer.cpp:
+        * platform/graphics/GraphicsLayer.h:
+        * platform/graphics/GraphicsLayerAnimation.cpp:
+        * platform/graphics/GraphicsLayerAnimation.h:
+        * platform/graphics/GraphicsLayerClient.h:
+        * platform/graphics/GraphicsLayerFactory.h:
+        * platform/graphics/GraphicsLayerUpdater.cpp:
+        * platform/graphics/GraphicsLayerUpdater.h:
+        * platform/graphics/ImageBuffer.cpp:
+        * platform/graphics/ImageBuffer.h:
+        * platform/graphics/MediaPlayer.cpp:
+        (WebCore::MediaPlayer::platformLayer):
+        (WebCore::MediaPlayer::supportsAcceleratedRendering):
+        * platform/graphics/MediaPlayer.h:
+        * platform/graphics/MediaPlayerPrivate.h:
+        * platform/graphics/PlatformLayer.h:
+        * platform/graphics/TextTrackRepresentation.cpp:
+        * platform/graphics/TextTrackRepresentation.h:
+        * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:
+        (WebCore::MediaPlayerPrivateAVFoundation::currentRenderingMode):
+        (WebCore::MediaPlayerPrivateAVFoundation::preferredRenderingMode):
+        (WebCore::MediaPlayerPrivateAVFoundation::setUpVideoRendering):
+        (WebCore::MediaPlayerPrivateAVFoundation::tearDownVideoRendering):
+        * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h:
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h:
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
+        (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::platformLayer):
+        (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::acceleratedRenderingStateChanged):
+        * platform/graphics/ca/GraphicsLayerCA.cpp:
+        * platform/graphics/ca/GraphicsLayerCA.h:
+        * platform/graphics/ca/LayerFlushScheduler.cpp:
+        * platform/graphics/ca/LayerFlushScheduler.h:
+        * platform/graphics/ca/LayerFlushSchedulerClient.h:
+        * platform/graphics/ca/PlatformCAAnimation.h:
+        * platform/graphics/ca/PlatformCAFilters.h:
+        * platform/graphics/ca/PlatformCALayer.h:
+        * platform/graphics/ca/PlatformCALayerClient.h:
+        * platform/graphics/ca/mac/LayerFlushSchedulerMac.cpp:
+        * platform/graphics/ca/mac/PlatformCAAnimationMac.mm:
+        (PlatformCAAnimation::copyTimingFunctionsFrom):
+        * platform/graphics/ca/mac/PlatformCAFiltersMac.mm:
+        * platform/graphics/ca/mac/PlatformCALayerMac.h:
+        * platform/graphics/ca/mac/PlatformCALayerMac.mm:
+        (PlatformCALayerMac::enumerateRectsBeingDrawn):
+        * platform/graphics/ca/win/AbstractCACFLayerTreeHost.h:
+        * platform/graphics/ca/win/CACFLayerTreeHost.cpp:
+        * platform/graphics/ca/win/CACFLayerTreeHost.h:
+        * platform/graphics/ca/win/CACFLayerTreeHostClient.h:
+        * platform/graphics/ca/win/LayerChangesFlusher.cpp:
+        * platform/graphics/ca/win/LayerChangesFlusher.h:
+        * platform/graphics/ca/win/LegacyCACFLayerTreeHost.cpp:
+        * platform/graphics/ca/win/LegacyCACFLayerTreeHost.h:
+        * platform/graphics/ca/win/PlatformCAAnimationWin.cpp:
+        (PlatformCAAnimation::copyTimingFunctionsFrom):
+        * platform/graphics/ca/win/PlatformCAFiltersWin.cpp:
+        * platform/graphics/ca/win/PlatformCALayerWin.cpp:
+        (PlatformCALayerWin::createCompatibleLayer):
+        * platform/graphics/ca/win/PlatformCALayerWin.h:
+        * platform/graphics/ca/win/PlatformCALayerWinInternal.cpp:
+        (PlatformCALayerWinInternal::drawTile):
+        * platform/graphics/ca/win/PlatformCALayerWinInternal.h:
+        * platform/graphics/ca/win/WKCACFViewLayerTreeHost.cpp:
+        * platform/graphics/ca/win/WKCACFViewLayerTreeHost.h:
+        * platform/graphics/cairo/DrawingBufferCairo.cpp:
+        (WebCore::DrawingBuffer::paintCompositedResultsToCanvas):
+        * platform/graphics/cairo/GraphicsContext3DCairo.cpp:
+        (WebCore::GraphicsContext3D::platformLayer):
+        * platform/graphics/cairo/ImageBufferCairo.cpp:
+        (WebCore::ImageBuffer::platformLayer):
+        * platform/graphics/efl/GraphicsContext3DEfl.cpp:
+        (WebCore::GraphicsContext3D::platformLayer):
+        * platform/graphics/efl/GraphicsContext3DPrivate.cpp:
+        * platform/graphics/efl/GraphicsContext3DPrivate.h:
+        * platform/graphics/gpu/DrawingBuffer.h:
+        * platform/graphics/gpu/LoopBlinnMathUtils.cpp:
+        * platform/graphics/gpu/TilingData.cpp:
+        * platform/graphics/gpu/mac/DrawingBufferMac.mm:
+        (WebCore::DrawingBuffer::frontColorBuffer):
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
+        (WebCore::MediaPlayerPrivateGStreamerBase::triggerRepaint):
+        (WebCore::MediaPlayerPrivateGStreamerBase::paint):
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h:
+        * platform/graphics/ios/MediaPlayerPrivateIOS.h:
+        * platform/graphics/ios/MediaPlayerPrivateIOS.mm:
+        (WebCore::MediaPlayerPrivateIOS::supportsAcceleratedRendering):
+        * platform/graphics/mac/MediaPlayerPrivateQTKit.h:
+        * platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
+        (WebCore::MediaPlayerPrivateQTKit::createQTMovieLayer):
+        (WebCore::MediaPlayerPrivateQTKit::destroyQTMovieLayer):
+        (WebCore::MediaPlayerPrivateQTKit::preferredRenderingMode):
+        (WebCore::MediaPlayerPrivateQTKit::platformLayer):
+        (WebCore::MediaPlayerPrivateQTKit::setClosedCaptionsVisible):
+        (WebCore::MediaPlayerPrivateQTKit::layerHostChanged):
+        (WebCore::MediaPlayerPrivateQTKit::acceleratedRenderingStateChanged):
+        (-[WebCoreMovieObserver layerHostChanged:]):
+        * platform/graphics/mac/WebGLLayer.h:
+        * platform/graphics/mac/WebGLLayer.mm:
+        * platform/graphics/mac/WebLayer.h:
+        * platform/graphics/mac/WebLayer.mm:
+        * platform/graphics/mac/WebTiledLayer.h:
+        * platform/graphics/mac/WebTiledLayer.mm:
+        * platform/graphics/opengl/GLDefs.h:
+        * platform/graphics/opengl/GLPlatformContext.cpp:
+        * platform/graphics/opengl/GLPlatformContext.h:
+        * platform/graphics/opengl/GLPlatformSurface.cpp:
+        * platform/graphics/opengl/GLPlatformSurface.h:
+        * platform/graphics/surfaces/GLTransportSurface.cpp:
+        * platform/graphics/surfaces/GLTransportSurface.h:
+        * platform/graphics/surfaces/glx/GLXConfigSelector.h:
+        * platform/graphics/surfaces/glx/GLXContext.cpp:
+        * platform/graphics/surfaces/glx/GLXContext.h:
+        * platform/graphics/surfaces/glx/GLXSurface.cpp:
+        * platform/graphics/surfaces/glx/GLXSurface.h:
+        * platform/graphics/texmap/TextureMapper.cpp:
+        * platform/graphics/texmap/TextureMapper.h:
+        * platform/graphics/texmap/TextureMapperBackingStore.cpp:
+        * platform/graphics/texmap/TextureMapperBackingStore.h:
+        * platform/graphics/texmap/TextureMapperFPSCounter.cpp:
+        * platform/graphics/texmap/TextureMapperFPSCounter.h:
+        * platform/graphics/texmap/TextureMapperGL.cpp:
+        * platform/graphics/texmap/TextureMapperGL.h:
+        * platform/graphics/texmap/TextureMapperLayer.cpp:
+        * platform/graphics/texmap/TextureMapperLayer.h:
+        * platform/graphics/texmap/TextureMapperShaderProgram.cpp:
+        * platform/graphics/texmap/TextureMapperSurfaceBackingStore.cpp:
+        * platform/graphics/texmap/TextureMapperSurfaceBackingStore.h:
+        * platform/graphics/texmap/TextureMapperTile.cpp:
+        * platform/graphics/texmap/TextureMapperTile.h:
+        * platform/graphics/texmap/TextureMapperTiledBackingStore.cpp:
+        * platform/graphics/texmap/TextureMapperTiledBackingStore.h:
+        * platform/graphics/win/GraphicsContext3DWin.cpp:
+        (WebCore::GraphicsContext3D::platformLayer):
+        * platform/graphics/win/MediaPlayerPrivateFullscreenWindow.cpp:
+        (WebCore::MediaPlayerPrivateFullscreenWindow::createWindow):
+        (WebCore::MediaPlayerPrivateFullscreenWindow::wndProc):
+        * platform/graphics/win/MediaPlayerPrivateFullscreenWindow.h:
+        * platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp:
+        (WebCore::MediaPlayerPrivateQuickTimeVisualContext::LayerClient::platformCALayerLayoutSublayersOfLayer):
+        (WebCore::MediaPlayerPrivateQuickTimeVisualContext::MediaPlayerPrivateQuickTimeVisualContext):
+        (WebCore::MediaPlayerPrivateQuickTimeVisualContext::supportsFullscreen):
+        (WebCore::MediaPlayerPrivateQuickTimeVisualContext::platformMedia):
+        (WebCore::MediaPlayerPrivateQuickTimeVisualContext::platformLayer):
+        (WebCore::MediaPlayerPrivateQuickTimeVisualContext::naturalSize):
+        (WebCore::MediaPlayerPrivateQuickTimeVisualContext::paint):
+        (WebCore::CreateCGImageFromPixelBuffer):
+        (WebCore::MediaPlayerPrivateQuickTimeVisualContext::retrieveCurrentImage):
+        (WebCore::MediaPlayerPrivateQuickTimeVisualContext::currentRenderingMode):
+        (WebCore::MediaPlayerPrivateQuickTimeVisualContext::preferredRenderingMode):
+        (WebCore::MediaPlayerPrivateQuickTimeVisualContext::setUpVideoRendering):
+        (WebCore::MediaPlayerPrivateQuickTimeVisualContext::tearDownVideoRendering):
+        (WebCore::MediaPlayerPrivateQuickTimeVisualContext::hasSetUpVideoRendering):
+        (WebCore::MediaPlayerPrivateQuickTimeVisualContext::retrieveAndResetMovieTransform):
+        (WebCore::MediaPlayerPrivateQuickTimeVisualContext::createLayerForMovie):
+        (WebCore::MediaPlayerPrivateQuickTimeVisualContext::destroyLayerForMovie):
+        (WebCore::MediaPlayerPrivateQuickTimeVisualContext::setPrivateBrowsingMode):
+        * platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.h:
+        * platform/graphics/win/WKCAImageQueue.cpp:
+        * platform/graphics/win/WKCAImageQueue.h:
+        * platform/mac/ScrollbarThemeMac.h:
+        * platform/mac/ScrollbarThemeMac.mm:
+        * plugins/PluginViewBase.h:
+        * rendering/FlowThreadController.cpp:
+        (WebCore::FlowThreadController::updateRenderFlowThreadLayersIfNeeded):
+        * rendering/FlowThreadController.h:
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::styleWillChange):
+        (WebCore::isCandidateForOpaquenessTest):
+        (WebCore::layersUseImage):
+        (WebCore::RenderBox::imageChanged):
+        * rendering/RenderBoxModelObject.cpp:
+        (WebCore::RenderBoxModelObject::suspendAnimations):
+        (WebCore::RenderBoxModelObject::fixedBackgroundPaintsInLocalCoordinates):
+        * rendering/RenderBoxModelObject.h:
+        * rendering/RenderElement.cpp:
+        (WebCore::RenderElement::adjustStyleDifference):
+        (WebCore::RenderElement::setStyle):
+        (WebCore::RenderElement::styleWillChange):
+        * rendering/RenderEmbeddedObject.cpp:
+        (WebCore::RenderEmbeddedObject::allowsAcceleratedCompositing):
+        * rendering/RenderEmbeddedObject.h:
+        * rendering/RenderFlowThread.cpp:
+        (WebCore::RenderFlowThread::RenderFlowThread):
+        (WebCore::RenderFlowThread::layout):
+        (WebCore::RenderFlowThread::updateAllLayerToRegionMappings):
+        * rendering/RenderFlowThread.h:
+        * rendering/RenderFullScreen.cpp:
+        * rendering/RenderImage.cpp:
+        (WebCore::RenderImage::imageDimensionsChanged):
+        (WebCore::RenderImage::notifyFinished):
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::RenderLayer):
+        (WebCore::RenderLayer::~RenderLayer):
+        (WebCore::RenderLayer::canRender3DTransforms):
+        (WebCore::RenderLayer::paintsWithFilters):
+        (WebCore::RenderLayer::updateLayerPositions):
+        (WebCore::RenderLayer::updateDescendantsAreContiguousInStackingOrderRecursive):
+        (WebCore::RenderLayer::currentTransform):
+        (WebCore::RenderLayer::updateDescendantDependentFlags):
+        (WebCore::RenderLayer::checkIfDescendantClippingContextNeedsUpdate):
+        (WebCore::RenderLayer::shouldRepaintAfterLayout):
+        (WebCore::RenderLayer::enclosingFilterRepaintLayer):
+        (WebCore::RenderLayer::setFilterBackendNeedsRepaintingInRect):
+        (WebCore::RenderLayer::clippingRootForPainting):
+        (WebCore::RenderLayer::addChild):
+        (WebCore::RenderLayer::removeChild):
+        (WebCore::RenderLayer::removeOnlyThisLayer):
+        (WebCore::RenderLayer::scrollTo):
+        (WebCore::RenderLayer::updateCompositingLayersAfterScroll):
+        (WebCore::RenderLayer::invalidateScrollbarRect):
+        (WebCore::RenderLayer::invalidateScrollCornerRect):
+        (WebCore::RenderLayer::positionOverflowControls):
+        (WebCore::RenderLayer::updateScrollInfoAfterLayout):
+        (WebCore::RenderLayer::paintOverflowControls):
+        (WebCore::shouldDoSoftwarePaint):
+        (WebCore::RenderLayer::paintLayer):
+        (WebCore::RenderLayer::calculateClipRects):
+        * rendering/RenderLayer.h:
+        * rendering/RenderLayerBacking.cpp:
+        * rendering/RenderLayerBacking.h:
+        * rendering/RenderLayerCompositor.cpp:
+        * rendering/RenderLayerCompositor.h:
+        * rendering/RenderNamedFlowThread.cpp:
+        (WebCore::RenderNamedFlowThread::collectsGraphicsLayersUnderRegions):
+        * rendering/RenderNamedFlowThread.h:
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::containerForRepaint):
+        (WebCore::RenderObject::repaintUsingContainer):
+        * rendering/RenderTreeAsText.cpp:
+        (WebCore::write):
+        * rendering/RenderVideo.cpp:
+        (WebCore::RenderVideo::updatePlayer):
+        (WebCore::RenderVideo::acceleratedRenderingStateChanged):
+        * rendering/RenderVideo.h:
+        * rendering/RenderView.cpp:
+        (WebCore::RenderView::paintBoxDecorations):
+        (WebCore::RenderView::repaintRootContents):
+        (WebCore::RenderView::repaintRectangleInViewAndCompositedLayers):
+        (WebCore::RenderView::repaintViewAndCompositedLayers):
+        (WebCore::RenderView::setMaximalOutlineSize):
+        (WebCore::RenderView::compositor):
+        (WebCore::RenderView::setIsInWindow):
+        * rendering/RenderView.h:
+        * rendering/RenderWidget.cpp:
+        (WebCore::RenderWidget::setWidgetGeometry):
+        (WebCore::RenderWidget::requiresAcceleratedCompositing):
+        * rendering/RenderWidget.h:
+        * rendering/style/RenderStyle.cpp:
+        (WebCore::RenderStyle::changeRequiresLayout):
+        (WebCore::RenderStyle::changeRequiresLayerRepaint):
+        (WebCore::RenderStyle::changeRequiresRecompositeLayer):
+        (WebCore::RenderStyle::diff):
+        * rendering/style/RenderStyle.h:
+        * rendering/style/RenderStyleConstants.h:
+        * rendering/style/StyleRareNonInheritedData.cpp:
+        (WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
+        (WebCore::StyleRareNonInheritedData::operator==):
+        * rendering/style/StyleRareNonInheritedData.h:
+        * testing/Internals.cpp:
+        (WebCore::Internals::resetToConsistentState):
+        (WebCore::Internals::setHeaderHeight):
+        (WebCore::Internals::setFooterHeight):
+
 2014-01-30  Krzysztof Czech  <k.czech@samsung.com>
 
         AX: Clean up AccessibilityRenderObject
index 1d176ed..d395615 100644 (file)
@@ -55,7 +55,7 @@
 #include "StyleResolver.h"
 #include <wtf/HashMap.h>
 
-#if ENABLE(3D_RENDERING) && USE(ACCELERATED_COMPOSITING)
+#if ENABLE(3D_RENDERING)
 #include "RenderLayerCompositor.h"
 #endif
 
@@ -571,10 +571,8 @@ static bool transform_3dMediaFeatureEval(CSSValue* value, RenderStyle*, Frame* f
 
 #if ENABLE(3D_RENDERING)
     bool threeDEnabled = false;
-#if USE(ACCELERATED_COMPOSITING)
     if (RenderView* view = frame->contentRenderer())
         threeDEnabled = view->compositor().canRender3DTransforms();
-#endif
 
     returnValueIfNoParameter = threeDEnabled;
     have3dRendering = threeDEnabled ? 1 : 0;
index 827388f..9172b0f 100644 (file)
@@ -680,7 +680,6 @@ bool StyleResolver::canShareStyleWithElement(StyledElement* element) const
     if (style->transitions() || style->animations())
         return false;
 
-#if USE(ACCELERATED_COMPOSITING)
     // Turn off style sharing for elements that can gain layers for reasons outside of the style system.
     // See comments in RenderObject::setStyle().
     if (element->hasTagName(iframeTag) || element->hasTagName(frameTag) || element->hasTagName(embedTag) || element->hasTagName(objectTag) || element->hasTagName(appletTag) || element->hasTagName(canvasTag))
@@ -692,8 +691,6 @@ bool StyleResolver::canShareStyleWithElement(StyledElement* element) const
         return false;
 #endif
 
-#endif
-
     if (elementHasDirectionAuto(element))
         return false;
 
index 9c28c6b..7d70dcc 100644 (file)
 #include "PointerLockController.h"
 #include "PopStateEvent.h"
 #include "ProcessingInstruction.h"
+#include "RenderLayerCompositor.h"
 #include "RenderView.h"
 #include "RenderWidget.h"
 #include "ResourceLoadScheduler.h"
 #include <wtf/TemporaryChange.h>
 #include <wtf/text/StringBuffer.h>
 
-#if USE(ACCELERATED_COMPOSITING)
-#include "RenderLayerCompositor.h"
-#endif
-
 #if ENABLE(SHARED_WORKERS)
 #include "SharedWorkerRepository.h"
 #endif
@@ -1242,10 +1239,8 @@ void Document::setVisualUpdatesAllowed(bool visualUpdatesAllowed)
         }
     }
 
-#if USE(ACCELERATED_COMPOSITING)
     if (view())
         view()->updateCompositingLayersAfterLayout();
-#endif
 
     if (RenderView* renderView = this->renderView())
         renderView->repaintViewAndCompositedLayers();
@@ -1751,9 +1746,7 @@ void Document::recalcStyle(Style::Change change)
 
         Style::resolveTree(*this, change);
 
-#if USE(ACCELERATED_COMPOSITING)
         frameView.updateCompositingLayersAfterStyleChange();
-#endif
 
         clearNeedsStyleRecalc();
         clearChildNeedsStyleRecalc();
@@ -1956,9 +1949,7 @@ void Document::createRenderTree()
     m_renderView = createRenderer<RenderView>(*this, RenderStyle::create());
     Node::setRenderer(m_renderView.get());
 
-#if USE(ACCELERATED_COMPOSITING)
     renderView()->setIsInWindow(true);
-#endif
 
     recalcStyle(Style::Force);
 }
@@ -4077,10 +4068,8 @@ void Document::setInPageCache(bool flag)
 
 void Document::documentWillBecomeInactive()
 {
-#if USE(ACCELERATED_COMPOSITING)
     if (renderView())
         renderView()->setIsInWindow(false);
-#endif
 }
 
 void Document::documentWillSuspendForPageCache()
@@ -4106,10 +4095,8 @@ void Document::documentDidResumeFromPageCache()
     for (Vector<Element*>::iterator i = elements.begin(); i != end; ++i)
         (*i)->documentDidResumeFromPageCache();
 
-#if USE(ACCELERATED_COMPOSITING)
     if (renderView())
         renderView()->setIsInWindow(true);
-#endif
 
     ASSERT(page());
     page()->lockAllOverlayScrollbarsToHidden(false);
@@ -5008,12 +4995,10 @@ void Document::windowScreenDidChange(PlatformDisplayID displayID)
         m_scriptedAnimationController->windowScreenDidChange(displayID);
 #endif
 
-#if USE(ACCELERATED_COMPOSITING)
     if (RenderView* view = renderView()) {
         if (view->usesCompositing())
             view->compositor().windowScreenDidChange(displayID);
     }
-#endif
 }
 
 String Document::displayStringModifiedByEncoding(const String& str) const
index 29259e2..ce5bf2c 100644 (file)
@@ -67,9 +67,7 @@ PseudoElement::PseudoElement(Element& host, PseudoId pseudoId)
 PseudoElement::~PseudoElement()
 {
     ASSERT(!m_hostElement);
-#if USE(ACCELERATED_COMPOSITING)
     InspectorInstrumentation::pseudoElementDestroyed(document().page(), this);
-#endif
 }
 
 PassRefPtr<RenderStyle> PseudoElement::customStyleForRenderer()
index 1f61671..721e9e3 100644 (file)
@@ -43,6 +43,7 @@
 #include "Logging.h"
 #include "MainFrame.h"
 #include "Page.h"
+#include "PageCache.h"
 #include "PageTransitionEvent.h"
 #include "ScriptController.h"
 #include "SerializedScriptValue.h"
 #include "ChromeClient.h"
 #endif
 
-#if USE(ACCELERATED_COMPOSITING)
-#include "PageCache.h"
-#endif
-
 namespace WebCore {
 
 DEFINE_DEBUG_ONLY_GLOBAL(WTF::RefCountedLeakCounter, cachedFrameCounter, ("CachedFrame"));
@@ -73,9 +70,7 @@ CachedFrameBase::CachedFrameBase(Frame& frame)
     , m_mousePressNode(frame.eventHandler().mousePressNode())
     , m_url(frame.document()->url())
     , m_isMainFrame(!frame.tree().parent())
-#if USE(ACCELERATED_COMPOSITING)
     , m_isComposited(frame.view()->hasCompositedContent())
-#endif
 {
 }
 
@@ -112,10 +107,8 @@ void CachedFrameBase::restore()
     // cached page.
     frame.script().updatePlatformScriptObjects();
 
-#if USE(ACCELERATED_COMPOSITING)
     if (m_isComposited)
         frame.view()->restoreBackingStores();
-#endif
 
     frame.loader().client().didRestoreFromPageCache();
 
@@ -188,10 +181,8 @@ CachedFrame::CachedFrame(Frame& frame)
 
     frame.loader().client().savePlatformDataToCachedFrame(this);
 
-#if USE(ACCELERATED_COMPOSITING)
     if (m_isComposited && pageCache()->shouldClearBackingStores())
         frame.view()->clearBackingStores();
-#endif
 
     // documentWillSuspendForPageCache() can set up a layout timer on the FrameView, so clear timers after that.
     frame.clearTimers();
index e9f367b..feae1df 100644 (file)
@@ -61,9 +61,7 @@ protected:
     std::unique_ptr<ScriptCachedFrameData> m_cachedFrameScriptData;
     std::unique_ptr<CachedFramePlatformData> m_cachedFramePlatformData;
     bool m_isMainFrame;
-#if USE(ACCELERATED_COMPOSITING)
     bool m_isComposited;
-#endif
     
     Vector<std::unique_ptr<CachedFrame>> m_childFrames;
 };
index cad1849..0b45b5f 100644 (file)
@@ -101,11 +101,9 @@ void CachedPage::restore(Page& page)
             frame->document()->visitedLinkState().invalidateStyleForAllLinks();
     }
 
-#if USE(ACCELERATED_COMPOSITING)
     if (m_needsDeviceScaleChanged) {
         page.mainFrame().deviceOrPageScaleFactorChanged();
     }
-#endif
 
     if (m_needsFullStyleRecalc)
         page.setNeedsRecalcStyleInAllFrames();
index bb83e0f..c977ddd 100644 (file)
@@ -56,9 +56,7 @@ public:
     void markForCaptionPreferencesChanged() { m_needsCaptionPreferencesChanged = true; }
 #endif
 
-#if USE(ACCELERATED_COMPOSITING)
     void markForDeviceScaleChanged() { m_needsDeviceScaleChanged = true; }
-#endif
 
 private:
     void destroy();
index 57ec24e..d78fa12 100644 (file)
@@ -306,9 +306,7 @@ PageCache::PageCache()
     , m_size(0)
     , m_head(0)
     , m_tail(0)
-#if USE(ACCELERATED_COMPOSITING)
     , m_shouldClearBackingStores(false)
-#endif
 {
 }
     
@@ -434,8 +432,6 @@ void PageCache::markPagesForFullStyleRecalc(Page* page)
     }
 }
 
-
-#if USE(ACCELERATED_COMPOSITING)
 void PageCache::markPagesForDeviceScaleChanged(Page* page)
 {
     for (HistoryItem* current = m_head; current; current = current->m_next) {
@@ -444,7 +440,6 @@ void PageCache::markPagesForDeviceScaleChanged(Page* page)
             cachedPage->markForDeviceScaleChanged();
     }
 }
-#endif
 
 #if ENABLE(VIDEO_TRACK)
 void PageCache::markPagesForCaptionPreferencesChanged()
index ebab10c..2821a5a 100644 (file)
@@ -68,11 +68,9 @@ namespace WebCore {
         void markPagesForCaptionPreferencesChanged();
 #endif
 
-#if USE(ACCELERATED_COMPOSITING)
         bool shouldClearBackingStores() const { return m_shouldClearBackingStores; }
         void setShouldClearBackingStores(bool flag) { m_shouldClearBackingStores = flag; }
         void markPagesForDeviceScaleChanged(Page*);
-#endif
 
     private:
         PageCache(); // Use pageCache() instead.
@@ -92,9 +90,7 @@ namespace WebCore {
         HistoryItem* m_head;
         HistoryItem* m_tail;
         
-#if USE(ACCELERATED_COMPOSITING)
         bool m_shouldClearBackingStores;
-#endif
      };
 
     // Function to obtain the global page cache.
index 518a342..600e291 100644 (file)
@@ -212,7 +212,7 @@ CanvasRenderingContext* HTMLCanvasElement::getContext(const String& type, Canvas
                 usesDashbardCompatibilityMode = settings->usesDashboardBackwardCompatibilityMode();
 #endif
             m_context = CanvasRenderingContext2D::create(this, document().inQuirksMode(), usesDashbardCompatibilityMode);
-#if USE(IOSURFACE_CANVAS_BACKING_STORE) || (ENABLE(ACCELERATED_2D_CANVAS) && USE(ACCELERATED_COMPOSITING))
+#if USE(IOSURFACE_CANVAS_BACKING_STORE) || ENABLE(ACCELERATED_2D_CANVAS)
             // Need to make sure a RenderLayer and compositing layer get created for the Canvas
             setNeedsStyleRecalc(SyntheticStyleChange);
 #endif
@@ -356,10 +356,8 @@ void HTMLCanvasElement::reset()
         if (m_rendererIsCanvas) {
             if (oldSize != size()) {
                 toRenderHTMLCanvas(renderer)->canvasSizeChanged();
-#if USE(ACCELERATED_COMPOSITING)
                 if (renderBox() && renderBox()->hasAcceleratedCompositing())
                     renderBox()->contentChanged(CanvasChanged);
-#endif
             }
             if (hadImageBuffer)
                 renderer->repaint();
@@ -387,13 +385,12 @@ bool HTMLCanvasElement::paintsIntoCanvasBuffer() const
         return true;
 #endif
 
-#if USE(ACCELERATED_COMPOSITING)
     if (!m_context->isAccelerated())
         return true;
 
     if (renderBox() && renderBox()->hasAcceleratedCompositing())
         return false;
-#endif
+
     return true;
 }
 
@@ -616,7 +613,7 @@ void HTMLCanvasElement::createImageBuffer() const
     size_t numBytes = 4 * m_imageBuffer->internalSize().width() * m_imageBuffer->internalSize().height();
     scriptExecutionContext()->vm()->heap.reportExtraMemoryCost(numBytes);
 
-#if USE(IOSURFACE_CANVAS_BACKING_STORE) || (ENABLE(ACCELERATED_2D_CANVAS) && USE(ACCELERATED_COMPOSITING))
+#if USE(IOSURFACE_CANVAS_BACKING_STORE) || ENABLE(ACCELERATED_2D_CANVAS)
     if (m_context && m_context->is2d())
         // Recalculate compositing requirements if acceleration state changed.
         const_cast<HTMLCanvasElement*>(this)->setNeedsStyleRecalc(SyntheticStyleChange);
index 35f0047..9f997b0 100644 (file)
@@ -64,6 +64,7 @@
 #include "PageActivityAssertionToken.h"
 #include "PageGroup.h"
 #include "ProgressTracker.h"
+#include "RenderLayerCompositor.h"
 #include "RenderVideo.h"
 #include "RenderView.h"
 #include "ScriptController.h"
 #include <wtf/Ref.h>
 #include <wtf/text/CString.h>
 
-#if USE(ACCELERATED_COMPOSITING)
-#include "RenderLayerCompositor.h"
-#endif
-
 #if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
 #include "RenderEmbeddedObject.h"
 #include "SubframeLoader.h"
@@ -4014,7 +4011,6 @@ void HTMLMediaElement::mediaPlayerSizeChanged(MediaPlayer*)
     endProcessingMediaPlayerCallback();
 }
 
-#if USE(ACCELERATED_COMPOSITING)
 bool HTMLMediaElement::mediaPlayerRenderingCanBeAccelerated(MediaPlayer*)
 {
     if (renderer() && renderer()->isVideo())
@@ -4029,7 +4025,6 @@ void HTMLMediaElement::mediaPlayerRenderingModeChanged(MediaPlayer*)
     // Kick off a fake recalcStyle that will update the compositing tree.
     setNeedsStyleRecalc(SyntheticStyleChange);
 }
-#endif
 
 #if PLATFORM(WIN) && USE(AVFOUNDATION)
 GraphicsDeviceAdapter* HTMLMediaElement::mediaPlayerGraphicsDeviceAdapter(const MediaPlayer*) const
@@ -4060,9 +4055,7 @@ void HTMLMediaElement::mediaPlayerFirstVideoFrameAvailable(MediaPlayer*)
     beginProcessingMediaPlayerCallback();
     if (displayMode() == PosterWaitingForVideo) {
         setDisplayMode(Video);
-#if USE(ACCELERATED_COMPOSITING)
         mediaPlayerRenderingModeChanged(m_player.get());
-#endif
     }
     endProcessingMediaPlayerCallback();
 }
@@ -4922,7 +4915,6 @@ PlatformMedia HTMLMediaElement::platformMedia() const
     return m_player ? m_player->platformMedia() : NoPlatformMedia;
 }
 
-#if USE(ACCELERATED_COMPOSITING)
 PlatformLayer* HTMLMediaElement::platformLayer() const
 {
 #if PLATFORM(IOS)
@@ -4951,7 +4943,6 @@ void HTMLMediaElement::returnPlatformLayer(PlatformLayer* platformLayer)
         renderer()->updateFromElement();
 }
 #endif
-#endif
 
 bool HTMLMediaElement::hasClosedCaptions() const
 {
index 07faa23..ebe0e6b 100644 (file)
@@ -130,13 +130,11 @@ public:
     virtual bool supportsScanning() const override;
     
     PlatformMedia platformMedia() const;
-#if USE(ACCELERATED_COMPOSITING)
     PlatformLayer* platformLayer() const;
 #if PLATFORM(IOS)
     PlatformLayer* borrowPlatformLayer();
     void returnPlatformLayer(PlatformLayer*);
 #endif
-#endif
 
     enum DelayedActionType {
         LoadMediaResource = 1 << 0,
@@ -508,10 +506,8 @@ private:
     virtual void mediaPlayerResourceNotSupported(MediaPlayer*) override;
     virtual void mediaPlayerRepaint(MediaPlayer*) override;
     virtual void mediaPlayerSizeChanged(MediaPlayer*) override;
-#if USE(ACCELERATED_COMPOSITING)
     virtual bool mediaPlayerRenderingCanBeAccelerated(MediaPlayer*) override;
     virtual void mediaPlayerRenderingModeChanged(MediaPlayer*) override;
-#endif
     virtual void mediaPlayerEngineUpdated(MediaPlayer*) override;
     
     virtual void mediaPlayerFirstVideoFrameAvailable(MediaPlayer*) override;
index b5b2781..a9ac5b1 100644 (file)
@@ -56,10 +56,7 @@ public:
     virtual bool isAccelerated() const { return false; }
 
     virtual void paintRenderingResultsToCanvas() {}
-
-#if USE(ACCELERATED_COMPOSITING)
     virtual PlatformLayer* platformLayer() const { return 0; }
-#endif
 
 protected:
     CanvasRenderingContext(HTMLCanvasElement*);
index 18a87f4..47d87ed 100755 (executable)
@@ -48,6 +48,7 @@
 #include "HTMLVideoElement.h"
 #include "ImageData.h"
 #include "RenderElement.h"
+#include "RenderLayer.h"
 #include "SecurityOrigin.h"
 #include "StrokeStyleApplier.h"
 #include "StyleProperties.h"
 #include "TextMetrics.h"
 #include "TextRun.h"
 
-#if USE(ACCELERATED_COMPOSITING)
-#include "RenderLayer.h"
-#endif
-
 #include <wtf/CheckedArithmetic.h>
 #include <wtf/MathExtras.h>
 #include <wtf/text/StringBuilder.h>
@@ -1739,7 +1736,7 @@ void CanvasRenderingContext2D::didDraw(const FloatRect& r, unsigned options)
     if (!state().m_hasInvertibleTransform)
         return;
 
-#if ENABLE(ACCELERATED_2D_CANVAS) && USE(ACCELERATED_COMPOSITING)
+#if ENABLE(ACCELERATED_2D_CANVAS)
     // If we are drawing to hardware and we have a composited layer, just call contentChanged().
     if (isAccelerated()) {
         RenderBox* renderBox = canvas()->renderBox();
@@ -2327,7 +2324,7 @@ const Font& CanvasRenderingContext2D::accessFont()
     return state().m_font;
 }
 
-#if ENABLE(ACCELERATED_2D_CANVAS) && USE(ACCELERATED_COMPOSITING)
+#if ENABLE(ACCELERATED_2D_CANVAS)
 PlatformLayer* CanvasRenderingContext2D::platformLayer() const
 {
     return canvas()->buffer() ? canvas()->buffer()->platformLayer() : 0;
index 27b7e33..bb0736d 100644 (file)
 #include "GraphicsTypes.h"
 #include "ImageBuffer.h"
 #include "Path.h"
+#include "PlatformLayer.h"
 #include <wtf/Vector.h>
 #include <wtf/text/WTFString.h>
 
-#if USE(ACCELERATED_COMPOSITING)
-#include "PlatformLayer.h"
-#endif
-
 namespace WebCore {
 
 class CanvasGradient;
@@ -330,7 +327,7 @@ private:
 
     virtual bool hasInvertibleTransform() const override { return state().m_hasInvertibleTransform; }
 
-#if ENABLE(ACCELERATED_2D_CANVAS) && USE(ACCELERATED_COMPOSITING)
+#if ENABLE(ACCELERATED_2D_CANVAS)
     virtual PlatformLayer* platformLayer() const override;
 #endif
 
index fa5537b..3810399 100644 (file)
@@ -647,21 +647,17 @@ void WebGLRenderingContext::markContextChanged()
         m_drawingBuffer->markContentsChanged();
 
     m_layerCleared = false;
-#if USE(ACCELERATED_COMPOSITING)
     RenderBox* renderBox = canvas()->renderBox();
     if (renderBox && renderBox->hasAcceleratedCompositing()) {
         m_markedCanvasDirty = true;
         canvas()->clearCopiedImage();
         renderBox->contentChanged(CanvasChanged);
     } else {
-#endif
         if (!m_markedCanvasDirty) {
             m_markedCanvasDirty = true;
             canvas()->didDraw(FloatRect(FloatPoint(0, 0), clampedCanvasSize()));
         }
-#if USE(ACCELERATED_COMPOSITING)
     }
-#endif
 }
 
 bool WebGLRenderingContext::clearIfComposited(GC3Dbitfield mask)
@@ -802,11 +798,9 @@ void WebGLRenderingContext::reshape(int width, int height)
     height = clamp(height, 1, maxHeight);
 
     if (m_needsUpdate) {
-#if USE(ACCELERATED_COMPOSITING)
         RenderBox* renderBox = canvas()->renderBox();
         if (renderBox && renderBox->hasAcceleratedCompositing())
             renderBox->contentChanged(CanvasChanged);
-#endif
         m_needsUpdate = false;
     }
 
@@ -4776,12 +4770,10 @@ void WebGLRenderingContext::forceRestoreContext()
         m_restoreTimer.startOneShot(0);
 }
 
-#if USE(ACCELERATED_COMPOSITING)
 PlatformLayer* WebGLRenderingContext::platformLayer() const
 {
     return (!isContextLost()) ? m_context->platformLayer() : 0;
 }
-#endif
 
 void WebGLRenderingContext::removeSharedObject(WebGLSharedObject* object)
 {
index 88999d8..6adac0e 100644 (file)
@@ -309,9 +309,7 @@ public:
 
     GraphicsContext3D* graphicsContext3D() const { return m_context.get(); }
     WebGLContextGroup* contextGroup() const { return m_contextGroup.get(); }
-#if USE(ACCELERATED_COMPOSITING)
     virtual PlatformLayer* platformLayer() const override;
-#endif
 
     void reshape(int width, int height);
 
index 197eff2..8a411b4 100644 (file)
@@ -165,9 +165,7 @@ InspectorController::InspectorController(Page& page, InspectorClient* inspectorC
 
     m_agents.append(std::make_unique<InspectorInputAgent>(m_instrumentingAgents.get(), &page));
 
-#if USE(ACCELERATED_COMPOSITING)
     m_agents.append(std::make_unique<InspectorLayerTreeAgent>(m_instrumentingAgents.get()));
-#endif
 
     ASSERT(m_injectedScriptManager->commandLineAPIHost());
     if (CommandLineAPIHost* commandLineAPIHost = m_injectedScriptManager->commandLineAPIHost()) {
index df13572..1a9a8e6 100644 (file)
@@ -769,10 +769,8 @@ void InspectorInstrumentation::didCommitLoadImpl(InstrumentingAgents* instrument
 #endif
         if (InspectorDOMAgent* domAgent = instrumentingAgents->inspectorDOMAgent())
             domAgent->setDocument(page->mainFrame().document());
-#if USE(ACCELERATED_COMPOSITING)
         if (InspectorLayerTreeAgent* layerTreeAgent = instrumentingAgents->inspectorLayerTreeAgent())
             layerTreeAgent->reset();
-#endif
     }
     if (InspectorDOMAgent* domAgent = instrumentingAgents->inspectorDOMAgent())
         domAgent->didCommitLoad(loader->frame()->document());
@@ -1184,7 +1182,6 @@ InstrumentingAgents* InspectorInstrumentation::instrumentingAgentsForNonDocument
     return nullptr;
 }
 
-#if USE(ACCELERATED_COMPOSITING)
 void InspectorInstrumentation::layerTreeDidChangeImpl(InstrumentingAgents* instrumentingAgents)
 {
     if (InspectorLayerTreeAgent* layerTreeAgent = instrumentingAgents->inspectorLayerTreeAgent())
@@ -1202,7 +1199,6 @@ void InspectorInstrumentation::pseudoElementDestroyedImpl(InstrumentingAgents* i
     if (InspectorLayerTreeAgent* layerTreeAgent = instrumentingAgents->inspectorLayerTreeAgent())
         layerTreeAgent->pseudoElementDestroyed(pseudoElement);
 }
-#endif
 
 } // namespace WebCore
 
index 13d6224..8fce094 100644 (file)
@@ -273,11 +273,9 @@ public:
     static void registerInstrumentingAgents(InstrumentingAgents*);
     static void unregisterInstrumentingAgents(InstrumentingAgents*);
 
-#if USE(ACCELERATED_COMPOSITING)
     static void layerTreeDidChange(Page*);
     static void renderLayerDestroyed(Page*, const RenderLayer*);
     static void pseudoElementDestroyed(Page*, PseudoElement*);
-#endif
 
 private:
 #if ENABLE(INSPECTOR)
@@ -444,11 +442,9 @@ private:
     static void cancelPauseOnNativeEvent(InstrumentingAgents*);
     static InspectorTimelineAgent* retrieveTimelineAgent(const InspectorInstrumentationCookie&);
 
-#if USE(ACCELERATED_COMPOSITING)
     static void layerTreeDidChangeImpl(InstrumentingAgents*);
     static void renderLayerDestroyedImpl(InstrumentingAgents*, const RenderLayer*);
     static void pseudoElementDestroyedImpl(InstrumentingAgents*, PseudoElement*);
-#endif
 
     static int s_frontendCounter;
 #endif
@@ -1842,7 +1838,6 @@ inline void InspectorInstrumentation::didFireAnimationFrame(const InspectorInstr
 #endif
 }
 
-#if USE(ACCELERATED_COMPOSITING)
 inline void InspectorInstrumentation::layerTreeDidChange(Page* page)
 {
 #if ENABLE(INSPECTOR)
@@ -1874,7 +1869,6 @@ inline void InspectorInstrumentation::pseudoElementDestroyed(Page* page, PseudoE
     UNUSED_PARAM(pseudoElement);
 #endif
 }
-#endif
 
 #if ENABLE(INSPECTOR)
 inline InstrumentingAgents* InspectorInstrumentation::instrumentingAgentsForContext(ScriptExecutionContext* context)
index 086e3c8..4c1f006 100644 (file)
@@ -30,7 +30,6 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING)
 #if ENABLE(INSPECTOR)
 
 #include "InspectorLayerTreeAgent.h"
@@ -359,4 +358,3 @@ void InspectorLayerTreeAgent::unbindPseudoElement(PseudoElement* pseudoElement)
 } // namespace WebCore
 
 #endif // ENABLE(INSPECTOR)
-#endif // USE(ACCELERATED_COMPOSITING)
index 1564393..98e6bdd 100644 (file)
@@ -48,9 +48,7 @@ InstrumentingAgents::InstrumentingAgents(InspectorEnvironment& environment)
     , m_inspectorAgent(nullptr)
     , m_inspectorPageAgent(nullptr)
     , m_inspectorCSSAgent(nullptr)
-#if USE(ACCELERATED_COMPOSITING)
     , m_inspectorLayerTreeAgent(nullptr)
-#endif
     , m_inspectorConsoleAgent(nullptr)
     , m_inspectorDOMAgent(nullptr)
     , m_inspectorResourceAgent(nullptr)
@@ -76,9 +74,7 @@ void InstrumentingAgents::reset()
     m_inspectorAgent = nullptr;
     m_inspectorPageAgent = nullptr;
     m_inspectorCSSAgent = nullptr;
-#if USE(ACCELERATED_COMPOSITING)
     m_inspectorLayerTreeAgent = nullptr;
-#endif
     m_inspectorConsoleAgent = nullptr;
     m_inspectorDOMAgent = nullptr;
     m_inspectorResourceAgent = nullptr;
index d9b5d41..c99d269 100644 (file)
@@ -137,10 +137,8 @@ public:
     InspectorCanvasAgent* inspectorCanvasAgent() const { return m_inspectorCanvasAgent; }
     void setInspectorCanvasAgent(InspectorCanvasAgent* agent) { m_inspectorCanvasAgent = agent; }
 
-#if USE(ACCELERATED_COMPOSITING)
     InspectorLayerTreeAgent* inspectorLayerTreeAgent() const { return m_inspectorLayerTreeAgent; }
     void setInspectorLayerTreeAgent(InspectorLayerTreeAgent* agent) { m_inspectorLayerTreeAgent = agent; }
-#endif
 
 private:
     InstrumentingAgents(Inspector::InspectorEnvironment&);
@@ -150,9 +148,7 @@ private:
     Inspector::InspectorAgent* m_inspectorAgent;
     InspectorPageAgent* m_inspectorPageAgent;
     InspectorCSSAgent* m_inspectorCSSAgent;
-#if USE(ACCELERATED_COMPOSITING)
     InspectorLayerTreeAgent* m_inspectorLayerTreeAgent;
-#endif
     InspectorConsoleAgent* m_inspectorConsoleAgent;
     InspectorDOMAgent* m_inspectorDOMAgent;
     InspectorResourceAgent* m_inspectorResourceAgent;
index 199c9cc..8f14f5a 100644 (file)
@@ -183,11 +183,9 @@ public:
 
     virtual void scrollRectIntoView(const IntRect&) const override { }
 
-#if USE(ACCELERATED_COMPOSITING)
     virtual void attachRootGraphicsLayer(Frame*, GraphicsLayer*) override { }
     virtual void setNeedsOneShotDrawingSynchronization() override { }
     virtual void scheduleCompositingLayerFlush() override { }
-#endif
 
 #if PLATFORM(WIN)
     virtual void setLastSetCursorToCurrentCursor() override { }
index d7fe0f8..ae5b6d1 100644 (file)
@@ -287,7 +287,6 @@ public:
     
     virtual bool shouldPaintEntireContents() const { return false; }
 
-#if USE(ACCELERATED_COMPOSITING)
     // Allows ports to customize the type of graphics layers created by this page.
     virtual GraphicsLayerFactory* graphicsLayerFactory() const { return 0; }
 
@@ -321,7 +320,6 @@ public:
     
     // Returns true if layer tree updates are disabled.
     virtual bool layerTreeStateIsFrozen() const { return false; }
-#endif
 
     virtual PassRefPtr<ScrollingCoordinator> createScrollingCoordinator(Page*) const { return nullptr; }
 
index 4456c0d..5a9598e 100644 (file)
@@ -75,6 +75,7 @@
 #include "Page.h"
 #include "PageCache.h"
 #include "PageGroup.h"
+#include "RenderLayerCompositor.h"
 #include "RenderTableCell.h"
 #include "RenderText.h"
 #include "RenderTextControl.h"
 #include <wtf/StdLibExtras.h>
 #include <yarr/RegularExpression.h>
 
-#if USE(ACCELERATED_COMPOSITING)
-#include "RenderLayerCompositor.h"
-#endif
-
 #if ENABLE(SVG)
 #include "SVGDocument.h"
 #include "SVGDocumentExtensions.h"
@@ -999,17 +996,12 @@ Color Frame::tiledBackingStoreBackgroundColor() const
 
 String Frame::layerTreeAsText(LayerTreeFlags flags) const
 {
-#if USE(ACCELERATED_COMPOSITING)
     document()->updateLayout();
 
     if (!contentRenderer())
         return String();
 
     return contentRenderer()->compositor().layerTreeAsText(flags);
-#else
-    UNUSED_PARAM(flags);
-    return String();
-#endif
 }
 
 String Frame::trackedRepaintRectsAsText() const
@@ -1123,7 +1115,6 @@ void Frame::resumeActiveDOMObjectsAndAnimations()
     }
 }
 
-#if USE(ACCELERATED_COMPOSITING)
 void Frame::deviceOrPageScaleFactorChanged()
 {
     for (RefPtr<Frame> child = tree().firstChild(); child; child = child->tree().nextSibling())
@@ -1132,7 +1123,6 @@ void Frame::deviceOrPageScaleFactorChanged()
     if (RenderView* root = contentRenderer())
         root->compositor().deviceOrPageScaleFactorChanged();
 }
-#endif
 
 bool Frame::isURLAllowed(const URL& url) const
 {
index eff8e14..3e89207 100644 (file)
@@ -195,9 +195,7 @@ namespace WebCore {
         // Scale factor of this frame with respect to the container.
         float frameScaleFactor() const;
 
-#if USE(ACCELERATED_COMPOSITING)
         void deviceOrPageScaleFactorChanged();
-#endif
 
 #if PLATFORM(IOS)
         const ViewportArguments& viewportArguments() const;
index 8a9def4..47119e1 100644 (file)
@@ -62,6 +62,7 @@
 #include "RenderIFrame.h"
 #include "RenderLayer.h"
 #include "RenderLayerBacking.h"
+#include "RenderLayerCompositor.h"
 #include "RenderScrollbar.h"
 #include "RenderScrollbarPart.h"
 #include "RenderStyle.h"
 #include "StyleResolver.h"
 #include "TextResourceDecoder.h"
 #include "TextStream.h"
+#include "TiledBacking.h"
 
 #include <wtf/CurrentTime.h>
 #include <wtf/Ref.h>
 #include <wtf/TemporaryChange.h>
 
-#if USE(ACCELERATED_COMPOSITING)
-#include "RenderLayerCompositor.h"
-#include "TiledBacking.h"
-#endif
-
 #if ENABLE(SVG)
 #include "RenderSVGRoot.h"
 #include "SVGDocument.h"
@@ -433,12 +430,10 @@ void FrameView::setFrameRect(const IntRect& newRect)
 
     updateScrollableAreaSet();
 
-#if USE(ACCELERATED_COMPOSITING)
     if (RenderView* renderView = this->renderView()) {
         if (renderView->usesCompositing())
             renderView->compositor().frameViewDidChangeSize();
     }
-#endif
 
     if (!frameFlatteningEnabled())
         sendResizeEventIfNeeded();
@@ -713,7 +708,6 @@ void FrameView::calculateScrollbarModesForLayout(ScrollbarMode& hMode, Scrollbar
     }    
 }
 
-#if USE(ACCELERATED_COMPOSITING)
 void FrameView::updateCompositingLayersAfterStyleChange()
 {
     RenderView* renderView = this->renderView();
@@ -923,7 +917,6 @@ void FrameView::scheduleLayerFlushAllowingThrottling()
         return;
     view->compositor().scheduleLayerFlush(true /* canThrottle */);
 }
-#endif // USE(ACCELERATED_COMPOSITING)
 
 void FrameView::setHeaderHeight(int headerHeight)
 {
@@ -947,16 +940,13 @@ void FrameView::setFooterHeight(int footerHeight)
 
 bool FrameView::hasCompositedContent() const
 {
-#if USE(ACCELERATED_COMPOSITING)
     if (RenderView* renderView = this->renderView())
         return renderView->compositor().inCompositingMode();
-#endif
     return false;
 }
 
 bool FrameView::hasCompositedContentIncludingDescendants() const
 {
-#if USE(ACCELERATED_COMPOSITING)
     for (Frame* frame = m_frame.get(); frame; frame = frame->tree().traverseNext(m_frame.get())) {
         RenderView* renderView = frame->contentRenderer();
         if (RenderLayerCompositor* compositor = renderView ? &renderView->compositor() : 0) {
@@ -967,51 +957,43 @@ bool FrameView::hasCompositedContentIncludingDescendants() const
                 break;
         }
     }
-#endif
     return false;
 }
 
 bool FrameView::hasCompositingAncestor() const
 {
-#if USE(ACCELERATED_COMPOSITING)
     for (Frame* frame = this->frame().tree().parent(); frame; frame = frame->tree().parent()) {
         if (FrameView* view = frame->view()) {
             if (view->hasCompositedContent())
                 return true;
         }
     }
-#endif
     return false;
 }
 
 // Sometimes (for plug-ins) we need to eagerly go into compositing mode.
 void FrameView::enterCompositingMode()
 {
-#if USE(ACCELERATED_COMPOSITING)
     if (RenderView* renderView = this->renderView()) {
         renderView->compositor().enableCompositingMode();
         if (!needsLayout())
             renderView->compositor().scheduleCompositingLayerUpdate();
     }
-#endif
 }
 
 bool FrameView::isEnclosedInCompositingLayer() const
 {
-#if USE(ACCELERATED_COMPOSITING)
     auto frameOwnerRenderer = frame().ownerRenderer();
     if (frameOwnerRenderer && frameOwnerRenderer->containerForRepaint())
         return true;
 
     if (FrameView* parentView = parentFrameView())
         return parentView->isEnclosedInCompositingLayer();
-#endif
     return false;
 }
 
 bool FrameView::flushCompositingStateIncludingSubframes()
 {
-#if USE(ACCELERATED_COMPOSITING)
     bool allFramesFlushed = flushCompositingStateForThisFrame(&frame());
     
     for (Frame* child = frame().tree().firstChild(); child; child = child->tree().traverseNext(&frame())) {
@@ -1019,19 +1001,12 @@ bool FrameView::flushCompositingStateIncludingSubframes()
         allFramesFlushed &= flushed;
     }
     return allFramesFlushed;
-#else // USE(ACCELERATED_COMPOSITING)
-    return true;
-#endif
 }
 
 bool FrameView::isSoftwareRenderable() const
 {
-#if USE(ACCELERATED_COMPOSITING)
     RenderView* renderView = this->renderView();
     return !renderView || !renderView->compositor().has3DContent();
-#else
-    return true;
-#endif
 }
 
 void FrameView::didMoveOnscreen()
@@ -1328,9 +1303,7 @@ void FrameView::layout(bool allowSubtree)
 
     layer->updateLayerPositionsAfterLayout(renderView()->layer(), updateLayerPositionFlags(layer, subtree, m_needsFullRepaint));
 
-#if USE(ACCELERATED_COMPOSITING)
     updateCompositingLayersAfterLayout();
-#endif
     
     m_layoutCount++;
 
@@ -1494,14 +1467,13 @@ void FrameView::updateCanBlitOnScrollRecursively()
 
 bool FrameView::contentsInCompositedLayer() const
 {
-#if USE(ACCELERATED_COMPOSITING)
     RenderView* renderView = this->renderView();
     if (renderView && renderView->isComposited()) {
         GraphicsLayer* layer = renderView->layer()->backing()->graphicsLayer();
         if (layer && layer->drawsContent())
             return true;
     }
-#endif
+
     return false;
 }
 
@@ -1675,22 +1647,18 @@ bool FrameView::scrollContentsFastPath(const IntSize& scrollDelta, const IntRect
     for (auto& renderer : *m_viewportConstrainedObjects) {
         if (!renderer->style().hasViewportConstrainedPosition())
             continue;
-#if USE(ACCELERATED_COMPOSITING)
         if (renderer->isComposited())
             continue;
-#endif
 
         // Fixed items should always have layers.
         ASSERT(renderer->hasLayer());
         RenderLayer* layer = toRenderBoxModelObject(renderer)->layer();
 
-#if USE(ACCELERATED_COMPOSITING)
         if (layer->viewportConstrainedNotCompositedReason() == RenderLayer::NotCompositedForBoundsOutOfView
             || layer->viewportConstrainedNotCompositedReason() == RenderLayer::NotCompositedForNoVisibleContent) {
             // Don't invalidate for invisible fixed layers.
             continue;
         }
-#endif
 
 #if ENABLE(CSS_FILTERS)
         if (layer->hasAncestorWithFilterOutsets()) {
@@ -1718,14 +1686,12 @@ bool FrameView::scrollContentsFastPath(const IntSize& scrollDelta, const IntRect
         IntRect scrolledRect = updateRect;
         scrolledRect.move(scrollDelta);
         updateRect.unite(scrolledRect);
-#if USE(ACCELERATED_COMPOSITING)
         if (isCompositedContentLayer) {
             updateRect = rootViewToContents(updateRect);
             ASSERT(renderView());
             renderView()->layer()->setBackingNeedsRepaintInRect(updateRect);
             continue;
         }
-#endif
         if (clipsRepaints())
             updateRect.intersect(rectToScroll);
         hostWindow()->invalidateContentsAndRootView(updateRect, false);
@@ -1736,7 +1702,6 @@ bool FrameView::scrollContentsFastPath(const IntSize& scrollDelta, const IntRect
 
 void FrameView::scrollContentsSlowPath(const IntRect& updateRect)
 {
-#if USE(ACCELERATED_COMPOSITING)
     if (contentsInCompositedLayer()) {
         // FIXME: respect paintsEntireContents()?
         IntRect updateRect = visibleContentRect(LegacyIOSDocumentVisibleRect);
@@ -1760,7 +1725,6 @@ void FrameView::scrollContentsSlowPath(const IntRect& updateRect)
             return;
         }
     }
-#endif
 
     ScrollView::scrollContentsSlowPath(updateRect);
 }
@@ -1784,8 +1748,7 @@ void FrameView::setIsOverlapped(bool isOverlapped)
 
     m_isOverlapped = isOverlapped;
     updateCanBlitOnScrollRecursively();
-    
-#if USE(ACCELERATED_COMPOSITING)
+
     if (hasCompositedContentIncludingDescendants()) {
         // Overlap can affect compositing tests, so if it changes, we need to trigger
         // a layer update in the parent document.
@@ -1809,7 +1772,6 @@ void FrameView::setIsOverlapped(bool isOverlapped)
             }
         }
     }
-#endif
 }
 
 bool FrameView::isOverlappedIncludingAncestors() const
@@ -1934,11 +1896,9 @@ void FrameView::setScrollPosition(const IntPoint& scrollPoint)
 
 void FrameView::delegatesScrollingDidChange()
 {
-#if USE(ACCELERATED_COMPOSITING)
     // When we switch to delgatesScrolling mode, we should destroy the scrolling/clipping layers in RenderLayerCompositor.
     if (hasCompositedContent())
         clearBackingStores();
-#endif
 }
 
 #if USE(TILED_BACKING_STORE)
@@ -1991,12 +1951,10 @@ void FrameView::scrollPositionChanged()
     frame().eventHandler().sendScrollEvent();
     frame().eventHandler().dispatchFakeMouseMoveEventSoon();
 
-#if USE(ACCELERATED_COMPOSITING)
     if (RenderView* renderView = this->renderView()) {
         if (renderView->usesCompositing())
             renderView->compositor().frameViewDidScroll();
     }
-#endif
 }
 
 void FrameView::updateLayerPositionsAfterScrolling()
@@ -2045,7 +2003,6 @@ bool FrameView::shouldUpdateCompositingLayersAfterScrolling() const
 
 void FrameView::updateCompositingLayersAfterScrolling()
 {
-#if USE(ACCELERATED_COMPOSITING)
     if (!shouldUpdateCompositingLayersAfterScrolling())
         return;
 
@@ -2053,7 +2010,6 @@ void FrameView::updateCompositingLayersAfterScrolling()
         if (RenderView* renderView = this->renderView())
             renderView->compositor().updateCompositingLayers(CompositingUpdateOnScroll);
     }
-#endif
 }
 
 bool FrameView::isRubberBandInProgress() const
@@ -2191,41 +2147,33 @@ void FrameView::visibleContentsResized()
     if (!useFixedLayout() && needsLayout())
         layout();
 
-#if USE(ACCELERATED_COMPOSITING)
     if (RenderView* renderView = this->renderView()) {
         if (renderView->usesCompositing())
             renderView->compositor().frameViewDidChangeSize();
     }
-#endif
 }
 
 void FrameView::addedOrRemovedScrollbar()
 {
-#if USE(ACCELERATED_COMPOSITING)
     if (RenderView* renderView = this->renderView()) {
         if (renderView->usesCompositing())
             renderView->compositor().frameViewDidAddOrRemoveScrollbars();
     }
-#endif
 }
 
 void FrameView::disableLayerFlushThrottlingTemporarilyForInteraction()
 {
-#if USE(ACCELERATED_COMPOSITING)
     if (RenderView* view = renderView())
         view->compositor().disableLayerFlushThrottlingTemporarilyForInteraction();
-#endif
 }
 
 void FrameView::updateLayerFlushThrottlingInAllFrames()
 {
-#if USE(ACCELERATED_COMPOSITING)
     bool isMainLoadProgressing = frame().page()->progress().isMainLoadProgressing();
     for (Frame* frame = m_frame.get(); frame; frame = frame->tree().traverseNext(m_frame.get())) {
         if (RenderView* renderView = frame->contentRenderer())
             renderView->compositor().setLayerFlushThrottlingEnabled(isMainLoadProgressing);
     }
-#endif
 }
 
 void FrameView::adjustTiledBackingCoverage()
@@ -2233,11 +2181,9 @@ void FrameView::adjustTiledBackingCoverage()
     if (!m_speculativeTilingEnabled)
         enableSpeculativeTilingIfNeeded();
 
-#if USE(ACCELERATED_COMPOSITING)
     RenderView* renderView = this->renderView();
     if (renderView && renderView->layer()->backing())
         renderView->layer()->backing()->adjustTiledBackingCoverage();
-#endif
 #if PLATFORM(IOS)
     if (TileCache* tileCache = this->tileCache())
         tileCache->setSpeculativeTileCreationEnabled(m_speculativeTilingEnabled);
@@ -2487,7 +2433,6 @@ void FrameView::updateBackgroundRecursively(const Color& backgroundColor, bool t
 
 bool FrameView::hasExtendedBackground() const
 {
-#if USE(ACCELERATED_COMPOSITING)
     if (!frame().settings().backgroundShouldExtendBeyondPage())
         return false;
 
@@ -2496,29 +2441,17 @@ bool FrameView::hasExtendedBackground() const
         return false;
 
     return tiledBacking->hasMargins();
-#else
-    return false;
-#endif
 }
 
 IntRect FrameView::extendedBackgroundRect() const
 {
-#if USE(ACCELERATED_COMPOSITING)
     TiledBacking* tiledBacking = this->tiledBacking();
     if (!tiledBacking)
         return IntRect();
 
     return tiledBacking->bounds();
-#else
-    RenderView* renderView = this->renderView();
-    if (!renderView)
-        return IntRect();
-
-    return renderView->unscaledDocumentRect();
-#endif
 }
 
-#if USE(ACCELERATED_COMPOSITING)
 void FrameView::setBackgroundExtendsBeyondPage(bool extendBackground)
 {
     RenderView* renderView = this->renderView();
@@ -2531,7 +2464,6 @@ void FrameView::setBackgroundExtendsBeyondPage(bool extendBackground)
 
     backing->setTiledBackingHasMargins(extendBackground);
 }
-#endif
 
 bool FrameView::shouldUpdateWhileOffscreen() const
 {
@@ -2716,12 +2648,10 @@ void FrameView::performPostLayoutTasks()
             scrollingCoordinator->frameViewLayoutUpdated(this);
     }
 
-#if USE(ACCELERATED_COMPOSITING)
     if (RenderView* renderView = this->renderView()) {
         if (renderView->usesCompositing())
             renderView->compositor().frameViewDidLayout();
     }
-#endif
 
     scrollToAnchor();
 
@@ -3459,10 +3389,8 @@ void FrameView::paintContents(GraphicsContext* p, const IntRect& rect)
 
     FontCachePurgePreventer fontCachePurgePreventer;
 
-#if USE(ACCELERATED_COMPOSITING)
     if (!p->paintingDisabled() && !document->printing())
         flushCompositingStateForThisFrame(&frame());
-#endif
 
     PaintBehavior oldPaintBehavior = m_paintBehavior;
     
@@ -3927,12 +3855,10 @@ void FrameView::setTracksRepaints(bool trackRepaints)
             frame().document()->updateLayout();
     }
 
-#if USE(ACCELERATED_COMPOSITING)
     for (Frame* frame = &m_frame->tree().top(); frame; frame = frame->tree().traverseNext()) {
         if (RenderView* renderView = frame->contentRenderer())
             renderView->compositor().setTracksRepaints(trackRepaints);
     }
-#endif
 
     resetTrackedRepaints();
     m_isTrackingRepaints = trackRepaints;
@@ -3941,10 +3867,8 @@ void FrameView::setTracksRepaints(bool trackRepaints)
 void FrameView::resetTrackedRepaints()
 {
     m_trackedRepaintRects.clear();
-#if USE(ACCELERATED_COMPOSITING)
     if (RenderView* renderView = this->renderView())
         renderView->compositor().resetTrackedRepaintRects();
-#endif
 }
 
 String FrameView::trackedRepaintRectsAsText() const
@@ -4099,12 +4023,8 @@ bool FrameView::updateFixedPositionLayoutRect()
 
 void FrameView::setScrollingPerformanceLoggingEnabled(bool flag)
 {
-#if USE(ACCELERATED_COMPOSITING)
     if (TiledBacking* tiledBacking = this->tiledBacking())
         tiledBacking->setScrollingPerformanceLoggingEnabled(flag);
-#else
-    UNUSED_PARAM(flag);
-#endif
 }
 
 void FrameView::didAddScrollbar(Scrollbar* scrollbar, ScrollbarOrientation orientation)
@@ -4240,13 +4160,11 @@ void FrameView::setExposedRect(FloatRect exposedRect)
 
     m_exposedRect = exposedRect;
 
-#if USE(ACCELERATED_COMPOSITING)
     // FIXME: We should support clipping to the exposed rect for subframes as well.
     if (m_frame->isMainFrame()) {
         if (TiledBacking* tiledBacking = this->tiledBacking())
             tiledBacking->setExposedRect(exposedRect);
     }
-#endif
 }
 
 } // namespace WebCore
index b132684..ed20bd2 100644 (file)
@@ -135,7 +135,6 @@ public:
     void serviceScriptedAnimations(double monotonicAnimationStartTime);
 #endif
 
-#if USE(ACCELERATED_COMPOSITING)
     void updateCompositingLayersAfterStyleChange();
     void updateCompositingLayersAfterLayout();
     bool flushCompositingStateForThisFrame(Frame* rootFrameForFlush);
@@ -155,7 +154,6 @@ public:
     // In the future when any ScrollableArea can have a node in th ScrollingTree, this should
     // become a virtual function on ScrollableArea.
     uint64_t scrollLayerID() const;
-#endif
 
     bool hasCompositedContent() const;
     bool hasCompositedContentIncludingDescendants() const;
@@ -197,9 +195,7 @@ public:
     bool hasExtendedBackground() const;
     IntRect extendedBackgroundRect() const;
     
-#if USE(ACCELERATED_COMPOSITING)
     void setBackgroundExtendsBeyondPage(bool);
-#endif
 
     bool shouldUpdateWhileOffscreen() const;
     void setShouldUpdateWhileOffscreen(bool);
@@ -516,7 +512,6 @@ private:
     virtual ScrollableArea* enclosingScrollableArea() const override;
     virtual IntRect scrollableAreaBoundingBox() const override;
     virtual bool scrollAnimatorEnabled() const override;
-#if USE(ACCELERATED_COMPOSITING)
     virtual bool usesCompositedScrolling() const override;
     virtual GraphicsLayer* layerForScrolling() const override;
     virtual GraphicsLayer* layerForHorizontalScrollbar() const override;
@@ -525,7 +520,6 @@ private:
 #if ENABLE(RUBBER_BANDING)
     virtual GraphicsLayer* layerForOverhangAreas() const override;
 #endif
-#endif
 
     // Override scrollbar notifications to update the AXObject cache.
     virtual void didAddScrollbar(Scrollbar*, ScrollbarOrientation) override;
index d4638e9..a69f555 100644 (file)
@@ -723,9 +723,7 @@ void Page::setPageScaleFactor(float scale, const IntPoint& origin)
         mainFrame().view()->invalidateRect(IntRect(LayoutRect::infiniteRect()));
     }
 
-#if USE(ACCELERATED_COMPOSITING)
     mainFrame().deviceOrPageScaleFactorChanged();
-#endif
 
     if (view && view->fixedElementsLayoutRelativeToFrame())
         view->setViewportConstrainedObjectsNeedLayout();
@@ -746,10 +744,8 @@ void Page::setDeviceScaleFactor(float scaleFactor)
     m_deviceScaleFactor = scaleFactor;
     setNeedsRecalcStyleInAllFrames();
 
-#if USE(ACCELERATED_COMPOSITING)
     mainFrame().deviceOrPageScaleFactorChanged();
     pageCache()->markPagesForDeviceScaleChanged(this);
-#endif
 
     for (Frame* frame = &mainFrame(); frame; frame = frame->tree().traverseNext())
         frame->editor().deviceScaleFactorChanged();
index 67a7cbc..aad8149 100644 (file)
@@ -604,9 +604,7 @@ void Settings::setBackgroundShouldExtendBeyondPage(bool shouldExtend)
 
     m_backgroundShouldExtendBeyondPage = shouldExtend;
 
-#if USE(ACCELERATED_COMPOSITING)
     m_page->mainFrame().view()->setBackgroundExtendsBeyondPage(shouldExtend);
-#endif
 }
 
 #if USE(AVFOUNDATION)
index dd3315e..f5044b8 100644 (file)
@@ -659,10 +659,8 @@ void AnimationBase::freezeAtTime(double t)
     else
         m_pauseTime = m_startTime + t - m_animation->delay();
 
-#if USE(ACCELERATED_COMPOSITING)
     if (m_object && m_object->isComposited())
         toRenderBoxModelObject(m_object)->suspendAnimations(m_pauseTime);
-#endif
 }
 
 double AnimationBase::beginAnimationUpdateTime() const
index 5b8c90b..b7c94ed 100644 (file)
@@ -634,12 +634,7 @@ void AnimationController::endAnimationUpdate()
 
 bool AnimationController::supportsAcceleratedAnimationOfProperty(CSSPropertyID property)
 {
-#if USE(ACCELERATED_COMPOSITING)
     return CSSPropertyAnimation::animationOfPropertyIsAccelerated(property);
-#else
-    UNUSED_PARAM(property);
-    return false;
-#endif
 }
 
 } // namespace WebCore
index 291129e..cfb320f 100644 (file)
@@ -389,9 +389,7 @@ public:
 
     CSSPropertyID property() const { return m_prop; }
 
-#if USE(ACCELERATED_COMPOSITING)
     virtual bool animationIsAccelerated() const { return false; }
-#endif
 
 private:
     CSSPropertyID m_prop;
@@ -533,7 +531,6 @@ protected:
 };
 
 
-#if USE(ACCELERATED_COMPOSITING)
 class PropertyWrapperAcceleratedOpacity : public PropertyWrapper<float> {
 public:
     PropertyWrapperAcceleratedOpacity()
@@ -583,7 +580,6 @@ public:
     }
 };
 #endif
-#endif // USE(ACCELERATED_COMPOSITING)
 
 static inline size_t shadowListLength(const ShadowData* shadow)
 {
@@ -1232,19 +1228,11 @@ CSSPropertyAnimationWrapperMap::CSSPropertyAnimationWrapperMap()
 
         new LengthPropertyWrapper<LengthBox>(CSSPropertyClip, &RenderStyle::clip, &RenderStyle::setClip),
 
-#if USE(ACCELERATED_COMPOSITING)
         new PropertyWrapperAcceleratedOpacity(),
         new PropertyWrapperAcceleratedTransform(),
 #if ENABLE(CSS_FILTERS)
         new PropertyWrapperAcceleratedFilter(),
 #endif
-#else
-        new PropertyWrapper<float>(CSSPropertyOpacity, &RenderStyle::opacity, &RenderStyle::setOpacity),
-        new PropertyWrapper<const TransformOperations&>(CSSPropertyWebkitTransform, &RenderStyle::transform, &RenderStyle::setTransform),
-#if ENABLE(CSS_FILTERS)
-        new PropertyWrapper<const FilterOperations&>(CSSPropertyWebkitFilter, &RenderStyle::filter, &RenderStyle::setFilter),
-#endif
-#endif
 
         new PropertyWrapperClipPath(CSSPropertyWebkitClipPath, &RenderStyle::clipPath, &RenderStyle::setClipPath),
 
@@ -1393,23 +1381,17 @@ bool CSSPropertyAnimation::blendProperties(const AnimationBase* anim, CSSPropert
     AnimationPropertyWrapperBase* wrapper = CSSPropertyAnimationWrapperMap::instance().wrapperForProperty(prop);
     if (wrapper) {
         wrapper->blend(anim, dst, a, b, progress);
-#if USE(ACCELERATED_COMPOSITING)
         return !wrapper->animationIsAccelerated() || !anim->isAccelerated();
-#else
-        return true;
-#endif
     }
 
     return false;
 }
 
-#if USE(ACCELERATED_COMPOSITING)
 bool CSSPropertyAnimation::animationOfPropertyIsAccelerated(CSSPropertyID prop)
 {
     AnimationPropertyWrapperBase* wrapper = CSSPropertyAnimationWrapperMap::instance().wrapperForProperty(prop);
     return wrapper ? wrapper->animationIsAccelerated() : false;
 }
-#endif
 
 // Note: this is inefficient. It's only called from pauseTransitionAtTime().
 HashSet<CSSPropertyID> CSSPropertyAnimation::animatableShorthandsAffectingProperty(CSSPropertyID property)
index c41c7dd..b21466f 100644 (file)
@@ -40,9 +40,7 @@ class RenderStyle;
 
 class CSSPropertyAnimation {
 public:
-#if USE(ACCELERATED_COMPOSITING)
     static bool animationOfPropertyIsAccelerated(CSSPropertyID);
-#endif
     static bool propertiesEqual(CSSPropertyID, const RenderStyle* a, const RenderStyle* b);
     static CSSPropertyID getPropertyAtIndex(int, bool& isShorthand);
     static int getNumProperties();
index e18779e..1c95d90 100644 (file)
@@ -148,7 +148,6 @@ void CompositeAnimation::updateTransitions(RenderElement* renderer, RenderStyle*
                     // list. In this case, the latter one overrides the earlier one, so we
                     // behave as though this is a running animation being replaced.
                     if (!implAnim->isTargetPropertyEqual(prop, targetStyle)) {
-#if USE(ACCELERATED_COMPOSITING)
                         // For accelerated animations we need to return a new RenderStyle with the _current_ value
                         // of the property, so that restarted transitions use the correct starting point.
                         if (CSSPropertyAnimation::animationOfPropertyIsAccelerated(prop) && implAnim->isAccelerated()) {
@@ -157,7 +156,6 @@ void CompositeAnimation::updateTransitions(RenderElement* renderer, RenderStyle*
 
                             implAnim->blendPropertyValueInStyle(prop, modifiedCurrentStyle.get());
                         }
-#endif
                         LOG(Animations, "Removing existing ImplicitAnimation %p for property %s", implAnim, getPropertyName(prop));
                         animationController()->animationWillBeRemoved(implAnim);
                         m_transitions.remove(prop);
index af1d788..fee6c07 100644 (file)
@@ -77,7 +77,6 @@ void ImplicitAnimation::animate(CompositeAnimation*, RenderElement*, const Rende
     if (!animatedStyle)
         animatedStyle = RenderStyle::clone(targetStyle);
 
-#if USE(ACCELERATED_COMPOSITING)
     bool needsAnim = CSSPropertyAnimation::blendProperties(this, m_animatingProperty, animatedStyle.get(), m_fromStyle.get(), m_toStyle.get(), progress(1, 0, 0));
     // FIXME: we also need to detect cases where we have to software animate for other reasons,
     // such as a child using inheriting the transform. https://bugs.webkit.org/show_bug.cgi?id=23902
@@ -87,7 +86,6 @@ void ImplicitAnimation::animate(CompositeAnimation*, RenderElement*, const Rende
         // that is animating are correctly detected during the animation (e.g. when a transition
         // gets interrupted).
         animatedStyle->setIsRunningAcceleratedAnimation();
-#endif
 
     // Fire the start timeout if needed
     fireAnimationEventsIfNeeded();
@@ -103,12 +101,8 @@ void ImplicitAnimation::getAnimatedStyle(RefPtr<RenderStyle>& animatedStyle)
 
 bool ImplicitAnimation::startAnimation(double timeOffset)
 {
-#if USE(ACCELERATED_COMPOSITING)
     if (m_object && m_object->isComposited())
         return toRenderBoxModelObject(m_object)->startTransition(timeOffset, m_animatingProperty, m_fromStyle.get(), m_toStyle.get());
-#else
-    UNUSED_PARAM(timeOffset);
-#endif
     return false;
 }
 
@@ -117,12 +111,8 @@ void ImplicitAnimation::pauseAnimation(double timeOffset)
     if (!m_object)
         return;
 
-#if USE(ACCELERATED_COMPOSITING)
     if (m_object->isComposited())
         toRenderBoxModelObject(m_object)->transitionPaused(timeOffset, m_animatingProperty);
-#else
-    UNUSED_PARAM(timeOffset);
-#endif
     // Restore the original (unanimated) style
     if (!paused())
         setNeedsStyleRecalc(m_object->element());
@@ -130,10 +120,8 @@ void ImplicitAnimation::pauseAnimation(double timeOffset)
 
 void ImplicitAnimation::endAnimation()
 {
-#if USE(ACCELERATED_COMPOSITING)
     if (m_object && m_object->isComposited())
         toRenderBoxModelObject(m_object)->transitionFinished(m_animatingProperty);
-#endif
 }
 
 void ImplicitAnimation::onAnimationEnd(double elapsedTime)
@@ -285,7 +273,6 @@ void ImplicitAnimation::checkForMatchingFilterFunctionLists()
 double ImplicitAnimation::timeToNextService()
 {
     double t = AnimationBase::timeToNextService();
-#if USE(ACCELERATED_COMPOSITING)
     if (t != 0 || preActive())
         return t;
         
@@ -295,7 +282,6 @@ double ImplicitAnimation::timeToNextService()
         bool isLooping;
         getTimeToNextEvent(t, isLooping);
     }
-#endif
     return t;
 }
 
index 8f661c6..bf10c27 100644 (file)
@@ -183,14 +183,12 @@ void KeyframeAnimation::animate(CompositeAnimation* compositeAnimation, RenderEl
         double progress = 0.0;
         fetchIntervalEndpointsForProperty(*it, fromStyle, toStyle, progress);
 
-#if USE(ACCELERATED_COMPOSITING)
         bool needsAnim = CSSPropertyAnimation::blendProperties(this, *it, animatedStyle.get(), fromStyle, toStyle, progress);
         if (!needsAnim)
             // If we are running an accelerated animation, set a flag in the style
             // to indicate it. This can be used to make sure we get an updated
             // style for hit testing, etc.
             animatedStyle->setIsRunningAcceleratedAnimation();
-#endif
     }
 }
 
@@ -226,13 +224,9 @@ bool KeyframeAnimation::hasAnimationForProperty(CSSPropertyID property) const
 
 bool KeyframeAnimation::startAnimation(double timeOffset)
 {
-#if USE(ACCELERATED_COMPOSITING)
     if (m_object && m_object->isComposited()) {
         return toRenderBoxModelObject(m_object)->startAnimation(timeOffset, m_animation.get(), m_keyframes);
     }
-#else
-    UNUSED_PARAM(timeOffset);
-#endif
     return false;
 }
 
@@ -241,12 +235,9 @@ void KeyframeAnimation::pauseAnimation(double timeOffset)
     if (!m_object)
         return;
 
-#if USE(ACCELERATED_COMPOSITING)
     if (m_object->isComposited())
         toRenderBoxModelObject(m_object)->animationPaused(timeOffset, m_keyframes.animationName());
-#else
-    UNUSED_PARAM(timeOffset);
-#endif
+
     // Restore the original (unanimated) style
     if (!paused())
         setNeedsStyleRecalc(m_object->element());
@@ -257,10 +248,9 @@ void KeyframeAnimation::endAnimation()
     if (!m_object)
         return;
 
-#if USE(ACCELERATED_COMPOSITING)
     if (m_object->isComposited())
         toRenderBoxModelObject(m_object)->animationFinished(m_keyframes.animationName());
-#endif
+
     // Restore the original (unanimated) style
     if (!paused())
         setNeedsStyleRecalc(m_object->element());
@@ -432,7 +422,6 @@ void KeyframeAnimation::checkForMatchingFilterFunctionLists()
 double KeyframeAnimation::timeToNextService()
 {
     double t = AnimationBase::timeToNextService();
-#if USE(ACCELERATED_COMPOSITING)
     if (t != 0 || preActive())
         return t;
         
@@ -452,7 +441,7 @@ double KeyframeAnimation::timeToNextService()
         bool isLooping;
         getTimeToNextEvent(t, isLooping);
     }
-#endif
+
     return t;
 }
 
index 14968b6..b4e3c3c 100644 (file)
@@ -876,7 +876,6 @@ static bool anyFrameHasTiledLayers(Frame* rootFrame)
 
 void Frame::viewportOffsetChanged(ViewportOffsetChangeType changeType)
 {
-#if USE(ACCELERATED_COMPOSITING)
     if (changeType == IncrementalScrollOffset) {
         if (anyFrameHasTiledLayers(this)) {
             if (RenderView* root = contentRenderer())
@@ -888,15 +887,13 @@ void Frame::viewportOffsetChanged(ViewportOffsetChangeType changeType)
         if (RenderView* root = contentRenderer())
             root->compositor().updateCompositingLayers(CompositingUpdateOnScroll);
     }
-#endif
 }
 
 bool Frame::containsTiledBackingLayers() const
 {
-#if USE(ACCELERATED_COMPOSITING)
     if (RenderView* root = contentRenderer())
         return root->compositor().hasNonMainLayersWithTiledBacking();
-#endif
+
     return false;
 }
 
index 77c50b8..273861c 100644 (file)
@@ -197,7 +197,6 @@ void AsyncScrollingCoordinator::updateScrollPositionAfterAsyncScroll(ScrollingNo
 
     frameView->setInProgrammaticScroll(oldProgrammaticScroll);
 
-#if USE(ACCELERATED_COMPOSITING)
     if (scrollingNodeID == frameView->scrollLayerID()) {
         if (GraphicsLayer* scrollLayer = scrollLayerForFrameView(frameView)) {
             GraphicsLayer* counterScrollingLayer = counterScrollingLayerForFrameView(frameView);
@@ -228,9 +227,6 @@ void AsyncScrollingCoordinator::updateScrollPositionAfterAsyncScroll(ScrollingNo
         }
     }
     // FIXME: handle non-main scrolling nodes.
-#else
-    UNUSED_PARAM(scrollingLayerPositionAction);
-#endif
 }
 
 void AsyncScrollingCoordinator::scrollableAreaScrollbarLayerDidChange(ScrollableArea* scrollableArea, ScrollbarOrientation orientation)
index 93dfb0c..8e3256e 100644 (file)
 #include "PlatformWheelEvent.h"
 #include "PluginViewBase.h"
 #include "Region.h"
+#include "RenderLayerCompositor.h"
 #include "RenderView.h"
 #include "ScrollAnimator.h"
 #include <wtf/MainThread.h>
 #include <wtf/text/StringBuilder.h>
 
-#if USE(ACCELERATED_COMPOSITING)
-#include "RenderLayerCompositor.h"
-#endif
-
 #if USE(COORDINATED_GRAPHICS)
 #include "ScrollingCoordinatorCoordinatedGraphics.h"
 #endif
@@ -89,14 +86,10 @@ bool ScrollingCoordinator::coordinatesScrollingForFrameView(FrameView* frameView
         return false;
 
     // We currently only support composited mode.
-#if USE(ACCELERATED_COMPOSITING)
     RenderView* renderView = m_page->mainFrame().contentRenderer();
     if (!renderView)
         return false;
     return renderView->usesCompositing();
-#else
-    return false;
-#endif
 }
 
 Region ScrollingCoordinator::computeNonFastScrollableRegion(const Frame* frame, const IntPoint& frameLocation) const
@@ -112,11 +105,9 @@ Region ScrollingCoordinator::computeNonFastScrollableRegion(const Frame* frame,
     if (const FrameView::ScrollableAreaSet* scrollableAreas = frameView->scrollableAreas()) {
         for (FrameView::ScrollableAreaSet::const_iterator it = scrollableAreas->begin(), end = scrollableAreas->end(); it != end; ++it) {
             ScrollableArea* scrollableArea = *it;
-#if USE(ACCELERATED_COMPOSITING)
             // Composited scrollable areas can be scrolled off the main thread.
             if (scrollableArea->usesCompositedScrolling())
                 continue;
-#endif
             IntRect box = scrollableArea->scrollableAreaBoundingBox();
             box.moveBy(offset);
             nonFastScrollableRegion.unite(box);
@@ -179,7 +170,6 @@ void ScrollingCoordinator::frameViewFixedObjectsDidChange(FrameView* frameView)
     updateSynchronousScrollingReasons();
 }
 
-#if USE(ACCELERATED_COMPOSITING)
 GraphicsLayer* ScrollingCoordinator::scrollLayerForScrollableArea(ScrollableArea* scrollableArea)
 {
     return scrollableArea->layerForScrolling();
@@ -194,23 +184,17 @@ GraphicsLayer* ScrollingCoordinator::verticalScrollbarLayerForScrollableArea(Scr
 {
     return scrollableArea->layerForVerticalScrollbar();
 }
-#endif
 
 GraphicsLayer* ScrollingCoordinator::scrollLayerForFrameView(FrameView* frameView)
 {
-#if USE(ACCELERATED_COMPOSITING)
     if (RenderView* renderView = frameView->frame().contentRenderer())
         return renderView->compositor().scrollLayer();
     return 0;
-#else
-    UNUSED_PARAM(frameView);
-    return 0;
-#endif
 }
 
 GraphicsLayer* ScrollingCoordinator::headerLayerForFrameView(FrameView* frameView)
 {
-#if USE(ACCELERATED_COMPOSITING) && ENABLE(RUBBER_BANDING)
+#if ENABLE(RUBBER_BANDING)
     if (RenderView* renderView = frameView->frame().contentRenderer())
         renderView->compositor().headerLayer();
     return 0;
@@ -222,7 +206,7 @@ GraphicsLayer* ScrollingCoordinator::headerLayerForFrameView(FrameView* frameVie
 
 GraphicsLayer* ScrollingCoordinator::footerLayerForFrameView(FrameView* frameView)
 {
-#if USE(ACCELERATED_COMPOSITING) && ENABLE(RUBBER_BANDING)
+#if ENABLE(RUBBER_BANDING)
     if (RenderView* renderView = frameView->frame().contentRenderer())
         return renderView->compositor().footerLayer();
     return 0;
@@ -234,14 +218,9 @@ GraphicsLayer* ScrollingCoordinator::footerLayerForFrameView(FrameView* frameVie
 
 GraphicsLayer* ScrollingCoordinator::counterScrollingLayerForFrameView(FrameView* frameView)
 {
-#if USE(ACCELERATED_COMPOSITING)
     if (RenderView* renderView = frameView->frame().contentRenderer())
         return renderView->compositor().fixedRootBackgroundLayer();
     return 0;
-#else
-    UNUSED_PARAM(frameView);
-    return 0;
-#endif
 }
 
 void ScrollingCoordinator::frameViewRootLayerDidChange(FrameView* frameView)
@@ -279,7 +258,6 @@ bool ScrollingCoordinator::hasVisibleSlowRepaintViewportConstrainedObjects(Frame
     if (!viewportConstrainedObjects)
         return false;
 
-#if USE(ACCELERATED_COMPOSITING)
     for (FrameView::ViewportConstrainedObjectSet::const_iterator it = viewportConstrainedObjects->begin(), end = viewportConstrainedObjects->end(); it != end; ++it) {
         RenderObject* viewportConstrainedObject = *it;
         if (!viewportConstrainedObject->isBoxModelObject() || !viewportConstrainedObject->hasLayer())
@@ -290,9 +268,6 @@ bool ScrollingCoordinator::hasVisibleSlowRepaintViewportConstrainedObjects(Frame
             return true;
     }
     return false;
-#else
-    return viewportConstrainedObjects->size();
-#endif
 }
 
 SynchronousScrollingReasons ScrollingCoordinator::synchronousScrollingReasons() const
index 0e05d69..9247ba3 100644 (file)
@@ -182,11 +182,9 @@ public:
 protected:
     explicit ScrollingCoordinator(Page*);
 
-#if USE(ACCELERATED_COMPOSITING)
     static GraphicsLayer* scrollLayerForScrollableArea(ScrollableArea*);
     static GraphicsLayer* horizontalScrollbarLayerForScrollableArea(ScrollableArea*);
     static GraphicsLayer* verticalScrollbarLayerForScrollableArea(ScrollableArea*);
-#endif
 
     unsigned computeCurrentWheelEventHandlerCount();
     GraphicsLayer* scrollLayerForFrameView(FrameView*);
index 2e81d22..5974f84 100644 (file)
@@ -976,7 +976,6 @@ void ScrollView::clipRectChanged()
         (*current)->clipRectChanged();
 }
 
-#if USE(ACCELERATED_COMPOSITING)
 static void positionScrollbarLayer(GraphicsLayer* graphicsLayer, Scrollbar* scrollbar)
 {
     if (!graphicsLayer || !scrollbar)
@@ -1009,16 +1008,12 @@ static void positionScrollCornerLayer(GraphicsLayer* graphicsLayer, const IntRec
         graphicsLayer->setNeedsDisplay();
     graphicsLayer->setSize(cornerRect.size());
 }
-#endif
-
 
 void ScrollView::positionScrollbarLayers()
 {
-#if USE(ACCELERATED_COMPOSITING)
     positionScrollbarLayer(layerForHorizontalScrollbar(), horizontalScrollbar());
     positionScrollbarLayer(layerForVerticalScrollbar(), verticalScrollbar());
     positionScrollCornerLayer(layerForScrollCorner(), scrollCornerRect());
-#endif
 }
 
 void ScrollView::repaintContentRectangle(const IntRect& rect, bool now)
@@ -1099,23 +1094,14 @@ void ScrollView::invalidateScrollCornerRect(const IntRect& rect)
 
 void ScrollView::paintScrollbars(GraphicsContext* context, const IntRect& rect)
 {
-    if (m_horizontalScrollbar
-#if USE(ACCELERATED_COMPOSITING)
-        && !layerForHorizontalScrollbar()
-#endif
-                                      )
+    if (m_horizontalScrollbar && !layerForHorizontalScrollbar())
         paintScrollbar(context, m_horizontalScrollbar.get(), rect);
-    if (m_verticalScrollbar
-#if USE(ACCELERATED_COMPOSITING)
-        && !layerForVerticalScrollbar()
-#endif
-                                    )
+    if (m_verticalScrollbar && !layerForVerticalScrollbar())
         paintScrollbar(context, m_verticalScrollbar.get(), rect);
 
-#if USE(ACCELERATED_COMPOSITING)
     if (layerForScrollCorner())
         return;
-#endif
+
     paintScrollCorner(context, scrollCornerRect());
 }
 
@@ -1162,7 +1148,7 @@ void ScrollView::paint(GraphicsContext* context, const IntRect& rect)
         paintContents(context, documentDirtyRect);
     }
 
-#if USE(ACCELERATED_COMPOSITING) && ENABLE(RUBBER_BANDING)
+#if ENABLE(RUBBER_BANDING)
     if (!layerForOverhangAreas())
         calculateAndPaintOverhangAreas(context, rect);
 #else
index 88d0293..85f5852 100644 (file)
@@ -322,7 +322,6 @@ void ScrollableArea::setScrollbarOverlayStyle(ScrollbarOverlayStyle overlayStyle
 
 void ScrollableArea::invalidateScrollbar(Scrollbar* scrollbar, const IntRect& rect)
 {
-#if USE(ACCELERATED_COMPOSITING)
     if (scrollbar == horizontalScrollbar()) {
         if (GraphicsLayer* graphicsLayer = layerForHorizontalScrollbar()) {
             graphicsLayer->setNeedsDisplay();
@@ -336,22 +335,20 @@ void ScrollableArea::invalidateScrollbar(Scrollbar* scrollbar, const IntRect& re
             return;
         }
     }
-#endif
+
     invalidateScrollbarRect(scrollbar, rect);
 }
 
 void ScrollableArea::invalidateScrollCorner(const IntRect& rect)
 {
-#if USE(ACCELERATED_COMPOSITING)
     if (GraphicsLayer* graphicsLayer = layerForScrollCorner()) {
         graphicsLayer->setNeedsDisplay();
         return;
     }
-#endif
+
     invalidateScrollCornerRect(rect);
 }
 
-#if USE(ACCELERATED_COMPOSITING)
 void ScrollableArea::verticalScrollbarLayerDidChange()
 {
     scrollAnimator()->verticalScrollbarLayerDidChange();
@@ -361,33 +358,20 @@ void ScrollableArea::horizontalScrollbarLayerDidChange()
 {
     scrollAnimator()->horizontalScrollbarLayerDidChange();
 }
-#endif
 
 bool ScrollableArea::hasLayerForHorizontalScrollbar() const
 {
-#if USE(ACCELERATED_COMPOSITING)
     return layerForHorizontalScrollbar();
-#else
-    return false;
-#endif
 }
 
 bool ScrollableArea::hasLayerForVerticalScrollbar() const
 {
-#if USE(ACCELERATED_COMPOSITING)
     return layerForVerticalScrollbar();
-#else
-    return false;
-#endif
 }
 
 bool ScrollableArea::hasLayerForScrollCorner() const
 {
-#if USE(ACCELERATED_COMPOSITING)
     return layerForScrollCorner();
-#else
-    return false;
-#endif
 }
 
 void ScrollableArea::serviceScrollAnimations()
index 8d6f40c..7b40770 100644 (file)
@@ -36,10 +36,8 @@ class GraphicsContext;
 class PlatformTouchEvent;
 class PlatformWheelEvent;
 class ScrollAnimator;
-#if USE(ACCELERATED_COMPOSITING)
 class GraphicsLayer;
 class TiledBacking;
-#endif
 
 class ScrollableArea {
 public:
@@ -221,7 +219,6 @@ public:
     bool isPinnedVerticallyInDirection(int verticalScrollDelta) const;
 #endif
 
-#if USE(ACCELERATED_COMPOSITING)
     virtual TiledBacking* tiledBacking() const { return 0; }
     virtual bool usesCompositedScrolling() const { return false; }
 
@@ -230,7 +227,6 @@ public:
 
     void verticalScrollbarLayerDidChange();
     void horizontalScrollbarLayerDidChange();
-#endif
 
 protected:
     ScrollableArea();
@@ -242,14 +238,13 @@ protected:
     virtual void invalidateScrollbarRect(Scrollbar*, const IntRect&) = 0;
     virtual void invalidateScrollCornerRect(const IntRect&) = 0;
 
-#if USE(ACCELERATED_COMPOSITING)
     friend class ScrollingCoordinator;
     virtual GraphicsLayer* layerForScrolling() const { return 0; }
     virtual GraphicsLayer* layerForScrollCorner() const { return 0; }
 #if ENABLE(RUBBER_BANDING)
     virtual GraphicsLayer* layerForOverhangAreas() const { return 0; }
 #endif
-#endif
+
     bool hasLayerForHorizontalScrollbar() const;
     bool hasLayerForVerticalScrollbar() const;
     bool hasLayerForScrollCorner() const;
index d68e062..5898bd8 100644 (file)
@@ -36,7 +36,7 @@ class PlatformMouseEvent;
 class ScrollbarThemeClient;
 class ScrollView;
 
-#if USE(ACCELERATED_COMPOSITING) && ENABLE(RUBBER_BANDING)
+#if ENABLE(RUBBER_BANDING)
 class GraphicsLayer;
 #endif
 
@@ -90,7 +90,7 @@ public:
     virtual void paintTickmarks(GraphicsContext*, ScrollbarThemeClient*, const IntRect&) { }
     virtual void paintOverhangAreas(ScrollView*, GraphicsContext*, const IntRect&, const IntRect&, const IntRect&) { }
 
-#if USE(ACCELERATED_COMPOSITING) && ENABLE(RUBBER_BANDING)
+#if ENABLE(RUBBER_BANDING)
     virtual void setUpOverhangAreasLayerContents(GraphicsLayer*, const Color&) { }
     virtual void setUpContentShadowLayer(GraphicsLayer*) { }
 #endif
index 133a1ac..5dc091a 100644 (file)
@@ -114,12 +114,10 @@ void applyFallbackCursor(Ecore_Evas* ecoreEvas, const char* cursorString)
     }
 
     Ecore_X_Window window;
-#if USE(ACCELERATED_COMPOSITING)
     window = ecore_evas_gl_x11_window_get(ecoreEvas);
     // Fallback to software mode if necessary.
     if (!window)
-#endif
-    window = ecore_evas_software_x11_window_get(ecoreEvas);
+        window = ecore_evas_software_x11_window_get(ecoreEvas);
 
     Ecore_X_Cursor cursor = ecore_x_cursor_shape_get(shape);
     ecore_x_window_cursor_set(window, cursor);
index 705c327..c3f3e79 100644 (file)
@@ -491,10 +491,8 @@ public:
 #else
     PlatformGraphicsContext3D platformGraphicsContext3D();
     Platform3DObject platformTexture() const;
-#if USE(ACCELERATED_COMPOSITING) 
     PlatformLayer* platformLayer() const;
 #endif
-#endif
 
     bool makeContextCurrent();
 
index 049fdd2..956166d 100644 (file)
@@ -37,7 +37,7 @@
 #include "OpenGLShims.h"
 #endif
 
-#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER) && USE(TEXTURE_MAPPER_GL)
+#if USE(TEXTURE_MAPPER) && USE(TEXTURE_MAPPER_GL)
 #include <texmap/TextureMapperGL.h>
 #endif
 
@@ -68,7 +68,7 @@ GraphicsContext3DPrivate::GraphicsContext3DPrivate(GraphicsContext3D* context, G
 
 GraphicsContext3DPrivate::~GraphicsContext3DPrivate()
 {
-#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
+#if USE(TEXTURE_MAPPER)
     if (client())
         client()->platformLayerWillBeDestroyed();
 #endif
@@ -84,7 +84,7 @@ PlatformGraphicsContext3D GraphicsContext3DPrivate::platformContext()
     return m_glContext ? m_glContext->platformContext() : GLContext::getCurrent()->platformContext();
 }
 
-#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
+#if USE(TEXTURE_MAPPER)
 void GraphicsContext3DPrivate::paintToTextureMapper(TextureMapper* textureMapper, const FloatRect& targetRect, const TransformationMatrix& matrix, float opacity)
 {
     if (!m_glContext)
@@ -150,9 +150,9 @@ void GraphicsContext3DPrivate::paintToTextureMapper(TextureMapper* textureMapper
     TextureMapperGL::Flags flags = TextureMapperGL::ShouldFlipTexture | (m_context->m_attrs.alpha ? TextureMapperGL::ShouldBlend : 0);
     IntSize textureSize(m_context->m_currentWidth, m_context->m_currentHeight);
     texmapGL->drawTexture(m_context->m_texture, flags, textureSize, targetRect, matrix, opacity);
-#endif // USE(ACCELERATED_COMPOSITING_GL)
+#endif // USE(TEXTURE_MAPPER_GL)
 }
-#endif // USE(ACCELERATED_COMPOSITING)
+#endif // USE(TEXTURE_MAPPER)
 
 } // namespace WebCore
 
index 42eb6c2..b6fd448 100644 (file)
 #include "GraphicsContext3D.h"
 #include <wtf/PassOwnPtr.h>
 
-#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
+#if USE(TEXTURE_MAPPER)
 #include "TextureMapperPlatformLayer.h"
 #endif
 
 namespace WebCore {
 
 class GraphicsContext3DPrivate
-#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
+#if USE(TEXTURE_MAPPER)
     : public TextureMapperPlatformLayer
 #endif
 {
@@ -43,7 +43,7 @@ public:
 
     GraphicsContext3D::RenderStyle renderStyle() { return m_renderStyle; }
 
-#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
+#if USE(TEXTURE_MAPPER)
     virtual void paintToTextureMapper(TextureMapper*, const FloatRect& target, const TransformationMatrix&, float opacity);
 #endif
 
index 3d410b7..9344a38 100644 (file)
@@ -25,8 +25,6 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "GraphicsLayer.h"
 
 #include "FloatPoint.h"
@@ -793,5 +791,3 @@ void showGraphicsLayerTree(const WebCore::GraphicsLayer* layer)
     fprintf(stderr, "%s\n", output.utf8().data());
 }
 #endif
-
-#endif // USE(ACCELERATED_COMPOSITING)
index 3d57e80..ff0c159 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef GraphicsLayer_h
 #define GraphicsLayer_h
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "Animation.h"
 #include "Color.h"
 #include "FloatPoint.h"
@@ -625,6 +623,4 @@ protected:
 void showGraphicsLayerTree(const WebCore::GraphicsLayer* layer);
 #endif
 
-#endif // USE(ACCELERATED_COMPOSITING)
-
 #endif // GraphicsLayer_h
index add686f..645066e 100644 (file)
@@ -19,7 +19,6 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING)
 #include "GraphicsLayerAnimation.h"
 
 #include "LayoutSize.h"
@@ -401,5 +400,3 @@ GraphicsLayerAnimations GraphicsLayerAnimations::getActiveAnimations() const
     return active;
 }
 }
-#endif
-
index 2d2f685..8f37fe4 100644 (file)
@@ -20,8 +20,6 @@
 #ifndef GraphicsLayerAnimation_h
 #define GraphicsLayerAnimation_h
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "GraphicsLayer.h"
 #include "TransformationMatrix.h"
 #include <wtf/HashMap.h>
@@ -105,6 +103,5 @@ private:
 };
 
 }
-#endif
 
 #endif // GraphicsLayerAnimation_h
index 90f9e82..3d513cd 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef GraphicsLayerClient_h
 #define GraphicsLayerClient_h
 
-#if USE(ACCELERATED_COMPOSITING)
-
 namespace WebCore {
 
 class FloatPoint;
@@ -107,6 +105,4 @@ public:
 
 } // namespace WebCore
 
-#endif // USE(ACCELERATED_COMPOSITING)
-
 #endif // GraphicsLayerClient_h
index 6413e93..708c8c6 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef GraphicsLayerFactory_h
 #define GraphicsLayerFactory_h
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include <wtf/Forward.h>
 
 namespace WebCore {
@@ -44,6 +42,4 @@ public:
 
 } // namespace WebCore
 
-#endif // USE(ACCELERATED_COMPOSITING)
-
 #endif // GraphicsLayerFactory_h
index b3c9436..056992d 100644 (file)
@@ -25,8 +25,6 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "GraphicsLayerUpdater.h"
 
 #include "GraphicsLayer.h"
@@ -81,5 +79,3 @@ void GraphicsLayerUpdater::displayRefreshFired(double timestamp)
 }
 
 } // namespace WebCore
-
-#endif // USE(ACCELERATED_COMPOSITING)
index 108099a..f4246df 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef GraphicsLayerUpdater_h
 #define GraphicsLayerUpdater_h
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "DisplayRefreshMonitor.h"
 #include "PlatformScreen.h"
 
@@ -62,6 +60,4 @@ private:
 
 } // namespace WebCore
 
-#endif // USE(ACCELERATED_COMPOSITING)
-
 #endif // GraphicsLayerUpdater_h
index 833534c..e6facda 100644 (file)
@@ -98,7 +98,7 @@ void ImageBuffer::convertToLuminanceMask()
     genericConvertToLuminanceMask();
 }
 
-#if USE(ACCELERATED_COMPOSITING) && !USE(CAIRO)
+#if !USE(CAIRO)
 PlatformLayer* ImageBuffer::platformLayer() const
 {
     return 0;
index b62e506..5a4df21 100644 (file)
 #include "ColorSpace.h"
 #include "FloatRect.h"
 #include "GraphicsContext.h"
-#if USE(ACCELERATED_COMPOSITING)
-#include "PlatformLayer.h"
-#endif
 #include "GraphicsTypes.h"
 #include "GraphicsTypes3D.h"
 #include "IntSize.h"
 #include "ImageBufferData.h"
+#include "PlatformLayer.h"
 #include <runtime/Uint8ClampedArray.h>
 #include <wtf/Forward.h>
 #include <wtf/OwnPtr.h>
@@ -119,9 +117,7 @@ namespace WebCore {
 #else
         AffineTransform baseTransform() const { return AffineTransform(1, 0, 0, -1, 0, m_data.m_backingStoreSize.height()); }
 #endif
-#if USE(ACCELERATED_COMPOSITING)
         PlatformLayer* platformLayer() const;
-#endif
 
         // FIXME: current implementations of this method have the restriction that they only work
         // with textures that are RGB or RGBA format, and UNSIGNED_BYTE type.
index eac2554..e3f7724 100644 (file)
@@ -95,9 +95,7 @@ public:
     virtual void pause() { }    
 
     virtual PlatformMedia platformMedia() const { return NoPlatformMedia; }
-#if USE(ACCELERATED_COMPOSITING)
     virtual PlatformLayer* platformLayer() const { return 0; }
-#endif
 
     virtual IntSize naturalSize() const { return IntSize(0, 0); }
 
@@ -612,12 +610,10 @@ PlatformMedia MediaPlayer::platformMedia() const
     return m_private->platformMedia();
 }
 
-#if USE(ACCELERATED_COMPOSITING)
 PlatformLayer* MediaPlayer::platformLayer() const
 {
     return m_private->platformLayer();
 }
-#endif
 
 MediaPlayer::NetworkState MediaPlayer::networkState()
 {
@@ -890,7 +886,6 @@ bool MediaPlayer::canEnterFullscreen() const
 }
 #endif
 
-#if USE(ACCELERATED_COMPOSITING)
 void MediaPlayer::acceleratedRenderingStateChanged()
 {
     m_private->acceleratedRenderingStateChanged();
@@ -900,7 +895,6 @@ bool MediaPlayer::supportsAcceleratedRendering() const
 {
     return m_private->supportsAcceleratedRendering();
 }
-#endif // USE(ACCELERATED_COMPOSITING)
 
 bool MediaPlayer::shouldMaintainAspectRatio() const
 {
index c6480e4..471891c 100644 (file)
@@ -38,6 +38,7 @@
 #include "URL.h"
 #include "LayoutRect.h"
 #include "NativeImagePtr.h"
+#include "PlatformLayer.h"
 #include "Timer.h"
 #include "VideoTrackPrivate.h"
 #include <runtime/Uint8Array.h>
 #include <wtf/PassOwnPtr.h>
 #include <wtf/text/StringHash.h>
 
-#if USE(ACCELERATED_COMPOSITING)
-#include "PlatformLayer.h"
-#endif
-
 #if USE(PLATFORM_TEXT_TRACK_MENU)
 #include "PlatformTextTrackMenu.h"
 #endif
@@ -199,14 +196,12 @@ public:
     // A characteristic of the media file, eg. video, audio, closed captions, etc, has changed.
     virtual void mediaPlayerCharacteristicChanged(MediaPlayer*) { }
     
-#if USE(ACCELERATED_COMPOSITING)
     // whether the rendering system can accelerate the display of this MediaPlayer.
     virtual bool mediaPlayerRenderingCanBeAccelerated(MediaPlayer*) { return false; }
 
     // called when the media player's rendering mode changed, which indicates a change in the
     // availability of the platformLayer().
     virtual void mediaPlayerRenderingModeChanged(MediaPlayer*) { }
-#endif
 
 #if PLATFORM(WIN) && USE(AVFOUNDATION)
     virtual GraphicsDeviceAdapter* mediaPlayerGraphicsDeviceAdapter(const MediaPlayer*) const { return 0; }
@@ -294,9 +289,7 @@ public:
     bool supportsScanning() const;
     bool requiresImmediateCompositing() const;
     PlatformMedia platformMedia() const;
-#if USE(ACCELERATED_COMPOSITING)
     PlatformLayer* platformLayer() const;
-#endif
 
     IntSize naturalSize();
     bool hasVideo() const;
@@ -457,12 +450,10 @@ public:
     bool canEnterFullscreen() const;
 #endif
 
-#if USE(ACCELERATED_COMPOSITING)
     // whether accelerated rendering is supported by the media engine for the current media.
     bool supportsAcceleratedRendering() const;
     // called when the rendering system flips the into or out of accelerated rendering mode.
     void acceleratedRenderingStateChanged();
-#endif
 
     bool shouldMaintainAspectRatio() const;
     void setShouldMaintainAspectRatio(bool);
index fbafd70..553788c 100644 (file)
@@ -52,9 +52,7 @@ public:
     
     virtual void prepareToPlay() { }
     virtual PlatformMedia platformMedia() const { return NoPlatformMedia; }
-#if USE(ACCELERATED_COMPOSITING)
     virtual PlatformLayer* platformLayer() const { return 0; }
-#endif
 
     virtual void play() = 0;
     virtual void pause() = 0;    
@@ -160,12 +158,10 @@ public:
     virtual bool canEnterFullscreen() const { return false; }
 #endif
 
-#if USE(ACCELERATED_COMPOSITING)
     // whether accelerated rendering is supported by the media engine for the current media.
     virtual bool supportsAcceleratedRendering() const { return false; }
     // called when the rendering system flips the into or out of accelerated rendering mode.
     virtual void acceleratedRenderingStateChanged() { }
-#endif
 
     virtual bool shouldMaintainAspectRatio() const { return true; }
     virtual void setShouldMaintainAspectRatio(bool) { }
index a18f9b9..2c7d26b 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef PlatformLayer_h
 #define PlatformLayer_h
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #if PLATFORM(MAC)
 OBJC_CLASS CALayer;
 typedef CALayer PlatformLayer;
@@ -56,6 +54,4 @@ typedef TextureMapperPlatformLayer PlatformLayer;
 typedef void* PlatformLayer;
 #endif
 
-#endif // USE(ACCELERATED_COMPOSITING)
-
 #endif // PlatformLayer_h
index d178e58..fcf58b8 100644 (file)
@@ -35,9 +35,7 @@ class NullTextTrackRepresentation : public TextTrackRepresentation {
 public:
     virtual ~NullTextTrackRepresentation() { }
     virtual void update() { }
-#if USE(ACCELERATED_COMPOSITING)
     virtual PlatformLayer* platformLayer() { return 0; }
-#endif
     virtual void setContentScale(float) { }
     virtual IntRect bounds() const { return IntRect(); }
 };
index 5f84448..9e1c83b 100644 (file)
@@ -53,9 +53,7 @@ public:
     virtual ~TextTrackRepresentation() { }
 
     virtual void update() = 0;
-#if USE(ACCELERATED_COMPOSITING)
     virtual PlatformLayer* platformLayer() = 0;
-#endif
     virtual void setContentScale(float) = 0;
     virtual IntRect bounds() const = 0;
 };
index d0720c5..58a2468 100644 (file)
@@ -91,10 +91,8 @@ MediaPlayerPrivateAVFoundation::~MediaPlayerPrivateAVFoundation()
 
 MediaPlayerPrivateAVFoundation::MediaRenderingMode MediaPlayerPrivateAVFoundation::currentRenderingMode() const
 {
-#if USE(ACCELERATED_COMPOSITING)
     if (platformLayer())
         return MediaRenderingToLayer;
-#endif
 
     if (hasContextRenderer())
         return MediaRenderingToContext;
@@ -107,10 +105,8 @@ MediaPlayerPrivateAVFoundation::MediaRenderingMode MediaPlayerPrivateAVFoundatio
     if (!m_player->visible() || !m_player->frameView() || assetStatus() == MediaPlayerAVAssetStatusUnknown)
         return MediaRenderingNone;
 
-#if USE(ACCELERATED_COMPOSITING)
     if (supportsAcceleratedRendering() && m_player->mediaPlayerClient()->mediaPlayerRenderingCanBeAccelerated(m_player))
         return MediaRenderingToLayer;
-#endif
 
     return MediaRenderingToContext;
 }
@@ -140,21 +136,17 @@ void MediaPlayerPrivateAVFoundation::setUpVideoRendering()
     case MediaRenderingToContext:
         createContextVideoRenderer();
         break;
-        
-#if USE(ACCELERATED_COMPOSITING)
+
     case MediaRenderingToLayer:
         createVideoLayer();
         break;
-#endif
     }
 
-#if USE(ACCELERATED_COMPOSITING)
     // If using a movie layer, inform the client so the compositing tree is updated.
     if (currentMode == MediaRenderingToLayer || preferredMode == MediaRenderingToLayer) {
         LOG(Media, "MediaPlayerPrivateAVFoundation::setUpVideoRendering(%p) - calling mediaPlayerRenderingModeChanged()", this);
         m_player->mediaPlayerClient()->mediaPlayerRenderingModeChanged(m_player);
     }
-#endif
 }
 
 void MediaPlayerPrivateAVFoundation::tearDownVideoRendering()
@@ -163,10 +155,8 @@ void MediaPlayerPrivateAVFoundation::tearDownVideoRendering()
 
     destroyContextVideoRenderer();
 
-#if USE(ACCELERATED_COMPOSITING)
     if (platformLayer())
         destroyVideoLayer();
-#endif
 }
 
 bool MediaPlayerPrivateAVFoundation::hasSetUpVideoRendering() const
index 192ec39..0cfa51f 100644 (file)
@@ -180,11 +180,9 @@ protected:
     virtual void paint(GraphicsContext*, const IntRect&) = 0;
     virtual void paintCurrentFrameInContext(GraphicsContext*, const IntRect&) = 0;
     virtual void setPreload(MediaPlayer::Preload) override;
-#if USE(ACCELERATED_COMPOSITING)
     virtual PlatformLayer* platformLayer() const { return 0; }
     virtual bool supportsAcceleratedRendering() const = 0;
     virtual void acceleratedRenderingStateChanged() override;
-#endif
     virtual bool shouldMaintainAspectRatio() const override { return m_shouldMaintainAspectRatio; }
     virtual void setShouldMaintainAspectRatio(bool) override;
 
index 1f20621..f5a8b11 100644 (file)
@@ -80,9 +80,7 @@ private:
 
     virtual void prepareToPlay() override;
     virtual PlatformMedia platformMedia() const override;
-#if USE(ACCELERATED_COMPOSITING)
     virtual PlatformLayer* platformLayer() const override;
-#endif
 
     virtual void play() override;
     void playInternal();
@@ -128,11 +126,9 @@ private:
 
     virtual bool hasAvailableVideoFrame() const override;
 
-#if USE(ACCELERATED_COMPOSITING)
     virtual bool supportsAcceleratedRendering() const override;
     // called when the rendering system flips the into or out of accelerated rendering mode.
     virtual void acceleratedRenderingStateChanged() override;
-#endif
 
     virtual MediaPlayer::MovieLoadType movieLoadType() const override;
 
index 5208799..6c46568 100644 (file)
@@ -258,12 +258,10 @@ PlatformMedia MediaPlayerPrivateMediaSourceAVFObjC::platformMedia() const
     return pm;
 }
 
-#if USE(ACCELERATED_COMPOSITING)
 PlatformLayer* MediaPlayerPrivateMediaSourceAVFObjC::platformLayer() const
 {
     return m_sampleBufferDisplayLayer.get();
 }
-#endif
 
 void MediaPlayerPrivateMediaSourceAVFObjC::play()
 {
@@ -437,7 +435,6 @@ bool MediaPlayerPrivateMediaSourceAVFObjC::hasAvailableVideoFrame() const
     return m_hasAvailableVideoFrame;
 }
 
-#if USE(ACCELERATED_COMPOSITING)
 bool MediaPlayerPrivateMediaSourceAVFObjC::supportsAcceleratedRendering() const
 {
     return true;
@@ -450,7 +447,6 @@ void MediaPlayerPrivateMediaSourceAVFObjC::acceleratedRenderingStateChanged()
     else
         destroyLayer();
 }
-#endif
 
 MediaPlayer::MovieLoadType MediaPlayerPrivateMediaSourceAVFObjC::movieLoadType() const
 {
index ab44c7c..082d9ec 100644 (file)
@@ -25,8 +25,6 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "GraphicsLayerCA.h"
 
 #include "Animation.h"
@@ -3508,5 +3506,3 @@ double GraphicsLayerCA::backingStoreMemoryEstimate() const
 }
 
 } // namespace WebCore
-
-#endif // USE(ACCELERATED_COMPOSITING)
index e3e7928..0ef5d99 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef GraphicsLayerCA_h
 #define GraphicsLayerCA_h
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "GraphicsLayer.h"
 #include "Image.h"
 #include "PlatformCAAnimation.h"
@@ -551,7 +549,4 @@ GRAPHICSLAYER_TYPE_CASTS(GraphicsLayerCA, isGraphicsLayerCA());
 
 } // namespace WebCore
 
-
-#endif // USE(ACCELERATED_COMPOSITING)
-
 #endif // GraphicsLayerCA_h
index fc8de73..99ce693 100644 (file)
@@ -25,8 +25,6 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "LayerFlushScheduler.h"
 
 namespace WebCore {
@@ -50,5 +48,3 @@ void LayerFlushScheduler::resume()
 }
 
 } // namespace WebCore
-
-#endif // USE(ACCELERATED_COMPOSITING)
index fe0b52d..60188f3 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef LayerFlushScheduler_h
 #define LayerFlushScheduler_h
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "LayerFlushSchedulerClient.h"
 #include <wtf/Noncopyable.h>
 #include <wtf/RetainPtr.h>
@@ -63,6 +61,4 @@ protected:
 
 } // namespace WebCore
 
-#endif // USE(ACCELERATED_COMPOSITING)
-
 #endif // LayerFlushScheduler_h
index f79cb38..eb0b96c 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef LayerFlushSchedulerClient_h
 #define LayerFlushSchedulerClient_h
 
-#if USE(ACCELERATED_COMPOSITING)
-
 namespace WebCore {
 
 class LayerFlushSchedulerClient {
@@ -41,6 +39,4 @@ public:
 
 } // namespace WebCore
 
-#endif // USE(ACCELERATED_COMPOSITING)
-
 #endif // LayerFlushSchedulerClient_h
index ce3236f..acbaea2 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef PlatformCAAnimation_h
 #define PlatformCAAnimation_h
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "Color.h"
 #include "FilterOperation.h"
 #include "FloatPoint3D.h"
@@ -165,6 +163,4 @@ private:
 
 }
 
-#endif // USE(ACCELERATED_COMPOSITING)
-
 #endif // PlatformCAAnimation_h
index 9c3507b..797d3b6 100644 (file)
@@ -26,7 +26,6 @@
 #ifndef PlatformCAFilters_h
 #define PlatformCAFilters_h
 
-#if USE(ACCELERATED_COMPOSITING)
 #if ENABLE(CSS_FILTERS)
 
 #include "FilterOperations.h"
@@ -65,6 +64,5 @@ public:
 }
 
 #endif // ENABLE(CSS_FILTERS)
-#endif // USE(ACCELERATED_COMPOSITING)
 
 #endif // PlatformCAFilters_h
index 37a495f..e4744b0 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef PlatformCALayer_h
 #define PlatformCALayer_h
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "GraphicsContext.h"
 #include "GraphicsLayer.h"
 #include "PlatformCAAnimation.h"
@@ -238,6 +236,4 @@ protected:
 
 } // namespace WebCore
 
-#endif // USE(ACCELERATED_COMPOSITING)
-
 #endif // PlatformCALayer_h
index a223f16..36b8b0f 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef PlatformCALayerClient_h
 #define PlatformCALayerClient_h
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "GraphicsContext.h"
 #include "GraphicsLayer.h"
 #include "PlatformCAAnimation.h"
@@ -71,6 +69,4 @@ protected:
 
 }
 
-#endif // USE(ACCELERATED_COMPOSITING)
-
 #endif // PlatformCALayerClient_h
index bfc3e5a..ade9e8c 100644 (file)
@@ -25,8 +25,6 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "LayerFlushScheduler.h"
 
 #include <wtf/AutodrainedPool.h>
@@ -111,5 +109,3 @@ void LayerFlushScheduler::invalidate()
 }
     
 } // namespace WebCore
-
-#endif // USE(ACCELERATED_COMPOSITING)
index e6e59f3..d1f8be5 100644 (file)
@@ -25,8 +25,6 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #import "PlatformCAAnimation.h"
 
 #import "FloatConversion.h"
@@ -583,5 +581,3 @@ void PlatformCAAnimation::copyTimingFunctionsFrom(const PlatformCAAnimation* val
     CAKeyframeAnimation* other = static_cast<CAKeyframeAnimation*>(value->m_animation.get());
     [static_cast<CAKeyframeAnimation*>(m_animation.get()) setTimingFunctions:[other timingFunctions]];
 }
-
-#endif // USE(ACCELERATED_COMPOSITING)
index 6ff6485..96edac1 100644 (file)
@@ -25,7 +25,6 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING)
 #if ENABLE(CSS_FILTERS)
 
 #import "PlatformCAFilters.h"
@@ -711,4 +710,3 @@ const char* PlatformCAFilters::animatedFilterPropertyName(FilterOperation::Opera
 }
 
 #endif // ENABLE(CSS_FILTERS)
-#endif // USE(ACCELERATED_COMPOSITING)
index 6fc4d38..b99dcee 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef PlatformCALayerMac_h
 #define PlatformCALayerMac_h
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "PlatformCALayer.h"
 
 OBJC_CLASS NSObject;
@@ -165,6 +163,4 @@ PLATFORM_CALAYER_TYPE_CASTS(PlatformCALayerMac, isPlatformCALayerMac())
 
 } // namespace WebCore
 
-#endif // USE(ACCELERATED_COMPOSITING)
-
 #endif // PlatformCALayerMac_h
index 567dc2a..9addd72 100644 (file)
@@ -25,8 +25,6 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #import "PlatformCALayerMac.h"
 
 #import "AnimationUtilities.h"
@@ -831,5 +829,3 @@ void PlatformCALayerMac::enumerateRectsBeingDrawn(CGContextRef context, void (^b
 {
     wkCALayerEnumerateRectsBeingDrawnWithBlock(m_layer.get(), context, block);
 }
-
-#endif // USE(ACCELERATED_COMPOSITING)
index 13c6746..01f23c3 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef AbstractCACFLayerTreeHost_h
 #define AbstractCACFLayerTreeHost_h
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include <wtf/Forward.h>
 
 namespace WebCore {
@@ -47,6 +45,4 @@ protected:
 
 }
 
-#endif // USE(ACCELERATED_COMPOSITING)
-
 #endif // AbstractCACFLayerTreeHost_h
index 5d0c346..5e5411a 100644 (file)
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "CACFLayerTreeHost.h"
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "CACFLayerTreeHostClient.h"
 #include "DefWndProcWindowClass.h"
 #include "LayerChangesFlusher.h"
@@ -328,5 +326,3 @@ CGRect CACFLayerTreeHost::bounds() const
 }
 
 }
-
-#endif // USE(ACCELERATED_COMPOSITING)
index 9cea1c0..24f3208 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef CACFLayerTreeHost_h
 #define CACFLayerTreeHost_h
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "AbstractCACFLayerTreeHost.h"
 #include "COMPtr.h"
 #include "Timer.h"
@@ -120,6 +118,4 @@ private:
 
 }
 
-#endif // USE(ACCELERATED_COMPOSITING)
-
 #endif // CACFLayerTreeHost_h
index 845f934..f9eec0d 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef CACFLayerTreeHostClient_h
 #define CACFLayerTreeHostClient_h
 
-#if USE(ACCELERATED_COMPOSITING)
-
 namespace WebCore {
 
 class CACFLayerTreeHostClient {
@@ -38,6 +36,4 @@ public:
 
 } // namespace WebCore
 
-#endif // USE(ACCELERATED_COMPOSITING)
-
 #endif // CACFLayerTreeHostClient_h
index 1b19ea4..fd44aa0 100644 (file)
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "LayerChangesFlusher.h"
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "AbstractCACFLayerTreeHost.h"
 #include "StructuredExceptionHandlerSuppressor.h"
 #include <wtf/StdLibExtras.h>
@@ -131,5 +129,3 @@ void LayerChangesFlusher::removeHook()
 }
 
 } // namespace WebCore
-
-#endif // USE(ACCELERATED_COMPOSITING)
index 1e7ab31..37c3140 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef LayerChangesFlusher_h
 #define LayerChangesFlusher_h
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include <windows.h>
 #include <wtf/HashSet.h>
 #include <wtf/Noncopyable.h>
@@ -60,6 +58,4 @@ private:
 
 } // namespace WebCore
 
-#endif // USE(ACCELERATED_COMPOSITING)
-
 #endif // LayerChangesFlusher_h
index 228e16e..8f345bd 100644 (file)
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "LegacyCACFLayerTreeHost.h"
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "PlatformCALayer.h"
 #include <QuartzCore/CABase.h>
 #include <WebKitSystemInterface/WebKitSystemInterface.h>
@@ -398,5 +396,3 @@ bool LegacyCACFLayerTreeHost::resetDevice(ResetReason reason)
 }
 
 } // namespace WebCore
-
-#endif // USE(ACCELERATED_COMPOSITING)
index 5a678c6..331da78 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef LegacyCACFLayerTreeHost_h
 #define LegacyCACFLayerTreeHost_h
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "CACFLayerTreeHost.h"
 
 namespace WebCore {
@@ -81,6 +79,4 @@ private:
 
 } // namespace WebCore
 
-#endif // USE(ACCELERATED_COMPOSITING)
-
 #endif // LegacyCACFLayerTreeHost_h
index c584b96..d245401 100644 (file)
@@ -25,8 +25,6 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "PlatformCAAnimation.h"
 
 #include "FloatConversion.h"
@@ -559,5 +557,3 @@ void PlatformCAAnimation::copyTimingFunctionsFrom(const PlatformCAAnimation* val
 {
     CACFAnimationSetTimingFunctions(m_animation.get(), CACFAnimationGetTimingFunctions(value->platformAnimation()));
 }
-
-#endif // USE(ACCELERATED_COMPOSITING)
index 30c40a7..3a0d05c 100644 (file)
@@ -25,7 +25,6 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING)
 #if ENABLE(CSS_FILTERS)
 
 #include "PlatformCAFilters.h"
@@ -50,4 +49,3 @@ const char* PlatformCAFilters::animatedFilterPropertyName(FilterOperation::Opera
 }
 
 #endif // ENABLE(CSS_FILTERS)
-#endif // USE(ACCELERATED_COMPOSITING)
index 18be867..e80c244 100644 (file)
@@ -25,8 +25,6 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "PlatformCALayerWin.h"
 
 #include "AbstractCACFLayerTreeHost.h"
@@ -675,5 +673,3 @@ PassRefPtr<PlatformCALayer> PlatformCALayerWin::createCompatibleLayer(PlatformCA
 {
     return PlatformCALayerWin::create(layerType, client);
 }
-
-#endif // USE(ACCELERATED_COMPOSITING)
index 262aa2c..01b056e 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef PlatformCALayerWin_h
 #define PlatformCALayerWin_h
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "PlatformCALayer.h"
 
 namespace WebCore {
@@ -154,6 +152,4 @@ private:
 
 }
 
-#endif // USE(ACCELERATED_COMPOSITING)
-
 #endif // PlatformCALayerWin_h
index f0121aa..f6835d6 100644 (file)
@@ -25,8 +25,6 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "PlatformCALayerWinInternal.h"
 
 #include "Font.h"
@@ -488,5 +486,3 @@ void PlatformCALayerWinInternal::drawTile(CACFLayerRef tile, CGContextRef contex
 
     CGContextRestoreGState(context);
 }
-
-#endif // USE(ACCELERATED_COMPOSITING)
index 39ef3b3..9edbba4 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef PlatformCALayerWinInternal_h
 #define PlatformCALayerWinInternal_h
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include <CoreGraphics/CGGeometry.h>
 #include <wtf/RetainPtr.h>
 #include <wtf/Vector.h>
@@ -84,6 +82,4 @@ private:
 
 }
 
-#endif // USE(ACCELERATED_COMPOSITING)
-
 #endif // PlatformCALayerWinInternal_h
index 2f64ab1..4a25c6d 100644 (file)
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "WKCACFViewLayerTreeHost.h"
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "PlatformCALayer.h"
 #include "SoftLinking.h"
 #include <wtf/CurrentTime.h>
@@ -187,5 +185,3 @@ GraphicsDeviceAdapter* WKCACFViewLayerTreeHost::graphicsDeviceAdapter() const
 #endif
 
 } // namespace WebCore
-
-#endif // USE(ACCELERATED_COMPOSITING)
index c6f4a90..0dd18ca 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef WKCACFViewLayerTreeHost_h
 #define WKCACFViewLayerTreeHost_h
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "CACFLayerTreeHost.h"
 
 typedef struct _WKCACFView* WKCACFViewRef;
@@ -65,6 +63,4 @@ private:
 
 } // namespace WebCore
 
-#endif // USE(ACCELERATED_COMPOSITING)
-
 #endif // WKCACFViewLayerTreeHost_h
index 738e493..d710400 100644 (file)
@@ -33,8 +33,6 @@
 
 namespace WebCore {
 
-#if USE(ACCELERATED_COMPOSITING)
-
 unsigned DrawingBuffer::frontColorBuffer() const
 {
     return colorBuffer();
@@ -43,7 +41,6 @@ unsigned DrawingBuffer::frontColorBuffer() const
 void DrawingBuffer::paintCompositedResultsToCanvas(ImageBuffer*)
 {
 }
-#endif
 
 }
 
index 8641fd4..80b91e4 100644 (file)
@@ -306,12 +306,10 @@ bool GraphicsContext3D::isGLES2Compliant() const
 #endif
 }
 
-#if USE(ACCELERATED_COMPOSITING)
 PlatformLayer* GraphicsContext3D::platformLayer() const
 {
     return m_private.get();
 }
-#endif
 
 } // namespace WebCore
 
index 00482ad..86d8269 100644 (file)
@@ -406,7 +406,6 @@ void ImageBufferData::paintToTextureMapper(TextureMapper* textureMapper, const F
 }
 #endif
 
-#if USE(ACCELERATED_COMPOSITING)
 PlatformLayer* ImageBuffer::platformLayer() const
 {
 #if ENABLE(ACCELERATED_2D_CANVAS)
@@ -415,6 +414,5 @@ PlatformLayer* ImageBuffer::platformLayer() const
 #endif
     return 0;
 }
-#endif
 
 } // namespace WebCore
index 12ca726..9461825 100644 (file)
@@ -21,8 +21,6 @@
 #include "config.h"
 #include "GraphicsContext3D.h"
 
-#if USE(3D_GRAPHICS) || USE(ACCELERATED_COMPOSITING)
-
 #include "GLDefs.h"
 #include "GraphicsContext3DPrivate.h"
 #include "Image.h"
@@ -175,7 +173,6 @@ Platform3DObject GraphicsContext3D::platformTexture() const
     return m_texture;
 }
 
-#if USE(ACCELERATED_COMPOSITING)
 PlatformLayer* GraphicsContext3D::platformLayer() const
 {
 #if USE(TEXTURE_MAPPER_GL)
@@ -185,7 +182,6 @@ PlatformLayer* GraphicsContext3D::platformLayer() const
     return 0;
 #endif
 }
-#endif
 
 bool GraphicsContext3D::makeContextCurrent()
 {
@@ -310,5 +306,3 @@ bool GraphicsContext3D::ImageExtractor::extractImage(bool premultiplyAlpha, bool
 }
 
 } // namespace WebCore
-
-#endif // USE(3D_GRAPHICS)
index c1b7b6c..343dab6 100644 (file)
@@ -21,8 +21,6 @@
 #include "config.h"
 #include "GraphicsContext3DPrivate.h"
 
-#if USE(3D_GRAPHICS) || USE(ACCELERATED_COMPOSITING)
-
 #include "HostWindow.h"
 #include "NotImplemented.h"
 
@@ -275,5 +273,3 @@ GraphicsSurface::Flags GraphicsContext3DPrivate::graphicsSurfaceFlags() const
 #endif
 
 } // namespace WebCore
-
-#endif // USE(3D_GRAPHICS) || USE(ACCELERATED_COMPOSITING)
index cc41dc3..1332a48 100644 (file)
@@ -21,8 +21,6 @@
 #ifndef GraphicsContext3DPrivate_h
 #define GraphicsContext3DPrivate_h
 
-#if USE(3D_GRAPHICS) || USE(ACCELERATED_COMPOSITING)
-
 #include "GraphicsContext3D.h"
 
 #if USE(TEXTURE_MAPPER_GL)
@@ -96,5 +94,3 @@ private:
 } // namespace WebCore
 
 #endif
-
-#endif
index e234e42..0b75f76 100644 (file)
@@ -117,11 +117,9 @@ public:
 
     void markContentsChanged() { m_contentsChanged = true; }
 
-#if USE(ACCELERATED_COMPOSITING)
     PlatformLayer* platformLayer();
     unsigned frontColorBuffer() const;
     void paintCompositedResultsToCanvas(ImageBuffer*);
-#endif
 
     GraphicsContext3D* graphicsContext3D() const { return m_context.get(); }
 
index 32a54fb..87d72df 100644 (file)
@@ -25,8 +25,6 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING) || ENABLE(ACCELERATED_2D_CANVAS)
-
 #include "LoopBlinnMathUtils.h"
 
 #include "FloatPoint.h"
@@ -666,5 +664,3 @@ bool isConvex(const FloatPoint* vertices, int nVertices)
 
 } // namespace LoopBlinnMathUtils
 } // namespace WebCore
-
-#endif
index 23df37d..6a3d04c 100644 (file)
@@ -30,8 +30,6 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING) || ENABLE(ACCELERATED_2D_CANVAS)
-
 #include "TilingData.h"
 
 #include "FloatRect.h"
@@ -203,5 +201,3 @@ void TilingData::recomputeNumTiles()
 }
 
 }
-
-#endif
index 51c2657..42c0e0e 100644 (file)
@@ -94,7 +94,6 @@ DrawingBuffer::~DrawingBuffer()
     clear();
 }
 
-#if USE(ACCELERATED_COMPOSITING)
 PlatformLayer* DrawingBuffer::platformLayer()
 {
     return m_platformLayer.get();
@@ -104,7 +103,6 @@ unsigned DrawingBuffer::frontColorBuffer() const
 {
     return colorBuffer();
 }
-#endif
 
 }
 
index 3763a00..2bcc636 100644 (file)
@@ -43,7 +43,7 @@
 
 #include <gst/audio/streamvolume.h>
 
-#if GST_CHECK_VERSION(1, 1, 0) && USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER_GL)
+#if GST_CHECK_VERSION(1, 1, 0) && USE(TEXTURE_MAPPER_GL)
 #include "TextureMapperGL.h"
 #endif
 
@@ -304,7 +304,7 @@ void MediaPlayerPrivateGStreamerBase::muteChanged()
 }
 
 
-#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER_GL) && !USE(COORDINATED_GRAPHICS)
+#if USE(TEXTURE_MAPPER_GL) && !USE(COORDINATED_GRAPHICS)
 PassRefPtr<BitmapTexture> MediaPlayerPrivateGStreamerBase::updateTexture(TextureMapper* textureMapper)
 {
     GMutexLocker lock(m_bufferMutex);
@@ -357,7 +357,7 @@ void MediaPlayerPrivateGStreamerBase::triggerRepaint(GstBuffer* buffer)
         gst_buffer_replace(&m_buffer, buffer);
     }
 
-#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER_GL) && !USE(COORDINATED_GRAPHICS)
+#if USE(TEXTURE_MAPPER_GL) && !USE(COORDINATED_GRAPHICS)
     if (supportsAcceleratedRendering() && m_player->mediaPlayerClient()->mediaPlayerRenderingCanBeAccelerated(m_player) && client()) {
         client()->setPlatformLayerNeedsDisplay();
         return;
@@ -374,7 +374,7 @@ void MediaPlayerPrivateGStreamerBase::setSize(const IntSize& size)
 
 void MediaPlayerPrivateGStreamerBase::paint(GraphicsContext* context, const IntRect& rect)
 {
-#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER_GL) && !USE(COORDINATED_GRAPHICS)
+#if USE(TEXTURE_MAPPER_GL) && !USE(COORDINATED_GRAPHICS)
     if (client())
         return;
 #endif
@@ -401,7 +401,7 @@ void MediaPlayerPrivateGStreamerBase::paint(GraphicsContext* context, const IntR
         rect, gstImage->rect(), CompositeCopy, ImageOrientationDescription(), false);
 }
 
-#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER_GL) && !USE(COORDINATED_GRAPHICS)
+#if USE(TEXTURE_MAPPER_GL) && !USE(COORDINATED_GRAPHICS)
 void MediaPlayerPrivateGStreamerBase::paintToTextureMapper(TextureMapper* textureMapper, const FloatRect& targetRect, const TransformationMatrix& matrix, float opacity)
 {
     if (textureMapper->accelerationMode() != TextureMapper::OpenGLMode)
index 0f65094..cb7bb0b 100644 (file)
@@ -31,7 +31,7 @@
 
 #include <wtf/Forward.h>
 
-#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER_GL) && !USE(COORDINATED_GRAPHICS)
+#if USE(TEXTURE_MAPPER_GL) && !USE(COORDINATED_GRAPHICS)
 #include "TextureMapperPlatformLayer.h"
 #endif
 
@@ -48,7 +48,7 @@ class IntSize;
 class IntRect;
 
 class MediaPlayerPrivateGStreamerBase : public MediaPlayerPrivateInterface
-#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER_GL) && !USE(COORDINATED_GRAPHICS)
+#if USE(TEXTURE_MAPPER_GL) && !USE(COORDINATED_GRAPHICS)
     , public TextureMapperPlatformLayer
 #endif
 {
@@ -95,7 +95,7 @@ public:
     unsigned audioDecodedByteCount() const;
     unsigned videoDecodedByteCount() const;
 
-#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER_GL) && !USE(COORDINATED_GRAPHICS)
+#if USE(TEXTURE_MAPPER_GL) && !USE(COORDINATED_GRAPHICS)
     virtual PlatformLayer* platformLayer() const { return const_cast<MediaPlayerPrivateGStreamerBase*>(this); }
     virtual bool supportsAcceleratedRendering() const { return true; }
     virtual void paintToTextureMapper(TextureMapper*, const FloatRect&, const TransformationMatrix&, float);
@@ -125,7 +125,7 @@ protected:
     unsigned long m_volumeSignalHandler;
     unsigned long m_muteSignalHandler;
     mutable IntSize m_videoSize;
-#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER_GL) && !USE(COORDINATED_GRAPHICS)
+#if USE(TEXTURE_MAPPER_GL) && !USE(COORDINATED_GRAPHICS)
     PassRefPtr<BitmapTexture> updateTexture(TextureMapper*);
 #endif
 };
index 8116f83..16274b2 100644 (file)
@@ -142,9 +142,7 @@ private:
     virtual void setHasPlaybackTargetAvailabilityListeners(bool) override;
 #endif
 
-#if USE(ACCELERATED_COMPOSITING)
     virtual bool supportsAcceleratedRendering() const override;
-#endif
 
     virtual void setMediaPlayerProxy(WebMediaPlayerProxy*) override;
     void processPendingRequests();
index 9eea727..52bb019 100644 (file)
@@ -663,12 +663,10 @@ void MediaPlayerPrivateIOS::setHasPlaybackTargetAvailabilityListeners(bool hasLi
 }
 #endif
 
-#if USE(ACCELERATED_COMPOSITING)
 bool MediaPlayerPrivateIOS::supportsAcceleratedRendering() const
 {
     return true;
 }
-#endif
 
 void MediaPlayerPrivateIOS::enterFullscreen()
 {
index 9ea438c..25e6792 100644 (file)
@@ -65,9 +65,7 @@ public:
     void sizeChanged();
     void timeChanged();
     void didEnd();
-#if USE(ACCELERATED_COMPOSITING)
     void layerHostChanged(PlatformLayer* rootLayer);
-#endif
 
 private:
     MediaPlayerPrivateQTKit(MediaPlayer*);
@@ -83,9 +81,7 @@ private:
     static bool isAvailable();
 
     PlatformMedia platformMedia() const;
-#if USE(ACCELERATED_COMPOSITING)
     PlatformLayer* platformLayer() const;
-#endif
 
     IntSize naturalSize() const;
     bool hasVideo() const;
@@ -138,11 +134,8 @@ private:
     void paintCurrentFrameInContext(GraphicsContext*, const IntRect&);
     virtual void prepareForRendering();
 
-
-#if USE(ACCELERATED_COMPOSITING)
     bool supportsAcceleratedRendering() const;
     void acceleratedRenderingStateChanged();
-#endif
 
     bool hasSingleSecurityOrigin() const;
     MediaPlayer::MovieLoadType movieLoadType() const;
index d922ced..789b9ef 100644 (file)
@@ -38,6 +38,7 @@
 #import "URL.h"
 #import "Logging.h"
 #import "MIMETypeRegistry.h"
+#import "PlatformLayer.h"
 #import "SecurityOrigin.h"
 #import "SoftLinking.h"
 #import "TimeRanges.h"
 #import <QTKit/QTKit.h>
 #import <objc/runtime.h>
 
-#if USE(ACCELERATED_COMPOSITING)
-#include "PlatformLayer.h"
-#endif
-
 #if DRAW_FRAME_RATE
 #import "Font.h"
 #import "Document.h"
@@ -508,7 +505,6 @@ void MediaPlayerPrivateQTKit::destroyQTVideoRenderer()
 void MediaPlayerPrivateQTKit::createQTMovieLayer()
 {
     LOG(Media, "MediaPlayerPrivateQTKit::createQTMovieLayer(%p)", this);
-#if USE(ACCELERATED_COMPOSITING)
     if (!m_qtMovie)
         return;
 
@@ -525,20 +521,17 @@ void MediaPlayerPrivateQTKit::createQTMovieLayer()
 #endif
         // The layer will get hooked up via RenderLayerBacking::updateGraphicsLayerConfiguration().
     }
-#endif
 }
 
 void MediaPlayerPrivateQTKit::destroyQTMovieLayer()
 {
     LOG(Media, "MediaPlayerPrivateQTKit::destroyQTMovieLayer(%p)", this);
-#if USE(ACCELERATED_COMPOSITING)
     if (!m_qtVideoLayer)
         return;
 
     // disassociate our movie from our instance of QTMovieLayer
     [m_qtVideoLayer.get() setMovie:nil];    
     m_qtVideoLayer = nil;
-#endif
 }
 
 MediaPlayerPrivateQTKit::MediaRenderingMode MediaPlayerPrivateQTKit::currentRenderingMode() const
@@ -560,10 +553,8 @@ MediaPlayerPrivateQTKit::MediaRenderingMode MediaPlayerPrivateQTKit::preferredRe
     if (!m_player->frameView() || !m_qtMovie)
         return MediaRenderingNone;
 
-#if USE(ACCELERATED_COMPOSITING)
     if (supportsAcceleratedRendering() && m_player->mediaPlayerClient()->mediaPlayerRenderingCanBeAccelerated(m_player))
         return MediaRenderingMovieLayer;
-#endif
 
     if (!QTVideoRendererClass())
         return MediaRenderingMovieView;
@@ -691,12 +682,10 @@ PlatformMedia MediaPlayerPrivateQTKit::platformMedia() const
     return pm;
 }
 
-#if USE(ACCELERATED_COMPOSITING)
 PlatformLayer* MediaPlayerPrivateQTKit::platformLayer() const
 {
     return m_qtVideoLayer.get();
 }
-#endif
 
 void MediaPlayerPrivateQTKit::play()
 {
@@ -897,12 +886,10 @@ void MediaPlayerPrivateQTKit::setClosedCaptionsVisible(bool closedCaptionsVisibl
     if (metaDataAvailable()) {
         wkQTMovieSetShowClosedCaptions(m_qtMovie.get(), closedCaptionsVisible);
 
-#if USE(ACCELERATED_COMPOSITING)
         if (closedCaptionsVisible && m_qtVideoLayer) {
             // Captions will be rendered upside down unless we flag the movie as flipped (again). See <rdar://7408440>.
             [m_qtVideoLayer.get() setGeometryFlipped:YES];
         }
-#endif
     }
 }
 
@@ -1225,12 +1212,10 @@ void MediaPlayerPrivateQTKit::didEnd()
     m_player->timeChanged();
 }
 
-#if USE(ACCELERATED_COMPOSITING)
 void MediaPlayerPrivateQTKit::layerHostChanged(PlatformLayer* rootLayer)
 {
     UNUSED_PARAM(rootLayer);
 }
-#endif
 
 void MediaPlayerPrivateQTKit::setSize(const IntSize&) 
 { 
@@ -1617,7 +1602,6 @@ void MediaPlayerPrivateQTKit::sawUnsupportedTracks()
     m_player->mediaPlayerClient()->mediaPlayerSawUnsupportedTracks(m_player);
 }
 
-#if USE(ACCELERATED_COMPOSITING)
 bool MediaPlayerPrivateQTKit::supportsAcceleratedRendering() const
 {
     return isReadyForVideoSetup() && getQTMovieLayerClass() != Nil;
@@ -1628,7 +1612,6 @@ void MediaPlayerPrivateQTKit::acceleratedRenderingStateChanged()
     // Set up or change the rendering path if necessary.
     setUpVideoRendering();
 }
-#endif
 
 bool MediaPlayerPrivateQTKit::hasSingleSecurityOrigin() const
 {
@@ -1780,12 +1763,8 @@ void MediaPlayerPrivateQTKit::setPrivateBrowsingMode(bool privateBrowsing)
 
 - (void)layerHostChanged:(NSNotification *)notification
 {
-#if USE(ACCELERATED_COMPOSITING)
     CALayer* rootLayer = static_cast<CALayer*>([notification object]);
     m_callback->layerHostChanged(rootLayer);
-#else
-    UNUSED_PARAM(notification);
-#endif
 }
 
 - (void)setDelayCallbacks:(BOOL)shouldDelay
index eade520..00c81f6 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef WebGLLayer_h
 #define WebGLLayer_h
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #import <QuartzCore/QuartzCore.h>
 
 namespace WebCore {
@@ -51,6 +49,4 @@ namespace WebCore {
 
 @end
 
-#endif // USE(ACCELERATED_COMPOSITING)
-
 #endif // WebGLLayer_h
index 648299e..71f81fc 100644 (file)
@@ -25,7 +25,6 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING)
 #if ENABLE(WEBGL)
 
 #import "WebGLLayer.h"
@@ -177,4 +176,3 @@ static void freeData(void *, const void *data, size_t /* size */)
 @end
 
 #endif // ENABLE(WEBGL)
-#endif // USE(ACCELERATED_COMPOSITING)
index 52dcb23..1222a63 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef WebLayer_h
 #define WebLayer_h
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #import <QuartzCore/QuartzCore.h>
 #import <WebCore/FloatRect.h>
 #import <wtf/Vector.h>
@@ -54,6 +52,4 @@ void drawLayerContents(CGContextRef, PlatformCALayer*, RepaintRectList& dirtyRec
 void drawRepaintIndicator(CGContextRef, PlatformCALayer*, int repaintCount, CGColorRef customBackgroundColor);
 }
 
-#endif // USE(ACCELERATED_COMPOSITING)
-
 #endif // WebLayer_h
index d99df2e..9f2179d 100644 (file)
@@ -24,9 +24,6 @@
  */
 
 #include "config.h"
-
-#if USE(ACCELERATED_COMPOSITING)
-
 #import "WebLayer.h"
 
 #import "GraphicsContext.h"
@@ -330,5 +327,3 @@ void drawRepaintIndicator(CGContextRef context, PlatformCALayer* platformCALayer
 @end  // implementation WebLayer(ExtendedDescription)
 
 #endif // NDEBUG
-
-#endif // USE(ACCELERATED_COMPOSITING)
index 6f559e3..46d58a9 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef WebTiledLayer_h
 #define WebTiledLayer_h
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #import "WebLayer.h"
 
 @interface WebTiledLayer : CATiledLayer 
@@ -38,7 +36,5 @@
 
 @end
 
-#endif // USE(ACCELERATED_COMPOSITING)
-
 #endif // WebTiledLayer_h
 
index c86afa6..7138604 100644 (file)
@@ -24,9 +24,6 @@
  */
 
 #include "config.h"
-
-#if USE(ACCELERATED_COMPOSITING)
-
 #import "WebTiledLayer.h"
 
 #import "GraphicsContext.h"
@@ -141,5 +138,3 @@ using namespace WebCore;
 }
 
 @end // implementation WebTiledLayer
-
-#endif // USE(ACCELERATED_COMPOSITING)
index 659d249..a091f13 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef GLDefs_h
 #define GLDefs_h
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #define GL_GLEXT_PROTOTYPES 1
 
 #if USE(OPENGL_ES_2)
@@ -82,5 +80,3 @@ typedef void* PlatformDrawable;
 }
 
 #endif
-
-#endif
index 9ab3dea..06f61c4 100644 (file)
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "GLPlatformContext.h"
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #if USE(GLX)
 #include "GLXContext.h"
 #elif USE(EGL)
@@ -285,5 +283,3 @@ void GLPlatformContext::destroy()
 }
 
 } // namespace WebCore
-
-#endif
index 2e41db3..03147c8 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef GLPlatformContext_h
 #define GLPlatformContext_h
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "GLDefs.h"
 #include "GLPlatformSurface.h"
 #include "GraphicsContext3D.h"
@@ -96,6 +94,4 @@ protected:
 
 } // namespace WebCore
 
-#endif
-
 #endif // GLNativeContext_H
index 43b6530..dd27f76 100644 (file)
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "GLPlatformSurface.h"
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #if USE(GLX)
 #include "GLXSurface.h"
 #endif
@@ -133,5 +131,3 @@ GLPlatformSurface::SurfaceAttributes GLPlatformSurface::attributes() const
 }
 
 }
-
-#endif
index d276fa5..af7f7bc 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef GLPlatformSurface_h
 #define GLPlatformSurface_h
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "GLDefs.h"
 #include "IntRect.h"
 #include <wtf/Noncopyable.h>
@@ -95,6 +93,3 @@ protected:
 }
 
 #endif
-
-#endif
-
index 8199d6b..25d6ce9 100644 (file)
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "GLTransportSurface.h"
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "FloatRect.h"
 
 #if USE(GLX)
@@ -259,5 +257,3 @@ void GLTransportSurfaceClient::createTexture()
 }
 
 }
-
-#endif
index 2fdd1f8..b579c85 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef GLTransportSurface_h
 #define GLTransportSurface_h
 
-#if USE(ACCELERATED_COMPOSITING)
-
 #include "GLPlatformSurface.h"
 #include <wtf/PassOwnPtr.h>
 
@@ -77,5 +75,3 @@ protected:
 }
 
 #endif
-
-#endif
index 2fea7b0..8a6109a 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef GLXConfigSelector_h
 #define GLXConfigSelector_h
 
-#if USE(ACCELERATED_COMPOSITING) && USE(GLX)
+#if USE(GLX)
 
 #include "X11Helper.h"
 #include <opengl/GLDefs.h>
index 10d44f8..f42d3af 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "GLXContext.h"
 
-#if USE(ACCELERATED_COMPOSITING) && USE(GLX)
+#if USE(GLX)
 
 #include "X11Helper.h"
 
index b08b53e..95e9692 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef GLXContext_h
 #define GLXContext_h
 
-#if USE(ACCELERATED_COMPOSITING) && USE(GLX)
+#if USE(GLX)
 
 #include "GLPlatformContext.h"
 
index 4db9c89..16f56c1 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "GLXSurface.h"
 
-#if USE(ACCELERATED_COMPOSITING) && USE(GLX)
+#if USE(GLX)
 
 namespace WebCore {
 
index bb76fc0..0b19fe3 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef GLXSurface_h
 #define GLXSurface_h
 
-#if USE(ACCELERATED_COMPOSITING) && USE(GLX)
+#if USE(GLX)
 
 #include "GLTransportSurface.h"
 #include "GLXConfigSelector.h"
index 4c8ee6a..4cf4462 100644 (file)
@@ -26,7 +26,7 @@
 #include "Timer.h"
 #include <wtf/CurrentTime.h>
 
-#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
+#if USE(TEXTURE_MAPPER)
 
 namespace WebCore {
 
index a0a171e..2c86d72 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef TextureMapper_h
 #define TextureMapper_h
 
-#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
+#if USE(TEXTURE_MAPPER)
 
 #if (PLATFORM(GTK) || PLATFORM(EFL)) && USE(OPENGL_ES_2)
 #define TEXMAP_OPENGL_ES_2
index e68bc09..7a00e22 100644 (file)
@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
+#if USE(TEXTURE_MAPPER)
 #include "TextureMapperBackingStore.h"
 
 #include "GraphicsLayer.h"
index 4bae45b..7927a49 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef TextureMapperBackingStore_h
 #define TextureMapperBackingStore_h
 
-#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
+#if USE(TEXTURE_MAPPER)
 
 #include "FloatRect.h"
 #include "Image.h"
index d744770..2d333af 100644 (file)
@@ -21,7 +21,7 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
+#if USE(TEXTURE_MAPPER)
 
 #include "TextureMapperFPSCounter.h"
 
@@ -64,4 +64,4 @@ void TextureMapperFPSCounter::updateFPSAndDisplay(TextureMapper* textureMapper,
 
 } // namespace WebCore
 
-#endif // USE(ACCELERATED_COMPOSITING)
+#endif // USE(TEXTURE_MAPPER)
index 0062373..649989c 100644 (file)
@@ -22,7 +22,7 @@
 #ifndef TextureMapperFPSCounter_h
 #define TextureMapperFPSCounter_h
 
-#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
+#if USE(TEXTURE_MAPPER)
 #include "FloatPoint.h"
 #include "TransformationMatrix.h"
 #include <wtf/Noncopyable.h>
@@ -47,7 +47,7 @@ private:
 
 } // namespace WebCore
 
-#endif // USE(ACCELERATED_COMPOSITING)
+#endif // USE(TEXTURE_MAPPER)
 
 #endif // TextureMapperFPSCounter_h
 
index 05b884b..f09bba5 100644 (file)
@@ -50,7 +50,7 @@
 #define GL_UNPACK_SKIP_ROWS 0x0CF3
 #endif
 
-#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
+#if USE(TEXTURE_MAPPER)
 
 namespace WebCore {
 struct TextureMapperGLData {
index 081403f..f0fd1b1 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef TextureMapperGL_h
 #define TextureMapperGL_h
 
-#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
+#if USE(TEXTURE_MAPPER)
 
 #include "FilterOperation.h"
 #include "FloatQuad.h"
index 7e7babb..86592c6 100644 (file)
@@ -24,7 +24,7 @@
 #include "Region.h"
 #include <wtf/MathExtras.h>
 
-#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
+#if USE(TEXTURE_MAPPER)
 
 namespace WebCore {
 
index 87ff3f4..9046aa5 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef TextureMapperLayer_h
 #define TextureMapperLayer_h
 
-#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
+#if USE(TEXTURE_MAPPER)
 
 #include "FilterOperations.h"
 #include "FloatRect.h"
index f4b9a7e..7247502 100644 (file)
@@ -22,7 +22,7 @@
 #include "config.h"
 #include "TextureMapperShaderProgram.h"
 
-#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
+#if USE(TEXTURE_MAPPER)
 #include "LengthFunctions.h"
 #include "Logging.h"
 #include "TextureMapperGL.h"
index 8d38776..b33bbb6 100644 (file)
@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING) && USE(GRAPHICS_SURFACE)
+#if USE(GRAPHICS_SURFACE)
 #include "TextureMapperSurfaceBackingStore.h"
 
 #include "GraphicsSurface.h"
index 793c61d..31d1819 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef TextureMapperSurfaceBackingStore_h
 #define TextureMapperSurfaceBackingStore_h
 
-#if USE(ACCELERATED_COMPOSITING) && USE(GRAPHICS_SURFACE)
+#if USE(GRAPHICS_SURFACE)
 
 #include "GraphicsSurface.h"
 #include "TextureMapperBackingStore.h"
index 2ea7fb6..e6f3fe8 100644 (file)
@@ -18,7 +18,7 @@
  */
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
+#if USE(TEXTURE_MAPPER)
 #include "TextureMapperTile.h"
 
 #include "Image.h"
index ee6809f..648e71f 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef TextureMapperTile_h
 #define TextureMapperTile_h
 
-#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
+#if USE(TEXTURE_MAPPER)
 
 #include "FloatRect.h"
 #include "Image.h"
index ef56402..b81b89f 100644 (file)
@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
+#if USE(TEXTURE_MAPPER)
 #include "TextureMapperTiledBackingStore.h"
 
 #include "ImageBuffer.h"
index 38161c4..2f792dc 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef TextureMapperTiledBackingStore_h
 #define TextureMapperTiledBackingStore_h
 
-#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
+#if USE(TEXTURE_MAPPER)
 
 #include "FloatRect.h"
 #include "Image.h"
index 05e1508..2f35ef5 100644 (file)
@@ -197,12 +197,10 @@ bool GraphicsContext3D::isGLES2Compliant() const
 #endif
 }
 
-#if USE(ACCELERATED_COMPOSITING)
 PlatformLayer* GraphicsContext3D::platformLayer() const
 {
     return m_webGLLayer->platformLayer();
 }
-#endif
 
 } // namespace WebCore
 
index 6077f2d..0d098bd 100644 (file)
@@ -34,7 +34,7 @@
 #include <CoreGraphics/CGColor.h>
 #endif
 
-#if USE(ACCELERATED_COMPOSITING) && USE(CA)
+#if USE(CA)
 #include "CACFLayerTreeHost.h"
 #include "PlatformCALayer.h"
 #endif
@@ -84,7 +84,7 @@ void MediaPlayerPrivateFullscreenWindow::createWindow(HWND parentHwnd)
         parentHwnd, 0, instanceHandle(), this);
     ASSERT(IsWindow(m_hwnd));
 
-#if USE(ACCELERATED_COMPOSITING) && USE(CA)
+#if USE(CA)
     if (m_layerTreeHost)
         m_layerTreeHost->setWindow(m_hwnd);
 #endif
@@ -92,7 +92,7 @@ void MediaPlayerPrivateFullscreenWindow::createWindow(HWND parentHwnd)
     ::SetFocus(m_hwnd);
 }
 
-#if USE(ACCELERATED_COMPOSITING) && USE(CA)
+#if USE(CA)
 void MediaPlayerPrivateFullscreenWindow::setRootChildLayer(PassRefPtr<PlatformCALayer> rootChild)
 {
     if (m_rootChild == rootChild)
@@ -156,7 +156,7 @@ LRESULT MediaPlayerPrivateFullscreenWindow::wndProc(HWND hWnd, UINT message, WPA
         break;
     case WM_DESTROY:
         m_hwnd = 0;
-#if USE(ACCELERATED_COMPOSITING) && USE(CA)
+#if USE(CA)
         if (m_layerTreeHost)
             m_layerTreeHost->setWindow(0);
 #endif
@@ -166,7 +166,7 @@ LRESULT MediaPlayerPrivateFullscreenWindow::wndProc(HWND hWnd, UINT message, WPA
             LPWINDOWPOS wp = reinterpret_cast<LPWINDOWPOS>(lParam);
             if (wp->flags & SWP_NOSIZE)
                 break;
-#if USE(ACCELERATED_COMPOSITING) && USE(CA)
+#if USE(CA)