Rename WebKitCSSKeyframe(s)Rule into CSSKeyframe(s)Rule https://bugs.webkit.org/show_bug.cgi?id=138763 <rdar://problem/18991569> Reviewed by Simon Fraser. Source/WebCore: Globally rename WebKitCSSKeyframeRule and WebKitCSSKeyframesRule to CSSKeyframeRule and CSSKeyframesRule respectively. This *may* break some existing content, but is compatible with what Blink and Firefox are doing. To minimize breakage, I kept an alias for the old constant values on CSSRule: WEBKIT_KEYFRAMES_RULE and WEBKIT_KEYFRAME_RULE. Covered by existing tests. * CMakeLists.txt: * DerivedSources.cpp: * DerivedSources.make: * WebCore.vcxproj/WebCore.vcxproj: * WebCore.vcxproj/WebCore.vcxproj.filters: * WebCore.xcodeproj/project.pbxproj: * bindings/js/JSCSSRuleCustom.cpp: (WebCore::toJS): * bindings/objc/DOMCSS.mm: (kitClass): * css/CSSGrammar.y.includes: * css/CSSKeyframeRule.cpp: Renamed from Source/WebCore/css/WebKitCSSKeyframeRule.cpp. (WebCore::StyleKeyframe::StyleKeyframe): (WebCore::StyleKeyframe::~StyleKeyframe): (WebCore::StyleKeyframe::mutableProperties): (WebCore::StyleKeyframe::parseKeyString): (WebCore::StyleKeyframe::cssText): (WebCore::CSSKeyframeRule::CSSKeyframeRule): (WebCore::CSSKeyframeRule::~CSSKeyframeRule): (WebCore::CSSKeyframeRule::style): (WebCore::CSSKeyframeRule::reattach): * css/CSSKeyframeRule.h: Renamed from Source/WebCore/css/WebKitCSSKeyframeRule.h. (WebCore::StyleKeyframe::create): (WebCore::StyleKeyframe::keyText): (WebCore::StyleKeyframe::setKeyText): (WebCore::StyleKeyframe::getKeys): (WebCore::StyleKeyframe::properties): * css/CSSKeyframeRule.idl: Renamed from Source/WebCore/css/WebKitCSSKeyframeRule.idl. * css/CSSKeyframesRule.cpp: Renamed from Source/WebCore/css/WebKitCSSKeyframesRule.cpp. (WebCore::StyleRuleKeyframes::StyleRuleKeyframes): (WebCore::StyleRuleKeyframes::~StyleRuleKeyframes): (WebCore::StyleRuleKeyframes::parserAppendKeyframe): (WebCore::StyleRuleKeyframes::wrapperAppendKeyframe): (WebCore::StyleRuleKeyframes::wrapperRemoveKeyframe): (WebCore::StyleRuleKeyframes::findKeyframeIndex): (WebCore::CSSKeyframesRule::CSSKeyframesRule): (WebCore::CSSKeyframesRule::~CSSKeyframesRule): (WebCore::CSSKeyframesRule::setName): (WebCore::CSSKeyframesRule::appendRule): (WebCore::CSSKeyframesRule::insertRule): (WebCore::CSSKeyframesRule::deleteRule): (WebCore::CSSKeyframesRule::findRule): (WebCore::CSSKeyframesRule::cssText): (WebCore::CSSKeyframesRule::length): (WebCore::CSSKeyframesRule::item): (WebCore::CSSKeyframesRule::cssRules): (WebCore::CSSKeyframesRule::reattach): * css/CSSKeyframesRule.h: Renamed from Source/WebCore/css/WebKitCSSKeyframesRule.h. (WebCore::StyleRuleKeyframes::create): (WebCore::StyleRuleKeyframes::keyframes): (WebCore::StyleRuleKeyframes::name): (WebCore::StyleRuleKeyframes::setName): (WebCore::StyleRuleKeyframes::copy): * css/CSSKeyframesRule.idl: Renamed from Source/WebCore/css/WebKitCSSKeyframesRule.idl. * css/CSSParser.cpp: * css/CSSRule.h: * css/CSSRule.idl: * css/CSSStyleSheet.cpp: * css/RuleSet.cpp: * css/StyleResolver.cpp: * css/StyleRule.cpp: (WebCore::StyleRuleBase::createCSSOMWrapper): * inspector/InspectorStyleSheet.cpp: (WebCore::asCSSRuleList): LayoutTests: Some of the tests use the prefixed interface name. Replace that with the unprefixed version. The "keyframes-rule.html" test added a check to make sure the old constant WEBKIT_KEYFRAMES_RULE is the same as the new constant KEYFRAMES_RULE. * animations/keyframes-rule-expected.txt: * animations/keyframes-rule.html: * fast/dom/resources/wrapper-identity-base.js: * fast/dom/wrapper-classes.html: * fast/dom/wrapper-identity-expected.txt: * platform/efl/js/dom/global-constructors-attributes-expected.txt: * platform/gtk/js/dom/global-constructors-attributes-expected.txt: * platform/mac-mavericks/js/dom/global-constructors-attributes-expected.txt: * platform/mac-mountainlion/js/dom/global-constructors-attributes-expected.txt: * platform/mac/fast/dom/objc-wrapper-identity-expected.txt: * platform/mac/js/dom/global-constructors-attributes-expected.txt: * platform/win/js/dom/global-constructors-attributes-expected.txt: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@176157 268f45cc-cd09-0410-ab3c-d52691b4dbfc

commit: d2a5e4cbebdd2b5cb934c64a9c12fda15d29d54f [log] [tgz]
author: dino@apple.com <dino@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Sat Nov 15 23:02:43 2014 +0000
committer: dino@apple.com <dino@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Sat Nov 15 23:02:43 2014 +0000
tree: 20164d9970b25fe7adb62e68087c96e41501de86
parent: bc36d7bb7cc69ae99ce9b7ffeff103f4aa7ee4c3 [diff]
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 67d4188..5545d0c 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog

@@ -1,3 +1,31 @@
+2014-11-14  Dean Jackson  <dino@apple.com>
+
+        Rename WebKitCSSKeyframe(s)Rule into CSSKeyframe(s)Rule
+        https://bugs.webkit.org/show_bug.cgi?id=138763
+        <rdar://problem/18991569>
+
+        Reviewed by Simon Fraser.
+
+        Some of the tests use the prefixed interface name. Replace that
+        with the unprefixed version.
+
+        The "keyframes-rule.html" test added a check to make sure the
+        old constant WEBKIT_KEYFRAMES_RULE is the same as the new
+        constant KEYFRAMES_RULE.
+
+        * animations/keyframes-rule-expected.txt:
+        * animations/keyframes-rule.html:
+        * fast/dom/resources/wrapper-identity-base.js:
+        * fast/dom/wrapper-classes.html:
+        * fast/dom/wrapper-identity-expected.txt:
+        * platform/efl/js/dom/global-constructors-attributes-expected.txt:
+        * platform/gtk/js/dom/global-constructors-attributes-expected.txt:
+        * platform/mac-mavericks/js/dom/global-constructors-attributes-expected.txt:
+        * platform/mac-mountainlion/js/dom/global-constructors-attributes-expected.txt:
+        * platform/mac/fast/dom/objc-wrapper-identity-expected.txt:
+        * platform/mac/js/dom/global-constructors-attributes-expected.txt:
+        * platform/win/js/dom/global-constructors-attributes-expected.txt:
+
 2014-11-14  Alexey Proskuryakov  <ap@apple.com>
 
         Application test expectation gardening on WK2.

diff --git a/LayoutTests/animations/keyframes-rule-expected.txt b/LayoutTests/animations/keyframes-rule-expected.txt
index bc6946c..fc949e1 100644
--- a/LayoutTests/animations/keyframes-rule-expected.txt
+++ b/LayoutTests/animations/keyframes-rule-expected.txt

@@ -1,18 +1,22 @@
-This tests the WebKitCSSKeyframeRule and WebKitCSSKeyframesRule interfaces.
+This tests the CSSKeyframeRule and CSSKeyframesRule interfaces.
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
 
-PASS WebKitCSSKeyframeRule exists on Window object
-PASS WebKitCSSKeyframesRule exists on Window object
-PASS WEBKIT_KEYFRAME_RULE exists on Window.CSSRule object
-PASS WEBKIT_KEYFRAMES_RULE exists on Window.CSSRule object
+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
 
-PASS keyframes1.type is window.CSSRule.WEBKIT_KEYFRAMES_RULE
+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.WEBKIT_KEYFRAME_RULE
+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; }'
 
@@ -24,11 +28,11 @@
 PASS rules1.item(3).cssText is '60% { left: 60px; }'
 PASS rules1.item(4).cssText is '20% { left: 50px; }'
 
-PASS keyframes2.type is window.CSSRule.WEBKIT_KEYFRAMES_RULE
+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.WEBKIT_KEYFRAME_RULE
+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%'
@@ -40,14 +44,14 @@
 PASS rules2.item(0).style.length is 1
 
 Find a rule
-PASS rule.type is window.CSSRule.WEBKIT_KEYFRAME_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.WEBKIT_KEYFRAMES_RULE
-PASS rule.type is window.CSSRule.WEBKIT_KEYFRAME_RULE
+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.WEBKIT_KEYFRAME_RULE
+PASS rule.type is window.CSSRule.KEYFRAME_RULE
 PASS rule.cssText is '100% { left: 20px; }'
 
 Try to find a rule that doesn't exist
@@ -55,19 +59,19 @@
 
 Delete a rule
 PASS rules2.length is 2
-PASS rules2.item(0).type is window.CSSRule.WEBKIT_KEYFRAME_RULE
+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.WEBKIT_KEYFRAME_RULE
+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.WEBKIT_KEYFRAME_RULE
+PASS rules2.item(0).type is window.CSSRule.KEYFRAME_RULE
 PASS rules2.item(0).keyText is '0%'
 PASS rules2.item(1).keyText is '100%'
 

diff --git a/LayoutTests/animations/keyframes-rule.html b/LayoutTests/animations/keyframes-rule.html
index 4eb4aa2..9a65e91 100644
--- a/LayoutTests/animations/keyframes-rule.html
+++ b/LayoutTests/animations/keyframes-rule.html

@@ -21,33 +21,39 @@
 <body>
 <script>
 
-description("This tests the WebKitCSSKeyframeRule and WebKitCSSKeyframesRule interfaces.");
+description("This tests the CSSKeyframeRule and CSSKeyframesRule interfaces.");
 
-if (window.WebKitCSSKeyframeRule)
-    testPassed("WebKitCSSKeyframeRule exists on Window object");
+if (window.CSSKeyframeRule)
+    testPassed("CSSKeyframeRule exists on Window object");
 else
-    testFailed("WebKitCSSKeyframeRule does not exist on Window object");
+    testFailed("CSSKeyframeRule does not exist on Window object");
 
-if (window.WebKitCSSKeyframesRule)
-    testPassed("WebKitCSSKeyframesRule exists on Window object");
+if (window.CSSKeyframesRule)
+    testPassed("CSSKeyframesRule exists on Window object");
 else
-    testFailed("WebKitCSSKeyframesRule does not exist on Window object");
+    testFailed("CSSKeyframesRule does not exist on Window object");
 
-if (window.CSSRule.WEBKIT_KEYFRAME_RULE)
-    testPassed("WEBKIT_KEYFRAME_RULE exists on Window.CSSRule object");
+if (window.CSSRule.KEYFRAME_RULE)
+    testPassed("KEYFRAME_RULE exists on Window.CSSRule object");
 else
-    testFailed("WEBKIT_KEYFRAME_RULE does not exist on Window.CSSRule object");
+    testFailed("KEYFRAME_RULE does not exist on Window.CSSRule object");
 
-if (window.CSSRule.WEBKIT_KEYFRAMES_RULE)
-    testPassed("WEBKIT_KEYFRAMES_RULE exists on Window.CSSRule object");
+if (window.CSSRule.KEYFRAMES_RULE)
+    testPassed("KEYFRAMES_RULE exists on Window.CSSRule object");
 else
-    testFailed("WEBKIT_KEYFRAMES_RULE does not exist on Window.CSSRule object");
+    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.WEBKIT_KEYFRAMES_RULE");
+shouldBe("keyframes1.type", "window.CSSRule.KEYFRAMES_RULE");
 shouldBe("keyframes1.name", "'test1'");
 
 debug("");
@@ -55,7 +61,7 @@
 var rules1 = keyframes1.cssRules;
 shouldBe("rules1.length", "2");
 
-shouldBe("rules1.item(0).type", "window.CSSRule.WEBKIT_KEYFRAME_RULE");
+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; }'");
 
@@ -76,7 +82,7 @@
 
 var keyframes2 = document.styleSheets.item(0).cssRules.item(1);
 
-shouldBe("keyframes2.type", "window.CSSRule.WEBKIT_KEYFRAMES_RULE");
+shouldBe("keyframes2.type", "window.CSSRule.KEYFRAMES_RULE");
 shouldBe("keyframes2.name", "'test2'");
 
 var rules2 = keyframes2.cssRules;
@@ -85,7 +91,7 @@
 
 shouldBe("rules2.length", "3");
 
-shouldBe("rules2.item(0).type", "window.CSSRule.WEBKIT_KEYFRAME_RULE");
+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%'");
@@ -107,20 +113,20 @@
 if (!rule) 
   testFailed("Could not extract '50%' keyframe rule");
 
-shouldBe("rule.type", "window.CSSRule.WEBKIT_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.WEBKIT_KEYFRAMES_RULE");
+shouldBe("keyframesFromTo.type", "window.CSSRule.KEYFRAMES_RULE");
 rule = keyframesFromTo.findRule("From");
-shouldBe("rule.type", "window.CSSRule.WEBKIT_KEYFRAME_RULE");
+shouldBe("rule.type", "window.CSSRule.KEYFRAME_RULE");
 shouldBe("rule.cssText", "'0% { left: 10px; }'");
 
 rule = keyframesFromTo.findRule("TO");
-shouldBe("rule.type", "window.CSSRule.WEBKIT_KEYFRAME_RULE");
+shouldBe("rule.type", "window.CSSRule.KEYFRAME_RULE");
 shouldBe("rule.cssText", "'100% { left: 20px; }'");
 
 debug("");
@@ -138,7 +144,7 @@
 
 keyframes2.deleteRule("50%");
 shouldBe("rules2.length", "2");
-shouldBe("rules2.item(0).type", "window.CSSRule.WEBKIT_KEYFRAME_RULE");
+shouldBe("rules2.item(0).type", "window.CSSRule.KEYFRAME_RULE");
 shouldBe("rules2.item(0).keyText", "'0%'");
 shouldBe("rules2.item(1).keyText", "'100%'");
 
