<!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>[208055] 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/208055">208055</a></dd>
<dt>Author</dt> <dd>hyatt@apple.com</dd>
<dt>Date</dt> <dd>2016-10-28 10:42:47 -0700 (Fri, 28 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Parser] Support the marquee properties
https://bugs.webkit.org/show_bug.cgi?id=164132
Reviewed by Zalan Bujtas.
* css/parser/CSSParserFastPaths.cpp:
(WebCore::CSSParserFastPaths::isValidKeywordPropertyAndValue):
* css/parser/CSSPropertyParser.cpp:
(WebCore::consumeWebkitMarqueeIncrement):
(WebCore::consumeWebkitMarqueeRepetition):
(WebCore::consumeWebkitMarqueeSpeed):
(WebCore::CSSPropertyParser::parseSingleValue):
(WebCore::CSSPropertyParser::parseShorthand):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssStyleBuilderConverterh">trunk/Source/WebCore/css/StyleBuilderConverter.h</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSParserFastPathscpp">trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSPropertyParsercpp">trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208054 => 208055)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-28 17:41:55 UTC (rev 208054)
+++ trunk/Source/WebCore/ChangeLog 2016-10-28 17:42:47 UTC (rev 208055)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2016-10-28 Dave Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><ins>+ [CSS Parser] Support the marquee properties
+ https://bugs.webkit.org/show_bug.cgi?id=164132
+
+ Reviewed by Zalan Bujtas.
+
+ * css/parser/CSSParserFastPaths.cpp:
+ (WebCore::CSSParserFastPaths::isValidKeywordPropertyAndValue):
+ * css/parser/CSSPropertyParser.cpp:
+ (WebCore::consumeWebkitMarqueeIncrement):
+ (WebCore::consumeWebkitMarqueeRepetition):
+ (WebCore::consumeWebkitMarqueeSpeed):
+ (WebCore::CSSPropertyParser::parseSingleValue):
+ (WebCore::CSSPropertyParser::parseShorthand):
+
+2016-10-28 Dave Hyatt <hyatt@apple.com>
+
</ins><span class="cx"> [CSS Parser] Miscellaneous bug fixes
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=164131
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleBuilderConverterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleBuilderConverter.h (208054 => 208055)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleBuilderConverter.h 2016-10-28 17:41:55 UTC (rev 208054)
+++ trunk/Source/WebCore/css/StyleBuilderConverter.h 2016-10-28 17:42:47 UTC (rev 208055)
</span><span class="lines">@@ -341,14 +341,14 @@
</span><span class="cx">
</span><span class="cx"> if (value.isValueID()) {
</span><span class="cx"> switch (value.valueID()) {
</span><del>- case cssValueFor0:
- return Length(0, Percent);
- case cssValueFor100:
- return Length(100, Percent);
- case CSSValueCenter:
- return Length(50, Percent);
- default:
- ASSERT_NOT_REACHED();
</del><ins>+ case cssValueFor0:
+ return Length(0, Percent);
+ case cssValueFor100:
+ return Length(100, Percent);
+ case CSSValueCenter:
+ return Length(50, Percent);
+ default:
+ ASSERT_NOT_REACHED();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSParserFastPathscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp (208054 => 208055)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp 2016-10-28 17:41:55 UTC (rev 208054)
+++ trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp 2016-10-28 17:42:47 UTC (rev 208055)
</span><span class="lines">@@ -792,6 +792,11 @@
</span><span class="cx"> case CSSPropertyWebkitTouchCallout:
</span><span class="cx"> return valueID == CSSValueDefault || valueID == CSSValueNone;
</span><span class="cx"> #endif
</span><ins>+ case CSSPropertyWebkitMarqueeDirection:
+ return valueID == CSSValueForwards || valueID == CSSValueBackwards || valueID == CSSValueAhead || valueID == CSSValueReverse || valueID == CSSValueLeft || valueID == CSSValueRight || valueID == CSSValueDown
+ || valueID == CSSValueUp || valueID == CSSValueAuto;
+ case CSSPropertyWebkitMarqueeStyle:
+ return valueID == CSSValueNone || valueID == CSSValueSlide || valueID == CSSValueScroll || valueID == CSSValueAlternate;
</ins><span class="cx"> default:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSPropertyParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp (208054 => 208055)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp 2016-10-28 17:41:55 UTC (rev 208054)
+++ trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp 2016-10-28 17:42:47 UTC (rev 208055)
</span><span class="lines">@@ -3125,6 +3125,27 @@
</span><span class="cx"> return consumeCustomIdent(range);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static RefPtr<CSSValue> consumeWebkitMarqueeIncrement(CSSParserTokenRange& range, CSSParserMode cssParserMode)
+{
+ if (range.peek().type() == IdentToken)
+ return consumeIdent<CSSValueSmall, CSSValueMedium, CSSValueLarge>(range);
+ return consumeLengthOrPercent(range, cssParserMode, ValueRangeAll);
+}
+
+static RefPtr<CSSValue> consumeWebkitMarqueeRepetition(CSSParserTokenRange& range)
+{
+ if (range.peek().type() == IdentToken)
+ return consumeIdent<CSSValueInfinite>(range);
+ return consumeNumber(range, ValueRangeNonNegative);
+}
+
+static RefPtr<CSSValue> consumeWebkitMarqueeSpeed(CSSParserTokenRange& range, CSSParserMode cssParserMode)
+{
+ if (range.peek().type() == IdentToken)
+ return consumeIdent<CSSValueSlow, CSSValueNormal, CSSValueFast>(range);
+ return consumeTime(range, cssParserMode, ValueRangeNonNegative, UnitlessQuirk::Allow);
+}
+
</ins><span class="cx"> RefPtr<CSSValue> CSSPropertyParser::parseSingleValue(CSSPropertyID property, CSSPropertyID currentShorthand)
</span><span class="cx"> {
</span><span class="cx"> if (CSSParserFastPaths::isKeywordPropertyID(property)) {
</span><span class="lines">@@ -3495,6 +3516,12 @@
</span><span class="cx"> #endif
</span><span class="cx"> case CSSPropertyWebkitLineGrid:
</span><span class="cx"> return consumeLineGrid(m_range);
</span><ins>+ case CSSPropertyWebkitMarqueeIncrement:
+ return consumeWebkitMarqueeIncrement(m_range, m_context.mode);
+ case CSSPropertyWebkitMarqueeRepetition:
+ return consumeWebkitMarqueeRepetition(m_range);
+ case CSSPropertyWebkitMarqueeSpeed:
+ return consumeWebkitMarqueeSpeed(m_range, m_context.mode);
</ins><span class="cx"> default:
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="lines">@@ -4731,6 +4758,8 @@
</span><span class="cx"> return consumeGridTemplateShorthand(CSSPropertyGridTemplate, important);
</span><span class="cx"> case CSSPropertyGrid:
</span><span class="cx"> return consumeGridShorthand(important);
</span><ins>+ case CSSPropertyWebkitMarquee:
+ return consumeShorthandGreedily(webkitMarqueeShorthand(), important);
</ins><span class="cx"> default:
</span><span class="cx"> return false;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>