diff options
| author | Bart Sears <bsears@google.com> | 2012-05-17 19:33:09 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-17 19:33:09 -0700 |
| commit | 6af93dd239b6de08c9d86ee7a022148fb5a06643 (patch) | |
| tree | 3a1a96406f4c2be595fed9d7b23ea40cf6cfcc53 /Source/WebCore/platform/graphics/android/rendering | |
| parent | 9b0772e730f6ddda6199c42de267fc7742716c00 (diff) | |
| parent | 86ceef033ca2c835916e3970c2ea7cfdba5856a3 (diff) | |
| download | external_webkit-6af93dd239b6de08c9d86ee7a022148fb5a06643.zip external_webkit-6af93dd239b6de08c9d86ee7a022148fb5a06643.tar.gz external_webkit-6af93dd239b6de08c9d86ee7a022148fb5a06643.tar.bz2 | |
Merge "Workaround double texture removal" into jb-dev
Diffstat (limited to 'Source/WebCore/platform/graphics/android/rendering')
| -rw-r--r-- | Source/WebCore/platform/graphics/android/rendering/TilesManager.cpp | 6 |
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(); } |