Fix for deadlock

Bug:3155066

Change-Id: I3e249050c779d10db75f97b177e09144a52f70b1

diff --git a/WebCore/platform/graphics/android/BackedDoubleBufferedTexture.cpp b/WebCore/platform/graphics/android/BackedDoubleBufferedTexture.cpp
index 334f7fd..7cecddd 100644 (file)
--- a/WebCore/platform/graphics/android/BackedDoubleBufferedTexture.cpp
+++ b/WebCore/platform/graphics/android/BackedDoubleBufferedTexture.cpp
@@ -128,15 +128,14 @@ bool BackedDoubleBufferedTexture::acquire(BaseTile* owner)
 
     // if the writable texture is busy (i.e. currently being written to) then we
     // can't change the owner out from underneath that texture
-    m_varLock.lock();
-    if (m_busy)
-        return false;
-    m_varLock.unlock();
-
-    if (m_owner)
-        m_owner->removeTexture();
-    m_owner = owner;
-    return true;
+    android::Mutex::Autolock lock(m_varLock);
+    if (!m_busy) {
+        if (m_owner)
+            m_owner->removeTexture();
+        m_owner = owner;
+        return true;
+    }
+    return false;
 }
 
 } // namespace WebCore