summaryrefslogtreecommitdiffstats
path: root/WebCore
diff options
context:
space:
mode:
authorNicolas Roard <nicolasroard@google.com>2011-03-18 17:41:11 -0700
committerNicolas Roard <nicolasroard@google.com>2011-03-18 19:00:14 -0700
commita5ec3c20d40b576e2f6878c615cc7c63eebe3a3f (patch)
tree9797c22aede851d6e4ec08644217c9fef0531271 /WebCore
parent93a2b8c50e4f5f46e9d345c259e20192e47443a5 (diff)
downloadexternal_webkit-a5ec3c20d40b576e2f6878c615cc7c63eebe3a3f.zip
external_webkit-a5ec3c20d40b576e2f6878c615cc7c63eebe3a3f.tar.gz
external_webkit-a5ec3c20d40b576e2f6878c615cc7c63eebe3a3f.tar.bz2
Fix ANR introduced by recent CL...
before locking a texture, it needs to be ready. bug:4136077 Change-Id: Ib8235694e1a43524c52a02a5f288235d56088f46
Diffstat (limited to 'WebCore')
-rw-r--r--WebCore/platform/graphics/android/LayerAndroid.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/WebCore/platform/graphics/android/LayerAndroid.cpp b/WebCore/platform/graphics/android/LayerAndroid.cpp
index ba63ba1..2df63a9 100644
--- a/WebCore/platform/graphics/android/LayerAndroid.cpp
+++ b/WebCore/platform/graphics/android/LayerAndroid.cpp
@@ -898,6 +898,11 @@ bool LayerAndroid::needsScheduleRepaint(LayerTexture* texture)
if (!texture)
return false;
+ if (!texture->ready()) {
+ m_dirty = true;
+ return true;
+ }
+
TextureInfo* textureInfo = texture->consumerLock();
if (!texture->readyFor(this) ||
(texture->rect() != m_layerTextureRect))