summaryrefslogtreecommitdiffstats
path: root/WebCore/platform/graphics/android/GLWebViewState.cpp
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2011-04-04 18:18:37 -0700
committerJohn Reck <jreck@google.com>2011-04-04 18:18:37 -0700
commita33d490302a04453e2c671114d30a4ee93cb08f1 (patch)
tree787c4952a9dcf416da9d08f4c41aefb36269165d /WebCore/platform/graphics/android/GLWebViewState.cpp
parentca84feebe782358e319da8bd13938179e941f9b4 (diff)
downloadexternal_webkit-a33d490302a04453e2c671114d30a4ee93cb08f1.zip
external_webkit-a33d490302a04453e2c671114d30a4ee93cb08f1.tar.gz
external_webkit-a33d490302a04453e2c671114d30a4ee93cb08f1.tar.bz2
Fix tile vanishing act
Bug: 4184047 This is caused by textures being marked as unused by swapPages(). Limiting when swapPages() releases textures slightly fixes the issue. Change-Id: I8ac94f1370b023355f4b6f5877c3929b5d6d3ef6
Diffstat (limited to 'WebCore/platform/graphics/android/GLWebViewState.cpp')
-rw-r--r--WebCore/platform/graphics/android/GLWebViewState.cpp3
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;
}