diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog index 8578f84e5b0699c4168e3ee73597ff8bfa0cd9b0..b4d8ce6eb053a93914376f4130e4b534258ec42f 100644 --- a/LayoutTests/ChangeLog +++ b/LayoutTests/ChangeLog @@ -1,3 +1,21 @@ +2011-01-07 James Robinson + + Revert "Implement mozilla's animationTime property" + https://bugs.webkit.org/show_bug.cgi?id=51952 + + This approach isn't quite right. + + * animations/animation-time-expected.txt: Removed. + * animations/animation-time.html: Removed. + * animations/script-tests/animation-time.js: Removed. + * fast/dom/Window/window-properties-expected.txt: + * fast/dom/Window/window-property-descriptors-expected.txt: + * platform/gtk/fast/dom/Window/window-properties-expected.txt: + * platform/gtk/fast/dom/Window/window-property-descriptors-expected.txt: + * platform/qt/fast/dom/Window/window-properties-expected.txt: + * platform/qt/fast/dom/Window/window-property-descriptors-expected.txt: + * platform/win/fast/dom/Window/window-property-descriptors-expected.txt: + 2011-01-07 Stephen White Unreviewed; test expectations update. diff --git a/LayoutTests/animations/animation-time-expected.txt b/LayoutTests/animations/animation-time-expected.txt deleted file mode 100644 index 86c2353d0c87604b3b2ca3d21d0e67f78058c186..0000000000000000000000000000000000000000 --- a/LayoutTests/animations/animation-time-expected.txt +++ /dev/null @@ -1,12 +0,0 @@ -Tests that window.webkitAnimationTime remains the same during a script run and that all animations started within a script run are synchronized - -On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". - - -PASS startAnimationTime is defined. -PASS startAnimationTime is endAnimationTime -PASS window.getComputedStyle(div1).left is window.getComputedStyle(div2).left -PASS successfullyParsed is true - -TEST COMPLETE - diff --git a/LayoutTests/animations/animation-time.html b/LayoutTests/animations/animation-time.html deleted file mode 100644 index 0cf69503e0f19079f2f7b61ab53389c44c26b0ef..0000000000000000000000000000000000000000 --- a/LayoutTests/animations/animation-time.html +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - -

-
-
-
- - - - diff --git a/LayoutTests/animations/script-tests/animation-time.js b/LayoutTests/animations/script-tests/animation-time.js deleted file mode 100644 index 4fcf31243174d16f2a6b0067ab24e45e4bbdee4b..0000000000000000000000000000000000000000 --- a/LayoutTests/animations/script-tests/animation-time.js +++ /dev/null @@ -1,28 +0,0 @@ -description("Tests that window.webkitAnimationTime remains the same during a script run and that all animations started within a script run are synchronized"); -window.jsTestIsAsync = true; - -var div1 = document.getElementById("div1"); -var div2 = document.getElementById("div2"); - -div1.classList.add("animated"); -document.body.offsetTop; // Force a style recalc to start the first animation. - -var startAnimationTime = window.webkitAnimationTime; -shouldBeDefined('startAnimationTime'); - -var startTime = Date.now(); -while (Date.now() - startTime < 10) {} - -var endAnimationTime = window.webkitAnimationTime; -// Test that the webkitAnimationTime value hasn't changed out from under us. -shouldBe('startAnimationTime', 'endAnimationTime'); - -// Start a second declarative animation ~10ms after the first one. They should be in sync. -div2.classList.add("animated"); - -window.setTimeout(function() { - shouldBe('window.getComputedStyle(div1).left', 'window.getComputedStyle(div2).left'); - finishJSTest(); -}, 50); - -var successfullyParsed = true; diff --git a/LayoutTests/fast/dom/Window/window-properties-expected.txt b/LayoutTests/fast/dom/Window/window-properties-expected.txt index 80d816862355ee61e70c401da1109924f9e3a57e..f9bfff578db497deb8dea457ba6b90dba334bf6e 100644 --- a/LayoutTests/fast/dom/Window/window-properties-expected.txt +++ b/LayoutTests/fast/dom/Window/window-properties-expected.txt @@ -2420,7 +2420,6 @@ window.typeOfNullAware [function] window.typeStringNullAware [function] window.undefined [undefined] window.unescape [function] -window.webkitAnimationTime [number] window.webkitConvertPointFromNodeToPage [function] window.webkitConvertPointFromPageToNode [function] window.window [printed above as window] diff --git a/LayoutTests/fast/dom/Window/window-property-descriptors-expected.txt b/LayoutTests/fast/dom/Window/window-property-descriptors-expected.txt index 13116da4936d8aa83956987ae3648d3e9338422c..68315ad6d4d8a9fada2e8d2ba6e86fa7665e8296 100644 --- a/LayoutTests/fast/dom/Window/window-property-descriptors-expected.txt +++ b/LayoutTests/fast/dom/Window/window-property-descriptors-expected.txt @@ -483,7 +483,6 @@ PASS typeof Object.getOwnPropertyDescriptor(window, 'toolbar') is 'object' PASS typeof Object.getOwnPropertyDescriptor(window, 'top') is 'object' PASS typeof Object.getOwnPropertyDescriptor(window, 'undefined') is 'object' PASS typeof Object.getOwnPropertyDescriptor(window, 'unescape') is 'object' -PASS typeof Object.getOwnPropertyDescriptor(window, 'webkitAnimationTime') is 'object' PASS typeof Object.getOwnPropertyDescriptor(window, 'window') is 'object' PASS typeof Object.getOwnPropertyDescriptor(window, 'windowPropertyNames') is 'object' PASS Object.getOwnPropertyDescriptor(window, '__defineGetter__') is undefined. diff --git a/LayoutTests/platform/gtk/fast/dom/Window/window-properties-expected.txt b/LayoutTests/platform/gtk/fast/dom/Window/window-properties-expected.txt index c09ddaff3b5c38ee8334f02d26808165717ce226..2beaffea525310e1c082bd4ed16800d3cefc8405 100644 --- a/LayoutTests/platform/gtk/fast/dom/Window/window-properties-expected.txt +++ b/LayoutTests/platform/gtk/fast/dom/Window/window-properties-expected.txt @@ -2374,7 +2374,6 @@ window.typeOfNullAware [function] window.typeStringNullAware [function] window.undefined [undefined] window.unescape [function] -window.webkitAnimationTime [number] window.webkitConvertPointFromNodeToPage [function] window.webkitConvertPointFromPageToNode [function] window.window [printed above as window] diff --git a/LayoutTests/platform/gtk/fast/dom/Window/window-property-descriptors-expected.txt b/LayoutTests/platform/gtk/fast/dom/Window/window-property-descriptors-expected.txt index 8d4d83c1f3e0f41c6c9185d9f5195faa0e1f2101..226a64826158271613ba0c26a9885faf16bbf0b3 100644 --- a/LayoutTests/platform/gtk/fast/dom/Window/window-property-descriptors-expected.txt +++ b/LayoutTests/platform/gtk/fast/dom/Window/window-property-descriptors-expected.txt @@ -481,7 +481,6 @@ PASS typeof Object.getOwnPropertyDescriptor(window, 'toolbar') is 'object' PASS typeof Object.getOwnPropertyDescriptor(window, 'top') is 'object' PASS typeof Object.getOwnPropertyDescriptor(window, 'undefined') is 'object' PASS typeof Object.getOwnPropertyDescriptor(window, 'unescape') is 'object' -PASS typeof Object.getOwnPropertyDescriptor(window, 'webkitAnimationTime') is 'object' PASS typeof Object.getOwnPropertyDescriptor(window, 'window') is 'object' PASS typeof Object.getOwnPropertyDescriptor(window, 'windowPropertyNames') is 'object' PASS Object.getOwnPropertyDescriptor(window, '__defineGetter__') is undefined. diff --git a/LayoutTests/platform/qt/fast/dom/Window/window-properties-expected.txt b/LayoutTests/platform/qt/fast/dom/Window/window-properties-expected.txt index 43adacbc582197c13bbedaaf12a17b72b48f2eaf..b44b30088919c892cb825eb0c8983a8ff55335e8 100644 --- a/LayoutTests/platform/qt/fast/dom/Window/window-properties-expected.txt +++ b/LayoutTests/platform/qt/fast/dom/Window/window-properties-expected.txt @@ -2392,7 +2392,6 @@ window.typeOfNullAware [function] window.typeStringNullAware [function] window.undefined [undefined] window.unescape [function] -window.webkitAnimationTime [number] window.webkitConvertPointFromNodeToPage [function] window.webkitConvertPointFromPageToNode [function] window.webkitNotifications [object NotificationCenter] diff --git a/LayoutTests/platform/qt/fast/dom/Window/window-property-descriptors-expected.txt b/LayoutTests/platform/qt/fast/dom/Window/window-property-descriptors-expected.txt index 877705efe749f38c6df5a5f6b5ecc9764d12edca..943374c5349aa65c6a76cf5eb2bc2ca3a7ecb7bc 100644 --- a/LayoutTests/platform/qt/fast/dom/Window/window-property-descriptors-expected.txt +++ b/LayoutTests/platform/qt/fast/dom/Window/window-property-descriptors-expected.txt @@ -478,7 +478,6 @@ PASS typeof Object.getOwnPropertyDescriptor(window, 'toolbar') is 'object' PASS typeof Object.getOwnPropertyDescriptor(window, 'top') is 'object' PASS typeof Object.getOwnPropertyDescriptor(window, 'undefined') is 'object' PASS typeof Object.getOwnPropertyDescriptor(window, 'unescape') is 'object' -PASS typeof Object.getOwnPropertyDescriptor(window, 'webkitAnimationTime') is 'object' PASS typeof Object.getOwnPropertyDescriptor(window, 'webkitNotifications') is 'object' PASS typeof Object.getOwnPropertyDescriptor(window, 'window') is 'object' PASS typeof Object.getOwnPropertyDescriptor(window, 'windowPropertyNames') is 'object' diff --git a/LayoutTests/platform/win/fast/dom/Window/window-property-descriptors-expected.txt b/LayoutTests/platform/win/fast/dom/Window/window-property-descriptors-expected.txt index 0d9f5f732f3da4245146d3b8336b9d90b07911d8..5d1af9a65224d737517c7a87ef59710b4f26cf14 100644 --- a/LayoutTests/platform/win/fast/dom/Window/window-property-descriptors-expected.txt +++ b/LayoutTests/platform/win/fast/dom/Window/window-property-descriptors-expected.txt @@ -481,7 +481,6 @@ PASS typeof Object.getOwnPropertyDescriptor(window, 'toolbar') is 'object' PASS typeof Object.getOwnPropertyDescriptor(window, 'top') is 'object' PASS typeof Object.getOwnPropertyDescriptor(window, 'undefined') is 'object' PASS typeof Object.getOwnPropertyDescriptor(window, 'unescape') is 'object' -PASS typeof Object.getOwnPropertyDescriptor(window, 'webkitAnimationTime') is 'object' PASS typeof Object.getOwnPropertyDescriptor(window, 'window') is 'object' PASS typeof Object.getOwnPropertyDescriptor(window, 'windowPropertyNames') is 'object' PASS Object.getOwnPropertyDescriptor(window, '__defineGetter__') is undefined. diff --git a/Tools/ChangeLog b/Tools/ChangeLog index 69afbe2f3a8bf3f53d4cd0160b289887b38876bc..dcdfc5f9baa1126ab88db31864bad5f9caf6840e 100644 --- a/Tools/ChangeLog +++ b/Tools/ChangeLog @@ -1,3 +1,13 @@ +2011-01-07 James Robinson + + Revert "Implement mozilla's animationTime property" + https://bugs.webkit.org/show_bug.cgi?id=51952 + + This approach isn't quite right. + + * DumpRenderTree/chromium/WebViewHost.cpp: + (WebViewHost::paintInvalidatedRegion): + 2011-01-07 Adam Roben Build master fix diff --git a/Tools/DumpRenderTree/chromium/WebViewHost.cpp b/Tools/DumpRenderTree/chromium/WebViewHost.cpp index bbc32fc5add9f6546a2e74879db287fd9b1c30ba..849312c4b05edb8234fc0c75614ba961d028f10a 100644 --- a/Tools/DumpRenderTree/chromium/WebViewHost.cpp +++ b/Tools/DumpRenderTree/chromium/WebViewHost.cpp @@ -1482,7 +1482,6 @@ void WebViewHost::paintInvalidatedRegion() paintRect(rect); } ASSERT(m_paintRect.isEmpty()); - webWidget()->clearCurrentAnimationTime(); } PlatformCanvas* WebViewHost::canvas() diff --git a/WebCore/Android.mk b/WebCore/Android.mk index 530e6a19a5988a3feba097f083c11af00ce617b9..20db667314227d63233f9bedd864bee65d4a1b18 100644 --- a/WebCore/Android.mk +++ b/WebCore/Android.mk @@ -446,7 +446,6 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ \ page/animation/AnimationBase.cpp \ page/animation/AnimationController.cpp \ - page/animation/AnimationTimeController.cpp \ page/animation/CompositeAnimation.cpp \ page/animation/ImplicitAnimation.cpp \ page/animation/KeyframeAnimation.cpp \ diff --git a/WebCore/CMakeLists.txt b/WebCore/CMakeLists.txt index b29284033675e00aa2f14f8db58b9c6378c4e298..8774a09f76a91bd813fb2b842b0b9314c1760791 100644 --- a/WebCore/CMakeLists.txt +++ b/WebCore/CMakeLists.txt @@ -1279,7 +1279,6 @@ SET(WebCore_SOURCES page/animation/AnimationBase.cpp page/animation/AnimationController.cpp - page/animation/AnimationTimeController.cpp page/animation/CompositeAnimation.cpp page/animation/ImplicitAnimation.cpp page/animation/KeyframeAnimation.cpp diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog index 6a427a075857301a66d77bed7081858c1f75602d..98cbc73005cd472bc7f05e5347364201b1df13d4 100644 --- a/WebCore/ChangeLog +++ b/WebCore/ChangeLog @@ -1,3 +1,31 @@ +2011-01-07 James Robinson + + Revert "Implement mozilla's animationTime property" + https://bugs.webkit.org/show_bug.cgi?id=51952 + + This approach isn't quite right. + + * Android.mk: + * CMakeLists.txt: + * GNUmakefile.am: + * WebCore.exp.in: + * WebCore.gypi: + * WebCore.pro: + * WebCore.vcproj/WebCore.vcproj: + * WebCore.xcodeproj/project.pbxproj: + * page/DOMWindow.cpp: + * page/DOMWindow.h: + * page/DOMWindow.idl: + * page/Frame.cpp: + * page/Frame.h: + * page/Page.cpp: + (WebCore::Page::Page): + * page/Page.h: + * page/animation/AnimationController.cpp: + (WebCore::AnimationControllerPrivate::beginAnimationUpdateTime): + * page/animation/AnimationTimeController.cpp: Removed. + * page/animation/AnimationTimeController.h: Removed. + 2011-01-07 Jan Erik Hanssen Reviewed by Andreas Kling. diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am index 3e0534b6533f392c9e35c881f26c4d980cc2ba9b..0df0b68635d106dc4916a9a630834b31aa1cfdf7 100644 --- a/WebCore/GNUmakefile.am +++ b/WebCore/GNUmakefile.am @@ -2153,8 +2153,6 @@ webcore_sources += \ WebCore/page/animation/AnimationController.cpp \ WebCore/page/animation/AnimationController.h \ WebCore/page/animation/AnimationControllerPrivate.h \ - WebCore/page/animation/AnimationTimeController.cpp \ - WebCore/page/animation/AnimationTimeController.h \ WebCore/page/animation/CompositeAnimation.cpp \ WebCore/page/animation/CompositeAnimation.h \ WebCore/page/animation/ImplicitAnimation.cpp \ diff --git a/WebCore/WebCore.exp.in b/WebCore/WebCore.exp.in index da2d78c9dcb6ba545131e4f82c8c7e91e32c8ce6..7e3608d85282456d466eda68387331a881396bca 100644 --- a/WebCore/WebCore.exp.in +++ b/WebCore/WebCore.exp.in @@ -519,7 +519,6 @@ __ZN7WebCore22contextMenuItemTagBoldEv __ZN7WebCore22counterValueForElementEPNS_7ElementE __ZN7WebCore22createFragmentFromTextEPNS_5RangeERKN3WTF6StringE __ZN7WebCore22externalRepresentationEPNS_5FrameEj -__ZN7WebCore23AnimationTimeController25clearCurrentAnimationTimeEv __ZN7WebCore23AuthenticationChallengeC1ERKNS_15ProtectionSpaceERKNS_10CredentialEjRKNS_16ResourceResponseERKNS_13ResourceErrorE __ZN7WebCore23ReplaceSelectionCommandC1EPNS_8DocumentEN3WTF10PassRefPtrINS_16DocumentFragmentEEEbbbbbNS_10EditActionE __ZN7WebCore23createFragmentFromNodesEPNS_8DocumentERKN3WTF6VectorIPNS_4NodeELm0EEE diff --git a/WebCore/WebCore.gypi b/WebCore/WebCore.gypi index b5c24db648ec9ac0608a59c4419d1489b628055c..d5df56c64f3a79ba249eb733349778dcd9ee81dd 100644 --- a/WebCore/WebCore.gypi +++ b/WebCore/WebCore.gypi @@ -2223,8 +2223,6 @@ 'page/animation/AnimationController.cpp', 'page/animation/AnimationController.h', 'page/animation/AnimationControllerPrivate.h', - 'page/animation/AnimationTimeController.cpp', - 'page/animation/AnimationTimeController.h', 'page/animation/CompositeAnimation.cpp', 'page/animation/CompositeAnimation.h', 'page/animation/ImplicitAnimation.cpp', diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro index 13755a6fcc37287014742a497636bca1cf27f647..7fe59f6a96e37cec9a598ee022602c7ee46c71f8 100644 --- a/WebCore/WebCore.pro +++ b/WebCore/WebCore.pro @@ -1113,7 +1113,6 @@ SOURCES += \ notifications/NotificationCenter.cpp \ page/animation/AnimationBase.cpp \ page/animation/AnimationController.cpp \ - page/animation/AnimationTimeController.cpp \ page/animation/CompositeAnimation.cpp \ page/animation/ImplicitAnimation.cpp \ page/animation/KeyframeAnimation.cpp \ diff --git a/WebCore/WebCore.vcproj/WebCore.vcproj b/WebCore/WebCore.vcproj/WebCore.vcproj index 158721e1fa13d5693441704cf492a720b8b95b80..620fec1dd44e1972acf0d73a2951170b3b9a2ad1 100755 --- a/WebCore/WebCore.vcproj/WebCore.vcproj +++ b/WebCore/WebCore.vcproj/WebCore.vcproj @@ -24241,14 +24241,6 @@ RelativePath="..\page\animation\AnimationControllerPrivate.h" > - - - - diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj index c34c731b758d38d60ae2979cfbf93ee585a6e913..3db3d1ccc8eb8a5ce064e4cb88dc0598b73806c3 100644 --- a/WebCore/WebCore.xcodeproj/project.pbxproj +++ b/WebCore/WebCore.xcodeproj/project.pbxproj @@ -910,8 +910,6 @@ 37FD4298118368460093C029 /* TreeDepthLimit.h in Headers */ = {isa = PBXBuildFile; fileRef = 37FD4297118368460093C029 /* TreeDepthLimit.h */; }; 3888F6EE128C9889000CA8E0 /* InspectorFileSystemAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3888F6EC128C9889000CA8E0 /* InspectorFileSystemAgent.cpp */; }; 3888F6EF128C9889000CA8E0 /* InspectorFileSystemAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 3888F6ED128C9889000CA8E0 /* InspectorFileSystemAgent.h */; }; - 38DF1B3512D5284200F0477E /* AnimationTimeController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38DF1B3312D5284200F0477E /* AnimationTimeController.cpp */; }; - 38DF1B3612D5284200F0477E /* AnimationTimeController.h in Headers */ = {isa = PBXBuildFile; fileRef = 38DF1B3412D5284200F0477E /* AnimationTimeController.h */; settings = {ATTRIBUTES = (Private, ); }; }; 3AC648B2129E146500C3EB25 /* EditingBoundary.h in Headers */ = {isa = PBXBuildFile; fileRef = 3AC648B1129E146500C3EB25 /* EditingBoundary.h */; settings = {ATTRIBUTES = (Private, ); }; }; 41002CCD0F66EDEF009E660D /* ScriptFunctionCall.h in Headers */ = {isa = PBXBuildFile; fileRef = 41002CCB0F66EDEF009E660D /* ScriptFunctionCall.h */; }; 41002CCE0F66EDEF009E660D /* ScriptFunctionCall.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41002CCC0F66EDEF009E660D /* ScriptFunctionCall.cpp */; }; @@ -7235,8 +7233,6 @@ 37FD4297118368460093C029 /* TreeDepthLimit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TreeDepthLimit.h; sourceTree = ""; }; 3888F6EC128C9889000CA8E0 /* InspectorFileSystemAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorFileSystemAgent.cpp; sourceTree = ""; }; 3888F6ED128C9889000CA8E0 /* InspectorFileSystemAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorFileSystemAgent.h; sourceTree = ""; }; - 38DF1B3312D5284200F0477E /* AnimationTimeController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AnimationTimeController.cpp; path = animation/AnimationTimeController.cpp; sourceTree = ""; }; - 38DF1B3412D5284200F0477E /* AnimationTimeController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AnimationTimeController.h; path = animation/AnimationTimeController.h; sourceTree = ""; }; 3AC648B1129E146500C3EB25 /* EditingBoundary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EditingBoundary.h; sourceTree = ""; }; 41002CCB0F66EDEF009E660D /* ScriptFunctionCall.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptFunctionCall.h; sourceTree = ""; }; 41002CCC0F66EDEF009E660D /* ScriptFunctionCall.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptFunctionCall.cpp; sourceTree = ""; }; @@ -13038,8 +13034,6 @@ 316FE1090E6E1DA700BF6088 /* AnimationController.cpp */, 316FE10A0E6E1DA700BF6088 /* AnimationController.h */, 0F15DA890F3AAEE70000CE47 /* AnimationControllerPrivate.h */, - 38DF1B3312D5284200F0477E /* AnimationTimeController.cpp */, - 38DF1B3412D5284200F0477E /* AnimationTimeController.h */, 316FE10B0E6E1DA700BF6088 /* CompositeAnimation.cpp */, 316FE10C0E6E1DA700BF6088 /* CompositeAnimation.h */, 316FE10D0E6E1DA700BF6088 /* ImplicitAnimation.cpp */, @@ -19333,7 +19327,6 @@ 316FE1120E6E1DA700BF6088 /* AnimationBase.h in Headers */, 316FE1140E6E1DA700BF6088 /* AnimationController.h in Headers */, 0F15DA8A0F3AAEE70000CE47 /* AnimationControllerPrivate.h in Headers */, - 38DF1B3612D5284200F0477E /* AnimationTimeController.h in Headers */, 49E912AD0EFAC906009D0CAF /* AnimationList.h in Headers */, 93309DD7099E64920056E581 /* AppendNodeCommand.h in Headers */, 1A8F6BBD0DB55CDC001DB794 /* ApplicationCache.h in Headers */, @@ -22622,7 +22615,6 @@ 49E912AA0EFAC906009D0CAF /* Animation.cpp in Sources */, 316FE1110E6E1DA700BF6088 /* AnimationBase.cpp in Sources */, 316FE1130E6E1DA700BF6088 /* AnimationController.cpp in Sources */, - 38DF1B3512D5284200F0477E /* AnimationTimeController.cpp in Sources */, 49E912AC0EFAC906009D0CAF /* AnimationList.cpp in Sources */, 93309DD6099E64920056E581 /* AppendNodeCommand.cpp in Sources */, 1A8F6BBC0DB55CDC001DB794 /* ApplicationCache.cpp in Sources */, diff --git a/WebCore/page/DOMWindow.cpp b/WebCore/page/DOMWindow.cpp index 99bf6ea52c5e436b5e5c59bf96be2e5f94a067b1..9988be4157a54f36a2db9beefcd6d10985c2a222 100644 --- a/WebCore/page/DOMWindow.cpp +++ b/WebCore/page/DOMWindow.cpp @@ -1464,13 +1464,6 @@ void DOMWindow::clearInterval(int timeoutId) DOMTimer::removeById(context, timeoutId); } -DOMTimeStamp DOMWindow::webkitAnimationTime() -{ - if (Frame* f = frame()) - return convertSecondsToDOMTimeStamp(f->currentAnimationTime()); - return convertSecondsToDOMTimeStamp(currentTime()); -} - bool DOMWindow::addEventListener(const AtomicString& eventType, PassRefPtr listener, bool useCapture) { if (!EventTarget::addEventListener(eventType, listener, useCapture)) diff --git a/WebCore/page/DOMWindow.h b/WebCore/page/DOMWindow.h index 8680bc52919ff04d3856ad3e561083d6e94ef399..9e72dec318a1105040c9660a1e5db1395c9f7830 100644 --- a/WebCore/page/DOMWindow.h +++ b/WebCore/page/DOMWindow.h @@ -27,7 +27,6 @@ #ifndef DOMWindow_h #define DOMWindow_h -#include "DOMTimeStamp.h" #include "KURL.h" #include "MessagePort.h" #include "SecurityOrigin.h" @@ -238,9 +237,6 @@ namespace WebCore { int setInterval(PassOwnPtr, int timeout, ExceptionCode&); void clearInterval(int timeoutId); - // WebKit animation extensions - DOMTimeStamp webkitAnimationTime(); - // Events // EventTarget API virtual bool addEventListener(const AtomicString& eventType, PassRefPtr, bool useCapture); diff --git a/WebCore/page/DOMWindow.idl b/WebCore/page/DOMWindow.idl index 89b37c1562377f6cb5ebcc39b569fb2dee0dd53d..389d5eda4006dcf588579e6622630bb8c02af936 100644 --- a/WebCore/page/DOMWindow.idl +++ b/WebCore/page/DOMWindow.idl @@ -235,9 +235,6 @@ module window { // [Custom] long setInterval(in DOMString code, in long timeout); void clearInterval(in long handle); - // WebKit animation extensions - readonly attribute DOMTimeStamp webkitAnimationTime; - // Base64 DOMString atob(in [ConvertNullToNullString] DOMString string) raises(DOMException); diff --git a/WebCore/page/Frame.cpp b/WebCore/page/Frame.cpp index 3997331eb1e83f1effef0e8b6357f3c1ed528e3f..e6f4866120f1966b4fc1691a2612dca45522580e 100644 --- a/WebCore/page/Frame.cpp +++ b/WebCore/page/Frame.cpp @@ -29,7 +29,6 @@ #include "config.h" #include "Frame.h" -#include "AnimationTimeController.h" #include "ApplyStyleCommand.h" #include "CSSComputedStyleDeclaration.h" #include "CSSMutableStyleDeclaration.h" @@ -84,7 +83,6 @@ #include "markup.h" #include "npruntime_impl.h" #include "visible_units.h" -#include #include #include @@ -768,14 +766,6 @@ void Frame::transferChildFrameToNewDocument() } } -double Frame::currentAnimationTime() -{ - if (Page* p = page()) - return p->animationTime()->currentAnimationTime(); - return currentTime(); -} - - String Frame::documentTypeString() const { if (DocumentType* doctype = document()->doctype()) diff --git a/WebCore/page/Frame.h b/WebCore/page/Frame.h index da77966441755c92f5761d0db5d8979aaf8cbb61..4928742ef2ef63a04cad23961c75c5495cc9e8c0 100644 --- a/WebCore/page/Frame.h +++ b/WebCore/page/Frame.h @@ -117,8 +117,6 @@ namespace WebCore { void transferChildFrameToNewDocument(); - double currentAnimationTime(); - // ======== All public functions below this point are candidates to move out of Frame into another class. ======== bool isDisconnected() const; diff --git a/WebCore/page/Page.cpp b/WebCore/page/Page.cpp index 808c561f2d8203edc287e7bb0a685040dcd57cb8..3718d0a9cd7b25fa991428e986c3cb05ad757406 100644 --- a/WebCore/page/Page.cpp +++ b/WebCore/page/Page.cpp @@ -20,7 +20,6 @@ #include "config.h" #include "Page.h" -#include "AnimationTimeController.h" #include "BackForwardController.h" #include "BackForwardList.h" #include "Base64.h" @@ -157,7 +156,6 @@ Page::Page(const PageClients& pageClients) , m_settings(adoptPtr(new Settings(this))) , m_progress(adoptPtr(new ProgressTracker)) , m_backForwardController(adoptPtr(new BackForwardController(this, pageClients.backForwardClient))) - , m_animationTimeController(AnimationTimeController::create()) , m_theme(RenderTheme::themeForPage(this)) , m_editorClient(pageClients.editorClient) , m_frameCount(0) diff --git a/WebCore/page/Page.h b/WebCore/page/Page.h index 2a057c3841733b792f50477db92ab7d14050bc01..7413bb699df1f70dea545f55a8f79bf9a1c560b9 100644 --- a/WebCore/page/Page.h +++ b/WebCore/page/Page.h @@ -39,7 +39,6 @@ namespace JSC { namespace WebCore { - class AnimationTimeController; class BackForwardController; class BackForwardList; class Chrome; @@ -183,7 +182,6 @@ namespace WebCore { Settings* settings() const { return m_settings.get(); } ProgressTracker* progress() const { return m_progress.get(); } BackForwardController* backForward() const { return m_backForwardController.get(); } - AnimationTimeController* animationTime() const { return m_animationTimeController.get(); } enum ViewMode { ViewModeInvalid, @@ -329,7 +327,6 @@ namespace WebCore { OwnPtr m_progress; OwnPtr m_backForwardController; - OwnPtr m_animationTimeController; RefPtr m_mainFrame; RefPtr m_globalHistoryItem; @@ -383,8 +380,6 @@ namespace WebCore { NotificationPresenter* m_notificationPresenter; #endif - double m_currentAnimationTime; - ViewMode m_viewMode; ViewportArguments m_viewportArguments; diff --git a/WebCore/page/animation/AnimationController.cpp b/WebCore/page/animation/AnimationController.cpp index 3f8d2d9eb7f80067ab22f964025c23839e91f765..a4e00637572f0f746a55959d780ed3bff3b034ff 100644 --- a/WebCore/page/animation/AnimationController.cpp +++ b/WebCore/page/animation/AnimationController.cpp @@ -317,7 +317,6 @@ double AnimationControllerPrivate::beginAnimationUpdateTime() { if (m_beginAnimationUpdateTime == cBeginAnimationUpdateTimeNotSet) m_beginAnimationUpdateTime = m_frame->currentAnimationTime(); - return m_beginAnimationUpdateTime; } diff --git a/WebCore/page/animation/AnimationTimeController.cpp b/WebCore/page/animation/AnimationTimeController.cpp deleted file mode 100644 index a0f2b334953a57403c2757cce90fa9a3a2b501cd..0000000000000000000000000000000000000000 --- a/WebCore/page/animation/AnimationTimeController.cpp +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright (C) 2011, Google 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 "AnimationTimeController.h" - -#include - -static const double cCurrentAnimationTimeNotSet = -1; - -namespace WebCore { - -AnimationTimeController::AnimationTimeController() - : m_currentAnimationTime(cCurrentAnimationTimeNotSet) - , m_clearCurrentAnimationTimeTimer(this, &AnimationTimeController::clearCurrentAnimationTimeTimerFired) -{ -} - -AnimationTimeController::~AnimationTimeController() -{ -} - -double AnimationTimeController::currentAnimationTime() -{ - if (m_currentAnimationTime == cCurrentAnimationTimeNotSet) { - m_currentAnimationTime = currentTime(); - // Clear out the animation time after 15ms if it hasn't been already. - m_clearCurrentAnimationTimeTimer.startOneShot(0.015); - } - return m_currentAnimationTime; -} - -void AnimationTimeController::clearCurrentAnimationTime() -{ - m_currentAnimationTime = cCurrentAnimationTimeNotSet; - if (m_clearCurrentAnimationTimeTimer.isActive()) - m_clearCurrentAnimationTimeTimer.stop(); -} - -void AnimationTimeController::clearCurrentAnimationTimeTimerFired(Timer*) -{ - clearCurrentAnimationTime(); -} - -} diff --git a/WebCore/page/animation/AnimationTimeController.h b/WebCore/page/animation/AnimationTimeController.h deleted file mode 100644 index 647fff20519f911bbda014ea973aee420f3eff99..0000000000000000000000000000000000000000 --- a/WebCore/page/animation/AnimationTimeController.h +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (C) 2011, Google 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 AnimationTimeController_h -#define AnimationTimeController_h - -#include "Timer.h" -#include - -namespace WebCore { - -class AnimationTimeController : public Noncopyable { -public: - static PassOwnPtr create() - { - return adoptPtr(new AnimationTimeController); - } - ~AnimationTimeController(); - - double currentAnimationTime(); - void clearCurrentAnimationTime(); - -private: - AnimationTimeController(); - - void clearCurrentAnimationTimeTimerFired(Timer*); - - double m_currentAnimationTime; - Timer m_clearCurrentAnimationTimeTimer; -}; - -} - -#endif // AnimationTimeController_h diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog index 5ae17126202358b7db5062bb4d2cacafcde90ea1..00920032da54e5f42b6f1017aa1c2bf768004ebd 100644 --- a/WebKit/chromium/ChangeLog +++ b/WebKit/chromium/ChangeLog @@ -1,3 +1,16 @@ +2011-01-07 James Robinson + + Revert "Implement mozilla's animationTime property" + https://bugs.webkit.org/show_bug.cgi?id=51952 + + This approach isn't quite right. + + * public/WebWidget.h: + * src/WebPopupMenuImpl.cpp: + * src/WebPopupMenuImpl.h: + * src/WebViewImpl.cpp: + * src/WebViewImpl.h: + 2011-01-05 Zhenyao Mo Reviewed by Kenneth Russell. diff --git a/WebKit/chromium/public/WebWidget.h b/WebKit/chromium/public/WebWidget.h index 676d303ef5af83e69f7a446d2f079bd0fadf65f5..ccad134f634e84f3fc0b9c644e660fc680f3ef12 100644 --- a/WebKit/chromium/public/WebWidget.h +++ b/WebKit/chromium/public/WebWidget.h @@ -56,10 +56,6 @@ public: // Called to resize the WebWidget. virtual void resize(const WebSize&) = 0; - // Called to indicate that this widget has been rendered and the widget - // no longer needs to store the animation time. - virtual void clearCurrentAnimationTime() = 0; - // Called to layout the WebWidget. This MUST be called before Paint, // and it may result in calls to WebWidgetClient::didInvalidateRect. virtual void layout() = 0; diff --git a/WebKit/chromium/src/WebPopupMenuImpl.cpp b/WebKit/chromium/src/WebPopupMenuImpl.cpp index d25b0f1707ffafa4fd60be33cfd74c18dd25faf3..63ebed809befb04e80f643136fbd31d7e8c69271 100644 --- a/WebKit/chromium/src/WebPopupMenuImpl.cpp +++ b/WebKit/chromium/src/WebPopupMenuImpl.cpp @@ -151,10 +151,6 @@ void WebPopupMenuImpl::resize(const WebSize& newSize) } } -void WebPopupMenuImpl::clearCurrentAnimationTime() -{ -} - void WebPopupMenuImpl::layout() { } diff --git a/WebKit/chromium/src/WebPopupMenuImpl.h b/WebKit/chromium/src/WebPopupMenuImpl.h index 281710116d6fd42069c6f1f0a727a7e577608333..b8ef7ba8e4b99fee904b8fb6793d6e6629e2ab49 100644 --- a/WebKit/chromium/src/WebPopupMenuImpl.h +++ b/WebKit/chromium/src/WebPopupMenuImpl.h @@ -61,7 +61,6 @@ public: virtual void close(); virtual WebSize size() { return m_size; } virtual void resize(const WebSize&); - virtual void clearCurrentAnimationTime(); virtual void layout(); virtual void paint(WebCanvas* canvas, const WebRect& rect); virtual void themeChanged(); diff --git a/WebKit/chromium/src/WebViewImpl.cpp b/WebKit/chromium/src/WebViewImpl.cpp index 54e72b309155f5259f01dc77c68b0553bf142763..e47c89e8a042ca2ef399ada40637518fb95aeb45 100644 --- a/WebKit/chromium/src/WebViewImpl.cpp +++ b/WebKit/chromium/src/WebViewImpl.cpp @@ -31,7 +31,6 @@ #include "config.h" #include "WebViewImpl.h" -#include "AnimationTimeController.h" #include "AutoFillPopupMenuClient.h" #include "AXObjectCache.h" #include "BackForwardListImpl.h" @@ -978,13 +977,6 @@ void WebViewImpl::resize(const WebSize& newSize) #endif } -void WebViewImpl::clearCurrentAnimationTime() -{ - WebFrameImpl* webframe = mainFrameImpl(); - if (webframe) - webframe->frame()->page()->animationTime()->clearCurrentAnimationTime(); -} - void WebViewImpl::layout() { WebFrameImpl* webframe = mainFrameImpl(); diff --git a/WebKit/chromium/src/WebViewImpl.h b/WebKit/chromium/src/WebViewImpl.h index f5b5df31474137bcf4129073d815ff32fcf6bc2c..cc25c8467193734d1c8a68bf39d255c50e9d5609 100644 --- a/WebKit/chromium/src/WebViewImpl.h +++ b/WebKit/chromium/src/WebViewImpl.h @@ -92,7 +92,6 @@ public: virtual void close(); virtual WebSize size() { return m_size; } virtual void resize(const WebSize&); - virtual void clearCurrentAnimationTime(); virtual void layout(); virtual void paint(WebCanvas*, const WebRect&); virtual void themeChanged(); diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog index 9ce17eb3fb88824a22befb9a11a9abf675d99e3b..9bc29941c392c1f88751ba4f818f18aec94439cf 100644 --- a/WebKit/mac/ChangeLog +++ b/WebKit/mac/ChangeLog @@ -1,3 +1,15 @@ +2011-01-07 James Robinson + + Revert "Implement mozilla's animationTime property" + https://bugs.webkit.org/show_bug.cgi?id=51952 + + This approach isn't quite right. + + * WebView/WebHTMLView.mm: + (-[WebHTMLView drawRect:]): + * WebView/WebView.mm: + (layerSyncRunLoopObserverCallBack): + 2011-01-06 Gavin Barraclough Reviewed by Geoff Garen. diff --git a/WebKit/mac/WebView/WebHTMLView.mm b/WebKit/mac/WebView/WebHTMLView.mm index 8083fce7c5be2108523c5df6f300585385d654ef..093f3db50410754048a488919c06b6b7c81240f7 100644 --- a/WebKit/mac/WebView/WebHTMLView.mm +++ b/WebKit/mac/WebView/WebHTMLView.mm @@ -75,7 +75,6 @@ #import "WebViewInternal.h" #import #import -#import #import #import #import @@ -3506,10 +3505,6 @@ static void setMenuTargets(NSMenu* menu) } #endif - Frame* frame = [webView _mainCoreFrame]; - if (frame && frame->page()) - frame->page()->animationTime()->clearCurrentAnimationTime(); - if (webView) CallUIDelegate(webView, @selector(webView:didDrawFrame:), [self _frame]); } diff --git a/WebKit/mac/WebView/WebView.mm b/WebKit/mac/WebView/WebView.mm index 1d368e4eaf821ed9789d99a195bcd9211f8bae95..96ea7d0d46645eaa3cd305c4a79d47cc05d2fcba 100644 --- a/WebKit/mac/WebView/WebView.mm +++ b/WebKit/mac/WebView/WebView.mm @@ -110,7 +110,6 @@ #import #import #import -#import #import #import #import @@ -5958,10 +5957,6 @@ static void layerSyncRunLoopObserverCallBack(CFRunLoopObserverRef, CFRunLoopActi // so that the layers draw with up-to-date layout. [webView _viewWillDrawInternal]; } - - Frame* frame = [webView _mainCoreFrame]; - if (frame && frame->page()) - frame->page()->animationTime()->clearCurrentAnimationTime(); } - (void)_scheduleCompositingLayerSync diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog index c6a065d31488aae3eb1b518165a135fd0ff52082..a44aa9ed8c52968e0800665a6fe0f89a37b2a789 100644 --- a/WebKit2/ChangeLog +++ b/WebKit2/ChangeLog @@ -1,3 +1,18 @@ +2011-01-07 James Robinson + + Revert "Implement mozilla's animationTime property" + https://bugs.webkit.org/show_bug.cgi?id=51952 + + This approach isn't quite right. + + * WebProcess/WebPage/ChunkedUpdateDrawingArea.cpp: + (WebKit::ChunkedUpdateDrawingArea::display): + (WebKit::ChunkedUpdateDrawingArea::setSize): + * WebProcess/WebPage/WebPage.cpp: + (WebKit::WebPage::drawRect): + * WebProcess/WebPage/mac/LayerBackedDrawingAreaMac.mm: + (WebKit::LayerBackedDrawingArea::syncCompositingLayers): + 2011-01-07 Amruth Raj and Ravi Phaneendra Kasibhatla Reviewed by Martin Robinson. diff --git a/WebKit2/WebProcess/WebPage/ChunkedUpdateDrawingArea.cpp b/WebKit2/WebProcess/WebPage/ChunkedUpdateDrawingArea.cpp index 53a1f252087132adfcbf20ee674dcf29692f37d0..1cce5d01011415b752d87fb7141b3dc82495a483 100644 --- a/WebKit2/WebProcess/WebPage/ChunkedUpdateDrawingArea.cpp +++ b/WebKit2/WebProcess/WebPage/ChunkedUpdateDrawingArea.cpp @@ -32,8 +32,6 @@ #include "WebCoreArgumentCoders.h" #include "WebPage.h" #include "WebProcess.h" -#include -#include using namespace WebCore; @@ -92,8 +90,6 @@ void ChunkedUpdateDrawingArea::display() paintIntoUpdateChunk(&updateChunk); WebProcess::shared().connection()->send(DrawingAreaProxyLegacyMessage::Update, m_webPage->pageID(), CoreIPC::In(updateChunk)); - - m_webPage->corePage()->animationTime()->clearCurrentAnimationTime(); m_isWaitingForUpdate = true; m_displayTimer.stop(); @@ -147,7 +143,6 @@ void ChunkedUpdateDrawingArea::setSize(const IntSize& viewSize) m_displayTimer.stop(); WebProcess::shared().connection()->send(DrawingAreaProxyLegacyMessage::DidSetSize, m_webPage->pageID(), CoreIPC::In(updateChunk)); - m_webPage->corePage()->animationTime()->clearCurrentAnimationTime(); } void ChunkedUpdateDrawingArea::suspendPainting() diff --git a/WebKit2/WebProcess/WebPage/WebPage.cpp b/WebKit2/WebProcess/WebPage/WebPage.cpp index cf44ee40f8645a39358db2dcab5e827750505c9e..66e1d7147390dc2204b803d61e3a992bfbe7fbfe 100644 --- a/WebKit2/WebProcess/WebPage/WebPage.cpp +++ b/WebKit2/WebProcess/WebPage/WebPage.cpp @@ -63,7 +63,6 @@ #include "WebProcessProxyMessageKinds.h" #include "WebProcessProxyMessages.h" #include -#include #include #include #include @@ -525,8 +524,6 @@ void WebPage::drawRect(GraphicsContext& graphicsContext, const IntRect& rect) m_pageOverlay->drawRect(graphicsContext, rect); graphicsContext.restore(); } - - m_page->animationTime()->clearCurrentAnimationTime(); } double WebPage::textZoomFactor() const diff --git a/WebKit2/WebProcess/WebPage/mac/LayerBackedDrawingAreaMac.mm b/WebKit2/WebProcess/WebPage/mac/LayerBackedDrawingAreaMac.mm index e30a69a970cdeccea54a2480b9e9a901cefc0800..f8b7e71b23fb3e6f360d9b67af4505382c5d38a1 100644 --- a/WebKit2/WebProcess/WebPage/mac/LayerBackedDrawingAreaMac.mm +++ b/WebKit2/WebProcess/WebPage/mac/LayerBackedDrawingAreaMac.mm @@ -31,7 +31,6 @@ #include "WebKitSystemInterface.h" #include "WebPage.h" #include "WebProcess.h" -#include #include #include #include @@ -122,8 +121,6 @@ void LayerBackedDrawingArea::syncCompositingLayers() if (!didSync) { } - - m_webPage->corePage()->animationTime()->clearCurrentAnimationTime(); } void LayerBackedDrawingArea::setUpUpdateLayoutRunLoopObserver()