<!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>[169525] 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/169525">169525</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-06-02 00:00:53 -0700 (Mon, 02 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>CSS JIT: add support for the "not" pseudo class
https://bugs.webkit.org/show_bug.cgi?id=133314
Source/WebCore:
Patch by Yusuke Suzuki <utatane.tea@gmail.com> on 2014-06-02
Reviewed by Benjamin Poulain.
Add :not pseudo class support to CSS JIT. Current implementation
doesn't support visitedMatchType. So when link pseudo class appears in
:not sub fragment, fallback to the non-JIT implementation.
Tests: fast/selectors/not-active-hover-quirks.html
fast/selectors/not-active-hover-strict.html
fast/selectors/pseudo-class-not.html
* cssjit/SelectorCompiler.cpp:
(WebCore::SelectorCompiler::addPseudoClassType):
(WebCore::SelectorCompiler::SelectorCodeGenerator::SelectorCodeGenerator):
(WebCore::SelectorCompiler::constructFragments):
(WebCore::SelectorCompiler::minimumRegisterRequirements):
(WebCore::SelectorCompiler::computeBacktrackingInformation):
(WebCore::SelectorCompiler::SelectorCodeGenerator::generateSelectorChecker):
(WebCore::SelectorCompiler::fragmentOnlyMatchesLinksInQuirksMode):
(WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementMatching):
(WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementDataMatching):
(WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementIsNthChild):
(WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementMatchesNotPseudoClass):
(WebCore::SelectorCompiler::SelectorCodeGenerator::computeBacktrackingInformation): Deleted.
LayoutTests:
Add :not pseudo class support to CSS JIT. Current implementation
doesn't support visitedMatchType. So when link pseudo class appears in
:not sub fragment, fallback to the non-JIT implementation.
Patch by Yusuke Suzuki <utatane.tea@gmail.com> on 2014-06-02
Reviewed by Benjamin Poulain.
* fast/selectors/not-active-hover-quirks-expected.txt: Added.
* fast/selectors/not-active-hover-quirks.html: Added.
* fast/selectors/not-active-hover-strict-expected.txt: Added.
* fast/selectors/not-active-hover-strict.html: Added.
* fast/selectors/pseudo-class-not-expected.txt: Added.
* fast/selectors/pseudo-class-not.html: Added.
* fast/selectors/resources/not-hover-active-quirks-utility.js: Added.
(testQuerySelector):
(test):
* fast/selectors/resources/not-hover-active-strict-utility.js: Added.
(testQuerySelector):
(test):</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="#trunkLayoutTestsfastselectorsnotactivehoverquirksexpectedtxt">trunk/LayoutTests/fast/selectors/not-active-hover-quirks-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastselectorsnotactivehoverquirkshtml">trunk/LayoutTests/fast/selectors/not-active-hover-quirks.html</a></li>
<li><a href="#trunkLayoutTestsfastselectorsnotactivehoverstrictexpectedtxt">trunk/LayoutTests/fast/selectors/not-active-hover-strict-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastselectorsnotactivehoverstricthtml">trunk/LayoutTests/fast/selectors/not-active-hover-strict.html</a></li>
<li><a href="#trunkLayoutTestsfastselectorspseudoclassnotexpectedtxt">trunk/LayoutTests/fast/selectors/pseudo-class-not-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastselectorspseudoclassnothtml">trunk/LayoutTests/fast/selectors/pseudo-class-not.html</a></li>
<li><a href="#trunkLayoutTestsfastselectorsresourcesnothoveractivequirksutilityjs">trunk/LayoutTests/fast/selectors/resources/not-hover-active-quirks-utility.js</a></li>
<li><a href="#trunkLayoutTestsfastselectorsresourcesnothoveractivestrictutilityjs">trunk/LayoutTests/fast/selectors/resources/not-hover-active-strict-utility.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (169524 => 169525)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-06-02 06:52:50 UTC (rev 169524)
+++ trunk/LayoutTests/ChangeLog 2014-06-02 07:00:53 UTC (rev 169525)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-06-02 Yusuke Suzuki <utatane.tea@gmail.com>
+
+ CSS JIT: add support for the "not" pseudo class
+ https://bugs.webkit.org/show_bug.cgi?id=133314
+
+ Add :not pseudo class support to CSS JIT. Current implementation
+ doesn't support visitedMatchType. So when link pseudo class appears in
+ :not sub fragment, fallback to the non-JIT implementation.
+
+ Reviewed by Benjamin Poulain.
+
+ * fast/selectors/not-active-hover-quirks-expected.txt: Added.
+ * fast/selectors/not-active-hover-quirks.html: Added.
+ * fast/selectors/not-active-hover-strict-expected.txt: Added.
+ * fast/selectors/not-active-hover-strict.html: Added.
+ * fast/selectors/pseudo-class-not-expected.txt: Added.
+ * fast/selectors/pseudo-class-not.html: Added.
+ * fast/selectors/resources/not-hover-active-quirks-utility.js: Added.
+ (testQuerySelector):
+ (test):
+ * fast/selectors/resources/not-hover-active-strict-utility.js: Added.
+ (testQuerySelector):
+ (test):
+
</ins><span class="cx"> 2014-06-01 Jinwoo Song <jinwoo7.song@samsung.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed EFL gardening.
</span></span></pre></div>
<a id="trunkLayoutTestsfastselectorsnotactivehoverquirksexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/selectors/not-active-hover-quirks-expected.txt (0 => 169525)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/selectors/not-active-hover-quirks-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/selectors/not-active-hover-quirks-expected.txt 2014-06-02 07:00:53 UTC (rev 169525)
</span><span class="lines">@@ -0,0 +1,194 @@
</span><ins>+START
+Test the :not(:active) and :not(:hover) selector when the document is in quirks mode. To test manually, make sure not to move the cursor over the green rectangle and press the gray START div until the test is finished.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS document.querySelectorAll("*").length - document.querySelectorAll(":not(:active)").length is 3
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll("*").length - document.querySelectorAll("*:not(:active)").length is 3
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(":not(:active):hover").length is 0
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(1, 2, 3)"
+PASS document.querySelectorAll(":hover:not(:active)").length is 0
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(1, 2, 3)"
+PASS document.querySelectorAll(":hover:not(:active):hover").length is 0
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(1, 2, 3)"
+PASS document.querySelectorAll(":not(:active):active").length is 0
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(1, 2, 3)"
+PASS document.querySelectorAll(":active:not(:active)").length is 0
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(1, 2, 3)"
+PASS document.querySelectorAll(":active:not(:active):active").length is 0
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(1, 2, 3)"
+PASS document.querySelectorAll("testing:not(:active)").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll("#target:not(:active)").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(":not(:active)#target").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll("#target:not(:active)#target").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(".aClass:not(:active)").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(":not(:active).aClass").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(".aClass:not(:active).otherClass").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(".aClass[webkit]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(":not(:active)[webkit]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll("[id]:not(:active)[webkit]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(".aClass[webkit=rocks]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(":not(:active)[webkit=rocks]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll("[id=target]:not(:active)[webkit=rocks]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(".aClass[webkit^=ro]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(":not(:active)[webkit^=ro]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll("[id^=ta]:not(:active)[webkit^=ro]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(".aClass[webkit$=ks]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(":not(:active)[webkit$=ks]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll("[id$=et]:not(:active)[webkit$=ks]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(".aClass[webkit*=ck]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(":not(:active)[webkit*=ck]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll("[id*=rg]:not(:active)[webkit*=ck]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(".aClass[webkit~=rocks]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(":not(:active)[webkit~=rocks]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll("[id~=target]:not(:active)[webkit~=rocks]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(".aClass[webkit|=rocks]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(":not(:active)[webkit|=rocks]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll("[id|=target]:not(:active)[webkit|=rocks]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll("testing:nth-child(1):not(:active)").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll("testing:not(:active):nth-child(1)").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll("testing:nth-child(1):not(:active):nth-child(1)").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(":nth-child(n):not(:active) > #target").length is 0
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(1, 2, 3)"
+PASS document.querySelectorAll(":not(:active):nth-child(n) > #target").length is 0
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(1, 2, 3)"
+PASS document.querySelectorAll(":nth-child(n):not(:active):nth-child(n) > #target").length is 0
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(1, 2, 3)"
+PASS document.querySelectorAll(":nth-child(n):not(:active) #target").length is 0
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(1, 2, 3)"
+PASS document.querySelectorAll(":not(:active):nth-child(n) #target").length is 0
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(1, 2, 3)"
+PASS document.querySelectorAll(":nth-child(n):not(:active):nth-child(n) #target").length is 0
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(1, 2, 3)"
+PASS document.querySelectorAll(":-webkit-any(:not(:active)) #target").length is 0
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(1, 2, 3)"
+PASS document.querySelectorAll("*").length - document.querySelectorAll(":not(:hover)").length is 3
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll("*").length - document.querySelectorAll("*:not(:hover)").length is 3
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(":not(:hover):hover").length is 0
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(1, 2, 3)"
+PASS document.querySelectorAll(":hover:not(:hover)").length is 0
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(1, 2, 3)"
+PASS document.querySelectorAll(":hover:not(:hover):hover").length is 0
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(1, 2, 3)"
+PASS document.querySelectorAll(":not(:hover):active").length is 0
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(1, 2, 3)"
+PASS document.querySelectorAll(":active:not(:hover)").length is 0
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(1, 2, 3)"
+PASS document.querySelectorAll(":active:not(:hover):active").length is 0
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(1, 2, 3)"
+PASS document.querySelectorAll("testing:not(:hover)").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll("#target:not(:hover)").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(":not(:hover)#target").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll("#target:not(:hover)#target").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(".aClass:not(:hover)").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(":not(:hover).aClass").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(".aClass:not(:hover).otherClass").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(".aClass[webkit]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(":not(:hover)[webkit]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll("[id]:not(:hover)[webkit]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(".aClass[webkit=rocks]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(":not(:hover)[webkit=rocks]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll("[id=target]:not(:hover)[webkit=rocks]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(".aClass[webkit^=ro]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(":not(:hover)[webkit^=ro]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll("[id^=ta]:not(:hover)[webkit^=ro]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(".aClass[webkit$=ks]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(":not(:hover)[webkit$=ks]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll("[id$=et]:not(:hover)[webkit$=ks]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(".aClass[webkit*=ck]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(":not(:hover)[webkit*=ck]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll("[id*=rg]:not(:hover)[webkit*=ck]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(".aClass[webkit~=rocks]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(":not(:hover)[webkit~=rocks]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll("[id~=target]:not(:hover)[webkit~=rocks]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(".aClass[webkit|=rocks]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(":not(:hover)[webkit|=rocks]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll("[id|=target]:not(:hover)[webkit|=rocks]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll("testing:nth-child(1):not(:hover)").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll("testing:not(:hover):nth-child(1)").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll("testing:nth-child(1):not(:hover):nth-child(1)").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(":nth-child(n):not(:hover) > #target").length is 0
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(1, 2, 3)"
+PASS document.querySelectorAll(":not(:hover):nth-child(n) > #target").length is 0
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(1, 2, 3)"
+PASS document.querySelectorAll(":nth-child(n):not(:hover):nth-child(n) > #target").length is 0
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(1, 2, 3)"
+PASS document.querySelectorAll(":nth-child(n):not(:hover) #target").length is 0
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(1, 2, 3)"
+PASS document.querySelectorAll(":not(:hover):nth-child(n) #target").length is 0
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(1, 2, 3)"
+PASS document.querySelectorAll(":nth-child(n):not(:hover):nth-child(n) #target").length is 0
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(1, 2, 3)"
+PASS document.querySelectorAll(":-webkit-any(:not(:hover)) #target").length is 0
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(1, 2, 3)"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastselectorsnotactivehoverquirkshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/selectors/not-active-hover-quirks.html (0 => 169525)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/selectors/not-active-hover-quirks.html (rev 0)
+++ trunk/LayoutTests/fast/selectors/not-active-hover-quirks.html 2014-06-02 07:00:53 UTC (rev 169525)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+<script src="resources/not-hover-active-quirks-utility.js"></script>
+<style id="testStyle">
+</style>
+</head>
+<body>
+<testing id="target" class="aClass otherClass" webkit="rocks" style="background-color:green; width:200px; height:200px;display:block;"></testing>
+<div id="start" style="background-color:gray; height:200px; width:200px; display:block; text-align:center; color:white;">START</div>
+<div id="console"></div>
+</div>
+</body>
+<script>
+description('Test the :not(:active) and :not(:hover) selector when the document is in quirks mode. To test manually, make sure not to move the cursor over the green rectangle and press the gray START div until the test is finished.');
+
+if (window.eventSender) {
+ var start = document.getElementById('start');
+ var x = start.offsetLeft + start.offsetWidth / 2;
+ var y = start.offsetTop + start.offsetHeight / 2;
+ eventSender.mouseMoveTo(x, y);
+ eventSender.mouseDown();
+ test(':active');
+ test(':hover');
+ eventSender.mouseUp()
+} else {
+ // For some reasons, the test does not work well without the timeout on Firefox.
+ document.getElementById('start').addEventListener('mousedown', function(ev) {
+ setTimeout(function () {
+ test(':active');
+ test(':hover');
+ }, 250);
+ });
+}
+
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastselectorsnotactivehoverstrictexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/selectors/not-active-hover-strict-expected.txt (0 => 169525)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/selectors/not-active-hover-strict-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/selectors/not-active-hover-strict-expected.txt 2014-06-02 07:00:53 UTC (rev 169525)
</span><span class="lines">@@ -0,0 +1,170 @@
</span><ins>+START
+Test the :not(:active) and :not(:hover) selector when the document is in strict mode. To test manually, make sure not to move the cursor over the green rectangle and press the gray START div until the test is finished.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS document.querySelectorAll("testing:not(:active)").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll("#target:not(:active)").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(":not(:active)#target").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll("#target:not(:active)#target").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(".aClass:not(:active)").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(":not(:active).aClass").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(".aClass:not(:active).otherClass").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(".aClass[webkit]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(":not(:active)[webkit]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll("[id]:not(:active)[webkit]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(".aClass[webkit=rocks]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(":not(:active)[webkit=rocks]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll("[id=target]:not(:active)[webkit=rocks]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(".aClass[webkit^=ro]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(":not(:active)[webkit^=ro]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll("[id^=ta]:not(:active)[webkit^=ro]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(".aClass[webkit$=ks]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(":not(:active)[webkit$=ks]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll("[id$=et]:not(:active)[webkit$=ks]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(".aClass[webkit*=ck]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(":not(:active)[webkit*=ck]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll("[id*=rg]:not(:active)[webkit*=ck]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(".aClass[webkit~=rocks]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(":not(:active)[webkit~=rocks]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll("[id~=target]:not(:active)[webkit~=rocks]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(".aClass[webkit|=rocks]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(":not(:active)[webkit|=rocks]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll("[id|=target]:not(:active)[webkit|=rocks]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll("testing:nth-child(1):not(:active)").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll("testing:not(:active):nth-child(1)").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll("testing:nth-child(1):not(:active):nth-child(1)").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(":nth-child(n):not(:active) > #target").length is 0
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(1, 2, 3)"
+PASS document.querySelectorAll(":not(:active):nth-child(n) > #target").length is 0
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(1, 2, 3)"
+PASS document.querySelectorAll(":nth-child(n):not(:active):nth-child(n) > #target").length is 0
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(1, 2, 3)"
+PASS document.querySelectorAll(":nth-child(n):not(:active) #target").length is 0
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(1, 2, 3)"
+PASS document.querySelectorAll(":not(:active):nth-child(n) #target").length is 0
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(1, 2, 3)"
+PASS document.querySelectorAll(":nth-child(n):not(:active):nth-child(n) #target").length is 0
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(1, 2, 3)"
+PASS document.querySelectorAll(":-webkit-any(:not(:active)) #target").length is 0
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(1, 2, 3)"
+PASS document.querySelectorAll("*").length - document.querySelectorAll(":not(:active)").length is 3
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll("*").length - document.querySelectorAll("*:not(:active)").length is 3
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll("testing:not(:hover)").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll("#target:not(:hover)").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(":not(:hover)#target").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll("#target:not(:hover)#target").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(".aClass:not(:hover)").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(":not(:hover).aClass").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(".aClass:not(:hover).otherClass").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(".aClass[webkit]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(":not(:hover)[webkit]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll("[id]:not(:hover)[webkit]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(".aClass[webkit=rocks]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(":not(:hover)[webkit=rocks]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll("[id=target]:not(:hover)[webkit=rocks]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(".aClass[webkit^=ro]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(":not(:hover)[webkit^=ro]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll("[id^=ta]:not(:hover)[webkit^=ro]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(".aClass[webkit$=ks]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(":not(:hover)[webkit$=ks]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll("[id$=et]:not(:hover)[webkit$=ks]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(".aClass[webkit*=ck]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(":not(:hover)[webkit*=ck]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll("[id*=rg]:not(:hover)[webkit*=ck]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(".aClass[webkit~=rocks]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(":not(:hover)[webkit~=rocks]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll("[id~=target]:not(:hover)[webkit~=rocks]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(".aClass[webkit|=rocks]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(":not(:hover)[webkit|=rocks]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll("[id|=target]:not(:hover)[webkit|=rocks]").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll("testing:nth-child(1):not(:hover)").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll("testing:not(:hover):nth-child(1)").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll("testing:nth-child(1):not(:hover):nth-child(1)").length is 1
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll(":nth-child(n):not(:hover) > #target").length is 0
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(1, 2, 3)"
+PASS document.querySelectorAll(":not(:hover):nth-child(n) > #target").length is 0
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(1, 2, 3)"
+PASS document.querySelectorAll(":nth-child(n):not(:hover):nth-child(n) > #target").length is 0
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(1, 2, 3)"
+PASS document.querySelectorAll(":nth-child(n):not(:hover) #target").length is 0
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(1, 2, 3)"
+PASS document.querySelectorAll(":not(:hover):nth-child(n) #target").length is 0
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(1, 2, 3)"
+PASS document.querySelectorAll(":nth-child(n):not(:hover):nth-child(n) #target").length is 0
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(1, 2, 3)"
+PASS document.querySelectorAll(":-webkit-any(:not(:hover)) #target").length is 0
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(1, 2, 3)"
+PASS document.querySelectorAll("*").length - document.querySelectorAll(":not(:hover)").length is 3
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS document.querySelectorAll("*").length - document.querySelectorAll("*:not(:hover)").length is 3
+PASS getComputedStyle(document.getElementById("target")).color is "rgb(4, 5, 6)"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastselectorsnotactivehoverstricthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/selectors/not-active-hover-strict.html (0 => 169525)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/selectors/not-active-hover-strict.html (rev 0)
+++ trunk/LayoutTests/fast/selectors/not-active-hover-strict.html 2014-06-02 07:00:53 UTC (rev 169525)
</span><span class="lines">@@ -0,0 +1,39 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+<script src="resources/not-hover-active-strict-utility.js"></script>
+<style id="testStyle">
+</style>
+</head>
+<body>
+<testing id="target" class="aClass otherClass" webkit="rocks" style="background-color:green; width:200px; height:200px;display:block;"></testing>
+<div id="start" style="background-color:gray; height:200px; width:200px; display:block; text-align:center; color:white;">START</div>
+<div id="console"></div>
+</div>
+</body>
+<script>
+description('Test the :not(:active) and :not(:hover) selector when the document is in strict mode. To test manually, make sure not to move the cursor over the green rectangle and press the gray START div until the test is finished.');
+
+if (window.eventSender) {
+ var start = document.getElementById('start');
+ var x = start.offsetLeft + start.offsetWidth / 2;
+ var y = start.offsetTop + start.offsetHeight / 2;
+ eventSender.mouseMoveTo(x, y);
+ eventSender.mouseDown();
+ test(':active');
+ test(':hover');
+ eventSender.mouseUp()
+} else {
+ // For some reasons, the test does not work well without the timeout on Firefox.
+ document.getElementById('start').addEventListener('mousedown', function(ev) {
+ setTimeout(function () {
+ test(':active');
+ test(':hover');
+ }, 250);
+ });
+}
+
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastselectorspseudoclassnotexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/selectors/pseudo-class-not-expected.txt (0 => 169525)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/selectors/pseudo-class-not-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/selectors/pseudo-class-not-expected.txt 2014-06-02 07:00:53 UTC (rev 169525)
</span><span class="lines">@@ -0,0 +1,27 @@
</span><ins>+The pseudo class :not
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+:not selector matched.
+PASS getComputedStyle(document.getElementById("target1")).backgroundColor is "rgb(0, 0, 0)"
+:not selector unmatched.
+PASS getComputedStyle(document.getElementById("target2")).backgroundColor is "rgb(1, 2, 3)"
+multiple :not selector matched.
+PASS getComputedStyle(document.getElementById("target3")).backgroundColor is "rgb(2, 3, 4)"
+multiple :not selector matched.
+PASS getComputedStyle(document.getElementById("target4")).backgroundColor is "rgb(2, 3, 4)"
+multiple :not selector unmatched.
+PASS getComputedStyle(document.getElementById("target5")).backgroundColor is "rgb(0, 0, 0)"
+:not with backtracking matched.
+PASS getComputedStyle(document.getElementById("target6")).backgroundColor is "rgb(1, 2, 3)"
+:not with backtracking failed.
+PASS getComputedStyle(document.getElementById("target7")).backgroundColor is "rgb(0, 0, 0)"
+:not with maximum registers matched.
+PASS getComputedStyle(document.getElementById("target8")).backgroundColor is "rgb(1, 2, 3)"
+:not with maximum registers matched.
+PASS getComputedStyle(document.getElementById("target9")).backgroundColor is "rgb(1, 2, 3)"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastselectorspseudoclassnothtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/selectors/pseudo-class-not.html (0 => 169525)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/selectors/pseudo-class-not.html (rev 0)
+++ trunk/LayoutTests/fast/selectors/pseudo-class-not.html 2014-06-02 07:00:53 UTC (rev 169525)
</span><span class="lines">@@ -0,0 +1,153 @@
</span><ins>+<!doctype html>
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+<style>
+span.target {
+ background-color:rgb(0,0,0);
+}
+span.target.rabbit:not(.horse) {
+ background-color:rgb(1,2,3);
+}
+span.target:not(.rabbit):not(.horse) {
+ background-color:rgb(2,3,4);
+}
+
+span.target1 {
+ background-color:rgb(0,0,0);
+}
+c:not(.ng) > c span.target1 {
+ background-color:rgb(1,2,3);
+}
+
+span.target2 {
+ background-color:rgb(0,0,0);
+}
+/* Maximum register case */
+d > d[rel="drink"][data-cocoa][data-cappuccino]:not(.ng) > d > d span.target2 {
+ background-color:rgb(1,2,3);
+}
+
+span.target3 {
+ background-color:rgb(0,0,0);
+}
+/* Maximum register case */
+d > d:not([rel="drink"]) > d > d span.target3 {
+ background-color:rgb(1,2,3);
+}
+</style>
+</head>
+<body>
+<div style="display:none">
+ <!-- span.target.rabbit:not(.horse) -->
+ <target1>
+ <span class="target rabbit horse" id="target1"></span>
+ </target1>
+
+ <!-- span.target.rabbit:not(.horse) -->
+ <target2>
+ <span class="target rabbit house" id="target2"></span>
+ </target2>
+
+ <!-- span.target:not(.rabbit):not(.horse) -->
+ <target3>
+ <span class="target" id="target3"></span>
+ </target3>
+
+ <!-- span.target:not(.rabbit):not(.horse) -->
+ <target4>
+ <span class="target house" id="target4"></span>
+ </target4>
+
+ <!-- span.target:not(.rabbit):not(.horse) -->
+ <target5>
+ <span class="target horse" id="target5"></span>
+ </target5>
+
+ <!-- c:not(.ng) > c span.target1 -->
+ <target6>
+ <c> <!-- Matched. -->
+ <c class="ng"> <!-- Failed. Backtracking from here. -->
+ <c>
+ <span class="target1" id="target6"></span>
+ </c>
+ </c>
+ </c>
+ </target6>
+
+ <!-- c:not(.ng) > c span.target1 -->
+ <target7>
+ <c class="ng"> <!-- Failed. Backtracking from here. -->
+ <c class="ng"> <!-- Failed. Backtracking from here. -->
+ <c class="ng"> <!-- Failed. Backtracking from here. -->
+ <c>
+ <span class="target1" id="target7"></span>
+ </c>
+ </c>
+ </c>
+ </c>
+ </target7>
+
+ <!-- d > d[data-cocoa][data-cappuccino]:not(.ng) > d > d span.target2 -->
+ <target8>
+ <d> <!-- Matched. -->
+ <d rel="drink" data-cocoa data-cappuccino>
+ <d data-cocoa data-cappuccino class="ng"> <!-- Failed. Backtracking from the tail. -->
+ <d>
+ <d>
+ <span class="target2" id="target8"></span>
+ </d>
+ </d>
+ </d>
+ </d>
+ </d>
+ </target8>
+
+ <!-- d > d:not([rel="drink"]) > d > d span.target3 -->
+ <target9>
+ <d> <!-- Matched. -->
+ <d>
+ <d rel="drink"> <!-- Failed. Backtracking from the tail. -->
+ <d>
+ <d>
+ <span class="target3" id="target9"></span>
+ </d>
+ </d>
+ </d>
+ </d>
+ </d>
+ </target9>
+</div>
+</body>
+<script>
+description('The pseudo class :not');
+
+debug(":not selector matched.");
+shouldBeEqualToString('getComputedStyle(document.getElementById("target1")).backgroundColor', 'rgb(0, 0, 0)');
+
+debug(":not selector unmatched.");
+shouldBeEqualToString('getComputedStyle(document.getElementById("target2")).backgroundColor', 'rgb(1, 2, 3)');
+
+debug("multiple :not selector matched.");
+shouldBeEqualToString('getComputedStyle(document.getElementById("target3")).backgroundColor', 'rgb(2, 3, 4)');
+
+debug("multiple :not selector matched.");
+shouldBeEqualToString('getComputedStyle(document.getElementById("target4")).backgroundColor', 'rgb(2, 3, 4)');
+
+debug("multiple :not selector unmatched.");
+shouldBeEqualToString('getComputedStyle(document.getElementById("target5")).backgroundColor', 'rgb(0, 0, 0)');
+
+debug(":not with backtracking matched.");
+shouldBeEqualToString('getComputedStyle(document.getElementById("target6")).backgroundColor', 'rgb(1, 2, 3)');
+
+debug(":not with backtracking failed.");
+shouldBeEqualToString('getComputedStyle(document.getElementById("target7")).backgroundColor', 'rgb(0, 0, 0)');
+
+debug(":not with maximum registers matched.");
+shouldBeEqualToString('getComputedStyle(document.getElementById("target8")).backgroundColor', 'rgb(1, 2, 3)');
+
+debug(":not with maximum registers matched.");
+shouldBeEqualToString('getComputedStyle(document.getElementById("target9")).backgroundColor', 'rgb(1, 2, 3)');
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastselectorsresourcesnothoveractivequirksutilityjs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/selectors/resources/not-hover-active-quirks-utility.js (0 => 169525)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/selectors/resources/not-hover-active-quirks-utility.js (rev 0)
+++ trunk/LayoutTests/fast/selectors/resources/not-hover-active-quirks-utility.js 2014-06-02 07:00:53 UTC (rev 169525)
</span><span class="lines">@@ -0,0 +1,97 @@
</span><ins>+var testCases = [
+ // Having :hover or :active does not qualify the pseudo class.
+ ["PLACEHOLDER:hover", false],
+ [":hoverPLACEHOLDER", false],
+ [":hoverPLACEHOLDER:hover", false],
+ ["PLACEHOLDER:active", false],
+ [":activePLACEHOLDER", false],
+ [":activePLACEHOLDER:active", false],
+
+ // Tag qualify the pseudo class.
+ ["testingPLACEHOLDER", true],
+
+ // Id qualify the pseudo class.
+ ["#targetPLACEHOLDER", true],
+ ["PLACEHOLDER#target", true],
+ ["#targetPLACEHOLDER#target", true],
+
+ // Class qualify the pseudo class.
+ [".aClassPLACEHOLDER", true],
+ ["PLACEHOLDER.aClass", true],
+ [".aClassPLACEHOLDER.otherClass", true],
+
+ // Any attribute filter qualify the pseudo class.
+ [".aClass[webkit]", true],
+ ["PLACEHOLDER[webkit]", true],
+ ["[id]PLACEHOLDER[webkit]", true],
+
+ [".aClass[webkit=rocks]", true],
+ ["PLACEHOLDER[webkit=rocks]", true],
+ ["[id=target]PLACEHOLDER[webkit=rocks]", true],
+
+ [".aClass[webkit^=ro]", true],
+ ["PLACEHOLDER[webkit^=ro]", true],
+ ["[id^=ta]PLACEHOLDER[webkit^=ro]", true],
+
+ [".aClass[webkit$=ks]", true],
+ ["PLACEHOLDER[webkit$=ks]", true],
+ ["[id$=et]PLACEHOLDER[webkit$=ks]", true],
+
+ [".aClass[webkit*=ck]", true],
+ ["PLACEHOLDER[webkit*=ck]", true],
+ ["[id*=rg]PLACEHOLDER[webkit*=ck]", true],
+
+ [".aClass[webkit~=rocks]", true],
+ ["PLACEHOLDER[webkit~=rocks]", true],
+ ["[id~=target]PLACEHOLDER[webkit~=rocks]", true],
+
+ [".aClass[webkit|=rocks]", true],
+ ["PLACEHOLDER[webkit|=rocks]", true],
+ ["[id|=target]PLACEHOLDER[webkit|=rocks]", true],
+
+ // A pseudo-class other than :active/:hover qualify the pseudo class.
+ ["testing:nth-child(1)PLACEHOLDER", true],
+ ["testingPLACEHOLDER:nth-child(1)", true],
+ ["testing:nth-child(1)PLACEHOLDER:nth-child(1)", true],
+ // Same with child.
+ [":nth-child(n)PLACEHOLDER > #target", false],
+ ["PLACEHOLDER:nth-child(n) > #target", false],
+ [":nth-child(n)PLACEHOLDER:nth-child(n) > #target", false],
+ // Same with descendant.
+ [":nth-child(n)PLACEHOLDER #target", false],
+ ["PLACEHOLDER:nth-child(n) #target", false],
+ [":nth-child(n)PLACEHOLDER:nth-child(n) #target", false],
+
+ [":-webkit-any(PLACEHOLDER) #target", false],
+];
+
+function testQuerySelector(selector, shouldMatch) {
+ shouldBe('document.querySelectorAll("' + selector + '").length', shouldMatch? '1' : '0');
+}
+
+function testStyling(selector, shouldMatch) {
+ var testStyle = document.getElementById('testStyle');
+ var noMatchStyle = "rgb(1, 2, 3)";
+ var matchStyle = "rgb(4, 5, 6)"
+ testStyle.textContent = "#target { color:" + noMatchStyle + " } " + selector + " { color:" + matchStyle + " !important }";
+
+ shouldBeEqualToString('getComputedStyle(document.getElementById("target")).color', shouldMatch ? matchStyle : noMatchStyle);
+
+ testStyle.textContent = "";
+}
+
+function test(original) {
+ var pseudoClass = ':not(' + original + ')';
+
+ // Since inFunctionalPseudo is true, :hover and :active can be matched in quirks mode.
+ shouldBe('document.querySelectorAll("*").length - document.querySelectorAll("' + pseudoClass + '").length', '3');
+ testStyling(pseudoClass, true);
+ shouldBe('document.querySelectorAll("*").length - document.querySelectorAll("*' + pseudoClass + '").length', '3');
+ testStyling('*' + pseudoClass, true);
+
+ for (var i = 0, length = testCases.length; i < length; ++i) {
+ var selector = testCases[i][0].replace('PLACEHOLDER', pseudoClass)
+ testQuerySelector(selector, testCases[i][1]);
+ testStyling(selector, testCases[i][1]);
+ }
+}
</ins></span></pre></div>
<a id="trunkLayoutTestsfastselectorsresourcesnothoveractivestrictutilityjs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/selectors/resources/not-hover-active-strict-utility.js (0 => 169525)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/selectors/resources/not-hover-active-strict-utility.js (rev 0)
+++ trunk/LayoutTests/fast/selectors/resources/not-hover-active-strict-utility.js 2014-06-02 07:00:53 UTC (rev 169525)
</span><span class="lines">@@ -0,0 +1,90 @@
</span><ins>+// In strict mode, there is no restriction on when :hover or :active can match.
+var testCases = [
+ // Tag name.
+ ["testingPLACEHOLDER", true],
+
+ // Id.
+ ["#targetPLACEHOLDER", true],
+ ["PLACEHOLDER#target", true],
+ ["#targetPLACEHOLDER#target", true],
+
+ // Class name.
+ [".aClassPLACEHOLDER", true],
+ ["PLACEHOLDER.aClass", true],
+ [".aClassPLACEHOLDER.otherClass", true],
+
+ // Attribute filter.
+ [".aClass[webkit]", true],
+ ["PLACEHOLDER[webkit]", true],
+ ["[id]PLACEHOLDER[webkit]", true],
+
+ [".aClass[webkit=rocks]", true],
+ ["PLACEHOLDER[webkit=rocks]", true],
+ ["[id=target]PLACEHOLDER[webkit=rocks]", true],
+
+ [".aClass[webkit^=ro]", true],
+ ["PLACEHOLDER[webkit^=ro]", true],
+ ["[id^=ta]PLACEHOLDER[webkit^=ro]", true],
+
+ [".aClass[webkit$=ks]", true],
+ ["PLACEHOLDER[webkit$=ks]", true],
+ ["[id$=et]PLACEHOLDER[webkit$=ks]", true],
+
+ [".aClass[webkit*=ck]", true],
+ ["PLACEHOLDER[webkit*=ck]", true],
+ ["[id*=rg]PLACEHOLDER[webkit*=ck]", true],
+
+ [".aClass[webkit~=rocks]", true],
+ ["PLACEHOLDER[webkit~=rocks]", true],
+ ["[id~=target]PLACEHOLDER[webkit~=rocks]", true],
+
+ [".aClass[webkit|=rocks]", true],
+ ["PLACEHOLDER[webkit|=rocks]", true],
+ ["[id|=target]PLACEHOLDER[webkit|=rocks]", true],
+
+ // Pseudo-class other than :active/:hover.
+ ["testing:nth-child(1)PLACEHOLDER", true],
+ ["testingPLACEHOLDER:nth-child(1)", true],
+ ["testing:nth-child(1)PLACEHOLDER:nth-child(1)", true],
+ // Same with child relation.
+ [":nth-child(n)PLACEHOLDER > #target", false],
+ ["PLACEHOLDER:nth-child(n) > #target", false],
+ [":nth-child(n)PLACEHOLDER:nth-child(n) > #target", false],
+ // Same with descendant relation.
+ [":nth-child(n)PLACEHOLDER #target", false],
+ ["PLACEHOLDER:nth-child(n) #target", false],
+ [":nth-child(n)PLACEHOLDER:nth-child(n) #target", false],
+
+ [":-webkit-any(PLACEHOLDER) #target", false],
+];
+
+function testQuerySelector(selector, shouldMatch) {
+ shouldBe('document.querySelectorAll("' + selector + '").length', shouldMatch? '1' : '0');
+}
+
+function testStyling(selector, shouldMatch) {
+ var testStyle = document.getElementById('testStyle');
+ var noMatchStyle = "rgb(1, 2, 3)";
+ var matchStyle = "rgb(4, 5, 6)"
+ testStyle.textContent = "#target { color:" + noMatchStyle + " } " + selector + " { color:" + matchStyle + " !important }";
+
+ shouldBeEqualToString('getComputedStyle(document.getElementById("target")).color', shouldMatch ? matchStyle : noMatchStyle);
+
+ testStyle.textContent = "";
+}
+
+function test(original) {
+ var pseudoClass = ':not(' + original + ')';
+ for (var i = 0, length = testCases.length; i < length; ++i) {
+ var selector = testCases[i][0].replace('PLACEHOLDER', pseudoClass)
+ testQuerySelector(selector, testCases[i][1]);
+ testStyling(selector, testCases[i][1]);
+ }
+
+ // In strict mode, no tag name or the universal selector also work. This is tested separately because those selectors match
+ // every ancestor of the target.
+ shouldBe('document.querySelectorAll("*").length - document.querySelectorAll("' + pseudoClass + '").length', '3');
+ testStyling(pseudoClass, true);
+ shouldBe('document.querySelectorAll("*").length - document.querySelectorAll("*' + pseudoClass + '").length', '3');
+ testStyling('*' + pseudoClass, true);
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169524 => 169525)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-02 06:52:50 UTC (rev 169524)
+++ trunk/Source/WebCore/ChangeLog 2014-06-02 07:00:53 UTC (rev 169525)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2014-06-02 Yusuke Suzuki <utatane.tea@gmail.com>
+
+ CSS JIT: add support for the "not" pseudo class
+ https://bugs.webkit.org/show_bug.cgi?id=133314
+
+ Reviewed by Benjamin Poulain.
+
+ Add :not pseudo class support to CSS JIT. Current implementation
+ doesn't support visitedMatchType. So when link pseudo class appears in
+ :not sub fragment, fallback to the non-JIT implementation.
+
+ Tests: fast/selectors/not-active-hover-quirks.html
+ fast/selectors/not-active-hover-strict.html
+ fast/selectors/pseudo-class-not.html
+
+ * cssjit/SelectorCompiler.cpp:
+ (WebCore::SelectorCompiler::addPseudoClassType):
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::SelectorCodeGenerator):
+ (WebCore::SelectorCompiler::constructFragments):
+ (WebCore::SelectorCompiler::minimumRegisterRequirements):
+ (WebCore::SelectorCompiler::computeBacktrackingInformation):
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::generateSelectorChecker):
+ (WebCore::SelectorCompiler::fragmentOnlyMatchesLinksInQuirksMode):
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementMatching):
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementDataMatching):
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementIsNthChild):
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementMatchesNotPseudoClass):
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::computeBacktrackingInformation): Deleted.
+
</ins><span class="cx"> 2014-06-01 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> [MSE] Appends of overlapping sample data do not clear existing samples properly.
</span></span></pre></div>
<a id="trunkSourceWebCorecssjitSelectorCompilercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/cssjit/SelectorCompiler.cpp (169524 => 169525)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/cssjit/SelectorCompiler.cpp 2014-06-02 06:52:50 UTC (rev 169524)
+++ trunk/Source/WebCore/cssjit/SelectorCompiler.cpp 2014-06-02 07:00:53 UTC (rev 169525)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #if ENABLE(CSS_SELECTOR_JIT)
</span><span class="cx">
</span><span class="cx"> #include "CSSSelector.h"
</span><ins>+#include "CSSSelectorList.h"
</ins><span class="cx"> #include "Element.h"
</span><span class="cx"> #include "ElementData.h"
</span><span class="cx"> #include "ElementRareData.h"
</span><span class="lines">@@ -154,7 +155,8 @@
</span><span class="cx"> HashSet<unsigned> pseudoClasses;
</span><span class="cx"> Vector<JSC::FunctionPtr> unoptimizedPseudoClasses;
</span><span class="cx"> Vector<AttributeMatchingInfo> attributes;
</span><del>- Vector<std::pair<int, int>> nthChildfilters;
</del><ins>+ Vector<std::pair<int, int>> nthChildFilters;
+ Vector<SelectorFragment> notFilters;
</ins><span class="cx">
</span><span class="cx"> bool inFunctionalPseudoClass;
</span><span class="cx"> };
</span><span class="lines">@@ -184,7 +186,6 @@
</span><span class="cx"> static const Assembler::RegisterID checkingContextRegister;
</span><span class="cx"> static const Assembler::RegisterID callFrameRegister;
</span><span class="cx">
</span><del>- void computeBacktrackingInformation();
</del><span class="cx"> void generateSelectorChecker();
</span><span class="cx">
</span><span class="cx"> // Element relations tree walker.
</span><span class="lines">@@ -227,6 +228,7 @@
</span><span class="cx"> void generateElementHasClasses(Assembler::JumpList& failureCases, const LocalRegister& elementDataAddress, const Vector<const AtomicStringImpl*>& classNames);
</span><span class="cx"> void generateElementIsLink(Assembler::JumpList& failureCases);
</span><span class="cx"> void generateElementIsNthChild(Assembler::JumpList& failureCases, const SelectorFragment&);
</span><ins>+ void generateElementMatchesNotPseudoClass(Assembler::JumpList& failureCases, const SelectorFragment&);
</ins><span class="cx"> void generateElementIsRoot(Assembler::JumpList& failureCases);
</span><span class="cx"> void generateElementIsTarget(Assembler::JumpList& failureCases);
</span><span class="cx">
</span><span class="lines">@@ -242,7 +244,7 @@
</span><span class="cx"> bool generatePrologue();
</span><span class="cx"> void generateEpilogue();
</span><span class="cx"> Vector<StackAllocator::StackReference> m_prologueStackReferences;
</span><del>-
</del><ins>+
</ins><span class="cx"> Assembler m_assembler;
</span><span class="cx"> RegisterAllocator m_registerAllocator;
</span><span class="cx"> StackAllocator m_stackAllocator;
</span><span class="lines">@@ -274,6 +276,10 @@
</span><span class="cx"> const Assembler::RegisterID SelectorCodeGenerator::checkingContextRegister = JSC::GPRInfo::argumentGPR1;
</span><span class="cx"> const Assembler::RegisterID SelectorCodeGenerator::callFrameRegister = JSC::GPRInfo::callFrameRegister;
</span><span class="cx">
</span><ins>+static FunctionType constructFragments(const CSSSelector* rootSelector, SelectorContext, SelectorFragmentList& selectorFragments);
+
+static void computeBacktrackingInformation(SelectorFragmentList& selectorFragments, bool& needsAdjacentBacktrackingStart);
+
</ins><span class="cx"> SelectorCompilationStatus compileSelector(const CSSSelector* lastSelector, JSC::VM* vm, SelectorContext selectorContext, JSC::MacroAssemblerCodeRef& codeRef)
</span><span class="cx"> {
</span><span class="cx"> if (!vm->canUseJIT())
</span><span class="lines">@@ -397,11 +403,44 @@
</span><span class="cx"> if (a <= 0 && b < 1)
</span><span class="cx"> return FunctionType::CannotMatchAnything;
</span><span class="cx">
</span><del>- fragment.nthChildfilters.append(std::pair<int, int>(a, b));
</del><ins>+ fragment.nthChildFilters.append(std::pair<int, int>(a, b));
</ins><span class="cx"> if (selectorContext == SelectorContext::QuerySelector)
</span><span class="cx"> return FunctionType::SimpleSelectorChecker;
</span><span class="cx"> return FunctionType::SelectorCheckerWithCheckingContext;
</span><span class="cx"> }
</span><ins>+
+ case CSSSelector::PseudoClassNot:
+ {
+ const CSSSelectorList* selectorList = selector.selectorList();
+
+ if (!selectorList)
+ return FunctionType::CannotMatchAnything;
+
+ SelectorFragmentList notFragments;
+ FunctionType functionType = constructFragments(selectorList->first(), selectorContext, notFragments);
+
+ // Since this is not pseudo class filter, CannotMatchAnything implies this filter always passes.
+ if (functionType == FunctionType::CannotMatchAnything)
+ return FunctionType::SimpleSelectorChecker;
+
+ if (functionType == FunctionType::CannotCompile)
+ return functionType;
+
+ ASSERT(notFragments.size() == 1);
+ if (notFragments.size() != 1)
+ return FunctionType::CannotCompile;
+
+ SelectorFragment subFragment = notFragments.first();
+ subFragment.inFunctionalPseudoClass = true;
+
+ // FIXME: Currently we don't support visitedMatchType.
+ if (subFragment.pseudoClasses.contains(CSSSelector::PseudoClassLink))
+ return FunctionType::CannotCompile;
+
+ fragment.notFilters.append(subFragment);
+ return functionType;
+ }
+
</ins><span class="cx"> default:
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -421,8 +460,16 @@
</span><span class="cx"> dataLogF("Compiling \"%s\"\n", m_originalSelector->selectorText().utf8().data());
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ m_functionType = constructFragments(rootSelector, m_selectorContext, m_selectorFragments);
+ if (m_functionType != FunctionType::CannotCompile && m_functionType != FunctionType::CannotMatchAnything)
+ computeBacktrackingInformation(m_selectorFragments, m_needsAdjacentBacktrackingStart);
+}
+
+static FunctionType constructFragments(const CSSSelector* rootSelector, SelectorContext selectorContext, SelectorFragmentList& selectorFragments)
+{
</ins><span class="cx"> SelectorFragment fragment;
</span><span class="cx"> FragmentRelation relationToPreviousFragment = FragmentRelation::Rightmost;
</span><ins>+ FunctionType functionType = FunctionType::SimpleSelectorChecker;
</ins><span class="cx"> for (const CSSSelector* selector = rootSelector; selector; selector = selector->tagHistory()) {
</span><span class="cx"> switch (selector->m_match) {
</span><span class="cx"> case CSSSelector::Tag:
</span><span class="lines">@@ -433,8 +480,7 @@
</span><span class="cx"> const AtomicString& id = selector->value();
</span><span class="cx"> if (fragment.id) {
</span><span class="cx"> if (id != *fragment.id) {
</span><del>- m_functionType = FunctionType::CannotMatchAnything;
- return;
</del><ins>+ return FunctionType::CannotMatchAnything;
</ins><span class="cx"> }
</span><span class="cx"> } else
</span><span class="cx"> fragment.id = &(selector->value());
</span><span class="lines">@@ -444,22 +490,20 @@
</span><span class="cx"> fragment.classNames.append(selector->value().impl());
</span><span class="cx"> break;
</span><span class="cx"> case CSSSelector::PseudoClass:
</span><del>- m_functionType = mostRestrictiveFunctionType(m_functionType, addPseudoClassType(*selector, fragment, m_selectorContext));
- if (m_functionType == FunctionType::CannotCompile || m_functionType == FunctionType::CannotMatchAnything)
- return;
</del><ins>+ functionType = mostRestrictiveFunctionType(functionType, addPseudoClassType(*selector, fragment, selectorContext));
+ if (functionType == FunctionType::CannotCompile || functionType == FunctionType::CannotMatchAnything)
+ return functionType;
</ins><span class="cx"> break;
</span><span class="cx"> case CSSSelector::List:
</span><span class="cx"> if (selector->value().contains(' ')) {
</span><del>- m_functionType = FunctionType::CannotMatchAnything;
- return;
</del><ins>+ return FunctionType::CannotMatchAnything;
</ins><span class="cx"> }
</span><span class="cx"> FALLTHROUGH;
</span><span class="cx"> case CSSSelector::Begin:
</span><span class="cx"> case CSSSelector::End:
</span><span class="cx"> case CSSSelector::Contain:
</span><span class="cx"> if (selector->value().isEmpty()) {
</span><del>- m_functionType = FunctionType::CannotMatchAnything;
- return;
</del><ins>+ return FunctionType::CannotMatchAnything;
</ins><span class="cx"> }
</span><span class="cx"> FALLTHROUGH;
</span><span class="cx"> case CSSSelector::Exact:
</span><span class="lines">@@ -474,10 +518,9 @@
</span><span class="cx"> break;
</span><span class="cx"> case CSSSelector::Unknown:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><del>- m_functionType = FunctionType::CannotMatchAnything;
- return;
</del><ins>+ return FunctionType::CannotMatchAnything;
</ins><span class="cx"> case CSSSelector::PseudoElement:
</span><del>- goto CannotHandleSelector;
</del><ins>+ return FunctionType::CannotCompile;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CSSSelector::Relation relation = selector->relation();
</span><span class="lines">@@ -485,28 +528,23 @@
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> if (relation == CSSSelector::ShadowDescendant && !selector->isLastInTagHistory())
</span><del>- goto CannotHandleSelector;
</del><ins>+ return FunctionType::CannotCompile;
</ins><span class="cx">
</span><span class="cx"> if (relation == CSSSelector::DirectAdjacent || relation == CSSSelector::IndirectAdjacent) {
</span><span class="cx"> FunctionType relationFunctionType = FunctionType::SelectorCheckerWithCheckingContext;
</span><del>- if (m_selectorContext == SelectorContext::QuerySelector)
</del><ins>+ if (selectorContext == SelectorContext::QuerySelector)
</ins><span class="cx"> relationFunctionType = FunctionType::SimpleSelectorChecker;
</span><del>- m_functionType = std::max(m_functionType, relationFunctionType);
</del><ins>+ functionType = mostRestrictiveFunctionType(functionType, relationFunctionType);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> fragment.relationToLeftFragment = fragmentRelationForSelectorRelation(relation);
</span><span class="cx"> fragment.relationToRightFragment = relationToPreviousFragment;
</span><span class="cx"> relationToPreviousFragment = fragment.relationToLeftFragment;
</span><span class="cx">
</span><del>- m_selectorFragments.append(fragment);
</del><ins>+ selectorFragments.append(fragment);
</ins><span class="cx"> fragment = SelectorFragment();
</span><span class="cx"> }
</span><del>-
- computeBacktrackingInformation();
-
- return;
-CannotHandleSelector:
- m_functionType = FunctionType::CannotCompile;
</del><ins>+ return functionType;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline bool attributeNameTestingRequiresNamespaceRegister(const CSSSelector& attributeSelector)
</span><span class="lines">@@ -519,37 +557,55 @@
</span><span class="cx"> return !attributeInfo.canDefaultToCaseSensitiveValueMatch();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline unsigned minimumRegisterRequirements(const SelectorFragmentList& selectorFragments)
</del><ins>+// Strict minimum to match anything interesting:
+// Element + BacktrackingRegister + ElementData + a pointer to values + an index on that pointer + the value we expect;
+static const unsigned minimumRequiredRegisterCount = 6;
+// Element + ElementData + scratchRegister + attributeArrayPointer + expectedLocalName + (qualifiedNameImpl && expectedValue).
+static const unsigned minimumRequiredRegisterCountForAttributeFilter = 6;
+
+static inline unsigned minimumRegisterRequirements(const SelectorFragment& selectorFragment)
</ins><span class="cx"> {
</span><del>- // Strict minimum to match anything interesting:
- // Element + BacktrackingRegister + ElementData + a pointer to values + an index on that pointer + the value we expect;
- unsigned minimum = 6;
</del><ins>+ unsigned minimum = minimumRequiredRegisterCount;
+ const Vector<AttributeMatchingInfo>& attributes = selectorFragment.attributes;
</ins><span class="cx">
</span><ins>+ unsigned backtrackingRegisterRequirements = 0;
+ if (selectorFragment.backtrackingFlags & BacktrackingFlag::InChainWithDescendantTail)
+ backtrackingRegisterRequirements = 1; // If there is a DescendantTail, there is a backtracking register.
+
</ins><span class="cx"> // Attributes cause some register pressure.
</span><del>- for (unsigned selectorFragmentIndex = 0; selectorFragmentIndex < selectorFragments.size(); ++selectorFragmentIndex) {
- const SelectorFragment& selectorFragment = selectorFragments[selectorFragmentIndex];
- const Vector<AttributeMatchingInfo>& attributes = selectorFragment.attributes;
</del><ins>+ unsigned attributeCount = attributes.size();
+ for (unsigned attributeIndex = 0; attributeIndex < attributeCount; ++attributeIndex) {
+ unsigned attributeMinimum = minimumRequiredRegisterCountForAttributeFilter + backtrackingRegisterRequirements;
</ins><span class="cx">
</span><del>- unsigned attributeCount = attributes.size();
- for (unsigned attributeIndex = 0; attributeIndex < attributeCount; ++attributeIndex) {
- // Element + ElementData + scratchRegister + attributeArrayPointer + expectedLocalName + (qualifiedNameImpl && expectedValue).
- unsigned attributeMinimum = 6;
- if (selectorFragment.backtrackingFlags & BacktrackingFlag::InChainWithDescendantTail)
- attributeMinimum += 1; // If there is a DescendantTail, there is a backtracking register.
</del><ins>+ if (attributeIndex + 1 < attributeCount)
+ attributeMinimum += 2; // For the local copy of the counter and attributeArrayPointer.
</ins><span class="cx">
</span><del>- if (attributeIndex + 1 < attributeCount)
- attributeMinimum += 2; // For the local copy of the counter and attributeArrayPointer.
</del><ins>+ const AttributeMatchingInfo& attributeInfo = attributes[attributeIndex];
+ const CSSSelector& attributeSelector = attributeInfo.selector();
+ if (attributeNameTestingRequiresNamespaceRegister(attributeSelector)
+ || attributeValueTestingRequiresCaseFoldingRegister(attributeInfo))
+ attributeMinimum += 1;
</ins><span class="cx">
</span><del>- const AttributeMatchingInfo& attributeInfo = attributes[attributeIndex];
- const CSSSelector& attributeSelector = attributeInfo.selector();
- if (attributeNameTestingRequiresNamespaceRegister(attributeSelector)
- || attributeValueTestingRequiresCaseFoldingRegister(attributeInfo))
- attributeMinimum += 1;
</del><ins>+ minimum = std::max(minimum, attributeMinimum);
+ }
</ins><span class="cx">
</span><del>- minimum = std::max(minimum, attributeMinimum);
- }
</del><ins>+ // :not pseudo class filters cause some register pressure.
+ for (const SelectorFragment& subFragment : selectorFragment.notFilters) {
+ unsigned notFilterMinimum = minimumRegisterRequirements(subFragment) + backtrackingRegisterRequirements;
+ minimum = std::max(minimum, notFilterMinimum);
</ins><span class="cx"> }
</span><ins>+ return minimum;
+}
</ins><span class="cx">
</span><ins>+static inline unsigned minimumRegisterRequirements(const SelectorFragmentList& selectorFragments)
+{
+ unsigned minimum = minimumRequiredRegisterCount;
+
+ for (unsigned selectorFragmentIndex = 0; selectorFragmentIndex < selectorFragments.size(); ++selectorFragmentIndex) {
+ const SelectorFragment& selectorFragment = selectorFragments[selectorFragmentIndex];
+ minimum = std::max(minimum, minimumRegisterRequirements(selectorFragment));
+ }
+
</ins><span class="cx"> return minimum;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -873,7 +929,7 @@
</span><span class="cx"> return fragment.matchingTagNameBacktrackingAction == BacktrackingAction::JumpToDescendantTail || fragment.matchingPostTagNameBacktrackingAction == BacktrackingAction::JumpToDescendantTail || fragment.traversalBacktrackingAction == BacktrackingAction::JumpToDescendantTail;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SelectorCodeGenerator::computeBacktrackingInformation()
</del><ins>+void computeBacktrackingInformation(SelectorFragmentList& selectorFragments, bool& needsAdjacentBacktrackingStart)
</ins><span class="cx"> {
</span><span class="cx"> bool hasDescendantRelationOnTheRight = false;
</span><span class="cx"> unsigned ancestorPositionSinceDescendantRelation = 0;
</span><span class="lines">@@ -890,8 +946,8 @@
</span><span class="cx"> const SelectorFragment* previousChildFragmentInChildChain = nullptr;
</span><span class="cx"> const SelectorFragment* previousDirectAdjacentFragmentInDirectAdjacentChain = nullptr;
</span><span class="cx">
</span><del>- for (unsigned i = 0; i < m_selectorFragments.size(); ++i) {
- SelectorFragment& fragment = m_selectorFragments[i];
</del><ins>+ for (unsigned i = 0; i < selectorFragments.size(); ++i) {
+ SelectorFragment& fragment = selectorFragments[i];
</ins><span class="cx">
</span><span class="cx"> updateChainStates(fragment, hasDescendantRelationOnTheRight, ancestorPositionSinceDescendantRelation, hasIndirectAdjacentRelationOnTheRightOfDirectAdjacentChain, adjacentPositionSinceIndirectAdjacentTreeWalk);
</span><span class="cx">
</span><span class="lines">@@ -926,8 +982,8 @@
</span><span class="cx"> ASSERT(fragment.relationToRightFragment == FragmentRelation::DirectAdjacent);
</span><span class="cx"> ASSERT(saveIndirectAdjacentBacktrackingStartFragmentIndex != std::numeric_limits<unsigned>::max());
</span><span class="cx"> fragment.backtrackingFlags |= BacktrackingFlag::DirectAdjacentTail;
</span><del>- m_selectorFragments[saveIndirectAdjacentBacktrackingStartFragmentIndex].backtrackingFlags |= BacktrackingFlag::SaveAdjacentBacktrackingStart;
- m_needsAdjacentBacktrackingStart = true;
</del><ins>+ selectorFragments[saveIndirectAdjacentBacktrackingStartFragmentIndex].backtrackingFlags |= BacktrackingFlag::SaveAdjacentBacktrackingStart;
+ needsAdjacentBacktrackingStart = true;
</ins><span class="cx"> needsAdjacentTail = false;
</span><span class="cx"> }
</span><span class="cx"> saveIndirectAdjacentBacktrackingStartFragmentIndex = std::numeric_limits<unsigned>::max();
</span><span class="lines">@@ -936,10 +992,10 @@
</span><span class="cx"> if (needsDescendantTail) {
</span><span class="cx"> ASSERT(saveDescendantBacktrackingStartFragmentIndex != std::numeric_limits<unsigned>::max());
</span><span class="cx"> fragment.backtrackingFlags |= BacktrackingFlag::DescendantTail;
</span><del>- m_selectorFragments[saveDescendantBacktrackingStartFragmentIndex].backtrackingFlags |= BacktrackingFlag::SaveDescendantBacktrackingStart;
</del><ins>+ selectorFragments[saveDescendantBacktrackingStartFragmentIndex].backtrackingFlags |= BacktrackingFlag::SaveDescendantBacktrackingStart;
</ins><span class="cx"> needsDescendantTail = false;
</span><span class="cx"> for (unsigned j = saveDescendantBacktrackingStartFragmentIndex; j <= i; ++j)
</span><del>- m_selectorFragments[j].backtrackingFlags |= BacktrackingFlag::InChainWithDescendantTail;
</del><ins>+ selectorFragments[j].backtrackingFlags |= BacktrackingFlag::InChainWithDescendantTail;
</ins><span class="cx"> }
</span><span class="cx"> saveDescendantBacktrackingStartFragmentIndex = std::numeric_limits<unsigned>::max();
</span><span class="cx"> }
</span><span class="lines">@@ -962,7 +1018,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> inline void SelectorCodeGenerator::generateEpilogue()
</span><span class="cx"> {
</span><span class="cx"> #if CPU(ARM64)
</span><span class="lines">@@ -976,15 +1032,18 @@
</span><span class="cx"> m_stackAllocator.pop(m_prologueStackReferences, prologueRegister);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> void SelectorCodeGenerator::generateSelectorChecker()
</span><span class="cx"> {
</span><span class="cx"> bool needsEpilogue = generatePrologue();
</span><del>-
</del><ins>+
</ins><span class="cx"> Vector<StackAllocator::StackReference> calleeSavedRegisterStackReferences;
</span><span class="cx"> bool reservedCalleeSavedRegisters = false;
</span><span class="cx"> unsigned availableRegisterCount = m_registerAllocator.availableRegisterCount();
</span><span class="cx"> unsigned minimumRegisterCountForAttributes = minimumRegisterRequirements(m_selectorFragments);
</span><ins>+#if CSS_SELECTOR_JIT_DEBUGGING
+ dataLogF("Compiling with minimum required register count %u\n", minimumRegisterCountForAttributes);
+#endif
</ins><span class="cx"> ASSERT(minimumRegisterCountForAttributes <= registerCount);
</span><span class="cx"> if (availableRegisterCount < minimumRegisterCountForAttributes) {
</span><span class="cx"> reservedCalleeSavedRegisters = true;
</span><span class="lines">@@ -1290,7 +1349,7 @@
</span><span class="cx"> if (!fragment.classNames.isEmpty())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if (!fragment.unoptimizedPseudoClasses.isEmpty() || !fragment.nthChildfilters.isEmpty())
</del><ins>+ if (!fragment.unoptimizedPseudoClasses.isEmpty() || !fragment.nthChildFilters.isEmpty())
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> for (unsigned pseudoClassType : fragment.pseudoClasses) {
</span><span class="lines">@@ -1591,8 +1650,10 @@
</span><span class="cx"> generateElementIsFirstChild(matchingPostTagNameFailureCases, fragment);
</span><span class="cx"> if (fragment.pseudoClasses.contains(CSSSelector::PseudoClassLastChild))
</span><span class="cx"> generateElementIsLastChild(matchingPostTagNameFailureCases, fragment);
</span><del>- if (!fragment.nthChildfilters.isEmpty())
</del><ins>+ if (!fragment.nthChildFilters.isEmpty())
</ins><span class="cx"> generateElementIsNthChild(matchingPostTagNameFailureCases, fragment);
</span><ins>+ if (!fragment.notFilters.isEmpty())
+ generateElementMatchesNotPseudoClass(matchingPostTagNameFailureCases, fragment);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SelectorCodeGenerator::generateElementDataMatching(Assembler::JumpList& failureCases, const SelectorFragment& fragment)
</span><span class="lines">@@ -1613,7 +1674,7 @@
</span><span class="cx"> if (!fragment.classNames.isEmpty())
</span><span class="cx"> generateElementHasClasses(failureCases, elementDataAddress, fragment.classNames);
</span><span class="cx"> if (!fragment.attributes.isEmpty())
</span><del>- generateElementAttributesMatching(failureCases, elementDataAddress, fragment);
</del><ins>+ generateElementAttributesMatching(failureCases, elementDataAddress, fragment);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline Assembler::Jump testIsHTMLFlagOnNode(Assembler::ResultCondition condition, Assembler& assembler, Assembler::RegisterID nodeAddress)
</span><span class="lines">@@ -2385,8 +2446,8 @@
</span><span class="cx"> generateWalkToParentElement(failureCases, parentElement);
</span><span class="cx">
</span><span class="cx"> Vector<std::pair<int, int>> validSubsetFilters;
</span><del>- validSubsetFilters.reserveInitialCapacity(fragment.nthChildfilters.size());
- for (const auto& slot : fragment.nthChildfilters) {
</del><ins>+ validSubsetFilters.reserveInitialCapacity(fragment.nthChildFilters.size());
+ for (const auto& slot : fragment.nthChildFilters) {
</ins><span class="cx"> int a = slot.first;
</span><span class="cx"> int b = slot.second;
</span><span class="cx">
</span><span class="lines">@@ -2494,6 +2555,17 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void SelectorCodeGenerator::generateElementMatchesNotPseudoClass(Assembler::JumpList& failureCases, const SelectorFragment& fragment)
+{
+ for (const auto& subFragment : fragment.notFilters) {
+ Assembler::JumpList localFailureCases;
+ generateElementMatching(localFailureCases, localFailureCases, subFragment);
+ // Since this is a not pseudo class filter, reaching here is a failure.
+ failureCases.append(m_assembler.jump());
+ localFailureCases.link(&m_assembler);
+ }
+}
+
</ins><span class="cx"> void SelectorCodeGenerator::generateElementIsRoot(Assembler::JumpList& failureCases)
</span><span class="cx"> {
</span><span class="cx"> LocalRegister document(m_registerAllocator);
</span></span></pre>
</div>
</div>
</body>
</html>