<!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>[173011] 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/173011">173011</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-08-27 12:15:52 -0700 (Wed, 27 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update the CSS Grammar selector names to get closer to the latest terminology
https://bugs.webkit.org/show_bug.cgi?id=136277
Patch by Benjamin Poulain <bpoulain@apple.com> on 2014-08-27
Reviewed by Andreas Kling.
CSS Selector Level 4 gives useful definitions for various parts of a selector
(see http://dev.w3.org/csswg/selectors4/#structure). This patch updates our names to be closer
to that spec.
Stricto sensu, our definition of "simple selector list" is wrong. I did not attempt to fix this
because updates of CSS Selector Level 4 and WebVTT will eventually make that whole concept useless.
* css/CSSGrammar.y.in:</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173010 => 173011)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-08-27 19:14:24 UTC (rev 173010)
+++ trunk/Source/WebCore/ChangeLog 2014-08-27 19:15:52 UTC (rev 173011)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-08-27 Benjamin Poulain <bpoulain@apple.com>
+
+ Update the CSS Grammar selector names to get closer to the latest terminology
+ https://bugs.webkit.org/show_bug.cgi?id=136277
+
+ Reviewed by Andreas Kling.
+
+ CSS Selector Level 4 gives useful definitions for various parts of a selector
+ (see http://dev.w3.org/csswg/selectors4/#structure). This patch updates our names to be closer
+ to that spec.
+
+ Stricto sensu, our definition of "simple selector list" is wrong. I did not attempt to fix this
+ because updates of CSS Selector Level 4 and WebVTT will eventually make that whole concept useless.
+
+ * css/CSSGrammar.y.in:
+
</ins><span class="cx"> 2014-08-27 Gyuyoung Kim <gyuyoung.kim@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL] Unskip compositing test
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSGrammaryin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSGrammar.y.in (173010 => 173011)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSGrammar.y.in 2014-08-27 19:14:24 UTC (rev 173010)
+++ trunk/Source/WebCore/css/CSSGrammar.y.in 2014-08-27 19:15:52 UTC (rev 173011)
</span><span class="lines">@@ -275,8 +275,8 @@
</span><span class="cx"> %type <id> property
</span><span class="cx">
</span><span class="cx"> %union { CSSParserSelector* selector; }
</span><del>-%type <selector> attrib class page_selector pseudo pseudo_page selector selector_with_trailing_whitespace simple_selector specifier specifier_list
-%destructor { delete $$; } attrib class page_selector pseudo pseudo_page selector selector_with_trailing_whitespace simple_selector specifier specifier_list
</del><ins>+%type <selector> attrib class page_selector pseudo pseudo_page complex_selector complex_selector_with_trailing_whitespace compound_selector specifier specifier_list
+%destructor { delete $$; } attrib class page_selector pseudo pseudo_page complex_selector complex_selector_with_trailing_whitespace compound_selector specifier specifier_list
</ins><span class="cx">
</span><span class="cx"> %union { Vector<std::unique_ptr<CSSParserSelector>>* selectorList; }
</span><span class="cx"> %type <selectorList> selector_list simple_selector_list
</span><span class="lines">@@ -1037,7 +1037,7 @@
</span><span class="cx"> before_selector_group_item: { parser->markSelectorStart(); } ;
</span><span class="cx">
</span><span class="cx"> selector_list:
</span><del>- selector %prec UNIMPORTANT_TOK {
</del><ins>+ complex_selector %prec UNIMPORTANT_TOK {
</ins><span class="cx"> $$ = nullptr;
</span><span class="cx"> if ($1) {
</span><span class="cx"> $$ = parser->createSelectorVector().release();
</span><span class="lines">@@ -1045,7 +1045,7 @@
</span><span class="cx"> parser->updateLastSelectorLineAndPosition();
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- | selector_list at_selector_end ',' maybe_space before_selector_group_item selector %prec UNIMPORTANT_TOK {
</del><ins>+ | selector_list at_selector_end ',' maybe_space before_selector_group_item complex_selector %prec UNIMPORTANT_TOK {
</ins><span class="cx"> std::unique_ptr<Vector<std::unique_ptr<CSSParserSelector>>> selectorList($1);
</span><span class="cx"> std::unique_ptr<CSSParserSelector> selector($6);
</span><span class="cx"> $$ = nullptr;
</span><span class="lines">@@ -1061,13 +1061,13 @@
</span><span class="cx"> }
</span><span class="cx"> ;
</span><span class="cx">
</span><del>-selector_with_trailing_whitespace:
- selector WHITESPACE;
</del><ins>+complex_selector_with_trailing_whitespace:
+ complex_selector WHITESPACE;
</ins><span class="cx">
</span><del>-selector:
- simple_selector
- | selector_with_trailing_whitespace
- | selector_with_trailing_whitespace simple_selector {
</del><ins>+complex_selector:
+ compound_selector
+ | complex_selector_with_trailing_whitespace
+ | complex_selector_with_trailing_whitespace compound_selector {
</ins><span class="cx"> std::unique_ptr<CSSParserSelector> left($1);
</span><span class="cx"> std::unique_ptr<CSSParserSelector> right($2);
</span><span class="cx"> $$ = nullptr;
</span><span class="lines">@@ -1076,7 +1076,7 @@
</span><span class="cx"> $$ = right.release();
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- | selector combinator simple_selector {
</del><ins>+ | complex_selector combinator compound_selector {
</ins><span class="cx"> std::unique_ptr<CSSParserSelector> left($1);
</span><span class="cx"> std::unique_ptr<CSSParserSelector> right($3);
</span><span class="cx"> $$ = nullptr;
</span><span class="lines">@@ -1085,7 +1085,7 @@
</span><span class="cx"> $$ = right.release();
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- | selector error {
</del><ins>+ | complex_selector error {
</ins><span class="cx"> $$ = nullptr;
</span><span class="cx"> delete $1;
</span><span class="cx"> }
</span><span class="lines">@@ -1097,7 +1097,7 @@
</span><span class="cx"> | IDENT '|'
</span><span class="cx"> ;
</span><span class="cx">
</span><del>-simple_selector:
</del><ins>+compound_selector:
</ins><span class="cx"> element_name {
</span><span class="cx"> $$ = new CSSParserSelector(QualifiedName(nullAtom, $1, parser->m_defaultNamespace));
</span><span class="cx"> }
</span><span class="lines">@@ -1127,14 +1127,14 @@
</span><span class="cx"> ;
</span><span class="cx">
</span><span class="cx"> simple_selector_list:
</span><del>- simple_selector %prec UNIMPORTANT_TOK {
</del><ins>+ compound_selector %prec UNIMPORTANT_TOK {
</ins><span class="cx"> $$ = nullptr;
</span><span class="cx"> if ($1) {
</span><span class="cx"> $$ = parser->createSelectorVector().release();
</span><span class="cx"> $$->append(std::unique_ptr<CSSParserSelector>($1));
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- | simple_selector_list maybe_space ',' maybe_space simple_selector %prec UNIMPORTANT_TOK {
</del><ins>+ | simple_selector_list maybe_space ',' maybe_space compound_selector %prec UNIMPORTANT_TOK {
</ins><span class="cx"> std::unique_ptr<Vector<std::unique_ptr<CSSParserSelector>>> list($1);
</span><span class="cx"> std::unique_ptr<CSSParserSelector> selector($5);
</span><span class="cx"> $$ = nullptr;
</span><span class="lines">@@ -1331,7 +1331,7 @@
</span><span class="cx"> $$ = selector.release();
</span><span class="cx"> }
</span><span class="cx"> // used by :not
</span><del>- | ':' NOTFUNCTION maybe_space simple_selector maybe_space ')' {
</del><ins>+ | ':' NOTFUNCTION maybe_space compound_selector maybe_space ')' {
</ins><span class="cx"> std::unique_ptr<CSSParserSelector> selector($4);
</span><span class="cx"> $$ = nullptr;
</span><span class="cx"> if (selector && selector->isSimple()) {
</span></span></pre>
</div>
</div>
</body>
</html>