summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/platform/graphics/android/TilesManager.cpp
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2011-10-11 16:02:01 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-10-11 16:02:01 -0700
commit46f244f2351cbaa1a251d79605ed6d7e21d1d53f (patch)
tree18e5f77c0068b2d6f0e07bddde6df41a859a4e42 /Source/WebCore/platform/graphics/android/TilesManager.cpp
parentd253060c6edf139871ea630f884cc6631a162854 (diff)
parent959c08a729d39539327aeb634dbce69524e7b678 (diff)
downloadexternal_webkit-46f244f2351cbaa1a251d79605ed6d7e21d1d53f.zip
external_webkit-46f244f2351cbaa1a251d79605ed6d7e21d1d53f.tar.gz
external_webkit-46f244f2351cbaa1a251d79605ed6d7e21d1d53f.tar.bz2
Merge "Mark tiles discarded by TransferQueue as dirty" into ics-mr0
Diffstat (limited to 'Source/WebCore/platform/graphics/android/TilesManager.cpp')
-rw-r--r--Source/WebCore/platform/graphics/android/TilesManager.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebCore/platform/graphics/android/TilesManager.cpp b/Source/WebCore/platform/graphics/android/TilesManager.cpp
index f077d48..72c48b2 100644
--- a/Source/WebCore/platform/graphics/android/TilesManager.cpp
+++ b/Source/WebCore/platform/graphics/android/TilesManager.cpp
@@ -169,14 +169,14 @@ void TilesManager::deallocateTextures(bool allTextures)
for (unsigned int i = 0; i < max; i++) {
TextureOwner* owner = m_textures[i]->owner();
if (!owner || owner->drawCount() < sparedDrawCount) {
- m_textures[i]->discardTexture();
+ m_textures[i]->discardGLTexture();
dealloc++;
}
}
for (unsigned int i = 0; i < maxLayer; i++) {
TextureOwner* owner = m_tilesTextures[i]->owner();
if (!owner || owner->drawCount() < sparedDrawCount) {
- m_tilesTextures[i]->discardTexture();
+ m_tilesTextures[i]->discardGLTexture();
dealloc++;
}
}