<!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>[169298] trunk</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/169298">169298</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-05-23 19:11:17 -0700 (Fri, 23 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>CSS JIT: Apply backtracking optimization to adjacent backtracking
https://bugs.webkit.org/show_bug.cgi?id=132951
Patch by Yusuke Suzuki <utatane.tea@gmail.com> on 2014-05-23
Reviewed by Benjamin Poulain.
Apply the backtracking optimization to the adjacent backtracking.
This optimization is already done for the descendant backtracking.
We apply this to the adjacent backtracking similarly.
Source/WebCore:
Test: fast/selectors/backtracking-adjacent-optimized.html
* cssjit/SelectorCompiler.cpp:
(WebCore::SelectorCompiler::SelectorFragment::SelectorFragment):
(WebCore::SelectorCompiler::solveAdjacentBacktrackingActionForDirectAdjacent):
(WebCore::SelectorCompiler::solveBacktrackingAction):
(WebCore::SelectorCompiler::computeBacktrackingStartOffsetInChain):
(WebCore::SelectorCompiler::computeBacktrackingHeightFromDescendant):
(WebCore::SelectorCompiler::computeBacktrackingWidthFromIndirectAdjacent):
(WebCore::SelectorCompiler::SelectorCodeGenerator::computeBacktrackingInformation):
(WebCore::SelectorCompiler::SelectorCodeGenerator::generateIndirectAdjacentTreeWalker):
(WebCore::SelectorCompiler::SelectorCodeGenerator::linkFailures):
(WebCore::SelectorCompiler::computeBacktrackingStartHeightFromDescendant): Deleted.
LayoutTests:
* fast/selectors/backtracking-adjacent-optimized-expected.txt: Added.
* fast/selectors/backtracking-adjacent-optimized.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssjitSelectorCompilercpp">trunk/Source/WebCore/cssjit/SelectorCompiler.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastselectorsbacktrackingadjacentoptimizedexpectedtxt">trunk/LayoutTests/fast/selectors/backtracking-adjacent-optimized-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastselectorsbacktrackingadjacentoptimizedhtml">trunk/LayoutTests/fast/selectors/backtracking-adjacent-optimized.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (169297 => 169298)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-05-24 01:06:16 UTC (rev 169297)
+++ trunk/LayoutTests/ChangeLog 2014-05-24 02:11:17 UTC (rev 169298)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-05-23 Yusuke Suzuki <utatane.tea@gmail.com>
+
+ CSS JIT: Apply backtracking optimization to adjacent backtracking
+ https://bugs.webkit.org/show_bug.cgi?id=132951
+
+ Reviewed by Benjamin Poulain.
+
+ Apply the backtracking optimization to the adjacent backtracking.
+ This optimization is already done for the descendant backtracking.
+ We apply this to the adjacent backtracking similarly.
+
+ * fast/selectors/backtracking-adjacent-optimized-expected.txt: Added.
+ * fast/selectors/backtracking-adjacent-optimized.html: Added.
+
</ins><span class="cx"> 2014-05-23 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Rebaseline two tests affected by r169229.
</span></span></pre></div>
<a id="trunkLayoutTestsfastselectorsbacktrackingadjacentoptimizedexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/selectors/backtracking-adjacent-optimized-expected.txt (0 => 169298)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/selectors/backtracking-adjacent-optimized-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/selectors/backtracking-adjacent-optimized-expected.txt 2014-05-24 02:11:17 UTC (rev 169298)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+The backtracking from direct adjacent combinators
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Backtracking as JumpToIndirectAdjacentEntryPoint
+PASS getComputedStyle(document.getElementById("target1")).backgroundColor is "rgb(1, 2, 3)"
+Backtracking as JumpToIndirectAdjacentEntryPoint and failed
+PASS getComputedStyle(document.getElementById("target2")).backgroundColor is "rgb(0, 0, 0)"
+Backtracking as JumpToIndirectAdjacentTreeWalkerEntryPoint
+PASS getComputedStyle(document.getElementById("target3")).backgroundColor is "rgb(1, 2, 3)"
+Backtracking as JumpToIndirectAdjacentTreeWalkerEntryPoint and failed
+PASS getComputedStyle(document.getElementById("target4")).backgroundColor is "rgb(0, 0, 0)"
+Backtracking with tail
+PASS getComputedStyle(document.getElementById("target5")).backgroundColor is "rgb(4, 5, 6)"
+Backtracking with tail and failed
+PASS getComputedStyle(document.getElementById("target6")).backgroundColor is "rgb(0, 0, 0)"
+Backtracking with tail
+PASS getComputedStyle(document.getElementById("target7")).backgroundColor is "rgb(4, 5, 6)"
+Backtracking with tail
+PASS getComputedStyle(document.getElementById("target8")).backgroundColor is "rgb(4, 5, 6)"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastselectorsbacktrackingadjacentoptimizedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/selectors/backtracking-adjacent-optimized.html (0 => 169298)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/selectors/backtracking-adjacent-optimized.html (rev 0)
+++ trunk/LayoutTests/fast/selectors/backtracking-adjacent-optimized.html 2014-05-24 02:11:17 UTC (rev 169298)
</span><span class="lines">@@ -0,0 +1,155 @@
</span><ins>+<!doctype html>
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+<style>
+span.target {
+ background-color:rgb(0,0,0);
+}
+
+a.ok+a~b span.target {
+ background-color:rgb(1,2,3);
+}
+
+e.ok+c.ok+c.ok+c~d span.target {
+ background-color:rgb(4,5,6);
+}
+</style>
+</head>
+<body>
+<div style="display:none">
+ <!-- a.ok+a~b span.target -->
+ <target1>
+ <a class="ok"></a> <!-- Matched. -->
+ <a class="ng"></a> <!-- Failed. And backtrack from here. -->
+ <a class="ng"></a> <!-- Failed. And backtrack from here. -->
+ <a class="ng"></a> <!-- Failed. And backtrack from here. -->
+ <a class="ng"></a> <!-- Failed. And backtrack from here. -->
+ <a class="ng"></a> <!-- Failed. And backtrack from here. -->
+ <a class="ng"></a> <!-- Failed. And backtrack from here. -->
+ <a class="ng"></a> <!-- Failed. And backtrack from here. -->
+ <a class="ng"></a> <!-- Failed. And backtrack from here. -->
+ <a class="ng"></a> <!-- Failed. And backtrack from here. -->
+ <a class="ng"></a> <!-- Failed. And backtrack from here. -->
+ <a class="ng"></a> <!-- Failed. And backtrack from here. -->
+ <a class="ng"></a> <!-- Failed. And backtrack from here. -->
+ <a class="ng"></a> <!-- Failed. And backtrack from here. -->
+ <a></a>
+ <b>
+ <span class="target" id="target1"></span>
+ </b>
+ </target1>
+
+ <!-- a.ok+a~b span.target -->
+ <target2>
+ <a class="ng"></a> <!-- Failed.-->
+ <a class="ng"></a> <!-- Failed. And backtrack from here. -->
+ <a></a>
+ <b>
+ <span class="target" id="target2"></span>
+ </b>
+ </target2>
+
+ <!-- a.ok+a~b span.target -->
+ <target3>
+ <a class="ok"></a> <!-- Matched. -->
+ <a></a>
+ <b></b> <!-- Failed. And backtrack from here + 1. -->
+ <a></a>
+ <b>
+ <span class="target" id="target3"></span>
+ </b>
+ </target3>
+
+ <!-- a.ok+a~b span.target -->
+ <target4>
+ <a class="ng"></a> <!-- Failed. -->
+ <a></a>
+ <b></b> <!-- Failed. And backtrack from here + 1. -->
+ <a></a>
+ <b>
+ <span class="target" id="target4"></span>
+ </b>
+ </target4>
+
+ <!-- e.ok+c.ok+c.ok+c~d span.target -->
+ <target5>
+ <e class="ok"></e> <!-- Matched. -->
+ <c class="ok"></c> <!-- Failed. And backtrack with tail. -->
+ <c class="ok"></c>
+ <c class="ok"></c>
+ <c class="ok"></c>
+ <d>
+ <span class="target" id="target5"></span>
+ </d>
+ </target5>
+
+ <!-- e.ok+c.ok+c.ok+c~d span.target -->
+ <target6>
+ <e class="ng"></e> <!-- Failed. -->
+ <c class="ok"></c> <!-- Failed. And backtrack with tail. -->
+ <c class="ok"></c>
+ <c class="ok"></c>
+ <c class="ok"></c>
+ <d>
+ <span class="target" id="target6"></span>
+ </d>
+ </target6>
+
+ <!-- e.ok+c.ok+c.ok+c~d span.target -->
+ <target7>
+ <e class="ok"></e> <!-- Matched. -->
+ <c class="ok"></c>
+ <c class="ok"></c>
+ <c class="ok"></c>
+ <c class="ng"></c> <!-- Failed. And backtrack with tail. -->
+ <c></c>
+ <d>
+ <span class="target" id="target7"></span>
+ </d>
+ </target7>
+
+ <!-- e.ok+c.ok+c.ok+c~d span.target -->
+ <target8>
+ <e class="ok"></e> <!-- Matched. -->
+ <c class="ok"></c>
+ <c class="ok"></c>
+ <c class="ng"></c> <!-- Failed. And backtrack with tail. -->
+ <c class="ok"></c>
+ <c></c>
+ <d>
+ <span class="target" id="target8"></span>
+ </d>
+ </target8>
+</div>
+</body>
+<script>
+description('The backtracking from direct adjacent combinators');
+
+debug("Backtracking as JumpToIndirectAdjacentEntryPoint");
+shouldBeEqualToString('getComputedStyle(document.getElementById("target1")).backgroundColor', 'rgb(1, 2, 3)');
+
+debug("Backtracking as JumpToIndirectAdjacentEntryPoint and failed");
+shouldBeEqualToString('getComputedStyle(document.getElementById("target2")).backgroundColor', 'rgb(0, 0, 0)');
+
+debug("Backtracking as JumpToIndirectAdjacentTreeWalkerEntryPoint");
+shouldBeEqualToString('getComputedStyle(document.getElementById("target3")).backgroundColor', 'rgb(1, 2, 3)');
+
+debug("Backtracking as JumpToIndirectAdjacentTreeWalkerEntryPoint and failed");
+shouldBeEqualToString('getComputedStyle(document.getElementById("target4")).backgroundColor', 'rgb(0, 0, 0)');
+
+debug("Backtracking with tail");
+shouldBeEqualToString('getComputedStyle(document.getElementById("target5")).backgroundColor', 'rgb(4, 5, 6)');
+
+debug("Backtracking with tail and failed");
+shouldBeEqualToString('getComputedStyle(document.getElementById("target6")).backgroundColor', 'rgb(0, 0, 0)');
+
+debug("Backtracking with tail");
+shouldBeEqualToString('getComputedStyle(document.getElementById("target7")).backgroundColor', 'rgb(4, 5, 6)');
+
+debug("Backtracking with tail");
+shouldBeEqualToString('getComputedStyle(document.getElementById("target8")).backgroundColor', 'rgb(4, 5, 6)');
+
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169297 => 169298)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-24 01:06:16 UTC (rev 169297)
+++ trunk/Source/WebCore/ChangeLog 2014-05-24 02:11:17 UTC (rev 169298)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2014-05-23 Yusuke Suzuki <utatane.tea@gmail.com>
+
+ CSS JIT: Apply backtracking optimization to adjacent backtracking
+ https://bugs.webkit.org/show_bug.cgi?id=132951
+
+ Reviewed by Benjamin Poulain.
+
+ Apply the backtracking optimization to the adjacent backtracking.
+ This optimization is already done for the descendant backtracking.
+ We apply this to the adjacent backtracking similarly.
+
+ Test: fast/selectors/backtracking-adjacent-optimized.html
+
+ * cssjit/SelectorCompiler.cpp:
+ (WebCore::SelectorCompiler::SelectorFragment::SelectorFragment):
+ (WebCore::SelectorCompiler::solveAdjacentBacktrackingActionForDirectAdjacent):
+ (WebCore::SelectorCompiler::solveBacktrackingAction):
+ (WebCore::SelectorCompiler::computeBacktrackingStartOffsetInChain):
+ (WebCore::SelectorCompiler::computeBacktrackingHeightFromDescendant):
+ (WebCore::SelectorCompiler::computeBacktrackingWidthFromIndirectAdjacent):
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::computeBacktrackingInformation):
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::generateIndirectAdjacentTreeWalker):
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::linkFailures):
+ (WebCore::SelectorCompiler::computeBacktrackingStartHeightFromDescendant): Deleted.
+
</ins><span class="cx"> 2014-05-23 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Make CSS JIT run on ARM64.
</span></span></pre></div>
<a id="trunkSourceWebCorecssjitSelectorCompilercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/cssjit/SelectorCompiler.cpp (169297 => 169298)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/cssjit/SelectorCompiler.cpp 2014-05-24 01:06:16 UTC (rev 169297)
+++ trunk/Source/WebCore/cssjit/SelectorCompiler.cpp 2014-05-24 02:11:17 UTC (rev 169298)
</span><span class="lines">@@ -64,6 +64,7 @@
</span><span class="cx"> JumpToDescendantEntryPoint,
</span><span class="cx"> JumpToIndirectAdjacentEntryPoint,
</span><span class="cx"> JumpToDescendantTreeWalkerEntryPoint,
</span><ins>+ JumpToIndirectAdjacentTreeWalkerEntryPoint,
</ins><span class="cx"> JumpToDescendantTail,
</span><span class="cx"> JumpToDirectAdjacentTail
</span><span class="cx"> };
</span><span class="lines">@@ -112,6 +113,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> static const unsigned invalidHeight = std::numeric_limits<unsigned>::max();
</span><ins>+static const unsigned invalidWidth = std::numeric_limits<unsigned>::max();
</ins><span class="cx">
</span><span class="cx"> struct SelectorFragment {
</span><span class="cx"> SelectorFragment()
</span><span class="lines">@@ -122,6 +124,9 @@
</span><span class="cx"> , tagNameMatchedBacktrackingStartHeightFromDescendant(invalidHeight)
</span><span class="cx"> , tagNameNotMatchedBacktrackingStartHeightFromDescendant(invalidHeight)
</span><span class="cx"> , heightFromDescendant(0)
</span><ins>+ , tagNameMatchedBacktrackingStartWidthFromIndirectAdjacent(invalidWidth)
+ , tagNameNotMatchedBacktrackingStartWidthFromIndirectAdjacent(invalidWidth)
+ , widthFromIndirectAdjacent(0)
</ins><span class="cx"> , tagName(nullptr)
</span><span class="cx"> , id(nullptr)
</span><span class="cx"> {
</span><span class="lines">@@ -136,6 +141,9 @@
</span><span class="cx"> unsigned tagNameMatchedBacktrackingStartHeightFromDescendant;
</span><span class="cx"> unsigned tagNameNotMatchedBacktrackingStartHeightFromDescendant;
</span><span class="cx"> unsigned heightFromDescendant;
</span><ins>+ unsigned tagNameMatchedBacktrackingStartWidthFromIndirectAdjacent;
+ unsigned tagNameNotMatchedBacktrackingStartWidthFromIndirectAdjacent;
+ unsigned widthFromIndirectAdjacent;
</ins><span class="cx">
</span><span class="cx"> const QualifiedName* tagName;
</span><span class="cx"> const AtomicString* id;
</span><span class="lines">@@ -240,6 +248,7 @@
</span><span class="cx"> Assembler::Label m_descendantEntryPoint;
</span><span class="cx"> Assembler::Label m_indirectAdjacentEntryPoint;
</span><span class="cx"> Assembler::Label m_descendantTreeWalkerBacktrackingPoint;
</span><ins>+ Assembler::Label m_indirectAdjacentTreeWalkerBacktrackingPoint;
</ins><span class="cx"> Assembler::RegisterID m_descendantBacktrackingStart;
</span><span class="cx"> Assembler::JumpList m_descendantBacktrackingFailureCases;
</span><span class="cx"> StackAllocator::StackReference m_adjacentBacktrackingStart;
</span><span class="lines">@@ -611,6 +620,23 @@
</span><span class="cx"> return BacktrackingAction::JumpToDescendantTail;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static inline BacktrackingAction solveAdjacentBacktrackingActionForDirectAdjacent(const SelectorFragment& fragment, unsigned backtrackingStartWidthFromIndirectAdjacent)
+{
+ // If width is invalid (e.g. There's no tag name).
+ if (backtrackingStartWidthFromIndirectAdjacent == invalidWidth)
+ return BacktrackingAction::NoBacktracking;
+
+ // Start backtracking from the current element.
+ if (backtrackingStartWidthFromIndirectAdjacent == fragment.widthFromIndirectAdjacent)
+ return BacktrackingAction::JumpToIndirectAdjacentEntryPoint;
+
+ // Start backtracking from the previous adjacent of current element.
+ if (backtrackingStartWidthFromIndirectAdjacent == (fragment.widthFromIndirectAdjacent + 1))
+ return BacktrackingAction::JumpToIndirectAdjacentTreeWalkerEntryPoint;
+
+ return BacktrackingAction::JumpToDirectAdjacentTail;
+}
+
</ins><span class="cx"> static inline BacktrackingAction solveAdjacentTraversalBacktrackingAction(const SelectorFragment& fragment, bool hasDescendantRelationOnTheRight)
</span><span class="cx"> {
</span><span class="cx"> if (!hasDescendantRelationOnTheRight)
</span><span class="lines">@@ -622,7 +648,7 @@
</span><span class="cx"> return BacktrackingAction::JumpToDescendantTail;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline void solveBacktrackingAction(SelectorFragment& fragment, bool hasDescendantRelationOnTheRight, bool hasIndirectAdjacentRelationOnTheRightOfDirectAdjacentChain, unsigned adjacentPositionSinceIndirectAdjacentTreeWalk)
</del><ins>+static inline void solveBacktrackingAction(SelectorFragment& fragment, bool hasDescendantRelationOnTheRight, bool hasIndirectAdjacentRelationOnTheRightOfDirectAdjacentChain)
</ins><span class="cx"> {
</span><span class="cx"> switch (fragment.relationToRightFragment) {
</span><span class="cx"> case FragmentRelation::Rightmost:
</span><span class="lines">@@ -643,13 +669,8 @@
</span><span class="cx"> // If the rightmost relation is a indirect adjacent, matching sould resume from there.
</span><span class="cx"> // Otherwise, we resume from the latest ancestor/descendant if any.
</span><span class="cx"> if (hasIndirectAdjacentRelationOnTheRightOfDirectAdjacentChain) {
</span><del>- if (isFirstAdjacent(adjacentPositionSinceIndirectAdjacentTreeWalk)) {
- fragment.matchingTagNameBacktrackingAction = BacktrackingAction::JumpToIndirectAdjacentEntryPoint;
- fragment.matchingPostTagNameBacktrackingAction = BacktrackingAction::JumpToIndirectAdjacentEntryPoint;
- } else {
- fragment.matchingTagNameBacktrackingAction = BacktrackingAction::JumpToDirectAdjacentTail;
- fragment.matchingPostTagNameBacktrackingAction = BacktrackingAction::JumpToDirectAdjacentTail;
- }
</del><ins>+ fragment.matchingTagNameBacktrackingAction = solveAdjacentBacktrackingActionForDirectAdjacent(fragment, fragment.tagNameNotMatchedBacktrackingStartWidthFromIndirectAdjacent);
+ fragment.matchingPostTagNameBacktrackingAction = solveAdjacentBacktrackingActionForDirectAdjacent(fragment, fragment.tagNameMatchedBacktrackingStartWidthFromIndirectAdjacent);
</ins><span class="cx"> } else if (hasDescendantRelationOnTheRight) {
</span><span class="cx"> // Since we resume from the latest ancestor/descendant, the action is the same as the traversal action.
</span><span class="cx"> fragment.matchingTagNameBacktrackingAction = fragment.traversalBacktrackingAction;
</span><span class="lines">@@ -714,8 +735,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Find the largest matching prefix from already known tagNames.
</span><del>-// And by using this, compute an appropriate height of backtracking start element from the closest descendant.
-static inline unsigned computeBacktrackingStartHeightFromDescendant(const TagNameList& tagNames, unsigned maxPrefixSize)
</del><ins>+// And by using this, compute an appropriate height of backtracking start element from the closest base element in the chain.
+static inline unsigned computeBacktrackingStartOffsetInChain(const TagNameList& tagNames, unsigned maxPrefixSize)
</ins><span class="cx"> {
</span><span class="cx"> RELEASE_ASSERT(!tagNames.isEmpty());
</span><span class="cx"> RELEASE_ASSERT(maxPrefixSize < tagNames.size());
</span><span class="lines">@@ -738,54 +759,92 @@
</span><span class="cx"> return tagNames.size();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline void computeBacktrackingHeightFromDescendant(SelectorFragment& fragment, TagNameList& tagNames, bool hasDescendantRelationOnTheRight, const SelectorFragment*& previousChildFragmentInDescendantBacktrackingChain)
</del><ins>+static inline void computeBacktrackingHeightFromDescendant(SelectorFragment& fragment, TagNameList& tagNamesForChildChain, bool hasDescendantRelationOnTheRight, const SelectorFragment*& previousChildFragmentInChildChain)
</ins><span class="cx"> {
</span><span class="cx"> if (!hasDescendantRelationOnTheRight)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (fragment.relationToRightFragment == FragmentRelation::Descendant) {
</span><del>- tagNames.clear();
</del><ins>+ tagNamesForChildChain.clear();
</ins><span class="cx">
</span><span class="cx"> TagNamePattern pattern;
</span><span class="cx"> pattern.tagName = fragment.tagName;
</span><del>- tagNames.append(pattern);
</del><ins>+ tagNamesForChildChain.append(pattern);
</ins><span class="cx"> fragment.heightFromDescendant = 0;
</span><del>- previousChildFragmentInDescendantBacktrackingChain = nullptr;
</del><ins>+ previousChildFragmentInChildChain = nullptr;
</ins><span class="cx"> } else if (fragment.relationToRightFragment == FragmentRelation::Child) {
</span><span class="cx"> TagNamePattern pattern;
</span><span class="cx"> pattern.tagName = fragment.tagName;
</span><del>- tagNames.append(pattern);
</del><ins>+ tagNamesForChildChain.append(pattern);
</ins><span class="cx">
</span><del>- unsigned maxPrefixSize = tagNames.size() - 1;
- if (previousChildFragmentInDescendantBacktrackingChain) {
- RELEASE_ASSERT(tagNames.size() >= previousChildFragmentInDescendantBacktrackingChain->tagNameMatchedBacktrackingStartHeightFromDescendant);
- maxPrefixSize = tagNames.size() - previousChildFragmentInDescendantBacktrackingChain->tagNameMatchedBacktrackingStartHeightFromDescendant;
</del><ins>+ unsigned maxPrefixSize = tagNamesForChildChain.size() - 1;
+ if (previousChildFragmentInChildChain) {
+ RELEASE_ASSERT(tagNamesForChildChain.size() >= previousChildFragmentInChildChain->tagNameMatchedBacktrackingStartHeightFromDescendant);
+ maxPrefixSize = tagNamesForChildChain.size() - previousChildFragmentInChildChain->tagNameMatchedBacktrackingStartHeightFromDescendant;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (pattern.tagName) {
</span><span class="cx"> // Compute height from descendant in the case that tagName is not matched.
</span><del>- tagNames.last().inverted = true;
- fragment.tagNameNotMatchedBacktrackingStartHeightFromDescendant = computeBacktrackingStartHeightFromDescendant(tagNames, maxPrefixSize);
</del><ins>+ tagNamesForChildChain.last().inverted = true;
+ fragment.tagNameNotMatchedBacktrackingStartHeightFromDescendant = computeBacktrackingStartOffsetInChain(tagNamesForChildChain, maxPrefixSize);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Compute height from descendant in the case that tagName is matched.
</span><del>- tagNames.last().inverted = false;
- fragment.tagNameMatchedBacktrackingStartHeightFromDescendant = computeBacktrackingStartHeightFromDescendant(tagNames, maxPrefixSize);
- fragment.heightFromDescendant = tagNames.size() - 1;
- previousChildFragmentInDescendantBacktrackingChain = &fragment;
</del><ins>+ tagNamesForChildChain.last().inverted = false;
+ fragment.tagNameMatchedBacktrackingStartHeightFromDescendant = computeBacktrackingStartOffsetInChain(tagNamesForChildChain, maxPrefixSize);
+ fragment.heightFromDescendant = tagNamesForChildChain.size() - 1;
+ previousChildFragmentInChildChain = &fragment;
</ins><span class="cx"> } else {
</span><del>- if (previousChildFragmentInDescendantBacktrackingChain) {
- fragment.tagNameNotMatchedBacktrackingStartHeightFromDescendant = previousChildFragmentInDescendantBacktrackingChain->tagNameNotMatchedBacktrackingStartHeightFromDescendant;
- fragment.tagNameMatchedBacktrackingStartHeightFromDescendant = previousChildFragmentInDescendantBacktrackingChain->tagNameMatchedBacktrackingStartHeightFromDescendant;
- fragment.heightFromDescendant = previousChildFragmentInDescendantBacktrackingChain->heightFromDescendant;
</del><ins>+ if (previousChildFragmentInChildChain) {
+ fragment.tagNameNotMatchedBacktrackingStartHeightFromDescendant = previousChildFragmentInChildChain->tagNameNotMatchedBacktrackingStartHeightFromDescendant;
+ fragment.tagNameMatchedBacktrackingStartHeightFromDescendant = previousChildFragmentInChildChain->tagNameMatchedBacktrackingStartHeightFromDescendant;
+ fragment.heightFromDescendant = previousChildFragmentInChildChain->heightFromDescendant;
</ins><span class="cx"> } else {
</span><del>- fragment.tagNameNotMatchedBacktrackingStartHeightFromDescendant = tagNames.size();
- fragment.tagNameMatchedBacktrackingStartHeightFromDescendant = tagNames.size();
</del><ins>+ fragment.tagNameNotMatchedBacktrackingStartHeightFromDescendant = tagNamesForChildChain.size();
+ fragment.tagNameMatchedBacktrackingStartHeightFromDescendant = tagNamesForChildChain.size();
</ins><span class="cx"> fragment.heightFromDescendant = 0;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static inline void computeBacktrackingWidthFromIndirectAdjacent(SelectorFragment& fragment, TagNameList& tagNamesForDirectAdjacentChain, bool hasIndirectAdjacentRelationOnTheRightOfDirectAdjacentChain, const SelectorFragment*& previousDirectAdjacentFragmentInDirectAdjacentChain)
+{
+ if (!hasIndirectAdjacentRelationOnTheRightOfDirectAdjacentChain)
+ return;
+
+ if (fragment.relationToRightFragment == FragmentRelation::IndirectAdjacent) {
+ tagNamesForDirectAdjacentChain.clear();
+
+ TagNamePattern pattern;
+ pattern.tagName = fragment.tagName;
+ tagNamesForDirectAdjacentChain.append(pattern);
+ fragment.widthFromIndirectAdjacent = 0;
+ previousDirectAdjacentFragmentInDirectAdjacentChain = nullptr;
+ } else if (fragment.relationToRightFragment == FragmentRelation::DirectAdjacent) {
+ TagNamePattern pattern;
+ pattern.tagName = fragment.tagName;
+ tagNamesForDirectAdjacentChain.append(pattern);
+
+ unsigned maxPrefixSize = tagNamesForDirectAdjacentChain.size() - 1;
+ if (previousDirectAdjacentFragmentInDirectAdjacentChain) {
+ RELEASE_ASSERT(tagNamesForDirectAdjacentChain.size() >= previousDirectAdjacentFragmentInDirectAdjacentChain->tagNameMatchedBacktrackingStartWidthFromIndirectAdjacent);
+ maxPrefixSize = tagNamesForDirectAdjacentChain.size() - previousDirectAdjacentFragmentInDirectAdjacentChain->tagNameMatchedBacktrackingStartWidthFromIndirectAdjacent;
+ }
+
+ if (pattern.tagName) {
+ // Compute height from descendant in the case that tagName is not matched.
+ tagNamesForDirectAdjacentChain.last().inverted = true;
+ fragment.tagNameNotMatchedBacktrackingStartWidthFromIndirectAdjacent = computeBacktrackingStartOffsetInChain(tagNamesForDirectAdjacentChain, maxPrefixSize);
+ }
+
+ // Compute height from descendant in the case that tagName is matched.
+ tagNamesForDirectAdjacentChain.last().inverted = false;
+ fragment.tagNameMatchedBacktrackingStartWidthFromIndirectAdjacent = computeBacktrackingStartOffsetInChain(tagNamesForDirectAdjacentChain, maxPrefixSize);
+ fragment.widthFromIndirectAdjacent = tagNamesForDirectAdjacentChain.size() - 1;
+ previousDirectAdjacentFragmentInDirectAdjacentChain = &fragment;
+ }
+}
+
</ins><span class="cx"> static bool requiresAdjacentTail(const SelectorFragment& fragment)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(fragment.traversalBacktrackingAction != BacktrackingAction::JumpToDirectAdjacentTail);
</span><span class="lines">@@ -807,29 +866,31 @@
</span><span class="cx"> bool needsAdjacentTail = false;
</span><span class="cx"> bool needsDescendantTail = false;
</span><span class="cx"> unsigned saveDescendantBacktrackingStartFragmentIndex = std::numeric_limits<unsigned>::max();
</span><ins>+ unsigned saveIndirectAdjacentBacktrackingStartFragmentIndex = std::numeric_limits<unsigned>::max();
</ins><span class="cx">
</span><del>- TagNameList tagNames;
- const SelectorFragment* previousChildFragmentInDescendantBacktrackingChain = nullptr;
</del><ins>+ TagNameList tagNamesForChildChain;
+ TagNameList tagNamesForDirectAdjacentChain;
+ const SelectorFragment* previousChildFragmentInChildChain = nullptr;
+ const SelectorFragment* previousDirectAdjacentFragmentInDirectAdjacentChain = nullptr;
</ins><span class="cx">
</span><span class="cx"> for (unsigned i = 0; i < m_selectorFragments.size(); ++i) {
</span><span class="cx"> SelectorFragment& fragment = m_selectorFragments[i];
</span><span class="cx">
</span><span class="cx"> updateChainStates(fragment, hasDescendantRelationOnTheRight, ancestorPositionSinceDescendantRelation, hasIndirectAdjacentRelationOnTheRightOfDirectAdjacentChain, adjacentPositionSinceIndirectAdjacentTreeWalk);
</span><span class="cx">
</span><del>- computeBacktrackingHeightFromDescendant(fragment, tagNames, hasDescendantRelationOnTheRight, previousChildFragmentInDescendantBacktrackingChain);
</del><ins>+ computeBacktrackingHeightFromDescendant(fragment, tagNamesForChildChain, hasDescendantRelationOnTheRight, previousChildFragmentInChildChain);
</ins><span class="cx">
</span><ins>+ computeBacktrackingWidthFromIndirectAdjacent(fragment, tagNamesForDirectAdjacentChain, hasIndirectAdjacentRelationOnTheRightOfDirectAdjacentChain, previousDirectAdjacentFragmentInDirectAdjacentChain);
+
</ins><span class="cx"> #if CSS_SELECTOR_JIT_DEBUGGING
</span><del>- dataLogF("Computing fragment[%d] backtracking height %u. NotMatched %u / Matched %u\n", i, fragment.heightFromDescendant, fragment.tagNameNotMatchedBacktrackingStartHeightFromDescendant, fragment.tagNameMatchedBacktrackingStartHeightFromDescendant);
</del><ins>+ dataLogF("Computing fragment[%d] backtracking height %u. NotMatched %u / Matched %u | width %u. NotMatched %u / Matched %u\n", i, fragment.heightFromDescendant, fragment.tagNameNotMatchedBacktrackingStartHeightFromDescendant, fragment.tagNameMatchedBacktrackingStartHeightFromDescendant, fragment.widthFromIndirectAdjacent, fragment.tagNameNotMatchedBacktrackingStartWidthFromIndirectAdjacent, fragment.tagNameMatchedBacktrackingStartWidthFromIndirectAdjacent);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- solveBacktrackingAction(fragment, hasDescendantRelationOnTheRight, hasIndirectAdjacentRelationOnTheRightOfDirectAdjacentChain, adjacentPositionSinceIndirectAdjacentTreeWalk);
</del><ins>+ solveBacktrackingAction(fragment, hasDescendantRelationOnTheRight, hasIndirectAdjacentRelationOnTheRightOfDirectAdjacentChain);
</ins><span class="cx">
</span><span class="cx"> needsAdjacentTail |= requiresAdjacentTail(fragment);
</span><span class="cx"> needsDescendantTail |= requiresDescendantTail(fragment);
</span><span class="cx">
</span><del>- if (needsDescendantTail)
- fragment.backtrackingFlags |= BacktrackingFlag::InChainWithDescendantTail;
-
</del><span class="cx"> // Add code generation flags.
</span><span class="cx"> if (fragment.relationToLeftFragment != FragmentRelation::Descendant && fragment.relationToRightFragment == FragmentRelation::Descendant)
</span><span class="cx"> fragment.backtrackingFlags |= BacktrackingFlag::DescendantEntryPoint;
</span><span class="lines">@@ -840,13 +901,19 @@
</span><span class="cx"> saveDescendantBacktrackingStartFragmentIndex = i;
</span><span class="cx"> }
</span><span class="cx"> if (fragment.relationToLeftFragment == FragmentRelation::DirectAdjacent && fragment.relationToRightFragment == FragmentRelation::DirectAdjacent && isFirstAdjacent(adjacentPositionSinceIndirectAdjacentTreeWalk)) {
</span><del>- fragment.backtrackingFlags |= BacktrackingFlag::SaveAdjacentBacktrackingStart;
- m_needsAdjacentBacktrackingStart = true;
</del><ins>+ ASSERT(saveIndirectAdjacentBacktrackingStartFragmentIndex == std::numeric_limits<unsigned>::max());
+ saveIndirectAdjacentBacktrackingStartFragmentIndex = i;
</ins><span class="cx"> }
</span><del>- if (fragment.relationToLeftFragment != FragmentRelation::DirectAdjacent && needsAdjacentTail) {
- ASSERT(fragment.relationToRightFragment == FragmentRelation::DirectAdjacent);
- fragment.backtrackingFlags |= BacktrackingFlag::DirectAdjacentTail;
- needsAdjacentTail = false;
</del><ins>+ if (fragment.relationToLeftFragment != FragmentRelation::DirectAdjacent) {
+ if (needsAdjacentTail) {
+ ASSERT(fragment.relationToRightFragment == FragmentRelation::DirectAdjacent);
+ ASSERT(saveIndirectAdjacentBacktrackingStartFragmentIndex != std::numeric_limits<unsigned>::max());
+ fragment.backtrackingFlags |= BacktrackingFlag::DirectAdjacentTail;
+ m_selectorFragments[saveIndirectAdjacentBacktrackingStartFragmentIndex].backtrackingFlags |= BacktrackingFlag::SaveAdjacentBacktrackingStart;
+ m_needsAdjacentBacktrackingStart = true;
+ needsAdjacentTail = false;
+ }
+ saveIndirectAdjacentBacktrackingStartFragmentIndex = std::numeric_limits<unsigned>::max();
</ins><span class="cx"> }
</span><span class="cx"> if (fragment.relationToLeftFragment == FragmentRelation::Descendant) {
</span><span class="cx"> if (needsDescendantTail) {
</span><span class="lines">@@ -1121,6 +1188,9 @@
</span><span class="cx">
</span><span class="cx"> Assembler::Label loopStart(m_assembler.label());
</span><span class="cx">
</span><ins>+ if (fragment.backtrackingFlags & BacktrackingFlag::IndirectAdjacentEntryPoint)
+ m_indirectAdjacentTreeWalkerBacktrackingPoint = m_assembler.label();
+
</ins><span class="cx"> generateWalkToPreviousAdjacent(failureCases, fragment);
</span><span class="cx">
</span><span class="cx"> if (fragment.backtrackingFlags & BacktrackingFlag::IndirectAdjacentEntryPoint)
</span><span class="lines">@@ -1332,6 +1402,9 @@
</span><span class="cx"> case BacktrackingAction::JumpToIndirectAdjacentEntryPoint:
</span><span class="cx"> localFailureCases.linkTo(m_indirectAdjacentEntryPoint, &m_assembler);
</span><span class="cx"> break;
</span><ins>+ case BacktrackingAction::JumpToIndirectAdjacentTreeWalkerEntryPoint:
+ localFailureCases.linkTo(m_indirectAdjacentTreeWalkerBacktrackingPoint, &m_assembler);
+ break;
</ins><span class="cx"> case BacktrackingAction::JumpToDirectAdjacentTail:
</span><span class="cx"> m_adjacentBacktrackingFailureCases.append(localFailureCases);
</span><span class="cx"> break;
</span></span></pre>
</div>
</div>
</body>
</html>