summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2011-11-30 14:33:55 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-11-30 14:33:55 -0800
commited03bc998bd1c1a64a99ee631f3bc31466590bf1 (patch)
tree20535e419e2f9c6eabbfcb69aff689fe65c729b7
parente1ea7f8384757f9b46805df75a0aa72c1fc041b7 (diff)
parent60082004bd7975748f8b0bee91645de245f1ea94 (diff)
downloadexternal_webkit-ed03bc998bd1c1a64a99ee631f3bc31466590bf1.zip
external_webkit-ed03bc998bd1c1a64a99ee631f3bc31466590bf1.tar.gz
external_webkit-ed03bc998bd1c1a64a99ee631f3bc31466590bf1.tar.bz2
Merge "Swap tiled page tiles on zoom" into ics-mr1
-rw-r--r--Source/WebCore/platform/graphics/android/TiledTexture.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/WebCore/platform/graphics/android/TiledTexture.cpp b/Source/WebCore/platform/graphics/android/TiledTexture.cpp
index 5538e1b..91d6897 100644
--- a/Source/WebCore/platform/graphics/android/TiledTexture.cpp
+++ b/Source/WebCore/platform/graphics/android/TiledTexture.cpp
@@ -364,6 +364,7 @@ void DualTiledTexture::prepare(GLWebViewState* state, float scale, bool repaint,
if (m_zooming && m_zoomUpdateTime < WTF::currentTime()) {
m_backTexture->prepare(state, m_futureScale, repaint, startFastSwap, visibleArea);
if (m_backTexture->ready()) {
+ m_backTexture->swapTiles();
swap();
m_zooming = false;
}