diff options
| author | Nicolas Roard <nicolas@android.com> | 2011-01-19 11:54:04 -0800 |
|---|---|---|
| committer | Nicolas Roard <nicolas@android.com> | 2011-01-19 11:54:04 -0800 |
| commit | 1b4926b27410a012cf91fd77175034cd3930e308 (patch) | |
| tree | d3790da85f42f4ce0bd6a411df3266aa3ce4b05c /WebCore/platform | |
| parent | 3eee7f647df0557a7c476e21afb08031736aac8c (diff) | |
| download | external_webkit-1b4926b27410a012cf91fd77175034cd3930e308.zip external_webkit-1b4926b27410a012cf91fd77175034cd3930e308.tar.gz external_webkit-1b4926b27410a012cf91fd77175034cd3930e308.tar.bz2 | |
Fix "jump" bug
bug:3349970
Change-Id: I7e095c541bc8a106c94c14a70f121ea3b24f06f4
Diffstat (limited to 'WebCore/platform')
| -rw-r--r-- | WebCore/platform/graphics/android/BaseLayerAndroid.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/WebCore/platform/graphics/android/BaseLayerAndroid.cpp b/WebCore/platform/graphics/android/BaseLayerAndroid.cpp index 9ed967f..1e7e209 100644 --- a/WebCore/platform/graphics/android/BaseLayerAndroid.cpp +++ b/WebCore/platform/graphics/android/BaseLayerAndroid.cpp @@ -200,7 +200,6 @@ bool BaseLayerAndroid::drawBasePictureInGL(SkRect& viewport, float scale) // The transition between the two pages is finished, swap them if (currentTime > transitionTime) { - m_glWebViewState->setCurrentScale(scale); m_glWebViewState->resetTransitionTime(); doSwap = true; } @@ -218,8 +217,10 @@ bool BaseLayerAndroid::drawBasePictureInGL(SkRect& viewport, float scale) || !tiledPage->ready(preZoomBounds)) ret = true; - if (doSwap) + if (doSwap) { + m_glWebViewState->setCurrentScale(scale); m_glWebViewState->swapPages(); + } return ret; } |