diff options
author | Derek Sollenberger <djsollen@google.com> | 2011-10-13 10:13:42 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-13 10:13:42 -0700 |
commit | 834299ee1971101446d6f2a422956215b6dd1c06 (patch) | |
tree | ba568f1120e9c41ac523a26ae84d1ea68c6922e0 /Source/WebCore | |
parent | 668d7ec1b1c31b8bb2e6f45f5d2595e29a997276 (diff) | |
parent | 34b4a4e02f11c84784346846b8f4d80dd6343861 (diff) | |
download | external_webkit-834299ee1971101446d6f2a422956215b6dd1c06.zip external_webkit-834299ee1971101446d6f2a422956215b6dd1c06.tar.gz external_webkit-834299ee1971101446d6f2a422956215b6dd1c06.tar.bz2 |
Merge "Fix crash if a plugin is destroyed before its first drawing pass." into ics-mr0
Diffstat (limited to 'Source/WebCore')
-rw-r--r-- | Source/WebCore/platform/graphics/android/MediaTexture.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/WebCore/platform/graphics/android/MediaTexture.cpp b/Source/WebCore/platform/graphics/android/MediaTexture.cpp index 98dca22..3b215ee 100644 --- a/Source/WebCore/platform/graphics/android/MediaTexture.cpp +++ b/Source/WebCore/platform/graphics/android/MediaTexture.cpp @@ -70,7 +70,8 @@ MediaTexture::MediaTexture(jobject webViewRef) : android::LightRefBase<MediaText MediaTexture::~MediaTexture() { - deleteTexture(m_contentTexture); + if (m_contentTexture) + deleteTexture(m_contentTexture, true); for (unsigned int i = 0; i < m_videoTextures.size(); i++) { deleteTexture(m_videoTextures[i], true); } |