<!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>[165579] 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/165579">165579</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-03-13 17:31:18 -0700 (Thu, 13 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix a bunch of mistakes in the parsing of ::cue( and ::cue
https://bugs.webkit.org/show_bug.cgi?id=130113
Patch by Benjamin Poulain <bpoulain@apple.com> on 2014-03-13
Reviewed by Andreas Kling.
* css/CSSGrammar.y.in:
* css/CSSParserValues.cpp:
(WebCore::CSSParserSelector::setPseudoTypeValue):
The ::cue() pseudo element "function" was passed as a PseudoClass.
The type was then parsed and considered as a compatibility type to flip
the match type back to PseudoElement.
Instead of all that jazz, just pass the right type from the grammar.
* css/CSSSelector.cpp:
(WebCore::CSSSelector::parsePseudoType):
The non-function ::cue pseudo element use shadow pseudo ID for matching the element.
Since it is unprefixed, it needs to map to one of the Custom types. The previous code
was using String::startsWith() for some reason, change that to a simple equality.</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="#trunkSourceWebCorecssCSSSelectorcpp">trunk/Source/WebCore/css/CSSSelector.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (165578 => 165579)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-14 00:30:35 UTC (rev 165578)
+++ trunk/Source/WebCore/ChangeLog 2014-03-14 00:31:18 UTC (rev 165579)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-03-13 Benjamin Poulain <bpoulain@apple.com>
+
+ Fix a bunch of mistakes in the parsing of ::cue( and ::cue
+ https://bugs.webkit.org/show_bug.cgi?id=130113
+
+ Reviewed by Andreas Kling.
+
+ * css/CSSGrammar.y.in:
+ * css/CSSParserValues.cpp:
+ (WebCore::CSSParserSelector::setPseudoTypeValue):
+ The ::cue() pseudo element "function" was passed as a PseudoClass.
+ The type was then parsed and considered as a compatibility type to flip
+ the match type back to PseudoElement.
+
+ Instead of all that jazz, just pass the right type from the grammar.
+
+ * css/CSSSelector.cpp:
+ (WebCore::CSSSelector::parsePseudoType):
+ The non-function ::cue pseudo element use shadow pseudo ID for matching the element.
+ Since it is unprefixed, it needs to map to one of the Custom types. The previous code
+ was using String::startsWith() for some reason, change that to a simple equality.
+
</ins><span class="cx"> 2014-03-13 Benjamin Poulain <benjamin@webkit.org>
</span><span class="cx">
</span><span class="cx"> Clean up RenderStyle creation
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSGrammaryin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSGrammar.y.in (165578 => 165579)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSGrammar.y.in 2014-03-14 00:30:35 UTC (rev 165578)
+++ trunk/Source/WebCore/css/CSSGrammar.y.in 2014-03-14 00:31:18 UTC (rev 165579)
</span><span class="lines">@@ -1198,11 +1198,11 @@
</span><span class="cx"> $$ = nullptr;
</span><span class="cx"> if ($5) {
</span><span class="cx"> auto selector = std::make_unique<CSSParserSelector>();
</span><del>- selector->setMatch(CSSSelector::PseudoClass);
</del><ins>+ selector->setMatch(CSSSelector::PseudoElement);
</ins><span class="cx"> selector->adoptSelectorVector(*std::unique_ptr<Vector<std::unique_ptr<CSSParserSelector>>>($5));
</span><span class="cx"> selector->setPseudoTypeValue($3);
</span><del>- if (selector->pseudoType() == CSSSelector::PseudoCue)
- $$ = selector.release();
</del><ins>+ ASSERT(selector->pseudoType() == CSSSelector::PseudoCue);
+ $$ = selector.release();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParserValuescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParserValues.cpp (165578 => 165579)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParserValues.cpp 2014-03-14 00:30:35 UTC (rev 165578)
+++ trunk/Source/WebCore/css/CSSParserValues.cpp 2014-03-14 00:31:18 UTC (rev 165579)
</span><span class="lines">@@ -208,13 +208,13 @@
</span><span class="cx"> switch (pseudoType) {
</span><span class="cx"> case CSSSelector::PseudoAfter:
</span><span class="cx"> case CSSSelector::PseudoBefore:
</span><del>-#if ENABLE(VIDEO_TRACK)
- case CSSSelector::PseudoCue:
-#endif
</del><span class="cx"> case CSSSelector::PseudoFirstLetter:
</span><span class="cx"> case CSSSelector::PseudoFirstLine:
</span><span class="cx"> compat = true;
</span><span class="cx"> FALLTHROUGH;
</span><ins>+#if ENABLE(VIDEO_TRACK)
+ case CSSSelector::PseudoCue:
+#endif
</ins><span class="cx"> case CSSSelector::PseudoResizer:
</span><span class="cx"> case CSSSelector::PseudoScrollbar:
</span><span class="cx"> case CSSSelector::PseudoScrollbarCorner:
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSSelectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSSelector.cpp (165578 => 165579)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSSelector.cpp 2014-03-14 00:30:35 UTC (rev 165578)
+++ trunk/Source/WebCore/css/CSSSelector.cpp 2014-03-14 00:31:18 UTC (rev 165579)
</span><span class="lines">@@ -259,8 +259,10 @@
</span><span class="cx"> if (name.startsWith("-webkit-"))
</span><span class="cx"> type = PseudoWebKitCustomElement;
</span><span class="cx">
</span><del>- // FIXME: This is strange. Why would all strings that start with "cue" be "user agent custom"?
- if (name.startsWith("x-") || name.startsWith("cue"))
</del><ins>+ if (name == "cue")
+ type = PseudoWebKitCustomElement;
+
+ if (name.startsWith("x-"))
</ins><span class="cx"> type = PseudoUserAgentCustomElement;
</span><span class="cx"> }
</span><span class="cx"> return type;
</span></span></pre>
</div>
</div>
</body>
</html>