@@ -147,7 +153,7 @@
 keyframesFromTo.deleteRule("0%");
 var rulesFromTo = keyframesFromTo.cssRules;
 shouldBe("rulesFromTo.length", "2");
-shouldBe("rulesFromTo.item(0).type", "window.CSSRule.WEBKIT_KEYFRAME_RULE");
+shouldBe("rulesFromTo.item(0).type", "window.CSSRule.KEYFRAME_RULE");
 shouldBe("rulesFromTo.item(0).keyText", "'50%'");
 shouldBe("rulesFromTo.item(1).keyText", "'100%'");
 
@@ -157,7 +163,7 @@
 
 keyframes2.deleteRule("70%");
 shouldBe("rules2.length", "2");
-shouldBe("rules2.item(0).type", "window.CSSRule.WEBKIT_KEYFRAME_RULE");
+shouldBe("rules2.item(0).type", "window.CSSRule.KEYFRAME_RULE");
 shouldBe("rules2.item(0).keyText", "'0%'");
 shouldBe("rules2.item(1).keyText", "'100%'");
 

diff --git a/LayoutTests/fast/dom/resources/wrapper-identity-base.js b/LayoutTests/fast/dom/resources/wrapper-identity-base.js
index 4dbf802..e266d05 100644
--- a/LayoutTests/fast/dom/resources/wrapper-identity-base.js
+++ b/LayoutTests/fast/dom/resources/wrapper-identity-base.js

@@ -10,8 +10,8 @@
     'CSSFontFaceRule',
     'CSSPageRule',
     'CSSVariablesRule',
-    'WebKitCSSKeyframeRule',
-    'WebKitCSSKeyframesRule',
+    'CSSKeyframeRule',
+    'CSSKeyframesRule',
     'DOMException',
     'DOMParser',
     'Document',

diff --git a/LayoutTests/fast/dom/wrapper-classes.html b/LayoutTests/fast/dom/wrapper-classes.html
index a4f1f99..532e110 100644
--- a/LayoutTests/fast/dom/wrapper-classes.html
+++ b/LayoutTests/fast/dom/wrapper-classes.html

@@ -272,8 +272,8 @@
     // CSSPageRule
     // CSSRule
     // CSSVariablesRule
-    // WebKitCSSKeyframeRule
-    // WebKitCSSKeyframesRule
+    // CSSKeyframeRule
+    // CSSKeyframesRule
     // CSSValue
     // SVGColor
     // SVGPaint

diff --git a/LayoutTests/fast/dom/wrapper-identity-expected.txt b/LayoutTests/fast/dom/wrapper-identity-expected.txt
index 47babab..548a544 100644
--- a/LayoutTests/fast/dom/wrapper-identity-expected.txt
+++ b/LayoutTests/fast/dom/wrapper-identity-expected.txt

@@ -18,8 +18,8 @@
 PASS var object = window['CSSFontFaceRule']; isEqualJS(object, object); is true
 PASS var object = window['CSSPageRule']; isEqualJS(object, object); is true
 PASS var object = window['CSSVariablesRule']; isEqualJS(object, object); is true
-PASS var object = window['WebKitCSSKeyframeRule']; isEqualJS(object, object); is true
-PASS var object = window['WebKitCSSKeyframesRule']; isEqualJS(object, object); is true
+PASS var object = window['CSSKeyframeRule']; isEqualJS(object, object); is true
+PASS var object = window['CSSKeyframesRule']; isEqualJS(object, object); is true
 PASS var object = window['DOMException']; isEqualJS(object, object); is true
 PASS var object = window['DOMParser']; isEqualJS(object, object); is true
 PASS var object = window['Document']; isEqualJS(object, object); is true

diff --git a/LayoutTests/js/dom/global-constructors-attributes-expected.txt b/LayoutTests/js/dom/global-constructors-attributes-expected.txt
index b5f1dd7..30c09f6 100644
--- a/LayoutTests/js/dom/global-constructors-attributes-expected.txt
+++ b/LayoutTests/js/dom/global-constructors-attributes-expected.txt

@@ -98,6 +98,16 @@
 PASS Object.getOwnPropertyDescriptor(global, 'CSSImportRule').hasOwnProperty('set') is false
 PASS Object.getOwnPropertyDescriptor(global, 'CSSImportRule').enumerable is false
 PASS Object.getOwnPropertyDescriptor(global, 'CSSImportRule').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframeRule').value is WebKitCSSKeyframeRule
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframeRule').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframeRule').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframeRule').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframeRule').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframesRule').value is WebKitCSSKeyframesRule
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframesRule').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframesRule').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframesRule').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframesRule').configurable is true
 PASS Object.getOwnPropertyDescriptor(global, 'CSSMediaRule').value is CSSMediaRule
 PASS Object.getOwnPropertyDescriptor(global, 'CSSMediaRule').hasOwnProperty('get') is false
 PASS Object.getOwnPropertyDescriptor(global, 'CSSMediaRule').hasOwnProperty('set') is false
@@ -1903,16 +1913,6 @@
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSFilterValue').hasOwnProperty('set') is false
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSFilterValue').enumerable is false
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSFilterValue').configurable is true
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframeRule').value is WebKitCSSKeyframeRule
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframeRule').hasOwnProperty('get') is false
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframeRule').hasOwnProperty('set') is false
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframeRule').enumerable is false
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframeRule').configurable is true
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframesRule').value is WebKitCSSKeyframesRule
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframesRule').hasOwnProperty('get') is false
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframesRule').hasOwnProperty('set') is false
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframesRule').enumerable is false
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframesRule').configurable is true
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSMatrix').value is WebKitCSSMatrix
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSMatrix').hasOwnProperty('get') is false
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSMatrix').hasOwnProperty('set') is false

diff --git a/LayoutTests/platform/efl/js/dom/global-constructors-attributes-expected.txt b/LayoutTests/platform/efl/js/dom/global-constructors-attributes-expected.txt
index ff0df89..7df4e5b 100644
--- a/LayoutTests/platform/efl/js/dom/global-constructors-attributes-expected.txt
+++ b/LayoutTests/platform/efl/js/dom/global-constructors-attributes-expected.txt

@@ -103,6 +103,16 @@
 PASS Object.getOwnPropertyDescriptor(global, 'CSSImportRule').hasOwnProperty('set') is false
 PASS Object.getOwnPropertyDescriptor(global, 'CSSImportRule').enumerable is false
 PASS Object.getOwnPropertyDescriptor(global, 'CSSImportRule').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframeRule').value is CSSKeyframeRule
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframeRule').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframeRule').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframeRule').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframeRule').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframesRule').value is CSSKeyframesRule
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframesRule').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframesRule').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframesRule').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframesRule').configurable is true
 PASS Object.getOwnPropertyDescriptor(global, 'CSSMediaRule').value is CSSMediaRule
 PASS Object.getOwnPropertyDescriptor(global, 'CSSMediaRule').hasOwnProperty('get') is false
 PASS Object.getOwnPropertyDescriptor(global, 'CSSMediaRule').hasOwnProperty('set') is false
@@ -1908,16 +1918,6 @@
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSFilterValue').hasOwnProperty('set') is false
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSFilterValue').enumerable is false
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSFilterValue').configurable is true
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframeRule').value is WebKitCSSKeyframeRule
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframeRule').hasOwnProperty('get') is false
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframeRule').hasOwnProperty('set') is false
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframeRule').enumerable is false
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframeRule').configurable is true
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframesRule').value is WebKitCSSKeyframesRule
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframesRule').hasOwnProperty('get') is false
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframesRule').hasOwnProperty('set') is false
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframesRule').enumerable is false
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframesRule').configurable is true
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSMatrix').value is WebKitCSSMatrix
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSMatrix').hasOwnProperty('get') is false
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSMatrix').hasOwnProperty('set') is false

diff --git a/LayoutTests/platform/gtk/js/dom/global-constructors-attributes-expected.txt b/LayoutTests/platform/gtk/js/dom/global-constructors-attributes-expected.txt
index acf7732..37edf7d 100644
--- a/LayoutTests/platform/gtk/js/dom/global-constructors-attributes-expected.txt
+++ b/LayoutTests/platform/gtk/js/dom/global-constructors-attributes-expected.txt

@@ -103,6 +103,16 @@
 PASS Object.getOwnPropertyDescriptor(global, 'CSSImportRule').hasOwnProperty('set') is false
 PASS Object.getOwnPropertyDescriptor(global, 'CSSImportRule').enumerable is false
 PASS Object.getOwnPropertyDescriptor(global, 'CSSImportRule').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframeRule').value is CSSKeyframeRule
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframeRule').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframeRule').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframeRule').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframeRule').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframesRule').value is CSSKeyframesRule
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframesRule').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframesRule').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframesRule').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframesRule').configurable is true
 PASS Object.getOwnPropertyDescriptor(global, 'CSSMediaRule').value is CSSMediaRule
 PASS Object.getOwnPropertyDescriptor(global, 'CSSMediaRule').hasOwnProperty('get') is false
 PASS Object.getOwnPropertyDescriptor(global, 'CSSMediaRule').hasOwnProperty('set') is false
@@ -1988,16 +1998,6 @@
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitAnimationEvent').hasOwnProperty('set') is false
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitAnimationEvent').enumerable is false
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitAnimationEvent').configurable is true
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframeRule').value is WebKitCSSKeyframeRule
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframeRule').hasOwnProperty('get') is false
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframeRule').hasOwnProperty('set') is false
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframeRule').enumerable is false
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframeRule').configurable is true
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframesRule').value is WebKitCSSKeyframesRule
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframesRule').hasOwnProperty('get') is false
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframesRule').hasOwnProperty('set') is false
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframesRule').enumerable is false
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframesRule').configurable is true
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSMatrix').value is WebKitCSSMatrix
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSMatrix').hasOwnProperty('get') is false
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSMatrix').hasOwnProperty('set') is false

diff --git a/LayoutTests/platform/mac-mavericks/js/dom/global-constructors-attributes-expected.txt b/LayoutTests/platform/mac-mavericks/js/dom/global-constructors-attributes-expected.txt
index a67cbf9..5a1e80c 100644
--- a/LayoutTests/platform/mac-mavericks/js/dom/global-constructors-attributes-expected.txt
+++ b/LayoutTests/platform/mac-mavericks/js/dom/global-constructors-attributes-expected.txt

@@ -98,6 +98,16 @@
 PASS Object.getOwnPropertyDescriptor(global, 'CSSImportRule').hasOwnProperty('set') is false
 PASS Object.getOwnPropertyDescriptor(global, 'CSSImportRule').enumerable is false
 PASS Object.getOwnPropertyDescriptor(global, 'CSSImportRule').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframeRule').value is CSSKeyframeRule
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframeRule').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframeRule').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframeRule').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframeRule').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframesRule').value is CSSKeyframesRule
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframesRule').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframesRule').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframesRule').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframesRule').configurable is true
 PASS Object.getOwnPropertyDescriptor(global, 'CSSMediaRule').value is CSSMediaRule
 PASS Object.getOwnPropertyDescriptor(global, 'CSSMediaRule').hasOwnProperty('get') is false
 PASS Object.getOwnPropertyDescriptor(global, 'CSSMediaRule').hasOwnProperty('set') is false
@@ -1923,16 +1933,6 @@
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSFilterValue').hasOwnProperty('set') is false
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSFilterValue').enumerable is false
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSFilterValue').configurable is true
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframeRule').value is WebKitCSSKeyframeRule
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframeRule').hasOwnProperty('get') is false
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframeRule').hasOwnProperty('set') is false
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframeRule').enumerable is false
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframeRule').configurable is true
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframesRule').value is WebKitCSSKeyframesRule
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframesRule').hasOwnProperty('get') is false
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframesRule').hasOwnProperty('set') is false
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframesRule').enumerable is false
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframesRule').configurable is true
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSMatrix').value is WebKitCSSMatrix
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSMatrix').hasOwnProperty('get') is false
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSMatrix').hasOwnProperty('set') is false

diff --git a/LayoutTests/platform/mac-mountainlion/js/dom/global-constructors-attributes-expected.txt b/LayoutTests/platform/mac-mountainlion/js/dom/global-constructors-attributes-expected.txt
index cf1432d..f9b67dc 100644
--- a/LayoutTests/platform/mac-mountainlion/js/dom/global-constructors-attributes-expected.txt
+++ b/LayoutTests/platform/mac-mountainlion/js/dom/global-constructors-attributes-expected.txt

@@ -98,6 +98,16 @@
 PASS Object.getOwnPropertyDescriptor(global, 'CSSImportRule').hasOwnProperty('set') is false
 PASS Object.getOwnPropertyDescriptor(global, 'CSSImportRule').enumerable is false
 PASS Object.getOwnPropertyDescriptor(global, 'CSSImportRule').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframeRule').value is CSSKeyframeRule
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframeRule').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframeRule').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframeRule').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframeRule').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframesRule').value is CSSKeyframesRule
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframesRule').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframesRule').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframesRule').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframesRule').configurable is true
 PASS Object.getOwnPropertyDescriptor(global, 'CSSMediaRule').value is CSSMediaRule
 PASS Object.getOwnPropertyDescriptor(global, 'CSSMediaRule').hasOwnProperty('get') is false
 PASS Object.getOwnPropertyDescriptor(global, 'CSSMediaRule').hasOwnProperty('set') is false
@@ -1913,16 +1923,6 @@
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSFilterValue').hasOwnProperty('set') is false
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSFilterValue').enumerable is false
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSFilterValue').configurable is true
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframeRule').value is WebKitCSSKeyframeRule
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframeRule').hasOwnProperty('get') is false
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframeRule').hasOwnProperty('set') is false
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframeRule').enumerable is false
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframeRule').configurable is true
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframesRule').value is WebKitCSSKeyframesRule
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframesRule').hasOwnProperty('get') is false
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframesRule').hasOwnProperty('set') is false
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframesRule').enumerable is false
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframesRule').configurable is true
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSMatrix').value is WebKitCSSMatrix
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSMatrix').hasOwnProperty('get') is false
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSMatrix').hasOwnProperty('set') is false

diff --git a/LayoutTests/platform/mac/fast/dom/objc-wrapper-identity-expected.txt b/LayoutTests/platform/mac/fast/dom/objc-wrapper-identity-expected.txt
index c66e834..b456ff0 100644
--- a/LayoutTests/platform/mac/fast/dom/objc-wrapper-identity-expected.txt
+++ b/LayoutTests/platform/mac/fast/dom/objc-wrapper-identity-expected.txt

@@ -18,8 +18,8 @@
 PASS var object = window['CSSFontFaceRule']; isEqualObjC(object, object); is true
 PASS var object = window['CSSPageRule']; isEqualObjC(object, object); is true
 PASS var object = window['CSSVariablesRule']; isEqualObjC(object, object); is true
