diff options
| author | Chris Craik <ccraik@google.com> | 2012-01-04 13:44:48 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-01-04 13:44:48 -0800 |
| commit | acd6e2772da194e45555acd3c5792246c91a15f5 (patch) | |
| tree | 80115827b2920b3f46c25b73f47d0db46353127b | |
| parent | e5b6855637cefa440231d37a2dc4326bebe9833e (diff) | |
| parent | 2cc4497f17622689c7cd981e220795762660df5c (diff) | |
| download | external_webkit-acd6e2772da194e45555acd3c5792246c91a15f5.zip external_webkit-acd6e2772da194e45555acd3c5792246c91a15f5.tar.gz external_webkit-acd6e2772da194e45555acd3c5792246c91a15f5.tar.bz2 | |
am 2cc4497f: Merge "When loading new content, reset zoom state - DO NOT MERGE" into ics-mr1
* commit '2cc4497f17622689c7cd981e220795762660df5c':
When loading new content, reset zoom state - DO NOT MERGE
| -rw-r--r-- | Source/WebCore/platform/graphics/android/GLWebViewState.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/WebCore/platform/graphics/android/GLWebViewState.cpp b/Source/WebCore/platform/graphics/android/GLWebViewState.cpp index 273c478..262d270 100644 --- a/Source/WebCore/platform/graphics/android/GLWebViewState.cpp +++ b/Source/WebCore/platform/graphics/android/GLWebViewState.cpp @@ -130,6 +130,7 @@ void GLWebViewState::setBaseLayer(BaseLayerAndroid* layer, const SkRegion& inval { if (!layer || isPictureAfterFirstLayout) { // TODO: move this into TreeManager + m_zoomManager.swapPages(); // reset zoom state m_tiledPageA->discardTextures(); m_tiledPageB->discardTextures(); } |