summaryrefslogtreecommitdiffstats
path: root/WebCore
diff options
context:
space:
mode:
Diffstat (limited to 'WebCore')
-rw-r--r--WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp4
1 files changed, 1 insertions, 3 deletions
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
}