Remove old WebKit Animation API code
https://bugs.webkit.org/show_bug.cgi?id=104611
Reviewed by Simon Fraser.
Remove the existing, unused animation API code. We'll look into
implementing the W3C Animation API if/when it is stable.
Source/WebCore:
* CMakeLists.txt: Remove WebKitAnimation and WebKitAnimationList classes.
* DerivedSources.cpp:
* DerivedSources.make:
* DerivedSources.pri:
* GNUmakefile.list.am:
* Target.pri:
* UseJSC.cmake:
* UseV8.cmake:
* WebCore.gypi:
* WebCore.vcproj/WebCore.vcproj:
* WebCore.xcodeproj/project.pbxproj:
* bindings/js/JSBindingsAllInOne.cpp: Remove includes.
* bindings/js/JSWebKitAnimationCustom.cpp: Removed.
* bindings/js/JSWebKitAnimationListCustom.cpp: Removed.
* dom/Element.cpp: Remove API.
* dom/Element.h: Ditto.
* dom/Element.idl: Ditto.
* page/DOMWindow.idl: Ditto.
* page/WebKitAnimation.cpp: Removed.
* page/WebKitAnimation.h: Removed.
* page/WebKitAnimation.idl: Removed.
* page/WebKitAnimationList.cpp: Removed.
* page/WebKitAnimationList.h: Removed.
* page/WebKitAnimationList.idl: Removed.
* page/animation/AnimationController.cpp: Remove API.
* page/animation/AnimationController.h: Ditto.
* page/animation/AnimationControllerPrivate.h: Ditto.
* page/animation/CompositeAnimation.cpp: Ditto.
* page/animation/CompositeAnimation.h: Ditto.
LayoutTests:
* animations/animation-api-1-expected.txt: Removed.
* animations/animation-api-1.html: Removed.
* fast/js/global-constructors-expected.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@137243 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 3a26d02..e66a8f5 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2012-12-10 Dean Jackson <dino@apple.com>
+
+ Remove old WebKit Animation API code
+ https://bugs.webkit.org/show_bug.cgi?id=104611
+
+ Reviewed by Simon Fraser.
+
+ Remove the existing, unused animation API code. We'll look into
+ implementing the W3C Animation API if/when it is stable.
+
+ * animations/animation-api-1-expected.txt: Removed.
+ * animations/animation-api-1.html: Removed.
+ * fast/js/global-constructors-expected.txt:
+
2012-12-10 Kangil Han <kangil.han@samsung.com>
[EFL] Rebaseline expected results for "visibility:hidden; position: absolute;" cases
diff --git a/LayoutTests/animations/animation-api-1-expected.txt b/LayoutTests/animations/animation-api-1-expected.txt
deleted file mode 100644
index 29c0842..0000000
--- a/LayoutTests/animations/animation-api-1-expected.txt
+++ /dev/null
@@ -1,77 +0,0 @@
-This tests the WebKitAnimation interface.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS window.WebKitAnimation is defined.
-PASS window.WebKitAnimationList is defined.
-
-Test an almost-default animation
-PASS a_animations.length is 1
-PASS a_animation_0 is defined.
-
-PASS a_animation_0.name is 'test1'
-PASS a_animation_0.duration is 1
-PASS a_animation_0.delay is 0
-PASS a_animation_0.iterationCount is 1
-PASS a_animation_0.paused is false
-PASS a_animation_0.ended is false
-PASS a_animation_0.direction is window.WebKitAnimation.DIRECTION_NORMAL
-PASS a_animation_0.fillMode is window.WebKitAnimation.FILL_NONE
-
-Test a specified animation
-PASS b_animations.length is 1
-PASS b_animation_0 is defined.
-
-PASS b_animation_0.name is 'test1'
-PASS b_animation_0.duration is 2
-PASS b_animation_0.delay is 3
-PASS b_animation_0.iterationCount is 4
-PASS b_animation_0.paused is false
-PASS b_animation_0.ended is false
-PASS b_animation_0.direction is window.WebKitAnimation.DIRECTION_NORMAL
-PASS b_animation_0.fillMode is window.WebKitAnimation.FILL_NONE
-
-Test negative delay, fill mode, direction and infinite iterations
-PASS c_animations.length is 1
-PASS c_animation_0 is defined.
-
-PASS c_animation_0.name is 'test2'
-PASS c_animation_0.duration is 5
-PASS c_animation_0.delay is -1
-PASS c_animation_0.iterationCount is Number.POSITIVE_INFINITY
-PASS c_animation_0.paused is false
-PASS c_animation_0.ended is false
-PASS c_animation_0.direction is window.WebKitAnimation.DIRECTION_ALTERNATE
-PASS c_animation_0.fillMode is window.WebKitAnimation.FILL_FORWARDS
-
-Test multiple animations
-PASS d_animations.length is 2
-PASS d_animation_0 is defined.
-
-PASS d_animation_0.name is 'test1'
-PASS d_animation_0.duration is 1
-PASS d_animation_0.delay is 0
-PASS d_animation_0.iterationCount is 10
-PASS d_animation_0.paused is false
-PASS d_animation_0.ended is false
-PASS d_animation_0.direction is window.WebKitAnimation.DIRECTION_NORMAL
-PASS d_animation_0.fillMode is window.WebKitAnimation.FILL_BACKWARDS
-PASS d_animation_1 is defined.
-
-PASS d_animation_1.name is 'test2'
-PASS d_animation_1.duration is 2
-PASS d_animation_1.delay is 1
-PASS d_animation_1.iterationCount is Number.POSITIVE_INFINITY
-PASS d_animation_1.paused is false
-PASS d_animation_1.ended is false
-PASS d_animation_1.direction is window.WebKitAnimation.DIRECTION_ALTERNATE
-PASS d_animation_1.fillMode is window.WebKitAnimation.FILL_BOTH
-
-Test element with no animations
-PASS e_animations is null
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/animations/animation-api-1.html b/LayoutTests/animations/animation-api-1.html
deleted file mode 100644
index f6052cf..0000000
--- a/LayoutTests/animations/animation-api-1.html
+++ /dev/null
@@ -1,183 +0,0 @@
-<html>
-<head>
-<style type="text/css" media="screen">
- @-webkit-keyframes test1 {
- from { left: 10px; }
- to { left: 20px; }
- }
- @-webkit-keyframes test2 {
- 0% { left: 10px; }
- 50% { left: 30px; }
- 100% { left: 20px; }
- }
- #a {
- -webkit-animation-name: test1;
- -webkit-animation-duration: 1s;
- }
- #b {
- -webkit-animation-name: test1;
- -webkit-animation-duration: 2s;
- -webkit-animation-delay: 3s;
- -webkit-animation-iteration-count: 4;
- -webkit-animation-direction: normal;
- -webkit-animation-fill-mode: none;
- }
- #c {
- -webkit-animation-name: test2;
- -webkit-animation-duration: 5s;
- -webkit-animation-delay: -1s;
- -webkit-animation-iteration-count: infinite;
- -webkit-animation-direction: alternate;
- -webkit-animation-fill-mode: forwards;
- }
- #d {
- -webkit-animation-name: test1, test2;
- -webkit-animation-duration: 1s, 2s;
- -webkit-animation-delay: 0s, 1s;
- -webkit-animation-iteration-count: 10, infinite;
- -webkit-animation-direction: normal, alternate;
- -webkit-animation-fill-mode: backwards, both;
- }
-</style>
-<script src="../fast/js/resources/js-test-pre.js"></script>
-</head>
-<body>
-<div id="a"></div>
-<div id="b"></div>
-<div id="c"></div>
-<div id="d"></div>
-<p id="description"></p>
-<div id="console"></div>
-<script>
-
-description("This tests the WebKitAnimation interface.");
-
-shouldBeDefined("window.WebKitAnimation");
-shouldBeDefined("window.WebKitAnimationList");
-
-/* *********************************************** */
-
-debug("");
-debug("Test an almost-default animation");
-
-var a = document.getElementById("a");
-var a_animations = a.webkitGetAnimations();
-
-shouldBe("a_animations.length", "1");
-
-var a_animation_0 = a_animations[0];
-
-shouldBeDefined("a_animation_0");
-debug("");
-
-shouldBe("a_animation_0.name", "'test1'");
-shouldBe("a_animation_0.duration", "1");
-shouldBe("a_animation_0.delay", "0");
-shouldBe("a_animation_0.iterationCount", "1");
-shouldBe("a_animation_0.paused", "false");
-shouldBe("a_animation_0.ended", "false");
-shouldBe("a_animation_0.direction", "window.WebKitAnimation.DIRECTION_NORMAL");
-shouldBe("a_animation_0.fillMode", "window.WebKitAnimation.FILL_NONE");
-
-/* *********************************************** */
-
-debug("");
-debug("Test a specified animation");
-
-var b = document.getElementById("b");
-var b_animations = b.webkitGetAnimations();
-
-shouldBe("b_animations.length", "1");
-
-var b_animation_0 = b_animations[0];
-
-shouldBeDefined("b_animation_0");
-debug("");
-
-shouldBe("b_animation_0.name", "'test1'");
-shouldBe("b_animation_0.duration", "2");
-shouldBe("b_animation_0.delay", "3");
-shouldBe("b_animation_0.iterationCount", "4");
-shouldBe("b_animation_0.paused", "false");
-shouldBe("b_animation_0.ended", "false");
-shouldBe("b_animation_0.direction", "window.WebKitAnimation.DIRECTION_NORMAL");
-shouldBe("b_animation_0.fillMode", "window.WebKitAnimation.FILL_NONE");
-
-/* *********************************************** */
-
-debug("");
-debug("Test negative delay, fill mode, direction and infinite iterations");
-
-var c = document.getElementById("c");
-var c_animations = c.webkitGetAnimations();
-
-shouldBe("c_animations.length", "1");
-
-var c_animation_0 = c_animations[0];
-
-shouldBeDefined("c_animation_0");
-debug("");
-
-shouldBe("c_animation_0.name", "'test2'");
-shouldBe("c_animation_0.duration", "5");
-shouldBe("c_animation_0.delay", "-1");
-shouldBe("c_animation_0.iterationCount", "Number.POSITIVE_INFINITY");
-shouldBe("c_animation_0.paused", "false");
-shouldBe("c_animation_0.ended", "false");
-shouldBe("c_animation_0.direction", "window.WebKitAnimation.DIRECTION_ALTERNATE");
-shouldBe("c_animation_0.fillMode", "window.WebKitAnimation.FILL_FORWARDS");
-
-/* *********************************************** */
-
-debug("");
-debug("Test multiple animations");
-
-var d = document.getElementById("d");
-var d_animations = d.webkitGetAnimations();
-
-shouldBe("d_animations.length", "2");
-
-var d_animation_0 = d_animations[0];
-
-shouldBeDefined("d_animation_0");
-debug("");
-
-shouldBe("d_animation_0.name", "'test1'");
-shouldBe("d_animation_0.duration", "1");
-shouldBe("d_animation_0.delay", "0");
-shouldBe("d_animation_0.iterationCount", "10");
-shouldBe("d_animation_0.paused", "false");
-shouldBe("d_animation_0.ended", "false");
-shouldBe("d_animation_0.direction", "window.WebKitAnimation.DIRECTION_NORMAL");
-shouldBe("d_animation_0.fillMode", "window.WebKitAnimation.FILL_BACKWARDS");
-
-var d_animation_1 = d_animations[1];
-
-shouldBeDefined("d_animation_1");
-debug("");
-
-shouldBe("d_animation_1.name", "'test2'");
-shouldBe("d_animation_1.duration", "2");
-shouldBe("d_animation_1.delay", "1");
-shouldBe("d_animation_1.iterationCount", "Number.POSITIVE_INFINITY");
-shouldBe("d_animation_1.paused", "false");
-shouldBe("d_animation_1.ended", "false");
-shouldBe("d_animation_1.direction", "window.WebKitAnimation.DIRECTION_ALTERNATE");
-shouldBe("d_animation_1.fillMode", "window.WebKitAnimation.FILL_BOTH");
-
-/* *********************************************** */
-
-debug("");
-debug("Test element with no animations");
-
-var e = document.getElementById("description");
-var e_animations = e.webkitGetAnimations();
-
-shouldBeNull("e_animations");
-
-debug("");
-
-</script>
-<script src="../fast/js/resources/js-test-post.js"></script>
-</body>
-</html>
diff --git a/LayoutTests/fast/js/global-constructors-expected.txt b/LayoutTests/fast/js/global-constructors-expected.txt
index c2728d4..7ba07bb 100644
--- a/LayoutTests/fast/js/global-constructors-expected.txt
+++ b/LayoutTests/fast/js/global-constructors-expected.txt
@@ -320,9 +320,7 @@
PASS TrackEvent.toString() is '[object TrackEventConstructor]'
PASS UIEvent.toString() is '[object UIEventConstructor]'
PASS URL.toString() is '[object URLConstructor]'
-PASS WebKitAnimation.toString() is '[object WebKitAnimationConstructor]'
PASS WebKitAnimationEvent.toString() is '[object WebKitAnimationEventConstructor]'
-PASS WebKitAnimationList.toString() is '[object WebKitAnimationListConstructor]'
PASS WebKitCSSKeyframeRule.toString() is '[object WebKitCSSKeyframeRuleConstructor]'
PASS WebKitCSSKeyframesRule.toString() is '[object WebKitCSSKeyframesRuleConstructor]'
PASS WebKitCSSMatrix.toString() is '[object WebKitCSSMatrixConstructor]'
diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt
index a3a0d86..f3dca4a 100644
--- a/Source/WebCore/CMakeLists.txt
+++ b/Source/WebCore/CMakeLists.txt
@@ -585,8 +585,6 @@
page/SpeechInputEvent.idl
page/SpeechInputResult.idl
page/SpeechInputResultList.idl
- page/WebKitAnimation.idl
- page/WebKitAnimationList.idl
page/WebKitPoint.idl
page/WorkerNavigator.idl
@@ -1769,8 +1767,6 @@
page/SpatialNavigation.cpp
page/SuspendableTimer.cpp
page/UserContentURLPattern.cpp
- page/WebKitAnimation.cpp
- page/WebKitAnimationList.cpp
page/WindowFeatures.cpp
page/WindowFocusAllowedIndicator.cpp
page/WorkerNavigator.cpp
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 3f1860e..92e077e 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,43 @@
+2012-12-10 Dean Jackson <dino@apple.com>
+
+ Remove old WebKit Animation API code
+ https://bugs.webkit.org/show_bug.cgi?id=104611
+
+ Reviewed by Simon Fraser.
+
+ Remove the existing, unused animation API code. We'll look into
+ implementing the W3C Animation API if/when it is stable.
+
+ * CMakeLists.txt: Remove WebKitAnimation and WebKitAnimationList classes.
+ * DerivedSources.cpp:
+ * DerivedSources.make:
+ * DerivedSources.pri:
+ * GNUmakefile.list.am:
+ * Target.pri:
+ * UseJSC.cmake:
+ * UseV8.cmake:
+ * WebCore.gypi:
+ * WebCore.vcproj/WebCore.vcproj:
+ * WebCore.xcodeproj/project.pbxproj:
+ * bindings/js/JSBindingsAllInOne.cpp: Remove includes.
+ * bindings/js/JSWebKitAnimationCustom.cpp: Removed.
+ * bindings/js/JSWebKitAnimationListCustom.cpp: Removed.
+ * dom/Element.cpp: Remove API.
+ * dom/Element.h: Ditto.
+ * dom/Element.idl: Ditto.
+ * page/DOMWindow.idl: Ditto.
+ * page/WebKitAnimation.cpp: Removed.
+ * page/WebKitAnimation.h: Removed.
+ * page/WebKitAnimation.idl: Removed.
+ * page/WebKitAnimationList.cpp: Removed.
+ * page/WebKitAnimationList.h: Removed.
+ * page/WebKitAnimationList.idl: Removed.
+ * page/animation/AnimationController.cpp: Remove API.
+ * page/animation/AnimationController.h: Ditto.
+ * page/animation/AnimationControllerPrivate.h: Ditto.
+ * page/animation/CompositeAnimation.cpp: Ditto.
+ * page/animation/CompositeAnimation.h: Ditto.
+
2012-12-10 Jessie Berlin <jberlin@apple.com>
Fix the Mac build after r137233
diff --git a/Source/WebCore/DerivedSources.cpp b/Source/WebCore/DerivedSources.cpp
index 15ba265..077e09e 100644
--- a/Source/WebCore/DerivedSources.cpp
+++ b/Source/WebCore/DerivedSources.cpp
@@ -479,9 +479,7 @@
#include "JSUIEvent.cpp"
#include "JSValidityState.cpp"
#include "JSVoidCallback.cpp"
-#include "JSWebKitAnimation.cpp"
#include "JSWebKitAnimationEvent.cpp"
-#include "JSWebKitAnimationList.cpp"
#if ENABLE(CSS_FILTERS)
#include "JSWebKitCSSFilterValue.cpp"
#endif
diff --git a/Source/WebCore/DerivedSources.make b/Source/WebCore/DerivedSources.make
index 108411b..7be0d6a 100644
--- a/Source/WebCore/DerivedSources.make
+++ b/Source/WebCore/DerivedSources.make
@@ -434,8 +434,6 @@
$(WebCore)/page/SpeechInputEvent.idl \
$(WebCore)/page/SpeechInputResult.idl \
$(WebCore)/page/SpeechInputResultList.idl \
- $(WebCore)/page/WebKitAnimation.idl \
- $(WebCore)/page/WebKitAnimationList.idl \
$(WebCore)/page/WebKitPoint.idl \
$(WebCore)/page/WorkerNavigator.idl \
$(WebCore)/plugins/DOMMimeType.idl \
diff --git a/Source/WebCore/DerivedSources.pri b/Source/WebCore/DerivedSources.pri
index 178fda5..c157a52 100644
--- a/Source/WebCore/DerivedSources.pri
+++ b/Source/WebCore/DerivedSources.pri
@@ -447,8 +447,6 @@
$$PWD/page/SpeechInputEvent.idl \
$$PWD/page/SpeechInputResult.idl \
$$PWD/page/SpeechInputResultList.idl \
- $$PWD/page/WebKitAnimation.idl \
- $$PWD/page/WebKitAnimationList.idl \
$$PWD/page/WebKitPoint.idl \
$$PWD/page/WorkerNavigator.idl \
$$PWD/plugins/DOMPlugin.idl \
diff --git a/Source/WebCore/GNUmakefile.list.am b/Source/WebCore/GNUmakefile.list.am
index 5f5caa1..1009a27 100644
--- a/Source/WebCore/GNUmakefile.list.am
+++ b/Source/WebCore/GNUmakefile.list.am
@@ -795,11 +795,7 @@
DerivedSources/WebCore/JSWebGLUniformLocation.h \
DerivedSources/WebCore/JSWebGLVertexArrayObjectOES.cpp \
DerivedSources/WebCore/JSWebGLVertexArrayObjectOES.h \
- DerivedSources/WebCore/JSWebKitAnimation.cpp \
- DerivedSources/WebCore/JSWebKitAnimation.h \
DerivedSources/WebCore/JSWebKitAnimationEvent.cpp \
- DerivedSources/WebCore/JSWebKitAnimationList.h \
- DerivedSources/WebCore/JSWebKitAnimationList.cpp \
DerivedSources/WebCore/JSWebKitAnimationEvent.h \
DerivedSources/WebCore/JSWebKitCSSFilterValue.cpp \
DerivedSources/WebCore/JSWebKitCSSFilterValue.h \
@@ -1585,8 +1581,6 @@
$(WebCore)/page/SpeechInputEvent.idl \
$(WebCore)/page/SpeechInputResult.idl \
$(WebCore)/page/SpeechInputResultList.idl \
- $(WebCore)/page/WebKitAnimation.idl \
- $(WebCore)/page/WebKitAnimationList.idl \
$(WebCore)/page/WebKitPoint.idl \
$(WebCore)/page/WorkerNavigator.idl \
$(WebCore)/plugins/DOMMimeType.idl \
@@ -2399,8 +2393,6 @@
Source/WebCore/bindings/js/JSTrackCustom.h \
Source/WebCore/bindings/js/JSTrackEventCustom.cpp \
Source/WebCore/bindings/js/JSTreeWalkerCustom.cpp \
- Source/WebCore/bindings/js/JSWebKitAnimationCustom.cpp \
- Source/WebCore/bindings/js/JSWebKitAnimationListCustom.cpp \
Source/WebCore/bindings/js/JSWebKitCSSKeyframeRuleCustom.cpp \
Source/WebCore/bindings/js/JSWebKitCSSKeyframesRuleCustom.cpp \
Source/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp \
@@ -4160,10 +4152,6 @@
Source/WebCore/page/UserStyleSheetTypes.h \
Source/WebCore/page/ValidationMessageClient.h \
Source/WebCore/page/WebCoreKeyboardUIMode.h \
- Source/WebCore/page/WebKitAnimation.h \
- Source/WebCore/page/WebKitAnimation.cpp \
- Source/WebCore/page/WebKitAnimationList.h \
- Source/WebCore/page/WebKitAnimationList.cpp \
Source/WebCore/page/WebKitPoint.h \
Source/WebCore/page/WindowFeatures.cpp \
Source/WebCore/page/WindowFeatures.h \
diff --git a/Source/WebCore/Target.pri b/Source/WebCore/Target.pri
index b03bb12..cc2460f 100644
--- a/Source/WebCore/Target.pri
+++ b/Source/WebCore/Target.pri
@@ -181,8 +181,6 @@
bindings/js/JSTouchCustom.cpp \
bindings/js/JSTouchListCustom.cpp \
bindings/js/JSTreeWalkerCustom.cpp \
- bindings/js/JSWebKitAnimationCustom.cpp \
- bindings/js/JSWebKitAnimationListCustom.cpp \
bindings/js/JSWebKitCSSKeyframeRuleCustom.cpp \
bindings/js/JSWebKitCSSKeyframesRuleCustom.cpp \
bindings/js/JSWebKitPointCustom.cpp \
@@ -878,8 +876,6 @@
page/animation/CSSPropertyAnimation.cpp \
page/animation/ImplicitAnimation.cpp \
page/animation/KeyframeAnimation.cpp \
- page/WebKitAnimation.cpp \
- page/WebKitAnimationList.cpp \
page/BarInfo.cpp \
page/Chrome.cpp \
page/Console.cpp \
@@ -2072,8 +2068,6 @@
page/SpeechInputResultList.h \
page/TouchAdjustment.h \
page/ValidationMessageClient.h \
- page/WebKitAnimation.h \
- page/WebKitAnimationList.h \
page/WindowFeatures.h \
page/WindowFocusAllowedIndicator.h \
page/WorkerNavigator.h \
diff --git a/Source/WebCore/UseJSC.cmake b/Source/WebCore/UseJSC.cmake
index e30b618..89ff8cb 100644
--- a/Source/WebCore/UseJSC.cmake
+++ b/Source/WebCore/UseJSC.cmake
@@ -132,8 +132,6 @@
bindings/js/JSTouchCustom.cpp
bindings/js/JSTouchListCustom.cpp
bindings/js/JSTreeWalkerCustom.cpp
- bindings/js/JSWebKitAnimationCustom.cpp
- bindings/js/JSWebKitAnimationListCustom.cpp
bindings/js/JSWebKitCSSKeyframeRuleCustom.cpp
bindings/js/JSWebKitCSSKeyframesRuleCustom.cpp
bindings/js/JSWebKitPointCustom.cpp
diff --git a/Source/WebCore/UseV8.cmake b/Source/WebCore/UseV8.cmake
index 7d67f16..de4e715 100644
--- a/Source/WebCore/UseV8.cmake
+++ b/Source/WebCore/UseV8.cmake
@@ -147,7 +147,6 @@
bindings/v8/custom/V8StyleSheetCustom.cpp
bindings/v8/custom/V8StyleSheetListCustom.cpp
bindings/v8/custom/V8WebGLRenderingContextCustom.cpp
- bindings/v8/custom/V8WebKitAnimationCustom.cpp
bindings/v8/custom/V8WebKitPointCustom.cpp
bindings/v8/custom/V8WorkerContextCustom.cpp
bindings/v8/custom/V8WorkerCustom.cpp
diff --git a/Source/WebCore/WebCore.gypi b/Source/WebCore/WebCore.gypi
index 4443025..dc0218a 100644
--- a/Source/WebCore/WebCore.gypi
+++ b/Source/WebCore/WebCore.gypi
@@ -434,8 +434,6 @@
'page/SpeechInputEvent.idl',
'page/SpeechInputResult.idl',
'page/SpeechInputResultList.idl',
- 'page/WebKitAnimation.idl',
- 'page/WebKitAnimationList.idl',
'page/WebKitPoint.idl',
'page/WorkerNavigator.idl',
'plugins/DOMMimeType.idl',
@@ -1381,7 +1379,6 @@
'bindings/v8/custom/V8StyleSheetListCustom.cpp',
'bindings/v8/custom/V8TrackEventCustom.cpp',
'bindings/v8/custom/V8WebGLRenderingContextCustom.cpp',
- 'bindings/v8/custom/V8WebKitAnimationCustom.cpp',
'bindings/v8/custom/V8WebKitPointCustom.cpp',
'bindings/v8/custom/V8WorkerContextCustom.cpp',
'bindings/v8/custom/V8WorkerCustom.cpp',
@@ -2133,10 +2130,6 @@
'page/TouchDisambiguation.cpp',
'page/TouchDisambiguation.h',
'page/UserContentURLPattern.cpp',
- 'page/WebKitAnimation.cpp',
- 'page/WebKitAnimation.h',
- 'page/WebKitAnimationList.cpp',
- 'page/WebKitAnimationList.h',
'page/WebKitPoint.h',
'page/WindowFeatures.cpp',
'page/WindowFocusAllowedIndicator.cpp',
@@ -5971,13 +5964,9 @@
'<(PRODUCT_DIR)/DerivedSources/WebCore/DOMValidityState.h',
'<(PRODUCT_DIR)/DerivedSources/WebCore/DOMValidityState.mm',
'<(PRODUCT_DIR)/DerivedSources/WebCore/DOMValidityStateInternal.h',
- '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMWebKitAnimation.h',
- '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMWebKitAnimation.mm',
'<(PRODUCT_DIR)/DerivedSources/WebCore/DOMWebKitAnimationEvent.h',
'<(PRODUCT_DIR)/DerivedSources/WebCore/DOMWebKitAnimationEvent.mm',
'<(PRODUCT_DIR)/DerivedSources/WebCore/DOMWebKitAnimationEventInternal.h',
- '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMWebKitAnimationList.h',
- '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMWebKitAnimationList.mm',
'<(PRODUCT_DIR)/DerivedSources/WebCore/DOMWebKitCSSFilterValue.h',
'<(PRODUCT_DIR)/DerivedSources/WebCore/DOMWebKitCSSFilterValue.mm',
'<(PRODUCT_DIR)/DerivedSources/WebCore/DOMWebKitCSSFilterValueInternal.h',
@@ -7029,12 +7018,8 @@
'<(PRODUCT_DIR)/DerivedSources/WebCore/JSWebGLUniformLocation.h',
'<(PRODUCT_DIR)/DerivedSources/WebCore/JSWebGLVertexArrayObjectOES.cpp',
'<(PRODUCT_DIR)/DerivedSources/WebCore/JSWebGLVertexArrayObjectOES.h',
- '<(PRODUCT_DIR)/DerivedSources/WebCore/JSWebKitAnimation.cpp',
- '<(PRODUCT_DIR)/DerivedSources/WebCore/JSWebKitAnimation.h',
'<(PRODUCT_DIR)/DerivedSources/WebCore/JSWebKitAnimationEvent.cpp',
'<(PRODUCT_DIR)/DerivedSources/WebCore/JSWebKitAnimationEvent.h',
- '<(PRODUCT_DIR)/DerivedSources/WebCore/JSWebKitAnimationList.cpp',
- '<(PRODUCT_DIR)/DerivedSources/WebCore/JSWebKitAnimationList.h',
'<(PRODUCT_DIR)/DerivedSources/WebCore/JSWebKitCSSFilterValue.cpp',
'<(PRODUCT_DIR)/DerivedSources/WebCore/JSWebKitCSSFilterValue.h',
'<(PRODUCT_DIR)/DerivedSources/WebCore/JSWebKitCSSKeyframeRule.cpp',
diff --git a/Source/WebCore/WebCore.vcproj/WebCore.vcproj b/Source/WebCore/WebCore.vcproj/WebCore.vcproj
index 64da6dc..e453a6a 100755
--- a/Source/WebCore/WebCore.vcproj/WebCore.vcproj
+++ b/Source/WebCore/WebCore.vcproj/WebCore.vcproj
@@ -22786,62 +22786,6 @@
>
</File>
<File
- RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSWebKitAnimation.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_Cairo_CFLite|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release_Cairo_CFLite|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_All|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Production|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSWebKitAnimation.h"
- >
- </File>
- <File
RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSWebKitAnimationEvent.cpp"
>
<FileConfiguration
@@ -22898,62 +22842,6 @@
>
</File>
<File
- RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSWebKitAnimationList.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_Cairo_CFLite|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release_Cairo_CFLite|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_All|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Production|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSWebKitAnimationList.h"
- >
- </File>
- <File
RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSWebKitCSSFilterValue.cpp"
>
<FileConfiguration
@@ -27414,22 +27302,6 @@
>
</File>
<File
- RelativePath="..\page\WebKitAnimation.cpp"
- >
- </File>
- <File
- RelativePath="..\page\WebKitAnimation.h"
- >
- </File>
- <File
- RelativePath="..\page\WebKitAnimationList.cpp"
- >
- </File>
- <File
- RelativePath="..\page\WebKitAnimationList.h"
- >
- </File>
- <File
RelativePath="..\fileapi\WebKitBlobBuilder.cpp"
>
</File>
@@ -71069,110 +70941,6 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\bindings\js\JSWebKitAnimationCustom.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_Cairo_CFLite|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release_Cairo_CFLite|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_All|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Production|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\bindings\js\JSWebKitAnimationListCustom.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_Cairo_CFLite|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release_Cairo_CFLite|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_All|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Production|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- </File>
- <File
RelativePath="..\bindings\js\JSWebKitCSSKeyframeRuleCustom.cpp"
>
<FileConfiguration
diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
index ccdab97..ac36f82 100644
--- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -917,24 +917,10 @@
316FE1190E6E1DA700BF6088 /* KeyframeAnimation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 316FE10F0E6E1DA700BF6088 /* KeyframeAnimation.cpp */; };
316FE11A0E6E1DA700BF6088 /* KeyframeAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 316FE1100E6E1DA700BF6088 /* KeyframeAnimation.h */; };
31741AAD16636609008A5B7E /* SimulatedClickOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 31741AAB16635E45008A5B7E /* SimulatedClickOptions.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 3194616213020B20004BB3F8 /* JSWebKitAnimation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3194616013020B20004BB3F8 /* JSWebKitAnimation.cpp */; };
- 3194616313020B20004BB3F8 /* JSWebKitAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 3194616113020B20004BB3F8 /* JSWebKitAnimation.h */; };
- 3194616A13020B66004BB3F8 /* DOMWebKitAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 3194616813020B66004BB3F8 /* DOMWebKitAnimation.h */; };
- 3194616B13020B66004BB3F8 /* DOMWebKitAnimation.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3194616913020B66004BB3F8 /* DOMWebKitAnimation.mm */; };
- 319461FE13022BB8004BB3F8 /* JSWebKitAnimationList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 319461FC13022BB8004BB3F8 /* JSWebKitAnimationList.cpp */; };
- 319461FF13022BB8004BB3F8 /* JSWebKitAnimationList.h in Headers */ = {isa = PBXBuildFile; fileRef = 319461FD13022BB8004BB3F8 /* JSWebKitAnimationList.h */; };
- 3194620413022BF1004BB3F8 /* DOMWebKitAnimationList.h in Headers */ = {isa = PBXBuildFile; fileRef = 3194620213022BF1004BB3F8 /* DOMWebKitAnimationList.h */; };
- 3194620513022BF1004BB3F8 /* DOMWebKitAnimationList.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3194620313022BF1004BB3F8 /* DOMWebKitAnimationList.mm */; };
- 3194623213022F65004BB3F8 /* JSWebKitAnimationListCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3194623113022F65004BB3F8 /* JSWebKitAnimationListCustom.cpp */; };
31955A86160D199000858025 /* RenderSnapshottedPlugIn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31E8D8BA160BC94B004CE8F5 /* RenderSnapshottedPlugIn.cpp */; };
31955A88160D199200858025 /* RenderSnapshottedPlugIn.h in Headers */ = {isa = PBXBuildFile; fileRef = 31E8D8BB160BC94C004CE8F5 /* RenderSnapshottedPlugIn.h */; settings = {ATTRIBUTES = (Private, ); }; };
319AE063142D6B24006563A1 /* StyleFilterData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 319AE061142D6B24006563A1 /* StyleFilterData.cpp */; };
319AE064142D6B24006563A1 /* StyleFilterData.h in Headers */ = {isa = PBXBuildFile; fileRef = 319AE062142D6B24006563A1 /* StyleFilterData.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 319E68871327C911004AC91A /* JSWebKitAnimationCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 319E68861327C911004AC91A /* JSWebKitAnimationCustom.cpp */; };
- 319E69B213299BBD004AC91A /* WebKitAnimation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 319E69AC13299BBD004AC91A /* WebKitAnimation.cpp */; };
- 319E69B313299BBD004AC91A /* WebKitAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 319E69AD13299BBD004AC91A /* WebKitAnimation.h */; };
- 319E69B513299BBD004AC91A /* WebKitAnimationList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 319E69AF13299BBD004AC91A /* WebKitAnimationList.cpp */; };
- 319E69B613299BBD004AC91A /* WebKitAnimationList.h in Headers */ = {isa = PBXBuildFile; fileRef = 319E69B013299BBD004AC91A /* WebKitAnimationList.h */; };
319FBD5F15D2F464009640A6 /* CachedImageClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 319FBD5D15D2F444009640A6 /* CachedImageClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
31C0FF210E4CEB6E007D6FE5 /* WebKitAnimationEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31C0FF1B0E4CEB6E007D6FE5 /* WebKitAnimationEvent.cpp */; };
31C0FF220E4CEB6E007D6FE5 /* WebKitAnimationEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 31C0FF1C0E4CEB6E007D6FE5 /* WebKitAnimationEvent.h */; };
@@ -8120,24 +8106,8 @@
316FE10F0E6E1DA700BF6088 /* KeyframeAnimation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = KeyframeAnimation.cpp; path = animation/KeyframeAnimation.cpp; sourceTree = "<group>"; };
316FE1100E6E1DA700BF6088 /* KeyframeAnimation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = KeyframeAnimation.h; path = animation/KeyframeAnimation.h; sourceTree = "<group>"; };
31741AAB16635E45008A5B7E /* SimulatedClickOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SimulatedClickOptions.h; sourceTree = "<group>"; };
- 3194616013020B20004BB3F8 /* JSWebKitAnimation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebKitAnimation.cpp; sourceTree = "<group>"; };
- 3194616113020B20004BB3F8 /* JSWebKitAnimation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWebKitAnimation.h; sourceTree = "<group>"; };
- 3194616813020B66004BB3F8 /* DOMWebKitAnimation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMWebKitAnimation.h; sourceTree = "<group>"; };
- 3194616913020B66004BB3F8 /* DOMWebKitAnimation.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMWebKitAnimation.mm; sourceTree = "<group>"; };
- 319461FC13022BB8004BB3F8 /* JSWebKitAnimationList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebKitAnimationList.cpp; sourceTree = "<group>"; };
- 319461FD13022BB8004BB3F8 /* JSWebKitAnimationList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWebKitAnimationList.h; sourceTree = "<group>"; };
- 3194620213022BF1004BB3F8 /* DOMWebKitAnimationList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMWebKitAnimationList.h; sourceTree = "<group>"; };
- 3194620313022BF1004BB3F8 /* DOMWebKitAnimationList.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMWebKitAnimationList.mm; sourceTree = "<group>"; };
- 3194623113022F65004BB3F8 /* JSWebKitAnimationListCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebKitAnimationListCustom.cpp; sourceTree = "<group>"; };
319AE061142D6B24006563A1 /* StyleFilterData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = StyleFilterData.cpp; path = style/StyleFilterData.cpp; sourceTree = "<group>"; };
319AE062142D6B24006563A1 /* StyleFilterData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StyleFilterData.h; path = style/StyleFilterData.h; sourceTree = "<group>"; };
- 319E68861327C911004AC91A /* JSWebKitAnimationCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebKitAnimationCustom.cpp; sourceTree = "<group>"; };
- 319E69AC13299BBD004AC91A /* WebKitAnimation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebKitAnimation.cpp; sourceTree = "<group>"; };
- 319E69AD13299BBD004AC91A /* WebKitAnimation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKitAnimation.h; sourceTree = "<group>"; };
- 319E69AE13299BBD004AC91A /* WebKitAnimation.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebKitAnimation.idl; sourceTree = "<group>"; };
- 319E69AF13299BBD004AC91A /* WebKitAnimationList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebKitAnimationList.cpp; sourceTree = "<group>"; };
- 319E69B013299BBD004AC91A /* WebKitAnimationList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKitAnimationList.h; sourceTree = "<group>"; };
- 319E69B113299BBD004AC91A /* WebKitAnimationList.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebKitAnimationList.idl; sourceTree = "<group>"; };
319FBD5D15D2F444009640A6 /* CachedImageClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CachedImageClient.h; sourceTree = "<group>"; };
31C0FF1B0E4CEB6E007D6FE5 /* WebKitAnimationEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebKitAnimationEvent.cpp; sourceTree = "<group>"; };
31C0FF1C0E4CEB6E007D6FE5 /* WebKitAnimationEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKitAnimationEvent.h; sourceTree = "<group>"; };
@@ -16123,12 +16093,6 @@
BC8BF1591058141800A40A07 /* UserStyleSheetTypes.h */,
F513A3E915FF4841001526DB /* ValidationMessageClient.h */,
BE983D95052A2E0A00892D85 /* WebCoreKeyboardUIMode.h */,
- 319E69AC13299BBD004AC91A /* WebKitAnimation.cpp */,
- 319E69AD13299BBD004AC91A /* WebKitAnimation.h */,
- 319E69AE13299BBD004AC91A /* WebKitAnimation.idl */,
- 319E69AF13299BBD004AC91A /* WebKitAnimationList.cpp */,
- 319E69B013299BBD004AC91A /* WebKitAnimationList.h */,
- 319E69B113299BBD004AC91A /* WebKitAnimationList.idl */,
494BD7930F55C8EE00747828 /* WebKitPoint.h */,
494BD7940F55C8EE00747828 /* WebKitPoint.idl */,
BC8243E60D0CFD7500460C8F /* WindowFeatures.cpp */,
@@ -16982,10 +16946,6 @@
85BA4D0A0AA688680088052D /* DOMHTMLUListElement.mm */,
15C770A4100D41CD005BA267 /* DOMValidityState.h */,
15C770A3100D41CD005BA267 /* DOMValidityState.mm */,
- 3194616813020B66004BB3F8 /* DOMWebKitAnimation.h */,
- 3194616913020B66004BB3F8 /* DOMWebKitAnimation.mm */,
- 3194620213022BF1004BB3F8 /* DOMWebKitAnimationList.h */,
- 3194620313022BF1004BB3F8 /* DOMWebKitAnimationList.mm */,
);
name = HTML;
sourceTree = "<group>";
@@ -18777,10 +18737,6 @@
0C45342610CDBBFA00869157 /* JSWebGLUniformLocation.h */,
77EF62F112F9DB7400C77BD2 /* JSWebGLVertexArrayObjectOES.cpp */,
77EF62F212F9DB7400C77BD2 /* JSWebGLVertexArrayObjectOES.h */,
- 3194616013020B20004BB3F8 /* JSWebKitAnimation.cpp */,
- 3194616113020B20004BB3F8 /* JSWebKitAnimation.h */,
- 319461FC13022BB8004BB3F8 /* JSWebKitAnimationList.cpp */,
- 319461FD13022BB8004BB3F8 /* JSWebKitAnimationList.h */,
);
name = HTML;
sourceTree = "<group>";
@@ -20703,8 +20659,6 @@
07B5A30A14687B8400A81ECE /* JSTrackEventCustom.cpp */,
516BB7920CE91E6800512F79 /* JSTreeWalkerCustom.cpp */,
49EED14C1051971A00099FAB /* JSWebGLRenderingContextCustom.cpp */,
- 319E68861327C911004AC91A /* JSWebKitAnimationCustom.cpp */,
- 3194623113022F65004BB3F8 /* JSWebKitAnimationListCustom.cpp */,
E1AD14C41297354900ACA989 /* JSWebKitCSSKeyframeRuleCustom.cpp */,
E1AD14B4129734CA00ACA989 /* JSWebKitCSSKeyframesRuleCustom.cpp */,
BC275B7811C5D1C300C9206C /* JSWebKitPointCustom.cpp */,
@@ -23597,10 +23551,8 @@
2E37DFDB12DBAFB800A6B233 /* DOMURL.h in Headers */,
15C770A6100D41CD005BA267 /* DOMValidityState.h in Headers */,
BC1A37C0097C715F0019F3D8 /* DOMViews.h in Headers */,
- 3194616A13020B66004BB3F8 /* DOMWebKitAnimation.h in Headers */,
31C0FF490E4CEFDD007D6FE5 /* DOMWebKitAnimationEvent.h in Headers */,
31C0FF4B0E4CEFDD007D6FE5 /* DOMWebKitAnimationEventInternal.h in Headers */,
- 3194620413022BF1004BB3F8 /* DOMWebKitAnimationList.h in Headers */,
31060379143281CD00ABF4BA /* DOMWebKitCSSFilterValue.h in Headers */,
3106037B143281CD00ABF4BA /* DOMWebKitCSSFilterValueInternal.h in Headers */,
316FE07D0E6CCC2800BF6088 /* DOMWebKitCSSKeyframeRule.h in Headers */,
@@ -24639,9 +24591,7 @@
49C7B9A51042D2D30009D447 /* JSWebGLTexture.h in Headers */,
0C45342810CDBBFA00869157 /* JSWebGLUniformLocation.h in Headers */,
77EF62F412F9DB7400C77BD2 /* JSWebGLVertexArrayObjectOES.h in Headers */,
- 3194616313020B20004BB3F8 /* JSWebKitAnimation.h in Headers */,
31C0FF3E0E4CEFAC007D6FE5 /* JSWebKitAnimationEvent.h in Headers */,
- 319461FF13022BB8004BB3F8 /* JSWebKitAnimationList.h in Headers */,
310603751432819C00ABF4BA /* JSWebKitCSSFilterValue.h in Headers */,
316FE0720E6CCBEE00BF6088 /* JSWebKitCSSKeyframeRule.h in Headers */,
316FE0740E6CCBEE00BF6088 /* JSWebKitCSSKeyframesRule.h in Headers */,
@@ -25769,9 +25719,7 @@
49C7B9E61042D32F0009D447 /* WebGLTexture.h in Headers */,
0C3F1F5B10C8871200D72CE1 /* WebGLUniformLocation.h in Headers */,
77A17A7812F28642004E02F6 /* WebGLVertexArrayObjectOES.h in Headers */,
- 319E69B313299BBD004AC91A /* WebKitAnimation.h in Headers */,
31C0FF220E4CEB6E007D6FE5 /* WebKitAnimationEvent.h in Headers */,
- 319E69B613299BBD004AC91A /* WebKitAnimationList.h in Headers */,
976D6C7C122B8A3D001FD1F7 /* WebKitBlobBuilder.h in Headers */,
150B923A15F08DC400E10986 /* WebKitCSSArrayFunctionValue.h in Headers */,
3106037014327D2E00ABF4BA /* WebKitCSSFilterValue.h in Headers */,
@@ -26894,9 +26842,7 @@
2E37DFDA12DBAFB800A6B233 /* DOMURL.cpp in Sources */,
BC1A37BF097C715F0019F3D8 /* DOMUtility.mm in Sources */,
15C770A5100D41CD005BA267 /* DOMValidityState.mm in Sources */,
- 3194616B13020B66004BB3F8 /* DOMWebKitAnimation.mm in Sources */,
31C0FF4A0E4CEFDD007D6FE5 /* DOMWebKitAnimationEvent.mm in Sources */,
- 3194620513022BF1004BB3F8 /* DOMWebKitAnimationList.mm in Sources */,
3106037A143281CD00ABF4BA /* DOMWebKitCSSFilterValue.mm in Sources */,
316FE07E0E6CCC2800BF6088 /* DOMWebKitCSSKeyframeRule.mm in Sources */,
316FE0810E6CCC2800BF6088 /* DOMWebKitCSSKeyframesRule.mm in Sources */,
@@ -27965,11 +27911,7 @@
49C7B9A41042D2D30009D447 /* JSWebGLTexture.cpp in Sources */,
0C45342710CDBBFA00869157 /* JSWebGLUniformLocation.cpp in Sources */,
77EF62F312F9DB7400C77BD2 /* JSWebGLVertexArrayObjectOES.cpp in Sources */,
- 3194616213020B20004BB3F8 /* JSWebKitAnimation.cpp in Sources */,
- 319E68871327C911004AC91A /* JSWebKitAnimationCustom.cpp in Sources */,
31C0FF3D0E4CEFAC007D6FE5 /* JSWebKitAnimationEvent.cpp in Sources */,
- 319461FE13022BB8004BB3F8 /* JSWebKitAnimationList.cpp in Sources */,
- 3194623213022F65004BB3F8 /* JSWebKitAnimationListCustom.cpp in Sources */,
310603741432819C00ABF4BA /* JSWebKitCSSFilterValue.cpp in Sources */,
316FE0710E6CCBEE00BF6088 /* JSWebKitCSSKeyframeRule.cpp in Sources */,
E1AD14C51297354900ACA989 /* JSWebKitCSSKeyframeRuleCustom.cpp in Sources */,
@@ -28895,9 +28837,7 @@
49C7B9E51042D32F0009D447 /* WebGLTexture.cpp in Sources */,
0C3F1F5A10C8871200D72CE1 /* WebGLUniformLocation.cpp in Sources */,
77A17A7712F28642004E02F6 /* WebGLVertexArrayObjectOES.cpp in Sources */,
- 319E69B213299BBD004AC91A /* WebKitAnimation.cpp in Sources */,
31C0FF210E4CEB6E007D6FE5 /* WebKitAnimationEvent.cpp in Sources */,
- 319E69B513299BBD004AC91A /* WebKitAnimationList.cpp in Sources */,
976D6C7B122B8A3D001FD1F7 /* WebKitBlobBuilder.cpp in Sources */,
150B923915F08DC400E10986 /* WebKitCSSArrayFunctionValue.cpp in Sources */,
3106036F14327D2E00ABF4BA /* WebKitCSSFilterValue.cpp in Sources */,
diff --git a/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp b/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp
index 0886888..599889e 100644
--- a/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp
+++ b/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp
@@ -149,8 +149,6 @@
#include "JSTrackCustom.cpp"
#include "JSTrackEventCustom.cpp"
#include "JSTreeWalkerCustom.cpp"
-#include "JSWebKitAnimationCustom.cpp"
-#include "JSWebKitAnimationListCustom.cpp"
#include "JSWebKitCSSKeyframeRuleCustom.cpp"
#include "JSWebKitCSSKeyframesRuleCustom.cpp"
#include "JSWebKitPointCustom.cpp"
diff --git a/Source/WebCore/bindings/js/JSWebKitAnimationCustom.cpp b/Source/WebCore/bindings/js/JSWebKitAnimationCustom.cpp
deleted file mode 100644
index 8425c4c..0000000
--- a/Source/WebCore/bindings/js/JSWebKitAnimationCustom.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2011 Apple Inc. All right 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 COMPUTER, 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 COMPUTER, 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 "JSWebKitAnimation.h"
-
-#include "WebKitAnimation.h"
-
-using namespace JSC;
-
-namespace WebCore {
-
-JSValue JSWebKitAnimation::iterationCount(ExecState*) const
-{
- WebKitAnimation* imp = impl();
- int count = imp->iterationCount();
- if (count == Animation::IterationCountInfinite)
- return jsNumber(std::numeric_limits<float>::infinity());
- return jsNumber(count);
-}
-
-}
diff --git a/Source/WebCore/bindings/js/JSWebKitAnimationListCustom.cpp b/Source/WebCore/bindings/js/JSWebKitAnimationListCustom.cpp
deleted file mode 100644
index d840830..0000000
--- a/Source/WebCore/bindings/js/JSWebKitAnimationListCustom.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2011 Apple Inc. All right 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 COMPUTER, 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 COMPUTER, 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 "JSWebKitAnimationList.h"
-
-#include "WebKitAnimationList.h"
-
-using namespace JSC;
-
-namespace WebCore {
-
-}
diff --git a/Source/WebCore/dom/Element.cpp b/Source/WebCore/dom/Element.cpp
index 627e981..10ccf9a 100644
--- a/Source/WebCore/dom/Element.cpp
+++ b/Source/WebCore/dom/Element.cpp
@@ -76,7 +76,6 @@
#include "TextIterator.h"
#include "VoidCallback.h"
#include "WebCoreMemoryInstrumentation.h"
-#include "WebKitAnimationList.h"
#include "XMLNSNames.h"
#include "XMLNames.h"
#include "htmlediting.h"
@@ -2349,19 +2348,6 @@
return true;
}
-PassRefPtr<WebKitAnimationList> Element::webkitGetAnimations() const
-{
- if (!renderer())
- return 0;
-
- AnimationController* animController = renderer()->animation();
-
- if (!animController)
- return 0;
-
- return animController->animationsForRenderer(renderer());
-}
-
RenderRegion* Element::renderRegion() const
{
if (renderer() && renderer()->isRenderRegion())
diff --git a/Source/WebCore/dom/Element.h b/Source/WebCore/dom/Element.h
index c032405f..19d7b6d 100644
--- a/Source/WebCore/dom/Element.h
+++ b/Source/WebCore/dom/Element.h
@@ -46,7 +46,6 @@
class PseudoElement;
class RenderRegion;
class ShadowRoot;
-class WebKitAnimationList;
enum SpellcheckAttributeState {
SpellcheckAttributeTrue,
@@ -459,8 +458,6 @@
virtual bool isSpellCheckingEnabled() const;
- PassRefPtr<WebKitAnimationList> webkitGetAnimations() const;
-
PassRefPtr<RenderStyle> styleForRenderer();
RenderRegion* renderRegion() const;
diff --git a/Source/WebCore/dom/Element.idl b/Source/WebCore/dom/Element.idl
index d172389..377f8e2 100644
--- a/Source/WebCore/dom/Element.idl
+++ b/Source/WebCore/dom/Element.idl
@@ -88,10 +88,6 @@
void scrollByLines(in [Optional=DefaultIsUndefined] long lines);
void scrollByPages(in [Optional=DefaultIsUndefined] long pages);
-#if defined(ENABLE_ANIMATION_API) && ENABLE_ANIMATION_API
- WebKitAnimationList webkitGetAnimations();
-#endif
-
// HTML 5
NodeList getElementsByClassName(in [Optional=DefaultIsUndefined] DOMString name);
diff --git a/Source/WebCore/page/DOMWindow.idl b/Source/WebCore/page/DOMWindow.idl
index 918f480..14cee8e 100644
--- a/Source/WebCore/page/DOMWindow.idl
+++ b/Source/WebCore/page/DOMWindow.idl
@@ -622,11 +622,6 @@
attribute StorageConstructor Storage;
-#if defined(ENABLE_ANIMATION_API) && ENABLE_ANIMATION_API
- attribute WebKitAnimationConstructor WebKitAnimation;
- attribute WebKitAnimationListConstructor WebKitAnimationList;
-#endif
-
attribute XPathEvaluatorConstructor XPathEvaluator;
attribute XPathResultConstructor XPathResult;
attribute XPathExceptionConstructor XPathException;
diff --git a/Source/WebCore/page/WebKitAnimation.cpp b/Source/WebCore/page/WebKitAnimation.cpp
deleted file mode 100644
index 98e7736..0000000
--- a/Source/WebCore/page/WebKitAnimation.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright (C) 2011 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 COMPUTER, 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 COMPUTER, 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 "WebKitAnimation.h"
-
-#include "Animation.h"
-#include "AnimationBase.h"
-#include "RenderStyle.h"
-
-using namespace std;
-
-namespace WebCore {
-
-WebKitAnimation::WebKitAnimation(PassRefPtr<KeyframeAnimation> keyframeAnimation)
- : m_keyframeAnimation(keyframeAnimation)
-{
-}
-
-String WebKitAnimation::name() const
-{
- return m_keyframeAnimation->animation()->name();
-}
-
-double WebKitAnimation::duration() const
-{
- return m_keyframeAnimation->duration();
-}
-
-double WebKitAnimation::elapsedTime() const
-{
- return m_keyframeAnimation->getElapsedTime();
-}
-
-void WebKitAnimation::setElapsedTime(double time)
-{
- m_keyframeAnimation->setElapsedTime(time);
-}
-
-double WebKitAnimation::delay() const
-{
- return m_keyframeAnimation->animation()->delay();
-}
-
-int WebKitAnimation::iterationCount() const
-{
- return m_keyframeAnimation->animation()->iterationCount();
-}
-
-bool WebKitAnimation::paused() const
-{
- return m_keyframeAnimation->paused();
-}
-
-bool WebKitAnimation::ended() const
-{
- int iterations = iterationCount();
- if (iterations == Animation::IterationCountInfinite)
- return false;
- return m_keyframeAnimation->getElapsedTime() > (m_keyframeAnimation->duration() * iterations);
-}
-
-WebKitAnimation::Direction WebKitAnimation::direction() const
-{
- switch (m_keyframeAnimation->animation()->direction()) {
- case Animation::AnimationDirectionNormal:
- return DIRECTION_NORMAL;
- case Animation::AnimationDirectionAlternate:
- return DIRECTION_ALTERNATE;
- case Animation::AnimationDirectionReverse:
- return DIRECTION_REVERSE;
- case Animation::AnimationDirectionAlternateReverse:
- return DIRECTION_ALTERNATE_REVERSE;
- }
- ASSERT_NOT_REACHED();
- return DIRECTION_NORMAL;
-}
-
-WebKitAnimation::FillMode WebKitAnimation::fillMode() const
-{
- switch (m_keyframeAnimation->animation()->fillMode()) {
- case AnimationFillModeNone:
- return FILL_NONE;
- case AnimationFillModeForwards:
- return FILL_FORWARDS;
- case AnimationFillModeBackwards:
- return FILL_BACKWARDS;
- case AnimationFillModeBoth:
- return FILL_BOTH;
- }
- ASSERT_NOT_REACHED();
- return FILL_BOTH;
-}
-
-void WebKitAnimation::pause()
-{
- m_keyframeAnimation->pause();
-}
-
-void WebKitAnimation::play()
-{
- m_keyframeAnimation->play();
-}
-
-}
diff --git a/Source/WebCore/page/WebKitAnimation.h b/Source/WebCore/page/WebKitAnimation.h
deleted file mode 100644
index 65e05ef..0000000
--- a/Source/WebCore/page/WebKitAnimation.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (C) 2011 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 COMPUTER, 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 COMPUTER, 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 WebKitAnimation_h
-#define WebKitAnimation_h
-
-#include "Animation.h"
-#include "AnimationBase.h"
-#include "KeyframeAnimation.h"
-#include "RenderStyle.h"
-
-namespace WebCore {
-
-class WebKitAnimation : public RefCounted<WebKitAnimation> {
-public:
-
- static PassRefPtr<WebKitAnimation> create(PassRefPtr<KeyframeAnimation> keyframeAnimation)
- {
- return adoptRef(new WebKitAnimation(keyframeAnimation));
- }
-
- virtual ~WebKitAnimation() { }
-
- // DOM API
-
- String name() const;
-
- double duration() const;
-
- double elapsedTime() const;
- void setElapsedTime(double);
-
- double delay() const;
- int iterationCount() const;
-
- bool paused() const;
- bool ended() const;
-
- // direction
- enum Direction { DIRECTION_NORMAL, DIRECTION_ALTERNATE, DIRECTION_REVERSE, DIRECTION_ALTERNATE_REVERSE };
- Direction direction() const;
-
- // fill mode
- enum FillMode { FILL_NONE, FILL_BACKWARDS, FILL_FORWARDS, FILL_BOTH };
- FillMode fillMode() const;
-
- void play();
- void pause();
-
-protected:
- explicit WebKitAnimation(PassRefPtr<KeyframeAnimation>);
-
-private:
- RefPtr<KeyframeAnimation> m_keyframeAnimation;
-};
-
-} // namespace
-
-#endif
diff --git a/Source/WebCore/page/WebKitAnimation.idl b/Source/WebCore/page/WebKitAnimation.idl
deleted file mode 100644
index 2618be0..0000000
--- a/Source/WebCore/page/WebKitAnimation.idl
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2011 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 Computer, 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 WebKitAnimation {
-
- readonly attribute DOMString name;
-
- readonly attribute double duration;
- attribute double elapsedTime;
-
- readonly attribute double delay;
- [Custom] readonly attribute long iterationCount;
-
- readonly attribute boolean paused;
- readonly attribute boolean ended;
-
- const unsigned short DIRECTION_NORMAL = 0;
- const unsigned short DIRECTION_ALTERNATE = 1;
- readonly attribute unsigned short direction;
-
- const unsigned short FILL_NONE = 0;
- const unsigned short FILL_BACKWARDS = 1;
- const unsigned short FILL_FORWARDS = 2;
- const unsigned short FILL_BOTH = 3;
- readonly attribute unsigned short fillMode;
-
- void play();
- void pause();
-};
-
diff --git a/Source/WebCore/page/WebKitAnimationList.cpp b/Source/WebCore/page/WebKitAnimationList.cpp
deleted file mode 100644
index 3acfa4c..0000000
--- a/Source/WebCore/page/WebKitAnimationList.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (C) 2011 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 COMPUTER, 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 COMPUTER, 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 "WebKitAnimationList.h"
-
-#include "WebKitAnimation.h"
-
-namespace WebCore {
-
-WebKitAnimationList::WebKitAnimationList()
-{
-}
-
-WebKitAnimationList::~WebKitAnimationList()
-{
-}
-
-unsigned WebKitAnimationList::length() const
-{
- return m_animations.size();
-}
-
-WebKitAnimation* WebKitAnimationList::item(unsigned index)
-{
- if (index < m_animations.size())
- return m_animations[index].get();
- return 0;
-}
-
-void WebKitAnimationList::deleteAnimation(unsigned index)
-{
- if (index >= m_animations.size())
- return;
-
- m_animations.remove(index);
-}
-
-void WebKitAnimationList::append(PassRefPtr<WebKitAnimation> animation)
-{
- m_animations.append(animation);
-}
-
-unsigned WebKitAnimationList::insertAnimation(PassRefPtr<WebKitAnimation> animation, unsigned index)
-{
- if (!animation)
- return 0;
-
- if (index > m_animations.size())
- return 0;
-
- m_animations.insert(index, animation);
- return index;
-}
-
-} // namespace WebCore
diff --git a/Source/WebCore/page/WebKitAnimationList.h b/Source/WebCore/page/WebKitAnimationList.h
deleted file mode 100644
index 58df2c0..0000000
--- a/Source/WebCore/page/WebKitAnimationList.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2011 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 COMPUTER, 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 COMPUTER, 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 WebKitAnimationList_h
-#define WebKitAnimationList_h
-
-#include <wtf/PassRefPtr.h>
-#include <wtf/RefCounted.h>
-#include <wtf/RefPtr.h>
-#include <wtf/Vector.h>
-
-namespace WebCore {
-
-class WebKitAnimation;
-
-class WebKitAnimationList : public RefCounted<WebKitAnimationList> {
-public:
- static PassRefPtr<WebKitAnimationList> create()
- {
- return adoptRef(new WebKitAnimationList);
- }
- ~WebKitAnimationList();
-
- unsigned length() const;
- WebKitAnimation* item(unsigned index);
-
- unsigned insertAnimation(PassRefPtr<WebKitAnimation>, unsigned index);
- void deleteAnimation(unsigned index);
- void append(PassRefPtr<WebKitAnimation>);
-
-private:
- WebKitAnimationList();
-
- Vector<RefPtr<WebKitAnimation> > m_animations;
-};
-
-} // namespace WebCore
-
-#endif // WebKitAnimationList_h
diff --git a/Source/WebCore/page/WebKitAnimationList.idl b/Source/WebCore/page/WebKitAnimationList.idl
deleted file mode 100644
index cf2da14..0000000
--- a/Source/WebCore/page/WebKitAnimationList.idl
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2011 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 COMPUTER, 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 COMPUTER, 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.
- */
-
-[
- IndexedGetter
-] interface WebKitAnimationList {
- readonly attribute unsigned long length;
- WebKitAnimation item(in unsigned long index);
-};
-
diff --git a/Source/WebCore/page/animation/AnimationController.cpp b/Source/WebCore/page/animation/AnimationController.cpp
index 12bfc4a..80827a1 100644
--- a/Source/WebCore/page/animation/AnimationController.cpp
+++ b/Source/WebCore/page/animation/AnimationController.cpp
@@ -39,7 +39,6 @@
#include "FrameView.h"
#include "RenderView.h"
#include "WebKitAnimationEvent.h"
-#include "WebKitAnimationList.h"
#include "WebKitTransitionEvent.h"
#include <wtf/CurrentTime.h>
#include <wtf/UnusedParam.h>
@@ -482,16 +481,6 @@
removeFromAnimationsWaitingForStartTimeResponse(animation);
}
-PassRefPtr<WebKitAnimationList> AnimationControllerPrivate::animationsForRenderer(RenderObject* renderer) const
-{
- RefPtr<CompositeAnimation> animation = m_compositeAnimations.get(renderer);
-
- if (!animation)
- return 0;
-
- return animation->animations();
-}
-
AnimationController::AnimationController(Frame* frame)
: m_data(adoptPtr(new AnimationControllerPrivate(frame)))
, m_beginAnimationUpdateCount(0)
@@ -648,9 +637,4 @@
#endif
}
-PassRefPtr<WebKitAnimationList> AnimationController::animationsForRenderer(RenderObject* renderer) const
-{
- return m_data->animationsForRenderer(renderer);
-}
-
} // namespace WebCore
diff --git a/Source/WebCore/page/animation/AnimationController.h b/Source/WebCore/page/animation/AnimationController.h
index ea3c41c..946abe2 100644
--- a/Source/WebCore/page/animation/AnimationController.h
+++ b/Source/WebCore/page/animation/AnimationController.h
@@ -43,7 +43,6 @@
class Node;
class RenderObject;
class RenderStyle;
-class WebKitAnimationList;
class AnimationController {
public:
@@ -78,8 +77,6 @@
static bool supportsAcceleratedAnimationOfProperty(CSSPropertyID);
- PassRefPtr<WebKitAnimationList> animationsForRenderer(RenderObject*) const;
-
private:
OwnPtr<AnimationControllerPrivate> m_data;
int m_beginAnimationUpdateCount;
diff --git a/Source/WebCore/page/animation/AnimationControllerPrivate.h b/Source/WebCore/page/animation/AnimationControllerPrivate.h
index ec76f1c98..07afb74 100644
--- a/Source/WebCore/page/animation/AnimationControllerPrivate.h
+++ b/Source/WebCore/page/animation/AnimationControllerPrivate.h
@@ -49,7 +49,6 @@
class Node;
class RenderObject;
class RenderStyle;
-class WebKitAnimationList;
enum SetChanged {
DoNotCallSetChanged = 0,
@@ -107,8 +106,6 @@
void animationWillBeRemoved(AnimationBase*);
- PassRefPtr<WebKitAnimationList> animationsForRenderer(RenderObject*) const;
-
void updateAnimationTimerForRenderer(RenderObject*);
private:
diff --git a/Source/WebCore/page/animation/CompositeAnimation.cpp b/Source/WebCore/page/animation/CompositeAnimation.cpp
index 1bb5059..50130f4 100644
--- a/Source/WebCore/page/animation/CompositeAnimation.cpp
+++ b/Source/WebCore/page/animation/CompositeAnimation.cpp
@@ -36,8 +36,6 @@
#include "KeyframeAnimation.h"
#include "RenderObject.h"
#include "RenderStyle.h"
-#include "WebKitAnimation.h"
-#include "WebKitAnimationList.h"
namespace WebCore {
@@ -574,20 +572,4 @@
return count;
}
-PassRefPtr<WebKitAnimationList> CompositeAnimation::animations() const
-{
- RefPtr<WebKitAnimationList> animations = WebKitAnimationList::create();
- if (!m_keyframeAnimations.isEmpty()) {
- m_keyframeAnimations.checkConsistency();
- for (Vector<AtomicStringImpl*>::const_iterator it = m_keyframeAnimationOrderMap.begin(); it != m_keyframeAnimationOrderMap.end(); ++it) {
- RefPtr<KeyframeAnimation> keyframeAnimation = m_keyframeAnimations.get(*it);
- if (keyframeAnimation) {
- RefPtr<WebKitAnimation> anim = WebKitAnimation::create(keyframeAnimation);
- animations->append(anim);
- }
- }
- }
- return animations;
-}
-
} // namespace WebCore
diff --git a/Source/WebCore/page/animation/CompositeAnimation.h b/Source/WebCore/page/animation/CompositeAnimation.h
index 91a35f0..29463ad 100644
--- a/Source/WebCore/page/animation/CompositeAnimation.h
+++ b/Source/WebCore/page/animation/CompositeAnimation.h
@@ -41,7 +41,6 @@
class AnimationController;
class RenderObject;
class RenderStyle;
-class WebKitAnimationList;
// A CompositeAnimation represents a collection of animations that are running
// on a single RenderObject, such as a number of properties transitioning at once.
@@ -81,8 +80,6 @@
bool pauseTransitionAtTime(CSSPropertyID, double);
unsigned numberOfActiveAnimations() const;
- PassRefPtr<WebKitAnimationList> animations() const;
-
private:
CompositeAnimation(AnimationControllerPrivate* animationController)
: m_animationController(animationController)
