Skip to content

Commit

Permalink
[web-animations] rename DeclarativeAnimation to StyleOriginatedAnimation
Browse files Browse the repository at this point in the history 
https://bugs.webkit.org/show_bug.cgi?id=267640
rdar://121121419

Reviewed by Ryosuke Niwa.

Animations originated from CSS, CSS Animations and CSS Transitions, share a superclass named `DeclarativeAnimation`.
However, the terminology is "style-originated animation" as opposed to "script-originated animation". We rename
that shared superclass to reflect this.

* Source/WebCore/Sources.txt:
* Source/WebCore/WebCore.xcodeproj/project.pbxproj:
* Source/WebCore/animation/AnimationEffect.cpp:
(WebCore::AnimationEffect::getBindingsTiming const):
(WebCore::AnimationEffect::getBindingsComputedTiming const):
* Source/WebCore/animation/CSSAnimation.cpp:
(WebCore::CSSAnimation::CSSAnimation):
(WebCore::CSSAnimation::syncPropertiesWithBackingAnimation):
(WebCore::CSSAnimation::bindingsPlay):
(WebCore::CSSAnimation::bindingsPause):
(WebCore::CSSAnimation::setBindingsEffect):
(WebCore::CSSAnimation::setBindingsStartTime):
(WebCore::CSSAnimation::bindingsReverse):
(WebCore::CSSAnimation::updateKeyframesIfNeeded):
(WebCore::CSSAnimation::createEvent):
* Source/WebCore/animation/CSSAnimation.h:
* Source/WebCore/animation/CSSAnimationEvent.cpp:
(WebCore::CSSAnimationEvent::CSSAnimationEvent):
* Source/WebCore/animation/CSSAnimationEvent.h:
* Source/WebCore/animation/CSSTransition.cpp:
(WebCore::CSSTransition::CSSTransition):
(WebCore::CSSTransition::resolve):
(WebCore::CSSTransition::animationDidFinish):
(WebCore::CSSTransition::createEvent):
* Source/WebCore/animation/CSSTransition.h:
* Source/WebCore/animation/CSSTransitionEvent.cpp:
(WebCore::CSSTransitionEvent::CSSTransitionEvent):
* Source/WebCore/animation/CSSTransitionEvent.h:
* Source/WebCore/animation/DocumentTimeline.cpp:
* Source/WebCore/animation/KeyframeEffect.cpp:
(WebCore::KeyframeEffect::getKeyframes):
(WebCore::KeyframeEffect::computeStyleOriginatedAnimationBlendingKeyframes):
(WebCore::KeyframeEffect::timingFunctionForBlendingKeyframe const):
(WebCore::KeyframeEffect::computeExtentOfTransformAnimation const):
(WebCore::KeyframeEffect::bindingsComposite const):
(WebCore::KeyframeEffect::computeDeclarativeAnimationBlendingKeyframes): Deleted.
* Source/WebCore/animation/KeyframeEffect.h:
* Source/WebCore/animation/StyleOriginatedAnimation.cpp: Renamed from Source/WebCore/animation/DeclarativeAnimation.cpp.
(WebCore::StyleOriginatedAnimation::StyleOriginatedAnimation):
(WebCore::StyleOriginatedAnimation::~StyleOriginatedAnimation):
(WebCore::StyleOriginatedAnimation::owningElement const):
(WebCore::StyleOriginatedAnimation::tick):
(WebCore::StyleOriginatedAnimation::canHaveGlobalPosition):
(WebCore::StyleOriginatedAnimation::disassociateFromOwningElement):
(WebCore::StyleOriginatedAnimation::setBackingAnimation):
(WebCore::StyleOriginatedAnimation::initialize):
(WebCore::StyleOriginatedAnimation::syncPropertiesWithBackingAnimation):
(WebCore::StyleOriginatedAnimation::bindingsStartTime const):
(WebCore::StyleOriginatedAnimation::bindingsCurrentTime const):
(WebCore::StyleOriginatedAnimation::bindingsPlayState const):
(WebCore::StyleOriginatedAnimation::bindingsReplaceState const):
(WebCore::StyleOriginatedAnimation::bindingsPending const):
(WebCore::StyleOriginatedAnimation::bindingsReady):
(WebCore::StyleOriginatedAnimation::bindingsFinished):
(WebCore::StyleOriginatedAnimation::bindingsPlay):
(WebCore::StyleOriginatedAnimation::bindingsPause):
(WebCore::StyleOriginatedAnimation::flushPendingStyleChanges const):
(WebCore::StyleOriginatedAnimation::setTimeline):
(WebCore::StyleOriginatedAnimation::cancel):
(WebCore::StyleOriginatedAnimation::cancelFromStyle):
(WebCore::StyleOriginatedAnimation::phaseWithoutEffect const):
(WebCore::StyleOriginatedAnimation::effectTimeAtStart const):
(WebCore::StyleOriginatedAnimation::effectTimeAtIteration const):
(WebCore::StyleOriginatedAnimation::effectTimeAtEnd const):
(WebCore::StyleOriginatedAnimation::shouldFireDOMEvents const):
(WebCore::StyleOriginatedAnimation::invalidateDOMEvents):
(WebCore::StyleOriginatedAnimation::enqueueDOMEvent):
* Source/WebCore/animation/StyleOriginatedAnimation.h: Renamed from Source/WebCore/animation/DeclarativeAnimation.h.
(WebCore::StyleOriginatedAnimation::backingAnimation const):
* Source/WebCore/animation/StyleOriginatedAnimationEvent.cpp: Renamed from Source/WebCore/animation/DeclarativeAnimationEvent.cpp.
(WebCore::StyleOriginatedAnimationEvent::StyleOriginatedAnimationEvent):
(WebCore::StyleOriginatedAnimationEvent::pseudoElement):
* Source/WebCore/animation/StyleOriginatedAnimationEvent.h: Renamed from Source/WebCore/animation/DeclarativeAnimationEvent.h.
(WebCore::StyleOriginatedAnimationEvent::elapsedTime const):
(WebCore::StyleOriginatedAnimationEvent::pseudoId const):
* Source/WebCore/animation/WebAnimation.cpp:
(WebCore::WebAnimation::setEffect):
(WebCore::WebAnimation::setTimeline):
(WebCore::WebAnimation::isReplaceable const):
(WebCore::WebAnimation::isSkippedContentAnimation const):
* Source/WebCore/animation/WebAnimation.h:
(WebCore::WebAnimation::isStyleOriginatedAnimation const):
(WebCore::WebAnimation::isDeclarativeAnimation const): Deleted.
* Source/WebCore/animation/WebAnimationUtilities.cpp:
(WebCore::compareStyleOriginatedAnimationOwningElementPositionsInDocumentTreeOrder):
(WebCore::compareCSSTransitions):
(WebCore::compareCSSAnimations):
(WebCore::compareAnimationsByCompositeOrder):
(WebCore::compareStyleOriginatedAnimationEvents):
(WebCore::compareAnimationEventsByCompositeOrder):
(WebCore::compareDeclarativeAnimationOwningElementPositionsInDocumentTreeOrder): Deleted.
(WebCore::compareDeclarativeAnimationEvents): Deleted.
* Source/WebCore/dom/ContentVisibilityDocumentState.cpp:
(WebCore::ContentVisibilityDocumentState::updateAnimations):
* Source/WebCore/dom/Element.cpp:
(WebCore::Element::removeFromTopLayer):
* Source/WebCore/inspector/InspectorInstrumentation.h:
* Source/WebCore/inspector/agents/InspectorAnimationAgent.cpp:
(WebCore::buildObjectForKeyframes):
(WebCore::InspectorAnimationAgent::startTracking):
(WebCore::InspectorAnimationAgent::stopTracking):
(WebCore::InspectorAnimationAgent::willApplyKeyframeEffect):
(WebCore::InspectorAnimationAgent::didSetWebAnimationEffect):
(WebCore::InspectorAnimationAgent::willDestroyWebAnimation):
(WebCore::InspectorAnimationAgent::stopTrackingStyleOriginatedAnimation):
(WebCore::InspectorAnimationAgent::stopTrackingDeclarativeAnimation): Deleted.
* Source/WebCore/inspector/agents/InspectorAnimationAgent.h:
* Source/WebCore/platform/animation/AcceleratedEffect.cpp:
(WebCore::AcceleratedEffect::AcceleratedEffect):
* Source/WebCore/rendering/updating/RenderTreeUpdater.cpp:
(WebCore::RenderTreeUpdater::tearDownRenderers):
* Source/WebCore/style/Styleable.cpp:
(WebCore::Styleable::removeStyleOriginatedAnimationFromListsForOwningElement const):
(WebCore::Styleable::animationWasRemoved const):
(WebCore::Styleable::elementWasRemoved const):
(WebCore::Styleable::cancelStyleOriginatedAnimations const):
(WebCore::updateCSSTransitionsForStyleableAndProperty):
(WebCore::Styleable::removeDeclarativeAnimationFromListsForOwningElement const): Deleted.
(WebCore::Styleable::cancelDeclarativeAnimations const): Deleted.
* Source/WebCore/style/Styleable.h:

