<!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>[208615] 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/208615">208615</a></dd>
<dt>Author</dt> <dd>hyatt@apple.com</dd>
<dt>Date</dt> <dd>2016-11-11 15:04:55 -0800 (Fri, 11 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Parser] Support the spring animation timing function
https://bugs.webkit.org/show_bug.cgi?id=164654
Reviewed by Dean Jackson.
* css/CSSValueKeywords.in:
* css/parser/CSSPropertyParser.cpp:
(WebCore::consumeSpringFunction):
(WebCore::consumeAnimationTimingFunction):
(WebCore::consumeAnimationValue):</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 (208614 => 208615)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-11 23:03:41 UTC (rev 208614)
+++ trunk/Source/WebCore/ChangeLog 2016-11-11 23:04:55 UTC (rev 208615)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-11-11 Dave Hyatt <hyatt@apple.com>
+
+ [CSS Parser] Support the spring animation timing function
+ https://bugs.webkit.org/show_bug.cgi?id=164654
+
+ Reviewed by Dean Jackson.
+
+ * css/CSSValueKeywords.in:
+ * css/parser/CSSPropertyParser.cpp:
+ (WebCore::consumeSpringFunction):
+ (WebCore::consumeAnimationTimingFunction):
+ (WebCore::consumeAnimationValue):
+
</ins><span class="cx"> 2016-11-11 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> WorkerGlobalScope's indexedDB property should be on the prototype, not the instance
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSValueKeywordsin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValueKeywords.in (208614 => 208615)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSValueKeywords.in 2016-11-11 23:03:41 UTC (rev 208614)
+++ trunk/Source/WebCore/css/CSSValueKeywords.in 2016-11-11 23:04:55 UTC (rev 208615)
</span><span class="lines">@@ -1199,6 +1199,7 @@
</span><span class="cx"> drop-shadow
</span><span class="cx"> url
</span><span class="cx"> cubic-bezier
</span><ins>+spring
</ins><span class="cx"> steps
</span><span class="cx">
</span><span class="cx"> // colors
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSPropertyParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp (208614 => 208615)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp 2016-11-11 23:03:41 UTC (rev 208614)
+++ trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp 2016-11-11 23:04:55 UTC (rev 208615)
</span><span class="lines">@@ -1183,8 +1183,42 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static RefPtr<CSSValue> consumeAnimationTimingFunction(CSSParserTokenRange& range)
</del><ins>+static RefPtr<CSSValue> consumeSpringFunction(CSSParserTokenRange& range)
</ins><span class="cx"> {
</span><ins>+ ASSERT(range.peek().functionId() == CSSValueSpring);
+ CSSParserTokenRange rangeCopy = range;
+ CSSParserTokenRange args = consumeFunction(rangeCopy);
+
+ // Mass must be greater than 0.
+ double mass;
+ if (!consumeNumberRaw(args, mass) || mass <= 0)
+ return nullptr;
+
+ // Stiffness must be greater than 0.
+ double stiffness;
+ if (!consumeNumberRaw(args, stiffness) || stiffness <= 0)
+ return nullptr;
+
+ // Damping coefficient must be greater than or equal to 0.
+ double damping;
+ if (!consumeNumberRaw(args, damping) || damping < 0)
+ return nullptr;
+
+ // Initial velocity may have any value.
+ double initialVelocity;
+ if (!consumeNumberRaw(args, initialVelocity))
+ return nullptr;
+
+ if (!args.atEnd())
+ return nullptr;
+
+ range = rangeCopy;
+
+ return CSSSpringTimingFunctionValue::create(mass, stiffness, damping, initialVelocity);
+}
+
+static RefPtr<CSSValue> consumeAnimationTimingFunction(CSSParserTokenRange& range, const CSSParserContext& context)
+{
</ins><span class="cx"> CSSValueID id = range.peek().id();
</span><span class="cx"> if (id == CSSValueEase || id == CSSValueLinear || id == CSSValueEaseIn
</span><span class="cx"> || id == CSSValueEaseOut || id == CSSValueEaseInOut || id == CSSValueStepStart || id == CSSValueStepEnd)
</span><span class="lines">@@ -1195,6 +1229,8 @@
</span><span class="cx"> return consumeCubicBezier(range);
</span><span class="cx"> if (function == CSSValueSteps)
</span><span class="cx"> return consumeSteps(range);
</span><ins>+ if (context.springTimingFunctionEnabled && function == CSSValueSpring)
+ return consumeSpringFunction(range);
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1221,7 +1257,7 @@
</span><span class="cx"> return consumeTransitionProperty(range);
</span><span class="cx"> case CSSPropertyAnimationTimingFunction:
</span><span class="cx"> case CSSPropertyTransitionTimingFunction:
</span><del>- return consumeAnimationTimingFunction(range);
</del><ins>+ return consumeAnimationTimingFunction(range, context);
</ins><span class="cx"> default:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return nullptr;
</span></span></pre>
</div>
</div>
</body>
</html>