diff options
| author | Derek Sollenberger <djsollen@google.com> | 2011-10-13 11:56:32 -0400 |
|---|---|---|
| committer | Derek Sollenberger <djsollen@google.com> | 2011-10-13 12:15:50 -0400 |
| commit | 34b4a4e02f11c84784346846b8f4d80dd6343861 (patch) | |
| tree | a55befc25d151810c14d9c79f0ca54c5750f89e4 /Source/WebCore | |
| parent | 5ed31e7bc52e99103e4da5755d944f9ca98305b3 (diff) | |
| download | external_webkit-34b4a4e02f11c84784346846b8f4d80dd6343861.zip external_webkit-34b4a4e02f11c84784346846b8f4d80dd6343861.tar.gz external_webkit-34b4a4e02f11c84784346846b8f4d80dd6343861.tar.bz2 | |
Fix crash if a plugin is destroyed before its first drawing pass.
bug: 5454889
Change-Id: I34e125d4b6aa5b9c0da7017a975e80761b6183df
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); } |