diff options
| author | John Reck <jreck@google.com> | 2011-04-05 10:28:22 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-04-05 10:28:22 -0700 |
| commit | 60b339cd8d85685bb778fdf014922ad64eea9a1f (patch) | |
| tree | 063fbbe8e82ba2fb5a987d033de42b129a15f71e | |
| parent | 7e03c379b83d3947f8927ebc4d6f7ca30e1cc53c (diff) | |
| parent | f5b8d538f8fb1cf9a6fe7eac2bd58e3b550f5505 (diff) | |
| download | external_webkit-60b339cd8d85685bb778fdf014922ad64eea9a1f.zip external_webkit-60b339cd8d85685bb778fdf014922ad64eea9a1f.tar.gz external_webkit-60b339cd8d85685bb778fdf014922ad64eea9a1f.tar.bz2 | |
am f5b8d538: am a33d4903: Fix tile vanishing act
* commit 'f5b8d538f8fb1cf9a6fe7eac2bd58e3b550f5505':
Fix tile vanishing act
| -rw-r--r-- | WebCore/platform/graphics/android/GLWebViewState.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/WebCore/platform/graphics/android/GLWebViewState.cpp b/WebCore/platform/graphics/android/GLWebViewState.cpp index 189b3f0..e5034d4 100644 --- a/WebCore/platform/graphics/android/GLWebViewState.cpp +++ b/WebCore/platform/graphics/android/GLWebViewState.cpp @@ -313,7 +313,8 @@ void GLWebViewState::swapPages() android::Mutex::Autolock lock(m_tiledPageLock); m_usePageA ^= true; TiledPage* working = m_usePageA ? m_tiledPageB : m_tiledPageA; - TilesManager::instance()->resetTextureUsage(working); + if (m_scaleRequestState != kNoScaleRequest) + TilesManager::instance()->resetTextureUsage(working); m_scaleRequestState = kNoScaleRequest; } |