Changeset 137243 in webkit
- Timestamp:
- Dec 10, 2012 8:23:47 PM (11 years ago)
- Location:
- trunk
- Files:
-
- 10 deleted
- 24 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r137239 r137243 1 2012-12-10 Dean Jackson <dino@apple.com> 2 3 Remove old WebKit Animation API code 4 https://bugs.webkit.org/show_bug.cgi?id=104611 5 6 Reviewed by Simon Fraser. 7 8 Remove the existing, unused animation API code. We'll look into 9 implementing the W3C Animation API if/when it is stable. 10 11 * animations/animation-api-1-expected.txt: Removed. 12 * animations/animation-api-1.html: Removed. 13 * fast/js/global-constructors-expected.txt: 14 1 15 2012-12-10 Kangil Han <kangil.han@samsung.com> 2 16 -
trunk/LayoutTests/fast/js/global-constructors-expected.txt
r128866 r137243 321 321 PASS UIEvent.toString() is '[object UIEventConstructor]' 322 322 PASS URL.toString() is '[object URLConstructor]' 323 PASS WebKitAnimation.toString() is '[object WebKitAnimationConstructor]'324 323 PASS WebKitAnimationEvent.toString() is '[object WebKitAnimationEventConstructor]' 325 PASS WebKitAnimationList.toString() is '[object WebKitAnimationListConstructor]'326 324 PASS WebKitCSSKeyframeRule.toString() is '[object WebKitCSSKeyframeRuleConstructor]' 327 325 PASS WebKitCSSKeyframesRule.toString() is '[object WebKitCSSKeyframesRuleConstructor]' -
trunk/Source/WebCore/CMakeLists.txt
r137221 r137243 586 586 page/SpeechInputResult.idl 587 587 page/SpeechInputResultList.idl 588 page/WebKitAnimation.idl589 page/WebKitAnimationList.idl590 588 page/WebKitPoint.idl 591 589 page/WorkerNavigator.idl … … 1770 1768 page/SuspendableTimer.cpp 1771 1769 page/UserContentURLPattern.cpp 1772 page/WebKitAnimation.cpp1773 page/WebKitAnimationList.cpp1774 1770 page/WindowFeatures.cpp 1775 1771 page/WindowFocusAllowedIndicator.cpp -
trunk/Source/WebCore/ChangeLog
r137240 r137243 1 2012-12-10 Dean Jackson <dino@apple.com> 2 3 Remove old WebKit Animation API code 4 https://bugs.webkit.org/show_bug.cgi?id=104611 5 6 Reviewed by Simon Fraser. 7 8 Remove the existing, unused animation API code. We'll look into 9 implementing the W3C Animation API if/when it is stable. 10 11 * CMakeLists.txt: Remove WebKitAnimation and WebKitAnimationList classes. 12 * DerivedSources.cpp: 13 * DerivedSources.make: 14 * DerivedSources.pri: 15 * GNUmakefile.list.am: 16 * Target.pri: 17 * UseJSC.cmake: 18 * UseV8.cmake: 19 * WebCore.gypi: 20 * WebCore.vcproj/WebCore.vcproj: 21 * WebCore.xcodeproj/project.pbxproj: 22 * bindings/js/JSBindingsAllInOne.cpp: Remove includes. 23 * bindings/js/JSWebKitAnimationCustom.cpp: Removed. 24 * bindings/js/JSWebKitAnimationListCustom.cpp: Removed. 25 * dom/Element.cpp: Remove API. 26 * dom/Element.h: Ditto. 27 * dom/Element.idl: Ditto. 28 * page/DOMWindow.idl: Ditto. 29 * page/WebKitAnimation.cpp: Removed. 30 * page/WebKitAnimation.h: Removed. 31 * page/WebKitAnimation.idl: Removed. 32 * page/WebKitAnimationList.cpp: Removed. 33 * page/WebKitAnimationList.h: Removed. 34 * page/WebKitAnimationList.idl: Removed. 35 * page/animation/AnimationController.cpp: Remove API. 36 * page/animation/AnimationController.h: Ditto. 37 * page/animation/AnimationControllerPrivate.h: Ditto. 38 * page/animation/CompositeAnimation.cpp: Ditto. 39 * page/animation/CompositeAnimation.h: Ditto. 40 1 41 2012-12-10 Jessie Berlin <jberlin@apple.com> 2 42 -
trunk/Source/WebCore/DerivedSources.cpp
r136903 r137243 480 480 #include "JSValidityState.cpp" 481 481 #include "JSVoidCallback.cpp" 482 #include "JSWebKitAnimation.cpp"483 482 #include "JSWebKitAnimationEvent.cpp" 484 #include "JSWebKitAnimationList.cpp"485 483 #if ENABLE(CSS_FILTERS) 486 484 #include "JSWebKitCSSFilterValue.cpp" -
trunk/Source/WebCore/DerivedSources.make
r136869 r137243 435 435 $(WebCore)/page/SpeechInputResult.idl \ 436 436 $(WebCore)/page/SpeechInputResultList.idl \ 437 $(WebCore)/page/WebKitAnimation.idl \438 $(WebCore)/page/WebKitAnimationList.idl \439 437 $(WebCore)/page/WebKitPoint.idl \ 440 438 $(WebCore)/page/WorkerNavigator.idl \ -
trunk/Source/WebCore/DerivedSources.pri
r136869 r137243 448 448 $$PWD/page/SpeechInputResult.idl \ 449 449 $$PWD/page/SpeechInputResultList.idl \ 450 $$PWD/page/WebKitAnimation.idl \451 $$PWD/page/WebKitAnimationList.idl \452 450 $$PWD/page/WebKitPoint.idl \ 453 451 $$PWD/page/WorkerNavigator.idl \ -
trunk/Source/WebCore/GNUmakefile.list.am
r137230 r137243 796 796 DerivedSources/WebCore/JSWebGLVertexArrayObjectOES.cpp \ 797 797 DerivedSources/WebCore/JSWebGLVertexArrayObjectOES.h \ 798 DerivedSources/WebCore/JSWebKitAnimation.cpp \799 DerivedSources/WebCore/JSWebKitAnimation.h \800 798 DerivedSources/WebCore/JSWebKitAnimationEvent.cpp \ 801 DerivedSources/WebCore/JSWebKitAnimationList.h \802 DerivedSources/WebCore/JSWebKitAnimationList.cpp \803 799 DerivedSources/WebCore/JSWebKitAnimationEvent.h \ 804 800 DerivedSources/WebCore/JSWebKitCSSFilterValue.cpp \ … … 1586 1582 $(WebCore)/page/SpeechInputResult.idl \ 1587 1583 $(WebCore)/page/SpeechInputResultList.idl \ 1588 $(WebCore)/page/WebKitAnimation.idl \1589 $(WebCore)/page/WebKitAnimationList.idl \1590 1584 $(WebCore)/page/WebKitPoint.idl \ 1591 1585 $(WebCore)/page/WorkerNavigator.idl \ … … 2400 2394 Source/WebCore/bindings/js/JSTrackEventCustom.cpp \ 2401 2395 Source/WebCore/bindings/js/JSTreeWalkerCustom.cpp \ 2402 Source/WebCore/bindings/js/JSWebKitAnimationCustom.cpp \2403 Source/WebCore/bindings/js/JSWebKitAnimationListCustom.cpp \2404 2396 Source/WebCore/bindings/js/JSWebKitCSSKeyframeRuleCustom.cpp \ 2405 2397 Source/WebCore/bindings/js/JSWebKitCSSKeyframesRuleCustom.cpp \ … … 4161 4153 Source/WebCore/page/ValidationMessageClient.h \ 4162 4154 Source/WebCore/page/WebCoreKeyboardUIMode.h \ 4163 Source/WebCore/page/WebKitAnimation.h \4164 Source/WebCore/page/WebKitAnimation.cpp \4165 Source/WebCore/page/WebKitAnimationList.h \4166 Source/WebCore/page/WebKitAnimationList.cpp \4167 4155 Source/WebCore/page/WebKitPoint.h \ 4168 4156 Source/WebCore/page/WindowFeatures.cpp \ -
trunk/Source/WebCore/Target.pri
r137230 r137243 182 182 bindings/js/JSTouchListCustom.cpp \ 183 183 bindings/js/JSTreeWalkerCustom.cpp \ 184 bindings/js/JSWebKitAnimationCustom.cpp \185 bindings/js/JSWebKitAnimationListCustom.cpp \186 184 bindings/js/JSWebKitCSSKeyframeRuleCustom.cpp \ 187 185 bindings/js/JSWebKitCSSKeyframesRuleCustom.cpp \ … … 879 877 page/animation/ImplicitAnimation.cpp \ 880 878 page/animation/KeyframeAnimation.cpp \ 881 page/WebKitAnimation.cpp \882 page/WebKitAnimationList.cpp \883 879 page/BarInfo.cpp \ 884 880 page/Chrome.cpp \ … … 2073 2069 page/TouchAdjustment.h \ 2074 2070 page/ValidationMessageClient.h \ 2075 page/WebKitAnimation.h \2076 page/WebKitAnimationList.h \2077 2071 page/WindowFeatures.h \ 2078 2072 page/WindowFocusAllowedIndicator.h \ -
trunk/Source/WebCore/UseJSC.cmake
r136903 r137243 133 133 bindings/js/JSTouchListCustom.cpp 134 134 bindings/js/JSTreeWalkerCustom.cpp 135 bindings/js/JSWebKitAnimationCustom.cpp136 bindings/js/JSWebKitAnimationListCustom.cpp137 135 bindings/js/JSWebKitCSSKeyframeRuleCustom.cpp 138 136 bindings/js/JSWebKitCSSKeyframesRuleCustom.cpp -
trunk/Source/WebCore/UseV8.cmake
r136790 r137243 148 148 bindings/v8/custom/V8StyleSheetListCustom.cpp 149 149 bindings/v8/custom/V8WebGLRenderingContextCustom.cpp 150 bindings/v8/custom/V8WebKitAnimationCustom.cpp151 150 bindings/v8/custom/V8WebKitPointCustom.cpp 152 151 bindings/v8/custom/V8WorkerContextCustom.cpp -
trunk/Source/WebCore/WebCore.gypi
r137221 r137243 435 435 'page/SpeechInputResult.idl', 436 436 'page/SpeechInputResultList.idl', 437 'page/WebKitAnimation.idl',438 'page/WebKitAnimationList.idl',439 437 'page/WebKitPoint.idl', 440 438 'page/WorkerNavigator.idl', … … 1382 1380 'bindings/v8/custom/V8TrackEventCustom.cpp', 1383 1381 'bindings/v8/custom/V8WebGLRenderingContextCustom.cpp', 1384 'bindings/v8/custom/V8WebKitAnimationCustom.cpp',1385 1382 'bindings/v8/custom/V8WebKitPointCustom.cpp', 1386 1383 'bindings/v8/custom/V8WorkerContextCustom.cpp', … … 2134 2131 'page/TouchDisambiguation.h', 2135 2132 'page/UserContentURLPattern.cpp', 2136 'page/WebKitAnimation.cpp',2137 'page/WebKitAnimation.h',2138 'page/WebKitAnimationList.cpp',2139 'page/WebKitAnimationList.h',2140 2133 'page/WebKitPoint.h', 2141 2134 'page/WindowFeatures.cpp', … … 5972 5965 '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMValidityState.mm', 5973 5966 '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMValidityStateInternal.h', 5974 '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMWebKitAnimation.h',5975 '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMWebKitAnimation.mm',5976 5967 '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMWebKitAnimationEvent.h', 5977 5968 '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMWebKitAnimationEvent.mm', 5978 5969 '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMWebKitAnimationEventInternal.h', 5979 '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMWebKitAnimationList.h',5980 '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMWebKitAnimationList.mm',5981 5970 '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMWebKitCSSFilterValue.h', 5982 5971 '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMWebKitCSSFilterValue.mm', … … 7030 7019 '<(PRODUCT_DIR)/DerivedSources/WebCore/JSWebGLVertexArrayObjectOES.cpp', 7031 7020 '<(PRODUCT_DIR)/DerivedSources/WebCore/JSWebGLVertexArrayObjectOES.h', 7032 '<(PRODUCT_DIR)/DerivedSources/WebCore/JSWebKitAnimation.cpp',7033 '<(PRODUCT_DIR)/DerivedSources/WebCore/JSWebKitAnimation.h',7034 7021 '<(PRODUCT_DIR)/DerivedSources/WebCore/JSWebKitAnimationEvent.cpp', 7035 7022 '<(PRODUCT_DIR)/DerivedSources/WebCore/JSWebKitAnimationEvent.h', 7036 '<(PRODUCT_DIR)/DerivedSources/WebCore/JSWebKitAnimationList.cpp',7037 '<(PRODUCT_DIR)/DerivedSources/WebCore/JSWebKitAnimationList.h',7038 7023 '<(PRODUCT_DIR)/DerivedSources/WebCore/JSWebKitCSSFilterValue.cpp', 7039 7024 '<(PRODUCT_DIR)/DerivedSources/WebCore/JSWebKitCSSFilterValue.h', -
trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj
r137230 r137243 22787 22787 </File> 22788 22788 <File 22789 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSWebKitAnimation.cpp"22790 >22791 <FileConfiguration22792 Name="Debug|Win32"22793 ExcludedFromBuild="true"22794 >22795 <Tool22796 Name="VCCLCompilerTool"22797 />22798 </FileConfiguration>22799 <FileConfiguration22800 Name="Release|Win32"22801 ExcludedFromBuild="true"22802 >22803 <Tool22804 Name="VCCLCompilerTool"22805 />22806 </FileConfiguration>22807 <FileConfiguration22808 Name="Debug_Cairo_CFLite|Win32"22809 ExcludedFromBuild="true"22810 >22811 <Tool22812 Name="VCCLCompilerTool"22813 />22814 </FileConfiguration>22815 <FileConfiguration22816 Name="Release_Cairo_CFLite|Win32"22817 ExcludedFromBuild="true"22818 >22819 <Tool22820 Name="VCCLCompilerTool"22821 />22822 </FileConfiguration>22823 <FileConfiguration22824 Name="Debug_All|Win32"22825 ExcludedFromBuild="true"22826 >22827 <Tool22828 Name="VCCLCompilerTool"22829 />22830 </FileConfiguration>22831 <FileConfiguration22832 Name="Production|Win32"22833 ExcludedFromBuild="true"22834 >22835 <Tool22836 Name="VCCLCompilerTool"22837 />22838 </FileConfiguration>22839 </File>22840 <File22841 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSWebKitAnimation.h"22842 >22843 </File>22844 <File22845 22789 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSWebKitAnimationEvent.cpp" 22846 22790 > … … 22896 22840 <File 22897 22841 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSWebKitAnimationEvent.h" 22898 >22899 </File>22900 <File22901 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSWebKitAnimationList.cpp"22902 >22903 <FileConfiguration22904 Name="Debug|Win32"22905 ExcludedFromBuild="true"22906 >22907 <Tool22908 Name="VCCLCompilerTool"22909 />22910 </FileConfiguration>22911 <FileConfiguration22912 Name="Release|Win32"22913 ExcludedFromBuild="true"22914 >22915 <Tool22916 Name="VCCLCompilerTool"22917 />22918 </FileConfiguration>22919 <FileConfiguration22920 Name="Debug_Cairo_CFLite|Win32"22921 ExcludedFromBuild="true"22922 >22923 <Tool22924 Name="VCCLCompilerTool"22925 />22926 </FileConfiguration>22927 <FileConfiguration22928 Name="Release_Cairo_CFLite|Win32"22929 ExcludedFromBuild="true"22930 >22931 <Tool22932 Name="VCCLCompilerTool"22933 />22934 </FileConfiguration>22935 <FileConfiguration22936 Name="Debug_All|Win32"22937 ExcludedFromBuild="true"22938 >22939 <Tool22940 Name="VCCLCompilerTool"22941 />22942 </FileConfiguration>22943 <FileConfiguration22944 Name="Production|Win32"22945 ExcludedFromBuild="true"22946 >22947 <Tool22948 Name="VCCLCompilerTool"22949 />22950 </FileConfiguration>22951 </File>22952 <File22953 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSWebKitAnimationList.h"22954 22842 > 22955 22843 </File> … … 27412 27300 <File 27413 27301 RelativePath="..\page\UserStyleSheetTypes.h" 27414 >27415 </File>27416 <File27417 RelativePath="..\page\WebKitAnimation.cpp"27418 >27419 </File>27420 <File27421 RelativePath="..\page\WebKitAnimation.h"27422 >27423 </File>27424 <File27425 RelativePath="..\page\WebKitAnimationList.cpp"27426 >27427 </File>27428 <File27429 RelativePath="..\page\WebKitAnimationList.h"27430 27302 > 27431 27303 </File> … … 71070 70942 </File> 71071 70943 <File 71072 RelativePath="..\bindings\js\JSWebKitAnimationCustom.cpp"71073 >71074 <FileConfiguration71075 Name="Debug|Win32"71076 ExcludedFromBuild="true"71077 >71078 <Tool71079 Name="VCCLCompilerTool"71080 />71081 </FileConfiguration>71082 <FileConfiguration71083 Name="Release|Win32"71084 ExcludedFromBuild="true"71085 >71086 <Tool71087 Name="VCCLCompilerTool"71088 />71089 </FileConfiguration>71090 <FileConfiguration71091 Name="Debug_Cairo_CFLite|Win32"71092 ExcludedFromBuild="true"71093 >71094 <Tool71095 Name="VCCLCompilerTool"71096 />71097 </FileConfiguration>71098 <FileConfiguration71099 Name="Release_Cairo_CFLite|Win32"71100 ExcludedFromBuild="true"71101 >71102 <Tool71103 Name="VCCLCompilerTool"71104 />71105 </FileConfiguration>71106 <FileConfiguration71107 Name="Debug_All|Win32"71108 ExcludedFromBuild="true"71109 >71110 <Tool71111 Name="VCCLCompilerTool"71112 />71113 </FileConfiguration>71114 <FileConfiguration71115 Name="Production|Win32"71116 ExcludedFromBuild="true"71117 >71118 <Tool71119 Name="VCCLCompilerTool"71120 />71121 </FileConfiguration>71122 </File>71123 <File71124 RelativePath="..\bindings\js\JSWebKitAnimationListCustom.cpp"71125 >71126 <FileConfiguration71127 Name="Debug|Win32"71128 ExcludedFromBuild="true"71129 >71130 <Tool71131 Name="VCCLCompilerTool"71132 />71133 </FileConfiguration>71134 <FileConfiguration71135 Name="Release|Win32"71136 ExcludedFromBuild="true"71137 >71138 <Tool71139 Name="VCCLCompilerTool"71140 />71141 </FileConfiguration>71142 <FileConfiguration71143 Name="Debug_Cairo_CFLite|Win32"71144 ExcludedFromBuild="true"71145 >71146 <Tool71147 Name="VCCLCompilerTool"71148 />71149 </FileConfiguration>71150 <FileConfiguration71151 Name="Release_Cairo_CFLite|Win32"71152 ExcludedFromBuild="true"71153 >71154 <Tool71155 Name="VCCLCompilerTool"71156 />71157 </FileConfiguration>71158 <FileConfiguration71159 Name="Debug_All|Win32"71160 ExcludedFromBuild="true"71161 >71162 <Tool71163 Name="VCCLCompilerTool"71164 />71165 </FileConfiguration>71166 <FileConfiguration71167 Name="Production|Win32"71168 ExcludedFromBuild="true"71169 >71170 <Tool71171 Name="VCCLCompilerTool"71172 />71173 </FileConfiguration>71174 </File>71175 <File71176 70944 RelativePath="..\bindings\js\JSWebKitCSSKeyframeRuleCustom.cpp" 71177 70945 > -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r137230 r137243 918 918 316FE11A0E6E1DA700BF6088 /* KeyframeAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 316FE1100E6E1DA700BF6088 /* KeyframeAnimation.h */; }; 919 919 31741AAD16636609008A5B7E /* SimulatedClickOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 31741AAB16635E45008A5B7E /* SimulatedClickOptions.h */; settings = {ATTRIBUTES = (Private, ); }; }; 920 3194616213020B20004BB3F8 /* JSWebKitAnimation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3194616013020B20004BB3F8 /* JSWebKitAnimation.cpp */; };921 3194616313020B20004BB3F8 /* JSWebKitAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 3194616113020B20004BB3F8 /* JSWebKitAnimation.h */; };922 3194616A13020B66004BB3F8 /* DOMWebKitAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 3194616813020B66004BB3F8 /* DOMWebKitAnimation.h */; };923 3194616B13020B66004BB3F8 /* DOMWebKitAnimation.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3194616913020B66004BB3F8 /* DOMWebKitAnimation.mm */; };924 319461FE13022BB8004BB3F8 /* JSWebKitAnimationList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 319461FC13022BB8004BB3F8 /* JSWebKitAnimationList.cpp */; };925 319461FF13022BB8004BB3F8 /* JSWebKitAnimationList.h in Headers */ = {isa = PBXBuildFile; fileRef = 319461FD13022BB8004BB3F8 /* JSWebKitAnimationList.h */; };926 3194620413022BF1004BB3F8 /* DOMWebKitAnimationList.h in Headers */ = {isa = PBXBuildFile; fileRef = 3194620213022BF1004BB3F8 /* DOMWebKitAnimationList.h */; };927 3194620513022BF1004BB3F8 /* DOMWebKitAnimationList.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3194620313022BF1004BB3F8 /* DOMWebKitAnimationList.mm */; };928 3194623213022F65004BB3F8 /* JSWebKitAnimationListCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3194623113022F65004BB3F8 /* JSWebKitAnimationListCustom.cpp */; };929 920 31955A86160D199000858025 /* RenderSnapshottedPlugIn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31E8D8BA160BC94B004CE8F5 /* RenderSnapshottedPlugIn.cpp */; }; 930 921 31955A88160D199200858025 /* RenderSnapshottedPlugIn.h in Headers */ = {isa = PBXBuildFile; fileRef = 31E8D8BB160BC94C004CE8F5 /* RenderSnapshottedPlugIn.h */; settings = {ATTRIBUTES = (Private, ); }; }; 931 922 319AE063142D6B24006563A1 /* StyleFilterData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 319AE061142D6B24006563A1 /* StyleFilterData.cpp */; }; 932 923 319AE064142D6B24006563A1 /* StyleFilterData.h in Headers */ = {isa = PBXBuildFile; fileRef = 319AE062142D6B24006563A1 /* StyleFilterData.h */; settings = {ATTRIBUTES = (Private, ); }; }; 933 319E68871327C911004AC91A /* JSWebKitAnimationCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 319E68861327C911004AC91A /* JSWebKitAnimationCustom.cpp */; };934 319E69B213299BBD004AC91A /* WebKitAnimation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 319E69AC13299BBD004AC91A /* WebKitAnimation.cpp */; };935 319E69B313299BBD004AC91A /* WebKitAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 319E69AD13299BBD004AC91A /* WebKitAnimation.h */; };936 319E69B513299BBD004AC91A /* WebKitAnimationList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 319E69AF13299BBD004AC91A /* WebKitAnimationList.cpp */; };937 319E69B613299BBD004AC91A /* WebKitAnimationList.h in Headers */ = {isa = PBXBuildFile; fileRef = 319E69B013299BBD004AC91A /* WebKitAnimationList.h */; };938 924 319FBD5F15D2F464009640A6 /* CachedImageClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 319FBD5D15D2F444009640A6 /* CachedImageClient.h */; settings = {ATTRIBUTES = (Private, ); }; }; 939 925 31C0FF210E4CEB6E007D6FE5 /* WebKitAnimationEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31C0FF1B0E4CEB6E007D6FE5 /* WebKitAnimationEvent.cpp */; }; … … 8121 8107 316FE1100E6E1DA700BF6088 /* KeyframeAnimation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = KeyframeAnimation.h; path = animation/KeyframeAnimation.h; sourceTree = "<group>"; }; 8122 8108 31741AAB16635E45008A5B7E /* SimulatedClickOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SimulatedClickOptions.h; sourceTree = "<group>"; }; 8123 3194616013020B20004BB3F8 /* JSWebKitAnimation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebKitAnimation.cpp; sourceTree = "<group>"; };8124 3194616113020B20004BB3F8 /* JSWebKitAnimation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWebKitAnimation.h; sourceTree = "<group>"; };8125 3194616813020B66004BB3F8 /* DOMWebKitAnimation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMWebKitAnimation.h; sourceTree = "<group>"; };8126 3194616913020B66004BB3F8 /* DOMWebKitAnimation.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMWebKitAnimation.mm; sourceTree = "<group>"; };8127 319461FC13022BB8004BB3F8 /* JSWebKitAnimationList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebKitAnimationList.cpp; sourceTree = "<group>"; };8128 319461FD13022BB8004BB3F8 /* JSWebKitAnimationList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWebKitAnimationList.h; sourceTree = "<group>"; };8129 3194620213022BF1004BB3F8 /* DOMWebKitAnimationList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMWebKitAnimationList.h; sourceTree = "<group>"; };8130 3194620313022BF1004BB3F8 /* DOMWebKitAnimationList.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMWebKitAnimationList.mm; sourceTree = "<group>"; };8131 3194623113022F65004BB3F8 /* JSWebKitAnimationListCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebKitAnimationListCustom.cpp; sourceTree = "<group>"; };8132 8109 319AE061142D6B24006563A1 /* StyleFilterData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = StyleFilterData.cpp; path = style/StyleFilterData.cpp; sourceTree = "<group>"; }; 8133 8110 319AE062142D6B24006563A1 /* StyleFilterData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StyleFilterData.h; path = style/StyleFilterData.h; sourceTree = "<group>"; }; 8134 319E68861327C911004AC91A /* JSWebKitAnimationCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebKitAnimationCustom.cpp; sourceTree = "<group>"; };8135 319E69AC13299BBD004AC91A /* WebKitAnimation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebKitAnimation.cpp; sourceTree = "<group>"; };8136 319E69AD13299BBD004AC91A /* WebKitAnimation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKitAnimation.h; sourceTree = "<group>"; };8137 319E69AE13299BBD004AC91A /* WebKitAnimation.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebKitAnimation.idl; sourceTree = "<group>"; };8138 319E69AF13299BBD004AC91A /* WebKitAnimationList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebKitAnimationList.cpp; sourceTree = "<group>"; };8139 319E69B013299BBD004AC91A /* WebKitAnimationList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKitAnimationList.h; sourceTree = "<group>"; };8140 319E69B113299BBD004AC91A /* WebKitAnimationList.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebKitAnimationList.idl; sourceTree = "<group>"; };8141 8111 319FBD5D15D2F444009640A6 /* CachedImageClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CachedImageClient.h; sourceTree = "<group>"; }; 8142 8112 31C0FF1B0E4CEB6E007D6FE5 /* WebKitAnimationEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebKitAnimationEvent.cpp; sourceTree = "<group>"; }; … … 16124 16094 F513A3E915FF4841001526DB /* ValidationMessageClient.h */, 16125 16095 BE983D95052A2E0A00892D85 /* WebCoreKeyboardUIMode.h */, 16126 319E69AC13299BBD004AC91A /* WebKitAnimation.cpp */,16127 319E69AD13299BBD004AC91A /* WebKitAnimation.h */,16128 319E69AE13299BBD004AC91A /* WebKitAnimation.idl */,16129 319E69AF13299BBD004AC91A /* WebKitAnimationList.cpp */,16130 319E69B013299BBD004AC91A /* WebKitAnimationList.h */,16131 319E69B113299BBD004AC91A /* WebKitAnimationList.idl */,16132 16096 494BD7930F55C8EE00747828 /* WebKitPoint.h */, 16133 16097 494BD7940F55C8EE00747828 /* WebKitPoint.idl */, … … 16983 16947 15C770A4100D41CD005BA267 /* DOMValidityState.h */, 16984 16948 15C770A3100D41CD005BA267 /* DOMValidityState.mm */, 16985 3194616813020B66004BB3F8 /* DOMWebKitAnimation.h */,16986 3194616913020B66004BB3F8 /* DOMWebKitAnimation.mm */,16987 3194620213022BF1004BB3F8 /* DOMWebKitAnimationList.h */,16988 3194620313022BF1004BB3F8 /* DOMWebKitAnimationList.mm */,16989 16949 ); 16990 16950 name = HTML; … … 18778 18738 77EF62F112F9DB7400C77BD2 /* JSWebGLVertexArrayObjectOES.cpp */, 18779 18739 77EF62F212F9DB7400C77BD2 /* JSWebGLVertexArrayObjectOES.h */, 18780 3194616013020B20004BB3F8 /* JSWebKitAnimation.cpp */,18781 3194616113020B20004BB3F8 /* JSWebKitAnimation.h */,18782 319461FC13022BB8004BB3F8 /* JSWebKitAnimationList.cpp */,18783 319461FD13022BB8004BB3F8 /* JSWebKitAnimationList.h */,18784 18740 ); 18785 18741 name = HTML; … … 20704 20660 516BB7920CE91E6800512F79 /* JSTreeWalkerCustom.cpp */, 20705 20661 49EED14C1051971A00099FAB /* JSWebGLRenderingContextCustom.cpp */, 20706 319E68861327C911004AC91A /* JSWebKitAnimationCustom.cpp */,20707 3194623113022F65004BB3F8 /* JSWebKitAnimationListCustom.cpp */,20708 20662 E1AD14C41297354900ACA989 /* JSWebKitCSSKeyframeRuleCustom.cpp */, 20709 20663 E1AD14B4129734CA00ACA989 /* JSWebKitCSSKeyframesRuleCustom.cpp */, … … 23598 23552 15C770A6100D41CD005BA267 /* DOMValidityState.h in Headers */, 23599 23553 BC1A37C0097C715F0019F3D8 /* DOMViews.h in Headers */, 23600 3194616A13020B66004BB3F8 /* DOMWebKitAnimation.h in Headers */,23601 23554 31C0FF490E4CEFDD007D6FE5 /* DOMWebKitAnimationEvent.h in Headers */, 23602 23555 31C0FF4B0E4CEFDD007D6FE5 /* DOMWebKitAnimationEventInternal.h in Headers */, 23603 3194620413022BF1004BB3F8 /* DOMWebKitAnimationList.h in Headers */,23604 23556 31060379143281CD00ABF4BA /* DOMWebKitCSSFilterValue.h in Headers */, 23605 23557 3106037B143281CD00ABF4BA /* DOMWebKitCSSFilterValueInternal.h in Headers */, … … 24640 24592 0C45342810CDBBFA00869157 /* JSWebGLUniformLocation.h in Headers */, 24641 24593 77EF62F412F9DB7400C77BD2 /* JSWebGLVertexArrayObjectOES.h in Headers */, 24642 3194616313020B20004BB3F8 /* JSWebKitAnimation.h in Headers */,24643 24594 31C0FF3E0E4CEFAC007D6FE5 /* JSWebKitAnimationEvent.h in Headers */, 24644 319461FF13022BB8004BB3F8 /* JSWebKitAnimationList.h in Headers */,24645 24595 310603751432819C00ABF4BA /* JSWebKitCSSFilterValue.h in Headers */, 24646 24596 316FE0720E6CCBEE00BF6088 /* JSWebKitCSSKeyframeRule.h in Headers */, … … 25770 25720 0C3F1F5B10C8871200D72CE1 /* WebGLUniformLocation.h in Headers */, 25771 25721 77A17A7812F28642004E02F6 /* WebGLVertexArrayObjectOES.h in Headers */, 25772 319E69B313299BBD004AC91A /* WebKitAnimation.h in Headers */,25773 25722 31C0FF220E4CEB6E007D6FE5 /* WebKitAnimationEvent.h in Headers */, 25774 319E69B613299BBD004AC91A /* WebKitAnimationList.h in Headers */,25775 25723 976D6C7C122B8A3D001FD1F7 /* WebKitBlobBuilder.h in Headers */, 25776 25724 150B923A15F08DC400E10986 /* WebKitCSSArrayFunctionValue.h in Headers */, … … 26895 26843 BC1A37BF097C715F0019F3D8 /* DOMUtility.mm in Sources */, 26896 26844 15C770A5100D41CD005BA267 /* DOMValidityState.mm in Sources */, 26897 3194616B13020B66004BB3F8 /* DOMWebKitAnimation.mm in Sources */,26898 26845 31C0FF4A0E4CEFDD007D6FE5 /* DOMWebKitAnimationEvent.mm in Sources */, 26899 3194620513022BF1004BB3F8 /* DOMWebKitAnimationList.mm in Sources */,26900 26846 3106037A143281CD00ABF4BA /* DOMWebKitCSSFilterValue.mm in Sources */, 26901 26847 316FE07E0E6CCC2800BF6088 /* DOMWebKitCSSKeyframeRule.mm in Sources */, … … 27966 27912 0C45342710CDBBFA00869157 /* JSWebGLUniformLocation.cpp in Sources */, 27967 27913 77EF62F312F9DB7400C77BD2 /* JSWebGLVertexArrayObjectOES.cpp in Sources */, 27968 3194616213020B20004BB3F8 /* JSWebKitAnimation.cpp in Sources */,27969 319E68871327C911004AC91A /* JSWebKitAnimationCustom.cpp in Sources */,27970 27914 31C0FF3D0E4CEFAC007D6FE5 /* JSWebKitAnimationEvent.cpp in Sources */, 27971 319461FE13022BB8004BB3F8 /* JSWebKitAnimationList.cpp in Sources */,27972 3194623213022F65004BB3F8 /* JSWebKitAnimationListCustom.cpp in Sources */,27973 27915 310603741432819C00ABF4BA /* JSWebKitCSSFilterValue.cpp in Sources */, 27974 27916 316FE0710E6CCBEE00BF6088 /* JSWebKitCSSKeyframeRule.cpp in Sources */, … … 28896 28838 0C3F1F5A10C8871200D72CE1 /* WebGLUniformLocation.cpp in Sources */, 28897 28839 77A17A7712F28642004E02F6 /* WebGLVertexArrayObjectOES.cpp in Sources */, 28898 319E69B213299BBD004AC91A /* WebKitAnimation.cpp in Sources */,28899 28840 31C0FF210E4CEB6E007D6FE5 /* WebKitAnimationEvent.cpp in Sources */, 28900 319E69B513299BBD004AC91A /* WebKitAnimationList.cpp in Sources */,28901 28841 976D6C7B122B8A3D001FD1F7 /* WebKitBlobBuilder.cpp in Sources */, 28902 28842 150B923915F08DC400E10986 /* WebKitCSSArrayFunctionValue.cpp in Sources */, -
trunk/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp
r136903 r137243 150 150 #include "JSTrackEventCustom.cpp" 151 151 #include "JSTreeWalkerCustom.cpp" 152 #include "JSWebKitAnimationCustom.cpp"153 #include "JSWebKitAnimationListCustom.cpp"154 152 #include "JSWebKitCSSKeyframeRuleCustom.cpp" 155 153 #include "JSWebKitCSSKeyframesRuleCustom.cpp" -
trunk/Source/WebCore/dom/Element.cpp
r136975 r137243 77 77 #include "VoidCallback.h" 78 78 #include "WebCoreMemoryInstrumentation.h" 79 #include "WebKitAnimationList.h"80 79 #include "XMLNSNames.h" 81 80 #include "XMLNames.h" … … 2350 2349 } 2351 2350 2352 PassRefPtr<WebKitAnimationList> Element::webkitGetAnimations() const2353 {2354 if (!renderer())2355 return 0;2356 2357 AnimationController* animController = renderer()->animation();2358 2359 if (!animController)2360 return 0;2361 2362 return animController->animationsForRenderer(renderer());2363 }2364 2365 2351 RenderRegion* Element::renderRegion() const 2366 2352 { -
trunk/Source/WebCore/dom/Element.h
r136975 r137243 47 47 class RenderRegion; 48 48 class ShadowRoot; 49 class WebKitAnimationList;50 49 51 50 enum SpellcheckAttributeState { … … 460 459 virtual bool isSpellCheckingEnabled() const; 461 460 462 PassRefPtr<WebKitAnimationList> webkitGetAnimations() const;463 464 461 PassRefPtr<RenderStyle> styleForRenderer(); 465 462 -
trunk/Source/WebCore/dom/Element.idl
r136924 r137243 88 88 void scrollByLines(in [Optional=DefaultIsUndefined] long lines); 89 89 void scrollByPages(in [Optional=DefaultIsUndefined] long pages); 90 91 #if defined(ENABLE_ANIMATION_API) && ENABLE_ANIMATION_API92 WebKitAnimationList webkitGetAnimations();93 #endif94 90 95 91 // HTML 5 -
trunk/Source/WebCore/page/DOMWindow.idl
r136467 r137243 622 622 623 623 attribute StorageConstructor Storage; 624 625 #if defined(ENABLE_ANIMATION_API) && ENABLE_ANIMATION_API626 attribute WebKitAnimationConstructor WebKitAnimation;627 attribute WebKitAnimationListConstructor WebKitAnimationList;628 #endif629 624 630 625 attribute XPathEvaluatorConstructor XPathEvaluator; -
trunk/Source/WebCore/page/animation/AnimationController.cpp
r136744 r137243 40 40 #include "RenderView.h" 41 41 #include "WebKitAnimationEvent.h" 42 #include "WebKitAnimationList.h"43 42 #include "WebKitTransitionEvent.h" 44 43 #include <wtf/CurrentTime.h> … … 483 482 } 484 483 485 PassRefPtr<WebKitAnimationList> AnimationControllerPrivate::animationsForRenderer(RenderObject* renderer) const486 {487 RefPtr<CompositeAnimation> animation = m_compositeAnimations.get(renderer);488 489 if (!animation)490 return 0;491 492 return animation->animations();493 }494 495 484 AnimationController::AnimationController(Frame* frame) 496 485 : m_data(adoptPtr(new AnimationControllerPrivate(frame))) … … 649 638 } 650 639 651 PassRefPtr<WebKitAnimationList> AnimationController::animationsForRenderer(RenderObject* renderer) const652 {653 return m_data->animationsForRenderer(renderer);654 }655 656 640 } // namespace WebCore -
trunk/Source/WebCore/page/animation/AnimationController.h
r118052 r137243 44 44 class RenderObject; 45 45 class RenderStyle; 46 class WebKitAnimationList;47 46 48 47 class AnimationController { … … 79 78 static bool supportsAcceleratedAnimationOfProperty(CSSPropertyID); 80 79 81 PassRefPtr<WebKitAnimationList> animationsForRenderer(RenderObject*) const;82 83 80 private: 84 81 OwnPtr<AnimationControllerPrivate> m_data; -
trunk/Source/WebCore/page/animation/AnimationControllerPrivate.h
r127757 r137243 50 50 class RenderObject; 51 51 class RenderStyle; 52 class WebKitAnimationList;53 52 54 53 enum SetChanged { … … 108 107 void animationWillBeRemoved(AnimationBase*); 109 108 110 PassRefPtr<WebKitAnimationList> animationsForRenderer(RenderObject*) const;111 112 109 void updateAnimationTimerForRenderer(RenderObject*); 113 110 -
trunk/Source/WebCore/page/animation/CompositeAnimation.cpp
r133976 r137243 37 37 #include "RenderObject.h" 38 38 #include "RenderStyle.h" 39 #include "WebKitAnimation.h"40 #include "WebKitAnimationList.h"41 39 42 40 namespace WebCore { … … 575 573 } 576 574 577 PassRefPtr<WebKitAnimationList> CompositeAnimation::animations() const578 {579 RefPtr<WebKitAnimationList> animations = WebKitAnimationList::create();580 if (!m_keyframeAnimations.isEmpty()) {581 m_keyframeAnimations.checkConsistency();582 for (Vector<AtomicStringImpl*>::const_iterator it = m_keyframeAnimationOrderMap.begin(); it != m_keyframeAnimationOrderMap.end(); ++it) {583 RefPtr<KeyframeAnimation> keyframeAnimation = m_keyframeAnimations.get(*it);584 if (keyframeAnimation) {585 RefPtr<WebKitAnimation> anim = WebKitAnimation::create(keyframeAnimation);586 animations->append(anim);587 }588 }589 }590 return animations;591 }592 593 575 } // namespace WebCore -
trunk/Source/WebCore/page/animation/CompositeAnimation.h
r120044 r137243 42 42 class RenderObject; 43 43 class RenderStyle; 44 class WebKitAnimationList;45 44 46 45 // A CompositeAnimation represents a collection of animations that are running … … 82 81 unsigned numberOfActiveAnimations() const; 83 82 84 PassRefPtr<WebKitAnimationList> animations() const;85 86 83 private: 87 84 CompositeAnimation(AnimationControllerPrivate* animationController)
Note: See TracChangeset
for help on using the changeset viewer.