<!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>[173732] branches/safari-600.1.4.11-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/173732">173732</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2014-09-18 14:26:32 -0700 (Thu, 18 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge patch for <rdar://problem/18382131>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001411branchLayoutTestsChangeLog">branches/safari-600.1.4.11-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari6001411branchLayoutTestsfastselectorsnthchildwithbacktrackingexpectedtxt">branches/safari-600.1.4.11-branch/LayoutTests/fast/selectors/nth-child-with-backtracking-expected.txt</a></li>
<li><a href="#branchessafari6001411branchLayoutTestsfastselectorsnthchildwithbacktrackinghtml">branches/safari-600.1.4.11-branch/LayoutTests/fast/selectors/nth-child-with-backtracking.html</a></li>
<li><a href="#branchessafari6001411branchSourceWebCoreChangeLog">branches/safari-600.1.4.11-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001411branchSourceWebCorecssjitSelectorCompilercpp">branches/safari-600.1.4.11-branch/Source/WebCore/cssjit/SelectorCompiler.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001411branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.11-branch/LayoutTests/ChangeLog (173731 => 173732)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.11-branch/LayoutTests/ChangeLog 2014-09-18 19:47:55 UTC (rev 173731)
+++ branches/safari-600.1.4.11-branch/LayoutTests/ChangeLog 2014-09-18 21:26:32 UTC (rev 173732)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-09-18 Babak Shafiei <bshafiei@apple.com>
+
+ Merge patch for <rdar://problem/18382131>.
+
+ 2014-09-18 Benjamin Poulain <bpoulain@apple.com>
+
+ CSS JIT: The backtracking register can be ignored from the minimumRegisterRequirements
+ https://bugs.webkit.org/show_bug.cgi?id=136906
+ rdar://problem/18368294
+
+ Reviewed by Darin Adler.
+
+ * fast/selectors/nth-child-with-backtracking-expected.txt:
+ * fast/selectors/nth-child-with-backtracking.html:
+ The use case is well covered by existing tests. This is updating the backtracking test
+ with a simpler selector similar to the one in the bug report.
+
</ins><span class="cx"> 2014-08-18 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r172213.
</span></span></pre></div>
<a id="branchessafari6001411branchLayoutTestsfastselectorsnthchildwithbacktrackingexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.11-branch/LayoutTests/fast/selectors/nth-child-with-backtracking-expected.txt (173731 => 173732)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.11-branch/LayoutTests/fast/selectors/nth-child-with-backtracking-expected.txt 2014-09-18 19:47:55 UTC (rev 173731)
+++ branches/safari-600.1.4.11-branch/LayoutTests/fast/selectors/nth-child-with-backtracking-expected.txt 2014-09-18 21:26:32 UTC (rev 173732)
</span><span class="lines">@@ -9,6 +9,8 @@
</span><span class="cx"> PASS document.querySelectorAll("ul>[foo=bar]:nth-child(-3n+3)+li+li+li~li+li+li~li>span.first>span.second a").length is 11
</span><span class="cx"> PASS allLinks.length is 20
</span><span class="cx"> PASS backgroundColoredCount is 11
</span><ins>+PASS document.querySelectorAll("ul>:nth-child(-3n+3)>*>* a").length is 1
+PASS nonOpaqueCount is 1
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="branchessafari6001411branchLayoutTestsfastselectorsnthchildwithbacktrackinghtml"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.11-branch/LayoutTests/fast/selectors/nth-child-with-backtracking.html (173731 => 173732)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.11-branch/LayoutTests/fast/selectors/nth-child-with-backtracking.html 2014-09-18 19:47:55 UTC (rev 173731)
+++ branches/safari-600.1.4.11-branch/LayoutTests/fast/selectors/nth-child-with-backtracking.html 2014-09-18 21:26:32 UTC (rev 173732)
</span><span class="lines">@@ -9,6 +9,9 @@
</span><span class="cx"> ul>[foo=bar]:nth-child(-3n+3)+li+li+li~li+li+li~li>span.first>span.second a {
</span><span class="cx"> background-color:rgb(1,2,3);
</span><span class="cx"> }
</span><ins>+ul>:nth-child(-3n+3)>*>* a {
+ opacity: 0.5;
+}
</ins><span class="cx"> </style>
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><span class="lines">@@ -57,12 +60,18 @@
</span><span class="cx"> var allLinks = document.querySelectorAll('a');
</span><span class="cx"> shouldBe('allLinks.length', '20');
</span><span class="cx"> var backgroundColoredCount = 0;
</span><ins>+var nonOpaqueCount = 0;
</ins><span class="cx"> for (var i = 0; i < allLinks.length; ++i) {
</span><del>- if (getComputedStyle(allLinks[i]).backgroundColor === 'rgb(1, 2, 3)')
</del><ins>+ var computedStyle = getComputedStyle(allLinks[i]);
+ if (computedStyle.backgroundColor === 'rgb(1, 2, 3)')
</ins><span class="cx"> backgroundColoredCount++;
</span><ins>+ if (computedStyle.opacity === '0.5')
+ ++nonOpaqueCount;
</ins><span class="cx"> }
</span><span class="cx"> shouldBe('backgroundColoredCount', '11');
</span><span class="cx">
</span><ins>+shouldBe('document.querySelectorAll("ul>:nth-child(-3n+3)>*>* a").length', '1');
+shouldBe('nonOpaqueCount', '1');
</ins><span class="cx"> </script>
</span><span class="cx"> <script src="../../resources/js-test-post.js"></script>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="branchessafari6001411branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.11-branch/Source/WebCore/ChangeLog (173731 => 173732)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.11-branch/Source/WebCore/ChangeLog 2014-09-18 19:47:55 UTC (rev 173731)
+++ branches/safari-600.1.4.11-branch/Source/WebCore/ChangeLog 2014-09-18 21:26:32 UTC (rev 173732)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2014-09-18 Babak Shafiei <bshafiei@apple.com>
+
+ Merge patch for <rdar://problem/18382131>.
+
+ 2014-09-18 Benjamin Poulain <bpoulain@apple.com>
+
+ CSS JIT: The backtracking register can be ignored from the minimumRegisterRequirements
+ https://bugs.webkit.org/show_bug.cgi?id=136906
+ rdar://problem/18368294
+
+ Reviewed by Darin Adler.
+
+ This patch is for WebKit branches that do not include r173229.
+
+ * cssjit/SelectorCompiler.cpp:
+ (WebCore::SelectorCompiler::minimumRegisterRequirements):
+ In the worst case, the nth-child() filter can take up to 6 registers:
+ 1) currentElement, the state register.
+ 2) parentElement for tree marking on style resolution.
+ 3) elementCounter to count elements pior to current.
+ 4) previousSibling when walking the previous siblings.
+ 5) elementRareData to access the index cache.
+ 6) cachedChildIndex, the value of the index cache.
+
+ If the backtracking register is also used, the total of "in-flight" registers is 7,
+ one more than "minimumRequiredRegisterCount". This needs to be taken into account
+ in minimumRegisterRequirements() or we will run out of registers when hitting the worst case.
+
</ins><span class="cx"> 2014-09-15 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> <rdar://problem/18327341> Disable Web Timing on this branch.
</span></span></pre></div>
<a id="branchessafari6001411branchSourceWebCorecssjitSelectorCompilercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.11-branch/Source/WebCore/cssjit/SelectorCompiler.cpp (173731 => 173732)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.11-branch/Source/WebCore/cssjit/SelectorCompiler.cpp 2014-09-18 19:47:55 UTC (rev 173731)
+++ branches/safari-600.1.4.11-branch/Source/WebCore/cssjit/SelectorCompiler.cpp 2014-09-18 21:26:32 UTC (rev 173732)
</span><span class="lines">@@ -679,6 +679,9 @@
</span><span class="cx"> // Element + ElementData + scratchRegister + attributeArrayPointer + expectedLocalName + (qualifiedNameImpl && expectedValue).
</span><span class="cx"> static const unsigned minimumRequiredRegisterCountForAttributeFilter = 6;
</span><span class="cx">
</span><ins>+// Element + parentElement + elementCounter + previousSibling + elementRareData + cachedChildIndex.
+static const unsigned minimumRequiredRegisterCountForNthChildFilter = 6;
+
</ins><span class="cx"> static inline unsigned minimumRegisterRequirements(const SelectorFragment& selectorFragment)
</span><span class="cx"> {
</span><span class="cx"> unsigned minimum = minimumRequiredRegisterCount;
</span><span class="lines">@@ -705,6 +708,9 @@
</span><span class="cx"> minimum = std::max(minimum, attributeMinimum);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (!selectorFragment.nthChildFilters.isEmpty())
+ minimum = std::max(minimum, minimumRequiredRegisterCountForNthChildFilter + backtrackingRegisterRequirements);
+
</ins><span class="cx"> // :not pseudo class filters cause some register pressure.
</span><span class="cx"> for (const SelectorFragment& subFragment : selectorFragment.notFilters) {
</span><span class="cx"> unsigned notFilterMinimum = minimumRegisterRequirements(subFragment) + backtrackingRegisterRequirements;
</span></span></pre>
</div>
</div>
</body>
</html>