<!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>[174914] trunk/Source/WebCore</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/174914">174914</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-10-20 17:43:29 -0700 (Mon, 20 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Generalize the compilation of :not() to support arbitrary selector lists
https://bugs.webkit.org/show_bug.cgi?id=137843
Patch by Benjamin Poulain <bpoulain@apple.com> on 2014-10-20
Reviewed by Andreas Kling.
This builds :not() on top of the code created for :nth-child(An+B of selectorList)
to support any selector list.
The tests for the JIT were added previously:
-not-boundaries.html
-not-backtracking.html
* cssjit/SelectorCompiler.cpp:
(WebCore::SelectorCompiler::addPseudoClassType):
Any :not() of a selector is handled through a simple selector list. Cases like
:not(foo, bar) simply generate not([fragmentFoo, bragmentBar]).
Old cases like :not(foo):not(bar) simply add those cases to the selector list,
generating not([fragmentFoo, bragmentBar]).
(WebCore::SelectorCompiler::minimumRegisterRequirements):
Register pressure is now tracked through computeBacktrackingMemoryRequirements.
(WebCore::SelectorCompiler::hasAnyCombinators):
(WebCore::SelectorCompiler::computeBacktrackingMemoryRequirements):
(WebCore::SelectorCompiler::computeBacktrackingInformation):
Abstract the code creating Selector Lists from :nth-child(of). Use that for :not()
and :nth-child(of).
(WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementMatchesNotPseudoClass):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssjitSelectorCompilercpp">trunk/Source/WebCore/cssjit/SelectorCompiler.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (174913 => 174914)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-10-20 23:25:51 UTC (rev 174913)
+++ trunk/Source/WebCore/ChangeLog 2014-10-21 00:43:29 UTC (rev 174914)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2014-10-20 Benjamin Poulain <bpoulain@apple.com>
+
+ Generalize the compilation of :not() to support arbitrary selector lists
+ https://bugs.webkit.org/show_bug.cgi?id=137843
+
+ Reviewed by Andreas Kling.
+
+ This builds :not() on top of the code created for :nth-child(An+B of selectorList)
+ to support any selector list.
+
+ The tests for the JIT were added previously:
+ -not-boundaries.html
+ -not-backtracking.html
+
+ * cssjit/SelectorCompiler.cpp:
+ (WebCore::SelectorCompiler::addPseudoClassType):
+ Any :not() of a selector is handled through a simple selector list. Cases like
+ :not(foo, bar) simply generate not([fragmentFoo, bragmentBar]).
+
+ Old cases like :not(foo):not(bar) simply add those cases to the selector list,
+ generating not([fragmentFoo, bragmentBar]).
+
+ (WebCore::SelectorCompiler::minimumRegisterRequirements):
+ Register pressure is now tracked through computeBacktrackingMemoryRequirements.
+
+ (WebCore::SelectorCompiler::hasAnyCombinators):
+ (WebCore::SelectorCompiler::computeBacktrackingMemoryRequirements):
+ (WebCore::SelectorCompiler::computeBacktrackingInformation):
+ Abstract the code creating Selector Lists from :nth-child(of). Use that for :not()
+ and :nth-child(of).
+
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementMatchesNotPseudoClass):
+
</ins><span class="cx"> 2014-10-20 Gyuyoung Kim <gyuyoung.kim@samsung.com>
</span><span class="cx">
</span><span class="cx"> Use std::unique_ptr<>|make_unique<> in PluginView::scheduleRequest()
</span></span></pre></div>
<a id="trunkSourceWebCorecssjitSelectorCompilercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/cssjit/SelectorCompiler.cpp (174913 => 174914)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/cssjit/SelectorCompiler.cpp 2014-10-20 23:25:51 UTC (rev 174913)
+++ trunk/Source/WebCore/cssjit/SelectorCompiler.cpp 2014-10-21 00:43:29 UTC (rev 174914)
</span><span class="lines">@@ -195,7 +195,7 @@
</span><span class="cx"> Vector<AttributeMatchingInfo, 4> attributes;
</span><span class="cx"> Vector<std::pair<int, int>, 2> nthChildFilters;
</span><span class="cx"> Vector<NthChildOfSelectorInfo> nthChildOfFilters;
</span><del>- Vector<SelectorFragment> notFilters;
</del><ins>+ SelectorList notFilters;
</ins><span class="cx"> Vector<Vector<SelectorFragment>> anyFilters;
</span><span class="cx"> const CSSSelector* pseudoElementSelector;
</span><span class="cx">
</span><span class="lines">@@ -661,33 +661,28 @@
</span><span class="cx"> {
</span><span class="cx"> const CSSSelectorList* selectorList = selector.selectorList();
</span><span class="cx">
</span><ins>+ ASSERT_WITH_MESSAGE(selectorList, "The CSS Parser should never produce valid :not() CSSSelector with an empty selectorList.");
</ins><span class="cx"> if (!selectorList)
</span><span class="cx"> return FunctionType::CannotMatchAnything;
</span><span class="cx">
</span><del>-#if ENABLE(CSS_SELECTORS_LEVEL4)
- if (selectorList->first()->tagHistory() || CSSSelectorList::next(selectorList->first()))
- return FunctionType::CannotCompile;
-#endif
</del><ins>+ FunctionType functionType = FunctionType::SimpleSelectorChecker;
+ for (const CSSSelector* subselector = selectorList->first(); subselector; subselector = CSSSelectorList::next(subselector)) {
+ SelectorFragmentList selectorFragments;
+ VisitedMode ignoreVisitedMode = VisitedMode::None;
+ FunctionType localFunctionType = constructFragments(subselector, selectorContext, selectorFragments, FragmentsLevel::InFunctionalPseudoType, positionInRootFragments, visitedMatchEnabled, ignoreVisitedMode);
+ ASSERT_WITH_MESSAGE(ignoreVisitedMode == VisitedMode::None, ":visited is disabled in the functional pseudo classes");
</ins><span class="cx">
</span><del>- SelectorFragmentList notFragments;
- VisitedMode ignoreVisitedMode = VisitedMode::None;
- FunctionType functionType = constructFragments(selectorList->first(), selectorContext, notFragments, FragmentsLevel::InFunctionalPseudoType, positionInRootFragments, visitedMatchEnabled, ignoreVisitedMode);
- ASSERT_WITH_MESSAGE(ignoreVisitedMode == VisitedMode::None, ":visited is disabled in the functional pseudo classes");
</del><ins>+ // Since this is not pseudo class filter, CannotMatchAnything implies this filter always passes.
+ if (localFunctionType == FunctionType::CannotMatchAnything)
+ continue;
</ins><span class="cx">
</span><del>- // Since this is not pseudo class filter, CannotMatchAnything implies this filter always passes.
- if (functionType == FunctionType::CannotMatchAnything)
- return FunctionType::SimpleSelectorChecker;
</del><ins>+ if (localFunctionType == FunctionType::CannotCompile)
+ return FunctionType::CannotCompile;
</ins><span class="cx">
</span><del>- if (functionType == FunctionType::CannotCompile)
- return functionType;
</del><ins>+ functionType = std::max(functionType, localFunctionType);
+ fragment.notFilters.append(selectorFragments);
+ }
</ins><span class="cx">
</span><del>- ASSERT(notFragments.size() == 1);
- if (notFragments.size() != 1)
- return FunctionType::CannotCompile;
-
- const SelectorFragment& subFragment = notFragments.first();
-
- fragment.notFilters.append(subFragment);
</del><span class="cx"> return functionType;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -982,12 +977,6 @@
</span><span class="cx"> minimum = std::max(minimum, minimumRequiredRegisterCountForNthChildFilter);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- // :not pseudo class filters cause some register pressure.
- for (const SelectorFragment& subFragment : selectorFragment.notFilters) {
- unsigned notFilterMinimum = minimumRegisterRequirements(subFragment);
- minimum = std::max(minimum, notFilterMinimum);
- }
-
</del><span class="cx"> // :any pseudo class filters cause some register pressure.
</span><span class="cx"> for (const auto& subFragments : selectorFragment.anyFilters) {
</span><span class="cx"> for (const SelectorFragment& subFragment : subFragments) {
</span><span class="lines">@@ -1019,6 +1008,8 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (selectorFragmentList.size() != 1)
</span><span class="cx"> return true;
</span><ins>+ if (hasAnyCombinators(selectorFragmentList.first().notFilters))
+ return true;
</ins><span class="cx"> for (const NthChildOfSelectorInfo& nthChildOfSelectorInfo : selectorFragmentList.first().nthChildOfFilters) {
</span><span class="cx"> if (hasAnyCombinators(nthChildOfSelectorInfo.selectorList))
</span><span class="cx"> return true;
</span><span class="lines">@@ -1029,8 +1020,32 @@
</span><span class="cx"> // The CSS JIT has only been validated with a strict minimum of 6 allocated registers.
</span><span class="cx"> const unsigned minimumRegisterRequirement = 6;
</span><span class="cx">
</span><del>-static void computeBacktrackingMemoryRequirements(SelectorFragmentList& selectorFragments, bool backtrackingRegisterReserved = false)
</del><ins>+void computeBacktrackingMemoryRequirements(SelectorFragmentList& selectorFragments, bool backtrackingRegisterReserved = false);
+
+static void computeBacktrackingMemoryRequirements(SelectorList& selectorList, unsigned& totalRegisterRequirements, unsigned& totalStackRequirements, bool backtrackingRegisterReservedForFragment = false)
</ins><span class="cx"> {
</span><ins>+ unsigned selectorListRegisterRequirements = 0;
+ unsigned selectorListStackRequirements = 0;
+ bool clobberElementAddressRegister = false;
+
+ for (SelectorFragmentList& selectorFragmentList : selectorList) {
+ computeBacktrackingMemoryRequirements(selectorFragmentList, backtrackingRegisterReservedForFragment);
+
+ selectorListRegisterRequirements = std::max(selectorListRegisterRequirements, selectorFragmentList.registerRequirements);
+ selectorListStackRequirements = std::max(selectorListStackRequirements, selectorFragmentList.stackRequirements);
+ clobberElementAddressRegister = clobberElementAddressRegister || selectorFragmentList.clobberElementAddressRegister;
+ }
+
+ totalRegisterRequirements = std::max(totalRegisterRequirements, selectorListRegisterRequirements);
+ totalStackRequirements = std::max(totalStackRequirements, selectorListStackRequirements);
+
+ selectorList.registerRequirements = std::max(selectorListRegisterRequirements, minimumRegisterRequirement);
+ selectorList.stackRequirements = selectorListStackRequirements;
+ selectorList.clobberElementAddressRegister = clobberElementAddressRegister;
+}
+
+void computeBacktrackingMemoryRequirements(SelectorFragmentList& selectorFragments, bool backtrackingRegisterReserved)
+{
</ins><span class="cx"> selectorFragments.registerRequirements = minimumRegisterRequirement;
</span><span class="cx"> selectorFragments.stackRequirements = 0;
</span><span class="cx"> selectorFragments.clobberElementAddressRegister = hasAnyCombinators(selectorFragments);
</span><span class="lines">@@ -1039,27 +1054,13 @@
</span><span class="cx"> unsigned fragmentRegisterRequirements = minimumRegisterRequirements(selectorFragment);
</span><span class="cx"> unsigned fragmentStackRequirements = 0;
</span><span class="cx">
</span><del>- if (!selectorFragment.nthChildOfFilters.isEmpty()) {
- bool backtrackingRegisterReservedForFragment = backtrackingRegisterReserved || selectorFragment.backtrackingFlags & BacktrackingFlag::InChainWithDescendantTail;
</del><ins>+ bool backtrackingRegisterReservedForFragment = backtrackingRegisterReserved || selectorFragment.backtrackingFlags & BacktrackingFlag::InChainWithDescendantTail;
</ins><span class="cx">
</span><del>- for (NthChildOfSelectorInfo& nthChildOfSelectorInfo : selectorFragment.nthChildOfFilters) {
- unsigned nthChildOfSelectorInfoRegisterRequirements = minimumRegisterRequirement;
- bool clobberElementAddressRegister = false;
</del><ins>+ computeBacktrackingMemoryRequirements(selectorFragment.notFilters, fragmentRegisterRequirements, fragmentStackRequirements, backtrackingRegisterReservedForFragment);
</ins><span class="cx">
</span><del>- for (SelectorFragmentList& nestedSelectorFragmentList : nthChildOfSelectorInfo.selectorList) {
- computeBacktrackingMemoryRequirements(nestedSelectorFragmentList, backtrackingRegisterReservedForFragment);
</del><ins>+ for (NthChildOfSelectorInfo& nthChildOfSelectorInfo : selectorFragment.nthChildOfFilters)
+ computeBacktrackingMemoryRequirements(nthChildOfSelectorInfo.selectorList, fragmentRegisterRequirements, fragmentStackRequirements, backtrackingRegisterReservedForFragment);
</ins><span class="cx">
</span><del>- nthChildOfSelectorInfoRegisterRequirements = std::max(nthChildOfSelectorInfoRegisterRequirements, nestedSelectorFragmentList.registerRequirements);
- clobberElementAddressRegister = clobberElementAddressRegister || nestedSelectorFragmentList.clobberElementAddressRegister;
-
- fragmentStackRequirements = std::max(fragmentStackRequirements, nestedSelectorFragmentList.stackRequirements);
- }
- fragmentRegisterRequirements = std::max(fragmentRegisterRequirements, nthChildOfSelectorInfoRegisterRequirements);
- nthChildOfSelectorInfo.selectorList.registerRequirements = nthChildOfSelectorInfoRegisterRequirements;
- nthChildOfSelectorInfo.selectorList.clobberElementAddressRegister = clobberElementAddressRegister;
- }
- }
-
</del><span class="cx"> if (selectorFragment.backtrackingFlags & BacktrackingFlag::InChainWithDescendantTail) {
</span><span class="cx"> if (!backtrackingRegisterReserved)
</span><span class="cx"> ++fragmentRegisterRequirements;
</span><span class="lines">@@ -1470,6 +1471,18 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> for (SelectorFragment& fragment : selectorFragments) {
</span><ins>+ if (!fragment.notFilters.isEmpty()) {
+#if CSS_SELECTOR_JIT_DEBUGGING
+ dataLogF(" ");
+ dataLogF("Subselectors for :not():\n");
+#endif
+
+ for (SelectorFragmentList& selectorList : fragment.notFilters)
+ computeBacktrackingInformation(selectorList, level + 1);
+ }
+ }
+
+ for (SelectorFragment& fragment : selectorFragments) {
</ins><span class="cx"> for (NthChildOfSelectorInfo& nthChildOfSelectorInfo : fragment.nthChildOfFilters) {
</span><span class="cx"> #if CSS_SELECTOR_JIT_DEBUGGING
</span><span class="cx"> for (unsigned i = level; i; --i)
</span><span class="lines">@@ -3453,13 +3466,11 @@
</span><span class="cx">
</span><span class="cx"> void SelectorCodeGenerator::generateElementMatchesNotPseudoClass(Assembler::JumpList& failureCases, const SelectorFragment& fragment)
</span><span class="cx"> {
</span><del>- 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);
- }
</del><ins>+ Assembler::JumpList localFailureCases;
+ generateElementMatchesSelectorList(localFailureCases, elementAddressRegister, fragment.notFilters);
+ // 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"> }
</span><span class="cx">
</span><span class="cx"> void SelectorCodeGenerator::generateElementMatchesAnyPseudoClass(Assembler::JumpList& failureCases, const SelectorFragment& fragment)
</span></span></pre>
</div>
</div>
</body>
</html>