diff options
| author | Chris Craik <ccraik@google.com> | 2011-12-13 17:42:52 -0800 |
|---|---|---|
| committer | Chris Craik <ccraik@google.com> | 2012-01-04 13:17:22 -0800 |
| commit | 0d7be54f39958e22bdc62849abfdf979b76f4383 (patch) | |
| tree | c497af0a658365d82aca76ea1eb8076155397935 /Source/WebCore/platform/graphics/android | |
| parent | 599c05f3080acd1c99f4d925c333d8a2711c9bdf (diff) | |
| download | external_webkit-0d7be54f39958e22bdc62849abfdf979b76f4383.zip external_webkit-0d7be54f39958e22bdc62849abfdf979b76f4383.tar.gz external_webkit-0d7be54f39958e22bdc62849abfdf979b76f4383.tar.bz2 | |
When loading new content, reset zoom state - DO NOT MERGE
cherry-pick of https://android-git.corp.google.com/g/#/c/155121/2 into MR1 branch
bug:5757950
Change-Id: I34042e8b1f1adf1fc1826d7fde5500708bef3b60
Diffstat (limited to 'Source/WebCore/platform/graphics/android')
| -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(); } |