<!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>[178904] branches/safari-600.5-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/178904">178904</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-01-22 01:32:03 -0800 (Thu, 22 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/173688">r173688</a>. rdar://problem/19451277</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6005branchLayoutTestsChangeLog">branches/safari-600.5-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreChangeLog">branches/safari-600.5-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6005branchSourceWebCoredomSelectorQuerycpp">branches/safari-600.5-branch/Source/WebCore/dom/SelectorQuery.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6005branchLayoutTestsfastselectorsfilterrootnodewithselectorcontainsadjacentsexpectedtxt">branches/safari-600.5-branch/LayoutTests/fast/selectors/filter-root-node-with-selector-contains-adjacents-expected.txt</a></li>
<li><a href="#branchessafari6005branchLayoutTestsfastselectorsfilterrootnodewithselectorcontainsadjacentshtml">branches/safari-600.5-branch/LayoutTests/fast/selectors/filter-root-node-with-selector-contains-adjacents.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6005branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/LayoutTests/ChangeLog (178903 => 178904)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/LayoutTests/ChangeLog 2015-01-22 09:31:59 UTC (rev 178903)
+++ branches/safari-600.5-branch/LayoutTests/ChangeLog 2015-01-22 09:32:03 UTC (rev 178904)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2015-01-22 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r173688. rdar://problem/19451277
+
+ 2014-09-16 Yusuke Suzuki <utatane.tea@gmail.com>
+
+ filterRootById accidentally clears inAdjacentChain flag
+ https://bugs.webkit.org/show_bug.cgi?id=136851
+
+ Reviewed by Benjamin Poulain.
+
+ When SubSelector comes, `inAdjacentChain` flag is cleared to false.
+ So for example, `document.querySelector("span#id + ok")` doesn't work correctly.
+ In this patch, we handles SubSelector relation correctly; don't change `inAdjacentChain` flag
+ to filter the right search root node.
+
+ * fast/selectors/filter-root-node-with-selector-contains-adjacents-expected.txt: Added.
+ * fast/selectors/filter-root-node-with-selector-contains-adjacents.html: Added.
+
+2015-01-22 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r172797. rdar://problem/19451324
</span><span class="cx">
</span><span class="cx"> 2014-08-20 Zalan Bujtas <zalan@apple.com>
</span></span></pre></div>
<a id="branchessafari6005branchLayoutTestsfastselectorsfilterrootnodewithselectorcontainsadjacentsexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-600.5-branch/LayoutTests/fast/selectors/filter-root-node-with-selector-contains-adjacents-expected.txt (0 => 178904)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/LayoutTests/fast/selectors/filter-root-node-with-selector-contains-adjacents-expected.txt (rev 0)
+++ branches/safari-600.5-branch/LayoutTests/fast/selectors/filter-root-node-with-selector-contains-adjacents-expected.txt 2015-01-22 09:32:03 UTC (rev 178904)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+Test filtering the root nodes by leveraging #id inside selectors with adjacents.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS document.querySelectorAll("span#first + t1").length is 1
+PASS document.querySelectorAll("span#second ~ t2").length is 1
+PASS document.querySelectorAll("span#third + t3 > t4").length is 1
+PASS document.querySelectorAll("span#third + t3 > t5").length is 0
+PASS document.querySelectorAll("span#fourth t6 ~ t7").length is 3
+PASS document.querySelectorAll(".ok#first + t1").length is 1
+PASS document.querySelectorAll(".ok#second ~ t2").length is 1
+PASS document.querySelectorAll(".ok#third + t3 > t4").length is 1
+PASS document.querySelectorAll(".ok#third + t3 > t5").length is 0
+PASS document.querySelectorAll(".ok#fourth t6 ~ t7").length is 3
+PASS document.querySelectorAll("#first.ok + t1").length is 1
+PASS document.querySelectorAll("#second.ok ~ t2").length is 1
+PASS document.querySelectorAll("#third.ok + t3 > t4").length is 1
+PASS document.querySelectorAll("#third.ok + t3 > t5").length is 0
+PASS document.querySelectorAll("#fourth.ok t6 ~ t7").length is 3
+PASS document.querySelectorAll("span#first.ok + t1").length is 1
+PASS document.querySelectorAll("span#second.ok ~ t2").length is 1
+PASS document.querySelectorAll("span#third.ok + t3 > t4").length is 1
+PASS document.querySelectorAll("span#third.ok + t3 > t5").length is 0
+PASS document.querySelectorAll("span#fourth.ok t6 ~ t7").length is 3
+PASS document.querySelectorAll("span.ok#first + t1").length is 1
+PASS document.querySelectorAll("span.ok#second ~ t2").length is 1
+PASS document.querySelectorAll("span.ok#third + t3 > t4").length is 1
+PASS document.querySelectorAll("span.ok#third + t3 > t5").length is 0
+PASS document.querySelectorAll("span.ok#fourth t6 ~ t7").length is 3
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="branchessafari6005branchLayoutTestsfastselectorsfilterrootnodewithselectorcontainsadjacentshtml"></a>
<div class="addfile"><h4>Added: branches/safari-600.5-branch/LayoutTests/fast/selectors/filter-root-node-with-selector-contains-adjacents.html (0 => 178904)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/LayoutTests/fast/selectors/filter-root-node-with-selector-contains-adjacents.html (rev 0)
+++ branches/safari-600.5-branch/LayoutTests/fast/selectors/filter-root-node-with-selector-contains-adjacents.html 2015-01-22 09:32:03 UTC (rev 178904)
</span><span class="lines">@@ -0,0 +1,47 @@
</span><ins>+<!doctype html>
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body>
+<div style="display:none">
+ <span class="ok" id="first"></span>
+ <t1></t1>
+
+ <span class="ok" id="second"></span>
+ <t2></t2>
+
+ <span class="ok" id="third"></span>
+ <t3><t4></t4></t3>
+
+ <span class="ok" id="fourth">
+ <t6>
+ </t6>
+ <t7></t7>
+ <t7></t7>
+ <t7>
+ <t7></t7>
+ </t7>
+ </span>
+</div>
+</body>
+<script>
+description('Test filtering the root nodes by leveraging #id inside selectors with adjacents.');
+
+[
+ 'span$',
+ '.ok$',
+ '$.ok',
+ 'span$.ok',
+ 'span.ok$'
+].forEach(function (selector) {
+ shouldBe('document.querySelectorAll("' + selector.replace('$', '#first') + ' + t1").length', '1');
+ shouldBe('document.querySelectorAll("' + selector.replace('$', '#second') + ' ~ t2").length', '1');
+ shouldBe('document.querySelectorAll("' + selector.replace('$', '#third') + ' + t3 > t4").length', '1');
+ shouldBe('document.querySelectorAll("' + selector.replace('$', '#third') + ' + t3 > t5").length', '0');
+ shouldBe('document.querySelectorAll("' + selector.replace('$', '#fourth') + ' t6 ~ t7").length', '3');
+});
+
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</html>
</ins></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/ChangeLog (178903 => 178904)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/ChangeLog 2015-01-22 09:31:59 UTC (rev 178903)
+++ branches/safari-600.5-branch/Source/WebCore/ChangeLog 2015-01-22 09:32:03 UTC (rev 178904)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2015-01-22 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r173688. rdar://problem/19451277
+
+ 2014-09-16 Yusuke Suzuki <utatane.tea@gmail.com>
+
+ filterRootById accidentally clears inAdjacentChain flag
+ https://bugs.webkit.org/show_bug.cgi?id=136851
+
+ Reviewed by Benjamin Poulain.
+
+ Test: fast/selectors/filter-root-node-with-selector-contains-adjacents.html
+
+ * dom/SelectorQuery.cpp:
+ (WebCore::filterRootById):
+
+2015-01-22 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r172797. rdar://problem/19451324
</span><span class="cx">
</span><span class="cx"> 2014-08-20 Zalan Bujtas <zalan@apple.com>
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoredomSelectorQuerycpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/dom/SelectorQuery.cpp (178903 => 178904)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/dom/SelectorQuery.cpp 2015-01-22 09:31:59 UTC (rev 178903)
+++ branches/safari-600.5-branch/Source/WebCore/dom/SelectorQuery.cpp 2015-01-22 09:32:03 UTC (rev 178904)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2011, 2013, 2014 Apple Inc. All rights reserved.
</span><ins>+ * Copyright (C) 2014 Yusuke Suzuki <utatane.tea@gmail.com>
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -251,6 +252,8 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+ if (selector->relation() == CSSSelector::SubSelector)
+ continue;
</ins><span class="cx"> if (selector->relation() == CSSSelector::DirectAdjacent || selector->relation() == CSSSelector::IndirectAdjacent)
</span><span class="cx"> inAdjacentChain = true;
</span><span class="cx"> else
</span><span class="lines">@@ -494,7 +497,7 @@
</span><span class="cx"> const int maximumSelectorQueryCacheSize = 256;
</span><span class="cx"> if (m_entries.size() == maximumSelectorQueryCacheSize)
</span><span class="cx"> m_entries.remove(m_entries.begin());
</span><del>-
</del><ins>+
</ins><span class="cx"> return m_entries.add(selectors, std::make_unique<SelectorQuery>(WTF::move(selectorList))).iterator->value.get();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>