diff options
| author | Chris Craik <ccraik@google.com> | 2011-11-30 14:37:44 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-30 14:37:44 -0800 |
| commit | 9777b5d54b30546e2ca988bf94d03d4bcee1e162 (patch) | |
| tree | f1263aef41c491255460dd339c66c2d015ae909e | |
| parent | 9de1ab165fdd5dda79a6a17b0f93822f8d82ca2f (diff) | |
| parent | ed03bc998bd1c1a64a99ee631f3bc31466590bf1 (diff) | |
| download | external_webkit-9777b5d54b30546e2ca988bf94d03d4bcee1e162.zip external_webkit-9777b5d54b30546e2ca988bf94d03d4bcee1e162.tar.gz external_webkit-9777b5d54b30546e2ca988bf94d03d4bcee1e162.tar.bz2 | |
am ed03bc99: Merge "Swap tiled page tiles on zoom" into ics-mr1
* commit 'ed03bc998bd1c1a64a99ee631f3bc31466590bf1':
Swap tiled page tiles on zoom
| -rw-r--r-- | Source/WebCore/platform/graphics/android/TiledTexture.cpp | 1 |
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; } |