diff options
| author | Patrick Scott <phanna@android.com> | 2011-02-16 12:00:23 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-02-16 12:00:23 -0800 |
| commit | e9d5f570f22c46f9adaa4181c3fa1b715f15ccb3 (patch) | |
| tree | 7af064db79bcf227d640ee81f52cf267baebf478 /WebCore | |
| parent | 0b435a609307d4acb1ad303b67070dff99cb5927 (diff) | |
| parent | 7dfcd11a5bb620c10f2f1c9f35b01004fed51507 (diff) | |
| download | external_webkit-e9d5f570f22c46f9adaa4181c3fa1b715f15ccb3.zip external_webkit-e9d5f570f22c46f9adaa4181c3fa1b715f15ccb3.tar.gz external_webkit-e9d5f570f22c46f9adaa4181c3fa1b715f15ccb3.tar.bz2 | |
Merge "Clip nodes to the visible rect."
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp | 4 |
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 } |