summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeng-Hui Zhu <ztenghui@google.com>2011-06-28 08:57:58 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-06-28 08:57:58 -0700
commitd43ff08c4af52461322b7ae56d491cd0d4b8cd37 (patch)
tree89889b55cf62ee48076c6f95f085cba43f579380
parent30375bd7b8396c98aac134419306b45f79fc10d8 (diff)
parent7aabeb5a7207216adbd99c10990804112007bc38 (diff)
downloadexternal_webkit-d43ff08c4af52461322b7ae56d491cd0d4b8cd37.zip
external_webkit-d43ff08c4af52461322b7ae56d491cd0d4b8cd37.tar.gz
external_webkit-d43ff08c4af52461322b7ae56d491cd0d4b8cd37.tar.bz2
Merge "Delete the GL texture when deleting the Surface Texture"
-rw-r--r--Source/WebCore/platform/graphics/android/SharedTexture.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/WebCore/platform/graphics/android/SharedTexture.cpp b/Source/WebCore/platform/graphics/android/SharedTexture.cpp
index cbe44da..4f52107 100644
--- a/Source/WebCore/platform/graphics/android/SharedTexture.cpp
+++ b/Source/WebCore/platform/graphics/android/SharedTexture.cpp
@@ -78,6 +78,7 @@ SharedTexture::~SharedTexture()
else if (m_sharedTextureMode == SurfaceTextureMode) {
m_sourceTexture->m_surfaceTexture.clear();
m_sourceTexture->m_ANW.clear();
+ GLUtils::deleteTexture(&m_sourceTexture->m_textureId);
}
delete m_sourceTexture;
delete m_targetTexture;