Title: [200413] trunk/Source/WebCore
- Revision
- 200413
- Author
- [email protected]
- Date
- 2016-05-04 03:26:29 -0700 (Wed, 04 May 2016)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (200412 => 200413)
--- trunk/Source/WebCore/ChangeLog 2016-05-04 08:39:07 UTC (rev 200412)
+++ trunk/Source/WebCore/ChangeLog 2016-05-04 10:26:29 UTC (rev 200413)
@@ -1,3 +1,13 @@
+2016-05-04 Zan Dobersek <[email protected]>
+
+ 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 <[email protected]>
Add WKPreference for SelectionPaintingWithoutSelectionGaps
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp (200412 => 200413)
--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp 2016-05-04 08:39:07 UTC (rev 200412)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp 2016-05-04 10:26:29 UTC (rev 200413)
@@ -89,7 +89,8 @@
~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; });
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes