diff options
| author | Chris Craik <ccraik@google.com> | 2011-12-12 12:34:59 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-12 12:34:59 -0800 |
| commit | 1c42978931fbc36259741b9ccbb90b974e385693 (patch) | |
| tree | dc06b7a289caf0ce1e091bd537c5f6344e253232 /Source/WebCore/platform/graphics/android/BaseLayerAndroid.cpp | |
| parent | a8919811c45b9aac7b20abfb3f5b0fb80deec795 (diff) | |
| parent | 397afc9c161292e163bf2381973fced88c7123bf (diff) | |
| download | external_webkit-1c42978931fbc36259741b9ccbb90b974e385693.zip external_webkit-1c42978931fbc36259741b9ccbb90b974e385693.tar.gz external_webkit-1c42978931fbc36259741b9ccbb90b974e385693.tar.bz2 | |
am 397afc9c: am 2ee79460: Merge "Reset framework inval when done zooming" into ics-mr1
* commit '397afc9c161292e163bf2381973fced88c7123bf':
Reset framework inval when done zooming
Diffstat (limited to 'Source/WebCore/platform/graphics/android/BaseLayerAndroid.cpp')
| -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 8cb4938..6ab9226 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); |