-PASS var object = window['WebKitCSSKeyframeRule']; isEqualObjC(object, object); is true
-PASS var object = window['WebKitCSSKeyframesRule']; isEqualObjC(object, object); is true
+PASS var object = window['CSSKeyframeRule']; isEqualObjC(object, object); is true
+PASS var object = window['CSSKeyframesRule']; isEqualObjC(object, object); is true
 PASS var object = window['DOMException']; isEqualObjC(object, object); is true
 PASS var object = window['DOMParser']; isEqualObjC(object, object); is true
 PASS var object = window['Document']; isEqualObjC(object, object); is true

diff --git a/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt b/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt
index a0c0df7..d7af808 100644
--- a/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt
+++ b/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt

@@ -98,6 +98,16 @@
 PASS Object.getOwnPropertyDescriptor(global, 'CSSImportRule').hasOwnProperty('set') is false
 PASS Object.getOwnPropertyDescriptor(global, 'CSSImportRule').enumerable is false
 PASS Object.getOwnPropertyDescriptor(global, 'CSSImportRule').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframeRule').value is CSSKeyframeRule
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframeRule').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframeRule').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframeRule').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframeRule').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframesRule').value is CSSKeyframesRule
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframesRule').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframesRule').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframesRule').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframesRule').configurable is true
 PASS Object.getOwnPropertyDescriptor(global, 'CSSMediaRule').value is CSSMediaRule
 PASS Object.getOwnPropertyDescriptor(global, 'CSSMediaRule').hasOwnProperty('get') is false
 PASS Object.getOwnPropertyDescriptor(global, 'CSSMediaRule').hasOwnProperty('set') is false
@@ -1943,16 +1953,6 @@
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSFilterValue').hasOwnProperty('set') is false
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSFilterValue').enumerable is false
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSFilterValue').configurable is true
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframeRule').value is WebKitCSSKeyframeRule
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframeRule').hasOwnProperty('get') is false
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframeRule').hasOwnProperty('set') is false
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframeRule').enumerable is false
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframeRule').configurable is true
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframesRule').value is WebKitCSSKeyframesRule
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframesRule').hasOwnProperty('get') is false
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframesRule').hasOwnProperty('set') is false
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframesRule').enumerable is false
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframesRule').configurable is true
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSMatrix').value is WebKitCSSMatrix
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSMatrix').hasOwnProperty('get') is false
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSMatrix').hasOwnProperty('set') is false

diff --git a/LayoutTests/platform/win/js/dom/global-constructors-attributes-expected.txt b/LayoutTests/platform/win/js/dom/global-constructors-attributes-expected.txt
index 24a1b4f..522d863 100644
--- a/LayoutTests/platform/win/js/dom/global-constructors-attributes-expected.txt
+++ b/LayoutTests/platform/win/js/dom/global-constructors-attributes-expected.txt

@@ -53,6 +53,16 @@
 PASS Object.getOwnPropertyDescriptor(global, 'CSSImportRule').hasOwnProperty('set') is false
 PASS Object.getOwnPropertyDescriptor(global, 'CSSImportRule').enumerable is false
 PASS Object.getOwnPropertyDescriptor(global, 'CSSImportRule').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframeRule').value is CSSKeyframeRule
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframeRule').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframeRule').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframeRule').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframeRule').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframesRule').value is CSSKeyframesRule
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframesRule').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframesRule').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframesRule').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'CSSKeyframesRule').configurable is true
 PASS Object.getOwnPropertyDescriptor(global, 'CSSMediaRule').value is CSSMediaRule
 PASS Object.getOwnPropertyDescriptor(global, 'CSSMediaRule').hasOwnProperty('get') is false
 PASS Object.getOwnPropertyDescriptor(global, 'CSSMediaRule').hasOwnProperty('set') is false
@@ -1648,16 +1658,6 @@
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSFilterValue').hasOwnProperty('set') is false
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSFilterValue').enumerable is false
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSFilterValue').configurable is true
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframeRule').value is WebKitCSSKeyframeRule
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframeRule').hasOwnProperty('get') is false
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframeRule').hasOwnProperty('set') is false
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframeRule').enumerable is false
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframeRule').configurable is true
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframesRule').value is WebKitCSSKeyframesRule
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframesRule').hasOwnProperty('get') is false
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframesRule').hasOwnProperty('set') is false
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframesRule').enumerable is false
-PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSKeyframesRule').configurable is true
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSMatrix').value is WebKitCSSMatrix
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSMatrix').hasOwnProperty('get') is false
 PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSMatrix').hasOwnProperty('set') is false

diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt
index f0134a0..5efa3fd 100644
--- a/Source/WebCore/CMakeLists.txt
+++ b/Source/WebCore/CMakeLists.txt

@@ -350,8 +350,8 @@
     css/StyleSheet.idl
     css/StyleSheetList.idl
     css/WebKitCSSFilterValue.idl
-    css/WebKitCSSKeyframeRule.idl
-    css/WebKitCSSKeyframesRule.idl
+    css/CSSKeyframeRule.idl
+    css/CSSKeyframesRule.idl
     css/WebKitCSSMatrix.idl
     css/WebKitCSSRegionRule.idl
     css/WebKitCSSTransformValue.idl
@@ -1288,8 +1288,8 @@
     css/TransformFunctions.cpp
     css/ViewportStyleResolver.cpp
     css/WebKitCSSFilterValue.cpp
-    css/WebKitCSSKeyframeRule.cpp
-    css/WebKitCSSKeyframesRule.cpp
+    css/CSSKeyframeRule.cpp
+    css/CSSKeyframesRule.cpp
     css/WebKitCSSMatrix.cpp
     css/WebKitCSSRegionRule.cpp
     css/WebKitCSSTransformValue.cpp
@@ -3341,7 +3341,6 @@
 GENERATE_GRAMMAR(cssyy ${WEBCORE_DIR}/css/CSSGrammar.y.in ${DERIVED_SOURCES_WEBCORE_DIR}/CSSGrammar.h ${DERIVED_SOURCES_WEBCORE_DIR}/CSSGrammar.cpp "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}")
 list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/CSSGrammar.cpp)
 
-
 GENERATE_GRAMMAR(xpathyy ${WEBCORE_DIR}/xml/XPathGrammar.y ${DERIVED_SOURCES_WEBCORE_DIR}/XPathGrammar.h ${DERIVED_SOURCES_WEBCORE_DIR}/XPathGrammar.cpp "")
 list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/XPathGrammar.cpp)
 

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 7634a09..496657a 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog

@@ -1,3 +1,86 @@
+2014-11-14  Dean Jackson  <dino@apple.com>
+
+        Rename WebKitCSSKeyframe(s)Rule into CSSKeyframe(s)Rule
+        https://bugs.webkit.org/show_bug.cgi?id=138763
+        <rdar://problem/18991569>
+
+        Reviewed by Simon Fraser.
+
+        Globally rename WebKitCSSKeyframeRule and WebKitCSSKeyframesRule to
+        CSSKeyframeRule and CSSKeyframesRule respectively.
+
+        This *may* break some existing content, but is compatible with
+        what Blink and Firefox are doing. To minimize breakage, I kept an
+        alias for the old constant values on CSSRule: WEBKIT_KEYFRAMES_RULE
+        and WEBKIT_KEYFRAME_RULE.
+
+        Covered by existing tests.
+
+        * CMakeLists.txt:
+        * DerivedSources.cpp:
+        * DerivedSources.make:
+        * WebCore.vcxproj/WebCore.vcxproj:
+        * WebCore.vcxproj/WebCore.vcxproj.filters:
+        * WebCore.xcodeproj/project.pbxproj:
+        * bindings/js/JSCSSRuleCustom.cpp:
+        (WebCore::toJS):
+        * bindings/objc/DOMCSS.mm:
+        (kitClass):
+        * css/CSSGrammar.y.includes:
+        * css/CSSKeyframeRule.cpp: Renamed from Source/WebCore/css/WebKitCSSKeyframeRule.cpp.
+        (WebCore::StyleKeyframe::StyleKeyframe):
+        (WebCore::StyleKeyframe::~StyleKeyframe):
+        (WebCore::StyleKeyframe::mutableProperties):
+        (WebCore::StyleKeyframe::parseKeyString):
+        (WebCore::StyleKeyframe::cssText):
+        (WebCore::CSSKeyframeRule::CSSKeyframeRule):
+        (WebCore::CSSKeyframeRule::~CSSKeyframeRule):
+        (WebCore::CSSKeyframeRule::style):
+        (WebCore::CSSKeyframeRule::reattach):
+        * css/CSSKeyframeRule.h: Renamed from Source/WebCore/css/WebKitCSSKeyframeRule.h.
+        (WebCore::StyleKeyframe::create):
+        (WebCore::StyleKeyframe::keyText):
+        (WebCore::StyleKeyframe::setKeyText):
+        (WebCore::StyleKeyframe::getKeys):
+        (WebCore::StyleKeyframe::properties):
+        * css/CSSKeyframeRule.idl: Renamed from Source/WebCore/css/WebKitCSSKeyframeRule.idl.
+        * css/CSSKeyframesRule.cpp: Renamed from Source/WebCore/css/WebKitCSSKeyframesRule.cpp.
+        (WebCore::StyleRuleKeyframes::StyleRuleKeyframes):
+        (WebCore::StyleRuleKeyframes::~StyleRuleKeyframes):
+        (WebCore::StyleRuleKeyframes::parserAppendKeyframe):
+        (WebCore::StyleRuleKeyframes::wrapperAppendKeyframe):
+        (WebCore::StyleRuleKeyframes::wrapperRemoveKeyframe):
+        (WebCore::StyleRuleKeyframes::findKeyframeIndex):
+        (WebCore::CSSKeyframesRule::CSSKeyframesRule):
+        (WebCore::CSSKeyframesRule::~CSSKeyframesRule):
+        (WebCore::CSSKeyframesRule::setName):
+        (WebCore::CSSKeyframesRule::appendRule):
+        (WebCore::CSSKeyframesRule::insertRule):
+        (WebCore::CSSKeyframesRule::deleteRule):
+        (WebCore::CSSKeyframesRule::findRule):
+        (WebCore::CSSKeyframesRule::cssText):
+        (WebCore::CSSKeyframesRule::length):
+        (WebCore::CSSKeyframesRule::item):
+        (WebCore::CSSKeyframesRule::cssRules):
+        (WebCore::CSSKeyframesRule::reattach):
+        * css/CSSKeyframesRule.h: Renamed from Source/WebCore/css/WebKitCSSKeyframesRule.h.
+        (WebCore::StyleRuleKeyframes::create):
+        (WebCore::StyleRuleKeyframes::keyframes):
+        (WebCore::StyleRuleKeyframes::name):
+        (WebCore::StyleRuleKeyframes::setName):
+        (WebCore::StyleRuleKeyframes::copy):
+        * css/CSSKeyframesRule.idl: Renamed from Source/WebCore/css/WebKitCSSKeyframesRule.idl.
+        * css/CSSParser.cpp:
+        * css/CSSRule.h:
+        * css/CSSRule.idl:
+        * css/CSSStyleSheet.cpp:
+        * css/RuleSet.cpp:
+        * css/StyleResolver.cpp:
+        * css/StyleRule.cpp:
+        (WebCore::StyleRuleBase::createCSSOMWrapper):
+        * inspector/InspectorStyleSheet.cpp:
+        (WebCore::asCSSRuleList):
+
 2014-11-15  David Kilzer  <ddkilzer@apple.com>
 
         REGRESSION (r176137): iOS build broke after moving DataDetectors scanning code to WebCore

diff --git a/Source/WebCore/DerivedSources.cpp b/Source/WebCore/DerivedSources.cpp
index 624ce17..f486c79 100644
--- a/Source/WebCore/DerivedSources.cpp
+++ b/Source/WebCore/DerivedSources.cpp

@@ -89,6 +89,8 @@
 #endif
 #include "JSCSSFontFaceRule.cpp"
 #include "JSCSSImportRule.cpp"
+#include "JSCSSKeyframeRule.cpp"
+#include "JSCSSKeyframesRule.cpp"
 #include "JSCSSMediaRule.cpp"
 #include "JSCSSPageRule.cpp"
 #include "JSCSSPrimitiveValue.cpp"
@@ -495,8 +497,6 @@
 #include "JSVoidCallback.cpp"
 #include "JSWebKitAnimationEvent.cpp"
 #include "JSWebKitCSSFilterValue.cpp"
-#include "JSWebKitCSSKeyframeRule.cpp"
-#include "JSWebKitCSSKeyframesRule.cpp"
 #include "JSWebKitCSSTransformValue.cpp"
 #include "JSWebKitCSSMatrix.cpp"
 #include "JSWebKitCSSRegionRule.cpp"

diff --git a/Source/WebCore/DerivedSources.make b/Source/WebCore/DerivedSources.make
index c41b5f4..9502a5f 100644
--- a/Source/WebCore/DerivedSources.make
+++ b/Source/WebCore/DerivedSources.make

@@ -243,8 +243,8 @@
     $(WebCore)/css/StyleSheet.idl \
     $(WebCore)/css/StyleSheetList.idl \
     $(WebCore)/css/WebKitCSSFilterValue.idl \
-    $(WebCore)/css/WebKitCSSKeyframeRule.idl \
-    $(WebCore)/css/WebKitCSSKeyframesRule.idl \
+    $(WebCore)/css/CSSKeyframeRule.idl \
+    $(WebCore)/css/CSSKeyframesRule.idl \
     $(WebCore)/css/WebKitCSSMatrix.idl \
     $(WebCore)/css/WebKitCSSRegionRule.idl \
     $(WebCore)/css/WebKitCSSTransformValue.idl \

diff --git a/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj b/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
index 3be5bf6..5a0ddd6 100644
--- a/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
+++ b/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj

@@ -6214,7 +6214,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSWebKitCSSKeyframeRule.cpp">
+    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCSSKeyframeRule.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
@@ -6228,7 +6228,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSWebKitCSSKeyframesRule.cpp">
+    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCSSKeyframesRule.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
@@ -9873,8 +9873,8 @@
     <ClCompile Include="..\css\TransformFunctions.cpp" />
     <ClCompile Include="..\css\ViewportStyleResolver.cpp" />
     <ClCompile Include="..\css\WebKitCSSFilterValue.cpp" />
-    <ClCompile Include="..\css\WebKitCSSKeyframeRule.cpp" />
-    <ClCompile Include="..\css\WebKitCSSKeyframesRule.cpp" />
+    <ClCompile Include="..\css\CSSKeyframeRule.cpp" />
+    <ClCompile Include="..\css\CSSKeyframesRule.cpp" />
     <ClCompile Include="..\css\WebKitCSSMatrix.cpp" />
     <ClCompile Include="..\css\WebKitCSSRegionRule.cpp" />
     <ClCompile Include="..\css\WebKitCSSTransformValue.cpp" />
