Title: [191555] releases/WebKitGTK/webkit-2.10
- Revision
- 191555
- Author
- [email protected]
- Date
- 2015-10-26 00:11:46 -0700 (Mon, 26 Oct 2015)
Log Message
Merge r191132 - 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:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog (191554 => 191555)
--- releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog 2015-10-26 06:40:50 UTC (rev 191554)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog 2015-10-26 07:11:46 UTC (rev 191555)
@@ -1,3 +1,16 @@
+2015-10-15 Dean Jackson <[email protected]>
+
+ 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:
+
2015-10-14 Jiewen Tan <[email protected]>
Postpone mutation events before invoke Editor::Command command(Document*, const String&, bool).
Modified: releases/WebKitGTK/webkit-2.10/LayoutTests/animations/change-keyframes-expected.txt (191554 => 191555)
--- releases/WebKitGTK/webkit-2.10/LayoutTests/animations/change-keyframes-expected.txt 2015-10-26 06:40:50 UTC (rev 191554)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/animations/change-keyframes-expected.txt 2015-10-26 07:11:46 UTC (rev 191555)
@@ -1,5 +1,5 @@
-CONSOLE MESSAGE: line 58: CSSKeyframesRule 'appendRule' function is deprecated. Use 'insertRule' instead.
-CONSOLE MESSAGE: line 60: CSSKeyframesRule 'appendRule' function is deprecated. Use 'insertRule' instead.
+CONSOLE MESSAGE: line 57: CSSKeyframesRule 'insertRule' function is deprecated. Use 'appendRule' instead.
+CONSOLE MESSAGE: line 59: CSSKeyframesRule 'insertRule' function is deprecated. Use 'appendRule' instead.
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.
PASS - "left" property for "box" element at 0.5s saw something close to: 200
PASS - "top" property for "box" element at 1s saw something close to: 100
Modified: releases/WebKitGTK/webkit-2.10/LayoutTests/animations/keyframes-rule.html (191554 => 191555)
--- releases/WebKitGTK/webkit-2.10/LayoutTests/animations/keyframes-rule.html 2015-10-26 06:40:50 UTC (rev 191554)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/animations/keyframes-rule.html 2015-10-26 07:11:46 UTC (rev 191555)
@@ -88,9 +88,9 @@
debug("");
debug("Insert three new rules");
-keyframes1.insertRule("30% { left: 30px; }");
-keyframes1.insertRule("60% { left: 60px; }");
-keyframes1.insertRule("20% { left: 50px; }");
+keyframes1.appendRule("30% { left: 30px; }");
+keyframes1.appendRule("60% { left: 60px; }");
+keyframes1.appendRule("20% { left: 50px; }");
shouldBe("rules1.length", "5");
shouldBe("rules1.item(0).cssText", "'0% { left: 10px; }'");
Modified: releases/WebKitGTK/webkit-2.10/LayoutTests/animations/unprefixed-keyframes-rule.html (191554 => 191555)
--- releases/WebKitGTK/webkit-2.10/LayoutTests/animations/unprefixed-keyframes-rule.html 2015-10-26 06:40:50 UTC (rev 191554)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/animations/unprefixed-keyframes-rule.html 2015-10-26 07:11:46 UTC (rev 191555)
@@ -88,9 +88,9 @@
debug("");
debug("Insert three new rules");
-keyframes1.insertRule("30% { left: 30px; }");
-keyframes1.insertRule("60% { left: 60px; }");
-keyframes1.insertRule("20% { left: 50px; }");
+keyframes1.appendRule("30% { left: 30px; }");
+keyframes1.appendRule("60% { left: 60px; }");
+keyframes1.appendRule("20% { left: 50px; }");
shouldBe("rules1.length", "5");
shouldBe("rules1.item(0).cssText", "'0% { left: 10px; }'");
Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (191554 => 191555)
--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2015-10-26 06:40:50 UTC (rev 191554)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2015-10-26 07:11:46 UTC (rev 191555)
@@ -1,3 +1,17 @@
+2015-10-15 Dean Jackson <[email protected]>
+
+ 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):
+
2015-10-14 Jiewen Tan <[email protected]>
Postpone mutation events before invoke Editor::Command command(Document*, const String&, bool).
Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/css/CSSKeyframesRule.cpp (191554 => 191555)
--- releases/WebKitGTK/webkit-2.10/Source/WebCore/css/CSSKeyframesRule.cpp 2015-10-26 06:40:50 UTC (rev 191554)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/css/CSSKeyframesRule.cpp 2015-10-26 07:11:46 UTC (rev 191555)
@@ -108,15 +108,6 @@
void CSSKeyframesRule::appendRule(const String& ruleText)
{
- 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)
-{
ASSERT(m_childRuleCSSOMWrappers.size() == m_keyframesRule->keyframes().size());
CSSParser parser(parserContext());
@@ -132,6 +123,15 @@
m_childRuleCSSOMWrappers.grow(length());
}
+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);
+}
+
void CSSKeyframesRule::deleteRule(const String& s)
{
ASSERT(m_childRuleCSSOMWrappers.size() == m_keyframesRule->keyframes().size());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
