summaryrefslogtreecommitdiffstats
path: root/WebCore/platform/graphics
diff options
context:
space:
mode:
Diffstat (limited to 'WebCore/platform/graphics')
-rw-r--r--WebCore/platform/graphics/android/BaseLayerAndroid.cpp5
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;
}