<!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>[209302] 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/209302">209302</a></dd>
<dt>Author</dt> <dd>hyatt@apple.com</dd>
<dt>Date</dt> <dd>2016-12-03 11:56:49 -0800 (Sat, 03 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Parser] Support Dashboard Regions
https://bugs.webkit.org/show_bug.cgi?id=165357
Reviewed by Daniel Bates.
* css/CSSValueKeywords.in:
* css/parser/CSSPropertyParser.cpp:
(WebCore::consumeWebkitDashboardRegion):
(WebCore::CSSPropertyParser::parseSingleValue):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSValueKeywordsin">trunk/Source/WebCore/css/CSSValueKeywords.in</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 (209301 => 209302)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-03 19:05:22 UTC (rev 209301)
+++ trunk/Source/WebCore/ChangeLog 2016-12-03 19:56:49 UTC (rev 209302)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-12-03 Dave Hyatt <hyatt@apple.com>
+
+ [CSS Parser] Support Dashboard Regions
+ https://bugs.webkit.org/show_bug.cgi?id=165357
+
+ Reviewed by Daniel Bates.
+
+ * css/CSSValueKeywords.in:
+ * css/parser/CSSPropertyParser.cpp:
+ (WebCore::consumeWebkitDashboardRegion):
+ (WebCore::CSSPropertyParser::parseSingleValue):
+
</ins><span class="cx"> 2016-12-02 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Improve the behavior of scroll-into-view when the target is inside position:fixed
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSValueKeywordsin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValueKeywords.in (209301 => 209302)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSValueKeywords.in 2016-12-03 19:05:22 UTC (rev 209301)
+++ trunk/Source/WebCore/css/CSSValueKeywords.in 2016-12-03 19:56:49 UTC (rev 209302)
</span><span class="lines">@@ -1168,6 +1168,7 @@
</span><span class="cx"> -webkit-named-image
</span><span class="cx"> filter
</span><span class="cx"> -webkit-filter
</span><ins>+dashboard-region
</ins><span class="cx">
</span><span class="cx"> // deprecated gradients
</span><span class="cx"> from
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSPropertyParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp (209301 => 209302)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp 2016-12-03 19:05:22 UTC (rev 209301)
+++ trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp 2016-12-03 19:56:49 UTC (rev 209302)
</span><span class="lines">@@ -66,6 +66,9 @@
</span><span class="cx"> #include "CSSVariableParser.h"
</span><span class="cx"> #include "CSSVariableReferenceValue.h"
</span><span class="cx"> #include "Counter.h"
</span><ins>+#if ENABLE(DASHBOARD_SUPPORT)
+#include "DashboardRegion.h"
+#endif
</ins><span class="cx"> #include "FontFace.h"
</span><span class="cx"> #include "HashTools.h"
</span><span class="cx"> // FIXME-NEWPARSER: Replace Pair and Rect with actual CSSValue subclasses (CSSValuePair and CSSQuadValue).
</span><span class="lines">@@ -1466,7 +1469,7 @@
</span><span class="cx"> return consumeIdent<CSSValueNormal, CSSValueAlternate, CSSValueReverse, CSSValueAlternateReverse>(range);
</span><span class="cx"> case CSSPropertyAnimationDuration:
</span><span class="cx"> case CSSPropertyTransitionDuration:
</span><del>- return consumeTime(range, context.mode, ValueRangeNonNegative, UnitlessQuirk::Forbid);
</del><ins>+ return consumeTime(range, context.mode, ValueRangeNonNegative, UnitlessQuirk::Allow);
</ins><span class="cx"> case CSSPropertyAnimationFillMode:
</span><span class="cx"> return consumeIdent<CSSValueNone, CSSValueForwards, CSSValueBackwards, CSSValueBoth>(range);
</span><span class="cx"> case CSSPropertyAnimationIterationCount:
</span><span class="lines">@@ -3592,6 +3595,98 @@
</span><span class="cx"> return list;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(DASHBOARD_SUPPORT)
+
+static RefPtr<CSSValue> consumeWebkitDashboardRegion(CSSParserTokenRange& range, CSSParserMode mode)
+{
+ if (range.peek().id() == CSSValueNone)
+ return consumeIdent(range);
+
+ auto firstRegion = DashboardRegion::create();
+ DashboardRegion* region = nullptr;
+
+ bool requireCommas = false;
+
+ while (!range.atEnd()) {
+ if (!region)
+ region = firstRegion.ptr();
+ else {
+ auto nextRegion = DashboardRegion::create();
+ region->m_next = nextRegion.copyRef();
+ region = nextRegion.ptr();
+ }
+
+ if (range.peek().functionId() != CSSValueDashboardRegion)
+ return nullptr;
+
+ CSSParserTokenRange rangeCopy = range;
+ CSSParserTokenRange args = consumeFunction(rangeCopy);
+
+ // First arg is a label.
+ if (args.peek().type() != IdentToken)
+ return nullptr;
+ region->m_label = args.consumeIncludingWhitespace().value().toString();
+
+ // Comma is optional, so don't fail if we can't consume one.
+ requireCommas = consumeCommaIncludingWhitespace(args);
+
+ // Second arg is a type.
+ if (args.peek().type() != IdentToken)
+ return nullptr;
+ region->m_geometryType = args.consumeIncludingWhitespace().value().toString();
+ if (equalLettersIgnoringASCIICase(region->m_geometryType, "circle"))
+ region->m_isCircle = true;
+ else if (equalLettersIgnoringASCIICase(region->m_geometryType, "rectangle"))
+ region->m_isRectangle = true;
+ else
+ return nullptr;
+
+ if (args.atEnd()) {
+ // This originally used CSSValueInvalid by accident. It might be more logical to use something else.
+ RefPtr<CSSPrimitiveValue> amount = CSSValuePool::singleton().createIdentifierValue(CSSValueInvalid);
+ region->setTop(amount.copyRef());
+ region->setRight(amount.copyRef());
+ region->setBottom(amount.copyRef());
+ region->setLeft(WTFMove(amount));
+ range = rangeCopy;
+ continue;
+ }
+
+ // Next four arguments must be offset numbers or auto.
+ for (int i = 0; i < 4; ++i) {
+ if (args.atEnd() || (requireCommas && !consumeCommaIncludingWhitespace(args)))
+ return nullptr;
+
+ if (args.atEnd())
+ return nullptr;
+
+ RefPtr<CSSPrimitiveValue> amount;
+ if (args.peek().id() == CSSValueAuto)
+ amount = consumeIdent(args);
+ else
+ amount = consumeLength(args, mode, ValueRangeAll);
+
+ if (!i)
+ region->setTop(WTFMove(amount));
+ else if (i == 1)
+ region->setRight(WTFMove(amount));
+ else if (i == 2)
+ region->setBottom(WTFMove(amount));
+ else
+ region->setLeft(WTFMove(amount));
+ }
+
+ if (!args.atEnd())
+ return nullptr;
+
+ range = rangeCopy;
+ }
+
+ return CSSValuePool::singleton().createValue(RefPtr<DashboardRegion>(WTFMove(firstRegion)));
+}
+
+#endif
+
</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">@@ -4033,6 +4128,10 @@
</span><span class="cx"> return consumeWebkitAspectRatio(m_range);
</span><span class="cx"> case CSSPropertyWebkitTextEmphasisPosition:
</span><span class="cx"> return consumeTextEmphasisPosition(m_range);
</span><ins>+#if ENABLE(DASHBOARD_SUPPORT)
+ case CSSPropertyWebkitDashboardRegion:
+ return consumeWebkitDashboardRegion(m_range, m_context.mode);
+#endif
</ins><span class="cx"> default:
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>