From cfd86b747d32ac22246a1aa908eaa720c63a88c1 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 7 Nov 2012 11:22:47 +0100 Subject: Imported WebKit commit 20271caf2e2c016d5cef40184cddeefeac4f1876 (http://svn.webkit.org/repository/webkit/trunk@133733) New snapshot that contains all previous fixes as well as build fix for latest QtMultimedia API changes. --- Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp | 2 ++ 1 file changed, 2 insertions(+) (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 71916909d..5e70c9448 100644 --- a/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp +++ b/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp @@ -307,6 +307,7 @@ void DrawingAreaImpl::layerHostDidFlushLayers() #endif } +#if USE(ACCELERATED_COMPOSITING) GraphicsLayerFactory* DrawingAreaImpl::graphicsLayerFactory() { if (m_layerTreeHost) @@ -361,6 +362,7 @@ void DrawingAreaImpl::scheduleCompositingLayerFlush() return; m_layerTreeHost->scheduleLayerFlush(); } +#endif void DrawingAreaImpl::updateBackingStoreState(uint64_t stateID, bool respondImmediately, float deviceScaleFactor, const WebCore::IntSize& size, const WebCore::IntSize& scrollOffset) { -- cgit v1.2.1