diff options
| author | Chris Craik <ccraik@google.com> | 2011-10-24 15:54:15 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-24 15:54:15 -0700 |
| commit | 7b6a150feadfcf43fb6452394b8363cee15824f8 (patch) | |
| tree | 3ac56d500974ff30e76103605e4119769cd2f8f6 /Source/WebCore/platform/graphics/android/TiledTexture.cpp | |
| parent | 32213997dc5e3c30bc6b47fb413d8d700aa6f53b (diff) | |
| parent | a4adfec4837fe35c27bbee2963cbc105dbce38ff (diff) | |
| download | external_webkit-7b6a150feadfcf43fb6452394b8363cee15824f8.zip external_webkit-7b6a150feadfcf43fb6452394b8363cee15824f8.tar.gz external_webkit-7b6a150feadfcf43fb6452394b8363cee15824f8.tar.bz2 | |
am a4adfec4: Merge "Mark layers as ready to swap if invisible" into ics-mr0
* commit 'a4adfec4837fe35c27bbee2963cbc105dbce38ff':
Mark layers as ready to swap if invisible
Diffstat (limited to 'Source/WebCore/platform/graphics/android/TiledTexture.cpp')
| -rw-r--r-- | Source/WebCore/platform/graphics/android/TiledTexture.cpp | 2 |
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 35ce35f..b252303 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, |