<!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>[187149] 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/187149">187149</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2015-07-21 22:23:06 -0700 (Tue, 21 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Selectors Level 4] Add #ifdefs to the new '>>' descendant combinator
https://bugs.webkit.org/show_bug.cgi?id=147184
Patch by Benjamin Poulain <bpoulain@apple.com> on 2015-07-21
Reviewed by Anders Carlsson.
Now that '>>>' is dead, the combinator '>>' is at risk.
This patch #ifdef all that code with the other experimental
features from Level 4.
* css/CSSGrammar.y.in:
* css/CSSParserValues.cpp:
(WebCore::CSSParserSelector::appendTagHistory):
* css/CSSParserValues.h:
* css/CSSSelector.cpp:
(WebCore::CSSSelector::CSSSelector):
(WebCore::CSSSelector::selectorText):
* css/CSSSelector.h:
(WebCore::CSSSelector::CSSSelector):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSGrammaryin">trunk/Source/WebCore/css/CSSGrammar.y.in</a></li>
<li><a href="#trunkSourceWebCorecssCSSParserValuescpp">trunk/Source/WebCore/css/CSSParserValues.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSParserValuesh">trunk/Source/WebCore/css/CSSParserValues.h</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (187148 => 187149)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-07-22 03:51:12 UTC (rev 187148)
+++ trunk/Source/WebCore/ChangeLog 2015-07-22 05:23:06 UTC (rev 187149)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-07-21 Benjamin Poulain <bpoulain@apple.com>
+
+ [CSS Selectors Level 4] Add #ifdefs to the new '>>' descendant combinator
+ https://bugs.webkit.org/show_bug.cgi?id=147184
+
+ Reviewed by Anders Carlsson.
+
+ Now that '>>>' is dead, the combinator '>>' is at risk.
+
+ This patch #ifdef all that code with the other experimental
+ features from Level 4.
+
+ * css/CSSGrammar.y.in:
+ * css/CSSParserValues.cpp:
+ (WebCore::CSSParserSelector::appendTagHistory):
+ * css/CSSParserValues.h:
+ * css/CSSSelector.cpp:
+ (WebCore::CSSSelector::CSSSelector):
+ (WebCore::CSSSelector::selectorText):
+ * css/CSSSelector.h:
+ (WebCore::CSSSelector::CSSSelector):
+
</ins><span class="cx"> 2015-07-21 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Node highlights are wrong when the page is zoomed
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSGrammaryin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSGrammar.y.in (187148 => 187149)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSGrammar.y.in 2015-07-22 03:51:12 UTC (rev 187148)
+++ trunk/Source/WebCore/css/CSSGrammar.y.in 2015-07-22 05:23:06 UTC (rev 187149)
</span><span class="lines">@@ -1011,7 +1011,9 @@
</span><span class="cx"> '+' maybe_space { $$ = CSSParserSelectorCombinator::DirectAdjacent; }
</span><span class="cx"> | '~' maybe_space { $$ = CSSParserSelectorCombinator::IndirectAdjacent; }
</span><span class="cx"> | '>' maybe_space { $$ = CSSParserSelectorCombinator::Child; }
</span><ins>+#if ENABLE_CSS_SELECTORS_LEVEL4
</ins><span class="cx"> | '>' '>' maybe_space { $$ = CSSParserSelectorCombinator::DescendantDoubleChild; }
</span><ins>+#endif
</ins><span class="cx"> ;
</span><span class="cx">
</span><span class="cx"> maybe_unary_operator: unary_operator | { $$ = 1; } ;
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParserValuescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParserValues.cpp (187148 => 187149)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParserValues.cpp 2015-07-22 03:51:12 UTC (rev 187148)
+++ trunk/Source/WebCore/css/CSSParserValues.cpp 2015-07-22 05:23:06 UTC (rev 187149)
</span><span class="lines">@@ -336,9 +336,11 @@
</span><span class="cx"> case CSSParserSelectorCombinator::DescendantSpace:
</span><span class="cx"> selectorRelation = CSSSelector::Descendant;
</span><span class="cx"> break;
</span><ins>+#if ENABLE_CSS_SELECTORS_LEVEL4
</ins><span class="cx"> case CSSParserSelectorCombinator::DescendantDoubleChild:
</span><span class="cx"> selectorRelation = CSSSelector::Descendant;
</span><span class="cx"> break;
</span><ins>+#endif
</ins><span class="cx"> case CSSParserSelectorCombinator::DirectAdjacent:
</span><span class="cx"> selectorRelation = CSSSelector::DirectAdjacent;
</span><span class="cx"> break;
</span><span class="lines">@@ -348,8 +350,10 @@
</span><span class="cx"> }
</span><span class="cx"> end->setRelation(selectorRelation);
</span><span class="cx">
</span><ins>+#if ENABLE_CSS_SELECTORS_LEVEL4
</ins><span class="cx"> if (relation == CSSParserSelectorCombinator::DescendantDoubleChild)
</span><span class="cx"> end->setDescendantUseDoubleChildSyntax();
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> end->setTagHistory(WTF::move(selector));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParserValuesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParserValues.h (187148 => 187149)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParserValues.h 2015-07-22 03:51:12 UTC (rev 187148)
+++ trunk/Source/WebCore/css/CSSParserValues.h 2015-07-22 05:23:06 UTC (rev 187149)
</span><span class="lines">@@ -181,7 +181,9 @@
</span><span class="cx"> enum class CSSParserSelectorCombinator {
</span><span class="cx"> Child,
</span><span class="cx"> DescendantSpace,
</span><ins>+#if ENABLE_CSS_SELECTORS_LEVEL4
</ins><span class="cx"> DescendantDoubleChild,
</span><ins>+#endif
</ins><span class="cx"> DirectAdjacent,
</span><span class="cx"> IndirectAdjacent
</span><span class="cx"> };
</span><span class="lines">@@ -236,7 +238,9 @@
</span><span class="cx"> void prependTagSelector(const QualifiedName&, bool tagIsForNamespaceRule = false);
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+#if ENABLE_CSS_SELECTORS_LEVEL4
</ins><span class="cx"> void setDescendantUseDoubleChildSyntax() { m_selector->setDescendantUseDoubleChildSyntax(); }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> std::unique_ptr<CSSSelector> m_selector;
</span><span class="cx"> std::unique_ptr<CSSParserSelector> m_tagHistory;
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSSelectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSSelector.cpp (187148 => 187149)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSSelector.cpp 2015-07-22 03:51:12 UTC (rev 187148)
+++ trunk/Source/WebCore/css/CSSSelector.cpp 2015-07-22 05:23:06 UTC (rev 187149)
</span><span class="lines">@@ -60,7 +60,9 @@
</span><span class="cx"> , m_hasNameWithCase(false)
</span><span class="cx"> , m_isForPage(false)
</span><span class="cx"> , m_tagIsForNamespaceRule(tagIsForNamespaceRule)
</span><ins>+#if ENABLE(CSS_SELECTORS_LEVEL4)
</ins><span class="cx"> , m_descendantDoubleChildSyntax(false)
</span><ins>+#endif
</ins><span class="cx"> , m_caseInsensitiveAttributeValueMatching(false)
</span><span class="cx"> {
</span><span class="cx"> const AtomicString& tagLocalName = tagQName.localName();
</span><span class="lines">@@ -699,8 +701,10 @@
</span><span class="cx"> if (const CSSSelector* tagHistory = cs->tagHistory()) {
</span><span class="cx"> switch (cs->relation()) {
</span><span class="cx"> case CSSSelector::Descendant:
</span><ins>+#if ENABLE(CSS_SELECTORS_LEVEL4)
</ins><span class="cx"> if (cs->m_descendantDoubleChildSyntax)
</span><span class="cx"> return tagHistory->selectorText(" >> " + str.toString() + rightSide);
</span><ins>+#endif
</ins><span class="cx"> return tagHistory->selectorText(" " + str.toString() + rightSide);
</span><span class="cx"> case CSSSelector::Child:
</span><span class="cx"> return tagHistory->selectorText(" > " + str.toString() + rightSide);
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSSelectorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSSelector.h (187148 => 187149)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSSelector.h 2015-07-22 03:51:12 UTC (rev 187148)
+++ trunk/Source/WebCore/css/CSSSelector.h 2015-07-22 05:23:06 UTC (rev 187149)
</span><span class="lines">@@ -283,11 +283,13 @@
</span><span class="cx"> ASSERT(m_relation == relation);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE_CSS_SELECTORS_LEVEL4
</ins><span class="cx"> void setDescendantUseDoubleChildSyntax()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(relation() == Descendant);
</span><span class="cx"> m_descendantDoubleChildSyntax = true;
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> Match match() const { return static_cast<Match>(m_match); }
</span><span class="cx"> void setMatch(Match match)
</span><span class="lines">@@ -315,7 +317,9 @@
</span><span class="cx"> unsigned m_hasNameWithCase : 1;
</span><span class="cx"> unsigned m_isForPage : 1;
</span><span class="cx"> unsigned m_tagIsForNamespaceRule : 1;
</span><ins>+#if ENABLE(CSS_SELECTORS_LEVEL4)
</ins><span class="cx"> unsigned m_descendantDoubleChildSyntax : 1;
</span><ins>+#endif
</ins><span class="cx"> unsigned m_caseInsensitiveAttributeValueMatching : 1;
</span><span class="cx">
</span><span class="cx"> unsigned simpleSelectorSpecificityForPage() const;
</span><span class="lines">@@ -455,7 +459,9 @@
</span><span class="cx"> , m_hasNameWithCase(false)
</span><span class="cx"> , m_isForPage(false)
</span><span class="cx"> , m_tagIsForNamespaceRule(false)
</span><ins>+#if ENABLE(CSS_SELECTORS_LEVEL4)
</ins><span class="cx"> , m_descendantDoubleChildSyntax(false)
</span><ins>+#endif
</ins><span class="cx"> , m_caseInsensitiveAttributeValueMatching(false)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -471,7 +477,9 @@
</span><span class="cx"> , m_hasNameWithCase(o.m_hasNameWithCase)
</span><span class="cx"> , m_isForPage(o.m_isForPage)
</span><span class="cx"> , m_tagIsForNamespaceRule(o.m_tagIsForNamespaceRule)
</span><ins>+#if ENABLE(CSS_SELECTORS_LEVEL4)
</ins><span class="cx"> , m_descendantDoubleChildSyntax(o.m_descendantDoubleChildSyntax)
</span><ins>+#endif
</ins><span class="cx"> , m_caseInsensitiveAttributeValueMatching(o.m_caseInsensitiveAttributeValueMatching)
</span><span class="cx"> {
</span><span class="cx"> if (o.m_hasRareData) {
</span></span></pre>
</div>
</div>
</body>
</html>