@@ -18690,8 +18690,8 @@
     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSValidityState.h" />
     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSWebKitAnimationEvent.h" />
     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSWebKitCSSFilterValue.h" />
-    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSWebKitCSSKeyframeRule.h" />
-    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSWebKitCSSKeyframesRule.h" />
+    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCSSKeyframeRule.h" />
+    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCSSKeyframesRule.h" />
     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSWebKitCSSMatrix.h" />
     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSWebKitCSSRegionRule.h" />
     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSWebKitCSSTransformValue.h" />
@@ -20150,8 +20150,8 @@
     <ClInclude Include="..\css\TransformFunctions.h" />
     <ClInclude Include="..\css\ViewportStyleResolver.h" />
     <ClInclude Include="..\css\WebKitCSSFilterValue.h" />
-    <ClInclude Include="..\css\WebKitCSSKeyframeRule.h" />
-    <ClInclude Include="..\css\WebKitCSSKeyframesRule.h" />
+    <ClInclude Include="..\css\CSSKeyframeRule.h" />
+    <ClInclude Include="..\css\CSSKeyframesRule.h" />
     <ClInclude Include="..\css\WebKitCSSMatrix.h" />
     <ClInclude Include="..\css\WebKitCSSRegionRule.h" />
     <ClInclude Include="..\css\WebKitCSSTransformValue.h" />

diff --git a/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters b/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters
index 83aac37..d2c8d11 100644
--- a/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters
+++ b/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters

@@ -2346,10 +2346,10 @@
     <ClCompile Include="..\css\WebKitCSSFilterValue.cpp">
       <Filter>css</Filter>
     </ClCompile>
-    <ClCompile Include="..\css\WebKitCSSKeyframeRule.cpp">
+    <ClCompile Include="..\css\CSSKeyframeRule.cpp">
       <Filter>css</Filter>
     </ClCompile>
-    <ClCompile Include="..\css\WebKitCSSKeyframesRule.cpp">
+    <ClCompile Include="..\css\CSSKeyframesRule.cpp">
       <Filter>css</Filter>
     </ClCompile>
     <ClCompile Include="..\css\WebKitCSSMatrix.cpp">
@@ -6352,10 +6352,10 @@
     <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSWebKitCSSFilterValue.cpp">
       <Filter>DerivedSources</Filter>
     </ClCompile>
-    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSWebKitCSSKeyframeRule.cpp">
+    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCSSKeyframeRule.cpp">
       <Filter>DerivedSources</Filter>
     </ClCompile>
-    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSWebKitCSSKeyframesRule.cpp">
+    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCSSKeyframesRule.cpp">
       <Filter>DerivedSources</Filter>
     </ClCompile>
     <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSWebKitCSSMatrix.cpp">
@@ -9339,10 +9339,10 @@
     <ClInclude Include="..\css\WebKitCSSFilterValue.h">
       <Filter>css</Filter>
     </ClInclude>
-    <ClInclude Include="..\css\WebKitCSSKeyframeRule.h">
+    <ClInclude Include="..\css\CSSKeyframeRule.h">
       <Filter>css</Filter>
     </ClInclude>
-    <ClInclude Include="..\css\WebKitCSSKeyframesRule.h">
+    <ClInclude Include="..\css\CSSKeyframesRule.h">
       <Filter>css</Filter>
     </ClInclude>
     <ClInclude Include="..\css\WebKitCSSMatrix.h">
@@ -14264,10 +14264,10 @@
     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSWebKitCSSFilterValue.h">
       <Filter>DerivedSources</Filter>
     </ClInclude>
-    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSWebKitCSSKeyframeRule.h">
+    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCSSKeyframeRule.h">
       <Filter>DerivedSources</Filter>
     </ClInclude>
-    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSWebKitCSSKeyframesRule.h">
+    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCSSKeyframesRule.h">
       <Filter>DerivedSources</Filter>
     </ClInclude>
     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSWebKitCSSMatrix.h">

diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
index 1799ac5..f7ad634 100644
--- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -1216,10 +1216,10 @@
 		311C08BE18EB7CAF00B65615 /* mediaControlsApple.js in Resources */ = {isa = PBXBuildFile; fileRef = CDE6560E17CA6E7600526BA7 /* mediaControlsApple.js */; };
 		311C08BF18EB7CAF00B65615 /* mediaControlsiOS.css in Resources */ = {isa = PBXBuildFile; fileRef = CDAAF45D1869094E003C1717 /* mediaControlsiOS.css */; };
 		311C08C018EB7CAF00B65615 /* mediaControlsiOS.js in Resources */ = {isa = PBXBuildFile; fileRef = CD32A189184EB46A0029B1BB /* mediaControlsiOS.js */; };
-		31288E720E3005D6003619AE /* WebKitCSSKeyframeRule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31288E6E0E3005D6003619AE /* WebKitCSSKeyframeRule.cpp */; };
-		31288E730E3005D6003619AE /* WebKitCSSKeyframeRule.h in Headers */ = {isa = PBXBuildFile; fileRef = 31288E6F0E3005D6003619AE /* WebKitCSSKeyframeRule.h */; };
-		31288E740E3005D6003619AE /* WebKitCSSKeyframesRule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31288E700E3005D6003619AE /* WebKitCSSKeyframesRule.cpp */; };
-		31288E750E3005D6003619AE /* WebKitCSSKeyframesRule.h in Headers */ = {isa = PBXBuildFile; fileRef = 31288E710E3005D6003619AE /* WebKitCSSKeyframesRule.h */; };
+		31288E720E3005D6003619AE /* CSSKeyframeRule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31288E6E0E3005D6003619AE /* CSSKeyframeRule.cpp */; };
+		31288E730E3005D6003619AE /* CSSKeyframeRule.h in Headers */ = {isa = PBXBuildFile; fileRef = 31288E6F0E3005D6003619AE /* CSSKeyframeRule.h */; };
+		31288E740E3005D6003619AE /* CSSKeyframesRule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31288E700E3005D6003619AE /* CSSKeyframesRule.cpp */; };
+		31288E750E3005D6003619AE /* CSSKeyframesRule.h in Headers */ = {isa = PBXBuildFile; fileRef = 31288E710E3005D6003619AE /* CSSKeyframesRule.h */; };
 		3128CA68147331520074C72A /* NotificationController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3128CA67147331520074C72A /* NotificationController.cpp */; };
 		3128CA6B147331630074C72A /* NotificationController.h in Headers */ = {isa = PBXBuildFile; fileRef = 3128CA6A147331630074C72A /* NotificationController.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		312C0C41146DC6CC0016C911 /* Notification.h in Headers */ = {isa = PBXBuildFile; fileRef = 333F704F0FB49CA2008E12A6 /* Notification.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -1240,16 +1240,16 @@
 		31611E610E1C4E1400F6A579 /* DOMWebKitCSSTransformValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 31611E5E0E1C4E1400F6A579 /* DOMWebKitCSSTransformValue.h */; };
 		31611E620E1C4E1400F6A579 /* DOMWebKitCSSTransformValue.mm in Sources */ = {isa = PBXBuildFile; fileRef = 31611E5F0E1C4E1400F6A579 /* DOMWebKitCSSTransformValue.mm */; };
 		31611E630E1C4E1400F6A579 /* DOMWebKitCSSTransformValueInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 31611E600E1C4E1400F6A579 /* DOMWebKitCSSTransformValueInternal.h */; };
-		316FE0710E6CCBEE00BF6088 /* JSWebKitCSSKeyframeRule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 316FE06D0E6CCBEE00BF6088 /* JSWebKitCSSKeyframeRule.cpp */; };
-		316FE0720E6CCBEE00BF6088 /* JSWebKitCSSKeyframeRule.h in Headers */ = {isa = PBXBuildFile; fileRef = 316FE06E0E6CCBEE00BF6088 /* JSWebKitCSSKeyframeRule.h */; };
-		316FE0730E6CCBEE00BF6088 /* JSWebKitCSSKeyframesRule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 316FE06F0E6CCBEE00BF6088 /* JSWebKitCSSKeyframesRule.cpp */; };
-		316FE0740E6CCBEE00BF6088 /* JSWebKitCSSKeyframesRule.h in Headers */ = {isa = PBXBuildFile; fileRef = 316FE0700E6CCBEE00BF6088 /* JSWebKitCSSKeyframesRule.h */; };
-		316FE07D0E6CCC2800BF6088 /* DOMWebKitCSSKeyframeRule.h in Headers */ = {isa = PBXBuildFile; fileRef = 316FE0770E6CCC2800BF6088 /* DOMWebKitCSSKeyframeRule.h */; };
-		316FE07E0E6CCC2800BF6088 /* DOMWebKitCSSKeyframeRule.mm in Sources */ = {isa = PBXBuildFile; fileRef = 316FE0780E6CCC2800BF6088 /* DOMWebKitCSSKeyframeRule.mm */; };
-		316FE07F0E6CCC2800BF6088 /* DOMWebKitCSSKeyframeRuleInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 316FE0790E6CCC2800BF6088 /* DOMWebKitCSSKeyframeRuleInternal.h */; };
-		316FE0800E6CCC2800BF6088 /* DOMWebKitCSSKeyframesRule.h in Headers */ = {isa = PBXBuildFile; fileRef = 316FE07A0E6CCC2800BF6088 /* DOMWebKitCSSKeyframesRule.h */; };
-		316FE0810E6CCC2800BF6088 /* DOMWebKitCSSKeyframesRule.mm in Sources */ = {isa = PBXBuildFile; fileRef = 316FE07B0E6CCC2800BF6088 /* DOMWebKitCSSKeyframesRule.mm */; };
-		316FE0820E6CCC2800BF6088 /* DOMWebKitCSSKeyframesRuleInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 316FE07C0E6CCC2800BF6088 /* DOMWebKitCSSKeyframesRuleInternal.h */; };
+		316FE0710E6CCBEE00BF6088 /* JSCSSKeyframeRule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 316FE06D0E6CCBEE00BF6088 /* JSCSSKeyframeRule.cpp */; };
+		316FE0720E6CCBEE00BF6088 /* JSCSSKeyframeRule.h in Headers */ = {isa = PBXBuildFile; fileRef = 316FE06E0E6CCBEE00BF6088 /* JSCSSKeyframeRule.h */; };
+		316FE0730E6CCBEE00BF6088 /* JSCSSKeyframesRule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 316FE06F0E6CCBEE00BF6088 /* JSCSSKeyframesRule.cpp */; };
+		316FE0740E6CCBEE00BF6088 /* JSCSSKeyframesRule.h in Headers */ = {isa = PBXBuildFile; fileRef = 316FE0700E6CCBEE00BF6088 /* JSCSSKeyframesRule.h */; };
+		316FE07D0E6CCC2800BF6088 /* DOMCSSKeyframeRule.h in Headers */ = {isa = PBXBuildFile; fileRef = 316FE0770E6CCC2800BF6088 /* DOMCSSKeyframeRule.h */; };
+		316FE07E0E6CCC2800BF6088 /* DOMCSSKeyframeRule.mm in Sources */ = {isa = PBXBuildFile; fileRef = 316FE0780E6CCC2800BF6088 /* DOMCSSKeyframeRule.mm */; };
+		316FE07F0E6CCC2800BF6088 /* DOMCSSKeyframeRuleInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 316FE0790E6CCC2800BF6088 /* DOMCSSKeyframeRuleInternal.h */; };
+		316FE0800E6CCC2800BF6088 /* DOMCSSKeyframesRule.h in Headers */ = {isa = PBXBuildFile; fileRef = 316FE07A0E6CCC2800BF6088 /* DOMCSSKeyframesRule.h */; };
+		316FE0810E6CCC2800BF6088 /* DOMCSSKeyframesRule.mm in Sources */ = {isa = PBXBuildFile; fileRef = 316FE07B0E6CCC2800BF6088 /* DOMCSSKeyframesRule.mm */; };
+		316FE0820E6CCC2800BF6088 /* DOMCSSKeyframesRuleInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 316FE07C0E6CCC2800BF6088 /* DOMCSSKeyframesRuleInternal.h */; };
 		316FE1110E6E1DA700BF6088 /* AnimationBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 316FE1070E6E1DA700BF6088 /* AnimationBase.cpp */; };
 		316FE1120E6E1DA700BF6088 /* AnimationBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 316FE1080E6E1DA700BF6088 /* AnimationBase.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		316FE1130E6E1DA700BF6088 /* AnimationController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 316FE1090E6E1DA700BF6088 /* AnimationController.cpp */; };
