diff options
| author | John Reck <jreck@google.com> | 2011-05-05 13:08:45 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-05 13:08:45 -0700 |
| commit | 703236f98a63a5ed7da8d9014d30dd30b1a6db6f (patch) | |
| tree | 321afd33df1b863321305247f6dfb430c22a95fe /WebCore/platform/graphics | |
| parent | f528fe407ddb4168b95f347b27ecc9a6cc40d69f (diff) | |
| parent | 9fbf12a938dbcdbea0987ea89402a07e8d130830 (diff) | |
| download | external_webkit-703236f98a63a5ed7da8d9014d30dd30b1a6db6f.zip external_webkit-703236f98a63a5ed7da8d9014d30dd30b1a6db6f.tar.gz external_webkit-703236f98a63a5ed7da8d9014d30dd30b1a6db6f.tar.bz2 | |
Merge "Fix issue with zooming in then out very quickly"
Diffstat (limited to 'WebCore/platform/graphics')
| -rw-r--r-- | WebCore/platform/graphics/android/BaseLayerAndroid.cpp | 4 |
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); |