diff options
| author | Russell Brenner <russellbrenner@google.com> | 2011-05-25 09:00:16 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-25 09:00:16 -0700 |
| commit | 3d487c65ee7e11672335cae6240879d3421abf24 (patch) | |
| tree | da6569b84eb59b06a0a7752ecaaa7d2c3e9f1c22 | |
| parent | f18b71fe96d66428ffbf90961f13f81b248f9157 (diff) | |
| parent | 5963aad4282248c0d0a50a8aa738963a0c0a8f40 (diff) | |
| download | external_webkit-3d487c65ee7e11672335cae6240879d3421abf24.zip external_webkit-3d487c65ee7e11672335cae6240879d3421abf24.tar.gz external_webkit-3d487c65ee7e11672335cae6240879d3421abf24.tar.bz2 | |
Merge "DO NOT MERGE-Move check for pending style recalc" into honeycomb-mr2
| -rw-r--r-- | WebKit/android/jni/WebViewCore.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp index 1d9c26b..92f2962 100644 --- a/WebKit/android/jni/WebViewCore.cpp +++ b/WebKit/android/jni/WebViewCore.cpp @@ -569,11 +569,6 @@ void WebViewCore::recordPictureSet(PictureSet* content) DBG_SET_LOG("!m_mainFrame->document()"); return; } - // If there is a pending style recalculation, just return. - if (m_mainFrame->document()->isPendingStyleRecalc()) { - LOGW("recordPictureSet: pending style recalc, ignoring."); - return; - } if (m_addInval.isEmpty()) { DBG_SET_LOG("m_addInval.isEmpty()"); return; @@ -918,6 +913,11 @@ BaseLayerAndroid* WebViewCore::createBaseLayer() BaseLayerAndroid* WebViewCore::recordContent(SkRegion* region, SkIPoint* point) { DBG_SET_LOG("start"); + // If there is a pending style recalculation, just return. + if (m_mainFrame->document()->isPendingStyleRecalc()) { + DBG_SET_LOGD("recordContent: pending style recalc, ignoring."); + return 0; + } float progress = (float) m_mainFrame->page()->progress()->estimatedProgress(); m_progressDone = progress <= 0.0f || progress >= 1.0f; recordPictureSet(&m_content); |