summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/platform
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2011-10-24 15:40:09 -0700
committerEd Heyl <ed@google.com>2011-10-25 20:36:01 +0000
commit9bcbd1be99f8033fe90e903b41a29a24dbf3616d (patch)
tree3c44ee4d22f2e82e2e3ac18453d1732ae19d44a5 /Source/WebCore/platform
parent3528cb86ca5faa67fb43f8cedb5437e3cb2c8b9f (diff)
downloadexternal_webkit-9bcbd1be99f8033fe90e903b41a29a24dbf3616d.zip
external_webkit-9bcbd1be99f8033fe90e903b41a29a24dbf3616d.tar.gz
external_webkit-9bcbd1be99f8033fe90e903b41a29a24dbf3616d.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')
-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,