<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[176157] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/176157">176157</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2014-11-15 15:02:43 -0800 (Sat, 15 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsanimationskeyframesruleexpectedtxt">trunk/LayoutTests/animations/keyframes-rule-expected.txt</a></li>
<li><a href="#trunkLayoutTestsanimationskeyframesrulehtml">trunk/LayoutTests/animations/keyframes-rule.html</a></li>
<li><a href="#trunkLayoutTestsfastdomresourceswrapperidentitybasejs">trunk/LayoutTests/fast/dom/resources/wrapper-identity-base.js</a></li>
<li><a href="#trunkLayoutTestsfastdomwrapperclasseshtml">trunk/LayoutTests/fast/dom/wrapper-classes.html</a></li>
<li><a href="#trunkLayoutTestsfastdomwrapperidentityexpectedtxt">trunk/LayoutTests/fast/dom/wrapper-identity-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsdomglobalconstructorsattributesexpectedtxt">trunk/LayoutTests/js/dom/global-constructors-attributes-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformefljsdomglobalconstructorsattributesexpectedtxt">trunk/LayoutTests/platform/efl/js/dom/global-constructors-attributes-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformgtkjsdomglobalconstructorsattributesexpectedtxt">trunk/LayoutTests/platform/gtk/js/dom/global-constructors-attributes-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastdomobjcwrapperidentityexpectedtxt">trunk/LayoutTests/platform/mac/fast/dom/objc-wrapper-identity-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacjsdomglobalconstructorsattributesexpectedtxt">trunk/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacmavericksjsdomglobalconstructorsattributesexpectedtxt">trunk/LayoutTests/platform/mac-mavericks/js/dom/global-constructors-attributes-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacmountainlionjsdomglobalconstructorsattributesexpectedtxt">trunk/LayoutTests/platform/mac-mountainlion/js/dom/global-constructors-attributes-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformwinjsdomglobalconstructorsattributesexpectedtxt">trunk/LayoutTests/platform/win/js/dom/global-constructors-attributes-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreDerivedSourcescpp">trunk/Source/WebCore/DerivedSources.cpp</a></li>
<li><a href="#trunkSourceWebCoreDerivedSourcesmake">trunk/Source/WebCore/DerivedSources.make</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxproj">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSCSSRuleCustomcpp">trunk/Source/WebCore/bindings/js/JSCSSRuleCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsobjcDOMCSSmm">trunk/Source/WebCore/bindings/objc/DOMCSS.mm</a></li>
<li><a href="#trunkSourceWebCorecssCSSGrammaryin">trunk/Source/WebCore/css/CSSGrammar.y.in</a></li>
<li><a href="#trunkSourceWebCorecssCSSGrammaryincludes">trunk/Source/WebCore/css/CSSGrammar.y.includes</a></li>
<li><a href="#trunkSourceWebCorecssCSSParsercpp">trunk/Source/WebCore/css/CSSParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSRuleh">trunk/Source/WebCore/css/CSSRule.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSRuleidl">trunk/Source/WebCore/css/CSSRule.idl</a></li>
<li><a href="#trunkSourceWebCorecssCSSStyleSheetcpp">trunk/Source/WebCore/css/CSSStyleSheet.cpp</a></li>
<li><a href="#trunkSourceWebCorecssRuleSetcpp">trunk/Source/WebCore/css/RuleSet.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolvercpp">trunk/Source/WebCore/css/StyleResolver.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStyleRulecpp">trunk/Source/WebCore/css/StyleRule.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorStyleSheetcpp">trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCorecssCSSKeyframeRulecpp">trunk/Source/WebCore/css/CSSKeyframeRule.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSKeyframeRuleh">trunk/Source/WebCore/css/CSSKeyframeRule.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSKeyframeRuleidl">trunk/Source/WebCore/css/CSSKeyframeRule.idl</a></li>
<li><a href="#trunkSourceWebCorecssCSSKeyframesRulecpp">trunk/Source/WebCore/css/CSSKeyframesRule.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSKeyframesRuleh">trunk/Source/WebCore/css/CSSKeyframesRule.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSKeyframesRuleidl">trunk/Source/WebCore/css/CSSKeyframesRule.idl</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCorecssWebKitCSSKeyframeRulecpp">trunk/Source/WebCore/css/WebKitCSSKeyframeRule.cpp</a></li>
<li><a href="#trunkSourceWebCorecssWebKitCSSKeyframeRuleh">trunk/Source/WebCore/css/WebKitCSSKeyframeRule.h</a></li>
<li><a href="#trunkSourceWebCorecssWebKitCSSKeyframeRuleidl">trunk/Source/WebCore/css/WebKitCSSKeyframeRule.idl</a></li>
<li><a href="#trunkSourceWebCorecssWebKitCSSKeyframesRulecpp">trunk/Source/WebCore/css/WebKitCSSKeyframesRule.cpp</a></li>
<li><a href="#trunkSourceWebCorecssWebKitCSSKeyframesRuleh">trunk/Source/WebCore/css/WebKitCSSKeyframesRule.h</a></li>
<li><a href="#trunkSourceWebCorecssWebKitCSSKeyframesRuleidl">trunk/Source/WebCore/css/WebKitCSSKeyframesRule.idl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (176156 => 176157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-11-15 18:57:31 UTC (rev 176156)
+++ trunk/LayoutTests/ChangeLog 2014-11-15 23:02:43 UTC (rev 176157)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+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:
+
</ins><span class="cx"> 2014-11-14 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Application test expectation gardening on WK2.
</span></span></pre></div>
<a id="trunkLayoutTestsanimationskeyframesruleexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/animations/keyframes-rule-expected.txt (176156 => 176157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/animations/keyframes-rule-expected.txt 2014-11-15 18:57:31 UTC (rev 176156)
+++ trunk/LayoutTests/animations/keyframes-rule-expected.txt 2014-11-15 23:02:43 UTC (rev 176157)
</span><span class="lines">@@ -1,18 +1,22 @@
</span><del>-This tests the WebKitCSSKeyframeRule and WebKitCSSKeyframesRule interfaces.
</del><ins>+This tests the CSSKeyframeRule and CSSKeyframesRule interfaces.
</ins><span class="cx">
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx">
</span><span class="cx">
</span><del>-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
</del><ins>+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
</ins><span class="cx">
</span><del>-PASS keyframes1.type is window.CSSRule.WEBKIT_KEYFRAMES_RULE
</del><ins>+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
</ins><span class="cx"> PASS keyframes1.name is 'test1'
</span><span class="cx">
</span><span class="cx"> PASS rules1.length is 2
</span><del>-PASS rules1.item(0).type is window.CSSRule.WEBKIT_KEYFRAME_RULE
</del><ins>+PASS rules1.item(0).type is window.CSSRule.KEYFRAME_RULE
</ins><span class="cx"> PASS rules1.item(0).cssText is '0% { left: 10px; }'
</span><span class="cx"> PASS rules1.item(1).cssText is '100% { left: 20px; }'
</span><span class="cx">
</span><span class="lines">@@ -24,11 +28,11 @@
</span><span class="cx"> PASS rules1.item(3).cssText is '60% { left: 60px; }'
</span><span class="cx"> PASS rules1.item(4).cssText is '20% { left: 50px; }'
</span><span class="cx">
</span><del>-PASS keyframes2.type is window.CSSRule.WEBKIT_KEYFRAMES_RULE
</del><ins>+PASS keyframes2.type is window.CSSRule.KEYFRAMES_RULE
</ins><span class="cx"> PASS keyframes2.name is 'test2'
</span><span class="cx">
</span><span class="cx"> PASS rules2.length is 3
</span><del>-PASS rules2.item(0).type is window.CSSRule.WEBKIT_KEYFRAME_RULE
</del><ins>+PASS rules2.item(0).type is window.CSSRule.KEYFRAME_RULE
</ins><span class="cx"> PASS rules2.item(0).keyText is '0%'
</span><span class="cx"> PASS rules2.item(1).keyText is '50%'
</span><span class="cx"> PASS rules2.item(2).keyText is '100%'
</span><span class="lines">@@ -40,14 +44,14 @@
</span><span class="cx"> PASS rules2.item(0).style.length is 1
</span><span class="cx">
</span><span class="cx"> Find a rule
</span><del>-PASS rule.type is window.CSSRule.WEBKIT_KEYFRAME_RULE
</del><ins>+PASS rule.type is window.CSSRule.KEYFRAME_RULE
</ins><span class="cx"> PASS rule.cssText is '50% { left: 30px; }'
</span><span class="cx">
</span><span class="cx"> Find a rule using from and to
</span><del>-PASS keyframesFromTo.type is window.CSSRule.WEBKIT_KEYFRAMES_RULE
-PASS rule.type is window.CSSRule.WEBKIT_KEYFRAME_RULE
</del><ins>+PASS keyframesFromTo.type is window.CSSRule.KEYFRAMES_RULE
+PASS rule.type is window.CSSRule.KEYFRAME_RULE
</ins><span class="cx"> PASS rule.cssText is '0% { left: 10px; }'
</span><del>-PASS rule.type is window.CSSRule.WEBKIT_KEYFRAME_RULE
</del><ins>+PASS rule.type is window.CSSRule.KEYFRAME_RULE
</ins><span class="cx"> PASS rule.cssText is '100% { left: 20px; }'
</span><span class="cx">
</span><span class="cx"> Try to find a rule that doesn't exist
</span><span class="lines">@@ -55,19 +59,19 @@
</span><span class="cx">
</span><span class="cx"> Delete a rule
</span><span class="cx"> PASS rules2.length is 2
</span><del>-PASS rules2.item(0).type is window.CSSRule.WEBKIT_KEYFRAME_RULE
</del><ins>+PASS rules2.item(0).type is window.CSSRule.KEYFRAME_RULE
</ins><span class="cx"> PASS rules2.item(0).keyText is '0%'
</span><span class="cx"> PASS rules2.item(1).keyText is '100%'
</span><span class="cx">
</span><span class="cx"> Delete a from rule
</span><span class="cx"> PASS rulesFromTo.length is 2
</span><del>-PASS rulesFromTo.item(0).type is window.CSSRule.WEBKIT_KEYFRAME_RULE
</del><ins>+PASS rulesFromTo.item(0).type is window.CSSRule.KEYFRAME_RULE
</ins><span class="cx"> PASS rulesFromTo.item(0).keyText is '50%'
</span><span class="cx"> PASS rulesFromTo.item(1).keyText is '100%'
</span><span class="cx">
</span><span class="cx"> Delete a rule that doesn't exist
</span><span class="cx"> PASS rules2.length is 2
</span><del>-PASS rules2.item(0).type is window.CSSRule.WEBKIT_KEYFRAME_RULE
</del><ins>+PASS rules2.item(0).type is window.CSSRule.KEYFRAME_RULE
</ins><span class="cx"> PASS rules2.item(0).keyText is '0%'
</span><span class="cx"> PASS rules2.item(1).keyText is '100%'
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsanimationskeyframesrulehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/animations/keyframes-rule.html (176156 => 176157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/animations/keyframes-rule.html 2014-11-15 18:57:31 UTC (rev 176156)
+++ trunk/LayoutTests/animations/keyframes-rule.html 2014-11-15 23:02:43 UTC (rev 176157)
</span><span class="lines">@@ -21,33 +21,39 @@
</span><span class="cx"> <body>
</span><span class="cx"> <script>
</span><span class="cx">
</span><del>-description("This tests the WebKitCSSKeyframeRule and WebKitCSSKeyframesRule interfaces.");
</del><ins>+description("This tests the CSSKeyframeRule and CSSKeyframesRule interfaces.");
</ins><span class="cx">
</span><del>-if (window.WebKitCSSKeyframeRule)
- testPassed("WebKitCSSKeyframeRule exists on Window object");
</del><ins>+if (window.CSSKeyframeRule)
+ testPassed("CSSKeyframeRule exists on Window object");
</ins><span class="cx"> else
</span><del>- testFailed("WebKitCSSKeyframeRule does not exist on Window object");
</del><ins>+ testFailed("CSSKeyframeRule does not exist on Window object");
</ins><span class="cx">
</span><del>-if (window.WebKitCSSKeyframesRule)
- testPassed("WebKitCSSKeyframesRule exists on Window object");
</del><ins>+if (window.CSSKeyframesRule)
+ testPassed("CSSKeyframesRule exists on Window object");
</ins><span class="cx"> else
</span><del>- testFailed("WebKitCSSKeyframesRule does not exist on Window object");
</del><ins>+ testFailed("CSSKeyframesRule does not exist on Window object");
</ins><span class="cx">
</span><del>-if (window.CSSRule.WEBKIT_KEYFRAME_RULE)
- testPassed("WEBKIT_KEYFRAME_RULE exists on Window.CSSRule object");
</del><ins>+if (window.CSSRule.KEYFRAME_RULE)
+ testPassed("KEYFRAME_RULE exists on Window.CSSRule object");
</ins><span class="cx"> else
</span><del>- testFailed("WEBKIT_KEYFRAME_RULE does not exist on Window.CSSRule object");
</del><ins>+ testFailed("KEYFRAME_RULE does not exist on Window.CSSRule object");
</ins><span class="cx">
</span><del>-if (window.CSSRule.WEBKIT_KEYFRAMES_RULE)
- testPassed("WEBKIT_KEYFRAMES_RULE exists on Window.CSSRule object");
</del><ins>+if (window.CSSRule.KEYFRAMES_RULE)
+ testPassed("KEYFRAMES_RULE exists on Window.CSSRule object");
</ins><span class="cx"> else
</span><del>- testFailed("WEBKIT_KEYFRAMES_RULE does not exist on Window.CSSRule object");
</del><ins>+ testFailed("KEYFRAMES_RULE does not exist on Window.CSSRule object");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx">
</span><ins>+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("")
+
</ins><span class="cx"> var keyframes1 = document.styleSheets.item(0).cssRules.item(0);
</span><span class="cx">
</span><del>-shouldBe("keyframes1.type", "window.CSSRule.WEBKIT_KEYFRAMES_RULE");
</del><ins>+shouldBe("keyframes1.type", "window.CSSRule.KEYFRAMES_RULE");
</ins><span class="cx"> shouldBe("keyframes1.name", "'test1'");
</span><span class="cx">
</span><span class="cx"> debug("");
</span><span class="lines">@@ -55,7 +61,7 @@
</span><span class="cx"> var rules1 = keyframes1.cssRules;
</span><span class="cx"> shouldBe("rules1.length", "2");
</span><span class="cx">
</span><del>-shouldBe("rules1.item(0).type", "window.CSSRule.WEBKIT_KEYFRAME_RULE");
</del><ins>+shouldBe("rules1.item(0).type", "window.CSSRule.KEYFRAME_RULE");
</ins><span class="cx"> shouldBe("rules1.item(0).cssText", "'0% { left: 10px; }'");
</span><span class="cx"> shouldBe("rules1.item(1).cssText", "'100% { left: 20px; }'");
</span><span class="cx">
</span><span class="lines">@@ -76,7 +82,7 @@
</span><span class="cx">
</span><span class="cx"> var keyframes2 = document.styleSheets.item(0).cssRules.item(1);
</span><span class="cx">
</span><del>-shouldBe("keyframes2.type", "window.CSSRule.WEBKIT_KEYFRAMES_RULE");
</del><ins>+shouldBe("keyframes2.type", "window.CSSRule.KEYFRAMES_RULE");
</ins><span class="cx"> shouldBe("keyframes2.name", "'test2'");
</span><span class="cx">
</span><span class="cx"> var rules2 = keyframes2.cssRules;
</span><span class="lines">@@ -85,7 +91,7 @@
</span><span class="cx">
</span><span class="cx"> shouldBe("rules2.length", "3");
</span><span class="cx">
</span><del>-shouldBe("rules2.item(0).type", "window.CSSRule.WEBKIT_KEYFRAME_RULE");
</del><ins>+shouldBe("rules2.item(0).type", "window.CSSRule.KEYFRAME_RULE");
</ins><span class="cx"> shouldBe("rules2.item(0).keyText", "'0%'");
</span><span class="cx"> shouldBe("rules2.item(1).keyText", "'50%'");
</span><span class="cx"> shouldBe("rules2.item(2).keyText", "'100%'");
</span><span class="lines">@@ -107,20 +113,20 @@
</span><span class="cx"> if (!rule)
</span><span class="cx"> testFailed("Could not extract '50%' keyframe rule");
</span><span class="cx">
</span><del>-shouldBe("rule.type", "window.CSSRule.WEBKIT_KEYFRAME_RULE");
</del><ins>+shouldBe("rule.type", "window.CSSRule.KEYFRAME_RULE");
</ins><span class="cx"> shouldBe("rule.cssText", "'50% { left: 30px; }'");
</span><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Find a rule using from and to");
</span><span class="cx">
</span><span class="cx"> var keyframesFromTo = document.styleSheets.item(0).cssRules.item(2);
</span><del>-shouldBe("keyframesFromTo.type", "window.CSSRule.WEBKIT_KEYFRAMES_RULE");
</del><ins>+shouldBe("keyframesFromTo.type", "window.CSSRule.KEYFRAMES_RULE");
</ins><span class="cx"> rule = keyframesFromTo.findRule("From");
</span><del>-shouldBe("rule.type", "window.CSSRule.WEBKIT_KEYFRAME_RULE");
</del><ins>+shouldBe("rule.type", "window.CSSRule.KEYFRAME_RULE");
</ins><span class="cx"> shouldBe("rule.cssText", "'0% { left: 10px; }'");
</span><span class="cx">
</span><span class="cx"> rule = keyframesFromTo.findRule("TO");
</span><del>-shouldBe("rule.type", "window.CSSRule.WEBKIT_KEYFRAME_RULE");
</del><ins>+shouldBe("rule.type", "window.CSSRule.KEYFRAME_RULE");
</ins><span class="cx"> shouldBe("rule.cssText", "'100% { left: 20px; }'");
</span><span class="cx">
</span><span class="cx"> debug("");
</span><span class="lines">@@ -138,7 +144,7 @@
</span><span class="cx">
</span><span class="cx"> keyframes2.deleteRule("50%");
</span><span class="cx"> shouldBe("rules2.length", "2");
</span><del>-shouldBe("rules2.item(0).type", "window.CSSRule.WEBKIT_KEYFRAME_RULE");
</del><ins>+shouldBe("rules2.item(0).type", "window.CSSRule.KEYFRAME_RULE");
</ins><span class="cx"> shouldBe("rules2.item(0).keyText", "'0%'");
</span><span class="cx"> shouldBe("rules2.item(1).keyText", "'100%'");
</span><span class="cx">
</span><span class="lines">@@ -147,7 +153,7 @@
</span><span class="cx"> keyframesFromTo.deleteRule("0%");
</span><span class="cx"> var rulesFromTo = keyframesFromTo.cssRules;
</span><span class="cx"> shouldBe("rulesFromTo.length", "2");
</span><del>-shouldBe("rulesFromTo.item(0).type", "window.CSSRule.WEBKIT_KEYFRAME_RULE");
</del><ins>+shouldBe("rulesFromTo.item(0).type", "window.CSSRule.KEYFRAME_RULE");
</ins><span class="cx"> shouldBe("rulesFromTo.item(0).keyText", "'50%'");
</span><span class="cx"> shouldBe("rulesFromTo.item(1).keyText", "'100%'");
</span><span class="cx">
</span><span class="lines">@@ -157,7 +163,7 @@
</span><span class="cx">
</span><span class="cx"> keyframes2.deleteRule("70%");
</span><span class="cx"> shouldBe("rules2.length", "2");
</span><del>-shouldBe("rules2.item(0).type", "window.CSSRule.WEBKIT_KEYFRAME_RULE");
</del><ins>+shouldBe("rules2.item(0).type", "window.CSSRule.KEYFRAME_RULE");
</ins><span class="cx"> shouldBe("rules2.item(0).keyText", "'0%'");
</span><span class="cx"> shouldBe("rules2.item(1).keyText", "'100%'");
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomresourceswrapperidentitybasejs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/resources/wrapper-identity-base.js (176156 => 176157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/resources/wrapper-identity-base.js 2014-11-15 18:57:31 UTC (rev 176156)
+++ trunk/LayoutTests/fast/dom/resources/wrapper-identity-base.js 2014-11-15 23:02:43 UTC (rev 176157)
</span><span class="lines">@@ -10,8 +10,8 @@
</span><span class="cx"> 'CSSFontFaceRule',
</span><span class="cx"> 'CSSPageRule',
</span><span class="cx"> 'CSSVariablesRule',
</span><del>- 'WebKitCSSKeyframeRule',
- 'WebKitCSSKeyframesRule',
</del><ins>+ 'CSSKeyframeRule',
+ 'CSSKeyframesRule',
</ins><span class="cx"> 'DOMException',
</span><span class="cx"> 'DOMParser',
</span><span class="cx"> 'Document',
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomwrapperclasseshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/wrapper-classes.html (176156 => 176157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/wrapper-classes.html 2014-11-15 18:57:31 UTC (rev 176156)
+++ trunk/LayoutTests/fast/dom/wrapper-classes.html 2014-11-15 23:02:43 UTC (rev 176157)
</span><span class="lines">@@ -272,8 +272,8 @@
</span><span class="cx"> // CSSPageRule
</span><span class="cx"> // CSSRule
</span><span class="cx"> // CSSVariablesRule
</span><del>- // WebKitCSSKeyframeRule
- // WebKitCSSKeyframesRule
</del><ins>+ // CSSKeyframeRule
+ // CSSKeyframesRule
</ins><span class="cx"> // CSSValue
</span><span class="cx"> // SVGColor
</span><span class="cx"> // SVGPaint
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomwrapperidentityexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/wrapper-identity-expected.txt (176156 => 176157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/wrapper-identity-expected.txt 2014-11-15 18:57:31 UTC (rev 176156)
+++ trunk/LayoutTests/fast/dom/wrapper-identity-expected.txt 2014-11-15 23:02:43 UTC (rev 176157)
</span><span class="lines">@@ -18,8 +18,8 @@
</span><span class="cx"> PASS var object = window['CSSFontFaceRule']; isEqualJS(object, object); is true
</span><span class="cx"> PASS var object = window['CSSPageRule']; isEqualJS(object, object); is true
</span><span class="cx"> PASS var object = window['CSSVariablesRule']; isEqualJS(object, object); is true
</span><del>-PASS var object = window['WebKitCSSKeyframeRule']; isEqualJS(object, object); is true
-PASS var object = window['WebKitCSSKeyframesRule']; isEqualJS(object, object); is true
</del><ins>+PASS var object = window['CSSKeyframeRule']; isEqualJS(object, object); is true
+PASS var object = window['CSSKeyframesRule']; isEqualJS(object, object); is true
</ins><span class="cx"> PASS var object = window['DOMException']; isEqualJS(object, object); is true
</span><span class="cx"> PASS var object = window['DOMParser']; isEqualJS(object, object); is true
</span><span class="cx"> PASS var object = window['Document']; isEqualJS(object, object); is true
</span></span></pre></div>
<a id="trunkLayoutTestsjsdomglobalconstructorsattributesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/dom/global-constructors-attributes-expected.txt (176156 => 176157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/dom/global-constructors-attributes-expected.txt 2014-11-15 18:57:31 UTC (rev 176156)
+++ trunk/LayoutTests/js/dom/global-constructors-attributes-expected.txt 2014-11-15 23:02:43 UTC (rev 176157)
</span><span class="lines">@@ -98,6 +98,16 @@
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CSSImportRule').hasOwnProperty('set') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CSSImportRule').enumerable is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CSSImportRule').configurable is true
</span><ins>+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
</ins><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CSSMediaRule').value is CSSMediaRule
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CSSMediaRule').hasOwnProperty('get') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CSSMediaRule').hasOwnProperty('set') is false
</span><span class="lines">@@ -1903,16 +1913,6 @@
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSFilterValue').hasOwnProperty('set') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSFilterValue').enumerable is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSFilterValue').configurable is true
</span><del>-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
</del><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSMatrix').value is WebKitCSSMatrix
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSMatrix').hasOwnProperty('get') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSMatrix').hasOwnProperty('set') is false
</span></span></pre></div>
<a id="trunkLayoutTestsplatformefljsdomglobalconstructorsattributesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/efl/js/dom/global-constructors-attributes-expected.txt (176156 => 176157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/efl/js/dom/global-constructors-attributes-expected.txt 2014-11-15 18:57:31 UTC (rev 176156)
+++ trunk/LayoutTests/platform/efl/js/dom/global-constructors-attributes-expected.txt 2014-11-15 23:02:43 UTC (rev 176157)
</span><span class="lines">@@ -103,6 +103,16 @@
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CSSImportRule').hasOwnProperty('set') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CSSImportRule').enumerable is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CSSImportRule').configurable is true
</span><ins>+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
</ins><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CSSMediaRule').value is CSSMediaRule
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CSSMediaRule').hasOwnProperty('get') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CSSMediaRule').hasOwnProperty('set') is false
</span><span class="lines">@@ -1908,16 +1918,6 @@
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSFilterValue').hasOwnProperty('set') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSFilterValue').enumerable is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSFilterValue').configurable is true
</span><del>-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
</del><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSMatrix').value is WebKitCSSMatrix
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSMatrix').hasOwnProperty('get') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSMatrix').hasOwnProperty('set') is false
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkjsdomglobalconstructorsattributesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/js/dom/global-constructors-attributes-expected.txt (176156 => 176157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/js/dom/global-constructors-attributes-expected.txt 2014-11-15 18:57:31 UTC (rev 176156)
+++ trunk/LayoutTests/platform/gtk/js/dom/global-constructors-attributes-expected.txt 2014-11-15 23:02:43 UTC (rev 176157)
</span><span class="lines">@@ -103,6 +103,16 @@
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CSSImportRule').hasOwnProperty('set') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CSSImportRule').enumerable is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CSSImportRule').configurable is true
</span><ins>+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
</ins><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CSSMediaRule').value is CSSMediaRule
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CSSMediaRule').hasOwnProperty('get') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CSSMediaRule').hasOwnProperty('set') is false
</span><span class="lines">@@ -1988,16 +1998,6 @@
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebKitAnimationEvent').hasOwnProperty('set') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebKitAnimationEvent').enumerable is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebKitAnimationEvent').configurable is true
</span><del>-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
</del><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSMatrix').value is WebKitCSSMatrix
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSMatrix').hasOwnProperty('get') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSMatrix').hasOwnProperty('set') is false
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastdomobjcwrapperidentityexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/dom/objc-wrapper-identity-expected.txt (176156 => 176157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/dom/objc-wrapper-identity-expected.txt 2014-11-15 18:57:31 UTC (rev 176156)
+++ trunk/LayoutTests/platform/mac/fast/dom/objc-wrapper-identity-expected.txt 2014-11-15 23:02:43 UTC (rev 176157)
</span><span class="lines">@@ -18,8 +18,8 @@
</span><span class="cx"> PASS var object = window['CSSFontFaceRule']; isEqualObjC(object, object); is true
</span><span class="cx"> PASS var object = window['CSSPageRule']; isEqualObjC(object, object); is true
</span><span class="cx"> PASS var object = window['CSSVariablesRule']; isEqualObjC(object, object); is true
</span><del>-PASS var object = window['WebKitCSSKeyframeRule']; isEqualObjC(object, object); is true
-PASS var object = window['WebKitCSSKeyframesRule']; isEqualObjC(object, object); is true
</del><ins>+PASS var object = window['CSSKeyframeRule']; isEqualObjC(object, object); is true
+PASS var object = window['CSSKeyframesRule']; isEqualObjC(object, object); is true
</ins><span class="cx"> PASS var object = window['DOMException']; isEqualObjC(object, object); is true
</span><span class="cx"> PASS var object = window['DOMParser']; isEqualObjC(object, object); is true
</span><span class="cx"> PASS var object = window['Document']; isEqualObjC(object, object); is true
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacjsdomglobalconstructorsattributesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt (176156 => 176157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt 2014-11-15 18:57:31 UTC (rev 176156)
+++ trunk/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt 2014-11-15 23:02:43 UTC (rev 176157)
</span><span class="lines">@@ -98,6 +98,16 @@
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CSSImportRule').hasOwnProperty('set') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CSSImportRule').enumerable is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CSSImportRule').configurable is true
</span><ins>+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
</ins><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CSSMediaRule').value is CSSMediaRule
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CSSMediaRule').hasOwnProperty('get') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CSSMediaRule').hasOwnProperty('set') is false
</span><span class="lines">@@ -1943,16 +1953,6 @@
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSFilterValue').hasOwnProperty('set') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSFilterValue').enumerable is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSFilterValue').configurable is true
</span><del>-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
</del><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSMatrix').value is WebKitCSSMatrix
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSMatrix').hasOwnProperty('get') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSMatrix').hasOwnProperty('set') is false
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacmavericksjsdomglobalconstructorsattributesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-mavericks/js/dom/global-constructors-attributes-expected.txt (176156 => 176157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-mavericks/js/dom/global-constructors-attributes-expected.txt 2014-11-15 18:57:31 UTC (rev 176156)
+++ trunk/LayoutTests/platform/mac-mavericks/js/dom/global-constructors-attributes-expected.txt 2014-11-15 23:02:43 UTC (rev 176157)
</span><span class="lines">@@ -98,6 +98,16 @@
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CSSImportRule').hasOwnProperty('set') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CSSImportRule').enumerable is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CSSImportRule').configurable is true
</span><ins>+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
</ins><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CSSMediaRule').value is CSSMediaRule
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CSSMediaRule').hasOwnProperty('get') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CSSMediaRule').hasOwnProperty('set') is false
</span><span class="lines">@@ -1923,16 +1933,6 @@
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSFilterValue').hasOwnProperty('set') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSFilterValue').enumerable is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSFilterValue').configurable is true
</span><del>-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
</del><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSMatrix').value is WebKitCSSMatrix
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSMatrix').hasOwnProperty('get') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSMatrix').hasOwnProperty('set') is false
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacmountainlionjsdomglobalconstructorsattributesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-mountainlion/js/dom/global-constructors-attributes-expected.txt (176156 => 176157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-mountainlion/js/dom/global-constructors-attributes-expected.txt 2014-11-15 18:57:31 UTC (rev 176156)
+++ trunk/LayoutTests/platform/mac-mountainlion/js/dom/global-constructors-attributes-expected.txt 2014-11-15 23:02:43 UTC (rev 176157)
</span><span class="lines">@@ -98,6 +98,16 @@
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CSSImportRule').hasOwnProperty('set') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CSSImportRule').enumerable is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CSSImportRule').configurable is true
</span><ins>+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
</ins><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CSSMediaRule').value is CSSMediaRule
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CSSMediaRule').hasOwnProperty('get') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CSSMediaRule').hasOwnProperty('set') is false
</span><span class="lines">@@ -1913,16 +1923,6 @@
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSFilterValue').hasOwnProperty('set') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSFilterValue').enumerable is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSFilterValue').configurable is true
</span><del>-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
</del><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSMatrix').value is WebKitCSSMatrix
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSMatrix').hasOwnProperty('get') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSMatrix').hasOwnProperty('set') is false
</span></span></pre></div>
<a id="trunkLayoutTestsplatformwinjsdomglobalconstructorsattributesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/win/js/dom/global-constructors-attributes-expected.txt (176156 => 176157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/win/js/dom/global-constructors-attributes-expected.txt 2014-11-15 18:57:31 UTC (rev 176156)
+++ trunk/LayoutTests/platform/win/js/dom/global-constructors-attributes-expected.txt 2014-11-15 23:02:43 UTC (rev 176157)
</span><span class="lines">@@ -53,6 +53,16 @@
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CSSImportRule').hasOwnProperty('set') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CSSImportRule').enumerable is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CSSImportRule').configurable is true
</span><ins>+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
</ins><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CSSMediaRule').value is CSSMediaRule
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CSSMediaRule').hasOwnProperty('get') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CSSMediaRule').hasOwnProperty('set') is false
</span><span class="lines">@@ -1648,16 +1658,6 @@
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSFilterValue').hasOwnProperty('set') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSFilterValue').enumerable is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSFilterValue').configurable is true
</span><del>-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
</del><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSMatrix').value is WebKitCSSMatrix
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSMatrix').hasOwnProperty('get') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'WebKitCSSMatrix').hasOwnProperty('set') is false
</span></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (176156 => 176157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2014-11-15 18:57:31 UTC (rev 176156)
+++ trunk/Source/WebCore/CMakeLists.txt 2014-11-15 23:02:43 UTC (rev 176157)
</span><span class="lines">@@ -350,8 +350,8 @@
</span><span class="cx"> css/StyleSheet.idl
</span><span class="cx"> css/StyleSheetList.idl
</span><span class="cx"> css/WebKitCSSFilterValue.idl
</span><del>- css/WebKitCSSKeyframeRule.idl
- css/WebKitCSSKeyframesRule.idl
</del><ins>+ css/CSSKeyframeRule.idl
+ css/CSSKeyframesRule.idl
</ins><span class="cx"> css/WebKitCSSMatrix.idl
</span><span class="cx"> css/WebKitCSSRegionRule.idl
</span><span class="cx"> css/WebKitCSSTransformValue.idl
</span><span class="lines">@@ -1288,8 +1288,8 @@
</span><span class="cx"> css/TransformFunctions.cpp
</span><span class="cx"> css/ViewportStyleResolver.cpp
</span><span class="cx"> css/WebKitCSSFilterValue.cpp
</span><del>- css/WebKitCSSKeyframeRule.cpp
- css/WebKitCSSKeyframesRule.cpp
</del><ins>+ css/CSSKeyframeRule.cpp
+ css/CSSKeyframesRule.cpp
</ins><span class="cx"> css/WebKitCSSMatrix.cpp
</span><span class="cx"> css/WebKitCSSRegionRule.cpp
</span><span class="cx"> css/WebKitCSSTransformValue.cpp
</span><span class="lines">@@ -3341,7 +3341,6 @@
</span><span class="cx"> 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}")
</span><span class="cx"> list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/CSSGrammar.cpp)
</span><span class="cx">
</span><del>-
</del><span class="cx"> GENERATE_GRAMMAR(xpathyy ${WEBCORE_DIR}/xml/XPathGrammar.y ${DERIVED_SOURCES_WEBCORE_DIR}/XPathGrammar.h ${DERIVED_SOURCES_WEBCORE_DIR}/XPathGrammar.cpp "")
</span><span class="cx"> list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/XPathGrammar.cpp)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (176156 => 176157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-11-15 18:57:31 UTC (rev 176156)
+++ trunk/Source/WebCore/ChangeLog 2014-11-15 23:02:43 UTC (rev 176157)
</span><span class="lines">@@ -1,3 +1,86 @@
</span><ins>+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):
+
</ins><span class="cx"> 2014-11-15 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r176137): iOS build broke after moving DataDetectors scanning code to WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.cpp (176156 => 176157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources.cpp 2014-11-15 18:57:31 UTC (rev 176156)
+++ trunk/Source/WebCore/DerivedSources.cpp 2014-11-15 23:02:43 UTC (rev 176157)
</span><span class="lines">@@ -89,6 +89,8 @@
</span><span class="cx"> #endif
</span><span class="cx"> #include "JSCSSFontFaceRule.cpp"
</span><span class="cx"> #include "JSCSSImportRule.cpp"
</span><ins>+#include "JSCSSKeyframeRule.cpp"
+#include "JSCSSKeyframesRule.cpp"
</ins><span class="cx"> #include "JSCSSMediaRule.cpp"
</span><span class="cx"> #include "JSCSSPageRule.cpp"
</span><span class="cx"> #include "JSCSSPrimitiveValue.cpp"
</span><span class="lines">@@ -495,8 +497,6 @@
</span><span class="cx"> #include "JSVoidCallback.cpp"
</span><span class="cx"> #include "JSWebKitAnimationEvent.cpp"
</span><span class="cx"> #include "JSWebKitCSSFilterValue.cpp"
</span><del>-#include "JSWebKitCSSKeyframeRule.cpp"
-#include "JSWebKitCSSKeyframesRule.cpp"
</del><span class="cx"> #include "JSWebKitCSSTransformValue.cpp"
</span><span class="cx"> #include "JSWebKitCSSMatrix.cpp"
</span><span class="cx"> #include "JSWebKitCSSRegionRule.cpp"
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.make (176156 => 176157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources.make 2014-11-15 18:57:31 UTC (rev 176156)
+++ trunk/Source/WebCore/DerivedSources.make 2014-11-15 23:02:43 UTC (rev 176157)
</span><span class="lines">@@ -243,8 +243,8 @@
</span><span class="cx"> $(WebCore)/css/StyleSheet.idl \
</span><span class="cx"> $(WebCore)/css/StyleSheetList.idl \
</span><span class="cx"> $(WebCore)/css/WebKitCSSFilterValue.idl \
</span><del>- $(WebCore)/css/WebKitCSSKeyframeRule.idl \
- $(WebCore)/css/WebKitCSSKeyframesRule.idl \
</del><ins>+ $(WebCore)/css/CSSKeyframeRule.idl \
+ $(WebCore)/css/CSSKeyframesRule.idl \
</ins><span class="cx"> $(WebCore)/css/WebKitCSSMatrix.idl \
</span><span class="cx"> $(WebCore)/css/WebKitCSSRegionRule.idl \
</span><span class="cx"> $(WebCore)/css/WebKitCSSTransformValue.idl \
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (176156 => 176157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-11-15 18:57:31 UTC (rev 176156)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-11-15 23:02:43 UTC (rev 176157)
</span><span class="lines">@@ -6214,7 +6214,7 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSWebKitCSSKeyframeRule.cpp">
</del><ins>+ <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCSSKeyframeRule.cpp">
</ins><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
</span><span class="lines">@@ -6228,7 +6228,7 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSWebKitCSSKeyframesRule.cpp">
</del><ins>+ <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCSSKeyframesRule.cpp">
</ins><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
</span><span class="lines">@@ -9873,8 +9873,8 @@
</span><span class="cx"> <ClCompile Include="..\css\TransformFunctions.cpp" />
</span><span class="cx"> <ClCompile Include="..\css\ViewportStyleResolver.cpp" />
</span><span class="cx"> <ClCompile Include="..\css\WebKitCSSFilterValue.cpp" />
</span><del>- <ClCompile Include="..\css\WebKitCSSKeyframeRule.cpp" />
- <ClCompile Include="..\css\WebKitCSSKeyframesRule.cpp" />
</del><ins>+ <ClCompile Include="..\css\CSSKeyframeRule.cpp" />
+ <ClCompile Include="..\css\CSSKeyframesRule.cpp" />
</ins><span class="cx"> <ClCompile Include="..\css\WebKitCSSMatrix.cpp" />
</span><span class="cx"> <ClCompile Include="..\css\WebKitCSSRegionRule.cpp" />
</span><span class="cx"> <ClCompile Include="..\css\WebKitCSSTransformValue.cpp" />
</span><span class="lines">@@ -18690,8 +18690,8 @@
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSValidityState.h" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSWebKitAnimationEvent.h" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSWebKitCSSFilterValue.h" />
</span><del>- <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSWebKitCSSKeyframeRule.h" />
- <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSWebKitCSSKeyframesRule.h" />
</del><ins>+ <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCSSKeyframeRule.h" />
+ <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCSSKeyframesRule.h" />
</ins><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSWebKitCSSMatrix.h" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSWebKitCSSRegionRule.h" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSWebKitCSSTransformValue.h" />
</span><span class="lines">@@ -20150,8 +20150,8 @@
</span><span class="cx"> <ClInclude Include="..\css\TransformFunctions.h" />
</span><span class="cx"> <ClInclude Include="..\css\ViewportStyleResolver.h" />
</span><span class="cx"> <ClInclude Include="..\css\WebKitCSSFilterValue.h" />
</span><del>- <ClInclude Include="..\css\WebKitCSSKeyframeRule.h" />
- <ClInclude Include="..\css\WebKitCSSKeyframesRule.h" />
</del><ins>+ <ClInclude Include="..\css\CSSKeyframeRule.h" />
+ <ClInclude Include="..\css\CSSKeyframesRule.h" />
</ins><span class="cx"> <ClInclude Include="..\css\WebKitCSSMatrix.h" />
</span><span class="cx"> <ClInclude Include="..\css\WebKitCSSRegionRule.h" />
</span><span class="cx"> <ClInclude Include="..\css\WebKitCSSTransformValue.h" />
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (176156 => 176157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2014-11-15 18:57:31 UTC (rev 176156)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2014-11-15 23:02:43 UTC (rev 176157)
</span><span class="lines">@@ -2346,10 +2346,10 @@
</span><span class="cx"> <ClCompile Include="..\css\WebKitCSSFilterValue.cpp">
</span><span class="cx"> <Filter>css</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\css\WebKitCSSKeyframeRule.cpp">
</del><ins>+ <ClCompile Include="..\css\CSSKeyframeRule.cpp">
</ins><span class="cx"> <Filter>css</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\css\WebKitCSSKeyframesRule.cpp">
</del><ins>+ <ClCompile Include="..\css\CSSKeyframesRule.cpp">
</ins><span class="cx"> <Filter>css</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="cx"> <ClCompile Include="..\css\WebKitCSSMatrix.cpp">
</span><span class="lines">@@ -6352,10 +6352,10 @@
</span><span class="cx"> <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSWebKitCSSFilterValue.cpp">
</span><span class="cx"> <Filter>DerivedSources</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSWebKitCSSKeyframeRule.cpp">
</del><ins>+ <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCSSKeyframeRule.cpp">
</ins><span class="cx"> <Filter>DerivedSources</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSWebKitCSSKeyframesRule.cpp">
</del><ins>+ <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCSSKeyframesRule.cpp">
</ins><span class="cx"> <Filter>DerivedSources</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="cx"> <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSWebKitCSSMatrix.cpp">
</span><span class="lines">@@ -9339,10 +9339,10 @@
</span><span class="cx"> <ClInclude Include="..\css\WebKitCSSFilterValue.h">
</span><span class="cx"> <Filter>css</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\css\WebKitCSSKeyframeRule.h">
</del><ins>+ <ClInclude Include="..\css\CSSKeyframeRule.h">
</ins><span class="cx"> <Filter>css</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\css\WebKitCSSKeyframesRule.h">
</del><ins>+ <ClInclude Include="..\css\CSSKeyframesRule.h">
</ins><span class="cx"> <Filter>css</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="cx"> <ClInclude Include="..\css\WebKitCSSMatrix.h">
</span><span class="lines">@@ -14264,10 +14264,10 @@
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSWebKitCSSFilterValue.h">
</span><span class="cx"> <Filter>DerivedSources</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSWebKitCSSKeyframeRule.h">
</del><ins>+ <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCSSKeyframeRule.h">
</ins><span class="cx"> <Filter>DerivedSources</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSWebKitCSSKeyframesRule.h">
</del><ins>+ <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCSSKeyframesRule.h">
</ins><span class="cx"> <Filter>DerivedSources</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSWebKitCSSMatrix.h">
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (176156 => 176157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-11-15 18:57:31 UTC (rev 176156)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-11-15 23:02:43 UTC (rev 176157)
</span><span class="lines">@@ -1216,10 +1216,10 @@
</span><span class="cx"> 311C08BE18EB7CAF00B65615 /* mediaControlsApple.js in Resources */ = {isa = PBXBuildFile; fileRef = CDE6560E17CA6E7600526BA7 /* mediaControlsApple.js */; };
</span><span class="cx"> 311C08BF18EB7CAF00B65615 /* mediaControlsiOS.css in Resources */ = {isa = PBXBuildFile; fileRef = CDAAF45D1869094E003C1717 /* mediaControlsiOS.css */; };
</span><span class="cx"> 311C08C018EB7CAF00B65615 /* mediaControlsiOS.js in Resources */ = {isa = PBXBuildFile; fileRef = CD32A189184EB46A0029B1BB /* mediaControlsiOS.js */; };
</span><del>- 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 */; };
</del><ins>+ 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 */; };
</ins><span class="cx"> 3128CA68147331520074C72A /* NotificationController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3128CA67147331520074C72A /* NotificationController.cpp */; };
</span><span class="cx"> 3128CA6B147331630074C72A /* NotificationController.h in Headers */ = {isa = PBXBuildFile; fileRef = 3128CA6A147331630074C72A /* NotificationController.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 312C0C41146DC6CC0016C911 /* Notification.h in Headers */ = {isa = PBXBuildFile; fileRef = 333F704F0FB49CA2008E12A6 /* Notification.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -1240,16 +1240,16 @@
</span><span class="cx"> 31611E610E1C4E1400F6A579 /* DOMWebKitCSSTransformValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 31611E5E0E1C4E1400F6A579 /* DOMWebKitCSSTransformValue.h */; };
</span><span class="cx"> 31611E620E1C4E1400F6A579 /* DOMWebKitCSSTransformValue.mm in Sources */ = {isa = PBXBuildFile; fileRef = 31611E5F0E1C4E1400F6A579 /* DOMWebKitCSSTransformValue.mm */; };
</span><span class="cx"> 31611E630E1C4E1400F6A579 /* DOMWebKitCSSTransformValueInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 31611E600E1C4E1400F6A579 /* DOMWebKitCSSTransformValueInternal.h */; };
</span><del>- 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 */; };
</del><ins>+ 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 */; };
</ins><span class="cx"> 316FE1110E6E1DA700BF6088 /* AnimationBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 316FE1070E6E1DA700BF6088 /* AnimationBase.cpp */; };
</span><span class="cx"> 316FE1120E6E1DA700BF6088 /* AnimationBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 316FE1080E6E1DA700BF6088 /* AnimationBase.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 316FE1130E6E1DA700BF6088 /* AnimationController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 316FE1090E6E1DA700BF6088 /* AnimationController.cpp */; };
</span><span class="lines">@@ -8224,10 +8224,10 @@
</span><span class="cx"> 31078CC51880AAAA008099DC /* JSOESTextureHalfFloatLinear.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSOESTextureHalfFloatLinear.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 31078CC61880AAAA008099DC /* JSOESTextureHalfFloatLinear.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSOESTextureHalfFloatLinear.h; sourceTree = "<group>"; };
</span><span class="cx"> 311C08BC18E35D6800B65615 /* ControlStates.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ControlStates.h; sourceTree = "<group>"; };
</span><del>- 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>"; };
</del><ins>+ 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>"; };
</ins><span class="cx"> 3128CA67147331520074C72A /* NotificationController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NotificationController.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 3128CA6A147331630074C72A /* NotificationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NotificationController.h; sourceTree = "<group>"; };
</span><span class="cx"> 312D67B01535691F00563D0D /* Dictionary.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Dictionary.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -8249,18 +8249,18 @@
</span><span class="cx"> 31611E5E0E1C4E1400F6A579 /* DOMWebKitCSSTransformValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMWebKitCSSTransformValue.h; sourceTree = "<group>"; };
</span><span class="cx"> 31611E5F0E1C4E1400F6A579 /* DOMWebKitCSSTransformValue.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMWebKitCSSTransformValue.mm; sourceTree = "<group>"; };
</span><span class="cx"> 31611E600E1C4E1400F6A579 /* DOMWebKitCSSTransformValueInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMWebKitCSSTransformValueInternal.h; sourceTree = "<group>"; };
</span><del>- 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>"; };
</del><ins>+ 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>"; };
</ins><span class="cx"> 316FE1070E6E1DA700BF6088 /* AnimationBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AnimationBase.cpp; path = animation/AnimationBase.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 316FE1080E6E1DA700BF6088 /* AnimationBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AnimationBase.h; path = animation/AnimationBase.h; sourceTree = "<group>"; };
</span><span class="cx"> 316FE1090E6E1DA700BF6088 /* AnimationController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AnimationController.cpp; path = animation/AnimationController.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -9282,7 +9282,7 @@
</span><span class="cx"> 65653F2C0D9727D200CA9723 /* SVGAltGlyphElement.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SVGAltGlyphElement.idl; sourceTree = "<group>"; };
</span><span class="cx"> 656580EE09D12B20000E61D7 /* CSSPropertyNames.gperf */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CSSPropertyNames.gperf; sourceTree = "<group>"; };
</span><span class="cx"> 656580EF09D12B20000E61D7 /* CSSPropertyNames.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CSSPropertyNames.h; sourceTree = "<group>"; };
</span><del>- 6565814409D13043000E61D7 /* CSSGrammar.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CSSGrammar.cpp; sourceTree = "<group>"; };
</del><ins>+ 6565814409D13043000E61D7 /* CSSGrammar.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = CSSGrammar.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
</ins><span class="cx"> 6565814709D13043000E61D7 /* CSSValueKeywords.gperf */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CSSValueKeywords.gperf; sourceTree = "<group>"; };
</span><span class="cx"> 6565814809D13043000E61D7 /* CSSValueKeywords.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CSSValueKeywords.h; sourceTree = "<group>"; };
</span><span class="cx"> 656581AC09D14EE6000E61D7 /* CharsetData.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CharsetData.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -10258,7 +10258,7 @@
</span><span class="cx"> 930705D909E0C9BF00B17FE4 /* JSCounter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCounter.h; sourceTree = "<group>"; };
</span><span class="cx"> 930705E809E0C9F000B17FE4 /* JSCSSPrimitiveValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCSSPrimitiveValue.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 930705EA09E0C9F600B17FE4 /* JSCSSPrimitiveValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCSSPrimitiveValue.h; sourceTree = "<group>"; };
</span><del>- 9307061309E0CA8200B17FE4 /* DerivedSources.make */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 4; path = DerivedSources.make; sourceTree = "<group>"; usesTabs = 1; };
</del><ins>+ 9307061309E0CA8200B17FE4 /* DerivedSources.make */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 4; lineEnding = 0; path = DerivedSources.make; sourceTree = "<group>"; usesTabs = 1; xcLanguageSpecificationIdentifier = xcode.lang.simpleColoring; };
</ins><span class="cx"> 9307F1D50AF2D59000DBA31A /* HitTestResult.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = HitTestResult.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 9307F1D60AF2D59000DBA31A /* HitTestResult.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HitTestResult.h; sourceTree = "<group>"; };
</span><span class="cx"> 930908900AF7EDE40081DF01 /* HitTestRequest.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HitTestRequest.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -12403,7 +12403,7 @@
</span><span class="cx"> BC1A3798097C715F0019F3D8 /* DOM.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = DOM.mm; sourceTree = "<group>"; };
</span><span class="cx"> BC1A3799097C715F0019F3D8 /* DOMCore.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMCore.h; sourceTree = "<group>"; };
</span><span class="cx"> BC1A379A097C715F0019F3D8 /* DOMCSS.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMCSS.h; sourceTree = "<group>"; };
</span><del>- BC1A379B097C715F0019F3D8 /* DOMCSS.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMCSS.mm; sourceTree = "<group>"; };
</del><ins>+ BC1A379B097C715F0019F3D8 /* DOMCSS.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = DOMCSS.mm; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
</ins><span class="cx"> BC1A379C097C715F0019F3D8 /* DOMEvents.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMEvents.h; sourceTree = "<group>"; };
</span><span class="cx"> BC1A379D097C715F0019F3D8 /* DOMEvents.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMEvents.mm; sourceTree = "<group>"; };
</span><span class="cx"> BC1A379F097C715F0019F3D8 /* DOMExtensions.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMExtensions.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -12470,7 +12470,7 @@
</span><span class="cx"> BC3C39B40C0D3D8D005F4D7A /* JSMediaList.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSMediaList.cpp; sourceTree = "<group>"; };
</span><span class="cx"> BC3C39B50C0D3D8D005F4D7A /* JSMediaList.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSMediaList.h; sourceTree = "<group>"; };
</span><span class="cx"> BC4368E70C226E32005EFB5F /* Rect.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Rect.h; sourceTree = "<group>"; };
</span><del>- BC46C1ED0C0DDBDF0020CFC3 /* JSCSSRuleCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSCSSRuleCustom.cpp; sourceTree = "<group>"; };
</del><ins>+ BC46C1ED0C0DDBDF0020CFC3 /* JSCSSRuleCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = JSCSSRuleCustom.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
</ins><span class="cx"> BC46C1F00C0DDC8F0020CFC3 /* JSCSSCharsetRule.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSCSSCharsetRule.cpp; sourceTree = "<group>"; };
</span><span class="cx"> BC46C1F10C0DDC8F0020CFC3 /* JSCSSCharsetRule.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSCSSCharsetRule.h; sourceTree = "<group>"; };
</span><span class="cx"> BC46C1F20C0DDC8F0020CFC3 /* JSCSSFontFaceRule.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSCSSFontFaceRule.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -12600,7 +12600,7 @@
</span><span class="cx"> BC74DA471013F468007987AD /* JSRGBColor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSRGBColor.h; sourceTree = "<group>"; };
</span><span class="cx"> BC76AC110DD7AD5C00415F34 /* ParserUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ParserUtilities.h; sourceTree = "<group>"; };
</span><span class="cx"> BC772B360C4EA91E0083285F /* CSSHelper.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CSSHelper.h; sourceTree = "<group>"; };
</span><del>- BC772B370C4EA91E0083285F /* CSSParser.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CSSParser.cpp; sourceTree = "<group>"; };
</del><ins>+ BC772B370C4EA91E0083285F /* CSSParser.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = CSSParser.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
</ins><span class="cx"> BC772B380C4EA91E0083285F /* CSSParser.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CSSParser.h; sourceTree = "<group>"; };
</span><span class="cx"> BC772C440C4EB2C60083285F /* XMLHttpRequest.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = XMLHttpRequest.cpp; sourceTree = "<group>"; };
</span><span class="cx"> BC772C450C4EB2C60083285F /* XMLHttpRequest.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = XMLHttpRequest.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -13547,7 +13547,7 @@
</span><span class="cx"> E1C6571E1816E50300256CDD /* CryptoAlgorithmHmacParams.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CryptoAlgorithmHmacParams.h; path = parameters/CryptoAlgorithmHmacParams.h; sourceTree = "<group>"; };
</span><span class="cx"> E1C657241816E69D00256CDD /* CryptoAlgorithmIdentifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoAlgorithmIdentifier.h; sourceTree = "<group>"; };
</span><span class="cx"> E1C657261816F9FE00256CDD /* CryptoAlgorithmParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoAlgorithmParameters.h; sourceTree = "<group>"; };
</span><del>- E1C6CFC21746D293007B87A1 /* DOMWindowConstructors.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = DOMWindowConstructors.idl; sourceTree = "<group>"; };
</del><ins>+ E1C6CFC21746D293007B87A1 /* DOMWindowConstructors.idl */ = {isa = PBXFileReference; lastKnownFileType = text; lineEnding = 0; path = DOMWindowConstructors.idl; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = "<none>"; };
</ins><span class="cx"> E1C8BE5C0E8BD15A0064CB7D /* JSWorker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWorker.cpp; sourceTree = "<group>"; };
</span><span class="cx"> E1C94AF7191303F000D5A893 /* BlobPart.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BlobPart.h; sourceTree = "<group>"; };
</span><span class="cx"> E1CA5CBB0E8CDCAF00E8EF90 /* JSWorkerCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWorkerCustom.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -13919,7 +13919,7 @@
</span><span class="cx"> FCD8832916A49F8200962227 /* DOMCSSSupportsRule.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMCSSSupportsRule.mm; sourceTree = "<group>"; };
</span><span class="cx"> FCEBBAAA16A4967A00FA20A6 /* DOMCSSSupportsRuleInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMCSSSupportsRuleInternal.h; sourceTree = "<group>"; };
</span><span class="cx"> FCEBCD711623A7910029965E /* CSSGrammar.y.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.yacc; path = CSSGrammar.y.in; sourceTree = "<group>"; };
</span><del>- FCEBCD721623A7910029965E /* CSSGrammar.y.includes */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.yacc; path = CSSGrammar.y.includes; sourceTree = "<group>"; };
</del><ins>+ FCEBCD721623A7910029965E /* CSSGrammar.y.includes */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.yacc; lineEnding = 0; path = CSSGrammar.y.includes; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = "<none>"; };
</ins><span class="cx"> FD00D7A214A3F61900734011 /* SincResampler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SincResampler.cpp; sourceTree = "<group>"; };
</span><span class="cx"> FD00D7A314A3F61900734011 /* SincResampler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SincResampler.h; sourceTree = "<group>"; };
</span><span class="cx"> FD06DFA3134A4DEF006F5D7D /* DefaultAudioDestinationNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DefaultAudioDestinationNode.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -16928,12 +16928,12 @@
</span><span class="cx"> 31060376143281CD00ABF4BA /* DOMWebKitCSSFilterValue.h */,
</span><span class="cx"> 31060377143281CD00ABF4BA /* DOMWebKitCSSFilterValue.mm */,
</span><span class="cx"> 31060378143281CD00ABF4BA /* DOMWebKitCSSFilterValueInternal.h */,
</span><del>- 316FE0770E6CCC2800BF6088 /* DOMWebKitCSSKeyframeRule.h */,
- 316FE0780E6CCC2800BF6088 /* DOMWebKitCSSKeyframeRule.mm */,
- 316FE0790E6CCC2800BF6088 /* DOMWebKitCSSKeyframeRuleInternal.h */,
- 316FE07A0E6CCC2800BF6088 /* DOMWebKitCSSKeyframesRule.h */,
- 316FE07B0E6CCC2800BF6088 /* DOMWebKitCSSKeyframesRule.mm */,
- 316FE07C0E6CCC2800BF6088 /* DOMWebKitCSSKeyframesRuleInternal.h */,
</del><ins>+ 316FE0770E6CCC2800BF6088 /* DOMCSSKeyframeRule.h */,
+ 316FE0780E6CCC2800BF6088 /* DOMCSSKeyframeRule.mm */,
+ 316FE0790E6CCC2800BF6088 /* DOMCSSKeyframeRuleInternal.h */,
+ 316FE07A0E6CCC2800BF6088 /* DOMCSSKeyframesRule.h */,
+ 316FE07B0E6CCC2800BF6088 /* DOMCSSKeyframesRule.mm */,
+ 316FE07C0E6CCC2800BF6088 /* DOMCSSKeyframesRuleInternal.h */,
</ins><span class="cx"> 4983914D0F1E76B400C23782 /* DOMWebKitCSSMatrix.h */,
</span><span class="cx"> 4983914E0F1E76B400C23782 /* DOMWebKitCSSMatrix.mm */,
</span><span class="cx"> 4983914F0F1E76B400C23782 /* DOMWebKitCSSMatrixInternal.h */,
</span><span class="lines">@@ -19276,10 +19276,10 @@
</span><span class="cx"> A84EBD810CB8C97700079609 /* JSStyleSheetList.h */,
</span><span class="cx"> 310603721432819C00ABF4BA /* JSWebKitCSSFilterValue.cpp */,
</span><span class="cx"> 310603731432819C00ABF4BA /* JSWebKitCSSFilterValue.h */,
</span><del>- 316FE06D0E6CCBEE00BF6088 /* JSWebKitCSSKeyframeRule.cpp */,
- 316FE06E0E6CCBEE00BF6088 /* JSWebKitCSSKeyframeRule.h */,
- 316FE06F0E6CCBEE00BF6088 /* JSWebKitCSSKeyframesRule.cpp */,
- 316FE0700E6CCBEE00BF6088 /* JSWebKitCSSKeyframesRule.h */,
</del><ins>+ 316FE06D0E6CCBEE00BF6088 /* JSCSSKeyframeRule.cpp */,
+ 316FE06E0E6CCBEE00BF6088 /* JSCSSKeyframeRule.h */,
+ 316FE06F0E6CCBEE00BF6088 /* JSCSSKeyframesRule.cpp */,
+ 316FE0700E6CCBEE00BF6088 /* JSCSSKeyframesRule.h */,
</ins><span class="cx"> 4983913D0F1E767500C23782 /* JSWebKitCSSMatrix.cpp */,
</span><span class="cx"> 4983913E0F1E767500C23782 /* JSWebKitCSSMatrix.h */,
</span><span class="cx"> 8ACC24CD148E24B200EFCC0D /* JSWebKitCSSRegionRule.cpp */,
</span><span class="lines">@@ -22214,12 +22214,12 @@
</span><span class="cx"> 3106036C14327D2E00ABF4BA /* WebKitCSSFilterValue.cpp */,
</span><span class="cx"> 3106036D14327D2E00ABF4BA /* WebKitCSSFilterValue.h */,
</span><span class="cx"> 3106036E14327D2E00ABF4BA /* WebKitCSSFilterValue.idl */,
</span><del>- 31288E6E0E3005D6003619AE /* WebKitCSSKeyframeRule.cpp */,
- 31288E6F0E3005D6003619AE /* WebKitCSSKeyframeRule.h */,
- 316FE0910E6CCD7F00BF6088 /* WebKitCSSKeyframeRule.idl */,
- 31288E700E3005D6003619AE /* WebKitCSSKeyframesRule.cpp */,
- 31288E710E3005D6003619AE /* WebKitCSSKeyframesRule.h */,
- 316FE0920E6CCD7F00BF6088 /* WebKitCSSKeyframesRule.idl */,
</del><ins>+ 31288E6E0E3005D6003619AE /* CSSKeyframeRule.cpp */,
+ 31288E6F0E3005D6003619AE /* CSSKeyframeRule.h */,
+ 316FE0910E6CCD7F00BF6088 /* CSSKeyframeRule.idl */,
+ 31288E700E3005D6003619AE /* CSSKeyframesRule.cpp */,
+ 31288E710E3005D6003619AE /* CSSKeyframesRule.h */,
+ 316FE0920E6CCD7F00BF6088 /* CSSKeyframesRule.idl */,
</ins><span class="cx"> 498391550F1E776900C23782 /* WebKitCSSMatrix.cpp */,
</span><span class="cx"> 498391560F1E776900C23782 /* WebKitCSSMatrix.h */,
</span><span class="cx"> 498391570F1E776900C23782 /* WebKitCSSMatrix.idl */,
</span><span class="lines">@@ -24127,10 +24127,10 @@
</span><span class="cx"> 31C0FF4B0E4CEFDD007D6FE5 /* DOMWebKitAnimationEventInternal.h in Headers */,
</span><span class="cx"> 31060379143281CD00ABF4BA /* DOMWebKitCSSFilterValue.h in Headers */,
</span><span class="cx"> 3106037B143281CD00ABF4BA /* DOMWebKitCSSFilterValueInternal.h in Headers */,
</span><del>- 316FE07D0E6CCC2800BF6088 /* DOMWebKitCSSKeyframeRule.h in Headers */,
- 316FE07F0E6CCC2800BF6088 /* DOMWebKitCSSKeyframeRuleInternal.h in Headers */,
- 316FE0800E6CCC2800BF6088 /* DOMWebKitCSSKeyframesRule.h in Headers */,
- 316FE0820E6CCC2800BF6088 /* DOMWebKitCSSKeyframesRuleInternal.h in Headers */,
</del><ins>+ 316FE07D0E6CCC2800BF6088 /* DOMCSSKeyframeRule.h in Headers */,
+ 316FE07F0E6CCC2800BF6088 /* DOMCSSKeyframeRuleInternal.h in Headers */,
+ 316FE0800E6CCC2800BF6088 /* DOMCSSKeyframesRule.h in Headers */,
+ 316FE0820E6CCC2800BF6088 /* DOMCSSKeyframesRuleInternal.h in Headers */,
</ins><span class="cx"> 498391500F1E76B400C23782 /* DOMWebKitCSSMatrix.h in Headers */,
</span><span class="cx"> 498391520F1E76B400C23782 /* DOMWebKitCSSMatrixInternal.h in Headers */,
</span><span class="cx"> 8AD0A59614C88358000D83C5 /* DOMWebKitCSSRegionRule.h in Headers */,
</span><span class="lines">@@ -25210,8 +25210,8 @@
</span><span class="cx"> 77EF62F412F9DB7400C77BD2 /* JSWebGLVertexArrayObjectOES.h in Headers */,
</span><span class="cx"> 31C0FF3E0E4CEFAC007D6FE5 /* JSWebKitAnimationEvent.h in Headers */,
</span><span class="cx"> 310603751432819C00ABF4BA /* JSWebKitCSSFilterValue.h in Headers */,
</span><del>- 316FE0720E6CCBEE00BF6088 /* JSWebKitCSSKeyframeRule.h in Headers */,
- 316FE0740E6CCBEE00BF6088 /* JSWebKitCSSKeyframesRule.h in Headers */,
</del><ins>+ 316FE0720E6CCBEE00BF6088 /* JSCSSKeyframeRule.h in Headers */,
+ 316FE0740E6CCBEE00BF6088 /* JSCSSKeyframesRule.h in Headers */,
</ins><span class="cx"> 498391400F1E767500C23782 /* JSWebKitCSSMatrix.h in Headers */,
</span><span class="cx"> 8AD0A59514C88336000D83C5 /* JSWebKitCSSRegionRule.h in Headers */,
</span><span class="cx"> 31611E5B0E1C4DE000F6A579 /* JSWebKitCSSTransformValue.h in Headers */,
</span><span class="lines">@@ -26627,8 +26627,8 @@
</span><span class="cx"> 5DFEBAB718592B6D00C75BEB /* WebKitAvailability.h in Headers */,
</span><span class="cx"> 976D6C7C122B8A3D001FD1F7 /* WebKitBlobBuilder.h in Headers */,
</span><span class="cx"> 3106037014327D2E00ABF4BA /* WebKitCSSFilterValue.h in Headers */,
</span><del>- 31288E730E3005D6003619AE /* WebKitCSSKeyframeRule.h in Headers */,
- 31288E750E3005D6003619AE /* WebKitCSSKeyframesRule.h in Headers */,
</del><ins>+ 31288E730E3005D6003619AE /* CSSKeyframeRule.h in Headers */,
+ 31288E750E3005D6003619AE /* CSSKeyframesRule.h in Headers */,
</ins><span class="cx"> 498391590F1E776900C23782 /* WebKitCSSMatrix.h in Headers */,
</span><span class="cx"> 8AA61D00144D595B00F37350 /* WebKitCSSRegionRule.h in Headers */,
</span><span class="cx"> BC9ADD230CC4032600098C4C /* WebKitCSSTransformValue.h in Headers */,
</span><span class="lines">@@ -27637,8 +27637,8 @@
</span><span class="cx"> 15C770A5100D41CD005BA267 /* DOMValidityState.mm in Sources */,
</span><span class="cx"> 31C0FF4A0E4CEFDD007D6FE5 /* DOMWebKitAnimationEvent.mm in Sources */,
</span><span class="cx"> 3106037A143281CD00ABF4BA /* DOMWebKitCSSFilterValue.mm in Sources */,
</span><del>- 316FE07E0E6CCC2800BF6088 /* DOMWebKitCSSKeyframeRule.mm in Sources */,
- 316FE0810E6CCC2800BF6088 /* DOMWebKitCSSKeyframesRule.mm in Sources */,
</del><ins>+ 316FE07E0E6CCC2800BF6088 /* DOMCSSKeyframeRule.mm in Sources */,
+ 316FE0810E6CCC2800BF6088 /* DOMCSSKeyframesRule.mm in Sources */,
</ins><span class="cx"> 498391510F1E76B400C23782 /* DOMWebKitCSSMatrix.mm in Sources */,
</span><span class="cx"> 8AD0A59714C88358000D83C5 /* DOMWebKitCSSRegionRule.mm in Sources */,
</span><span class="cx"> 31611E620E1C4E1400F6A579 /* DOMWebKitCSSTransformValue.mm in Sources */,
</span><span class="lines">@@ -28754,8 +28754,8 @@
</span><span class="cx"> 77EF62F312F9DB7400C77BD2 /* JSWebGLVertexArrayObjectOES.cpp in Sources */,
</span><span class="cx"> 31C0FF3D0E4CEFAC007D6FE5 /* JSWebKitAnimationEvent.cpp in Sources */,
</span><span class="cx"> 310603741432819C00ABF4BA /* JSWebKitCSSFilterValue.cpp in Sources */,
</span><del>- 316FE0710E6CCBEE00BF6088 /* JSWebKitCSSKeyframeRule.cpp in Sources */,
- 316FE0730E6CCBEE00BF6088 /* JSWebKitCSSKeyframesRule.cpp in Sources */,
</del><ins>+ 316FE0710E6CCBEE00BF6088 /* JSCSSKeyframeRule.cpp in Sources */,
+ 316FE0730E6CCBEE00BF6088 /* JSCSSKeyframesRule.cpp in Sources */,
</ins><span class="cx"> 4983913F0F1E767500C23782 /* JSWebKitCSSMatrix.cpp in Sources */,
</span><span class="cx"> 8AD0A59414C88336000D83C5 /* JSWebKitCSSRegionRule.cpp in Sources */,
</span><span class="cx"> 31611E5A0E1C4DE000F6A579 /* JSWebKitCSSTransformValue.cpp in Sources */,
</span><span class="lines">@@ -29903,8 +29903,8 @@
</span><span class="cx"> 31C0FF210E4CEB6E007D6FE5 /* WebKitAnimationEvent.cpp in Sources */,
</span><span class="cx"> 976D6C7B122B8A3D001FD1F7 /* WebKitBlobBuilder.cpp in Sources */,
</span><span class="cx"> 3106036F14327D2E00ABF4BA /* WebKitCSSFilterValue.cpp in Sources */,
</span><del>- 31288E720E3005D6003619AE /* WebKitCSSKeyframeRule.cpp in Sources */,
- 31288E740E3005D6003619AE /* WebKitCSSKeyframesRule.cpp in Sources */,
</del><ins>+ 31288E720E3005D6003619AE /* CSSKeyframeRule.cpp in Sources */,
+ 31288E740E3005D6003619AE /* CSSKeyframesRule.cpp in Sources */,
</ins><span class="cx"> 498391580F1E776900C23782 /* WebKitCSSMatrix.cpp in Sources */,
</span><span class="cx"> 8AA61CFF144D595B00F37350 /* WebKitCSSRegionRule.cpp in Sources */,
</span><span class="cx"> BC9ADD800CC4092200098C4C /* WebKitCSSTransformValue.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSCSSRuleCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSCSSRuleCustom.cpp (176156 => 176157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSCSSRuleCustom.cpp 2014-11-15 18:57:31 UTC (rev 176156)
+++ trunk/Source/WebCore/bindings/js/JSCSSRuleCustom.cpp 2014-11-15 23:02:43 UTC (rev 176157)
</span><span class="lines">@@ -29,6 +29,8 @@
</span><span class="cx"> #include "CSSCharsetRule.h"
</span><span class="cx"> #include "CSSFontFaceRule.h"
</span><span class="cx"> #include "CSSImportRule.h"
</span><ins>+#include "CSSKeyframeRule.h"
+#include "CSSKeyframesRule.h"
</ins><span class="cx"> #include "CSSMediaRule.h"
</span><span class="cx"> #include "CSSPageRule.h"
</span><span class="cx"> #include "CSSStyleRule.h"
</span><span class="lines">@@ -36,18 +38,16 @@
</span><span class="cx"> #include "JSCSSCharsetRule.h"
</span><span class="cx"> #include "JSCSSFontFaceRule.h"
</span><span class="cx"> #include "JSCSSImportRule.h"
</span><ins>+#include "JSCSSKeyframeRule.h"
+#include "JSCSSKeyframesRule.h"
</ins><span class="cx"> #include "JSCSSMediaRule.h"
</span><span class="cx"> #include "JSCSSPageRule.h"
</span><span class="cx"> #include "JSCSSStyleRule.h"
</span><span class="cx"> #include "JSCSSSupportsRule.h"
</span><span class="cx"> #include "JSNode.h"
</span><span class="cx"> #include "JSStyleSheetCustom.h"
</span><del>-#include "JSWebKitCSSKeyframeRule.h"
-#include "JSWebKitCSSKeyframesRule.h"
</del><span class="cx"> #include "JSWebKitCSSRegionRule.h"
</span><span class="cx"> #include "JSWebKitCSSViewportRule.h"
</span><del>-#include "WebKitCSSKeyframeRule.h"
-#include "WebKitCSSKeyframesRule.h"
</del><span class="cx"> #include "WebKitCSSRegionRule.h"
</span><span class="cx"> #include "WebKitCSSViewportRule.h"
</span><span class="cx">
</span><span class="lines">@@ -88,11 +88,11 @@
</span><span class="cx"> case CSSRule::CHARSET_RULE:
</span><span class="cx"> wrapper = CREATE_DOM_WRAPPER(globalObject, CSSCharsetRule, rule);
</span><span class="cx"> break;
</span><del>- case CSSRule::WEBKIT_KEYFRAME_RULE:
- wrapper = CREATE_DOM_WRAPPER(globalObject, WebKitCSSKeyframeRule, rule);
</del><ins>+ case CSSRule::KEYFRAME_RULE:
+ wrapper = CREATE_DOM_WRAPPER(globalObject, CSSKeyframeRule, rule);
</ins><span class="cx"> break;
</span><del>- case CSSRule::WEBKIT_KEYFRAMES_RULE:
- wrapper = CREATE_DOM_WRAPPER(globalObject, WebKitCSSKeyframesRule, rule);
</del><ins>+ case CSSRule::KEYFRAMES_RULE:
+ wrapper = CREATE_DOM_WRAPPER(globalObject, CSSKeyframesRule, rule);
</ins><span class="cx"> break;
</span><span class="cx"> case CSSRule::SUPPORTS_RULE:
</span><span class="cx"> wrapper = CREATE_DOM_WRAPPER(globalObject, CSSSupportsRule, rule);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsobjcDOMCSSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/objc/DOMCSS.mm (176156 => 176157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/objc/DOMCSS.mm 2014-11-15 18:57:31 UTC (rev 176156)
+++ trunk/Source/WebCore/bindings/objc/DOMCSS.mm 2014-11-15 23:02:43 UTC (rev 176157)
</span><span class="lines">@@ -33,6 +33,8 @@
</span><span class="cx"> #import "DOMCSSCharsetRule.h"
</span><span class="cx"> #import "DOMCSSFontFaceRule.h"
</span><span class="cx"> #import "DOMCSSImportRule.h"
</span><ins>+#import "DOMCSSKeyframeRule.h"
+#import "DOMCSSKeyframesRule.h"
</ins><span class="cx"> #import "DOMCSSMediaRule.h"
</span><span class="cx"> #import "DOMCSSPageRule.h"
</span><span class="cx"> #import "DOMCSSPrimitiveValue.h"
</span><span class="lines">@@ -47,8 +49,6 @@
</span><span class="cx"> #import "DOMInternal.h"
</span><span class="cx"> #import "DOMStyleSheetInternal.h"
</span><span class="cx"> #import "DOMWebKitCSSFilterValue.h"
</span><del>-#import "DOMWebKitCSSKeyframeRule.h"
-#import "DOMWebKitCSSKeyframesRule.h"
</del><span class="cx"> #import "DOMWebKitCSSTransformValue.h"
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_REGIONS)
</span><span class="lines">@@ -89,10 +89,10 @@
</span><span class="cx"> return [DOMCSSFontFaceRule class];
</span><span class="cx"> case DOM_PAGE_RULE:
</span><span class="cx"> return [DOMCSSPageRule class];
</span><del>- case DOM_WEBKIT_KEYFRAMES_RULE:
- return [DOMWebKitCSSKeyframesRule class];
- case DOM_WEBKIT_KEYFRAME_RULE:
- return [DOMWebKitCSSKeyframeRule class];
</del><ins>+ case DOM_KEYFRAMES_RULE:
+ return [DOMCSSKeyframesRule class];
+ case DOM_KEYFRAME_RULE:
+ return [DOMCSSKeyframeRule class];
</ins><span class="cx"> case DOM_SUPPORTS_RULE:
</span><span class="cx"> return [DOMCSSSupportsRule class];
</span><span class="cx"> #if ENABLE(CSS_DEVICE_ADAPTATION)
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSGrammaryin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSGrammar.y.in (176156 => 176157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSGrammar.y.in 2014-11-15 18:57:31 UTC (rev 176156)
+++ trunk/Source/WebCore/css/CSSGrammar.y.in 2014-11-15 23:02:43 UTC (rev 176157)
</span><span class="lines">@@ -805,7 +805,7 @@
</span><span class="cx"> $$ = parser->createKeyframesRule($4, std::unique_ptr<Vector<RefPtr<StyleKeyframe>>>($9)).leakRef();
</span><span class="cx"> }
</span><span class="cx"> ;
</span><del>-
</del><ins>+
</ins><span class="cx"> keyframe_name: IDENT | STRING ;
</span><span class="cx">
</span><span class="cx"> keyframes_rule:
</span><span class="lines">@@ -1854,7 +1854,7 @@
</span><span class="cx"> $$.id = CSSValueInvalid;
</span><span class="cx"> $$.unit = CSSParserValue::Function;
</span><span class="cx"> $$.function = f;
</span><del>- }
</del><ins>+ }
</ins><span class="cx"> | min_or_max maybe_space expr_recovery closing_parenthesis {
</span><span class="cx"> $$.id = CSSValueInvalid;
</span><span class="cx"> $$.unit = 0;
</span><span class="lines">@@ -1897,3 +1897,4 @@
</span><span class="cx"> ;
</span><span class="cx">
</span><span class="cx"> %%
</span><ins>+
</ins></span></pre></div>
<a id="trunkSourceWebCorecssCSSGrammaryincludes"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSGrammar.y.includes (176156 => 176157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSGrammar.y.includes 2014-11-15 18:57:31 UTC (rev 176156)
+++ trunk/Source/WebCore/css/CSSGrammar.y.includes 2014-11-15 23:02:43 UTC (rev 176157)
</span><span class="lines">@@ -36,8 +36,8 @@
</span><span class="cx"> #include "MediaQueryExp.h"
</span><span class="cx"> #include "StyleRule.h"
</span><span class="cx"> #include "StyleSheetContents.h"
</span><del>-#include "WebKitCSSKeyframeRule.h"
-#include "WebKitCSSKeyframesRule.h"
</del><ins>+#include "CSSKeyframeRule.h"
+#include "CSSKeyframesRule.h"
</ins><span class="cx"> #include <wtf/FastMalloc.h>
</span><span class="cx"> #include <stdlib.h>
</span><span class="cx"> #include <string.h>
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSKeyframeRulecppfromrev176156trunkSourceWebCorecssWebKitCSSKeyframeRulecpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/css/CSSKeyframeRule.cpp (from rev 176156, trunk/Source/WebCore/css/WebKitCSSKeyframeRule.cpp) (0 => 176157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSKeyframeRule.cpp (rev 0)
+++ trunk/Source/WebCore/css/CSSKeyframeRule.cpp 2014-11-15 23:02:43 UTC (rev 176157)
</span><span class="lines">@@ -0,0 +1,120 @@
</span><ins>+/*
+ * 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
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "CSSKeyframeRule.h"
+
+#include "CSSKeyframesRule.h"
+#include "PropertySetCSSStyleDeclaration.h"
+#include "StyleProperties.h"
+#include <wtf/text/StringBuilder.h>
+
+namespace WebCore {
+
+StyleKeyframe::StyleKeyframe(PassRef<StyleProperties> properties)
+ : m_properties(WTF::move(properties))
+{
+}
+
+StyleKeyframe::~StyleKeyframe()
+{
+}
+
+MutableStyleProperties& StyleKeyframe::mutableProperties()
+{
+ if (!is<MutableStyleProperties>(m_properties.get()))
+ m_properties = m_properties->mutableCopy();
+ return downcast<MutableStyleProperties>(m_properties.get());
+}
+
+/* static */
+void StyleKeyframe::parseKeyString(const String& s, Vector<double>& keys)
+{
+ keys.clear();
+ Vector<String> strings;
+ s.split(',', strings);
+
+ 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;
+ else if (cur == "to")
+ key = 1;
+ else if (cur.endsWith('%')) {
+ double k = cur.substring(0, cur.length() - 1).toDouble();
+ if (k >= 0 && k <= 100)
+ key = k / 100;
+ }
+ if (key < 0) {
+ keys.clear();
+ return;
+ }
+ keys.append(key);
+ }
+}
+
+String StyleKeyframe::cssText() const
+{
+ StringBuilder result;
+ result.append(keyText());
+ result.appendLiteral(" { ");
+ String decls = m_properties->asText();
+ result.append(decls);
+ if (!decls.isEmpty())
+ result.append(' ');
+ result.append('}');
+ return result.toString();
+}
+
+CSSKeyframeRule::CSSKeyframeRule(StyleKeyframe& keyframe, CSSKeyframesRule* parent)
+ : CSSRule(0)
+ , m_keyframe(keyframe)
+{
+ setParentRule(parent);
+}
+
+CSSKeyframeRule::~CSSKeyframeRule()
+{
+ if (m_propertiesCSSOMWrapper)
+ m_propertiesCSSOMWrapper->clearParentRule();
+}
+
+CSSStyleDeclaration& CSSKeyframeRule::style()
+{
+ if (!m_propertiesCSSOMWrapper)
+ m_propertiesCSSOMWrapper = StyleRuleCSSStyleDeclaration::create(m_keyframe->mutableProperties(), *this);
+ return *m_propertiesCSSOMWrapper;
+}
+
+void CSSKeyframeRule::reattach(StyleRuleBase&)
+{
+ // No need to reattach, the underlying data is shareable on mutation.
+ ASSERT_NOT_REACHED();
+}
+
+} // namespace WebCore
</ins></span></pre></div>
<a id="trunkSourceWebCorecssCSSKeyframeRulecpp"></a>
<div class="propset"><h4>Property changes: trunk/Source/WebCore/css/CSSKeyframeRule.cpp</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkSourceWebCorecssCSSKeyframeRulehfromrev176156trunkSourceWebCorecssWebKitCSSKeyframeRuleh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/css/CSSKeyframeRule.h (from rev 176156, trunk/Source/WebCore/css/WebKitCSSKeyframeRule.h) (0 => 176157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSKeyframeRule.h (rev 0)
+++ trunk/Source/WebCore/css/CSSKeyframeRule.h 2014-11-15 23:02:43 UTC (rev 176157)
</span><span class="lines">@@ -0,0 +1,93 @@
</span><ins>+/*
+ * 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
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef CSSKeyframeRule_h
+#define CSSKeyframeRule_h
+
+#include "CSSRule.h"
+#include "StyleProperties.h"
+
+namespace WebCore {
+
+class CSSStyleDeclaration;
+class StyleRuleCSSStyleDeclaration;
+class CSSKeyframesRule;
+
+class StyleKeyframe : public RefCounted<StyleKeyframe> {
+ WTF_MAKE_FAST_ALLOCATED;
+public:
+ static PassRefPtr<StyleKeyframe> create(PassRef<StyleProperties> properties)
+ {
+ return adoptRef(new StyleKeyframe(WTF::move(properties)));
+ }
+ ~StyleKeyframe();
+
+ String keyText() const { return m_key; }
+ void setKeyText(const String& s) { m_key = s; }
+
+ void getKeys(Vector<double>& keys) const { parseKeyString(m_key, keys); }
+
+ const StyleProperties& properties() const { return m_properties; }
+ MutableStyleProperties& mutableProperties();
+
+ String cssText() const;
+
+private:
+ explicit StyleKeyframe(PassRef<StyleProperties>);
+
+ static void parseKeyString(const String&, Vector<double>& keys);
+
+ Ref<StyleProperties> m_properties;
+ // FIXME: This should be a parsed vector of floats.
+ // comma separated list of keys
+ String m_key;
+};
+
+class CSSKeyframeRule final : public CSSRule {
+public:
+ virtual ~CSSKeyframeRule();
+
+ virtual String cssText() const override { return m_keyframe->cssText(); }
+ virtual void reattach(StyleRuleBase&) override;
+
+ String keyText() const { return m_keyframe->keyText(); }
+ void setKeyText(const String& s) { m_keyframe->setKeyText(s); }
+
+ CSSStyleDeclaration& style();
+
+private:
+ CSSKeyframeRule(StyleKeyframe&, CSSKeyframesRule* parent);
+
+ virtual CSSRule::Type type() const override { return KEYFRAME_RULE; }
+
+ Ref<StyleKeyframe> m_keyframe;
+ mutable RefPtr<StyleRuleCSSStyleDeclaration> m_propertiesCSSOMWrapper;
+
+ friend class CSSKeyframesRule;
+};
+
+} // namespace WebCore
+
+#endif // CSSKeyframeRule_h
</ins></span></pre></div>
<a id="trunkSourceWebCorecssCSSKeyframeRuleh"></a>
<div class="propset"><h4>Property changes: trunk/Source/WebCore/css/CSSKeyframeRule.h</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkSourceWebCorecssCSSKeyframeRuleidlfromrev176156trunkSourceWebCorecssWebKitCSSKeyframeRuleidl"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/css/CSSKeyframeRule.idl (from rev 176156, trunk/Source/WebCore/css/WebKitCSSKeyframeRule.idl) (0 => 176157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSKeyframeRule.idl (rev 0)
+++ trunk/Source/WebCore/css/CSSKeyframeRule.idl 2014-11-15 23:02:43 UTC (rev 176157)
</span><span class="lines">@@ -0,0 +1,36 @@
</span><ins>+/*
+ * 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of Apple Inc. ("Apple") nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+// Introduced in DOM Level ?:
+interface CSSKeyframeRule : CSSRule {
+
+ attribute DOMString keyText;
+ readonly attribute CSSStyleDeclaration style;
+
+};
+
</ins></span></pre></div>
<a id="trunkSourceWebCorecssCSSKeyframesRulecppfromrev176156trunkSourceWebCorecssWebKitCSSKeyframesRulecpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/css/CSSKeyframesRule.cpp (from rev 176156, trunk/Source/WebCore/css/WebKitCSSKeyframesRule.cpp) (0 => 176157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSKeyframesRule.cpp (rev 0)
+++ trunk/Source/WebCore/css/CSSKeyframesRule.cpp 2014-11-15 23:02:43 UTC (rev 176157)
</span><span class="lines">@@ -0,0 +1,211 @@
</span><ins>+/*
+ * 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
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.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 <wtf/text/StringBuilder.h>
+
+namespace WebCore {
+
+StyleRuleKeyframes::StyleRuleKeyframes()
+ : StyleRuleBase(Keyframes, 0)
+{
+}
+
+StyleRuleKeyframes::StyleRuleKeyframes(const StyleRuleKeyframes& o)
+ : StyleRuleBase(o)
+ , m_keyframes(o.m_keyframes)
+ , m_name(o.m_name)
+{
+}
+
+StyleRuleKeyframes::~StyleRuleKeyframes()
+{
+}
+
+void StyleRuleKeyframes::parserAppendKeyframe(PassRefPtr<StyleKeyframe> keyframe)
+{
+ if (!keyframe)
+ return;
+ m_keyframes.append(keyframe);
+}
+
+void StyleRuleKeyframes::wrapperAppendKeyframe(PassRefPtr<StyleKeyframe> keyframe)
+{
+ m_keyframes.append(keyframe);
+}
+
+void StyleRuleKeyframes::wrapperRemoveKeyframe(unsigned index)
+{
+ m_keyframes.remove(index);
+}
+
+int StyleRuleKeyframes::findKeyframeIndex(const String& key) const
+{
+ String percentageString;
+ if (equalIgnoringCase(key, "from"))
+ percentageString = ASCIILiteral("0%");
+ else if (equalIgnoringCase(key, "to"))
+ percentageString = ASCIILiteral("100%");
+ else
+ percentageString = key;
+
+ for (unsigned i = 0; i < m_keyframes.size(); ++i) {
+ if (m_keyframes[i]->keyText() == percentageString)
+ return i;
+ }
+ return -1;
+}
+
+CSSKeyframesRule::CSSKeyframesRule(StyleRuleKeyframes& keyframesRule, CSSStyleSheet* parent)
+ : CSSRule(parent)
+ , m_keyframesRule(keyframesRule)
+ , m_childRuleCSSOMWrappers(keyframesRule.keyframes().size())
+{
+}
+
+CSSKeyframesRule::~CSSKeyframesRule()
+{
+ ASSERT(m_childRuleCSSOMWrappers.size() == m_keyframesRule->keyframes().size());
+
+ for (unsigned i = 0; i < m_childRuleCSSOMWrappers.size(); ++i) {
+ if (m_childRuleCSSOMWrappers[i])
+ m_childRuleCSSOMWrappers[i]->setParentRule(0);
+ }
+}
+
+void CSSKeyframesRule::setName(const String& name)
+{
+ CSSStyleSheet::RuleMutationScope mutationScope(this);
+
+ m_keyframesRule->setName(name);
+}
+
+void CSSKeyframesRule::appendRule(const String& ruleText)
+{
+ if (CSSStyleSheet* parent = parentStyleSheet()) {
+ if (Document* ownerDocument = parent->ownerDocument())
+ ownerDocument->addConsoleMessage(MessageSource::JS, MessageLevel::Warning, ASCIILiteral("CSSKeyframesRule 'appendRule' function is deprecated. Use 'insertRule' instead."));
+ }
+ insertRule(ruleText);
+}
+
+void CSSKeyframesRule::insertRule(const String& ruleText)
+{
+ ASSERT(m_childRuleCSSOMWrappers.size() == m_keyframesRule->keyframes().size());
+
+ CSSParser parser(parserContext());
+ CSSStyleSheet* styleSheet = parentStyleSheet();
+ RefPtr<StyleKeyframe> keyframe = parser.parseKeyframeRule(styleSheet ? &styleSheet->contents() : nullptr, ruleText);
+ if (!keyframe)
+ return;
+
+ CSSStyleSheet::RuleMutationScope mutationScope(this);
+
+ m_keyframesRule->wrapperAppendKeyframe(keyframe);
+
+ m_childRuleCSSOMWrappers.grow(length());
+}
+
+void CSSKeyframesRule::deleteRule(const String& s)
+{
+ ASSERT(m_childRuleCSSOMWrappers.size() == m_keyframesRule->keyframes().size());
+
+ int i = m_keyframesRule->findKeyframeIndex(s);
+ if (i < 0)
+ return;
+
+ CSSStyleSheet::RuleMutationScope mutationScope(this);
+
+ m_keyframesRule->wrapperRemoveKeyframe(i);
+
+ if (m_childRuleCSSOMWrappers[i])
+ m_childRuleCSSOMWrappers[i]->setParentRule(0);
+ m_childRuleCSSOMWrappers.remove(i);
+}
+
+CSSKeyframeRule* CSSKeyframesRule::findRule(const String& s)
+{
+ int i = m_keyframesRule->findKeyframeIndex(s);
+ return (i >= 0) ? item(i) : 0;
+}
+
+String CSSKeyframesRule::cssText() const
+{
+ StringBuilder result;
+ result.appendLiteral("@-webkit-keyframes ");
+ result.append(name());
+ result.appendLiteral(" { \n");
+
+ unsigned size = length();
+ for (unsigned i = 0; i < size; ++i) {
+ result.appendLiteral(" ");
+ result.append(m_keyframesRule->keyframes()[i]->cssText());
+ result.append('\n');
+ }
+ result.append('}');
+ return result.toString();
+}
+
+unsigned CSSKeyframesRule::length() const
+{
+ return m_keyframesRule->keyframes().size();
+}
+
+CSSKeyframeRule* CSSKeyframesRule::item(unsigned index) const
+{
+ if (index >= length())
+ return 0;
+
+ ASSERT(m_childRuleCSSOMWrappers.size() == m_keyframesRule->keyframes().size());
+ RefPtr<CSSKeyframeRule>& rule = m_childRuleCSSOMWrappers[index];
+ if (!rule)
+ rule = adoptRef(new CSSKeyframeRule(*m_keyframesRule->keyframes()[index], const_cast<CSSKeyframesRule*>(this)));
+
+ return rule.get();
+}
+
+CSSRuleList& CSSKeyframesRule::cssRules()
+{
+ if (!m_ruleListCSSOMWrapper)
+ m_ruleListCSSOMWrapper = std::make_unique<LiveCSSRuleList<CSSKeyframesRule>>(this);
+ return *m_ruleListCSSOMWrapper;
+}
+
+void CSSKeyframesRule::reattach(StyleRuleBase& rule)
+{
+ ASSERT_WITH_SECURITY_IMPLICATION(rule.isKeyframesRule());
+ m_keyframesRule = static_cast<StyleRuleKeyframes&>(rule);
+}
+
+} // namespace WebCore
</ins></span></pre></div>
<a id="trunkSourceWebCorecssCSSKeyframesRulecpp"></a>
<div class="propset"><h4>Property changes: trunk/Source/WebCore/css/CSSKeyframesRule.cpp</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkSourceWebCorecssCSSKeyframesRulehfromrev176156trunkSourceWebCorecssWebKitCSSKeyframesRuleh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/css/CSSKeyframesRule.h (from rev 176156, trunk/Source/WebCore/css/WebKitCSSKeyframesRule.h) (0 => 176157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSKeyframesRule.h (rev 0)
+++ trunk/Source/WebCore/css/CSSKeyframesRule.h 2014-11-15 23:02:43 UTC (rev 176157)
</span><span class="lines">@@ -0,0 +1,104 @@
</span><ins>+/*
+ * 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
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef CSSKeyframesRule_h
+#define CSSKeyframesRule_h
+
+#include "CSSRule.h"
+#include "StyleRule.h"
+#include <memory>
+#include <wtf/Forward.h>
+#include <wtf/text/AtomicString.h>
+
+namespace WebCore {
+
+class CSSRuleList;
+class StyleKeyframe;
+class CSSKeyframeRule;
+
+class StyleRuleKeyframes : public StyleRuleBase {
+public:
+ static PassRef<StyleRuleKeyframes> create() { return adoptRef(*new StyleRuleKeyframes()); }
+
+ ~StyleRuleKeyframes();
+
+ const Vector<RefPtr<StyleKeyframe>>& keyframes() const { return m_keyframes; }
+
+ void parserAppendKeyframe(PassRefPtr<StyleKeyframe>);
+ void wrapperAppendKeyframe(PassRefPtr<StyleKeyframe>);
+ void wrapperRemoveKeyframe(unsigned);
+
+ String name() const { return m_name; }
+ void setName(const String& name) { m_name = AtomicString(name); }
+
+ int findKeyframeIndex(const String& key) const;
+
+ PassRef<StyleRuleKeyframes> copy() const { return adoptRef(*new StyleRuleKeyframes(*this)); }
+
+private:
+ StyleRuleKeyframes();
+ StyleRuleKeyframes(const StyleRuleKeyframes&);
+
+ Vector<RefPtr<StyleKeyframe>> m_keyframes;
+ AtomicString m_name;
+};
+
+class CSSKeyframesRule final : public CSSRule {
+public:
+ static PassRefPtr<CSSKeyframesRule> create(StyleRuleKeyframes& rule, CSSStyleSheet* sheet) { return adoptRef(new CSSKeyframesRule(rule, sheet)); }
+
+ virtual ~CSSKeyframesRule();
+
+ virtual CSSRule::Type type() const override { return KEYFRAMES_RULE; }
+ virtual String cssText() const override;
+ virtual void reattach(StyleRuleBase&) override;
+
+ String name() const { return m_keyframesRule->name(); }
+ void setName(const String&);
+
+ CSSRuleList& cssRules();
+
+ void insertRule(const String& rule);
+ void appendRule(const String& rule);
+ void deleteRule(const String& key);
+ CSSKeyframeRule* findRule(const String& key);
+
+ // For IndexedGetter and CSSRuleList.
+ unsigned length() const;
+ CSSKeyframeRule* item(unsigned index) const;
+
+private:
+ CSSKeyframesRule(StyleRuleKeyframes&, CSSStyleSheet* parent);
+
+ Ref<StyleRuleKeyframes> m_keyframesRule;
+ mutable Vector<RefPtr<CSSKeyframeRule>> m_childRuleCSSOMWrappers;
+ mutable std::unique_ptr<CSSRuleList> m_ruleListCSSOMWrapper;
+};
+
+} // namespace WebCore
+
+SPECIALIZE_TYPE_TRAITS_CSS_RULE(CSSKeyframesRule, CSSRule::KEYFRAMES_RULE)
+
+#endif // CSSKeyframesRule_h
</ins></span></pre></div>
<a id="trunkSourceWebCorecssCSSKeyframesRuleh"></a>
<div class="propset"><h4>Property changes: trunk/Source/WebCore/css/CSSKeyframesRule.h</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkSourceWebCorecssCSSKeyframesRuleidlfromrev176156trunkSourceWebCorecssWebKitCSSKeyframesRuleidl"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/css/CSSKeyframesRule.idl (from rev 176156, trunk/Source/WebCore/css/WebKitCSSKeyframesRule.idl) (0 => 176157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSKeyframesRule.idl (rev 0)
+++ trunk/Source/WebCore/css/CSSKeyframesRule.idl 2014-11-15 23:02:43 UTC (rev 176157)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+/*
+ * 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of Apple Inc. ("Apple") nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+interface CSSKeyframesRule : CSSRule {
+
+ [TreatReturnedNullStringAs=Null, TreatNullAs=NullString] attribute DOMString name;
+ readonly attribute CSSRuleList cssRules;
+
+ void insertRule([Default=Undefined] optional DOMString rule);
+ void appendRule([Default=Undefined] optional DOMString rule);
+ void deleteRule([Default=Undefined] optional DOMString key);
+ CSSKeyframeRule findRule([Default=Undefined] optional DOMString key);
+
+ getter CSSKeyframeRule (unsigned long index);
+};
+
</ins></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (176156 => 176157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2014-11-15 18:57:31 UTC (rev 176156)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2014-11-15 23:02:43 UTC (rev 176157)
</span><span class="lines">@@ -43,6 +43,8 @@
</span><span class="cx"> #include "CSSImageValue.h"
</span><span class="cx"> #include "CSSInheritedValue.h"
</span><span class="cx"> #include "CSSInitialValue.h"
</span><ins>+#include "CSSKeyframeRule.h"
+#include "CSSKeyframesRule.h"
</ins><span class="cx"> #include "CSSLineBoxContainValue.h"
</span><span class="cx"> #include "CSSMediaRule.h"
</span><span class="cx"> #include "CSSPageRule.h"
</span><span class="lines">@@ -80,8 +82,6 @@
</span><span class="cx"> #include "StyleSheetContents.h"
</span><span class="cx"> #include "TextEncoding.h"
</span><span class="cx"> #include "WebKitCSSFilterValue.h"
</span><del>-#include "WebKitCSSKeyframeRule.h"
-#include "WebKitCSSKeyframesRule.h"
</del><span class="cx"> #include "WebKitCSSRegionRule.h"
</span><span class="cx"> #include "WebKitCSSTransformValue.h"
</span><span class="cx"> #include <bitset>
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSRuleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSRule.h (176156 => 176157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSRule.h 2014-11-15 18:57:31 UTC (rev 176156)
+++ trunk/Source/WebCore/css/CSSRule.h 2014-11-15 23:02:43 UTC (rev 176157)
</span><span class="lines">@@ -49,8 +49,8 @@
</span><span class="cx"> // 7 was VARIABLES_RULE; we now match other browsers with 7 as
</span><span class="cx"> // KEYFRAMES_RULE:
</span><span class="cx"> // <https://bugs.webkit.org/show_bug.cgi?id=71293>.
</span><del>- WEBKIT_KEYFRAMES_RULE,
- WEBKIT_KEYFRAME_RULE,
</del><ins>+ KEYFRAMES_RULE,
+ KEYFRAME_RULE,
</ins><span class="cx"> SUPPORTS_RULE = 12,
</span><span class="cx"> #if ENABLE(CSS_DEVICE_ADAPTATION)
</span><span class="cx"> WEBKIT_VIEWPORT_RULE = 15,
</span><span class="lines">@@ -60,6 +60,11 @@
</span><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+ enum DeprecatedType {
+ WEBKIT_KEYFRAMES_RULE = 7,
+ WEBKIT_KEYFRAME_RULE = 8
+ };
+
</ins><span class="cx"> virtual Type type() const = 0;
</span><span class="cx"> virtual String cssText() const = 0;
</span><span class="cx"> virtual void reattach(StyleRuleBase&) = 0;
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSRuleidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSRule.idl (176156 => 176157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSRule.idl 2014-11-15 18:57:31 UTC (rev 176156)
+++ trunk/Source/WebCore/css/CSSRule.idl 2014-11-15 23:02:43 UTC (rev 176157)
</span><span class="lines">@@ -35,8 +35,8 @@
</span><span class="cx"> const unsigned short MEDIA_RULE = 4;
</span><span class="cx"> const unsigned short FONT_FACE_RULE = 5;
</span><span class="cx"> const unsigned short PAGE_RULE = 6;
</span><del>- const unsigned short WEBKIT_KEYFRAMES_RULE = 7;
- const unsigned short WEBKIT_KEYFRAME_RULE = 8;
</del><ins>+ const unsigned short KEYFRAMES_RULE = 7;
+ const unsigned short KEYFRAME_RULE = 8;
</ins><span class="cx"> const unsigned short SUPPORTS_RULE = 12;
</span><span class="cx"> #if defined(ENABLE_CSS_DEVICE_ADAPTATION) && ENABLE_CSS_DEVICE_ADAPTATION
</span><span class="cx"> const unsigned short WEBKIT_VIEWPORT_RULE = 15;
</span><span class="lines">@@ -45,6 +45,9 @@
</span><span class="cx"> const unsigned short WEBKIT_REGION_RULE = 16;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ const unsigned short WEBKIT_KEYFRAMES_RULE = 7; // Avoid breaking exisiting content.
+ const unsigned short WEBKIT_KEYFRAME_RULE = 8;
+
</ins><span class="cx"> readonly attribute unsigned short type;
</span><span class="cx">
</span><span class="cx"> [TreatReturnedNullStringAs=Null, TreatNullAs=NullString, SetterRaisesException] attribute DOMString cssText;
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSStyleSheetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSStyleSheet.cpp (176156 => 176157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSStyleSheet.cpp 2014-11-15 18:57:31 UTC (rev 176156)
+++ trunk/Source/WebCore/css/CSSStyleSheet.cpp 2014-11-15 23:02:43 UTC (rev 176157)
</span><span class="lines">@@ -24,6 +24,7 @@
</span><span class="cx"> #include "CSSCharsetRule.h"
</span><span class="cx"> #include "CSSFontFaceRule.h"
</span><span class="cx"> #include "CSSImportRule.h"
</span><ins>+#include "CSSKeyframesRule.h"
</ins><span class="cx"> #include "CSSParser.h"
</span><span class="cx"> #include "CSSRuleList.h"
</span><span class="cx"> #include "CSSStyleRule.h"
</span><span class="lines">@@ -41,7 +42,6 @@
</span><span class="cx"> #include "StyleResolver.h"
</span><span class="cx"> #include "StyleRule.h"
</span><span class="cx"> #include "StyleSheetContents.h"
</span><del>-#include "WebKitCSSKeyframesRule.h"
</del><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCorecssRuleSetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/RuleSet.cpp (176156 => 176157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/RuleSet.cpp 2014-11-15 18:57:31 UTC (rev 176156)
+++ trunk/Source/WebCore/css/RuleSet.cpp 2014-11-15 23:02:43 UTC (rev 176157)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #include "RuleSet.h"
</span><span class="cx">
</span><span class="cx"> #include "CSSFontSelector.h"
</span><ins>+#include "CSSKeyframesRule.h"
</ins><span class="cx"> #include "CSSSelector.h"
</span><span class="cx"> #include "CSSSelectorList.h"
</span><span class="cx"> #include "HTMLNames.h"
</span><span class="lines">@@ -41,7 +42,6 @@
</span><span class="cx"> #include "StyleRule.h"
</span><span class="cx"> #include "StyleRuleImport.h"
</span><span class="cx"> #include "StyleSheetContents.h"
</span><del>-#include "WebKitCSSKeyframesRule.h"
</del><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx"> #include "TextTrackCue.h"
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (176156 => 176157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2014-11-15 18:57:31 UTC (rev 176156)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2014-11-15 23:02:43 UTC (rev 176157)
</span><span class="lines">@@ -41,6 +41,8 @@
</span><span class="cx"> #include "CSSFontSelector.h"
</span><span class="cx"> #include "CSSFontValue.h"
</span><span class="cx"> #include "CSSFunctionValue.h"
</span><ins>+#include "CSSKeyframeRule.h"
+#include "CSSKeyframesRule.h"
</ins><span class="cx"> #include "CSSLineBoxContainValue.h"
</span><span class="cx"> #include "CSSPageRule.h"
</span><span class="cx"> #include "CSSParser.h"
</span><span class="lines">@@ -132,8 +134,6 @@
</span><span class="cx"> #include "ViewportStyleResolver.h"
</span><span class="cx"> #include "VisitedLinkState.h"
</span><span class="cx"> #include "WebKitCSSFilterValue.h"
</span><del>-#include "WebKitCSSKeyframeRule.h"
-#include "WebKitCSSKeyframesRule.h"
</del><span class="cx"> #include "WebKitCSSRegionRule.h"
</span><span class="cx"> #include "WebKitCSSTransformValue.h"
</span><span class="cx"> #include "WebKitFontFamilyNames.h"
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleRulecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleRule.cpp (176156 => 176157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleRule.cpp 2014-11-15 18:57:31 UTC (rev 176156)
+++ trunk/Source/WebCore/css/StyleRule.cpp 2014-11-15 23:02:43 UTC (rev 176157)
</span><span class="lines">@@ -25,6 +25,8 @@
</span><span class="cx"> #include "CSSCharsetRule.h"
</span><span class="cx"> #include "CSSFontFaceRule.h"
</span><span class="cx"> #include "CSSImportRule.h"
</span><ins>+#include "CSSKeyframeRule.h"
+#include "CSSKeyframesRule.h"
</ins><span class="cx"> #include "CSSMediaRule.h"
</span><span class="cx"> #include "CSSPageRule.h"
</span><span class="cx"> #include "CSSStyleRule.h"
</span><span class="lines">@@ -32,8 +34,6 @@
</span><span class="cx"> #include "CSSUnknownRule.h"
</span><span class="cx"> #include "StyleProperties.h"
</span><span class="cx"> #include "StyleRuleImport.h"
</span><del>-#include "WebKitCSSKeyframeRule.h"
-#include "WebKitCSSKeyframesRule.h"
</del><span class="cx"> #include "WebKitCSSRegionRule.h"
</span><span class="cx"> #include "WebKitCSSViewportRule.h"
</span><span class="cx">
</span><span class="lines">@@ -169,7 +169,7 @@
</span><span class="cx"> rule = CSSImportRule::create(static_cast<StyleRuleImport&>(self), parentSheet);
</span><span class="cx"> break;
</span><span class="cx"> case Keyframes:
</span><del>- rule = WebKitCSSKeyframesRule::create(static_cast<StyleRuleKeyframes&>(self), parentSheet);
</del><ins>+ rule = CSSKeyframesRule::create(static_cast<StyleRuleKeyframes&>(self), parentSheet);
</ins><span class="cx"> break;
</span><span class="cx"> #if ENABLE(CSS_DEVICE_ADAPTATION)
</span><span class="cx"> case Viewport:
</span></span></pre></div>
<a id="trunkSourceWebCorecssWebKitCSSKeyframeRulecpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/css/WebKitCSSKeyframeRule.cpp (176156 => 176157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/WebKitCSSKeyframeRule.cpp 2014-11-15 18:57:31 UTC (rev 176156)
+++ trunk/Source/WebCore/css/WebKitCSSKeyframeRule.cpp 2014-11-15 23:02:43 UTC (rev 176157)
</span><span class="lines">@@ -1,121 +0,0 @@
</span><del>-/*
- * Copyright (C) 2007, 2008, 2012 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "WebKitCSSKeyframeRule.h"
-
-#include "PropertySetCSSStyleDeclaration.h"
-#include "StyleProperties.h"
-#include "WebKitCSSKeyframesRule.h"
-#include <wtf/text/StringBuilder.h>
-
-namespace WebCore {
-
-StyleKeyframe::StyleKeyframe(PassRef<StyleProperties> properties)
- : m_properties(WTF::move(properties))
-{
-}
-
-StyleKeyframe::~StyleKeyframe()
-{
-}
-
-MutableStyleProperties& StyleKeyframe::mutableProperties()
-{
- if (!is<MutableStyleProperties>(m_properties.get()))
- m_properties = m_properties->mutableCopy();
- return downcast<MutableStyleProperties>(m_properties.get());
-}
-
-/* static */
-void StyleKeyframe::parseKeyString(const String& s, Vector<double>& keys)
-{
- keys.clear();
- Vector<String> strings;
- s.split(',', strings);
-
- 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;
- else if (cur == "to")
- key = 1;
- else if (cur.endsWith('%')) {
- double k = cur.substring(0, cur.length() - 1).toDouble();
- if (k >= 0 && k <= 100)
- key = k/100;
- }
- if (key < 0) {
- keys.clear();
- return;
- }
- else
- keys.append(key);
- }
-}
-
-String StyleKeyframe::cssText() const
-{
- StringBuilder result;
- result.append(keyText());
- result.appendLiteral(" { ");
- String decls = m_properties->asText();
- result.append(decls);
- if (!decls.isEmpty())
- result.append(' ');
- result.append('}');
- return result.toString();
-}
-
-WebKitCSSKeyframeRule::WebKitCSSKeyframeRule(StyleKeyframe& keyframe, WebKitCSSKeyframesRule* parent)
- : CSSRule(0)
- , m_keyframe(keyframe)
-{
- setParentRule(parent);
-}
-
-WebKitCSSKeyframeRule::~WebKitCSSKeyframeRule()
-{
- if (m_propertiesCSSOMWrapper)
- m_propertiesCSSOMWrapper->clearParentRule();
-}
-
-CSSStyleDeclaration& WebKitCSSKeyframeRule::style()
-{
- if (!m_propertiesCSSOMWrapper)
- m_propertiesCSSOMWrapper = StyleRuleCSSStyleDeclaration::create(m_keyframe->mutableProperties(), *this);
- return *m_propertiesCSSOMWrapper;
-}
-
-void WebKitCSSKeyframeRule::reattach(StyleRuleBase&)
-{
- // No need to reattach, the underlying data is shareable on mutation.
- ASSERT_NOT_REACHED();
-}
-
-} // namespace WebCore
</del></span></pre></div>
<a id="trunkSourceWebCorecssWebKitCSSKeyframeRuleh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/css/WebKitCSSKeyframeRule.h (176156 => 176157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/WebKitCSSKeyframeRule.h 2014-11-15 18:57:31 UTC (rev 176156)
+++ trunk/Source/WebCore/css/WebKitCSSKeyframeRule.h 2014-11-15 23:02:43 UTC (rev 176157)
</span><span class="lines">@@ -1,93 +0,0 @@
</span><del>-/*
- * Copyright (C) 2007, 2008, 2012 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WebKitCSSKeyframeRule_h
-#define WebKitCSSKeyframeRule_h
-
-#include "CSSRule.h"
-#include "StyleProperties.h"
-
-namespace WebCore {
-
-class CSSStyleDeclaration;
-class StyleRuleCSSStyleDeclaration;
-class WebKitCSSKeyframesRule;
-
-class StyleKeyframe : public RefCounted<StyleKeyframe> {
- WTF_MAKE_FAST_ALLOCATED;
-public:
- static PassRefPtr<StyleKeyframe> create(PassRef<StyleProperties> properties)
- {
- return adoptRef(new StyleKeyframe(WTF::move(properties)));
- }
- ~StyleKeyframe();
-
- String keyText() const { return m_key; }
- void setKeyText(const String& s) { m_key = s; }
-
- void getKeys(Vector<double>& keys) const { parseKeyString(m_key, keys); }
-
- const StyleProperties& properties() const { return m_properties; }
- MutableStyleProperties& mutableProperties();
-
- String cssText() const;
-
-private:
- explicit StyleKeyframe(PassRef<StyleProperties>);
-
- static void parseKeyString(const String&, Vector<double>& keys);
-
- Ref<StyleProperties> m_properties;
- // FIXME: This should be a parsed vector of floats.
- // comma separated list of keys
- String m_key;
-};
-
-class WebKitCSSKeyframeRule final : public CSSRule {
-public:
- virtual ~WebKitCSSKeyframeRule();
-
- virtual String cssText() const override { return m_keyframe->cssText(); }
- virtual void reattach(StyleRuleBase&) override;
-
- String keyText() const { return m_keyframe->keyText(); }
- void setKeyText(const String& s) { m_keyframe->setKeyText(s); }
-
- CSSStyleDeclaration& style();
-
-private:
- WebKitCSSKeyframeRule(StyleKeyframe&, WebKitCSSKeyframesRule* parent);
-
- virtual CSSRule::Type type() const override { return WEBKIT_KEYFRAME_RULE; }
-
- Ref<StyleKeyframe> m_keyframe;
- mutable RefPtr<StyleRuleCSSStyleDeclaration> m_propertiesCSSOMWrapper;
-
- friend class WebKitCSSKeyframesRule;
-};
-
-} // namespace WebCore
-
-#endif // WebKitCSSKeyframeRule_h
</del></span></pre></div>
<a id="trunkSourceWebCorecssWebKitCSSKeyframeRuleidl"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/css/WebKitCSSKeyframeRule.idl (176156 => 176157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/WebKitCSSKeyframeRule.idl 2014-11-15 18:57:31 UTC (rev 176156)
+++ trunk/Source/WebCore/css/WebKitCSSKeyframeRule.idl 2014-11-15 23:02:43 UTC (rev 176157)
</span><span class="lines">@@ -1,36 +0,0 @@
</span><del>-/*
- * Copyright (C) 2008 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Apple Inc. ("Apple") nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-// Introduced in DOM Level ?:
-interface WebKitCSSKeyframeRule : CSSRule {
-
- attribute DOMString keyText;
- readonly attribute CSSStyleDeclaration style;
-
-};
-
</del></span></pre></div>
<a id="trunkSourceWebCorecssWebKitCSSKeyframesRulecpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/css/WebKitCSSKeyframesRule.cpp (176156 => 176157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/WebKitCSSKeyframesRule.cpp 2014-11-15 18:57:31 UTC (rev 176156)
+++ trunk/Source/WebCore/css/WebKitCSSKeyframesRule.cpp 2014-11-15 23:02:43 UTC (rev 176157)
</span><span class="lines">@@ -1,211 +0,0 @@
</span><del>-/*
- * Copyright (C) 2007, 2008, 2012, 2013 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "WebKitCSSKeyframesRule.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 {
-
-StyleRuleKeyframes::StyleRuleKeyframes()
- : StyleRuleBase(Keyframes, 0)
-{
-}
-
-StyleRuleKeyframes::StyleRuleKeyframes(const StyleRuleKeyframes& o)
- : StyleRuleBase(o)
- , m_keyframes(o.m_keyframes)
- , m_name(o.m_name)
-{
-}
-
-StyleRuleKeyframes::~StyleRuleKeyframes()
-{
-}
-
-void StyleRuleKeyframes::parserAppendKeyframe(PassRefPtr<StyleKeyframe> keyframe)
-{
- if (!keyframe)
- return;
- m_keyframes.append(keyframe);
-}
-
-void StyleRuleKeyframes::wrapperAppendKeyframe(PassRefPtr<StyleKeyframe> keyframe)
-{
- m_keyframes.append(keyframe);
-}
-
-void StyleRuleKeyframes::wrapperRemoveKeyframe(unsigned index)
-{
- m_keyframes.remove(index);
-}
-
-int StyleRuleKeyframes::findKeyframeIndex(const String& key) const
-{
- String percentageString;
- if (equalIgnoringCase(key, "from"))
- percentageString = ASCIILiteral("0%");
- else if (equalIgnoringCase(key, "to"))
- percentageString = ASCIILiteral("100%");
- else
- percentageString = key;
-
- for (unsigned i = 0; i < m_keyframes.size(); ++i) {
- if (m_keyframes[i]->keyText() == percentageString)
- return i;
- }
- return -1;
-}
-
-WebKitCSSKeyframesRule::WebKitCSSKeyframesRule(StyleRuleKeyframes& keyframesRule, CSSStyleSheet* parent)
- : CSSRule(parent)
- , m_keyframesRule(keyframesRule)
- , m_childRuleCSSOMWrappers(keyframesRule.keyframes().size())
-{
-}
-
-WebKitCSSKeyframesRule::~WebKitCSSKeyframesRule()
-{
- ASSERT(m_childRuleCSSOMWrappers.size() == m_keyframesRule->keyframes().size());
-
- for (unsigned i = 0; i < m_childRuleCSSOMWrappers.size(); ++i) {
- if (m_childRuleCSSOMWrappers[i])
- m_childRuleCSSOMWrappers[i]->setParentRule(0);
- }
-}
-
-void WebKitCSSKeyframesRule::setName(const String& name)
-{
- CSSStyleSheet::RuleMutationScope mutationScope(this);
-
- m_keyframesRule->setName(name);
-}
-
-void WebKitCSSKeyframesRule::appendRule(const String& ruleText)
-{
- if (CSSStyleSheet* parent = parentStyleSheet()) {
- if (Document* ownerDocument = parent->ownerDocument())
- ownerDocument->addConsoleMessage(MessageSource::JS, MessageLevel::Warning, ASCIILiteral("CSSKeyframesRule 'appendRule' function is deprecated. Use 'insertRule' instead."));
- }
- insertRule(ruleText);
-}
-
-void WebKitCSSKeyframesRule::insertRule(const String& ruleText)
-{
- ASSERT(m_childRuleCSSOMWrappers.size() == m_keyframesRule->keyframes().size());
-
- CSSParser parser(parserContext());
- CSSStyleSheet* styleSheet = parentStyleSheet();
- RefPtr<StyleKeyframe> keyframe = parser.parseKeyframeRule(styleSheet ? &styleSheet->contents() : nullptr, ruleText);
- if (!keyframe)
- return;
-
- CSSStyleSheet::RuleMutationScope mutationScope(this);
-
- m_keyframesRule->wrapperAppendKeyframe(keyframe);
-
- m_childRuleCSSOMWrappers.grow(length());
-}
-
-void WebKitCSSKeyframesRule::deleteRule(const String& s)
-{
- ASSERT(m_childRuleCSSOMWrappers.size() == m_keyframesRule->keyframes().size());
-
- int i = m_keyframesRule->findKeyframeIndex(s);
- if (i < 0)
- return;
-
- CSSStyleSheet::RuleMutationScope mutationScope(this);
-
- m_keyframesRule->wrapperRemoveKeyframe(i);
-
- if (m_childRuleCSSOMWrappers[i])
- m_childRuleCSSOMWrappers[i]->setParentRule(0);
- m_childRuleCSSOMWrappers.remove(i);
-}
-
-WebKitCSSKeyframeRule* WebKitCSSKeyframesRule::findRule(const String& s)
-{
- int i = m_keyframesRule->findKeyframeIndex(s);
- return (i >= 0) ? item(i) : 0;
-}
-
-String WebKitCSSKeyframesRule::cssText() const
-{
- StringBuilder result;
- result.appendLiteral("@-webkit-keyframes ");
- result.append(name());
- result.appendLiteral(" { \n");
-
- unsigned size = length();
- for (unsigned i = 0; i < size; ++i) {
- result.appendLiteral(" ");
- result.append(m_keyframesRule->keyframes()[i]->cssText());
- result.append('\n');
- }
- result.append('}');
- return result.toString();
-}
-
-unsigned WebKitCSSKeyframesRule::length() const
-{
- return m_keyframesRule->keyframes().size();
-}
-
-WebKitCSSKeyframeRule* WebKitCSSKeyframesRule::item(unsigned index) const
-{
- if (index >= length())
- return 0;
-
- ASSERT(m_childRuleCSSOMWrappers.size() == m_keyframesRule->keyframes().size());
- RefPtr<WebKitCSSKeyframeRule>& rule = m_childRuleCSSOMWrappers[index];
- if (!rule)
- rule = adoptRef(new WebKitCSSKeyframeRule(*m_keyframesRule->keyframes()[index], const_cast<WebKitCSSKeyframesRule*>(this)));
-
- return rule.get();
-}
-
-CSSRuleList& WebKitCSSKeyframesRule::cssRules()
-{
- if (!m_ruleListCSSOMWrapper)
- m_ruleListCSSOMWrapper = std::make_unique<LiveCSSRuleList<WebKitCSSKeyframesRule>>(this);
- return *m_ruleListCSSOMWrapper;
-}
-
-void WebKitCSSKeyframesRule::reattach(StyleRuleBase& rule)
-{
- ASSERT_WITH_SECURITY_IMPLICATION(rule.isKeyframesRule());
- m_keyframesRule = static_cast<StyleRuleKeyframes&>(rule);
-}
-
-} // namespace WebCore
</del></span></pre></div>
<a id="trunkSourceWebCorecssWebKitCSSKeyframesRuleh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/css/WebKitCSSKeyframesRule.h (176156 => 176157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/WebKitCSSKeyframesRule.h 2014-11-15 18:57:31 UTC (rev 176156)
+++ trunk/Source/WebCore/css/WebKitCSSKeyframesRule.h 2014-11-15 23:02:43 UTC (rev 176157)
</span><span class="lines">@@ -1,104 +0,0 @@
</span><del>-/*
- * Copyright (C) 2007, 2008, 2012 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WebKitCSSKeyframesRule_h
-#define WebKitCSSKeyframesRule_h
-
-#include "CSSRule.h"
-#include "StyleRule.h"
-#include <memory>
-#include <wtf/Forward.h>
-#include <wtf/text/AtomicString.h>
-
-namespace WebCore {
-
-class CSSRuleList;
-class StyleKeyframe;
-class WebKitCSSKeyframeRule;
-
-class StyleRuleKeyframes : public StyleRuleBase {
-public:
- static PassRef<StyleRuleKeyframes> create() { return adoptRef(*new StyleRuleKeyframes()); }
-
- ~StyleRuleKeyframes();
-
- const Vector<RefPtr<StyleKeyframe>>& keyframes() const { return m_keyframes; }
-
- void parserAppendKeyframe(PassRefPtr<StyleKeyframe>);
- void wrapperAppendKeyframe(PassRefPtr<StyleKeyframe>);
- void wrapperRemoveKeyframe(unsigned);
-
- String name() const { return m_name; }
- void setName(const String& name) { m_name = AtomicString(name); }
-
- int findKeyframeIndex(const String& key) const;
-
- PassRef<StyleRuleKeyframes> copy() const { return adoptRef(*new StyleRuleKeyframes(*this)); }
-
-private:
- StyleRuleKeyframes();
- StyleRuleKeyframes(const StyleRuleKeyframes&);
-
- Vector<RefPtr<StyleKeyframe>> m_keyframes;
- AtomicString m_name;
-};
-
-class WebKitCSSKeyframesRule final : public CSSRule {
-public:
- static PassRefPtr<WebKitCSSKeyframesRule> create(StyleRuleKeyframes& rule, CSSStyleSheet* sheet) { return adoptRef(new WebKitCSSKeyframesRule(rule, sheet)); }
-
- virtual ~WebKitCSSKeyframesRule();
-
- virtual CSSRule::Type type() const override { return WEBKIT_KEYFRAMES_RULE; }
- virtual String cssText() const override;
- virtual void reattach(StyleRuleBase&) override;
-
- String name() const { return m_keyframesRule->name(); }
- void setName(const String&);
-
- CSSRuleList& cssRules();
-
- void insertRule(const String& rule);
- void appendRule(const String& rule);
- void deleteRule(const String& key);
- WebKitCSSKeyframeRule* findRule(const String& key);
-
- // For IndexedGetter and CSSRuleList.
- unsigned length() const;
- WebKitCSSKeyframeRule* item(unsigned index) const;
-
-private:
- WebKitCSSKeyframesRule(StyleRuleKeyframes&, CSSStyleSheet* parent);
-
- Ref<StyleRuleKeyframes> m_keyframesRule;
- mutable Vector<RefPtr<WebKitCSSKeyframeRule>> m_childRuleCSSOMWrappers;
- mutable std::unique_ptr<CSSRuleList> m_ruleListCSSOMWrapper;
-};
-
-} // namespace WebCore
-
-SPECIALIZE_TYPE_TRAITS_CSS_RULE(WebKitCSSKeyframesRule, CSSRule::WEBKIT_KEYFRAMES_RULE)
-
-#endif // WebKitCSSKeyframesRule_h
</del></span></pre></div>
<a id="trunkSourceWebCorecssWebKitCSSKeyframesRuleidl"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/css/WebKitCSSKeyframesRule.idl (176156 => 176157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/WebKitCSSKeyframesRule.idl 2014-11-15 18:57:31 UTC (rev 176156)
+++ trunk/Source/WebCore/css/WebKitCSSKeyframesRule.idl 2014-11-15 23:02:43 UTC (rev 176157)
</span><span class="lines">@@ -1,42 +0,0 @@
</span><del>-/*
- * Copyright (C) 2008 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Apple Inc. ("Apple") nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-// Introduced in DOM Level ?:
-interface WebKitCSSKeyframesRule : CSSRule {
-
- [TreatReturnedNullStringAs=Null, TreatNullAs=NullString] attribute DOMString name;
- readonly attribute CSSRuleList cssRules;
-
- 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);
-
- getter WebKitCSSKeyframeRule (unsigned long index);
-};
-
</del></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorStyleSheetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp (176156 => 176157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp 2014-11-15 18:57:31 UTC (rev 176156)
+++ trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp 2014-11-15 23:02:43 UTC (rev 176157)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #include "InspectorStyleSheet.h"
</span><span class="cx">
</span><span class="cx"> #include "CSSImportRule.h"
</span><ins>+#include "CSSKeyframesRule.h"
</ins><span class="cx"> #include "CSSMediaRule.h"
</span><span class="cx"> #include "CSSParser.h"
</span><span class="cx"> #include "CSSPropertyNames.h"
</span><span class="lines">@@ -56,7 +57,6 @@
</span><span class="cx"> #include "StyleRuleImport.h"
</span><span class="cx"> #include "StyleSheetContents.h"
</span><span class="cx"> #include "StyleSheetList.h"
</span><del>-#include "WebKitCSSKeyframesRule.h"
</del><span class="cx"> #include <inspector/ContentSearchUtilities.h>
</span><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx"> #include <yarr/RegularExpression.h>
</span><span class="lines">@@ -213,8 +213,8 @@
</span><span class="cx"> if (is<CSSMediaRule>(*rule))
</span><span class="cx"> return &downcast<CSSMediaRule>(*rule).cssRules();
</span><span class="cx">
</span><del>- if (is<WebKitCSSKeyframesRule>(*rule))
- return &downcast<WebKitCSSKeyframesRule>(*rule).cssRules();
</del><ins>+ if (is<CSSKeyframesRule>(*rule))
+ return &downcast<CSSKeyframesRule>(*rule).cssRules();
</ins><span class="cx">
</span><span class="cx"> if (is<CSSSupportsRule>(*rule))
</span><span class="cx"> return &downcast<CSSSupportsRule>(*rule).cssRules();
</span></span></pre>
</div>
</div>
</body>
</html>