From 29ce486d7bb8336c3aa85f41189e3d6fb3cc6d56 Mon Sep 17 00:00:00 2001 From: Russell Brenner Date: Wed, 25 May 2011 09:54:35 -0700 Subject: merge from honeycomb mr2 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: I511d6f1118c0a122ee893167311f3cc82f2cbf7e --- Source/WebKit/android/jni/WebViewCore.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Source/WebKit/android/jni/WebViewCore.cpp') diff --git a/Source/WebKit/android/jni/WebViewCore.cpp b/Source/WebKit/android/jni/WebViewCore.cpp index f2680b5..7379e20 100644 --- a/Source/WebKit/android/jni/WebViewCore.cpp +++ b/Source/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