diff options
| author | Chris Craik <ccraik@google.com> | 2011-09-22 16:25:22 -0700 |
|---|---|---|
| committer | The Android Automerger <android-build@android.com> | 2011-09-22 18:25:30 -0700 |
| commit | a4723810a9d5f9957a05e568c14ddfe80179cfa9 (patch) | |
| tree | cd7fa2e913dfdcdd73168775f0686058d355a065 | |
| parent | a8a33df10caf0d4abf964d7ca2c15f2175bb3527 (diff) | |
| download | external_webkit-a4723810a9d5f9957a05e568c14ddfe80179cfa9.zip external_webkit-a4723810a9d5f9957a05e568c14ddfe80179cfa9.tar.gz external_webkit-a4723810a9d5f9957a05e568c14ddfe80179cfa9.tar.bz2 | |
Discard BaseTileTextures entirely when they delete their GL textures
bug:5361337
Fixes issue with garbage being drawn in unpainted tiles, and also allocates
tiles very lazily.
Change-Id: I9799b63670a80748a4809b61506da96a739d3a65
| -rw-r--r-- | Source/WebCore/platform/graphics/android/BaseTileTexture.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/Source/WebCore/platform/graphics/android/BaseTileTexture.cpp b/Source/WebCore/platform/graphics/android/BaseTileTexture.cpp index f049b6f..d60d695 100644 --- a/Source/WebCore/platform/graphics/android/BaseTileTexture.cpp +++ b/Source/WebCore/platform/graphics/android/BaseTileTexture.cpp @@ -89,6 +89,7 @@ void BaseTileTexture::discardTexture() { if (m_ownTextureId) GLUtils::deleteTexture(&m_ownTextureId); + release(m_owner); } void BaseTileTexture::destroyTextures(SharedTexture** textures) @@ -274,13 +275,6 @@ void BaseTileTexture::setOwnTextureTileInfoFromQueue(const TextureTileInfo* info bool BaseTileTexture::readyFor(BaseTile* baseTile) { - if (!m_ownTextureId) { - // If our backing opengl texture doesn't exist, allocate it and return - // false since it won't have useful data - requireTexture(); - return false; - } - const TextureTileInfo* info = &m_ownTextureTileInfo; if (info && (info->m_x == baseTile->x()) && |