diff options
| author | Derek Sollenberger <djsollen@google.com> | 2011-10-13 10:15:26 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-13 10:15:26 -0700 |
| commit | ae0cc7aee2c66d2d24f6e2874dd6ad9e2d5a21d1 (patch) | |
| tree | 5428c915d50c54de3dd93590701c1c29509eba26 /Source/WebCore/platform/graphics/android | |
| parent | f208dff4283bf1e235b1bcb28e2ba508a4a2c717 (diff) | |
| parent | 834299ee1971101446d6f2a422956215b6dd1c06 (diff) | |
| download | external_webkit-ae0cc7aee2c66d2d24f6e2874dd6ad9e2d5a21d1.zip external_webkit-ae0cc7aee2c66d2d24f6e2874dd6ad9e2d5a21d1.tar.gz external_webkit-ae0cc7aee2c66d2d24f6e2874dd6ad9e2d5a21d1.tar.bz2 | |
am 834299ee: Merge "Fix crash if a plugin is destroyed before its first drawing pass." into ics-mr0
* commit '834299ee1971101446d6f2a422956215b6dd1c06':
Fix crash if a plugin is destroyed before its first drawing pass.
Diffstat (limited to 'Source/WebCore/platform/graphics/android')
| -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); } |