@@ -8224,10 +8224,10 @@
 		31078CC51880AAAA008099DC /* JSOESTextureHalfFloatLinear.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSOESTextureHalfFloatLinear.cpp; sourceTree = "<group>"; };
 		31078CC61880AAAA008099DC /* JSOESTextureHalfFloatLinear.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSOESTextureHalfFloatLinear.h; sourceTree = "<group>"; };
 		311C08BC18E35D6800B65615 /* ControlStates.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ControlStates.h; sourceTree = "<group>"; };
-		31288E6E0E3005D6003619AE /* WebKitCSSKeyframeRule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebKitCSSKeyframeRule.cpp; sourceTree = "<group>"; };
-		31288E6F0E3005D6003619AE /* WebKitCSSKeyframeRule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKitCSSKeyframeRule.h; sourceTree = "<group>"; };
-		31288E700E3005D6003619AE /* WebKitCSSKeyframesRule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebKitCSSKeyframesRule.cpp; sourceTree = "<group>"; };
-		31288E710E3005D6003619AE /* WebKitCSSKeyframesRule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKitCSSKeyframesRule.h; sourceTree = "<group>"; };
+		31288E6E0E3005D6003619AE /* CSSKeyframeRule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSKeyframeRule.cpp; sourceTree = "<group>"; };
+		31288E6F0E3005D6003619AE /* CSSKeyframeRule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSKeyframeRule.h; sourceTree = "<group>"; };
+		31288E700E3005D6003619AE /* CSSKeyframesRule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSKeyframesRule.cpp; sourceTree = "<group>"; };
+		31288E710E3005D6003619AE /* CSSKeyframesRule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSKeyframesRule.h; sourceTree = "<group>"; };
 		3128CA67147331520074C72A /* NotificationController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NotificationController.cpp; sourceTree = "<group>"; };
 		3128CA6A147331630074C72A /* NotificationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NotificationController.h; sourceTree = "<group>"; };
 		312D67B01535691F00563D0D /* Dictionary.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Dictionary.cpp; sourceTree = "<group>"; };
@@ -8249,18 +8249,18 @@
 		31611E5E0E1C4E1400F6A579 /* DOMWebKitCSSTransformValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMWebKitCSSTransformValue.h; sourceTree = "<group>"; };
 		31611E5F0E1C4E1400F6A579 /* DOMWebKitCSSTransformValue.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMWebKitCSSTransformValue.mm; sourceTree = "<group>"; };
 		31611E600E1C4E1400F6A579 /* DOMWebKitCSSTransformValueInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMWebKitCSSTransformValueInternal.h; sourceTree = "<group>"; };
-		316FE06D0E6CCBEE00BF6088 /* JSWebKitCSSKeyframeRule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebKitCSSKeyframeRule.cpp; sourceTree = "<group>"; };
-		316FE06E0E6CCBEE00BF6088 /* JSWebKitCSSKeyframeRule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWebKitCSSKeyframeRule.h; sourceTree = "<group>"; };
-		316FE06F0E6CCBEE00BF6088 /* JSWebKitCSSKeyframesRule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebKitCSSKeyframesRule.cpp; sourceTree = "<group>"; };
-		316FE0700E6CCBEE00BF6088 /* JSWebKitCSSKeyframesRule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWebKitCSSKeyframesRule.h; sourceTree = "<group>"; };
-		316FE0770E6CCC2800BF6088 /* DOMWebKitCSSKeyframeRule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMWebKitCSSKeyframeRule.h; sourceTree = "<group>"; };
-		316FE0780E6CCC2800BF6088 /* DOMWebKitCSSKeyframeRule.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMWebKitCSSKeyframeRule.mm; sourceTree = "<group>"; };
-		316FE0790E6CCC2800BF6088 /* DOMWebKitCSSKeyframeRuleInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMWebKitCSSKeyframeRuleInternal.h; sourceTree = "<group>"; };
-		316FE07A0E6CCC2800BF6088 /* DOMWebKitCSSKeyframesRule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMWebKitCSSKeyframesRule.h; sourceTree = "<group>"; };
-		316FE07B0E6CCC2800BF6088 /* DOMWebKitCSSKeyframesRule.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMWebKitCSSKeyframesRule.mm; sourceTree = "<group>"; };
-		316FE07C0E6CCC2800BF6088 /* DOMWebKitCSSKeyframesRuleInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMWebKitCSSKeyframesRuleInternal.h; sourceTree = "<group>"; };
-		316FE0910E6CCD7F00BF6088 /* WebKitCSSKeyframeRule.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebKitCSSKeyframeRule.idl; sourceTree = "<group>"; };
-		316FE0920E6CCD7F00BF6088 /* WebKitCSSKeyframesRule.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebKitCSSKeyframesRule.idl; sourceTree = "<group>"; };
+		316FE06D0E6CCBEE00BF6088 /* JSCSSKeyframeRule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCSSKeyframeRule.cpp; sourceTree = "<group>"; };
+		316FE06E0E6CCBEE00BF6088 /* JSCSSKeyframeRule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCSSKeyframeRule.h; sourceTree = "<group>"; };
+		316FE06F0E6CCBEE00BF6088 /* JSCSSKeyframesRule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCSSKeyframesRule.cpp; sourceTree = "<group>"; };
+		316FE0700E6CCBEE00BF6088 /* JSCSSKeyframesRule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCSSKeyframesRule.h; sourceTree = "<group>"; };
+		316FE0770E6CCC2800BF6088 /* DOMCSSKeyframeRule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = DOMCSSKeyframeRule.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+		316FE0780E6CCC2800BF6088 /* DOMCSSKeyframeRule.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = DOMCSSKeyframeRule.mm; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+		316FE0790E6CCC2800BF6088 /* DOMCSSKeyframeRuleInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = DOMCSSKeyframeRuleInternal.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+		316FE07A0E6CCC2800BF6088 /* DOMCSSKeyframesRule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = DOMCSSKeyframesRule.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+		316FE07B0E6CCC2800BF6088 /* DOMCSSKeyframesRule.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = DOMCSSKeyframesRule.mm; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+		316FE07C0E6CCC2800BF6088 /* DOMCSSKeyframesRuleInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMCSSKeyframesRuleInternal.h; sourceTree = "<group>"; };
+		316FE0910E6CCD7F00BF6088 /* CSSKeyframeRule.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CSSKeyframeRule.idl; sourceTree = "<group>"; };
+		316FE0920E6CCD7F00BF6088 /* CSSKeyframesRule.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CSSKeyframesRule.idl; sourceTree = "<group>"; };
 		316FE1070E6E1DA700BF6088 /* AnimationBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AnimationBase.cpp; path = animation/AnimationBase.cpp; sourceTree = "<group>"; };
 		316FE1080E6E1DA700BF6088 /* AnimationBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AnimationBase.h; path = animation/AnimationBase.h; sourceTree = "<group>"; };
 		316FE1090E6E1DA700BF6088 /* AnimationController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AnimationController.cpp; path = animation/AnimationController.cpp; sourceTree = "<group>"; };
@@ -9282,7 +9282,7 @@
 		65653F2C0D9727D200CA9723 /* SVGAltGlyphElement.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SVGAltGlyphElement.idl; sourceTree = "<group>"; };
 		656580EE09D12B20000E61D7 /* CSSPropertyNames.gperf */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CSSPropertyNames.gperf; sourceTree = "<group>"; };
 		656580EF09D12B20000E61D7 /* CSSPropertyNames.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CSSPropertyNames.h; sourceTree = "<group>"; };
-		6565814409D13043000E61D7 /* CSSGrammar.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CSSGrammar.cpp; sourceTree = "<group>"; };
+		6565814409D13043000E61D7 /* CSSGrammar.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = CSSGrammar.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
 		6565814709D13043000E61D7 /* CSSValueKeywords.gperf */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CSSValueKeywords.gperf; sourceTree = "<group>"; };
 		6565814809D13043000E61D7 /* CSSValueKeywords.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CSSValueKeywords.h; sourceTree = "<group>"; };
 		656581AC09D14EE6000E61D7 /* CharsetData.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CharsetData.cpp; sourceTree = "<group>"; };
@@ -10258,7 +10258,7 @@
 		930705D909E0C9BF00B17FE4 /* JSCounter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCounter.h; sourceTree = "<group>"; };
 		930705E809E0C9F000B17FE4 /* JSCSSPrimitiveValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCSSPrimitiveValue.cpp; sourceTree = "<group>"; };
 		930705EA09E0C9F600B17FE4 /* JSCSSPrimitiveValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCSSPrimitiveValue.h; sourceTree = "<group>"; };
-		9307061309E0CA8200B17FE4 /* DerivedSources.make */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 4; path = DerivedSources.make; sourceTree = "<group>"; usesTabs = 1; };
+		9307061309E0CA8200B17FE4 /* DerivedSources.make */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 4; lineEnding = 0; path = DerivedSources.make; sourceTree = "<group>"; usesTabs = 1; xcLanguageSpecificationIdentifier = xcode.lang.simpleColoring; };
 		9307F1D50AF2D59000DBA31A /* HitTestResult.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = HitTestResult.cpp; sourceTree = "<group>"; };
 		9307F1D60AF2D59000DBA31A /* HitTestResult.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HitTestResult.h; sourceTree = "<group>"; };
 		930908900AF7EDE40081DF01 /* HitTestRequest.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HitTestRequest.h; sourceTree = "<group>"; };
@@ -12403,7 +12403,7 @@
 		BC1A3798097C715F0019F3D8 /* DOM.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = DOM.mm; sourceTree = "<group>"; };
 		BC1A3799097C715F0019F3D8 /* DOMCore.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMCore.h; sourceTree = "<group>"; };
 		BC1A379A097C715F0019F3D8 /* DOMCSS.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMCSS.h; sourceTree = "<group>"; };
-		BC1A379B097C715F0019F3D8 /* DOMCSS.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMCSS.mm; sourceTree = "<group>"; };
+		BC1A379B097C715F0019F3D8 /* DOMCSS.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = DOMCSS.mm; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		BC1A379C097C715F0019F3D8 /* DOMEvents.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMEvents.h; sourceTree = "<group>"; };
 		BC1A379D097C715F0019F3D8 /* DOMEvents.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMEvents.mm; sourceTree = "<group>"; };
 		BC1A379F097C715F0019F3D8 /* DOMExtensions.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMExtensions.h; sourceTree = "<group>"; };
@@ -12470,7 +12470,7 @@
 		BC3C39B40C0D3D8D005F4D7A /* JSMediaList.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSMediaList.cpp; sourceTree = "<group>"; };
 		BC3C39B50C0D3D8D005F4D7A /* JSMediaList.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSMediaList.h; sourceTree = "<group>"; };
 		BC4368E70C226E32005EFB5F /* Rect.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Rect.h; sourceTree = "<group>"; };
-		BC46C1ED0C0DDBDF0020CFC3 /* JSCSSRuleCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSCSSRuleCustom.cpp; sourceTree = "<group>"; };
+		BC46C1ED0C0DDBDF0020CFC3 /* JSCSSRuleCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = JSCSSRuleCustom.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
 		BC46C1F00C0DDC8F0020CFC3 /* JSCSSCharsetRule.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSCSSCharsetRule.cpp; sourceTree = "<group>"; };
 		BC46C1F10C0DDC8F0020CFC3 /* JSCSSCharsetRule.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSCSSCharsetRule.h; sourceTree = "<group>"; };
 		BC46C1F20C0DDC8F0020CFC3 /* JSCSSFontFaceRule.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSCSSFontFaceRule.cpp; sourceTree = "<group>"; };
@@ -12600,7 +12600,7 @@
 		BC74DA471013F468007987AD /* JSRGBColor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSRGBColor.h; sourceTree = "<group>"; };
 		BC76AC110DD7AD5C00415F34 /* ParserUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ParserUtilities.h; sourceTree = "<group>"; };
 		BC772B360C4EA91E0083285F /* CSSHelper.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CSSHelper.h; sourceTree = "<group>"; };
-		BC772B370C4EA91E0083285F /* CSSParser.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CSSParser.cpp; sourceTree = "<group>"; };
+		BC772B370C4EA91E0083285F /* CSSParser.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = CSSParser.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
 		BC772B380C4EA91E0083285F /* CSSParser.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CSSParser.h; sourceTree = "<group>"; };
 		BC772C440C4EB2C60083285F /* XMLHttpRequest.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = XMLHttpRequest.cpp; sourceTree = "<group>"; };
 		BC772C450C4EB2C60083285F /* XMLHttpRequest.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = XMLHttpRequest.h; sourceTree = "<group>"; };
@@ -13547,7 +13547,7 @@
 		E1C6571E1816E50300256CDD /* CryptoAlgorithmHmacParams.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CryptoAlgorithmHmacParams.h; path = parameters/CryptoAlgorithmHmacParams.h; sourceTree = "<group>"; };
 		E1C657241816E69D00256CDD /* CryptoAlgorithmIdentifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoAlgorithmIdentifier.h; sourceTree = "<group>"; };
 		E1C657261816F9FE00256CDD /* CryptoAlgorithmParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoAlgorithmParameters.h; sourceTree = "<group>"; };
-		E1C6CFC21746D293007B87A1 /* DOMWindowConstructors.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = DOMWindowConstructors.idl; sourceTree = "<group>"; };
+		E1C6CFC21746D293007B87A1 /* DOMWindowConstructors.idl */ = {isa = PBXFileReference; lastKnownFileType = text; lineEnding = 0; path = DOMWindowConstructors.idl; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = "<none>"; };
 		E1C8BE5C0E8BD15A0064CB7D /* JSWorker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWorker.cpp; sourceTree = "<group>"; };
 		E1C94AF7191303F000D5A893 /* BlobPart.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BlobPart.h; sourceTree = "<group>"; };
 		E1CA5CBB0E8CDCAF00E8EF90 /* JSWorkerCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWorkerCustom.cpp; sourceTree = "<group>"; };
@@ -13919,7 +13919,7 @@
 		FCD8832916A49F8200962227 /* DOMCSSSupportsRule.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMCSSSupportsRule.mm; sourceTree = "<group>"; };
 		FCEBBAAA16A4967A00FA20A6 /* DOMCSSSupportsRuleInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMCSSSupportsRuleInternal.h; sourceTree = "<group>"; };
 		FCEBCD711623A7910029965E /* CSSGrammar.y.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.yacc; path = CSSGrammar.y.in; sourceTree = "<group>"; };
-		FCEBCD721623A7910029965E /* CSSGrammar.y.includes */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.yacc; path = CSSGrammar.y.includes; sourceTree = "<group>"; };
+		FCEBCD721623A7910029965E /* CSSGrammar.y.includes */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.yacc; lineEnding = 0; path = CSSGrammar.y.includes; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = "<none>"; };
 		FD00D7A214A3F61900734011 /* SincResampler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SincResampler.cpp; sourceTree = "<group>"; };
 		FD00D7A314A3F61900734011 /* SincResampler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SincResampler.h; sourceTree = "<group>"; };
 		FD06DFA3134A4DEF006F5D7D /* DefaultAudioDestinationNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DefaultAudioDestinationNode.cpp; sourceTree = "<group>"; };
@@ -16928,12 +16928,12 @@
 				31060376143281CD00ABF4BA /* DOMWebKitCSSFilterValue.h */,
 				31060377143281CD00ABF4BA /* DOMWebKitCSSFilterValue.mm */,
 				31060378143281CD00ABF4BA /* DOMWebKitCSSFilterValueInternal.h */,
-				316FE0770E6CCC2800BF6088 /* DOMWebKitCSSKeyframeRule.h */,
-				316FE0780E6CCC2800BF6088 /* DOMWebKitCSSKeyframeRule.mm */,
-				316FE0790E6CCC2800BF6088 /* DOMWebKitCSSKeyframeRuleInternal.h */,
-				316FE07A0E6CCC2800BF6088 /* DOMWebKitCSSKeyframesRule.h */,
-				316FE07B0E6CCC2800BF6088 /* DOMWebKitCSSKeyframesRule.mm */,
-				316FE07C0E6CCC2800BF6088 /* DOMWebKitCSSKeyframesRuleInternal.h */,
+				316FE0770E6CCC2800BF6088 /* DOMCSSKeyframeRule.h */,
+				316FE0780E6CCC2800BF6088 /* DOMCSSKeyframeRule.mm */,
+				316FE0790E6CCC2800BF6088 /* DOMCSSKeyframeRuleInternal.h */,
+				316FE07A0E6CCC2800BF6088 /* DOMCSSKeyframesRule.h */,
+				316FE07B0E6CCC2800BF6088 /* DOMCSSKeyframesRule.mm */,
+				316FE07C0E6CCC2800BF6088 /* DOMCSSKeyframesRuleInternal.h */,
 				4983914D0F1E76B400C23782 /* DOMWebKitCSSMatrix.h */,
 				4983914E0F1E76B400C23782 /* DOMWebKitCSSMatrix.mm */,
 				4983914F0F1E76B400C23782 /* DOMWebKitCSSMatrixInternal.h */,
