Null out m_canvas if HTMLCanvasElement is destroyed

 Bug: 6209508

Change-Id: I99be936cde28047d516ecdfcc20cd099241569ca

1 files changed, 13 insertions, 13 deletions

diff --git a/Source/WebCore/platform/graphics/android/CanvasTexture.cpp b/Source/WebCore/platform/graphics/android/CanvasTexture.cpp
index 90a4798..ca520fd 100644
--- a/Source/WebCore/platform/graphics/android/CanvasTexture.cpp
+++ b/Source/WebCore/platform/graphics/android/CanvasTexture.cpp
@@ -64,6 +64,18 @@ PassRefPtr<CanvasTexture> CanvasTexture::getCanvasTexture(CanvasLayer* layer)
     return adoptRef(new CanvasTexture(layer->uniqueId()));
 }
 
+bool CanvasTexture::setHwAccelerated(bool hwAccelerated)
+{
+    android::Mutex::Autolock lock(m_surfaceLock);
+    if (m_useHwAcceleration == hwAccelerated)
+        return false;
+    m_useHwAcceleration = hwAccelerated;
+    if (!m_ANW.get())
+        return false;
+    destroySurfaceTexture();
+    return true;
+}
+
 /********************************************
  * Called by WebKit thread
  ********************************************/
@@ -159,7 +171,7 @@ bool CanvasTexture::updateTexImage()
 }
 
 /********************************************
- * Called by UI thread (with or without GL context)
+ * Called by both threads
  ********************************************/
 
 void CanvasTexture::destroySurfaceTexture()
@@ -171,18 +183,6 @@ void CanvasTexture::destroySurfaceTexture()
     }
 }
 
-bool CanvasTexture::setHwAccelerated(bool hwAccelerated)
-{
-    android::Mutex::Autolock lock(m_surfaceLock);
-    if (m_useHwAcceleration == hwAccelerated)
-        return false;
-    m_useHwAcceleration = hwAccelerated;
-    if (!m_ANW.get())
-        return false;
-    destroySurfaceTexture();
-    return true;
-}
-
 /********************************************
  * Called by WebKit thread
  ********************************************/