Title: [191092] branches/safari-601.1.46-branch/Source/WebCore
- Revision
- 191092
- Author
- matthew_han...@apple.com
- Date
- 2015-10-14 23:46:30 -0700 (Wed, 14 Oct 2015)
Log Message
Merge r190097. rdar://problem/23075843
Modified Paths
Diff
Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (191091 => 191092)
--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-10-15 06:46:27 UTC (rev 191091)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-10-15 06:46:30 UTC (rev 191092)
@@ -1,5 +1,16 @@
2015-10-14 Matthew Hanson <matthew_han...@apple.com>
+ Merge r190097. rdar://problem/23075843
+
+ 2015-09-21 Ryosuke Niwa <rn...@webkit.org>
+
+ Fix release builds with security assertion after r190007.
+
+ * dom/DocumentOrderedMap.cpp:
+ * dom/DocumentOrderedMap.h:
+
+2015-10-14 Matthew Hanson <matthew_han...@apple.com>
+
Merge r190007. rdar://problem/23075843
2015-09-18 Ryosuke Niwa <rn...@webkit.org>
Modified: branches/safari-601.1.46-branch/Source/WebCore/dom/DocumentOrderedMap.cpp (191091 => 191092)
--- branches/safari-601.1.46-branch/Source/WebCore/dom/DocumentOrderedMap.cpp 2015-10-15 06:46:27 UTC (rev 191091)
+++ branches/safari-601.1.46-branch/Source/WebCore/dom/DocumentOrderedMap.cpp 2015-10-15 06:46:30 UTC (rev 191092)
@@ -57,7 +57,7 @@
Map::AddResult addResult = m_map.add(&key, MapEntry(&element));
MapEntry& entry = addResult.iterator->value;
-#ifndef NDEBUG
+#if !ASSERT_DISABLED || ENABLE(SECURITY_ASSERTIONS)
ASSERT_WITH_SECURITY_IMPLICATION(!entry.registeredElements.contains(&element));
entry.registeredElements.add(&element);
#endif
Modified: branches/safari-601.1.46-branch/Source/WebCore/dom/DocumentOrderedMap.h (191091 => 191092)
--- branches/safari-601.1.46-branch/Source/WebCore/dom/DocumentOrderedMap.h 2015-10-15 06:46:27 UTC (rev 191091)
+++ branches/safari-601.1.46-branch/Source/WebCore/dom/DocumentOrderedMap.h 2015-10-15 06:46:30 UTC (rev 191092)
@@ -85,7 +85,7 @@
Element* element;
unsigned count;
Vector<Element*> orderedList;
-#ifndef NDEBUG
+#if !ASSERT_DISABLED || ENABLE(SECURITY_ASSERTIONS)
HashSet<Element*> registeredElements;
#endif
};
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