@@ -19276,10 +19276,10 @@
 				A84EBD810CB8C97700079609 /* JSStyleSheetList.h */,
 				310603721432819C00ABF4BA /* JSWebKitCSSFilterValue.cpp */,
 				310603731432819C00ABF4BA /* JSWebKitCSSFilterValue.h */,
-				316FE06D0E6CCBEE00BF6088 /* JSWebKitCSSKeyframeRule.cpp */,
-				316FE06E0E6CCBEE00BF6088 /* JSWebKitCSSKeyframeRule.h */,
-				316FE06F0E6CCBEE00BF6088 /* JSWebKitCSSKeyframesRule.cpp */,
-				316FE0700E6CCBEE00BF6088 /* JSWebKitCSSKeyframesRule.h */,
+				316FE06D0E6CCBEE00BF6088 /* JSCSSKeyframeRule.cpp */,
+				316FE06E0E6CCBEE00BF6088 /* JSCSSKeyframeRule.h */,
+				316FE06F0E6CCBEE00BF6088 /* JSCSSKeyframesRule.cpp */,
+				316FE0700E6CCBEE00BF6088 /* JSCSSKeyframesRule.h */,
 				4983913D0F1E767500C23782 /* JSWebKitCSSMatrix.cpp */,
 				4983913E0F1E767500C23782 /* JSWebKitCSSMatrix.h */,
 				8ACC24CD148E24B200EFCC0D /* JSWebKitCSSRegionRule.cpp */,
@@ -22214,12 +22214,12 @@
 				3106036C14327D2E00ABF4BA /* WebKitCSSFilterValue.cpp */,
 				3106036D14327D2E00ABF4BA /* WebKitCSSFilterValue.h */,
 				3106036E14327D2E00ABF4BA /* WebKitCSSFilterValue.idl */,
-				31288E6E0E3005D6003619AE /* WebKitCSSKeyframeRule.cpp */,
-				31288E6F0E3005D6003619AE /* WebKitCSSKeyframeRule.h */,
-				316FE0910E6CCD7F00BF6088 /* WebKitCSSKeyframeRule.idl */,
-				31288E700E3005D6003619AE /* WebKitCSSKeyframesRule.cpp */,
-				31288E710E3005D6003619AE /* WebKitCSSKeyframesRule.h */,
-				316FE0920E6CCD7F00BF6088 /* WebKitCSSKeyframesRule.idl */,
+				31288E6E0E3005D6003619AE /* CSSKeyframeRule.cpp */,
+				31288E6F0E3005D6003619AE /* CSSKeyframeRule.h */,
+				316FE0910E6CCD7F00BF6088 /* CSSKeyframeRule.idl */,
+				31288E700E3005D6003619AE /* CSSKeyframesRule.cpp */,
+				31288E710E3005D6003619AE /* CSSKeyframesRule.h */,
+				316FE0920E6CCD7F00BF6088 /* CSSKeyframesRule.idl */,
 				498391550F1E776900C23782 /* WebKitCSSMatrix.cpp */,
 				498391560F1E776900C23782 /* WebKitCSSMatrix.h */,
 				498391570F1E776900C23782 /* WebKitCSSMatrix.idl */,
@@ -24127,10 +24127,10 @@
 				31C0FF4B0E4CEFDD007D6FE5 /* DOMWebKitAnimationEventInternal.h in Headers */,
 				31060379143281CD00ABF4BA /* DOMWebKitCSSFilterValue.h in Headers */,
 				3106037B143281CD00ABF4BA /* DOMWebKitCSSFilterValueInternal.h in Headers */,
-				316FE07D0E6CCC2800BF6088 /* DOMWebKitCSSKeyframeRule.h in Headers */,
-				316FE07F0E6CCC2800BF6088 /* DOMWebKitCSSKeyframeRuleInternal.h in Headers */,
-				316FE0800E6CCC2800BF6088 /* DOMWebKitCSSKeyframesRule.h in Headers */,
-				316FE0820E6CCC2800BF6088 /* DOMWebKitCSSKeyframesRuleInternal.h in Headers */,
+				316FE07D0E6CCC2800BF6088 /* DOMCSSKeyframeRule.h in Headers */,
+				316FE07F0E6CCC2800BF6088 /* DOMCSSKeyframeRuleInternal.h in Headers */,
+				316FE0800E6CCC2800BF6088 /* DOMCSSKeyframesRule.h in Headers */,
+				316FE0820E6CCC2800BF6088 /* DOMCSSKeyframesRuleInternal.h in Headers */,
 				498391500F1E76B400C23782 /* DOMWebKitCSSMatrix.h in Headers */,
 				498391520F1E76B400C23782 /* DOMWebKitCSSMatrixInternal.h in Headers */,
 				8AD0A59614C88358000D83C5 /* DOMWebKitCSSRegionRule.h in Headers */,
@@ -25210,8 +25210,8 @@
 				77EF62F412F9DB7400C77BD2 /* JSWebGLVertexArrayObjectOES.h in Headers */,
 				31C0FF3E0E4CEFAC007D6FE5 /* JSWebKitAnimationEvent.h in Headers */,
 				310603751432819C00ABF4BA /* JSWebKitCSSFilterValue.h in Headers */,
-				316FE0720E6CCBEE00BF6088 /* JSWebKitCSSKeyframeRule.h in Headers */,
-				316FE0740E6CCBEE00BF6088 /* JSWebKitCSSKeyframesRule.h in Headers */,
+				316FE0720E6CCBEE00BF6088 /* JSCSSKeyframeRule.h in Headers */,
+				316FE0740E6CCBEE00BF6088 /* JSCSSKeyframesRule.h in Headers */,
 				498391400F1E767500C23782 /* JSWebKitCSSMatrix.h in Headers */,
 				8AD0A59514C88336000D83C5 /* JSWebKitCSSRegionRule.h in Headers */,
 				31611E5B0E1C4DE000F6A579 /* JSWebKitCSSTransformValue.h in Headers */,
@@ -26627,8 +26627,8 @@
 				5DFEBAB718592B6D00C75BEB /* WebKitAvailability.h in Headers */,
 				976D6C7C122B8A3D001FD1F7 /* WebKitBlobBuilder.h in Headers */,
 				3106037014327D2E00ABF4BA /* WebKitCSSFilterValue.h in Headers */,
-				31288E730E3005D6003619AE /* WebKitCSSKeyframeRule.h in Headers */,
-				31288E750E3005D6003619AE /* WebKitCSSKeyframesRule.h in Headers */,
+				31288E730E3005D6003619AE /* CSSKeyframeRule.h in Headers */,
+				31288E750E3005D6003619AE /* CSSKeyframesRule.h in Headers */,
 				498391590F1E776900C23782 /* WebKitCSSMatrix.h in Headers */,
 				8AA61D00144D595B00F37350 /* WebKitCSSRegionRule.h in Headers */,
 				BC9ADD230CC4032600098C4C /* WebKitCSSTransformValue.h in Headers */,
@@ -27637,8 +27637,8 @@
 				15C770A5100D41CD005BA267 /* DOMValidityState.mm in Sources */,
 				31C0FF4A0E4CEFDD007D6FE5 /* DOMWebKitAnimationEvent.mm in Sources */,
 				3106037A143281CD00ABF4BA /* DOMWebKitCSSFilterValue.mm in Sources */,
-				316FE07E0E6CCC2800BF6088 /* DOMWebKitCSSKeyframeRule.mm in Sources */,
-				316FE0810E6CCC2800BF6088 /* DOMWebKitCSSKeyframesRule.mm in Sources */,
+				316FE07E0E6CCC2800BF6088 /* DOMCSSKeyframeRule.mm in Sources */,
+				316FE0810E6CCC2800BF6088 /* DOMCSSKeyframesRule.mm in Sources */,
 				498391510F1E76B400C23782 /* DOMWebKitCSSMatrix.mm in Sources */,
 				8AD0A59714C88358000D83C5 /* DOMWebKitCSSRegionRule.mm in Sources */,
 				31611E620E1C4E1400F6A579 /* DOMWebKitCSSTransformValue.mm in Sources */,
@@ -28754,8 +28754,8 @@
 				77EF62F312F9DB7400C77BD2 /* JSWebGLVertexArrayObjectOES.cpp in Sources */,
 				31C0FF3D0E4CEFAC007D6FE5 /* JSWebKitAnimationEvent.cpp in Sources */,
 				310603741432819C00ABF4BA /* JSWebKitCSSFilterValue.cpp in Sources */,
-				316FE0710E6CCBEE00BF6088 /* JSWebKitCSSKeyframeRule.cpp in Sources */,
-				316FE0730E6CCBEE00BF6088 /* JSWebKitCSSKeyframesRule.cpp in Sources */,
+				316FE0710E6CCBEE00BF6088 /* JSCSSKeyframeRule.cpp in Sources */,
+				316FE0730E6CCBEE00BF6088 /* JSCSSKeyframesRule.cpp in Sources */,
 				4983913F0F1E767500C23782 /* JSWebKitCSSMatrix.cpp in Sources */,
 				8AD0A59414C88336000D83C5 /* JSWebKitCSSRegionRule.cpp in Sources */,
 				31611E5A0E1C4DE000F6A579 /* JSWebKitCSSTransformValue.cpp in Sources */,
@@ -29903,8 +29903,8 @@
 				31C0FF210E4CEB6E007D6FE5 /* WebKitAnimationEvent.cpp in Sources */,
 				976D6C7B122B8A3D001FD1F7 /* WebKitBlobBuilder.cpp in Sources */,
 				3106036F14327D2E00ABF4BA /* WebKitCSSFilterValue.cpp in Sources */,
-				31288E720E3005D6003619AE /* WebKitCSSKeyframeRule.cpp in Sources */,
-				31288E740E3005D6003619AE /* WebKitCSSKeyframesRule.cpp in Sources */,
+				31288E720E3005D6003619AE /* CSSKeyframeRule.cpp in Sources */,
+				31288E740E3005D6003619AE /* CSSKeyframesRule.cpp in Sources */,
 				498391580F1E776900C23782 /* WebKitCSSMatrix.cpp in Sources */,
 				8AA61CFF144D595B00F37350 /* WebKitCSSRegionRule.cpp in Sources */,
 				BC9ADD800CC4092200098C4C /* WebKitCSSTransformValue.cpp in Sources */,

diff --git a/Source/WebCore/bindings/js/JSCSSRuleCustom.cpp b/Source/WebCore/bindings/js/JSCSSRuleCustom.cpp
index d08935a..ff26307 100644
--- a/Source/WebCore/bindings/js/JSCSSRuleCustom.cpp
+++ b/Source/WebCore/bindings/js/JSCSSRuleCustom.cpp

@@ -29,6 +29,8 @@
 #include "CSSCharsetRule.h"
 #include "CSSFontFaceRule.h"
 #include "CSSImportRule.h"
+#include "CSSKeyframeRule.h"
+#include "CSSKeyframesRule.h"
 #include "CSSMediaRule.h"
 #include "CSSPageRule.h"
 #include "CSSStyleRule.h"
@@ -36,18 +38,16 @@
 #include "JSCSSCharsetRule.h"
 #include "JSCSSFontFaceRule.h"
 #include "JSCSSImportRule.h"
+#include "JSCSSKeyframeRule.h"
+#include "JSCSSKeyframesRule.h"
 #include "JSCSSMediaRule.h"
 #include "JSCSSPageRule.h"
 #include "JSCSSStyleRule.h"
 #include "JSCSSSupportsRule.h"
 #include "JSNode.h"
 #include "JSStyleSheetCustom.h"
-#include "JSWebKitCSSKeyframeRule.h"
-#include "JSWebKitCSSKeyframesRule.h"
 #include "JSWebKitCSSRegionRule.h"
 #include "JSWebKitCSSViewportRule.h"
-#include "WebKitCSSKeyframeRule.h"
-#include "WebKitCSSKeyframesRule.h"
 #include "WebKitCSSRegionRule.h"
 #include "WebKitCSSViewportRule.h"
 
@@ -88,11 +88,11 @@
         case CSSRule::CHARSET_RULE:
             wrapper = CREATE_DOM_WRAPPER(globalObject, CSSCharsetRule, rule);
             break;
-        case CSSRule::WEBKIT_KEYFRAME_RULE:
-            wrapper = CREATE_DOM_WRAPPER(globalObject, WebKitCSSKeyframeRule, rule);
+        case CSSRule::KEYFRAME_RULE:
+            wrapper = CREATE_DOM_WRAPPER(globalObject, CSSKeyframeRule, rule);
             break;
-        case CSSRule::WEBKIT_KEYFRAMES_RULE:
-            wrapper = CREATE_DOM_WRAPPER(globalObject, WebKitCSSKeyframesRule, rule);
+        case CSSRule::KEYFRAMES_RULE:
+            wrapper = CREATE_DOM_WRAPPER(globalObject, CSSKeyframesRule, rule);
             break;
         case CSSRule::SUPPORTS_RULE:
             wrapper = CREATE_DOM_WRAPPER(globalObject, CSSSupportsRule, rule);

diff --git a/Source/WebCore/bindings/objc/DOMCSS.mm b/Source/WebCore/bindings/objc/DOMCSS.mm
index d38dfa0..7c6a2dd 100644
--- a/Source/WebCore/bindings/objc/DOMCSS.mm
+++ b/Source/WebCore/bindings/objc/DOMCSS.mm

@@ -33,6 +33,8 @@
 #import "DOMCSSCharsetRule.h"
 #import "DOMCSSFontFaceRule.h"
 #import "DOMCSSImportRule.h"
+#import "DOMCSSKeyframeRule.h"
+#import "DOMCSSKeyframesRule.h"
 #import "DOMCSSMediaRule.h"
 #import "DOMCSSPageRule.h"
 #import "DOMCSSPrimitiveValue.h"
@@ -47,8 +49,6 @@
 #import "DOMInternal.h"
 #import "DOMStyleSheetInternal.h"
 #import "DOMWebKitCSSFilterValue.h"
-#import "DOMWebKitCSSKeyframeRule.h"
-#import "DOMWebKitCSSKeyframesRule.h"
 #import "DOMWebKitCSSTransformValue.h"
 
 #if ENABLE(CSS_REGIONS)