Canonical link: https://commits.webkit.org/273170@main
  • Loading branch information
@graouts
graouts committed Jan 18, 2024
1 parent f57f00a commit 1701618
Show file tree
Hide file tree
Showing 30 changed files with 189 additions and 188 deletions.
4 changes: 2 additions & 2 deletions Source/WebCore/Sources.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -571,8 +571,6 @@ animation/CSSTransition.cpp
animation/CSSTransitionEvent.cpp
animation/CompositeOperation.cpp
animation/CustomEffect.cpp
animation/DeclarativeAnimation.cpp
animation/DeclarativeAnimationEvent.cpp
animation/DocumentTimeline.cpp
animation/DocumentTimelinesController.cpp
animation/ElementAnimationRareData.cpp
Expand All @@ -581,6 +579,8 @@ animation/KeyframeEffect.cpp
animation/KeyframeEffectStack.cpp
animation/KeyframeInterpolation.cpp
animation/ScrollTimeline.cpp
animation/StyleOriginatedAnimation.cpp
animation/StyleOriginatedAnimationEvent.cpp
animation/ViewTimeline.cpp
animation/WebAnimation.cpp
animation/WebAnimationUtilities.cpp
Expand Down
30 changes: 15 additions & 15 deletions Source/WebCore/WebCore.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@
07277E4F17D018CC0015534D /* JSMediaStreamAudioDestinationNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 07277E4317D018CC0015534D /* JSMediaStreamAudioDestinationNode.h */; };
07277E5317D018CC0015534D /* JSMediaStreamTrack.h in Headers */ = {isa = PBXBuildFile; fileRef = 07277E4717D018CC0015534D /* JSMediaStreamTrack.h */; };
07277E5317D018CC0015535D /* JSVideoTrackGenerator.h in Headers */ = {isa = PBXBuildFile; fileRef = 07277E4717D018CC0015535D /* JSVideoTrackGenerator.h */; };
17277E5317D018CC0015535D /* JSMediaStreamTrackProcessor.h in Headers */ = {isa = PBXBuildFile; fileRef = 17277E4717D018CC0015535D /* JSMediaStreamTrackProcessor.h */; };
07277E5517D018CC0015534D /* JSMediaStreamTrackEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 07277E4917D018CC0015534D /* JSMediaStreamTrackEvent.h */; };
072880D12010F1F60071B255 /* RealtimeVideoCaptureSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 072880D02010EED70071B255 /* RealtimeVideoCaptureSource.h */; settings = {ATTRIBUTES = (Private, ); }; };
072A70401D6E8F6200DF0AFC /* OverconstrainedErrorEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 072A703E1D6E8F6200DF0AFC /* OverconstrainedErrorEvent.h */; };
Expand Down Expand Up @@ -499,6 +498,7 @@
159741DB1B7D140100201C92 /* JSMediaDeviceInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 157CC2621B7C1CA400D8D075 /* JSMediaDeviceInfo.h */; };
15C7708D100D3C6B005BA267 /* ValidityState.h in Headers */ = {isa = PBXBuildFile; fileRef = 15C7708A100D3C6A005BA267 /* ValidityState.h */; settings = {ATTRIBUTES = (Private, ); }; };
15C77093100D3CA8005BA267 /* JSValidityState.h in Headers */ = {isa = PBXBuildFile; fileRef = 15C77091100D3CA8005BA267 /* JSValidityState.h */; };
17277E5317D018CC0015535D /* JSMediaStreamTrackProcessor.h in Headers */ = {isa = PBXBuildFile; fileRef = 17277E4717D018CC0015535D /* JSMediaStreamTrackProcessor.h */; };
185BCF290F3279CE000EA262 /* ThreadTimers.h in Headers */ = {isa = PBXBuildFile; fileRef = 185BCF270F3279CE000EA262 /* ThreadTimers.h */; settings = {ATTRIBUTES = (Private, ); }; };
188604B40F2E654A000B6443 /* DOMTimer.h in Headers */ = {isa = PBXBuildFile; fileRef = 188604B20F2E654A000B6443 /* DOMTimer.h */; settings = {ATTRIBUTES = (Private, ); }; };
18F831B80FD48C7800D8C56B /* WorkerLoaderProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 18F831B70FD48C7800D8C56B /* WorkerLoaderProxy.h */; settings = {ATTRIBUTES = (Private, ); }; };
Expand Down Expand Up @@ -2706,7 +2706,7 @@
71556CB41F9F09BA00E78D08 /* KeyframeEffect.h in Headers */ = {isa = PBXBuildFile; fileRef = 71556CAA1F9F099B00E78D08 /* KeyframeEffect.h */; settings = {ATTRIBUTES = (Private, ); }; };
71556CBE1F9F0A4900E78D08 /* JSKeyframeEffect.h in Headers */ = {isa = PBXBuildFile; fileRef = 71556CB71F9F09FC00E78D08 /* JSKeyframeEffect.h */; };
7156BCA121CA350F00534397 /* BasicEffectTiming.h in Headers */ = {isa = PBXBuildFile; fileRef = 7156BC9F21CA350600534397 /* BasicEffectTiming.h */; settings = {ATTRIBUTES = (Private, ); }; };
715AD7202050513200D592DC /* DeclarativeAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 715AD71D2050512400D592DC /* DeclarativeAnimation.h */; settings = {ATTRIBUTES = (Private, ); }; };
715AD7202050513200D592DC /* StyleOriginatedAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 715AD71D2050512400D592DC /* StyleOriginatedAnimation.h */; settings = {ATTRIBUTES = (Private, ); }; };
715AD7212050513F00D592DC /* CSSTransition.h in Headers */ = {isa = PBXBuildFile; fileRef = 7123C186204739BA00789392 /* CSSTransition.h */; };
715FCD1729B09B0E002CE6A7 /* AcceleratedTimeline.h in Headers */ = {isa = PBXBuildFile; fileRef = 715FCD1629B09B09002CE6A7 /* AcceleratedTimeline.h */; settings = {ATTRIBUTES = (Private, ); }; };
7164D2CF29AFA0F6000AC8DA /* AcceleratedEffectValues.h in Headers */ = {isa = PBXBuildFile; fileRef = 7164D2CB29AFA0F5000AC8DA /* AcceleratedEffectValues.h */; settings = {ATTRIBUTES = (Private, ); }; };
Expand All @@ -2718,7 +2718,7 @@
7173694B275E0B6A003ADA9B /* CustomEffectCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 71A74B0A27592B3500DE80BA /* CustomEffectCallback.h */; };
7173694C275E0BAB003ADA9B /* CustomAnimationOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 71736947275E0B4B003ADA9B /* CustomAnimationOptions.h */; };
7177AD57274295D1002F103B /* HTMLModelElementCamera.h in Headers */ = {isa = PBXBuildFile; fileRef = 7177AD5627429590002F103B /* HTMLModelElementCamera.h */; settings = {ATTRIBUTES = (Private, ); }; };
717CE23A29335E9C001463BC /* DeclarativeAnimationEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 717CE23829335E8D001463BC /* DeclarativeAnimationEvent.h */; };
717CE23A29335E9C001463BC /* StyleOriginatedAnimationEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 717CE23829335E8D001463BC /* StyleOriginatedAnimationEvent.h */; };
7181A16C244F0F40007D8A24 /* DocumentTimelinesController.h in Headers */ = {isa = PBXBuildFile; fileRef = 7181A169244F0F2C007D8A24 /* DocumentTimelinesController.h */; settings = {ATTRIBUTES = (Private, ); }; };
71A1B6081DEE5AD70073BCFB /* modern-media-controls-localized-strings.js in Resources */ = {isa = PBXBuildFile; fileRef = 71A1B6061DEE5A820073BCFB /* modern-media-controls-localized-strings.js */; };
71A3D1812562B85B0064E2A6 /* HTMLModelElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 71A3D17D2562B8240064E2A6 /* HTMLModelElement.h */; settings = {ATTRIBUTES = (Private, ); }; };
Expand Down Expand Up @@ -6749,10 +6749,8 @@
07277E4317D018CC0015534D /* JSMediaStreamAudioDestinationNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMediaStreamAudioDestinationNode.h; sourceTree = "<group>"; };
07277E4617D018CC0015534D /* JSMediaStreamTrack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMediaStreamTrack.cpp; sourceTree = "<group>"; };
07277E4617D018CC0015535D /* JSVideoTrackGenerator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSVideoTrackGenerator.cpp; sourceTree = "<group>"; };
17277E4617D018CC0015535D /* JSMediaStreamTrackProcessor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMediaStreamTrackProcessor.cpp; sourceTree = "<group>"; };
07277E4717D018CC0015534D /* JSMediaStreamTrack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMediaStreamTrack.h; sourceTree = "<group>"; };
07277E4717D018CC0015535D /* JSVideoTrackGenerator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSVideoTrackGenerator.h; sourceTree = "<group>"; };
17277E4717D018CC0015535D /* JSMediaStreamTrackProcessor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMediaStreamTrackProcessor.h; sourceTree = "<group>"; };
07277E4817D018CC0015534D /* JSMediaStreamTrackEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMediaStreamTrackEvent.cpp; sourceTree = "<group>"; };
07277E4917D018CC0015534D /* JSMediaStreamTrackEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMediaStreamTrackEvent.h; sourceTree = "<group>"; };
072847E216EBC5B00043CFA4 /* PlatformTextTrack.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PlatformTextTrack.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -7504,6 +7502,8 @@
15C77091100D3CA8005BA267 /* JSValidityState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSValidityState.h; sourceTree = "<group>"; };
15C77092100D3CA8005BA267 /* JSValidityState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSValidityState.cpp; sourceTree = "<group>"; };
163E88F5118A39D200ED9231 /* SimpleFontDataCoreText.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SimpleFontDataCoreText.cpp; sourceTree = "<group>"; };
17277E4617D018CC0015535D /* JSMediaStreamTrackProcessor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMediaStreamTrackProcessor.cpp; sourceTree = "<group>"; };
17277E4717D018CC0015535D /* JSMediaStreamTrackProcessor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMediaStreamTrackProcessor.h; sourceTree = "<group>"; };
185BCF260F3279CE000EA262 /* ThreadTimers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ThreadTimers.cpp; sourceTree = "<group>"; };
185BCF270F3279CE000EA262 /* ThreadTimers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadTimers.h; sourceTree = "<group>"; };
188604B10F2E654A000B6443 /* DOMTimer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DOMTimer.cpp; sourceTree = "<group>"; };
Expand Down Expand Up @@ -12706,8 +12706,8 @@
71556CB71F9F09FC00E78D08 /* JSKeyframeEffect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSKeyframeEffect.h; sourceTree = "<group>"; };
7156BC9F21CA350600534397 /* BasicEffectTiming.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BasicEffectTiming.h; sourceTree = "<group>"; };
7157E3D11DC1EE4B0094550E /* scrubbing-support.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "scrubbing-support.js"; sourceTree = "<group>"; };
715AD71D2050512400D592DC /* DeclarativeAnimation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeclarativeAnimation.h; sourceTree = "<group>"; };
715AD71F2050512400D592DC /* DeclarativeAnimation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DeclarativeAnimation.cpp; sourceTree = "<group>"; };
715AD71D2050512400D592DC /* StyleOriginatedAnimation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StyleOriginatedAnimation.h; sourceTree = "<group>"; };
715AD71F2050512400D592DC /* StyleOriginatedAnimation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StyleOriginatedAnimation.cpp; sourceTree = "<group>"; };
715DA5D3201BB902002EF2B0 /* JSWebAnimationCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebAnimationCustom.cpp; sourceTree = "<group>"; };
715FCD1529B09B08002CE6A7 /* AcceleratedTimeline.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AcceleratedTimeline.cpp; sourceTree = "<group>"; };
715FCD1629B09B09002CE6A7 /* AcceleratedTimeline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AcceleratedTimeline.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -12765,8 +12765,8 @@
7177E2461DB80D2F00919A0B /* media-controller-support.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "media-controller-support.js"; sourceTree = "<group>"; };
7177E2471DB80D2F00919A0B /* mute-support.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "mute-support.js"; sourceTree = "<group>"; };
7177E2481DB80D2F00919A0B /* start-support.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "start-support.js"; sourceTree = "<group>"; };
717CE23829335E8D001463BC /* DeclarativeAnimationEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeclarativeAnimationEvent.h; sourceTree = "<group>"; };
717CE23929335E8E001463BC /* DeclarativeAnimationEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DeclarativeAnimationEvent.cpp; sourceTree = "<group>"; };
717CE23829335E8D001463BC /* StyleOriginatedAnimationEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StyleOriginatedAnimationEvent.h; sourceTree = "<group>"; };
717CE23929335E8E001463BC /* StyleOriginatedAnimationEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StyleOriginatedAnimationEvent.cpp; sourceTree = "<group>"; };
717DE7D52869B676004A39AB /* slider-base.css */ = {isa = PBXFileReference; lastKnownFileType = text.css; path = "slider-base.css"; sourceTree = "<group>"; };
717DE7D62869B678004A39AB /* slider-base.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = "slider-base.js"; sourceTree = "<group>"; };
717F618B1E43D61A00F37024 /* controls-bar.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = "controls-bar.css"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -27718,10 +27718,6 @@
71A74B052759293600DE80BA /* CustomEffect.idl */,
71A74B0A27592B3500DE80BA /* CustomEffectCallback.h */,
71A74B0927592A5300DE80BA /* CustomEffectCallback.idl */,
715AD71F2050512400D592DC /* DeclarativeAnimation.cpp */,
715AD71D2050512400D592DC /* DeclarativeAnimation.h */,
717CE23929335E8E001463BC /* DeclarativeAnimationEvent.cpp */,
717CE23829335E8D001463BC /* DeclarativeAnimationEvent.h */,
7C3A8AC02509A602008C477F /* Document+WebAnimations.idl */,
7C3655702506E0A700A7882B /* DocumentOrShadowRoot+WebAnimations.idl */,
71025EC41F99F096004A250C /* DocumentTimeline.cpp */,
Expand Down Expand Up @@ -27767,6 +27763,10 @@
713516902AE6D00A00718EBE /* ScrollTimeline.idl */,
713516942AE6D29600718EBE /* ScrollTimelineOptions.h */,
713516972AE6D29700718EBE /* ScrollTimelineOptions.idl */,
715AD71F2050512400D592DC /* StyleOriginatedAnimation.cpp */,
715AD71D2050512400D592DC /* StyleOriginatedAnimation.h */,
717CE23929335E8E001463BC /* StyleOriginatedAnimationEvent.cpp */,
717CE23829335E8D001463BC /* StyleOriginatedAnimationEvent.h */,
7135169D2AE6EF2800718EBE /* ViewTimeline.cpp */,
7135169F2AE6EF2900718EBE /* ViewTimeline.h */,
713516A12AE6EF2A00718EBE /* ViewTimeline.idl */,
Expand Down Expand Up @@ -38353,8 +38353,6 @@
BC4A532D256056D50028C592 /* DebugOverlayRegions.h in Headers */,
0F6A12BE1A00923700C6DE72 /* DebugPageOverlays.h in Headers */,
45FEA5D0156DDE8C00654101 /* Decimal.h in Headers */,
715AD7202050513200D592DC /* DeclarativeAnimation.h in Headers */,
717CE23A29335E9C001463BC /* DeclarativeAnimationEvent.h in Headers */,
464E5D292901A53B0051ACDA /* DeclaredStylePropertyMap.h in Headers */,
A8C228A111D5722E00D5A7D3 /* DecodedDataDocumentParser.h in Headers */,
555130011E7CCCCB00A69E38 /* DecodingOptions.h in Headers */,
Expand Down Expand Up @@ -41871,6 +41869,8 @@
32488D27299458D400934627 /* StyleMiscNonInheritedData.h in Headers */,
BC5EB74E0E81E06700B25965 /* StyleMultiColData.h in Headers */,
324EBEDB2993544F006F8973 /* StyleNonInheritedData.h in Headers */,
715AD7202050513200D592DC /* StyleOriginatedAnimation.h in Headers */,
717CE23A29335E9C001463BC /* StyleOriginatedAnimationEvent.h in Headers */,
E4DACE6A1D12E10B0075980F /* StylePendingResources.h in Headers */,
A80E6DFC0A199067007FB8C5 /* StyleProperties.h in Headers */,
930A76CB297FA2B30055B743 /* StylePropertiesInlines.h in Headers */,
Expand Down
8 changes: 4 additions & 4 deletions Source/WebCore/animation/AnimationEffect.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ void AnimationEffect::setAnimation(WebAnimation* animation)

EffectTiming AnimationEffect::getBindingsTiming() const
{
if (auto* declarativeAnimation = dynamicDowncast<DeclarativeAnimation>(animation()))
declarativeAnimation->flushPendingStyleChanges();
if (auto* styleOriginatedAnimation = dynamicDowncast<StyleOriginatedAnimation>(animation()))
styleOriginatedAnimation->flushPendingStyleChanges();

EffectTiming timing;
timing.delay = secondsToWebAnimationsAPITime(m_timing.delay);
Expand Down Expand Up @@ -102,8 +102,8 @@ BasicEffectTiming AnimationEffect::getBasicTiming(std::optional<Seconds> startTi

ComputedEffectTiming AnimationEffect::getBindingsComputedTiming() const
{
if (auto* declarativeAnimation = dynamicDowncast<DeclarativeAnimation>(animation()))
declarativeAnimation->flushPendingStyleChanges();
if (auto* styleOriginatedAnimation = dynamicDowncast<StyleOriginatedAnimation>(animation()))
styleOriginatedAnimation->flushPendingStyleChanges();
return getComputedTiming();
}

Expand Down
Loading

0 comments on commit 1701618

Please sign in to comment.