summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Roard <nicolasroard@google.com>2011-03-24 15:17:56 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-03-24 15:17:56 -0700
commit70e1ff0b3913af6a122390bbe4768c2c0fea045d (patch)
tree6d81a45fd0b429928701d2450ad2da36cacc3bcc
parent284cf17e2bcea995294e7ecdca145593523c3edc (diff)
parent557855a0cf753d49915b11849f3fa4a2c23c2c18 (diff)
downloadexternal_webkit-70e1ff0b3913af6a122390bbe4768c2c0fea045d.zip
external_webkit-70e1ff0b3913af6a122390bbe4768c2c0fea045d.tar.gz
external_webkit-70e1ff0b3913af6a122390bbe4768c2c0fea045d.tar.bz2
am 557855a0: Fix regression blocking the page cycler The bug caused a continuous redraw if you had a webview without content; the Activity containing the webview would thus not be marked as idle. The pagecycler is launching such an activity and wait until it\'s idle to
* commit '557855a0cf753d49915b11849f3fa4a2c23c2c18': Fix regression blocking the page cycler The bug caused a continuous redraw if you had a webview without content; the Activity containing the webview would thus not be marked as idle. The pagecycler is launching such an activity and wait until it's idle to determinate that it's usable to loade urls...
-rw-r--r--WebCore/platform/graphics/android/TiledPage.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/WebCore/platform/graphics/android/TiledPage.cpp b/WebCore/platform/graphics/android/TiledPage.cpp
index 099ed4d..21afe24 100644
--- a/WebCore/platform/graphics/android/TiledPage.cpp
+++ b/WebCore/platform/graphics/android/TiledPage.cpp
@@ -299,7 +299,7 @@ bool TiledPage::ready(const SkIRect& tileBounds, float scale)
if (!m_glWebViewState)
return false;
- if (!m_prepare)
+ if (!m_invalRegion.isEmpty() && !m_prepare)
return false;
if (m_scale != scale)