@@ -89,10 +89,10 @@
             return [DOMCSSFontFaceRule class];
         case DOM_PAGE_RULE:
             return [DOMCSSPageRule class];
-        case DOM_WEBKIT_KEYFRAMES_RULE:
-            return [DOMWebKitCSSKeyframesRule class];
-        case DOM_WEBKIT_KEYFRAME_RULE:
-            return [DOMWebKitCSSKeyframeRule class];
+        case DOM_KEYFRAMES_RULE:
+            return [DOMCSSKeyframesRule class];
+        case DOM_KEYFRAME_RULE:
+            return [DOMCSSKeyframeRule class];
         case DOM_SUPPORTS_RULE:
             return [DOMCSSSupportsRule class];
 #if ENABLE(CSS_DEVICE_ADAPTATION)

diff --git a/Source/WebCore/css/CSSGrammar.y.in b/Source/WebCore/css/CSSGrammar.y.in
index 7711bb3..ad97c2e 100644
--- a/Source/WebCore/css/CSSGrammar.y.in
+++ b/Source/WebCore/css/CSSGrammar.y.in

@@ -805,7 +805,7 @@
         $$ = parser->createKeyframesRule($4, std::unique_ptr<Vector<RefPtr<StyleKeyframe>>>($9)).leakRef();
     }
     ;
-  
+
 keyframe_name: IDENT | STRING ;
 
 keyframes_rule:
@@ -1854,7 +1854,7 @@
         $$.id = CSSValueInvalid;
         $$.unit = CSSParserValue::Function;
         $$.function = f;
-    } 
+    }
     | min_or_max maybe_space expr_recovery closing_parenthesis {
         $$.id = CSSValueInvalid;
         $$.unit = 0;
@@ -1897,3 +1897,4 @@
     ;
 
 %%
+

diff --git a/Source/WebCore/css/CSSGrammar.y.includes b/Source/WebCore/css/CSSGrammar.y.includes
index 44e45fc..7f8e881 100644
--- a/Source/WebCore/css/CSSGrammar.y.includes
+++ b/Source/WebCore/css/CSSGrammar.y.includes

@@ -36,8 +36,8 @@
 #include "MediaQueryExp.h"
 #include "StyleRule.h"
 #include "StyleSheetContents.h"
-#include "WebKitCSSKeyframeRule.h"
-#include "WebKitCSSKeyframesRule.h"
+#include "CSSKeyframeRule.h"
+#include "CSSKeyframesRule.h"
 #include <wtf/FastMalloc.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/Source/WebCore/css/WebKitCSSKeyframeRule.cpp b/Source/WebCore/css/CSSKeyframeRule.cpp
similarity index 87%
rename from Source/WebCore/css/WebKitCSSKeyframeRule.cpp
rename to Source/WebCore/css/CSSKeyframeRule.cpp
index 0ec4195..41d7b83 100644
--- a/Source/WebCore/css/WebKitCSSKeyframeRule.cpp
+++ b/Source/WebCore/css/CSSKeyframeRule.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007, 2008, 2012 Apple Inc. All rights reserved.
+ * Copyright (C) 2007, 2008, 2012, 2014 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -24,11 +24,11 @@
  */
 
 #include "config.h"
-#include "WebKitCSSKeyframeRule.h"
+#include "CSSKeyframeRule.h"
 
+#include "CSSKeyframesRule.h"
 #include "PropertySetCSSStyleDeclaration.h"
 #include "StyleProperties.h"
-#include "WebKitCSSKeyframesRule.h"
 #include <wtf/text/StringBuilder.h>
 
 namespace WebCore {
@@ -59,7 +59,7 @@
     for (size_t i = 0; i < strings.size(); ++i) {
         double key = -1;
         String cur = strings[i].stripWhiteSpace();
-        
+
         // For now the syntax MUST be 'xxx%' or 'from' or 'to', where xxx is a legal floating point number
         if (cur == "from")
             key = 0;
@@ -68,14 +68,13 @@
         else if (cur.endsWith('%')) {
             double k = cur.substring(0, cur.length() - 1).toDouble();
             if (k >= 0 && k <= 100)
-                key = k/100;
+                key = k / 100;
         }
         if (key < 0) {
             keys.clear();
             return;
         }
-        else
-            keys.append(key);
+        keys.append(key);
     }
 }
 
@@ -92,27 +91,27 @@
     return result.toString();
 }
 
-WebKitCSSKeyframeRule::WebKitCSSKeyframeRule(StyleKeyframe& keyframe, WebKitCSSKeyframesRule* parent)
+CSSKeyframeRule::CSSKeyframeRule(StyleKeyframe& keyframe, CSSKeyframesRule* parent)
     : CSSRule(0)
     , m_keyframe(keyframe)
 {
     setParentRule(parent);
 }
 
-WebKitCSSKeyframeRule::~WebKitCSSKeyframeRule()
+CSSKeyframeRule::~CSSKeyframeRule()
 {
     if (m_propertiesCSSOMWrapper)
         m_propertiesCSSOMWrapper->clearParentRule();
 }
 
-CSSStyleDeclaration& WebKitCSSKeyframeRule::style()
+CSSStyleDeclaration& CSSKeyframeRule::style()
 {
     if (!m_propertiesCSSOMWrapper)
         m_propertiesCSSOMWrapper = StyleRuleCSSStyleDeclaration::create(m_keyframe->mutableProperties(), *this);
     return *m_propertiesCSSOMWrapper;
 }
 
