diff options
| author | Chris Craik <ccraik@google.com> | 2011-09-22 17:18:56 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-22 17:18:56 -0700 |
| commit | b73d73df5423e237b8aafcbd60fdaf9e195243f8 (patch) | |
| tree | 897b6e4df949d675d3b91526b314fa1d10e6c427 | |
| parent | 81a264881142f77e3745fe68a03e41b36e554d40 (diff) | |
| parent | faa9e7f5cce5f55ef4d85e00bc6fb64c5fc94c8e (diff) | |
| download | external_webkit-b73d73df5423e237b8aafcbd60fdaf9e195243f8.zip external_webkit-b73d73df5423e237b8aafcbd60fdaf9e195243f8.tar.gz external_webkit-b73d73df5423e237b8aafcbd60fdaf9e195243f8.tar.bz2 | |
Merge "Discard BaseTileTextures entirely when they delete their GL textures"
| -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()) && |