<!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>[191132] 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/191132">191132</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2015-10-15 12:57:43 -0700 (Thu, 15 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>CSSKeyframesRule::appendRule is deprecated, but is actually the spec
https://bugs.webkit.org/show_bug.cgi?id=150113
Reviewed by Simon Fraser.
Source/WebCore:
I stupidly deprecated the wrong function in
http://trac.webkit.org/changeset/174469
* css/CSSKeyframesRule.cpp:
(WebCore::CSSKeyframesRule::insertRule): Swap the code between these two.
(WebCore::CSSKeyframesRule::appendRule):
LayoutTests:
Update tests to deprecate the correct function.
* animations/change-keyframes-expected.txt:
* animations/keyframes-rule.html:
* animations/unprefixed-keyframes-rule.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsanimationschangekeyframesexpectedtxt">trunk/LayoutTests/animations/change-keyframes-expected.txt</a></li>
<li><a href="#trunkLayoutTestsanimationskeyframesrulehtml">trunk/LayoutTests/animations/keyframes-rule.html</a></li>
<li><a href="#trunkLayoutTestsanimationsunprefixedkeyframesrulehtml">trunk/LayoutTests/animations/unprefixed-keyframes-rule.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSKeyframesRulecpp">trunk/Source/WebCore/css/CSSKeyframesRule.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (191131 => 191132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-10-15 19:56:38 UTC (rev 191131)
+++ trunk/LayoutTests/ChangeLog 2015-10-15 19:57:43 UTC (rev 191132)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-10-15 Dean Jackson <dino@apple.com>
+
+ CSSKeyframesRule::appendRule is deprecated, but is actually the spec
+ https://bugs.webkit.org/show_bug.cgi?id=150113
+
+ Reviewed by Simon Fraser.
+
+ Update tests to deprecate the correct function.
+
+ * animations/change-keyframes-expected.txt:
+ * animations/keyframes-rule.html:
+ * animations/unprefixed-keyframes-rule.html:
+
</ins><span class="cx"> 2015-10-15 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Update anonymous table results for Win port.
</span></span></pre></div>
<a id="trunkLayoutTestsanimationschangekeyframesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/animations/change-keyframes-expected.txt (191131 => 191132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/animations/change-keyframes-expected.txt 2015-10-15 19:56:38 UTC (rev 191131)
+++ trunk/LayoutTests/animations/change-keyframes-expected.txt 2015-10-15 19:57:43 UTC (rev 191132)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>-CONSOLE MESSAGE: line 58: CSSKeyframesRule 'appendRule' function is deprecated. Use 'insertRule' instead.
-CONSOLE MESSAGE: line 60: CSSKeyframesRule 'appendRule' function is deprecated. Use 'insertRule' instead.
</del><ins>+CONSOLE MESSAGE: line 57: CSSKeyframesRule 'insertRule' function is deprecated. Use 'appendRule' instead.
+CONSOLE MESSAGE: line 59: CSSKeyframesRule 'insertRule' function is deprecated. Use 'appendRule' instead.
</ins><span class="cx"> This test performs an animation of the left property and makes sure it is animating. Then it stops the animation, changes the keyframes to an animation of the top property, restarts the animation and makes sure top is animating.
</span><span class="cx"> PASS - "left" property for "box" element at 0.5s saw something close to: 200
</span><span class="cx"> PASS - "top" property for "box" element at 1s saw something close to: 100
</span></span></pre></div>
<a id="trunkLayoutTestsanimationskeyframesrulehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/animations/keyframes-rule.html (191131 => 191132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/animations/keyframes-rule.html 2015-10-15 19:56:38 UTC (rev 191131)
+++ trunk/LayoutTests/animations/keyframes-rule.html 2015-10-15 19:57:43 UTC (rev 191132)
</span><span class="lines">@@ -88,9 +88,9 @@
</span><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Insert three new rules");
</span><del>-keyframes1.insertRule("30% { left: 30px; }");
-keyframes1.insertRule("60% { left: 60px; }");
-keyframes1.insertRule("20% { left: 50px; }");
</del><ins>+keyframes1.appendRule("30% { left: 30px; }");
+keyframes1.appendRule("60% { left: 60px; }");
+keyframes1.appendRule("20% { left: 50px; }");
</ins><span class="cx"> shouldBe("rules1.length", "5");
</span><span class="cx">
</span><span class="cx"> shouldBe("rules1.item(0).cssText", "'0% { left: 10px; }'");
</span></span></pre></div>
<a id="trunkLayoutTestsanimationsunprefixedkeyframesrulehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/animations/unprefixed-keyframes-rule.html (191131 => 191132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/animations/unprefixed-keyframes-rule.html 2015-10-15 19:56:38 UTC (rev 191131)
+++ trunk/LayoutTests/animations/unprefixed-keyframes-rule.html 2015-10-15 19:57:43 UTC (rev 191132)
</span><span class="lines">@@ -88,9 +88,9 @@
</span><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Insert three new rules");
</span><del>-keyframes1.insertRule("30% { left: 30px; }");
-keyframes1.insertRule("60% { left: 60px; }");
-keyframes1.insertRule("20% { left: 50px; }");
</del><ins>+keyframes1.appendRule("30% { left: 30px; }");
+keyframes1.appendRule("60% { left: 60px; }");
+keyframes1.appendRule("20% { left: 50px; }");
</ins><span class="cx"> shouldBe("rules1.length", "5");
</span><span class="cx">
</span><span class="cx"> shouldBe("rules1.item(0).cssText", "'0% { left: 10px; }'");
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (191131 => 191132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-10-15 19:56:38 UTC (rev 191131)
+++ trunk/Source/WebCore/ChangeLog 2015-10-15 19:57:43 UTC (rev 191132)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-10-15 Dean Jackson <dino@apple.com>
+
+ CSSKeyframesRule::appendRule is deprecated, but is actually the spec
+ https://bugs.webkit.org/show_bug.cgi?id=150113
+
+ Reviewed by Simon Fraser.
+
+ I stupidly deprecated the wrong function in
+ http://trac.webkit.org/changeset/174469
+
+ * css/CSSKeyframesRule.cpp:
+ (WebCore::CSSKeyframesRule::insertRule): Swap the code between these two.
+ (WebCore::CSSKeyframesRule::appendRule):
+
</ins><span class="cx"> 2015-10-14 David Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> Implement CSS Variables.
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSKeyframesRulecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSKeyframesRule.cpp (191131 => 191132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSKeyframesRule.cpp 2015-10-15 19:56:38 UTC (rev 191131)
+++ trunk/Source/WebCore/css/CSSKeyframesRule.cpp 2015-10-15 19:57:43 UTC (rev 191132)
</span><span class="lines">@@ -108,15 +108,6 @@
</span><span class="cx">
</span><span class="cx"> void CSSKeyframesRule::appendRule(const String& ruleText)
</span><span class="cx"> {
</span><del>- if (CSSStyleSheet* parent = parentStyleSheet()) {
- if (Document* ownerDocument = parent->ownerDocument())
- ownerDocument->addConsoleMessage(MessageSource::JS, MessageLevel::Warning, ASCIILiteral("CSSKeyframesRule 'appendRule' function is deprecated. Use 'insertRule' instead."));
- }
- insertRule(ruleText);
-}
-
-void CSSKeyframesRule::insertRule(const String& ruleText)
-{
</del><span class="cx"> ASSERT(m_childRuleCSSOMWrappers.size() == m_keyframesRule->keyframes().size());
</span><span class="cx">
</span><span class="cx"> CSSParser parser(parserContext());
</span><span class="lines">@@ -132,6 +123,15 @@
</span><span class="cx"> m_childRuleCSSOMWrappers.grow(length());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void CSSKeyframesRule::insertRule(const String& ruleText)
+{
+ if (CSSStyleSheet* parent = parentStyleSheet()) {
+ if (Document* ownerDocument = parent->ownerDocument())
+ ownerDocument->addConsoleMessage(MessageSource::JS, MessageLevel::Warning, ASCIILiteral("CSSKeyframesRule 'insertRule' function is deprecated. Use 'appendRule' instead."));
+ }
+ appendRule(ruleText);
+}
+
</ins><span class="cx"> void CSSKeyframesRule::deleteRule(const String& s)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_childRuleCSSOMWrappers.size() == m_keyframesRule->keyframes().size());
</span></span></pre>
</div>
</div>
</body>
</html>