-void WebKitCSSKeyframeRule::reattach(StyleRuleBase&)
+void CSSKeyframeRule::reattach(StyleRuleBase&)
 {
     // No need to reattach, the underlying data is shareable on mutation.
     ASSERT_NOT_REACHED();

diff --git a/Source/WebCore/css/WebKitCSSKeyframeRule.h b/Source/WebCore/css/CSSKeyframeRule.h
similarity index 85%
rename from Source/WebCore/css/WebKitCSSKeyframeRule.h
rename to Source/WebCore/css/CSSKeyframeRule.h
index d51a32f..a73e1b4 100644
--- a/Source/WebCore/css/WebKitCSSKeyframeRule.h
+++ b/Source/WebCore/css/CSSKeyframeRule.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007, 2008, 2012 Apple Inc. All rights reserved.
+ * Copyright (C) 2007, 2008, 2012, 2014 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,8 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef WebKitCSSKeyframeRule_h
-#define WebKitCSSKeyframeRule_h
+#ifndef CSSKeyframeRule_h
+#define CSSKeyframeRule_h
 
 #include "CSSRule.h"
 #include "StyleProperties.h"
@@ -33,7 +33,7 @@
 
 class CSSStyleDeclaration;
 class StyleRuleCSSStyleDeclaration;
-class WebKitCSSKeyframesRule;
+class CSSKeyframesRule;
 
 class StyleKeyframe : public RefCounted<StyleKeyframe> {
     WTF_MAKE_FAST_ALLOCATED;
@@ -65,9 +65,9 @@
     String m_key;
 };
 
-class WebKitCSSKeyframeRule final : public CSSRule {
+class CSSKeyframeRule final : public CSSRule {
 public:
-    virtual ~WebKitCSSKeyframeRule();
+    virtual ~CSSKeyframeRule();
 
     virtual String cssText() const override { return m_keyframe->cssText(); }
     virtual void reattach(StyleRuleBase&) override;
@@ -78,16 +78,16 @@
     CSSStyleDeclaration& style();
 
 private:
-    WebKitCSSKeyframeRule(StyleKeyframe&, WebKitCSSKeyframesRule* parent);
+    CSSKeyframeRule(StyleKeyframe&, CSSKeyframesRule* parent);
 
-    virtual CSSRule::Type type() const override { return WEBKIT_KEYFRAME_RULE; }
+    virtual CSSRule::Type type() const override { return KEYFRAME_RULE; }
 
     Ref<StyleKeyframe> m_keyframe;
     mutable RefPtr<StyleRuleCSSStyleDeclaration> m_propertiesCSSOMWrapper;
     
-    friend class WebKitCSSKeyframesRule;
+    friend class CSSKeyframesRule;
 };
 
 } // namespace WebCore
 
-#endif // WebKitCSSKeyframeRule_h
+#endif // CSSKeyframeRule_h

diff --git a/Source/WebCore/css/WebKitCSSKeyframeRule.idl b/Source/WebCore/css/CSSKeyframeRule.idl
similarity index 94%
rename from Source/WebCore/css/WebKitCSSKeyframeRule.idl
rename to Source/WebCore/css/CSSKeyframeRule.idl
index e3dcf9e..e3b8b86 100644
--- a/Source/WebCore/css/WebKitCSSKeyframeRule.idl
+++ b/Source/WebCore/css/CSSKeyframeRule.idl

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2008, 2014 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -27,7 +27,7 @@
  */
 
 // Introduced in DOM Level ?:
-interface WebKitCSSKeyframeRule : CSSRule {
+interface CSSKeyframeRule : CSSRule {
 
     attribute DOMString keyText;
     readonly attribute CSSStyleDeclaration style;

diff --git a/Source/WebCore/css/WebKitCSSKeyframesRule.cpp b/Source/WebCore/css/CSSKeyframesRule.cpp
similarity index 82%
rename from Source/WebCore/css/WebKitCSSKeyframesRule.cpp
rename to Source/WebCore/css/CSSKeyframesRule.cpp
index 1756a67..779ce3b 100644
--- a/Source/WebCore/css/WebKitCSSKeyframesRule.cpp
+++ b/Source/WebCore/css/CSSKeyframesRule.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007, 2008, 2012, 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2007, 2008, 2012, 2013, 2014 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -24,15 +24,15 @@
  */
 
 #include "config.h"
-#include "WebKitCSSKeyframesRule.h"
+#include "CSSKeyframesRule.h"
 
+#include "CSSKeyframeRule.h"
 #include "CSSParser.h"
 #include "CSSRuleList.h"
 #include "CSSStyleSheet.h"
 #include "Document.h"
 #include "StyleProperties.h"
 #include "StyleSheet.h"
-#include "WebKitCSSKeyframeRule.h"
 #include <wtf/text/StringBuilder.h>
 
 namespace WebCore {
@@ -87,14 +87,14 @@
     return -1;
 }
 
-WebKitCSSKeyframesRule::WebKitCSSKeyframesRule(StyleRuleKeyframes& keyframesRule, CSSStyleSheet* parent)
+CSSKeyframesRule::CSSKeyframesRule(StyleRuleKeyframes& keyframesRule, CSSStyleSheet* parent)
     : CSSRule(parent)
     , m_keyframesRule(keyframesRule)
     , m_childRuleCSSOMWrappers(keyframesRule.keyframes().size())
 {
 }
 
-WebKitCSSKeyframesRule::~WebKitCSSKeyframesRule()
+CSSKeyframesRule::~CSSKeyframesRule()
 {
     ASSERT(m_childRuleCSSOMWrappers.size() == m_keyframesRule->keyframes().size());
 
@@ -104,14 +104,14 @@
     }
 }
 
-void WebKitCSSKeyframesRule::setName(const String& name)
+void CSSKeyframesRule::setName(const String& name)
 {
     CSSStyleSheet::RuleMutationScope mutationScope(this);
 
     m_keyframesRule->setName(name);
 }
 
-void WebKitCSSKeyframesRule::appendRule(const String& ruleText)
+void CSSKeyframesRule::appendRule(const String& ruleText)
 {
     if (CSSStyleSheet* parent = parentStyleSheet()) {
         if (Document* ownerDocument = parent->ownerDocument())
@@ -120,7 +120,7 @@
     insertRule(ruleText);
 }
 
-void WebKitCSSKeyframesRule::insertRule(const String& ruleText)
+void CSSKeyframesRule::insertRule(const String& ruleText)
 {
     ASSERT(m_childRuleCSSOMWrappers.size() == m_keyframesRule->keyframes().size());
 
@@ -137,7 +137,7 @@
     m_childRuleCSSOMWrappers.grow(length());
 }
 
-void WebKitCSSKeyframesRule::deleteRule(const String& s)
+void CSSKeyframesRule::deleteRule(const String& s)
 {
     ASSERT(m_childRuleCSSOMWrappers.size() == m_keyframesRule->keyframes().size());
 
@@ -154,13 +154,13 @@
     m_childRuleCSSOMWrappers.remove(i);
 }
 
-WebKitCSSKeyframeRule* WebKitCSSKeyframesRule::findRule(const String& s)
+CSSKeyframeRule* CSSKeyframesRule::findRule(const String& s)
 {
     int i = m_keyframesRule->findKeyframeIndex(s);
     return (i >= 0) ? item(i) : 0;
 }
 
-String WebKitCSSKeyframesRule::cssText() const
+String CSSKeyframesRule::cssText() const
 {
     StringBuilder result;
     result.appendLiteral("@-webkit-keyframes ");
@@ -177,32 +177,32 @@
     return result.toString();
 }
 
-unsigned WebKitCSSKeyframesRule::length() const
+unsigned CSSKeyframesRule::length() const
 { 
     return m_keyframesRule->keyframes().size(); 
 }
 
-WebKitCSSKeyframeRule* WebKitCSSKeyframesRule::item(unsigned index) const
+CSSKeyframeRule* CSSKeyframesRule::item(unsigned index) const
 { 
     if (index >= length())
         return 0;
 
     ASSERT(m_childRuleCSSOMWrappers.size() == m_keyframesRule->keyframes().size());
-    RefPtr<WebKitCSSKeyframeRule>& rule = m_childRuleCSSOMWrappers[index];
+    RefPtr<CSSKeyframeRule>& rule = m_childRuleCSSOMWrappers[index];
     if (!rule)
-        rule = adoptRef(new WebKitCSSKeyframeRule(*m_keyframesRule->keyframes()[index], const_cast<WebKitCSSKeyframesRule*>(this)));
+        rule = adoptRef(new CSSKeyframeRule(*m_keyframesRule->keyframes()[index], const_cast<CSSKeyframesRule*>(this)));
 
     return rule.get(); 
 }
 
-CSSRuleList& WebKitCSSKeyframesRule::cssRules()
+CSSRuleList& CSSKeyframesRule::cssRules()
 {
     if (!m_ruleListCSSOMWrapper)
-        m_ruleListCSSOMWrapper = std::make_unique<LiveCSSRuleList<WebKitCSSKeyframesRule>>(this);
+        m_ruleListCSSOMWrapper = std::make_unique<LiveCSSRuleList<CSSKeyframesRule>>(this);
     return *m_ruleListCSSOMWrapper;
 }
 
-void WebKitCSSKeyframesRule::reattach(StyleRuleBase& rule)
+void CSSKeyframesRule::reattach(StyleRuleBase& rule)
 {
     ASSERT_WITH_SECURITY_IMPLICATION(rule.isKeyframesRule());
     m_keyframesRule = static_cast<StyleRuleKeyframes&>(rule);

diff --git a/Source/WebCore/css/WebKitCSSKeyframesRule.h b/Source/WebCore/css/CSSKeyframesRule.h
similarity index 76%
rename from Source/WebCore/css/WebKitCSSKeyframesRule.h
rename to Source/WebCore/css/CSSKeyframesRule.h
index 8477d64..78f9e79 100644
--- a/Source/WebCore/css/WebKitCSSKeyframesRule.h
+++ b/Source/WebCore/css/CSSKeyframesRule.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007, 2008, 2012 Apple Inc. All rights reserved.
+ * Copyright (C) 2007, 2008, 2012, 2014 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,8 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef WebKitCSSKeyframesRule_h
-#define WebKitCSSKeyframesRule_h
+#ifndef CSSKeyframesRule_h
+#define CSSKeyframesRule_h
 
 #include "CSSRule.h"
 #include "StyleRule.h"
@@ -36,7 +36,7 @@
 
 class CSSRuleList;
 class StyleKeyframe;
-class WebKitCSSKeyframeRule;
+class CSSKeyframeRule;
 
 class StyleRuleKeyframes : public StyleRuleBase {
 public:
@@ -65,13 +65,13 @@
     AtomicString m_name;
 };
 
-class WebKitCSSKeyframesRule final : public CSSRule {
+class CSSKeyframesRule final : public CSSRule {
 public:
-    static PassRefPtr<WebKitCSSKeyframesRule> create(StyleRuleKeyframes& rule, CSSStyleSheet* sheet) { return adoptRef(new WebKitCSSKeyframesRule(rule, sheet)); }
+    static PassRefPtr<CSSKeyframesRule> create(StyleRuleKeyframes& rule, CSSStyleSheet* sheet) { return adoptRef(new CSSKeyframesRule(rule, sheet)); }
 
-    virtual ~WebKitCSSKeyframesRule();
+    virtual ~CSSKeyframesRule();
 
-    virtual CSSRule::Type type() const override { return WEBKIT_KEYFRAMES_RULE; }
+    virtual CSSRule::Type type() const override { return KEYFRAMES_RULE; }
     virtual String cssText() const override;
     virtual void reattach(StyleRuleBase&) override;
 
@@ -83,22 +83,22 @@
     void insertRule(const String& rule);
     void appendRule(const String& rule);
     void deleteRule(const String& key);
-    WebKitCSSKeyframeRule* findRule(const String& key);
+    CSSKeyframeRule* findRule(const String& key);
 
     // For IndexedGetter and CSSRuleList.
     unsigned length() const;
-    WebKitCSSKeyframeRule* item(unsigned index) const;
+    CSSKeyframeRule* item(unsigned index) const;
 
 private:
-    WebKitCSSKeyframesRule(StyleRuleKeyframes&, CSSStyleSheet* parent);
+    CSSKeyframesRule(StyleRuleKeyframes&, CSSStyleSheet* parent);
 
     Ref<StyleRuleKeyframes> m_keyframesRule;
-    mutable Vector<RefPtr<WebKitCSSKeyframeRule>> m_childRuleCSSOMWrappers;
+    mutable Vector<RefPtr<CSSKeyframeRule>> m_childRuleCSSOMWrappers;
     mutable std::unique_ptr<CSSRuleList> m_ruleListCSSOMWrapper;
 };
 
 } // namespace WebCore
 
-SPECIALIZE_TYPE_TRAITS_CSS_RULE(WebKitCSSKeyframesRule, CSSRule::WEBKIT_KEYFRAMES_RULE)
+SPECIALIZE_TYPE_TRAITS_CSS_RULE(CSSKeyframesRule, CSSRule::KEYFRAMES_RULE)
 
-#endif // WebKitCSSKeyframesRule_h
+#endif // CSSKeyframesRule_h

diff --git a/Source/WebCore/css/WebKitCSSKeyframesRule.idl b/Source/WebCore/css/CSSKeyframesRule.idl
similarity index 87%
rename from Source/WebCore/css/WebKitCSSKeyframesRule.idl
rename to Source/WebCore/css/CSSKeyframesRule.idl
index 133c5c4..ead654c 100644
--- a/Source/WebCore/css/WebKitCSSKeyframesRule.idl
+++ b/Source/WebCore/css/CSSKeyframesRule.idl

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2008, 2014 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -26,8 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-// Introduced in DOM Level ?:
-interface WebKitCSSKeyframesRule : CSSRule {
+interface CSSKeyframesRule : CSSRule {
 
     [TreatReturnedNullStringAs=Null, TreatNullAs=NullString] attribute DOMString name;
     readonly attribute CSSRuleList cssRules;
@@ -35,8 +34,8 @@
     void insertRule([Default=Undefined] optional DOMString rule);
     void appendRule([Default=Undefined] optional DOMString rule);
     void deleteRule([Default=Undefined] optional DOMString key);
-    WebKitCSSKeyframeRule findRule([Default=Undefined] optional DOMString key);
+    CSSKeyframeRule findRule([Default=Undefined] optional DOMString key);
 
-    getter WebKitCSSKeyframeRule (unsigned long index);
+    getter CSSKeyframeRule (unsigned long index);
 };
 

diff --git a/Source/WebCore/css/CSSParser.cpp b/Source/WebCore/css/CSSParser.cpp
index 9722fb8..653d404 100644
--- a/Source/WebCore/css/CSSParser.cpp
+++ b/Source/WebCore/css/CSSParser.cpp

@@ -43,6 +43,8 @@
 #include "CSSImageValue.h"
 #include "CSSInheritedValue.h"
 #include "CSSInitialValue.h"
+#include "CSSKeyframeRule.h"
+#include "CSSKeyframesRule.h"
 #include "CSSLineBoxContainValue.h"
 #include "CSSMediaRule.h"
 #include "CSSPageRule.h"
@@ -80,8 +82,6 @@
 #include "StyleSheetContents.h"
 #include "TextEncoding.h"
 #include "WebKitCSSFilterValue.h"
-#include "WebKitCSSKeyframeRule.h"
-#include "WebKitCSSKeyframesRule.h"
 #include "WebKitCSSRegionRule.h"
 #include "WebKitCSSTransformValue.h"
 #include <bitset>

diff --git a/Source/WebCore/css/CSSRule.h b/Source/WebCore/css/CSSRule.h
index 3da79dc..1b51d4e 100644
--- a/Source/WebCore/css/CSSRule.h
+++ b/Source/WebCore/css/CSSRule.h

@@ -49,8 +49,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,
+        KEYFRAMES_RULE,
+        KEYFRAME_RULE,
         SUPPORTS_RULE = 12,
 #if ENABLE(CSS_DEVICE_ADAPTATION)
         WEBKIT_VIEWPORT_RULE = 15,
@@ -60,6 +60,11 @@
 #endif
     };
 
+    enum DeprecatedType {
+        WEBKIT_KEYFRAMES_RULE = 7,
+        WEBKIT_KEYFRAME_RULE = 8
+    };
+
     virtual Type type() const = 0;
     virtual String cssText() const = 0;
     virtual void reattach(StyleRuleBase&) = 0;

diff --git a/Source/WebCore/css/CSSRule.idl b/Source/WebCore/css/CSSRule.idl
index 3af482e..df0c076 100644
--- a/Source/WebCore/css/CSSRule.idl
+++ b/Source/WebCore/css/CSSRule.idl

@@ -35,8 +35,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 = 7;
-    const unsigned short WEBKIT_KEYFRAME_RULE = 8;
+    const unsigned short KEYFRAMES_RULE = 7;
+    const unsigned short KEYFRAME_RULE = 8;
     const unsigned short SUPPORTS_RULE = 12;
 #if defined(ENABLE_CSS_DEVICE_ADAPTATION) && ENABLE_CSS_DEVICE_ADAPTATION
     const unsigned short WEBKIT_VIEWPORT_RULE = 15;
@@ -45,6 +45,9 @@
     const unsigned short WEBKIT_REGION_RULE = 16;
 #endif
 
+    const unsigned short WEBKIT_KEYFRAMES_RULE = 7; // Avoid breaking exisiting content.
+    const unsigned short WEBKIT_KEYFRAME_RULE = 8;
+
     readonly attribute unsigned short   type;
 
     [TreatReturnedNullStringAs=Null, TreatNullAs=NullString, SetterRaisesException] attribute DOMString cssText;

diff --git a/Source/WebCore/css/CSSStyleSheet.cpp b/Source/WebCore/css/CSSStyleSheet.cpp
index ec15740..4e1fe78 100644
--- a/Source/WebCore/css/CSSStyleSheet.cpp
+++ b/Source/WebCore/css/CSSStyleSheet.cpp

@@ -24,6 +24,7 @@
 #include "CSSCharsetRule.h"
 #include "CSSFontFaceRule.h"
 #include "CSSImportRule.h"
+#include "CSSKeyframesRule.h"
 #include "CSSParser.h"
 #include "CSSRuleList.h"
 #include "CSSStyleRule.h"
@@ -41,7 +42,6 @@
 #include "StyleResolver.h"
 #include "StyleRule.h"
 #include "StyleSheetContents.h"
-#include "WebKitCSSKeyframesRule.h"
 #include <wtf/text/StringBuilder.h>
 
 namespace WebCore {

diff --git a/Source/WebCore/css/RuleSet.cpp b/Source/WebCore/css/RuleSet.cpp
index 1900aa1..148ff60 100644
--- a/Source/WebCore/css/RuleSet.cpp
+++ b/Source/WebCore/css/RuleSet.cpp

@@ -30,6 +30,7 @@
 #include "RuleSet.h"
 
 #include "CSSFontSelector.h"
+#include "CSSKeyframesRule.h"
 #include "CSSSelector.h"
 #include "CSSSelectorList.h"
 #include "HTMLNames.h"
@@ -41,7 +42,6 @@
 #include "StyleRule.h"
 #include "StyleRuleImport.h"
 #include "StyleSheetContents.h"
-#include "WebKitCSSKeyframesRule.h"
 
 #if ENABLE(VIDEO_TRACK)
 #include "TextTrackCue.h"

diff --git a/Source/WebCore/css/StyleResolver.cpp b/Source/WebCore/css/StyleResolver.cpp
index 927cbd7..4ab81f8 100644
--- a/Source/WebCore/css/StyleResolver.cpp
+++ b/Source/WebCore/css/StyleResolver.cpp

@@ -41,6 +41,8 @@
 #include "CSSFontSelector.h"
 #include "CSSFontValue.h"
 #include "CSSFunctionValue.h"
+#include "CSSKeyframeRule.h"
+#include "CSSKeyframesRule.h"
 #include "CSSLineBoxContainValue.h"
 #include "CSSPageRule.h"
 #include "CSSParser.h"
@@ -132,8 +134,6 @@
 #include "ViewportStyleResolver.h"
 #include "VisitedLinkState.h"
 #include "WebKitCSSFilterValue.h"
-#include "WebKitCSSKeyframeRule.h"
-#include "WebKitCSSKeyframesRule.h"
 #include "WebKitCSSRegionRule.h"
 #include "WebKitCSSTransformValue.h"
 #include "WebKitFontFamilyNames.h"

diff --git a/Source/WebCore/css/StyleRule.cpp b/Source/WebCore/css/StyleRule.cpp
index 4f23d6c..217d603 100644
--- a/Source/WebCore/css/StyleRule.cpp
+++ b/Source/WebCore/css/StyleRule.cpp

@@ -25,6 +25,8 @@
 #include "CSSCharsetRule.h"
 #include "CSSFontFaceRule.h"
 #include "CSSImportRule.h"
+#include "CSSKeyframeRule.h"
+#include "CSSKeyframesRule.h"
 #include "CSSMediaRule.h"
 #include "CSSPageRule.h"
 #include "CSSStyleRule.h"
@@ -32,8 +34,6 @@
 #include "CSSUnknownRule.h"
 #include "StyleProperties.h"
 #include "StyleRuleImport.h"
-#include "WebKitCSSKeyframeRule.h"
-#include "WebKitCSSKeyframesRule.h"
 #include "WebKitCSSRegionRule.h"
 #include "WebKitCSSViewportRule.h"
 
@@ -169,7 +169,7 @@
         rule = CSSImportRule::create(static_cast<StyleRuleImport&>(self), parentSheet);
         break;
     case Keyframes:
-        rule = WebKitCSSKeyframesRule::create(static_cast<StyleRuleKeyframes&>(self), parentSheet);
+        rule = CSSKeyframesRule::create(static_cast<StyleRuleKeyframes&>(self), parentSheet);
         break;
 #if ENABLE(CSS_DEVICE_ADAPTATION)
     case Viewport:

diff --git a/Source/WebCore/inspector/InspectorStyleSheet.cpp b/Source/WebCore/inspector/InspectorStyleSheet.cpp
index ef52af5..5addb12f 100644
--- a/Source/WebCore/inspector/InspectorStyleSheet.cpp
+++ b/Source/WebCore/inspector/InspectorStyleSheet.cpp

@@ -29,6 +29,7 @@
 #include "InspectorStyleSheet.h"
 
 #include "CSSImportRule.h"
+#include "CSSKeyframesRule.h"
 #include "CSSMediaRule.h"
 #include "CSSParser.h"
 #include "CSSPropertyNames.h"
@@ -56,7 +57,6 @@
 #include "StyleRuleImport.h"
 #include "StyleSheetContents.h"
 #include "StyleSheetList.h"
-#include "WebKitCSSKeyframesRule.h"
 #include <inspector/ContentSearchUtilities.h>
 #include <wtf/text/StringBuilder.h>
 #include <yarr/RegularExpression.h>
@@ -213,8 +213,8 @@
     if (is<CSSMediaRule>(*rule))
         return &downcast<CSSMediaRule>(*rule).cssRules();
 
-    if (is<WebKitCSSKeyframesRule>(*rule))
-        return &downcast<WebKitCSSKeyframesRule>(*rule).cssRules();
+    if (is<CSSKeyframesRule>(*rule))
+        return &downcast<CSSKeyframesRule>(*rule).cssRules();
 
     if (is<CSSSupportsRule>(*rule))
         return &downcast<CSSSupportsRule>(*rule).cssRules();
commit	d2a5e4cbebdd2b5cb934c64a9c12fda15d29d54f	[log] [tgz]
author	dino@apple.com <dino@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>	Sat Nov 15 23:02:43 2014 +0000
committer	dino@apple.com <dino@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>	Sat Nov 15 23:02:43 2014 +0000
tree	20164d9970b25fe7adb62e68087c96e41501de86
parent	bc36d7bb7cc69ae99ce9b7ffeff103f4aa7ee4c3 [diff]