summaryrefslogtreecommitdiffstats
path: root/WebCore
diff options
context:
space:
mode:
authorNicolas Roard <nicolasroard@google.com>2011-03-24 14:30:55 -0700
committerNicolas Roard <nicolasroard@google.com>2011-03-24 14:30:55 -0700
commit557855a0cf753d49915b11849f3fa4a2c23c2c18 (patch)
tree6d81a45fd0b429928701d2450ad2da36cacc3bcc /WebCore
parent909e9c7e41ff3d446960cd840fb9aa055fef6812 (diff)
downloadexternal_webkit-557855a0cf753d49915b11849f3fa4a2c23c2c18.zip
external_webkit-557855a0cf753d49915b11849f3fa4a2c23c2c18.tar.gz
external_webkit-557855a0cf753d49915b11849f3fa4a2c23c2c18.tar.bz2
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... bug:4172381 Change-Id: I6c838c5f6757186d01e8e476a8fc5101ea00ed15
Diffstat (limited to 'WebCore')
-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)