<!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>[207212] branches/safari-602-branch</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/207212">207212</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2016-10-12 01:41:58 -0700 (Wed, 12 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/206975">r206975</a>. rdar://problem/28545012</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602branchLayoutTestsChangeLog">branches/safari-602-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebCoreChangeLog">branches/safari-602-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebCoredomDocumentcpp">branches/safari-602-branch/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebCoredomDocumenth">branches/safari-602-branch/Source/WebCore/dom/Document.h</a></li>
<li><a href="#branchessafari602branchSourceWebCoredomNodecpp">branches/safari-602-branch/Source/WebCore/dom/Node.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari602branchLayoutTestsfastdomNodeListformlabelslengthexpectedtxt">branches/safari-602-branch/LayoutTests/fast/dom/NodeList/form-labels-length-expected.txt</a></li>
<li><a href="#branchessafari602branchLayoutTestsfastdomNodeListformlabelslengthhtml">branches/safari-602-branch/LayoutTests/fast/dom/NodeList/form-labels-length.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/LayoutTests/ChangeLog (207211 => 207212)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/ChangeLog 2016-10-12 08:41:54 UTC (rev 207211)
+++ branches/safari-602-branch/LayoutTests/ChangeLog 2016-10-12 08:41:58 UTC (rev 207212)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2016-10-12 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r206975. rdar://problem/28545012
+
+ 2016-10-07 Ryosuke Niwa <rniwa@webkit.org>
+
+ REGRESSION(r165103): labels list doesn't get invalidated when other lists are invalidated at document level
+ https://bugs.webkit.org/show_bug.cgi?id=163145
+
+ Reviewed by Darin Adler.
+
+ Added a regression test.
+
+ * fast/dom/NodeList/form-labels-length-expected.txt: Added.
+ * fast/dom/NodeList/form-labels-length.html: Added.
+
+2016-10-12 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r206280. rdar://problem/28476953
</span><span class="cx">
</span><span class="cx"> 2016-09-22 Brady Eidson <beidson@apple.com>
</span></span></pre></div>
<a id="branchessafari602branchLayoutTestsfastdomNodeListformlabelslengthexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-602-branch/LayoutTests/fast/dom/NodeList/form-labels-length-expected.txt (0 => 207212)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/fast/dom/NodeList/form-labels-length-expected.txt (rev 0)
+++ branches/safari-602-branch/LayoutTests/fast/dom/NodeList/form-labels-length-expected.txt 2016-10-12 08:41:58 UTC (rev 207212)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+Tests that removing and inserting an input element always invalidates the cache in the labels node list
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS input.labels.length is 0
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="branchessafari602branchLayoutTestsfastdomNodeListformlabelslengthhtml"></a>
<div class="addfile"><h4>Added: branches/safari-602-branch/LayoutTests/fast/dom/NodeList/form-labels-length.html (0 => 207212)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/fast/dom/NodeList/form-labels-length.html (rev 0)
+++ branches/safari-602-branch/LayoutTests/fast/dom/NodeList/form-labels-length.html 2016-10-12 08:41:58 UTC (rev 207212)
</span><span class="lines">@@ -0,0 +1,27 @@
</span><ins>+<!DOCTYPE HTML>
+<html>
+<body>
+<script src="../../../resources/js-test-pre.js"></script>
+<script>
+
+description('Tests that removing and inserting an input element always invalidates the cache in the labels node list');
+
+var iframe = document.createElement('iframe');
+document.body.appendChild(iframe);
+var doc = iframe.contentDocument;
+
+doc.body.innerHTML = '<form><label><input id=someInput></label><label for=someInput></label></form><input id=otherInput>';
+var input = doc.getElementById('someInput');
+var form = doc.querySelector('form');
+form.elements[0];
+input.labels[0];
+form.id = 'someId';
+form.remove();
+doc.body.appendChild(input);
+
+shouldBe('input.labels.length', '0');
+
+</script>
+<script src="../../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari602branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (207211 => 207212)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/ChangeLog 2016-10-12 08:41:54 UTC (rev 207211)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2016-10-12 08:41:58 UTC (rev 207212)
</span><span class="lines">@@ -1,5 +1,34 @@
</span><span class="cx"> 2016-10-12 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r206975. rdar://problem/28545012
+
+ 2016-10-07 Ryosuke Niwa <rniwa@webkit.org>
+
+ REGRESSION(r165103): labels list doesn't get invalidated when other lists are invalidated at document level
+ https://bugs.webkit.org/show_bug.cgi?id=163145
+
+ Reviewed by Darin Adler.
+
+ The bug was caused by Document::invalidateNodeListAndCollectionCaches removing all node lists regardless
+ of whether they have been invalidated or not.
+
+ Fixed the bug by removing only those node lists that got invalidated via LiveNodeList::invalidateCache.
+
+ Test: fast/dom/NodeList/form-labels-length.html
+
+ * dom/Document.cpp:
+ (WebCore::Document::Document):
+ (WebCore::Document::unregisterNodeListForInvalidation): Removed the conditional which allowed removal to
+ happen while m_listsInvalidatedAtDocument is empty inside invalidateNodeListAndCollectionCaches.
+ * dom/Document.h:
+ * dom/Node.cpp:
+ (WebCore::Document::invalidateNodeListAndCollectionCaches): Just remove the node lists being invalidated via
+ LiveNodeList's invalidateCache, which calls unregisterNodeListForInvalidation, instead of removing them all.
+ We make a copy of the list of node lists into a local vector because mutating HashMap while iterating over it
+ is not a safe operation.
+
+2016-10-12 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r206280. rdar://problem/28476953
</span><span class="cx">
</span><span class="cx"> 2016-09-22 Brady Eidson <beidson@apple.com>
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/dom/Document.cpp (207211 => 207212)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/dom/Document.cpp 2016-10-12 08:41:54 UTC (rev 207211)
+++ branches/safari-602-branch/Source/WebCore/dom/Document.cpp 2016-10-12 08:41:58 UTC (rev 207212)
</span><span class="lines">@@ -484,9 +484,6 @@
</span><span class="cx"> , m_xmlStandalone(StandaloneUnspecified)
</span><span class="cx"> , m_hasXMLDeclaration(false)
</span><span class="cx"> , m_designMode(inherit)
</span><del>-#if !ASSERT_DISABLED
- , m_inInvalidateNodeListAndCollectionCaches(false)
-#endif
</del><span class="cx"> #if ENABLE(DASHBOARD_SUPPORT)
</span><span class="cx"> , m_hasAnnotatedRegions(false)
</span><span class="cx"> , m_annotatedRegionsDirty(false)
</span><span class="lines">@@ -4001,9 +3998,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> list.setRegisteredForInvalidationAtDocument(false);
</span><del>- ASSERT(m_inInvalidateNodeListAndCollectionCaches
- ? m_listsInvalidatedAtDocument.isEmpty()
- : m_listsInvalidatedAtDocument.contains(&list));
</del><ins>+ ASSERT(m_listsInvalidatedAtDocument.contains(&list));
</ins><span class="cx"> m_listsInvalidatedAtDocument.remove(&list);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/dom/Document.h (207211 => 207212)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/dom/Document.h 2016-10-12 08:41:54 UTC (rev 207211)
+++ branches/safari-602-branch/Source/WebCore/dom/Document.h 2016-10-12 08:41:58 UTC (rev 207212)
</span><span class="lines">@@ -1585,10 +1585,6 @@
</span><span class="cx">
</span><span class="cx"> HashSet<LiveNodeList*> m_listsInvalidatedAtDocument;
</span><span class="cx"> HashSet<HTMLCollection*> m_collectionsInvalidatedAtDocument;
</span><del>-#if !ASSERT_DISABLED
- bool m_inInvalidateNodeListAndCollectionCaches;
-#endif
-
</del><span class="cx"> unsigned m_nodeListAndCollectionCounts[numNodeListInvalidationTypes];
</span><span class="cx">
</span><span class="cx"> RefPtr<XPathEvaluator> m_xpathEvaluator;
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoredomNodecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/dom/Node.cpp (207211 => 207212)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/dom/Node.cpp 2016-10-12 08:41:54 UTC (rev 207211)
+++ branches/safari-602-branch/Source/WebCore/dom/Node.cpp 2016-10-12 08:41:58 UTC (rev 207212)
</span><span class="lines">@@ -814,19 +814,15 @@
</span><span class="cx">
</span><span class="cx"> void Document::invalidateNodeListAndCollectionCaches(const QualifiedName* attrName)
</span><span class="cx"> {
</span><del>-#if !ASSERT_DISABLED
- m_inInvalidateNodeListAndCollectionCaches = true;
-#endif
- HashSet<LiveNodeList*> lists = WTFMove(m_listsInvalidatedAtDocument);
- m_listsInvalidatedAtDocument.clear();
</del><ins>+ Vector<LiveNodeList*, 8> lists;
+ copyToVector(m_listsInvalidatedAtDocument, lists);
</ins><span class="cx"> for (auto* list : lists)
</span><span class="cx"> list->invalidateCacheForAttribute(attrName);
</span><del>- HashSet<HTMLCollection*> collections = WTFMove(m_collectionsInvalidatedAtDocument);
</del><ins>+
+ Vector<HTMLCollection*, 8> collections;
+ copyToVector(m_collectionsInvalidatedAtDocument, collections);
</ins><span class="cx"> for (auto* collection : collections)
</span><span class="cx"> collection->invalidateCacheForAttribute(attrName);
</span><del>-#if !ASSERT_DISABLED
- m_inInvalidateNodeListAndCollectionCaches = false;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Node::invalidateNodeListAndCollectionCachesInAncestors(const QualifiedName* attrName, Element* attributeOwnerElement)
</span></span></pre>
</div>
</div>
</body>
</html>