diff options
| author | Chris Craik <ccraik@google.com> | 2011-12-08 15:31:48 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-08 15:31:48 -0800 |
| commit | 397afc9c161292e163bf2381973fced88c7123bf (patch) | |
| tree | dbc2eac03b69489ab51f9e87d7b43de43075fa04 | |
| parent | 1e39112ee325513631caf399d23d166760763b2d (diff) | |
| parent | 2ee794607b1a21f2f9a0d19a43821d2fa6965470 (diff) | |
| download | external_webkit-397afc9c161292e163bf2381973fced88c7123bf.zip external_webkit-397afc9c161292e163bf2381973fced88c7123bf.tar.gz external_webkit-397afc9c161292e163bf2381973fced88c7123bf.tar.bz2 | |
am 2ee79460: Merge "Reset framework inval when done zooming" into ics-mr1
* commit '2ee794607b1a21f2f9a0d19a43821d2fa6965470':
Reset framework inval when done zooming
| -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); |