mirror of
https://github.com/servo/servo.git
synced 2025-08-02 04:00:32 +01:00
Auto merge of #13056 - KiChjang:transition-event, r=mbrubeck
Implement transition event and infrastructure Fixes #10245. <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13056) <!-- Reviewable:end -->
This commit is contained in:
commit
cd2f950de3
23 changed files with 199 additions and 61 deletions
|
@ -451,6 +451,14 @@ impl<T: Reflectable> LayoutJS<T> {
|
|||
debug_assert!(thread_state::get().is_layout());
|
||||
*self.ptr
|
||||
}
|
||||
|
||||
/// Returns a reference to the interior of this JS object. This method is
|
||||
/// safe to call because it originates from the layout thread, and it cannot
|
||||
/// mutate DOM nodes.
|
||||
pub fn get_for_script(&self) -> &T {
|
||||
debug_assert!(thread_state::get().is_script());
|
||||
unsafe { &**self.ptr }
|
||||
}
|
||||
}
|
||||
|
||||
/// Get a reference out of a rooted value.
|
||||
|
|
|
@ -472,6 +472,7 @@ macro_rules! global_event_handlers(
|
|||
event_handler!(suspend, GetOnsuspend, SetOnsuspend);
|
||||
event_handler!(timeupdate, GetOntimeupdate, SetOntimeupdate);
|
||||
event_handler!(toggle, GetOntoggle, SetOntoggle);
|
||||
event_handler!(transitionend, GetOntransitionend, SetOntransitionend);
|
||||
event_handler!(volumechange, GetOnvolumechange, SetOnvolumechange);
|
||||
event_handler!(waiting, GetOnwaiting, SetOnwaiting);
|
||||
)
|
||||
|
|
|
@ -404,6 +404,7 @@ pub mod textencoder;
|
|||
pub mod touch;
|
||||
pub mod touchevent;
|
||||
pub mod touchlist;
|
||||
pub mod transitionevent;
|
||||
pub mod treewalker;
|
||||
pub mod uievent;
|
||||
pub mod url;
|
||||
|
|
76
components/script/dom/transitionevent.rs
Normal file
76
components/script/dom/transitionevent.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 http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
use dom::bindings::codegen::Bindings::EventBinding::EventMethods;
|
||||
use dom::bindings::codegen::Bindings::TransitionEventBinding;
|
||||
use dom::bindings::codegen::Bindings::TransitionEventBinding::{TransitionEventInit, TransitionEventMethods};
|
||||
use dom::bindings::error::Fallible;
|
||||
use dom::bindings::inheritance::Castable;
|
||||
use dom::bindings::js::Root;
|
||||
use dom::bindings::num::Finite;
|
||||
use dom::bindings::reflector::reflect_dom_object;
|
||||
use dom::bindings::str::DOMString;
|
||||
use dom::event::Event;
|
||||
use dom::globalscope::GlobalScope;
|
||||
use string_cache::Atom;
|
||||
|
||||
#[dom_struct]
|
||||
pub struct TransitionEvent {
|
||||
event: Event,
|
||||
property_name: Atom,
|
||||
elapsed_time: Finite<f32>,
|
||||
pseudo_element: DOMString,
|
||||
}
|
||||
|
||||
impl TransitionEvent {
|
||||
pub fn new_inherited(init: &TransitionEventInit) -> TransitionEvent {
|
||||
TransitionEvent {
|
||||
event: Event::new_inherited(),
|
||||
property_name: Atom::from(init.propertyName.clone()),
|
||||
elapsed_time: init.elapsedTime.clone(),
|
||||
pseudo_element: init.pseudoElement.clone()
|
||||
}
|
||||
}
|
||||
|
||||
pub fn new(global: &GlobalScope,
|
||||
type_: Atom,
|
||||
init: &TransitionEventInit) -> Root<TransitionEvent> {
|
||||
let ev = reflect_dom_object(box TransitionEvent::new_inherited(init),
|
||||
global,
|
||||
TransitionEventBinding::Wrap);
|
||||
{
|
||||
let event = ev.upcast::<Event>();
|
||||
event.init_event(type_, init.parent.bubbles, init.parent.cancelable);
|
||||
}
|
||||
ev
|
||||
}
|
||||
|
||||
pub fn Constructor(global: &GlobalScope,
|
||||
type_: DOMString,
|
||||
init: &TransitionEventInit) -> Fallible<Root<TransitionEvent>> {
|
||||
Ok(TransitionEvent::new(global, Atom::from(type_), init))
|
||||
}
|
||||
}
|
||||
|
||||
impl TransitionEventMethods for TransitionEvent {
|
||||
// https://drafts.csswg.org/css-transitions/#Events-TransitionEvent-propertyName
|
||||
fn PropertyName(&self) -> DOMString {
|
||||
DOMString::from(&*self.property_name)
|
||||
}
|
||||
|
||||
// https://drafts.csswg.org/css-transitions/#Events-TransitionEvent-elapsedTime
|
||||
fn ElapsedTime(&self) -> Finite<f32> {
|
||||
self.elapsed_time.clone()
|
||||
}
|
||||
|
||||
// https://drafts.csswg.org/css-transitions/#Events-TransitionEvent-pseudoElement
|
||||
fn PseudoElement(&self) -> DOMString {
|
||||
self.pseudo_element.clone()
|
||||
}
|
||||
|
||||
// https://dom.spec.whatwg.org/#dom-event-istrusted
|
||||
fn IsTrusted(&self) -> bool {
|
||||
self.upcast::<Event>().IsTrusted()
|
||||
}
|
||||
}
|
|
@ -89,6 +89,11 @@ interface GlobalEventHandlers {
|
|||
attribute EventHandler onwaiting;
|
||||
};
|
||||
|
||||
// https://drafts.csswg.org/css-transitions/#interface-globaleventhandlers-idl
|
||||
partial interface GlobalEventHandlers {
|
||||
attribute EventHandler ontransitionend;
|
||||
};
|
||||
|
||||
// https://html.spec.whatwg.org/multipage/#windoweventhandlers
|
||||
[NoInterfaceObject, Exposed=(Window,Worker)]
|
||||
interface WindowEventHandlers {
|
||||
|
|
21
components/script/dom/webidls/TransitionEvent.webidl
Normal file
21
components/script/dom/webidls/TransitionEvent.webidl
Normal file
|
@ -0,0 +1,21 @@
|
|||
/* 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/. */
|
||||
/*
|
||||
* For more information on this interface please see
|
||||
* https://dom.spec.whatwg.org/#event
|
||||
*/
|
||||
|
||||
[Constructor(DOMString type, optional TransitionEventInit transitionEventInitDict),
|
||||
Exposed=Window]
|
||||
interface TransitionEvent : Event {
|
||||
readonly attribute DOMString propertyName;
|
||||
readonly attribute float elapsedTime;
|
||||
readonly attribute DOMString pseudoElement;
|
||||
};
|
||||
|
||||
dictionary TransitionEventInit : EventInit {
|
||||
DOMString propertyName = "";
|
||||
float elapsedTime = 0.0;
|
||||
DOMString pseudoElement = "";
|
||||
};
|
|
@ -413,7 +413,7 @@ impl<'ln> ServoLayoutNode<'ln> {
|
|||
|
||||
/// Returns the interior of this node as a `LayoutJS`. This is highly unsafe for layout to
|
||||
/// call and as such is marked `unsafe`.
|
||||
unsafe fn get_jsmanaged(&self) -> &LayoutJS<Node> {
|
||||
pub unsafe fn get_jsmanaged(&self) -> &LayoutJS<Node> {
|
||||
&self.node
|
||||
}
|
||||
}
|
||||
|
|
|
@ -23,13 +23,17 @@ use devtools_traits::{ScriptToDevtoolsControlMsg, WorkerId};
|
|||
use devtools_traits::CSSError;
|
||||
use document_loader::DocumentLoader;
|
||||
use dom::bindings::cell::DOMRefCell;
|
||||
use dom::bindings::codegen::Bindings::CSSStyleDeclarationBinding::CSSStyleDeclarationMethods;
|
||||
use dom::bindings::codegen::Bindings::DocumentBinding::{DocumentMethods, DocumentReadyState};
|
||||
use dom::bindings::codegen::Bindings::EventBinding::EventInit;
|
||||
use dom::bindings::codegen::Bindings::LocationBinding::LocationMethods;
|
||||
use dom::bindings::codegen::Bindings::TransitionEventBinding::TransitionEventInit;
|
||||
use dom::bindings::codegen::Bindings::WindowBinding::WindowMethods;
|
||||
use dom::bindings::conversions::{ConversionResult, FromJSValConvertible, StringificationBehavior};
|
||||
use dom::bindings::inheritance::Castable;
|
||||
use dom::bindings::js::{JS, MutNullableHeap, Root, RootCollection};
|
||||
use dom::bindings::js::{RootCollectionPtr, RootedReference};
|
||||
use dom::bindings::num::Finite;
|
||||
use dom::bindings::refcounted::Trusted;
|
||||
use dom::bindings::reflector::Reflectable;
|
||||
use dom::bindings::str::DOMString;
|
||||
|
@ -47,6 +51,7 @@ use dom::serviceworkerregistration::ServiceWorkerRegistration;
|
|||
use dom::servoparser::{ParserContext, ServoParser};
|
||||
use dom::servoparser::html::{ParseContext, parse_html};
|
||||
use dom::servoparser::xml::{self, parse_xml};
|
||||
use dom::transitionevent::TransitionEvent;
|
||||
use dom::uievent::UIEvent;
|
||||
use dom::window::{ReflowReason, Window};
|
||||
use dom::worker::TrustedWorkerAddress;
|
||||
|
@ -65,6 +70,7 @@ use js::jsapi::{JSAutoCompartment, JSContext, JS_SetWrapObjectCallbacks};
|
|||
use js::jsapi::{JSTracer, SetWindowProxyClass};
|
||||
use js::jsval::UndefinedValue;
|
||||
use js::rust::Runtime;
|
||||
use layout_wrapper::ServoLayoutNode;
|
||||
use mem::heap_size_of_self_and_children;
|
||||
use msg::constellation_msg::{FrameType, LoadData, PipelineId, PipelineNamespace};
|
||||
use msg::constellation_msg::{ReferrerPolicy, WindowSizeType};
|
||||
|
@ -97,6 +103,7 @@ use std::sync::{Arc, Mutex};
|
|||
use std::sync::atomic::{AtomicBool, Ordering};
|
||||
use std::sync::mpsc::{Receiver, Select, Sender, channel};
|
||||
use style::context::ReflowGoal;
|
||||
use style::dom::{TNode, UnsafeNode};
|
||||
use style::thread_state;
|
||||
use task_source::TaskSource;
|
||||
use task_source::dom_manipulation::{DOMManipulationTask, DOMManipulationTaskSource};
|
||||
|
@ -917,6 +924,8 @@ impl ScriptThread {
|
|||
self.handle_webdriver_msg(pipeline_id, msg),
|
||||
ConstellationControlMsg::TickAllAnimations(pipeline_id) =>
|
||||
self.handle_tick_all_animations(pipeline_id),
|
||||
ConstellationControlMsg::TransitionEnd(unsafe_node, name, duration) =>
|
||||
self.handle_transition_event(unsafe_node, name, duration),
|
||||
ConstellationControlMsg::WebFontLoaded(pipeline_id) =>
|
||||
self.handle_web_font_loaded(pipeline_id),
|
||||
ConstellationControlMsg::DispatchFrameLoadEvent {
|
||||
|
@ -1522,6 +1531,35 @@ impl ScriptThread {
|
|||
document.run_the_animation_frame_callbacks();
|
||||
}
|
||||
|
||||
/// Handles firing of transition events.
|
||||
#[allow(unsafe_code)]
|
||||
fn handle_transition_event(&self, unsafe_node: UnsafeNode, name: String, duration: f64) {
|
||||
let node = unsafe { ServoLayoutNode::from_unsafe(&unsafe_node) };
|
||||
let node = unsafe { node.get_jsmanaged().get_for_script() };
|
||||
let window = window_from_node(node);
|
||||
|
||||
if let Some(el) = node.downcast::<Element>() {
|
||||
if &*window.GetComputedStyle(el, None).Display() == "none" {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
let init = TransitionEventInit {
|
||||
parent: EventInit {
|
||||
bubbles: true,
|
||||
cancelable: false,
|
||||
},
|
||||
propertyName: DOMString::from(name),
|
||||
elapsedTime: Finite::new(duration as f32).unwrap(),
|
||||
// FIXME: Handle pseudo-elements properly
|
||||
pseudoElement: DOMString::new()
|
||||
};
|
||||
let transition_event = TransitionEvent::new(window.upcast(),
|
||||
atom!("transitionend"),
|
||||
&init);
|
||||
transition_event.upcast::<Event>().fire(node.upcast());
|
||||
}
|
||||
|
||||
/// Handles a Web font being loaded. Does nothing if the page no longer exists.
|
||||
fn handle_web_font_loaded(&self, pipeline_id: PipelineId) {
|
||||
if let Some(context) = self.find_child_context(pipeline_id) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue