diff options
author | Russell Brenner <russellbrenner@google.com> | 2011-05-24 13:25:21 -0700 |
---|---|---|
committer | Russell Brenner <russellbrenner@google.com> | 2011-05-24 17:19:38 -0700 |
commit | 5963aad4282248c0d0a50a8aa738963a0c0a8f40 (patch) | |
tree | 10320b80080343e8e7052bd21911eb55e591e01c | |
parent | e17c8aeecb722a98f9cac8556cf7d49d7247a83a (diff) | |
download | external_webkit-5963aad4282248c0d0a50a8aa738963a0c0a8f40.zip external_webkit-5963aad4282248c0d0a50a8aa738963a0c0a8f40.tar.gz external_webkit-5963aad4282248c0d0a50a8aa738963a0c0a8f40.tar.bz2 |
DO NOT MERGE-Move check for pending style recalc
The previous implementation had no way to notify the caller as to
whether or not the recording was successful. Now, recordContent
detects the pending recalc and returns null to indicate that no
recording was done.
bug: 4474358
Change-Id: I5d54fc606a059203a96270eae5dc78dc21e39a53
-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); |