Changeset 107470 in webkit

Timestamp:

Feb 10, 2012 7:10:31 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Change values for WEBKIT_KEYFRAMES_RULE, WEBKIT_KEYFRAME_RULE
​https://bugs.webkit.org/show_bug.cgi?id=71293

Patch by Edward O'Connor <Theresa O'Connor> 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.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/animations/animation-css-rule-types-expected.txt (modified) (1 diff)
• LayoutTests/animations/script-tests/animation-css-rule-types.js (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/CSSRule.h (modified) (1 diff)
• Source/WebCore/css/CSSRule.idl (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-02-10  Edward O'Connor  <eoconnor@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  <tony@chromium.org>
 

trunk/LayoutTests/animations/animation-css-rule-types-expected.txt

@@ -4 +4 @@
 
 
+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

trunk/LayoutTests/animations/script-tests/animation-css-rule-types.js

@@ -4 +4 @@
 
 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.');

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-10  Edward O'Connor  <eoconnor@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  <eric@webkit.org>
 

trunk/Source/WebCore/css/CSSRule.h

@@ -50 +50 @@
         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
     };
 

trunk/Source/WebCore/css/CSSRule.idl

@@ -38 +38 @@
         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;