From a5ec3c20d40b576e2f6878c615cc7c63eebe3a3f Mon Sep 17 00:00:00 2001 From: Nicolas Roard Date: Fri, 18 Mar 2011 17:41:11 -0700 Subject: [PATCH] Fix ANR introduced by recent CL... before locking a texture, it needs to be ready. bug:4136077 Change-Id: Ib8235694e1a43524c52a02a5f288235d56088f46 --- WebCore/platform/graphics/android/LayerAndroid.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/WebCore/platform/graphics/android/LayerAndroid.cpp b/WebCore/platform/graphics/android/LayerAndroid.cpp index ba63ba125..2df63a9ba 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)) -- 2.11.0