diff options
| author | Chris Craik <ccraik@google.com> | 2011-12-08 15:30:05 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-12-08 15:30:05 -0800 |
| commit | 2ee794607b1a21f2f9a0d19a43821d2fa6965470 (patch) | |
| tree | dbc2eac03b69489ab51f9e87d7b43de43075fa04 | |
| parent | aa81668752d33ae7a345626ab61f1ea9fc931392 (diff) | |
| parent | 6747a4b2a78a544c7ce235cefc826e9595fd441f (diff) | |
| download | external_webkit-2ee794607b1a21f2f9a0d19a43821d2fa6965470.zip external_webkit-2ee794607b1a21f2f9a0d19a43821d2fa6965470.tar.gz external_webkit-2ee794607b1a21f2f9a0d19a43821d2fa6965470.tar.bz2 | |
Merge "Reset framework inval when done zooming" into ics-mr1
| -rw-r--r-- | Source/WebCore/platform/graphics/android/BaseLayerAndroid.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/WebCore/platform/graphics/android/BaseLayerAndroid.cpp b/Source/WebCore/platform/graphics/android/BaseLayerAndroid.cpp index 7ec2d78..9c7716c 100644 --- a/Source/WebCore/platform/graphics/android/BaseLayerAndroid.cpp +++ b/Source/WebCore/platform/graphics/android/BaseLayerAndroid.cpp @@ -264,6 +264,7 @@ bool BaseLayerAndroid::prepareBasePictureInGL(SkRect& viewport, float scale, // the two pages (current one and future one with the new scale factor) if (zoomManager->didReceivedRequest()) { float nextTiledPageTransparency = 1; + m_state->resetFrameworkInval(); zoomManager->processTransition(currentTime, scale, &doZoomPageSwap, &nextTiledPageTransparency, &transparency); nextTiledPage->prepareForDrawGL(nextTiledPageTransparency, viewportTileBounds); |