summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/platform/graphics/android/TiledTexture.cpp
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2011-10-24 15:40:09 -0700
committerChris Craik <ccraik@google.com>2011-10-24 15:42:55 -0700
commit4ed1250cd6a767f36b8429212327d96d7ac1114d (patch)
tree8fd7528f4e5db60bf3ea6277d8b33bd10ce71a74 /Source/WebCore/platform/graphics/android/TiledTexture.cpp
parent5dee9ed228c914254062b62ae459884e3060a2ae (diff)
downloadexternal_webkit-4ed1250cd6a767f36b8429212327d96d7ac1114d.zip
external_webkit-4ed1250cd6a767f36b8429212327d96d7ac1114d.tar.gz
external_webkit-4ed1250cd6a767f36b8429212327d96d7ac1114d.tar.bz2
Mark layers as ready to swap if invisible
bug:5505364 This avoids the problem of waiting infinitely during initialization (when a layer doesn't have content) for the layer to be ready. Change-Id: I364eff66616ea304a68976d5ad06ce5fdb1a6d4b
Diffstat (limited to 'Source/WebCore/platform/graphics/android/TiledTexture.cpp')
-rw-r--r--Source/WebCore/platform/graphics/android/TiledTexture.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/platform/graphics/android/TiledTexture.cpp b/Source/WebCore/platform/graphics/android/TiledTexture.cpp
index 87996ab..3182eef 100644
--- a/Source/WebCore/platform/graphics/android/TiledTexture.cpp
+++ b/Source/WebCore/platform/graphics/android/TiledTexture.cpp
@@ -71,7 +71,7 @@ bool TiledTexture::ready() {
// FIXME: have a better system -- maybe keeping the last scale factor
// able to fully render everything
return !TilesManager::instance()->layerTexturesRemain()
- || (tilesAllReady && tilesVisible);
+ || !tilesVisible || tilesAllReady;
}
void TiledTexture::prepare(GLWebViewState* state, float scale, bool repaint,