<!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>[176368] 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/176368">176368</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2014-11-19 16:59:09 -0800 (Wed, 19 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Handle unprefixed @keyframes rule
https://bugs.webkit.org/show_bug.cgi?id=138899
<rdar://problem/18943117>
Reviewed by Simon Fraser.
Source/WebCore:
Support the parsing of unprefixed @keyframes. In
CSSParser, assign the same token identifier to
the prefixed and unprefixed forms. This will
keep compatibility with older content. If a page
has both forms, then whatever comes last will
win (as it does if you had duplicate names of the same
form).
Tests: animations/unprefixed-keyframes-rule.html
animations/unprefixed-keyframes.html
* css/CSSGrammar.y.in: Rename the WEBKIT_KEYFRAME_RULE_SYM symbol to
be KEYFRAME_RULE_SYM. Same with KEYFRAMES_SYM.
* css/CSSParser.cpp:
(WebCore::CSSParser::detectAtToken): Look for the @keyframes style
strings and assign the new token values.
LayoutTests:
Tests for @keyframes, both the OM side and the parsing.
* animations/unprefixed-keyframes-expected.txt: Added.
* animations/unprefixed-keyframes-rule-expected.txt: Added.
* animations/unprefixed-keyframes-rule.html: Added.
* animations/unprefixed-keyframes.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="#trunkSourceWebCorecssCSSGrammaryin">trunk/Source/WebCore/css/CSSGrammar.y.in</a></li>
<li><a href="#trunkSourceWebCorecssCSSParsercpp">trunk/Source/WebCore/css/CSSParser.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsanimationsunprefixedkeyframesexpectedtxt">trunk/LayoutTests/animations/unprefixed-keyframes-expected.txt</a></li>
<li><a href="#trunkLayoutTestsanimationsunprefixedkeyframesruleexpectedtxt">trunk/LayoutTests/animations/unprefixed-keyframes-rule-expected.txt</a></li>
<li><a href="#trunkLayoutTestsanimationsunprefixedkeyframesrulehtml">trunk/LayoutTests/animations/unprefixed-keyframes-rule.html</a></li>
<li><a href="#trunkLayoutTestsanimationsunprefixedkeyframeshtml">trunk/LayoutTests/animations/unprefixed-keyframes.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (176367 => 176368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-11-20 00:34:35 UTC (rev 176367)
+++ trunk/LayoutTests/ChangeLog 2014-11-20 00:59:09 UTC (rev 176368)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-11-19 Dean Jackson <dino@apple.com>
+
+ Handle unprefixed @keyframes rule
+ https://bugs.webkit.org/show_bug.cgi?id=138899
+ <rdar://problem/18943117>
+
+ Reviewed by Simon Fraser.
+
+ Tests for @keyframes, both the OM side and the parsing.
+
+ * animations/unprefixed-keyframes-expected.txt: Added.
+ * animations/unprefixed-keyframes-rule-expected.txt: Added.
+ * animations/unprefixed-keyframes-rule.html: Added.
+ * animations/unprefixed-keyframes.html: Added.
+
</ins><span class="cx"> 2014-11-19 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: JSContext inspection Resource search does not work
</span></span></pre></div>
<a id="trunkLayoutTestsanimationsunprefixedkeyframesexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/animations/unprefixed-keyframes-expected.txt (0 => 176368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/animations/unprefixed-keyframes-expected.txt (rev 0)
+++ trunk/LayoutTests/animations/unprefixed-keyframes-expected.txt 2014-11-20 00:59:09 UTC (rev 176368)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+This test performs an animation of the left property. It should stop for 100ms at 100px and 200px We test for those values 50ms after it has stopped at each position.
+PASS - "left" property for "box" element at 0.3s saw something close to: 100
+PASS - "left" property for "box" element at 0.7s saw something close to: 200
+
</ins><span class="cx">Property changes on: trunk/LayoutTests/animations/unprefixed-keyframes-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="trunkLayoutTestsanimationsunprefixedkeyframesruleexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/animations/unprefixed-keyframes-rule-expected.txt (0 => 176368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/animations/unprefixed-keyframes-rule-expected.txt (rev 0)
+++ trunk/LayoutTests/animations/unprefixed-keyframes-rule-expected.txt 2014-11-20 00:59:09 UTC (rev 176368)
</span><span class="lines">@@ -0,0 +1,81 @@
</span><ins>+This tests unprefixed @keyframes parsing and the CSSKeyframeRule and CSSKeyframesRule interfaces.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS CSSKeyframeRule exists on Window object
+PASS CSSKeyframesRule exists on Window object
+PASS KEYFRAME_RULE exists on Window.CSSRule object
+PASS KEYFRAMES_RULE exists on Window.CSSRule object
+
+Check that the old values still work.
+PASS window.CSSRule.KEYFRAME_RULE is window.CSSRule.WEBKIT_KEYFRAME_RULE
+PASS window.CSSRule.KEYFRAMES_RULE is window.CSSRule.WEBKIT_KEYFRAMES_RULE
+
+PASS keyframes1.type is window.CSSRule.KEYFRAMES_RULE
+PASS keyframes1.name is 'test1'
+
+PASS rules1.length is 2
+PASS rules1.item(0).type is window.CSSRule.KEYFRAME_RULE
+PASS rules1.item(0).cssText is '0% { left: 10px; }'
+PASS rules1.item(1).cssText is '100% { left: 20px; }'
+
+Insert three new rules
+PASS rules1.length is 5
+PASS rules1.item(0).cssText is '0% { left: 10px; }'
+PASS rules1.item(1).cssText is '100% { left: 20px; }'
+PASS rules1.item(2).cssText is '30% { left: 30px; }'
+PASS rules1.item(3).cssText is '60% { left: 60px; }'
+PASS rules1.item(4).cssText is '20% { left: 50px; }'
+
+PASS keyframes2.type is window.CSSRule.KEYFRAMES_RULE
+PASS keyframes2.name is 'test2'
+
+PASS rules2.length is 3
+PASS rules2.item(0).type is window.CSSRule.KEYFRAME_RULE
+PASS rules2.item(0).keyText is '0%'
+PASS rules2.item(1).keyText is '50%'
+PASS rules2.item(2).keyText is '100%'
+PASS rules2.item(0).cssText is '0% { left: 10px; }'
+PASS rules2.item(1).cssText is '50% { left: 30px; }'
+PASS rules2.item(2).cssText is '100% { left: 20px; }'
+
+PASS rules2.item(0).style is an instance of CSSStyleDeclaration
+PASS rules2.item(0).style.length is 1
+
+Find a rule
+PASS rule.type is window.CSSRule.KEYFRAME_RULE
+PASS rule.cssText is '50% { left: 30px; }'
+
+Find a rule using from and to
+PASS keyframesFromTo.type is window.CSSRule.KEYFRAMES_RULE
+PASS rule.type is window.CSSRule.KEYFRAME_RULE
+PASS rule.cssText is '0% { left: 10px; }'
+PASS rule.type is window.CSSRule.KEYFRAME_RULE
+PASS rule.cssText is '100% { left: 20px; }'
+
+Try to find a rule that doesn't exist
+PASS Non-existent rule was not found
+
+Delete a rule
+PASS rules2.length is 2
+PASS rules2.item(0).type is window.CSSRule.KEYFRAME_RULE
+PASS rules2.item(0).keyText is '0%'
+PASS rules2.item(1).keyText is '100%'
+
+Delete a from rule
+PASS rulesFromTo.length is 2
+PASS rulesFromTo.item(0).type is window.CSSRule.KEYFRAME_RULE
+PASS rulesFromTo.item(0).keyText is '50%'
+PASS rulesFromTo.item(1).keyText is '100%'
+
+Delete a rule that doesn't exist
+PASS rules2.length is 2
+PASS rules2.item(0).type is window.CSSRule.KEYFRAME_RULE
+PASS rules2.item(0).keyText is '0%'
+PASS rules2.item(1).keyText is '100%'
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins><span class="cx">Property changes on: trunk/LayoutTests/animations/unprefixed-keyframes-rule-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="trunkLayoutTestsanimationsunprefixedkeyframesrulehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/animations/unprefixed-keyframes-rule.html (0 => 176368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/animations/unprefixed-keyframes-rule.html (rev 0)
+++ trunk/LayoutTests/animations/unprefixed-keyframes-rule.html 2014-11-20 00:59:09 UTC (rev 176368)
</span><span class="lines">@@ -0,0 +1,175 @@
</span><ins>+<html>
+<head>
+<style>
+ @keyframes test1 {
+ from { left: 10px; }
+ to { left: 20px; }
+ }
+ @keyframes test2 {
+ 0% { left: 10px; }
+ 50% { left: 30px; }
+ 100% { left: 20px; }
+ }
+ @keyframes test-from-to {
+ from { left: 10px; }
+ 50% { left: 30px; }
+ to { left: 20px; }
+ }
+</style>
+<script src="../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script>
+
+description("This tests unprefixed @keyframes parsing and the CSSKeyframeRule and CSSKeyframesRule interfaces.");
+
+if (window.CSSKeyframeRule)
+ testPassed("CSSKeyframeRule exists on Window object");
+else
+ testFailed("CSSKeyframeRule does not exist on Window object");
+
+if (window.CSSKeyframesRule)
+ testPassed("CSSKeyframesRule exists on Window object");
+else
+ testFailed("CSSKeyframesRule does not exist on Window object");
+
+if (window.CSSRule.KEYFRAME_RULE)
+ testPassed("KEYFRAME_RULE exists on Window.CSSRule object");
+else
+ testFailed("KEYFRAME_RULE does not exist on Window.CSSRule object");
+
+if (window.CSSRule.KEYFRAMES_RULE)
+ testPassed("KEYFRAMES_RULE exists on Window.CSSRule object");
+else
+ testFailed("KEYFRAMES_RULE does not exist on Window.CSSRule object");
+
+debug("");
+
+debug("Check that the old values still work.");
+shouldBe("window.CSSRule.KEYFRAME_RULE", "window.CSSRule.WEBKIT_KEYFRAME_RULE");
+shouldBe("window.CSSRule.KEYFRAMES_RULE", "window.CSSRule.WEBKIT_KEYFRAMES_RULE");
+
+debug("")
+
+var keyframes1 = document.styleSheets.item(0).cssRules.item(0);
+
+shouldBe("keyframes1.type", "window.CSSRule.KEYFRAMES_RULE");
+shouldBe("keyframes1.name", "'test1'");
+
+debug("");
+
+var rules1 = keyframes1.cssRules;
+shouldBe("rules1.length", "2");
+
+shouldBe("rules1.item(0).type", "window.CSSRule.KEYFRAME_RULE");
+shouldBe("rules1.item(0).cssText", "'0% { left: 10px; }'");
+shouldBe("rules1.item(1).cssText", "'100% { left: 20px; }'");
+
+debug("");
+debug("Insert three new rules");
+keyframes1.insertRule("30% { left: 30px; }");
+keyframes1.insertRule("60% { left: 60px; }");
+keyframes1.insertRule("20% { left: 50px; }");
+shouldBe("rules1.length", "5");
+
+shouldBe("rules1.item(0).cssText", "'0% { left: 10px; }'");
+shouldBe("rules1.item(1).cssText", "'100% { left: 20px; }'");
+shouldBe("rules1.item(2).cssText", "'30% { left: 30px; }'");
+shouldBe("rules1.item(3).cssText", "'60% { left: 60px; }'");
+shouldBe("rules1.item(4).cssText", "'20% { left: 50px; }'");
+
+debug("");
+
+var keyframes2 = document.styleSheets.item(0).cssRules.item(1);
+
+shouldBe("keyframes2.type", "window.CSSRule.KEYFRAMES_RULE");
+shouldBe("keyframes2.name", "'test2'");
+
+var rules2 = keyframes2.cssRules;
+
+debug("");
+
+shouldBe("rules2.length", "3");
+
+shouldBe("rules2.item(0).type", "window.CSSRule.KEYFRAME_RULE");
+shouldBe("rules2.item(0).keyText", "'0%'");
+shouldBe("rules2.item(1).keyText", "'50%'");
+shouldBe("rules2.item(2).keyText", "'100%'");
+
+shouldBe("rules2.item(0).cssText", "'0% { left: 10px; }'");
+shouldBe("rules2.item(1).cssText", "'50% { left: 30px; }'");
+shouldBe("rules2.item(2).cssText", "'100% { left: 20px; }'");
+
+debug("");
+
+shouldBeType("rules2.item(0).style", "CSSStyleDeclaration");
+shouldBe("rules2.item(0).style.length", "1");
+
+debug("");
+debug("Find a rule");
+
+var rule = keyframes2.findRule("50%");
+
+if (!rule)
+ testFailed("Could not extract '50%' keyframe rule");
+
+shouldBe("rule.type", "window.CSSRule.KEYFRAME_RULE");
+shouldBe("rule.cssText", "'50% { left: 30px; }'");
+
+debug("");
+debug("Find a rule using from and to");
+
+var keyframesFromTo = document.styleSheets.item(0).cssRules.item(2);
+shouldBe("keyframesFromTo.type", "window.CSSRule.KEYFRAMES_RULE");
+rule = keyframesFromTo.findRule("From");
+shouldBe("rule.type", "window.CSSRule.KEYFRAME_RULE");
+shouldBe("rule.cssText", "'0% { left: 10px; }'");
+
+rule = keyframesFromTo.findRule("TO");
+shouldBe("rule.type", "window.CSSRule.KEYFRAME_RULE");
+shouldBe("rule.cssText", "'100% { left: 20px; }'");
+
+debug("");
+debug("Try to find a rule that doesn't exist");
+
+rule = keyframes2.findRule("70%");
+
+if (rule)
+ testFailed("Was able to find the non-existent '70%' keyframe rule");
+else
+ testPassed("Non-existent rule was not found");
+
+debug("");
+debug("Delete a rule");
+
+keyframes2.deleteRule("50%");
+shouldBe("rules2.length", "2");
+shouldBe("rules2.item(0).type", "window.CSSRule.KEYFRAME_RULE");
+shouldBe("rules2.item(0).keyText", "'0%'");
+shouldBe("rules2.item(1).keyText", "'100%'");
+
+debug("");
+debug("Delete a from rule");
+keyframesFromTo.deleteRule("0%");
+var rulesFromTo = keyframesFromTo.cssRules;
+shouldBe("rulesFromTo.length", "2");
+shouldBe("rulesFromTo.item(0).type", "window.CSSRule.KEYFRAME_RULE");
+shouldBe("rulesFromTo.item(0).keyText", "'50%'");
+shouldBe("rulesFromTo.item(1).keyText", "'100%'");
+
+
+debug("");
+debug("Delete a rule that doesn't exist");
+
+keyframes2.deleteRule("70%");
+shouldBe("rules2.length", "2");
+shouldBe("rules2.item(0).type", "window.CSSRule.KEYFRAME_RULE");
+shouldBe("rules2.item(0).keyText", "'0%'");
+shouldBe("rules2.item(1).keyText", "'100%'");
+
+debug("");
+
+</script>
+<script src="../resources/js-test-post.js"></script>
+</body>
+</html>
</ins><span class="cx">Property changes on: trunk/LayoutTests/animations/unprefixed-keyframes-rule.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="trunkLayoutTestsanimationsunprefixedkeyframeshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/animations/unprefixed-keyframes.html (0 => 176368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/animations/unprefixed-keyframes.html (rev 0)
+++ trunk/LayoutTests/animations/unprefixed-keyframes.html 2014-11-20 00:59:09 UTC (rev 176368)
</span><span class="lines">@@ -0,0 +1,47 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <title>Unprefixed keyframes test</title>
+ <style>
+ #box {
+ position: absolute;
+ left: 0;
+ top: 100px;
+ height: 100px;
+ width: 100px;
+ background-color: blue;
+ animation-duration: 1s;
+ animation-timing-function: linear;
+ animation-name: anim;
+ }
+ @keyframes anim {
+ from { left: 50px; }
+ 20% { left: 100px; }
+ 40% { left: 100px; }
+ 60% { left: 200px; }
+ 80% { left: 200px; }
+ to { left: 300px; }
+ }
+ </style>
+ <script src="resources/animation-test-helpers.js" type="text/javascript" charset="utf-8"></script>
+ <script type="text/javascript" charset="utf-8">
+
+ var expectedValues = [
+ // [animation-name, time, element-id, property, expected-value, tolerance]
+ ["anim", 0.3, "box", "left", 100, 1],
+ ["anim", 0.7, "box", "left", 200, 1],
+ ];
+
+ runAnimationTest(expectedValues);
+
+ </script>
+</head>
+<body>
+This test performs an animation of the left property. It should stop for 100ms at 100px and 200px
+We test for those values 50ms after it has stopped at each position.
+<div id="box">
+</div>
+<div id="result">
+</div>
+</body>
+</html>
</ins><span class="cx">Property changes on: trunk/LayoutTests/animations/unprefixed-keyframes.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="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (176367 => 176368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-11-20 00:34:35 UTC (rev 176367)
+++ trunk/Source/WebCore/ChangeLog 2014-11-20 00:59:09 UTC (rev 176368)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2014-11-19 Dean Jackson <dino@apple.com>
+
+ Handle unprefixed @keyframes rule
+ https://bugs.webkit.org/show_bug.cgi?id=138899
+ <rdar://problem/18943117>
+
+ Reviewed by Simon Fraser.
+
+ Support the parsing of unprefixed @keyframes. In
+ CSSParser, assign the same token identifier to
+ the prefixed and unprefixed forms. This will
+ keep compatibility with older content. If a page
+ has both forms, then whatever comes last will
+ win (as it does if you had duplicate names of the same
+ form).
+
+ Tests: animations/unprefixed-keyframes-rule.html
+ animations/unprefixed-keyframes.html
+
+ * css/CSSGrammar.y.in: Rename the WEBKIT_KEYFRAME_RULE_SYM symbol to
+ be KEYFRAME_RULE_SYM. Same with KEYFRAMES_SYM.
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::detectAtToken): Look for the @keyframes style
+ strings and assign the new token values.
+
</ins><span class="cx"> 2014-11-19 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Move pseudo-style code from RenderObject to RenderElement.
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSGrammaryin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSGrammar.y.in (176367 => 176368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSGrammar.y.in 2014-11-20 00:34:35 UTC (rev 176367)
+++ trunk/Source/WebCore/css/CSSGrammar.y.in 2014-11-20 00:59:09 UTC (rev 176368)
</span><span class="lines">@@ -151,11 +151,11 @@
</span><span class="cx"> %token MEDIA_SYM
</span><span class="cx"> %token FONT_FACE_SYM
</span><span class="cx"> %token CHARSET_SYM
</span><ins>+%token KEYFRAME_RULE_SYM
+%token KEYFRAMES_SYM
</ins><span class="cx"> %token NAMESPACE_SYM
</span><span class="cx"> %token WEBKIT_RULE_SYM
</span><span class="cx"> %token WEBKIT_DECLS_SYM
</span><del>-%token WEBKIT_KEYFRAME_RULE_SYM
-%token WEBKIT_KEYFRAMES_SYM
</del><span class="cx"> %token WEBKIT_VALUE_SYM
</span><span class="cx"> %token WEBKIT_MEDIAQUERY_SYM
</span><span class="cx"> #if ENABLE_PICTURE_SIZES
</span><span class="lines">@@ -395,7 +395,7 @@
</span><span class="cx">
</span><span class="cx"> webkit_rule: WEBKIT_RULE_SYM '{' maybe_space valid_rule maybe_space '}' { parser->m_rule = adoptRef($4); } ;
</span><span class="cx">
</span><del>-webkit_keyframe_rule: WEBKIT_KEYFRAME_RULE_SYM '{' maybe_space keyframe_rule maybe_space '}' { parser->m_keyframe = adoptRef($4); } ;
</del><ins>+webkit_keyframe_rule: KEYFRAME_RULE_SYM '{' maybe_space keyframe_rule maybe_space '}' { parser->m_keyframe = adoptRef($4); } ;
</ins><span class="cx">
</span><span class="cx"> webkit_decls: WEBKIT_DECLS_SYM '{' maybe_space_before_declaration declaration_list '}' ;
</span><span class="cx">
</span><span class="lines">@@ -803,7 +803,7 @@
</span><span class="cx"> ;
</span><span class="cx">
</span><span class="cx"> keyframes:
</span><del>- before_keyframes_rule WEBKIT_KEYFRAMES_SYM maybe_space keyframe_name at_rule_header_end_maybe_space '{' at_rule_body_start maybe_space keyframes_rule closing_brace {
</del><ins>+ before_keyframes_rule KEYFRAMES_SYM maybe_space keyframe_name at_rule_header_end_maybe_space '{' at_rule_body_start maybe_space keyframes_rule closing_brace {
</ins><span class="cx"> $$ = parser->createKeyframesRule($4, std::unique_ptr<Vector<RefPtr<StyleKeyframe>>>($9)).leakRef();
</span><span class="cx"> }
</span><span class="cx"> ;
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (176367 => 176368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2014-11-20 00:34:35 UTC (rev 176367)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2014-11-20 00:59:09 UTC (rev 176368)
</span><span class="lines">@@ -10973,6 +10973,13 @@
</span><span class="cx"> }
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ case 'k':
+ if (length == 10 && isEqualToCSSIdentifier(name + 2, "eyframes"))
+ m_token = KEYFRAMES_SYM;
+ else if (length == 14 && !hasEscape && isEqualToCSSIdentifier(name + 2, "eyframe-rule"))
+ m_token = KEYFRAME_RULE_SYM;
+ return;
+
</ins><span class="cx"> case 'l':
</span><span class="cx"> if (hasEscape)
</span><span class="cx"> return;
</span><span class="lines">@@ -11103,7 +11110,7 @@
</span><span class="cx">
</span><span class="cx"> case 18:
</span><span class="cx"> if (isEqualToCSSIdentifier(name + 2, "webkit-keyframes"))
</span><del>- m_token = WEBKIT_KEYFRAMES_SYM;
</del><ins>+ m_token = KEYFRAMES_SYM;
</ins><span class="cx"> #if ENABLE(PICTURE_SIZES)
</span><span class="cx"> else if (isEqualToCSSIdentifier(name + 2, "webkit-sizesattr"))
</span><span class="cx"> m_token = WEBKIT_SIZESATTR_SYM;
</span><span class="lines">@@ -11119,7 +11126,7 @@
</span><span class="cx">
</span><span class="cx"> case 22:
</span><span class="cx"> if (!hasEscape && isEqualToCSSIdentifier(name + 2, "webkit-keyframe-rule"))
</span><del>- m_token = WEBKIT_KEYFRAME_RULE_SYM;
</del><ins>+ m_token = KEYFRAME_RULE_SYM;
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> case 27:
</span></span></pre>
</div>
</div>
</body>
</html>