diff options
| author | Nicolas Roard <nicolas@android.com> | 2011-01-19 11:55:49 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-19 11:55:49 -0800 |
| commit | 8e8bcdf35a062cbf2526c1d1875869055e8c675e (patch) | |
| tree | 8d44a5207a77e7993a4be7bc64de1cdd2bce3081 | |
| parent | b38a8013ebf13b3408235cdfdab4ab8b4c26c610 (diff) | |
| parent | 1b4926b27410a012cf91fd77175034cd3930e308 (diff) | |
| download | external_webkit-8e8bcdf35a062cbf2526c1d1875869055e8c675e.zip external_webkit-8e8bcdf35a062cbf2526c1d1875869055e8c675e.tar.gz external_webkit-8e8bcdf35a062cbf2526c1d1875869055e8c675e.tar.bz2 | |
Merge "Fix "jump" bug" into honeycomb
| -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; } |