Changeset 200413 in webkit

Timestamp:

May 4, 2016 3:26:29 AM (8 years ago)

Author:

zandobersek@gmail.com

Message:

Unreviewed, fixing crashing GTK+ tests after r200407.

• platform/graphics/texmap/TextureMapperGL.cpp:

(WebCore::TextureMapperGLData::SharedGLData::~SharedGLData):
Don't use RELEASE_ASSERT. Also fix the actual assertion,
checking that any of the values in the map matches the object
that's being destroyed, instead of checking the keys.

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-05-04  Zan Dobersek  <zdobersek@igalia.com>
+
+        Unreviewed, fixing crashing GTK+ tests after r200407.
+
+        * platform/graphics/texmap/TextureMapperGL.cpp:
+        (WebCore::TextureMapperGLData::SharedGLData::~SharedGLData):
+        Don't use RELEASE_ASSERT. Also fix the actual assertion,
+        checking that any of the values in the map matches the object
+        that's being destroyed, instead of checking the keys.
+
 2016-05-04  Gyuyoung Kim  <gyuyoung.kim@webkit.org>
 

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

@@ -90 +90 @@
         ~SharedGLData()
         {
-            RELEASE_ASSERT(contextDataMap().contains(this));
+            ASSERT(std::any_of(contextDataMap().begin(), contextDataMap().end(),
+                [this](GLContextDataMap::KeyValuePairType& entry) { return entry.value == this; }));
             contextDataMap().removeIf([this] (GLContextDataMap::KeyValuePairType& entry) { return entry.value == this; });
         }