summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/platform/graphics/android/rendering
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2012-05-17 19:08:49 -0700
committerChris Craik <ccraik@google.com>2012-05-17 19:08:49 -0700
commit86ceef033ca2c835916e3970c2ea7cfdba5856a3 (patch)
tree8238cc286b1e3b68fea8caefcc72914b6f52a325 /Source/WebCore/platform/graphics/android/rendering
parentc6097fa86138b3dc74b91e12017cfab615fa0f38 (diff)
downloadexternal_webkit-86ceef033ca2c835916e3970c2ea7cfdba5856a3.zip
external_webkit-86ceef033ca2c835916e3970c2ea7cfdba5856a3.tar.gz
external_webkit-86ceef033ca2c835916e3970c2ea7cfdba5856a3.tar.bz2
Workaround double texture removal
bug:6463659 Change-Id: I5e98357f09d1a5e7f6e91c3a72728981b58c4185
Diffstat (limited to 'Source/WebCore/platform/graphics/android/rendering')
-rw-r--r--Source/WebCore/platform/graphics/android/rendering/TilesManager.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/WebCore/platform/graphics/android/rendering/TilesManager.cpp b/Source/WebCore/platform/graphics/android/rendering/TilesManager.cpp
index 66c4bf3..03ef714 100644
--- a/Source/WebCore/platform/graphics/android/rendering/TilesManager.cpp
+++ b/Source/WebCore/platform/graphics/android/rendering/TilesManager.cpp
@@ -292,7 +292,11 @@ TileTexture* TilesManager::getAvailableTexture(Tile* owner)
// Sanity check that the tile does not already own a texture
if (owner->backTexture() && owner->backTexture()->owner() == owner) {
- availableTexturePool->remove(availableTexturePool->find(owner->backTexture()));
+ int removeIndex = availableTexturePool->find(owner->backTexture());
+
+ // TODO: investigate why texture isn't found
+ if (removeIndex >= 0)
+ availableTexturePool->remove(removeIndex);
return owner->backTexture();
}