From 7dfcd11a5bb620c10f2f1c9f35b01004fed51507 Mon Sep 17 00:00:00 2001 From: Patrick Scott Date: Wed, 16 Feb 2011 13:35:37 -0500 Subject: Clip nodes to the visible rect. Do not build scrollable layers if the layer does not draw. No need to ask for a sync since the rebuild happens during a sync. Bug: 3429982 Change-Id: I7740cd4de4e1658e760da7391de708cbdf05cd44 --- WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp') diff --git a/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp b/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp index 49f20ab..ccc872a 100644 --- a/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp +++ b/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp @@ -467,7 +467,7 @@ void GraphicsLayerAndroid::updateScrollingLayers() { #if ENABLE(ANDROID_OVERFLOW_SCROLL) RenderLayer* layer = renderLayerFromClient(m_client); - if (!layer) + if (!layer || !m_haveContents) return; bool hasOverflowScroll = m_foregroundLayer || m_contentLayer->contentIsScrollable(); bool layerNeedsOverflow = layer->hasOverflowScroll(); @@ -508,7 +508,6 @@ void GraphicsLayerAndroid::updateScrollingLayers() } // Need to rebuild our children based on the new structure. m_needsSyncChildren = true; - askForSync(); } else { ASSERT(hasOverflowScroll && !layerNeedsOverflow && !iframeNeedsOverflow); ASSERT(m_contentLayer); @@ -531,7 +530,6 @@ void GraphicsLayerAndroid::updateScrollingLayers() } // Children are all re-parented. m_needsSyncChildren = true; - askForSync(); } #endif } -- cgit v1.1