<!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>[209085] 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/209085">209085</a></dd>
<dt>Author</dt> <dd>hyatt@apple.com</dd>
<dt>Date</dt> <dd>2016-11-29 13:04:05 -0800 (Tue, 29 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Parser] Fix ::cue parsing
https://bugs.webkit.org/show_bug.cgi?id=165152
Reviewed by Zalan Bujtas.
* css/parser/CSSParserValues.h:
(WebCore::CSSParserSelector::setPseudoElementType):
* css/parser/CSSSelectorParser.cpp:
(WebCore::isOnlyPseudoClassFunction):
(WebCore::isOnlyPseudoElementFunction):
(WebCore::CSSSelectorParser::consumePseudo):
(WebCore::isPseudoClassFunction): Deleted.
(WebCore::isPseudoElementFunction): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSParserValuesh">trunk/Source/WebCore/css/parser/CSSParserValues.h</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSSelectorParsercpp">trunk/Source/WebCore/css/parser/CSSSelectorParser.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209084 => 209085)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-29 19:46:31 UTC (rev 209084)
+++ trunk/Source/WebCore/ChangeLog 2016-11-29 21:04:05 UTC (rev 209085)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-11-29 Dave Hyatt <hyatt@apple.com>
+
+ [CSS Parser] Fix ::cue parsing
+ https://bugs.webkit.org/show_bug.cgi?id=165152
+
+ Reviewed by Zalan Bujtas.
+
+ * css/parser/CSSParserValues.h:
+ (WebCore::CSSParserSelector::setPseudoElementType):
+ * css/parser/CSSSelectorParser.cpp:
+ (WebCore::isOnlyPseudoClassFunction):
+ (WebCore::isOnlyPseudoElementFunction):
+ (WebCore::CSSSelectorParser::consumePseudo):
+ (WebCore::isPseudoClassFunction): Deleted.
+ (WebCore::isPseudoElementFunction): Deleted.
+
</ins><span class="cx"> 2016-11-28 Gavin Barraclough <barraclough@apple.com>
</span><span class="cx">
</span><span class="cx"> HTMLMediaElement::updateVolume should updateIsPlayingMedia
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSParserValuesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSParserValues.h (209084 => 209085)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSParserValues.h 2016-11-29 19:46:31 UTC (rev 209084)
+++ trunk/Source/WebCore/css/parser/CSSParserValues.h 2016-11-29 21:04:05 UTC (rev 209085)
</span><span class="lines">@@ -235,6 +235,8 @@
</span><span class="cx"> CSSSelector::Match match() const { return m_selector->match(); }
</span><span class="cx"> CSSSelector::PseudoElementType pseudoElementType() const { return m_selector->pseudoElementType(); }
</span><span class="cx"> const CSSSelectorList* selectorList() const { return m_selector->selectorList(); }
</span><ins>+
+ void setPseudoElementType(CSSSelector::PseudoElementType type) { m_selector->setPseudoElementType(type); }
</ins><span class="cx">
</span><span class="cx"> void adoptSelectorVector(Vector<std::unique_ptr<CSSParserSelector>>& selectorVector);
</span><span class="cx"> void setLangArgumentList(const Vector<CSSParserString>& stringVector);
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSSelectorParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSSelectorParser.cpp (209084 => 209085)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSSelectorParser.cpp 2016-11-29 19:46:31 UTC (rev 209084)
+++ trunk/Source/WebCore/css/parser/CSSSelectorParser.cpp 2016-11-29 21:04:05 UTC (rev 209085)
</span><span class="lines">@@ -461,7 +461,7 @@
</span><span class="cx"> return selector;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool isPseudoClassFunction(CSSSelector::PseudoClassType pseudoClassType)
</del><ins>+static bool isOnlyPseudoClassFunction(CSSSelector::PseudoClassType pseudoClassType)
</ins><span class="cx"> {
</span><span class="cx"> switch (pseudoClassType) {
</span><span class="cx"> case CSSSelector::PseudoClassNot:
</span><span class="lines">@@ -483,12 +483,10 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool isPseudoElementFunction(CSSSelector::PseudoElementType pseudoElementType)
</del><ins>+static bool isOnlyPseudoElementFunction(CSSSelector::PseudoElementType pseudoElementType)
</ins><span class="cx"> {
</span><ins>+ // Note that we omit cue since it can be both an ident or a function.
</ins><span class="cx"> switch (pseudoElementType) {
</span><del>-#if ENABLE(VIDEO_TRACK)
- case CSSSelector::PseudoElementCue:
-#endif
</del><span class="cx"> case CSSSelector::PseudoElementSlotted:
</span><span class="cx"> return true;
</span><span class="cx"> default:
</span><span class="lines">@@ -533,8 +531,22 @@
</span><span class="cx">
</span><span class="cx"> if (colons == 1)
</span><span class="cx"> selector = std::unique_ptr<CSSParserSelector>(CSSParserSelector::parsePseudoClassSelectorFromStringView(value));
</span><del>- else
</del><ins>+ else {
</ins><span class="cx"> selector = std::unique_ptr<CSSParserSelector>(CSSParserSelector::parsePseudoElementSelectorFromStringView(value));
</span><ins>+ if (selector && selector->match() == CSSSelector::PseudoElement && selector->pseudoElementType() == CSSSelector::PseudoElementWebKitCustom) {
+ // FIXME-NEWPARSER: The old parser treats cue as two pseudo-element types, because it
+ // is unable to handle a dual pseudo-element (one that can be both an ident or a
+ // function) without splitting them up.
+ //
+ // This means that "cue" is being parsed as PseudoElementWebkitCustom when used as an
+ // identifier, and it's being parsed as PseudoElementCue when used as a function.
+ //
+ // We have to mimic this behavior until the old parser is gone, at which point we can
+ // make all code use PseudoElementCue.
+ if (token.type() == FunctionToken && value.startsWithIgnoringASCIICase("cue"))
+ selector->setPseudoElementType(CSSSelector::PseudoElementCue);
+ }
+ }
</ins><span class="cx">
</span><span class="cx"> if (!selector || (selector->match() == CSSSelector::PseudoElement && m_disallowPseudoElements))
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -541,8 +553,8 @@
</span><span class="cx">
</span><span class="cx"> if (token.type() == IdentToken) {
</span><span class="cx"> range.consume();
</span><del>- if ((selector->match() == CSSSelector::PseudoElement && (selector->pseudoElementType() == CSSSelector::PseudoElementUnknown || isPseudoElementFunction(selector->pseudoElementType())))
- || (selector->match() == CSSSelector::PseudoClass && (selector->pseudoClassType() == CSSSelector::PseudoClassUnknown || isPseudoClassFunction(selector->pseudoClassType()))))
</del><ins>+ if ((selector->match() == CSSSelector::PseudoElement && (selector->pseudoElementType() == CSSSelector::PseudoElementUnknown || isOnlyPseudoElementFunction(selector->pseudoElementType())))
+ || (selector->match() == CSSSelector::PseudoClass && (selector->pseudoClassType() == CSSSelector::PseudoClassUnknown || isOnlyPseudoClassFunction(selector->pseudoClassType()))))
</ins><span class="cx"> return nullptr;
</span><span class="cx"> return selector;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>