<!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>[172679] 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/172679">172679</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-08-15 19:49:30 -0700 (Fri, 15 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unify the modes style resolution modes SharingRules and StyleInvalidation
https://bugs.webkit.org/show_bug.cgi?id=135969
Reviewed by Andreas Kling.
Unifying the Collector and SelectorCheckers was done in previous patches,
this is just removing the enums.
* css/ElementRuleCollector.cpp:
(WebCore::ElementRuleCollector::collectMatchingRules):
(WebCore::ElementRuleCollector::hasAnyMatchingRules):
* css/SelectorChecker.cpp:
(WebCore::SelectorChecker::match):
* css/SelectorChecker.h:
* css/StyleInvalidationAnalysis.cpp:
(WebCore::invalidateStyleRecursively):
* cssjit/SelectorCompiler.cpp:
(WebCore::SelectorCompiler::SelectorCodeGenerator::generateMarkPseudoStyleForPseudoElement):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssElementRuleCollectorcpp">trunk/Source/WebCore/css/ElementRuleCollector.cpp</a></li>
<li><a href="#trunkSourceWebCorecssSelectorCheckercpp">trunk/Source/WebCore/css/SelectorChecker.cpp</a></li>
<li><a href="#trunkSourceWebCorecssSelectorCheckerh">trunk/Source/WebCore/css/SelectorChecker.h</a></li>
<li><a href="#trunkSourceWebCorecssStyleInvalidationAnalysiscpp">trunk/Source/WebCore/css/StyleInvalidationAnalysis.cpp</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 (172678 => 172679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-08-16 02:32:54 UTC (rev 172678)
+++ trunk/Source/WebCore/ChangeLog 2014-08-16 02:49:30 UTC (rev 172679)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2014-08-15 Benjamin Poulain <benjamin@webkit.org>
</span><span class="cx">
</span><ins>+ Unify the modes style resolution modes SharingRules and StyleInvalidation
+ https://bugs.webkit.org/show_bug.cgi?id=135969
+
+ Reviewed by Andreas Kling.
+
+ Unifying the Collector and SelectorCheckers was done in previous patches,
+ this is just removing the enums.
+
+ * css/ElementRuleCollector.cpp:
+ (WebCore::ElementRuleCollector::collectMatchingRules):
+ (WebCore::ElementRuleCollector::hasAnyMatchingRules):
+ * css/SelectorChecker.cpp:
+ (WebCore::SelectorChecker::match):
+ * css/SelectorChecker.h:
+ * css/StyleInvalidationAnalysis.cpp:
+ (WebCore::invalidateStyleRecursively):
+ * cssjit/SelectorCompiler.cpp:
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::generateMarkPseudoStyleForPseudoElement):
+
+2014-08-15 Benjamin Poulain <benjamin@webkit.org>
+
</ins><span class="cx"> CSS JIT: compile :-webkit-full-page-media
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=135968
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssElementRuleCollectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/ElementRuleCollector.cpp (172678 => 172679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/ElementRuleCollector.cpp 2014-08-16 02:32:54 UTC (rev 172678)
+++ trunk/Source/WebCore/css/ElementRuleCollector.cpp 2014-08-16 02:49:30 UTC (rev 172679)
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(matchRequest.ruleSet);
</span><span class="cx"> ASSERT_WITH_MESSAGE(!(m_mode == SelectorChecker::Mode::ResolvingStyle && !m_style), "When resolving style, the SelectorChecker must have a style to set the pseudo elements and/or to do marking. The SelectorCompiler also rely on that behavior.");
</span><del>- ASSERT_WITH_MESSAGE(!((m_mode == SelectorChecker::Mode::StyleInvalidation || m_mode == SelectorChecker::Mode::SharingRules) && m_pseudoStyleRequest.pseudoId != NOPSEUDO), "When in mode StyleInvalidation or SharingRules, SelectorChecker does not try to match the pseudo ID. While ElementRuleCollector supports matching a particular pseudoId in this case, this would indicate a error at the call site since matching a particular element should be unnecessary.");
</del><ins>+ ASSERT_WITH_MESSAGE(!(m_mode == SelectorChecker::Mode::CollectingRulesIgnoringVirtualPseudoElements && m_pseudoStyleRequest.pseudoId != NOPSEUDO), "When in StyleInvalidation or SharingRules, SelectorChecker does not try to match the pseudo ID. While ElementRuleCollector supports matching a particular pseudoId in this case, this would indicate a error at the call site since matching a particular element should be unnecessary.");
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx"> if (m_element.isWebVTTElement())
</span><span class="lines">@@ -430,7 +430,7 @@
</span><span class="cx"> {
</span><span class="cx"> clearMatchedRules();
</span><span class="cx">
</span><del>- m_mode = SelectorChecker::Mode::SharingRules;
</del><ins>+ m_mode = SelectorChecker::Mode::CollectingRulesIgnoringVirtualPseudoElements;
</ins><span class="cx"> int firstRuleIndex = -1, lastRuleIndex = -1;
</span><span class="cx"> StyleResolver::RuleRange ruleRange(firstRuleIndex, lastRuleIndex);
</span><span class="cx"> collectMatchingRules(MatchRequest(ruleSet), ruleRange);
</span></span></pre></div>
<a id="trunkSourceWebCorecssSelectorCheckercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/SelectorChecker.cpp (172678 => 172679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/SelectorChecker.cpp 2014-08-16 02:32:54 UTC (rev 172678)
+++ trunk/Source/WebCore/css/SelectorChecker.cpp 2014-08-16 02:49:30 UTC (rev 172679)
</span><span class="lines">@@ -146,8 +146,9 @@
</span><span class="cx"> if (m_mode == Mode::ResolvingStyle && pseudoId < FIRST_INTERNAL_PSEUDOID)
</span><span class="cx"> context.elementStyle->setHasPseudoStyle(pseudoId);
</span><span class="cx">
</span><del>- // For SharingRules testing, any match is good enough, we don't care what is matched.
- return m_mode == Mode::SharingRules || m_mode == Mode::StyleInvalidation;
</del><ins>+ // When ignoring virtual pseudo elements, the context's pseudo should also be NOPSEUDO but that does
+ // not cause a failure.
+ return m_mode == Mode::CollectingRulesIgnoringVirtualPseudoElements;
</ins><span class="cx"> }
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssSelectorCheckerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/SelectorChecker.h (172678 => 172679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/SelectorChecker.h 2014-08-16 02:32:54 UTC (rev 172678)
+++ trunk/Source/WebCore/css/SelectorChecker.h 2014-08-16 02:49:30 UTC (rev 172679)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> public:
</span><span class="cx"> enum VisitedMatchType { VisitedMatchDisabled, VisitedMatchEnabled };
</span><span class="cx"> enum class Mode : unsigned char {
</span><del>- ResolvingStyle = 0, CollectingRules, QueryingRules, SharingRules, StyleInvalidation
</del><ins>+ ResolvingStyle = 0, CollectingRules, CollectingRulesIgnoringVirtualPseudoElements, QueryingRules
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> SelectorChecker(Document&, Mode);
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleInvalidationAnalysiscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleInvalidationAnalysis.cpp (172678 => 172679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleInvalidationAnalysis.cpp 2014-08-16 02:32:54 UTC (rev 172678)
+++ trunk/Source/WebCore/css/StyleInvalidationAnalysis.cpp 2014-08-16 02:49:30 UTC (rev 172679)
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> return;
</span><span class="cx"> if (element.styleChangeType() == NoStyleChange) {
</span><span class="cx"> ElementRuleCollector ruleCollector(element, nullptr, ruleSets, filter);
</span><del>- ruleCollector.setMode(SelectorChecker::Mode::StyleInvalidation);
</del><ins>+ ruleCollector.setMode(SelectorChecker::Mode::CollectingRulesIgnoringVirtualPseudoElements);
</ins><span class="cx"> ruleCollector.matchAuthorRules(false);
</span><span class="cx">
</span><span class="cx"> if (ruleCollector.hasMatchedRules())
</span></span></pre></div>
<a id="trunkSourceWebCorecssjitSelectorCompilercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/cssjit/SelectorCompiler.cpp (172678 => 172679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/cssjit/SelectorCompiler.cpp 2014-08-16 02:32:54 UTC (rev 172678)
+++ trunk/Source/WebCore/cssjit/SelectorCompiler.cpp 2014-08-16 02:49:30 UTC (rev 172679)
</span><span class="lines">@@ -3110,9 +3110,8 @@
</span><span class="cx"> // When the requested pseudoId isn't NOPSEUDO, there's no need to mark the pseudo element style.
</span><span class="cx"> successCases.append(m_assembler.branch8(Assembler::NotEqual, Assembler::Address(checkingContext, OBJECT_OFFSETOF(CheckingContext, pseudoId)), Assembler::TrustedImm32(NOPSEUDO)));
</span><span class="cx">
</span><del>- // When resolving mode is SharingRules or StyleInvalidation, there's no need to mark the pseudo element style.
- successCases.append(branchOnResolvingModeWithCheckingContext(Assembler::Equal, SelectorChecker::Mode::SharingRules, checkingContext));
- successCases.append(branchOnResolvingModeWithCheckingContext(Assembler::Equal, SelectorChecker::Mode::StyleInvalidation, checkingContext));
</del><ins>+ // When resolving mode is CollectingRulesIgnoringVirtualPseudoElements, there's no need to mark the pseudo element style.
+ successCases.append(branchOnResolvingModeWithCheckingContext(Assembler::Equal, SelectorChecker::Mode::CollectingRulesIgnoringVirtualPseudoElements, checkingContext));
</ins><span class="cx">
</span><span class="cx"> // When resolving mode is ResolvingStyle, mark the pseudo style for pseudo element.
</span><span class="cx"> PseudoId dynamicPseudo = CSSSelector::pseudoId(fragment.pseudoElementSelector->pseudoElementType());
</span><span class="lines">@@ -3121,8 +3120,9 @@
</span><span class="cx"> addFlagsToElementStyleFromContext(checkingContext, RenderStyle::NonInheritedFlags::flagPseudoStyle(dynamicPseudo));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // When resolving mode is not SharingRules or StyleInvalidation (In this case, ResolvingStyle or CollectingRules),
- // the checker including pseudo elements needs to fail for the matching request.
</del><ins>+ // We have a pseudoElementSelector, we are not in CollectingRulesIgnoringVirtualPseudoElements so
+ // we must match that pseudo element. Since the context's pseudo selector is NOPSEUDO, we fail matching
+ // after the marking.
</ins><span class="cx"> failureCases.append(m_assembler.jump());
</span><span class="cx">
</span><span class="cx"> successCases.link(&m_assembler);
</span></span></pre>
</div>
</div>
</body>
</html>