From 8995b83bcbfbb68245f779b64e5517627c6cc6ea Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 17 Oct 2012 16:21:14 +0200 Subject: Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00 (http://svn.webkit.org/repository/webkit/trunk@131592) New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well as the previously cherry-picked changes --- Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp') diff --git a/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp b/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp index 2299bc3ea..d6cef142f 100644 --- a/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp +++ b/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp @@ -70,7 +70,11 @@ DrawingAreaImpl::DrawingAreaImpl(WebPage* webPage, const WebPageCreationParamete { if (webPage->corePage()->settings()->acceleratedDrawingEnabled() || webPage->corePage()->settings()->forceCompositingMode()) m_alwaysUseCompositing = true; - + +#if USE(COORDINATED_GRAPHICS) + m_alwaysUseCompositing = true; +#endif + if (m_alwaysUseCompositing) enterAcceleratedCompositingMode(0); } @@ -303,6 +307,14 @@ void DrawingAreaImpl::layerHostDidFlushLayers() #endif } +GraphicsLayerFactory* DrawingAreaImpl::graphicsLayerFactory() +{ + if (m_layerTreeHost) + return m_layerTreeHost->graphicsLayerFactory(); + + return 0; +} + void DrawingAreaImpl::setRootCompositingLayer(GraphicsLayer* graphicsLayer) { // FIXME: Instead of using nested if statements, we should keep a compositing state @@ -343,7 +355,7 @@ void DrawingAreaImpl::setRootCompositingLayer(GraphicsLayer* graphicsLayer) } } -void DrawingAreaImpl::scheduleCompositingLayerSync() +void DrawingAreaImpl::scheduleCompositingLayerFlush() { if (!m_layerTreeHost) return; -- cgit v1.2.1