<!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>[177946] trunk</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/177946">177946</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-01-05 20:46:51 -0800 (Mon, 05 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>calc() cannot be used in steps() for -webkit-animation-timing-function
https://bugs.webkit.org/show_bug.cgi?id=140091
Reviewed by Darin Adler.
Source/WebCore:
calc() could not be used in steps() for -webkit-animation-timing-function
CSS property because the CSS parser did not handle this case properly.
This patch addresses the issue.
Test: fast/css/animation-steps-calculated-value.html
* css/CSSParser.cpp:
(WebCore::CSSParser::parseAnimationTimingFunction):
LayoutTests:
Add a layout test to make sure that calc() can be used in steps() for
-webkit-animation-timing-function CSS property.
* fast/css/animation-steps-calculated-value-expected.txt: Added.
* fast/css/animation-steps-calculated-value.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSParsercpp">trunk/Source/WebCore/css/CSSParser.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcssanimationstepscalculatedvalueexpectedtxt">trunk/LayoutTests/fast/css/animation-steps-calculated-value-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssanimationstepscalculatedvaluehtml">trunk/LayoutTests/fast/css/animation-steps-calculated-value.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (177945 => 177946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-01-06 02:38:35 UTC (rev 177945)
+++ trunk/LayoutTests/ChangeLog 2015-01-06 04:46:51 UTC (rev 177946)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2015-01-05 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ calc() cannot be used in steps() for -webkit-animation-timing-function
+ https://bugs.webkit.org/show_bug.cgi?id=140091
+
+ Reviewed by Darin Adler.
+
+ Add a layout test to make sure that calc() can be used in steps() for
+ -webkit-animation-timing-function CSS property.
+
+ * fast/css/animation-steps-calculated-value-expected.txt: Added.
+ * fast/css/animation-steps-calculated-value.html: Added.
+
+2015-01-05 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Regression(r163928): Animated images are not resumed on window resizing
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=139714
</span><span class="cx"> <rdar://problem/18855285>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssanimationstepscalculatedvalueexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/animation-steps-calculated-value-expected.txt (0 => 177946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/animation-steps-calculated-value-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/css/animation-steps-calculated-value-expected.txt 2015-01-06 04:46:51 UTC (rev 177946)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+Tests assigning using calculated value in steps() for -webkit-animation-timing-function works.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS testDiv.style['-webkit-animation-timing-function'] is ""
+testDiv.style['-webkit-animation-timing-function'] = 'steps(calc(1 + 2), end)'
+PASS testDiv.style['-webkit-animation-timing-function'] is "steps(3, end)"
+PASS window.getComputedStyle(testDiv).getPropertyValue('-webkit-animation-timing-function') is "steps(3, end)"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssanimationstepscalculatedvaluehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/animation-steps-calculated-value.html (0 => 177946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/animation-steps-calculated-value.html (rev 0)
+++ trunk/LayoutTests/fast/css/animation-steps-calculated-value.html 2015-01-06 04:46:51 UTC (rev 177946)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+<!DOCTYPE html>
+<body>
+<script src="../../resources/js-test-pre.js"></script>
+<div id="testDiv"></div>
+<script>
+description("Tests assigning using calculated value in steps() for -webkit-animation-timing-function works.");
+
+var testDiv = document.getElementById("testDiv");
+
+shouldBeEmptyString("testDiv.style['-webkit-animation-timing-function']");
+evalAndLog("testDiv.style['-webkit-animation-timing-function'] = 'steps(calc(1 + 2), end)'");
+shouldBeEqualToString("testDiv.style['-webkit-animation-timing-function']", "steps(3, end)");
+shouldBeEqualToString("window.getComputedStyle(testDiv).getPropertyValue('-webkit-animation-timing-function')", "steps(3, end)");
+
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (177945 => 177946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-06 02:38:35 UTC (rev 177945)
+++ trunk/Source/WebCore/ChangeLog 2015-01-06 04:46:51 UTC (rev 177946)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-01-05 Chris Dumez <cdumez@apple.com>
+
+ calc() cannot be used in steps() for -webkit-animation-timing-function
+ https://bugs.webkit.org/show_bug.cgi?id=140091
+
+ Reviewed by Darin Adler.
+
+ calc() could not be used in steps() for -webkit-animation-timing-function
+ CSS property because the CSS parser did not handle this case properly.
+ This patch addresses the issue.
+
+ Test: fast/css/animation-steps-calculated-value.html
+
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseAnimationTimingFunction):
+
</ins><span class="cx"> 2015-01-05 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] One more build fix for r177937.
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (177945 => 177946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2015-01-06 02:38:35 UTC (rev 177945)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2015-01-06 04:46:51 UTC (rev 177946)
</span><span class="lines">@@ -4731,8 +4731,7 @@
</span><span class="cx"> ValueWithCalculation argumentWithCalculation(*argument);
</span><span class="cx"> if (!validateUnit(argumentWithCalculation, FInteger))
</span><span class="cx"> return nullptr;
</span><del>- // FIXME: This doesn't handle calculated values.
- numSteps = clampToInteger(argument->fValue);
</del><ins>+ numSteps = clampToInteger(parsedDouble(argumentWithCalculation));
</ins><span class="cx"> if (numSteps < 1)
</span><span class="cx"> return nullptr;
</span><span class="cx"> argument = args->next();
</span></span></pre>
</div>
</div>
</body>
</html>