summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/platform/graphics
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2011-10-24 15:49:43 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-10-24 15:49:43 -0700
commita4adfec4837fe35c27bbee2963cbc105dbce38ff (patch)
tree34fee3d8026528d57c98fb5b5f4ebdf8c00859ea /Source/WebCore/platform/graphics
parentd436d4c3e6b088f1fcae26dc4835e28065f017a8 (diff)
parent4ed1250cd6a767f36b8429212327d96d7ac1114d (diff)
downloadexternal_webkit-a4adfec4837fe35c27bbee2963cbc105dbce38ff.zip
external_webkit-a4adfec4837fe35c27bbee2963cbc105dbce38ff.tar.gz
external_webkit-a4adfec4837fe35c27bbee2963cbc105dbce38ff.tar.bz2
Merge "Mark layers as ready to swap if invisible" into ics-mr0
Diffstat (limited to 'Source/WebCore/platform/graphics')
-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,