summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--WebCore/platform/graphics/android/BaseLayerAndroid.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/platform/graphics/android/BaseLayerAndroid.cpp b/WebCore/platform/graphics/android/BaseLayerAndroid.cpp
index ebf8c88..09d80a1 100644
--- a/WebCore/platform/graphics/android/BaseLayerAndroid.cpp
+++ b/WebCore/platform/graphics/android/BaseLayerAndroid.cpp
@@ -140,8 +140,8 @@ bool BaseLayerAndroid::drawBasePictureInGL(SkRect& viewport, float scale, double
// so that we do not slow down zooming unnecessarily.
if (m_glWebViewState->currentScale() != scale
&& (m_glWebViewState->scaleRequestState() == GLWebViewState::kNoScaleRequest
- || m_glWebViewState->scaleRequestState() == GLWebViewState::kWillScheduleRequest
- || m_glWebViewState->futureScale() != scale)) {
+ || m_glWebViewState->futureScale() != scale)
+ || m_glWebViewState->scaleRequestState() == GLWebViewState::kWillScheduleRequest) {
// schedule the new request
m_glWebViewState->scheduleUpdate(currentTime, viewportTileBounds, scale);