summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/platform/graphics/android/BaseTileTexture.cpp
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2011-07-01 10:27:35 -0700
committerChris Craik <ccraik@google.com>2011-07-01 10:47:26 -0700
commit72a76070d36a51926c224d230f1503c46f30da60 (patch)
tree08c67ac8a25dc7714de98243709b513d51699e5d /Source/WebCore/platform/graphics/android/BaseTileTexture.cpp
parentbeb5d5b7abfe05ecd6dccd281a0885e7a9526286 (diff)
downloadexternal_webkit-72a76070d36a51926c224d230f1503c46f30da60.zip
external_webkit-72a76070d36a51926c224d230f1503c46f30da60.tar.gz
external_webkit-72a76070d36a51926c224d230f1503c46f30da60.tar.bz2
Modified tile reclamation heuristic for multi-webview display
When tiles are reclaimed, they are now taken first from webviews that haven't been drawn in a while. Previously they were taken from any other webview - which may have been one still being displayed if multiple are onscreen. bug:4049143 partially solved (still not enough graphics memory allocated for tiles on tablet devices) Change-Id: Id400ea28e92ba805120c8353881834157fefa483
Diffstat (limited to 'Source/WebCore/platform/graphics/android/BaseTileTexture.cpp')
-rw-r--r--Source/WebCore/platform/graphics/android/BaseTileTexture.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/WebCore/platform/graphics/android/BaseTileTexture.cpp b/Source/WebCore/platform/graphics/android/BaseTileTexture.cpp
index ee8cebf..4d1dec1 100644
--- a/Source/WebCore/platform/graphics/android/BaseTileTexture.cpp
+++ b/Source/WebCore/platform/graphics/android/BaseTileTexture.cpp
@@ -147,13 +147,12 @@ bool BaseTileTexture::acquire(TextureOwner* owner, bool force)
return setOwner(owner, force);
}
-bool BaseTileTexture::tryAcquire(TextureOwner* owner, TiledPage* currentPage, TiledPage* nextPage)
+bool BaseTileTexture::tryAcquire(TextureOwner* owner)
{
m_busyLock.lock();
if (!m_busy
&& m_owner
- && m_owner->page() != currentPage
- && m_owner->page() != nextPage) {
+ && m_owner->state() != owner->state()) {
m_busyLock.unlock();
return this->acquire(owner);
}