From 34b4a4e02f11c84784346846b8f4d80dd6343861 Mon Sep 17 00:00:00 2001
From: Derek Sollenberger <djsollen@google.com>
Date: Thu, 13 Oct 2011 11:56:32 -0400
Subject: Fix crash if a plugin is destroyed before its first drawing pass.

bug: 5454889
Change-Id: I34e125d4b6aa5b9c0da7017a975e80761b6183df
---
 Source/WebCore/platform/graphics/android/MediaTexture.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'Source')

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);
     }
-- 
cgit v1.1