<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[191052] branches/safari-601-branch/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/191052">191052</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-10-14 11:49:33 -0700 (Wed, 14 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/190007">r190007</a>. rdar://problem/23075540</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchSourceWebCoreChangeLog">branches/safari-601-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebCoredomDocumentOrderedMapcpp">branches/safari-601-branch/Source/WebCore/dom/DocumentOrderedMap.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCoredomDocumentOrderedMaph">branches/safari-601-branch/Source/WebCore/dom/DocumentOrderedMap.h</a></li>
<li><a href="#branchessafari601branchSourceWebCoredomElementcpp">branches/safari-601-branch/Source/WebCore/dom/Element.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (191051 => 191052)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/ChangeLog 2015-10-14 18:49:30 UTC (rev 191051)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2015-10-14 18:49:33 UTC (rev 191052)
</span><span class="lines">@@ -1,5 +1,33 @@
</span><span class="cx"> 2015-10-13 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r190007. rdar://problem/23075540
+
+ 2015-09-18 Ryosuke Niwa <rniwa@webkit.org>
+
+ REGRESSION(r150187): updateIdForTreeScope may not be called inside shadow trees
+ https://bugs.webkit.org/show_bug.cgi?id=149364
+
+ Reviewed by Antti Koivisto.
+
+ Since the tree scope is set to that of Document's inside removeBetween when a node is removed from a shadow tree,
+ oldScope != &treeScope() was already true inside Element::removedFrom. This can introduce an inconsistency in
+ DocumentOrderedMap which could result in a crash. Fixed the bug by checking it against document(), which is the
+ behavior we had prior to r150187.
+
+ Also added a consistency check in DocumentOrderedMap to catch bugs like this.
+
+ No new tests. New assertions fail in existing tests without this fix.
+
+ * dom/DocumentOrderedMap.cpp:
+ (WebCore::DocumentOrderedMap::add):
+ (WebCore::DocumentOrderedMap::remove):
+ (WebCore::DocumentOrderedMap::get):
+ * dom/DocumentOrderedMap.h:
+ * dom/Element.cpp:
+ (WebCore::Element::removedFrom):
+
+2015-10-13 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r189979. rdar://problem/23075525
</span><span class="cx">
</span><span class="cx"> 2015-09-18 Chris Dumez <cdumez@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoredomDocumentOrderedMapcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/dom/DocumentOrderedMap.cpp (191051 => 191052)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/dom/DocumentOrderedMap.cpp 2015-10-14 18:49:30 UTC (rev 191051)
+++ branches/safari-601-branch/Source/WebCore/dom/DocumentOrderedMap.cpp 2015-10-14 18:49:33 UTC (rev 191052)
</span><span class="lines">@@ -51,13 +51,20 @@
</span><span class="cx"> UNUSED_PARAM(treeScope);
</span><span class="cx"> ASSERT_WITH_SECURITY_IMPLICATION(element.isInTreeScope());
</span><span class="cx"> ASSERT_WITH_SECURITY_IMPLICATION(treeScope.rootNode().containsIncludingShadowDOM(&element));
</span><ins>+
</ins><span class="cx"> if (!element.isInTreeScope())
</span><span class="cx"> return;
</span><span class="cx"> Map::AddResult addResult = m_map.add(&key, MapEntry(&element));
</span><ins>+ MapEntry& entry = addResult.iterator->value;
+
+#ifndef NDEBUG
+ ASSERT_WITH_SECURITY_IMPLICATION(!entry.registeredElements.contains(&element));
+ entry.registeredElements.add(&element);
+#endif
+
</ins><span class="cx"> if (addResult.isNewEntry)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- MapEntry& entry = addResult.iterator->value;
</del><span class="cx"> ASSERT_WITH_SECURITY_IMPLICATION(entry.count);
</span><span class="cx"> entry.element = nullptr;
</span><span class="cx"> entry.count++;
</span><span class="lines">@@ -68,11 +75,13 @@
</span><span class="cx"> {
</span><span class="cx"> m_map.checkConsistency();
</span><span class="cx"> auto it = m_map.find(&key);
</span><ins>+
</ins><span class="cx"> ASSERT_WITH_SECURITY_IMPLICATION(it != m_map.end());
</span><span class="cx"> if (it == m_map.end())
</span><span class="cx"> return;
</span><ins>+
</ins><span class="cx"> MapEntry& entry = it->value;
</span><del>-
</del><ins>+ ASSERT_WITH_SECURITY_IMPLICATION(entry.registeredElements.remove(&element));
</ins><span class="cx"> ASSERT_WITH_SECURITY_IMPLICATION(entry.count);
</span><span class="cx"> if (entry.count == 1) {
</span><span class="cx"> ASSERT_WITH_SECURITY_IMPLICATION(!entry.element || entry.element == &element);
</span><span class="lines">@@ -99,6 +108,7 @@
</span><span class="cx"> if (entry.element) {
</span><span class="cx"> ASSERT_WITH_SECURITY_IMPLICATION(entry.element->isInTreeScope());
</span><span class="cx"> ASSERT_WITH_SECURITY_IMPLICATION(&entry.element->treeScope() == &scope);
</span><ins>+ ASSERT_WITH_SECURITY_IMPLICATION(entry.registeredElements.contains(entry.element));
</ins><span class="cx"> return entry.element;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -109,6 +119,7 @@
</span><span class="cx"> entry.element = &element;
</span><span class="cx"> ASSERT_WITH_SECURITY_IMPLICATION(element.isInTreeScope());
</span><span class="cx"> ASSERT_WITH_SECURITY_IMPLICATION(&element.treeScope() == &scope);
</span><ins>+ ASSERT_WITH_SECURITY_IMPLICATION(entry.registeredElements.contains(entry.element));
</ins><span class="cx"> return &element;
</span><span class="cx"> }
</span><span class="cx"> ASSERT_NOT_REACHED();
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoredomDocumentOrderedMaph"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/dom/DocumentOrderedMap.h (191051 => 191052)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/dom/DocumentOrderedMap.h 2015-10-14 18:49:30 UTC (rev 191051)
+++ branches/safari-601-branch/Source/WebCore/dom/DocumentOrderedMap.h 2015-10-14 18:49:33 UTC (rev 191052)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx">
</span><span class="cx"> #include <wtf/HashCountedSet.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><ins>+#include <wtf/HashSet.h>
</ins><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/text/AtomicStringImpl.h>
</span><span class="cx">
</span><span class="lines">@@ -84,6 +85,9 @@
</span><span class="cx"> Element* element;
</span><span class="cx"> unsigned count;
</span><span class="cx"> Vector<Element*> orderedList;
</span><ins>+#ifndef NDEBUG
+ HashSet<Element*> registeredElements;
+#endif
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> typedef HashMap<const AtomicStringImpl*, MapEntry> Map;
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/dom/Element.cpp (191051 => 191052)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/dom/Element.cpp 2015-10-14 18:49:30 UTC (rev 191051)
+++ branches/safari-601-branch/Source/WebCore/dom/Element.cpp 2015-10-14 18:49:33 UTC (rev 191052)
</span><span class="lines">@@ -1562,7 +1562,7 @@
</span><span class="cx"> if (insertionPoint.isInTreeScope()) {
</span><span class="cx"> TreeScope* oldScope = &insertionPoint.treeScope();
</span><span class="cx"> HTMLDocument* oldDocument = inDocument() && is<HTMLDocument>(oldScope->documentScope()) ? &downcast<HTMLDocument>(oldScope->documentScope()) : nullptr;
</span><del>- if (oldScope != &treeScope() || !isInTreeScope())
</del><ins>+ if (!isInTreeScope() || &treeScope() != &document())
</ins><span class="cx"> oldScope = nullptr;
</span><span class="cx">
</span><span class="cx"> const AtomicString& idValue = getIdAttribute();
</span></span></pre>
</div>
</div>
</body>
</html>