Title: [107470] trunk
- Revision
- 107470
- Author
- commit-qu...@webkit.org
- Date
- 2012-02-10 19:10:31 -0800 (Fri, 10 Feb 2012)
Log Message
Change values for WEBKIT_KEYFRAMES_RULE, WEBKIT_KEYFRAME_RULE
https://bugs.webkit.org/show_bug.cgi?id=71293
Patch by Edward O'Connor <eocon...@apple.com> on 2012-02-10
Reviewed by Chris Marrin.
Source/WebCore:
Tests: animations/animation-css-rule-types.html
* css/CSSRule.h: Change WEBKIT_KEYFRAMES_RULE to 7 and
WEBKIT_KEYFRAME_RULE to 8.
* css/CSSRule.idl: Ditto.
LayoutTests:
* animations/animation-css-rule-types-expected.txt:
* animations/script-tests/animation-css-rule-types.js: Update
expected WEBKIT_KEYFRAMES_RULE and WEBKIT_KEYFRAME_RULE values.
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (107469 => 107470)
--- trunk/LayoutTests/ChangeLog 2012-02-11 02:53:12 UTC (rev 107469)
+++ trunk/LayoutTests/ChangeLog 2012-02-11 03:10:31 UTC (rev 107470)
@@ -1,3 +1,14 @@
+2012-02-10 Edward O'Connor <eocon...@apple.com>
+
+ Change values for WEBKIT_KEYFRAMES_RULE, WEBKIT_KEYFRAME_RULE
+ https://bugs.webkit.org/show_bug.cgi?id=71293
+
+ Reviewed by Chris Marrin.
+
+ * animations/animation-css-rule-types-expected.txt:
+ * animations/script-tests/animation-css-rule-types.js: Update
+ expected WEBKIT_KEYFRAMES_RULE and WEBKIT_KEYFRAME_RULE values.
+
2012-02-10 Tony Chang <t...@chromium.org>
[chromium] Unreviewed gardening.
Modified: trunk/LayoutTests/animations/animation-css-rule-types-expected.txt (107469 => 107470)
--- trunk/LayoutTests/animations/animation-css-rule-types-expected.txt 2012-02-11 02:53:12 UTC (rev 107469)
+++ trunk/LayoutTests/animations/animation-css-rule-types-expected.txt 2012-02-11 03:10:31 UTC (rev 107470)
@@ -3,8 +3,8 @@
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+PASS ruleType is 7
PASS ruleType is 8
-PASS ruleType is 9
If we got to this point then we did not crash and the test has passed.
PASS successfullyParsed is true
Modified: trunk/LayoutTests/animations/script-tests/animation-css-rule-types.js (107469 => 107470)
--- trunk/LayoutTests/animations/script-tests/animation-css-rule-types.js 2012-02-11 02:53:12 UTC (rev 107469)
+++ trunk/LayoutTests/animations/script-tests/animation-css-rule-types.js 2012-02-11 03:10:31 UTC (rev 107470)
@@ -3,9 +3,9 @@
);
var ruleType = window.CSSRule.WEBKIT_KEYFRAMES_RULE;
+shouldBe("ruleType", "7");
+ruleType = window.CSSRule.WEBKIT_KEYFRAME_RULE;
shouldBe("ruleType", "8");
-ruleType = window.CSSRule.WEBKIT_KEYFRAME_RULE;
-shouldBe("ruleType", "9");
debug('If we got to this point then we did not crash and the test has passed.');
var successfullyParsed = true;
Modified: trunk/Source/WebCore/ChangeLog (107469 => 107470)
--- trunk/Source/WebCore/ChangeLog 2012-02-11 02:53:12 UTC (rev 107469)
+++ trunk/Source/WebCore/ChangeLog 2012-02-11 03:10:31 UTC (rev 107470)
@@ -1,3 +1,16 @@
+2012-02-10 Edward O'Connor <eocon...@apple.com>
+
+ Change values for WEBKIT_KEYFRAMES_RULE, WEBKIT_KEYFRAME_RULE
+ https://bugs.webkit.org/show_bug.cgi?id=71293
+
+ Reviewed by Chris Marrin.
+
+ Tests: animations/animation-css-rule-types.html
+
+ * css/CSSRule.h: Change WEBKIT_KEYFRAMES_RULE to 7 and
+ WEBKIT_KEYFRAME_RULE to 8.
+ * css/CSSRule.idl: Ditto.
+
2012-02-10 Eric Seidel <e...@webkit.org>
AtomicMarkupTokenBase::initializeAttributes should not create a StringImpl if it doesn't need to
Modified: trunk/Source/WebCore/css/CSSRule.h (107469 => 107470)
--- trunk/Source/WebCore/css/CSSRule.h 2012-02-11 02:53:12 UTC (rev 107469)
+++ trunk/Source/WebCore/css/CSSRule.h 2012-02-11 03:10:31 UTC (rev 107470)
@@ -49,10 +49,12 @@
MEDIA_RULE,
FONT_FACE_RULE,
PAGE_RULE,
- // 7 used to be VARIABLES_RULE
- WEBKIT_KEYFRAMES_RULE = 8,
+ // 7 was VARIABLES_RULE; we now match other browsers with 7 as
+ // KEYFRAMES_RULE:
+ // <https://bugs.webkit.org/show_bug.cgi?id=71293>.
+ WEBKIT_KEYFRAMES_RULE,
WEBKIT_KEYFRAME_RULE,
- WEBKIT_REGION_RULE
+ WEBKIT_REGION_RULE = 10
};
Type type() const { return static_cast<Type>(m_type); }
Modified: trunk/Source/WebCore/css/CSSRule.idl (107469 => 107470)
--- trunk/Source/WebCore/css/CSSRule.idl 2012-02-11 02:53:12 UTC (rev 107469)
+++ trunk/Source/WebCore/css/CSSRule.idl 2012-02-11 03:10:31 UTC (rev 107470)
@@ -37,8 +37,8 @@
const unsigned short MEDIA_RULE = 4;
const unsigned short FONT_FACE_RULE = 5;
const unsigned short PAGE_RULE = 6;
- const unsigned short WEBKIT_KEYFRAMES_RULE = 8;
- const unsigned short WEBKIT_KEYFRAME_RULE = 9;
+ const unsigned short WEBKIT_KEYFRAMES_RULE = 7;
+ const unsigned short WEBKIT_KEYFRAME_RULE = 8;
const unsigned short WEBKIT_REGION_RULE = 10;
readonly attribute unsigned short type;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
