Changeset 129956 in webkit

Timestamp:

Sep 28, 2012, 4:07:39 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

TextureMapperGL destructor crashes
​https://bugs.webkit.org/show_bug.cgi?id=97942

Patch by Luiz Agostini <​luiz.agostini@nokia.com> on 2012-09-28
Reviewed by Noam Rosenthal.

BitmapTextureGL destructor uses a TextureMapperGL instance. The problem is that
BitmapTextureGL objects are destroyed on TextureMapper destructor and at that
time TextureMapperGL specific methods and data are not available any more.

This patch creates a new protected method TextureMapper::clearTexturePool()
that is called in TextureMapperGL's destructor.

• platform/graphics/texmap/TextureMapper.h:

(WebCore::TextureMapper::clearTexturePool):

• platform/graphics/texmap/TextureMapperGL.cpp:

(WebCore::TextureMapperGL::~TextureMapperGL):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/texmap/TextureMapper.h (modified) (1 diff)
• platform/graphics/texmap/TextureMapperGL.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-09-28  Luiz Agostini  <luiz.agostini@nokia.com>
+
+        TextureMapperGL destructor crashes
+        https://bugs.webkit.org/show_bug.cgi?id=97942
+
+        Reviewed by Noam Rosenthal.
+
+        BitmapTextureGL destructor uses a TextureMapperGL instance. The problem is that 
+        BitmapTextureGL objects are destroyed on TextureMapper destructor and at that 
+        time TextureMapperGL specific methods and data are not available any more.
+
+        This patch creates a new protected method TextureMapper::clearTexturePool()
+        that is called in TextureMapperGL's destructor.
+
+        * platform/graphics/texmap/TextureMapper.h:
+        (WebCore::TextureMapper::clearTexturePool):
+        * platform/graphics/texmap/TextureMapperGL.cpp:
+        (WebCore::TextureMapperGL::~TextureMapperGL):
+
 2012-09-28  Julien Chaffraix  <jchaffraix@webkit.org>
 

trunk/Source/WebCore/platform/graphics/texmap/TextureMapper.h

@@ -152 +152 @@
         , m_accelerationMode(accelerationMode)
     {}
+    void clearTexturePool() { m_texturePool.clear(); }
 
 private:

trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp

@@ -845 +845 @@
 TextureMapperGL::~TextureMapperGL()
 {
+    clearTexturePool();
     delete m_data;
 }