<!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>[55605] 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/55605">55605</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2010-03-05 18:27:34 -0800 (Fri, 05 Mar 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>2010-03-05  Dean Jackson  &lt;dino@apple.com&gt;

        Reviewed by Simon Fraser.

        https://bugs.webkit.org/show_bug.cgi?id=35772
        Animation fill modes should be supported in the shorthand property

        Add CSSPropertyWebkitAnimationFillMode to the list of properties
        evaluated in the -webkit-animation shorthand.

        Test: animations/animation-shorthand.html

        * css/CSSParser.cpp:
        (WebCore::CSSParser::parseAnimationShorthand):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCorecssCSSParsercpp">trunk/WebCore/css/CSSParser.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsanimationsanimationshorthandexpectedtxt">trunk/LayoutTests/animations/animation-shorthand-expected.txt</a></li>
<li><a href="#trunkLayoutTestsanimationsanimationshorthandhtml">trunk/LayoutTests/animations/animation-shorthand.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (55604 => 55605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2010-03-06 01:09:01 UTC (rev 55604)
+++ trunk/LayoutTests/ChangeLog        2010-03-06 02:27:34 UTC (rev 55605)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2010-03-05  Dean Jackson  &lt;dino@apple.com&gt;
+
+        Reviewed by Simon Fraser.
+
+        https://bugs.webkit.org/show_bug.cgi?id=35772
+        Animation fill modes should be supported in the shorthand property
+
+        Testcase for animation shorthand property (appears to be
+        the first of its kind).
+
+        * animations/animation-shorthand-expected.txt: Added.
+        * animations/animation-shorthand.html: Added.
+
</ins><span class="cx"> 2010-03-05  Eric Seidel  &lt;eric@webkit.org&gt;
</span><span class="cx"> 
</span><span class="cx">         No review.  Skipping recently regressed test to unblock the commit-queue (20 patches waiting).
</span></span></pre></div>
<a id="trunkLayoutTestsanimationsanimationshorthandexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/animations/animation-shorthand-expected.txt (0 => 55605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/animations/animation-shorthand-expected.txt                                (rev 0)
+++ trunk/LayoutTests/animations/animation-shorthand-expected.txt        2010-03-06 02:27:34 UTC (rev 55605)
</span><span class="lines">@@ -0,0 +1,71 @@
</span><ins>+Testing webkitAnimationName on a: PASS
+Testing webkitAnimationDuration on a: PASS
+Testing webkitAnimationTimingFunction on a: PASS
+Testing webkitAnimationDelay on a: PASS
+Testing webkitAnimationIterationCount on a: PASS
+Testing webkitAnimationDirection on a: PASS
+Testing webkitAnimationFillMode on a: PASS
+Testing webkitAnimationName on b: PASS
+Testing webkitAnimationDuration on b: PASS
+Testing webkitAnimationTimingFunction on b: PASS
+Testing webkitAnimationDelay on b: PASS
+Testing webkitAnimationIterationCount on b: PASS
+Testing webkitAnimationDirection on b: PASS
+Testing webkitAnimationFillMode on b: PASS
+Testing webkitAnimationName on c: PASS
+Testing webkitAnimationDuration on c: PASS
+Testing webkitAnimationTimingFunction on c: PASS
+Testing webkitAnimationDelay on c: PASS
+Testing webkitAnimationIterationCount on c: PASS
+Testing webkitAnimationDirection on c: PASS
+Testing webkitAnimationFillMode on c: PASS
+Testing webkitAnimationName on d: PASS
+Testing webkitAnimationDuration on d: PASS
+Testing webkitAnimationTimingFunction on d: PASS
+Testing webkitAnimationDelay on d: PASS
+Testing webkitAnimationIterationCount on d: PASS
+Testing webkitAnimationDirection on d: PASS
+Testing webkitAnimationFillMode on d: PASS
+Testing webkitAnimationName on e: PASS
+Testing webkitAnimationDuration on e: PASS
+Testing webkitAnimationTimingFunction on e: PASS
+Testing webkitAnimationDelay on e: PASS
+Testing webkitAnimationIterationCount on e: PASS
+Testing webkitAnimationDirection on e: PASS
+Testing webkitAnimationFillMode on e: PASS
+Testing webkitAnimationName on f: PASS
+Testing webkitAnimationDuration on f: PASS
+Testing webkitAnimationTimingFunction on f: PASS
+Testing webkitAnimationDelay on f: PASS
+Testing webkitAnimationIterationCount on f: PASS
+Testing webkitAnimationDirection on f: PASS
+Testing webkitAnimationFillMode on f: PASS
+Testing webkitAnimationName on g: PASS
+Testing webkitAnimationDuration on g: PASS
+Testing webkitAnimationTimingFunction on g: PASS
+Testing webkitAnimationDelay on g: PASS
+Testing webkitAnimationIterationCount on g: PASS
+Testing webkitAnimationDirection on g: PASS
+Testing webkitAnimationFillMode on g: PASS
+Testing webkitAnimationName on h: PASS
+Testing webkitAnimationDuration on h: PASS
+Testing webkitAnimationTimingFunction on h: PASS
+Testing webkitAnimationDelay on h: PASS
+Testing webkitAnimationIterationCount on h: PASS
+Testing webkitAnimationDirection on h: PASS
+Testing webkitAnimationFillMode on h: PASS
+Testing webkitAnimationName on i: PASS
+Testing webkitAnimationDuration on i: PASS
+Testing webkitAnimationTimingFunction on i: PASS
+Testing webkitAnimationDelay on i: PASS
+Testing webkitAnimationIterationCount on i: PASS
+Testing webkitAnimationDirection on i: PASS
+Testing webkitAnimationFillMode on i: PASS
+Testing webkitAnimationName on j: PASS
+Testing webkitAnimationDuration on j: PASS
+Testing webkitAnimationTimingFunction on j: PASS
+Testing webkitAnimationDelay on j: PASS
+Testing webkitAnimationIterationCount on j: PASS
+Testing webkitAnimationDirection on j: PASS
+Testing webkitAnimationFillMode on j: PASS
+
</ins><span class="cx">Property changes on: trunk/LayoutTests/animations/animation-shorthand-expected.txt
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkLayoutTestsanimationsanimationshorthandhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/animations/animation-shorthand.html (0 => 55605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/animations/animation-shorthand.html                                (rev 0)
+++ trunk/LayoutTests/animations/animation-shorthand.html        2010-03-06 02:27:34 UTC (rev 55605)
</span><span class="lines">@@ -0,0 +1,108 @@
</span><ins>+&lt;html&gt; 
+&lt;head&gt;
+&lt;title&gt;Test animation shorthand property&lt;/title&gt; 
+&lt;style type=&quot;text/css&quot; media=&quot;screen&quot;&gt;
+.box {
+  height: 10px;
+  width: 10px;
+  background-color: blue;
+}
+#a {
+}
+#b {
+  -webkit-animation: none;
+}
+#c {
+  -webkit-animation: anim1 10s;
+}
+#d {
+  -webkit-animation: anim1 10s linear;
+}
+#e {
+  -webkit-animation: anim1 10s linear 5s;
+}
+#f {
+  -webkit-animation: anim1 10s linear 5s 3;
+}
+#g {
+  -webkit-animation: anim1 10s linear 5s infinite alternate;
+}
+#h {
+  -webkit-animation: anim1 10s linear 5s infinite alternate forwards;
+}
+#i {
+  -webkit-animation: anim1 10s linear normal none;
+}
+#j {
+  -webkit-animation: anim1 10s linear infinite backwards, anim2 3s none, anim3 5s both;
+}
+
+@-webkit-keyframes anim1 { }
+@-webkit-keyframes anim2 { }
+&lt;/style&gt;
+  &lt;script type=&quot;text/javascript&quot; charset=&quot;utf-8&quot;&gt;
+    if (window.layoutTestController)
+        layoutTestController.dumpAsText();
+  
+    const kProperties = [
+      &quot;webkitAnimationName&quot;,
+      &quot;webkitAnimationDuration&quot;,
+      &quot;webkitAnimationTimingFunction&quot;,
+      &quot;webkitAnimationDelay&quot;,
+      &quot;webkitAnimationIterationCount&quot;,
+      &quot;webkitAnimationDirection&quot;,
+      &quot;webkitAnimationFillMode&quot;
+    ];
+    const kExpectedResults = [
+      { id: 'a',  values: [ &quot;none&quot;, &quot;0s&quot;, &quot;cubic-bezier(0.25, 0.1, 0.25, 1)&quot;, &quot;0s&quot;, &quot;1&quot;, &quot;normal&quot;, &quot;none&quot; ] },
+      { id: 'b',  values: [ &quot;none&quot;, &quot;0s&quot;, &quot;cubic-bezier(0.25, 0.1, 0.25, 1)&quot;, &quot;0s&quot;, &quot;1&quot;, &quot;normal&quot;, &quot;none&quot; ] },
+      { id: 'c',  values: [ &quot;anim1&quot;, &quot;10s&quot;, &quot;cubic-bezier(0.25, 0.1, 0.25, 1)&quot;, &quot;0s&quot;, &quot;1&quot;, &quot;normal&quot;, &quot;none&quot; ] },
+      { id: 'd',  values: [ &quot;anim1&quot;, &quot;10s&quot;, &quot;cubic-bezier(0, 0, 1, 1)&quot;, &quot;0s&quot;, &quot;1&quot;, &quot;normal&quot;, &quot;none&quot; ] },
+      { id: 'e',  values: [ &quot;anim1&quot;, &quot;10s&quot;, &quot;cubic-bezier(0, 0, 1, 1)&quot;, &quot;5s&quot;, &quot;1&quot;, &quot;normal&quot;, &quot;none&quot; ] },
+      { id: 'f',  values: [ &quot;anim1&quot;, &quot;10s&quot;, &quot;cubic-bezier(0, 0, 1, 1)&quot;, &quot;5s&quot;, &quot;3&quot;, &quot;normal&quot;, &quot;none&quot; ] },
+      { id: 'g',  values: [ &quot;anim1&quot;, &quot;10s&quot;, &quot;cubic-bezier(0, 0, 1, 1)&quot;, &quot;5s&quot;, &quot;infinite&quot;, &quot;alternate&quot;, &quot;none&quot; ] },
+      { id: 'h',  values: [ &quot;anim1&quot;, &quot;10s&quot;, &quot;cubic-bezier(0, 0, 1, 1)&quot;, &quot;5s&quot;, &quot;infinite&quot;, &quot;alternate&quot;, &quot;forwards&quot; ] },
+      { id: 'i',  values: [ &quot;anim1&quot;, &quot;10s&quot;, &quot;cubic-bezier(0, 0, 1, 1)&quot;, &quot;0s&quot;, &quot;1&quot;, &quot;normal&quot;, &quot;none&quot; ] },
+      { id: 'j',  values: [ &quot;anim1, anim2, anim3&quot;, &quot;10s, 3s, 5s&quot;, &quot;cubic-bezier(0, 0, 1, 1), cubic-bezier(0.25, 0.1, 0.25, 1), cubic-bezier(0.25, 0.1, 0.25, 1)&quot;, &quot;0s, 0s, 0s&quot;, &quot;infinite, 1, 1&quot;, &quot;normal, normal, normal&quot;, &quot;backwards, none, both&quot; ] }
+    ];
+    
+    function start()
+    {
+      var resultsString = &quot;&quot;;
+      kExpectedResults.forEach(function(curItem) {
+        var el = document.getElementById(curItem.id);
+        var elStyle = window.getComputedStyle(el);
+        
+        for (var i=0; i &lt; kProperties.length; i++) {
+          var computedValue = elStyle[kProperties[i]];
+          var expectedValue = curItem.values[i];
+          if (computedValue == expectedValue)
+            resultsString += &quot;Testing &quot; + kProperties[i] + &quot; on &quot; + curItem.id + &quot;: PASS&quot; + &quot;&lt;br&gt;&quot;;
+          else
+            resultsString += &quot;Testing &quot; + kProperties[i] + &quot; on &quot; + curItem.id + &quot; expected &lt;code&gt;&quot; + expectedValue + &quot;&lt;/code&gt; got &lt;code&gt;&quot; + computedValue + &quot;&lt;/code&gt;: FAIL&quot; + &quot;&lt;br&gt;&quot;;
+          
+        }
+      });
+
+      var results = document.getElementById('result');
+      results.innerHTML = resultsString;
+    }
+    
+    window.addEventListener('load', start, false);
+  &lt;/script&gt;
+&lt;/head&gt; 
+&lt;body&gt;
+&lt;div id=&quot;a&quot; class=&quot;box&quot;&gt;&lt;/div&gt;
+&lt;div id=&quot;b&quot; class=&quot;box&quot;&gt;&lt;/div&gt;
+&lt;div id=&quot;c&quot; class=&quot;box&quot;&gt;&lt;/div&gt;
+&lt;div id=&quot;d&quot; class=&quot;box&quot;&gt;&lt;/div&gt;
+&lt;div id=&quot;e&quot; class=&quot;box&quot;&gt;&lt;/div&gt;
+&lt;div id=&quot;f&quot; class=&quot;box&quot;&gt;&lt;/div&gt;
+&lt;div id=&quot;g&quot; class=&quot;box&quot;&gt;&lt;/div&gt;
+&lt;div id=&quot;h&quot; class=&quot;box&quot;&gt;&lt;/div&gt;
+&lt;div id=&quot;i&quot; class=&quot;box&quot;&gt;&lt;/div&gt;
+&lt;div id=&quot;j&quot; class=&quot;box&quot;&gt;&lt;/div&gt;
+&lt;div id=&quot;result&quot;&gt;
+&lt;/div&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins><span class="cx">Property changes on: trunk/LayoutTests/animations/animation-shorthand.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (55604 => 55605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2010-03-06 01:09:01 UTC (rev 55604)
+++ trunk/WebCore/ChangeLog        2010-03-06 02:27:34 UTC (rev 55605)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2010-03-05  Dean Jackson  &lt;dino@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Reviewed by Simon Fraser.
+
+        https://bugs.webkit.org/show_bug.cgi?id=35772
+        Animation fill modes should be supported in the shorthand property
+
+        Add CSSPropertyWebkitAnimationFillMode to the list of properties
+        evaluated in the -webkit-animation shorthand.
+
+        Test: animations/animation-shorthand.html
+
+        * css/CSSParser.cpp:
+        (WebCore::CSSParser::parseAnimationShorthand):
+
+2010-03-05  Dean Jackson  &lt;dino@apple.com&gt;
+
</ins><span class="cx">         Reviewed by Simon Fraser
</span><span class="cx"> 
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=35815
</span></span></pre></div>
<a id="trunkWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/css/CSSParser.cpp (55604 => 55605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/css/CSSParser.cpp        2010-03-06 01:09:01 UTC (rev 55604)
+++ trunk/WebCore/css/CSSParser.cpp        2010-03-06 02:27:34 UTC (rev 55605)
</span><span class="lines">@@ -1891,7 +1891,8 @@
</span><span class="cx">                                 CSSPropertyWebkitAnimationTimingFunction,
</span><span class="cx">                                 CSSPropertyWebkitAnimationDelay,
</span><span class="cx">                                 CSSPropertyWebkitAnimationIterationCount,
</span><del>-                                CSSPropertyWebkitAnimationDirection };
</del><ins>+                                CSSPropertyWebkitAnimationDirection,
+                                CSSPropertyWebkitAnimationFillMode };
</ins><span class="cx">     const int numProperties = sizeof(properties) / sizeof(properties[0]);
</span><span class="cx">     
</span><span class="cx">     ShorthandScope scope(this, CSSPropertyWebkitAnimation);
</span></span></pre>
</div>
</div>

</body>
</html>