Work around for pure virtual layers crash.

TextureOwner can be left still owning a texture when we come to
delete that TextureOwner. Then later the texture it still owns tries to
access it's owner and we crash.

Work around by explicity releasing any owned textures when we delete
the texture owner.

Bug:3367855

Change-Id: I38877b7088d27f51d98cfd182d937fe5cb3b9f8d

diff --git a/WebCore/Android.mk b/WebCore/Android.mk
index 8aa16d9..4428a84 100644 (file)
--- a/WebCore/Android.mk
+++ b/WebCore/Android.mk
@@ -625,6 +625,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
        platform/graphics/android/SharedBufferStream.cpp \
        platform/graphics/android/ShaderProgram.cpp \
        platform/graphics/android/SharedTexture.cpp \
+       platform/graphics/android/TextureOwner.cpp \
        platform/graphics/android/TexturesGenerator.cpp \
        platform/graphics/android/TilesManager.cpp \
        platform/graphics/android/TiledPage.cpp \

diff --git a/WebCore/platform/graphics/android/BackedDoubleBufferedTexture.cpp b/WebCore/platform/graphics/android/BackedDoubleBufferedTexture.cpp
index 6d9fe04..dd69c4c 100644 (file)
--- a/WebCore/platform/graphics/android/BackedDoubleBufferedTexture.cpp
+++ b/WebCore/platform/graphics/android/BackedDoubleBufferedTexture.cpp
@@ -140,6 +140,7 @@ bool BackedDoubleBufferedTexture::setOwner(TextureOwner* owner)
         if (m_owner && m_owner != owner)
             m_owner->removeTexture(this);
         m_owner = owner;
+        owner->addOwned(this);
         return true;
     }
     return false;
@@ -147,8 +148,11 @@ bool BackedDoubleBufferedTexture::setOwner(TextureOwner* owner)
 
 void BackedDoubleBufferedTexture::release(TextureOwner* owner)
 {
-    if (m_owner == owner)
+    if (m_owner == owner) {
+        m_owner->removeOwned(this);
         m_owner = 0;
+    }
+
 }
 
 } // namespace WebCore

diff --git a/WebCore/platform/graphics/android/TextureOwner.cpp b/WebCore/platform/graphics/android/TextureOwner.cpp
new file mode 100644 (file)
index 0000000..6a6845a
--- /dev/null
+++ b/WebCore/platform/graphics/android/TextureOwner.cpp
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2011, The Android Open Source Project
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "TextureOwner.h"
+
+#include "BackedDoubleBufferedTexture.h"
+
+namespace WebCore {
+
+TextureOwner::~TextureOwner()
+{
+    if (m_ownedTextures.size()) {
+        // This TextureOwner owns textures still!
+        HashSet<BackedDoubleBufferedTexture*>::iterator it = m_ownedTextures.begin();
+        for (; it != m_ownedTextures.end(); ++it)
+            (*it)->release(this);
+    }
+}
+
+void TextureOwner::addOwned(BackedDoubleBufferedTexture* t)
+{
+    // This TextureOwner now owns texture t
+    m_ownedTextures.add(t);
+}
+
+void TextureOwner::removeOwned(BackedDoubleBufferedTexture* t)
+{
+    // This textureowner no longer owns texture t.
+    m_ownedTextures.remove(t);
+}
+}

diff --git a/WebCore/platform/graphics/android/TextureOwner.h b/WebCore/platform/graphics/android/TextureOwner.h
index 7b0673d..c421e8a 100644 (file)
--- a/WebCore/platform/graphics/android/TextureOwner.h
+++ b/WebCore/platform/graphics/android/TextureOwner.h
@@ -26,6 +26,8 @@
 #ifndef TextureOwner_h
 #define TextureOwner_h
 
+#include <wtf/HashSet.h>
+
 namespace WebCore {
 
 class TiledPage;
@@ -33,9 +35,15 @@ class BackedDoubleBufferedTexture;
 
 class TextureOwner {
 public:
-    virtual ~TextureOwner() {}
+    virtual ~TextureOwner();
     virtual void removeTexture(BackedDoubleBufferedTexture* texture) = 0;
     virtual TiledPage* page() = 0;
+
+    void addOwned(BackedDoubleBufferedTexture*);
+    void removeOwned(BackedDoubleBufferedTexture*);
+
+private:
+    WTF::HashSet<BackedDoubleBufferedTexture*> m_ownedTextures;
 };
 
 }