<!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>[166863] 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/166863">166863</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-04-06 19:28:54 -0700 (Sun, 06 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move the PseudoPageClass types out of the pseudo element/class mix
https://bugs.webkit.org/show_bug.cgi?id=131284
Reviewed by Darin Adler.
Some more cleanup of Selector's pseudo types. This patch moves the page pseudo
class types into their own enumeration (PagePseudoClassType).
* css/CSSParserValues.cpp:
(WebCore::CSSParserSelector::parsePagePseudoSelector):
* css/CSSSelector.cpp:
(WebCore::CSSSelector::specificityForPage):
(WebCore::CSSSelector::pseudoId):
(WebCore::CSSSelector::selectorText):
* css/CSSSelector.h:
(WebCore::CSSSelector::setPagePseudoType):
(WebCore::CSSSelector::pagePseudoClassType):
* css/PageRuleCollector.cpp:
(WebCore::checkPageSelectorComponents):
* cssjit/SelectorCompiler.cpp:
(WebCore::SelectorCompiler::SelectorCodeGenerator::SelectorCodeGenerator):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSParserValuescpp">trunk/Source/WebCore/css/CSSParserValues.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSSelectorcpp">trunk/Source/WebCore/css/CSSSelector.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSSelectorh">trunk/Source/WebCore/css/CSSSelector.h</a></li>
<li><a href="#trunkSourceWebCorecssPageRuleCollectorcpp">trunk/Source/WebCore/css/PageRuleCollector.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 (166862 => 166863)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-07 02:25:19 UTC (rev 166862)
+++ trunk/Source/WebCore/ChangeLog 2014-04-07 02:28:54 UTC (rev 166863)
</span><span class="lines">@@ -1,5 +1,29 @@
</span><span class="cx"> 2014-04-06 Benjamin Poulain <benjamin@webkit.org>
</span><span class="cx">
</span><ins>+ Move the PseudoPageClass types out of the pseudo element/class mix
+ https://bugs.webkit.org/show_bug.cgi?id=131284
+
+ Reviewed by Darin Adler.
+
+ Some more cleanup of Selector's pseudo types. This patch moves the page pseudo
+ class types into their own enumeration (PagePseudoClassType).
+
+ * css/CSSParserValues.cpp:
+ (WebCore::CSSParserSelector::parsePagePseudoSelector):
+ * css/CSSSelector.cpp:
+ (WebCore::CSSSelector::specificityForPage):
+ (WebCore::CSSSelector::pseudoId):
+ (WebCore::CSSSelector::selectorText):
+ * css/CSSSelector.h:
+ (WebCore::CSSSelector::setPagePseudoType):
+ (WebCore::CSSSelector::pagePseudoClassType):
+ * css/PageRuleCollector.cpp:
+ (WebCore::checkPageSelectorComponents):
+ * cssjit/SelectorCompiler.cpp:
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::SelectorCodeGenerator):
+
+2014-04-06 Benjamin Poulain <benjamin@webkit.org>
+
</ins><span class="cx"> CSS JIT: add support for :last-child and :only-child
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=131283
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParserValuescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParserValues.cpp (166862 => 166863)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParserValues.cpp 2014-04-07 02:25:19 UTC (rev 166862)
+++ trunk/Source/WebCore/css/CSSParserValues.cpp 2014-04-07 02:28:54 UTC (rev 166863)
</span><span class="lines">@@ -153,19 +153,19 @@
</span><span class="cx">
</span><span class="cx"> CSSParserSelector* CSSParserSelector::parsePagePseudoSelector(const CSSParserString& pseudoTypeString)
</span><span class="cx"> {
</span><del>- CSSSelector::PseudoType pseudoType;
</del><ins>+ CSSSelector::PagePseudoClassType pseudoType;
</ins><span class="cx"> if (pseudoTypeString.equalIgnoringCase("first"))
</span><del>- pseudoType = CSSSelector::PseudoFirst;
</del><ins>+ pseudoType = CSSSelector::PagePseudoClassFirst;
</ins><span class="cx"> else if (pseudoTypeString.equalIgnoringCase("left"))
</span><del>- pseudoType = CSSSelector::PseudoLeft;
</del><ins>+ pseudoType = CSSSelector::PagePseudoClassLeft;
</ins><span class="cx"> else if (pseudoTypeString.equalIgnoringCase("right"))
</span><del>- pseudoType = CSSSelector::PseudoRight;
</del><ins>+ pseudoType = CSSSelector::PagePseudoClassRight;
</ins><span class="cx"> else
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> auto selector = std::make_unique<CSSParserSelector>();
</span><span class="cx"> selector->m_selector->m_match = CSSSelector::PagePseudoClass;
</span><del>- selector->m_selector->m_pseudoType = pseudoType;
</del><ins>+ selector->m_selector->setPagePseudoType(pseudoType);
</ins><span class="cx"> return selector.release();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSSelectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSSelector.cpp (166862 => 166863)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSSelector.cpp 2014-04-07 02:25:19 UTC (rev 166862)
+++ trunk/Source/WebCore/css/CSSSelector.cpp 2014-04-07 02:28:54 UTC (rev 166863)
</span><span class="lines">@@ -123,16 +123,14 @@
</span><span class="cx"> s += tagQName().localName() == starAtom ? 0 : 4;
</span><span class="cx"> break;
</span><span class="cx"> case PagePseudoClass:
</span><del>- switch (component->pseudoType()) {
- case PseudoFirst:
</del><ins>+ switch (component->pagePseudoClassType()) {
+ case PagePseudoClassFirst:
</ins><span class="cx"> s += 2;
</span><span class="cx"> break;
</span><del>- case PseudoLeft:
- case PseudoRight:
</del><ins>+ case PagePseudoClassLeft:
+ case PagePseudoClassRight:
</ins><span class="cx"> s += 1;
</span><span class="cx"> break;
</span><del>- default:
- ASSERT_NOT_REACHED();
</del><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="lines">@@ -230,9 +228,6 @@
</span><span class="cx"> case PseudoDoubleButton:
</span><span class="cx"> case PseudoSingleButton:
</span><span class="cx"> case PseudoNoButton:
</span><del>- case PseudoFirst:
- case PseudoLeft:
- case PseudoRight:
</del><span class="cx"> case PseudoInRange:
</span><span class="cx"> case PseudoOutOfRange:
</span><span class="cx"> case PseudoUserAgentCustomElement:
</span><span class="lines">@@ -572,18 +567,16 @@
</span><span class="cx"> str.append(']');
</span><span class="cx"> }
</span><span class="cx"> } else if (cs->m_match == CSSSelector::PagePseudoClass) {
</span><del>- switch (cs->pseudoType()) {
- case PseudoFirst:
</del><ins>+ switch (cs->pagePseudoClassType()) {
+ case PagePseudoClassFirst:
</ins><span class="cx"> str.appendLiteral(":first");
</span><span class="cx"> break;
</span><del>- case PseudoLeft:
</del><ins>+ case PagePseudoClassLeft:
</ins><span class="cx"> str.appendLiteral(":left");
</span><span class="cx"> break;
</span><del>- case PseudoRight:
</del><ins>+ case PagePseudoClassRight:
</ins><span class="cx"> str.appendLiteral(":right");
</span><span class="cx"> break;
</span><del>- default:
- ASSERT_NOT_REACHED();
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSSelectorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSSelector.h (166862 => 166863)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSSelector.h 2014-04-07 02:25:19 UTC (rev 166862)
+++ trunk/Source/WebCore/css/CSSSelector.h 2014-04-07 02:28:54 UTC (rev 166863)
</span><span class="lines">@@ -142,9 +142,6 @@
</span><span class="cx"> PseudoSingleButton,
</span><span class="cx"> PseudoNoButton,
</span><span class="cx"> PseudoSelection,
</span><del>- PseudoLeft,
- PseudoRight,
- PseudoFirst,
</del><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span><span class="cx"> PseudoFullScreen,
</span><span class="cx"> PseudoFullScreenDocument,
</span><span class="lines">@@ -162,6 +159,12 @@
</span><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+ enum PagePseudoClassType {
+ PagePseudoClassFirst = 1,
+ PagePseudoClassLeft,
+ PagePseudoClassRight,
+ };
+
</ins><span class="cx"> enum MarginBoxType {
</span><span class="cx"> TopLeftCornerMarginBox,
</span><span class="cx"> TopLeftMarginBox,
</span><span class="lines">@@ -200,6 +203,7 @@
</span><span class="cx"> const AtomicString& argument() const { return m_hasRareData ? m_data.m_rareData->m_argument : nullAtom; }
</span><span class="cx"> const CSSSelectorList* selectorList() const { return m_hasRareData ? m_data.m_rareData->m_selectorList.get() : 0; }
</span><span class="cx">
</span><ins>+ void setPagePseudoType(PagePseudoClassType pagePseudoType) { m_pseudoType = pagePseudoType; }
</ins><span class="cx"> void setValue(const AtomicString&);
</span><span class="cx"> void setAttribute(const QualifiedName&, bool isCaseInsensitive);
</span><span class="cx"> void setArgument(const AtomicString&);
</span><span class="lines">@@ -208,6 +212,8 @@
</span><span class="cx"> bool parseNth() const;
</span><span class="cx"> bool matchNth(int count) const;
</span><span class="cx">
</span><ins>+ PagePseudoClassType pagePseudoClassType() const { ASSERT(m_match == PagePseudoClass); return static_cast<PagePseudoClassType>(m_pseudoType); }
+
</ins><span class="cx"> bool matchesPseudoElement() const;
</span><span class="cx"> bool isUnknownPseudoElement() const;
</span><span class="cx"> bool isCustomPseudoElement() const;
</span></span></pre></div>
<a id="trunkSourceWebCorecssPageRuleCollectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/PageRuleCollector.cpp (166862 => 166863)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/PageRuleCollector.cpp 2014-04-07 02:25:19 UTC (rev 166862)
+++ trunk/Source/WebCore/css/PageRuleCollector.cpp 2014-04-07 02:28:54 UTC (rev 166863)
</span><span class="lines">@@ -98,10 +98,10 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- CSSSelector::PseudoType pseudoType = component->pseudoType();
- if ((pseudoType == CSSSelector::PseudoLeft && !isLeftPage)
- || (pseudoType == CSSSelector::PseudoRight && isLeftPage)
- || (pseudoType == CSSSelector::PseudoFirst && !isFirstPage))
</del><ins>+ CSSSelector::PagePseudoClassType pseudoType = component->pagePseudoClassType();
+ if ((pseudoType == CSSSelector::PagePseudoClassLeft && !isLeftPage)
+ || (pseudoType == CSSSelector::PagePseudoClassRight && isLeftPage)
+ || (pseudoType == CSSSelector::PagePseudoClassFirst && !isFirstPage))
</ins><span class="cx"> {
</span><span class="cx"> return false;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssjitSelectorCompilercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/cssjit/SelectorCompiler.cpp (166862 => 166863)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/cssjit/SelectorCompiler.cpp 2014-04-07 02:25:19 UTC (rev 166862)
+++ trunk/Source/WebCore/cssjit/SelectorCompiler.cpp 2014-04-07 02:28:54 UTC (rev 166863)
</span><span class="lines">@@ -391,9 +391,14 @@
</span><span class="cx"> case CSSSelector::Set:
</span><span class="cx"> fragment.attributes.append(AttributeMatchingInfo(selector, true));
</span><span class="cx"> break;
</span><ins>+ case CSSSelector::PagePseudoClass:
+ // Pseudo page class are only relevant for style resolution, they are ignored for matching.
+ break;
</ins><span class="cx"> case CSSSelector::Unknown:
</span><ins>+ ASSERT_NOT_REACHED();
+ m_functionType = FunctionType::CannotMatchAnything;
+ return;
</ins><span class="cx"> case CSSSelector::PseudoElement:
</span><del>- case CSSSelector::PagePseudoClass:
</del><span class="cx"> goto CannotHandleSelector;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>