mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
Add support for animationend event
This is triggered when an animation finishes. This is a high priority because it allows us to start rooting nodes with animations in the script thread. This doesn't yet cause a lot of tests to pass because they rely on the existence of `Document.getAnimations()` and the presence of `animationstart` and animationiteration` events.
This commit is contained in:
parent
6fb75c2b9e
commit
3903c1fb98
27 changed files with 335 additions and 331 deletions
76
components/script/dom/animationevent.rs
Normal file
76
components/script/dom/animationevent.rs
Normal file
|
@ -0,0 +1,76 @@
|
|||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
||||
|
||||
use crate::dom::bindings::codegen::Bindings::AnimationEventBinding::{
|
||||
AnimationEventInit, AnimationEventMethods,
|
||||
};
|
||||
use crate::dom::bindings::codegen::Bindings::EventBinding::EventMethods;
|
||||
use crate::dom::bindings::inheritance::Castable;
|
||||
use crate::dom::bindings::num::Finite;
|
||||
use crate::dom::bindings::reflector::reflect_dom_object;
|
||||
use crate::dom::bindings::root::DomRoot;
|
||||
use crate::dom::bindings::str::DOMString;
|
||||
use crate::dom::event::Event;
|
||||
use crate::dom::window::Window;
|
||||
use dom_struct::dom_struct;
|
||||
use servo_atoms::Atom;
|
||||
|
||||
#[dom_struct]
|
||||
pub struct AnimationEvent {
|
||||
event: Event,
|
||||
animation_name: Atom,
|
||||
elapsed_time: Finite<f32>,
|
||||
pseudo_element: DOMString,
|
||||
}
|
||||
|
||||
impl AnimationEvent {
|
||||
fn new_inherited(init: &AnimationEventInit) -> AnimationEvent {
|
||||
AnimationEvent {
|
||||
event: Event::new_inherited(),
|
||||
animation_name: Atom::from(init.animationName.clone()),
|
||||
elapsed_time: init.elapsedTime.clone(),
|
||||
pseudo_element: init.pseudoElement.clone(),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn new(window: &Window, type_: Atom, init: &AnimationEventInit) -> DomRoot<AnimationEvent> {
|
||||
let ev = reflect_dom_object(Box::new(AnimationEvent::new_inherited(init)), window);
|
||||
{
|
||||
let event = ev.upcast::<Event>();
|
||||
event.init_event(type_, init.parent.bubbles, init.parent.cancelable);
|
||||
}
|
||||
ev
|
||||
}
|
||||
|
||||
#[allow(non_snake_case)]
|
||||
pub fn Constructor(
|
||||
window: &Window,
|
||||
type_: DOMString,
|
||||
init: &AnimationEventInit,
|
||||
) -> DomRoot<AnimationEvent> {
|
||||
AnimationEvent::new(window, Atom::from(type_), init)
|
||||
}
|
||||
}
|
||||
|
||||
impl AnimationEventMethods for AnimationEvent {
|
||||
// https://drafts.csswg.org/css-animations/#interface-animationevent-attributes
|
||||
fn AnimationName(&self) -> DOMString {
|
||||
DOMString::from(&*self.animation_name)
|
||||
}
|
||||
|
||||
// https://drafts.csswg.org/css-animations/#interface-animationevent-attributes
|
||||
fn ElapsedTime(&self) -> Finite<f32> {
|
||||
self.elapsed_time.clone()
|
||||
}
|
||||
|
||||
// https://drafts.csswg.org/css-animations/#interface-animationevent-attributes
|
||||
fn PseudoElement(&self) -> DOMString {
|
||||
self.pseudo_element.clone()
|
||||
}
|
||||
|
||||
// https://dom.spec.whatwg.org/#dom-event-istrusted
|
||||
fn IsTrusted(&self) -> bool {
|
||||
self.upcast::<Event>().IsTrusted()
|
||||
}
|
||||
}
|
|
@ -442,6 +442,7 @@ macro_rules! global_event_handlers(
|
|||
);
|
||||
(NoOnload) => (
|
||||
event_handler!(abort, GetOnabort, SetOnabort);
|
||||
event_handler!(animationend, GetOnanimationend, SetOnanimationend);
|
||||
event_handler!(cancel, GetOncancel, SetOncancel);
|
||||
event_handler!(canplay, GetOncanplay, SetOncanplay);
|
||||
event_handler!(canplaythrough, GetOncanplaythrough, SetOncanplaythrough);
|
||||
|
|
|
@ -213,6 +213,7 @@ pub mod abstractworker;
|
|||
pub mod abstractworkerglobalscope;
|
||||
pub mod activation;
|
||||
pub mod analysernode;
|
||||
pub mod animationevent;
|
||||
pub mod attr;
|
||||
pub mod audiobuffer;
|
||||
pub mod audiobuffersourcenode;
|
||||
|
|
26
components/script/dom/webidls/AnimationEvent.webidl
Normal file
26
components/script/dom/webidls/AnimationEvent.webidl
Normal file
|
@ -0,0 +1,26 @@
|
|||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
*
|
||||
* The origin of this IDL file is
|
||||
* http://www.w3.org/TR/css3-animations/#animation-events-
|
||||
* http://dev.w3.org/csswg/css3-animations/#animation-events-
|
||||
*
|
||||
* Copyright © 2012 W3C® (MIT, ERCIM, Keio), All Rights Reserved. W3C
|
||||
* liability, trademark and document use rules apply.
|
||||
*/
|
||||
|
||||
[Exposed=Window]
|
||||
interface AnimationEvent : Event {
|
||||
constructor(DOMString type, optional AnimationEventInit eventInitDict = {});
|
||||
|
||||
readonly attribute DOMString animationName;
|
||||
readonly attribute float elapsedTime;
|
||||
readonly attribute DOMString pseudoElement;
|
||||
};
|
||||
|
||||
dictionary AnimationEventInit : EventInit {
|
||||
DOMString animationName = "";
|
||||
float elapsedTime = 0;
|
||||
DOMString pseudoElement = "";
|
||||
};
|
|
@ -90,6 +90,11 @@ interface mixin GlobalEventHandlers {
|
|||
attribute EventHandler onwaiting;
|
||||
};
|
||||
|
||||
// https://drafts.csswg.org/css-animations/#interface-globaleventhandlers-idl
|
||||
partial interface mixin GlobalEventHandlers {
|
||||
attribute EventHandler onanimationend;
|
||||
};
|
||||
|
||||
// https://drafts.csswg.org/css-transitions/#interface-globaleventhandlers-idl
|
||||
partial interface mixin GlobalEventHandlers {
|
||||
attribute EventHandler ontransitionrun;
|
||||
|
|
|
@ -1582,11 +1582,11 @@ impl Window {
|
|||
}
|
||||
|
||||
let for_display = reflow_goal == ReflowGoal::Full;
|
||||
let pipeline_id = self.upcast::<GlobalScope>().pipeline_id();
|
||||
if for_display && self.suppress_reflow.get() {
|
||||
debug!(
|
||||
"Suppressing reflow pipeline {} for reason {:?} before FirstLoad or RefreshTick",
|
||||
self.upcast::<GlobalScope>().pipeline_id(),
|
||||
reason
|
||||
pipeline_id, reason
|
||||
);
|
||||
return false;
|
||||
}
|
||||
|
@ -1617,11 +1617,7 @@ impl Window {
|
|||
|
||||
// On debug mode, print the reflow event information.
|
||||
if self.relayout_event {
|
||||
debug_reflow_events(
|
||||
self.upcast::<GlobalScope>().pipeline_id(),
|
||||
&reflow_goal,
|
||||
&reason,
|
||||
);
|
||||
debug_reflow_events(pipeline_id, &reflow_goal, &reason);
|
||||
}
|
||||
|
||||
let document = self.Document();
|
||||
|
@ -1699,12 +1695,11 @@ impl Window {
|
|||
{
|
||||
let (responder, responder_listener) =
|
||||
ProfiledIpc::channel(self.global().time_profiler_chan().clone()).unwrap();
|
||||
let pipeline = self.upcast::<GlobalScope>().pipeline_id();
|
||||
let image_cache_chan = self.image_cache_chan.clone();
|
||||
ROUTER.add_route(
|
||||
responder_listener.to_opaque(),
|
||||
Box::new(move |message| {
|
||||
let _ = image_cache_chan.send((pipeline, message.to().unwrap()));
|
||||
let _ = image_cache_chan.send((pipeline_id, message.to().unwrap()));
|
||||
}),
|
||||
);
|
||||
self.image_cache
|
||||
|
@ -1714,7 +1709,7 @@ impl Window {
|
|||
}
|
||||
|
||||
unsafe {
|
||||
ScriptThread::note_newly_transitioning_nodes(complete.newly_transitioning_nodes);
|
||||
ScriptThread::note_newly_animating_nodes(pipeline_id, complete.newly_animating_nodes);
|
||||
}
|
||||
|
||||
true
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue