From 5963aad4282248c0d0a50a8aa738963a0c0a8f40 Mon Sep 17 00:00:00 2001 From: Russell Brenner Date: Tue, 24 May 2011 13:25:21 -0700 Subject: 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 --- WebKit/android/jni/WebViewCore.cpp | 10 +++++----- 1 file 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); -- cgit v1.1