diff options
author | Chris Craik <ccraik@google.com> | 2011-09-30 15:31:01 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-30 15:31:01 -0700 |
commit | 558f20334ad46bbdf74bfa1ab82c630094e31e37 (patch) | |
tree | 75682b3b9e08959a7c066ed3661e389826bd2a20 /Source/WebCore | |
parent | 480eb21b8da42fec33d8c447f446738e61304be0 (diff) | |
parent | c565532a280bd10e53c0ed0447c1442c7ef27d0d (diff) | |
download | external_webkit-558f20334ad46bbdf74bfa1ab82c630094e31e37.zip external_webkit-558f20334ad46bbdf74bfa1ab82c630094e31e37.tar.gz external_webkit-558f20334ad46bbdf74bfa1ab82c630094e31e37.tar.bz2 |
Merge "Fix low-res tiles rendering too early"
Diffstat (limited to 'Source/WebCore')
-rw-r--r-- | Source/WebCore/platform/graphics/android/BaseLayerAndroid.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Source/WebCore/platform/graphics/android/BaseLayerAndroid.cpp b/Source/WebCore/platform/graphics/android/BaseLayerAndroid.cpp index 547ac39..94bf045 100644 --- a/Source/WebCore/platform/graphics/android/BaseLayerAndroid.cpp +++ b/Source/WebCore/platform/graphics/android/BaseLayerAndroid.cpp @@ -232,13 +232,6 @@ bool BaseLayerAndroid::drawBasePictureInGL(SkRect& viewport, float scale, bool scrolling = m_scrollState != NotScrolling; bool zooming = ZoomManager::kNoScaleRequest != zoomManager->scaleRequestState(); - // prefetch in the nextTiledPage if unused by zooming (even if not scrolling - // since we want the tiles to be ready before they're needed) - bool usePrefetchPage = !zooming; - nextTiledPage->setIsPrefetchPage(usePrefetchPage); - if (usePrefetchPage) - prefetchBasePicture(viewport, scale, nextTiledPage); - // When we aren't zooming, we should TRY and swap tile buffers if they're // ready. When scrolling, we swap whatever's ready. Otherwise, buffer until // the entire page is ready and then swap. @@ -293,6 +286,13 @@ bool BaseLayerAndroid::drawBasePictureInGL(SkRect& viewport, float scale, XLOG("scrolling %d, zooming %d, buffersSwapped %d, needsRedraw %d", scrolling, zooming, buffersSwapped, needsRedraw); + // prefetch in the nextTiledPage if unused by zooming (even if not scrolling + // since we want the tiles to be ready before they're needed) + bool usePrefetchPage = !zooming; + nextTiledPage->setIsPrefetchPage(usePrefetchPage); + if (usePrefetchPage) + prefetchBasePicture(viewport, scale, nextTiledPage); + tiledPage->draw(transparency, preZoomBounds); return needsRedraw; |