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:
bors-servo 2016-10-12 02:08:37 -05:00 committed by GitHub
commit cd2f950de3
23 changed files with 199 additions and 61 deletions

View file

@ -10,7 +10,7 @@ use gfx::display_list::OpaqueNode;
use ipc_channel::ipc::IpcSender; use ipc_channel::ipc::IpcSender;
use msg::constellation_msg::PipelineId; use msg::constellation_msg::PipelineId;
use script_layout_interface::restyle_damage::RestyleDamage; use script_layout_interface::restyle_damage::RestyleDamage;
use script_traits::{AnimationState, LayoutMsg as ConstellationMsg}; use script_traits::{AnimationState, ConstellationControlMsg, LayoutMsg as ConstellationMsg};
use std::collections::HashMap; use std::collections::HashMap;
use std::sync::mpsc::Receiver; use std::sync::mpsc::Receiver;
use style::animation::{Animation, update_style_for_animation}; use style::animation::{Animation, update_style_for_animation};
@ -21,6 +21,7 @@ use style::timer::Timer;
/// Also expire any old animations that have completed, inserting them into /// Also expire any old animations that have completed, inserting them into
/// `expired_animations`. /// `expired_animations`.
pub fn update_animation_state(constellation_chan: &IpcSender<ConstellationMsg>, pub fn update_animation_state(constellation_chan: &IpcSender<ConstellationMsg>,
script_chan: &IpcSender<ConstellationControlMsg>,
running_animations: &mut HashMap<OpaqueNode, Vec<Animation>>, running_animations: &mut HashMap<OpaqueNode, Vec<Animation>>,
expired_animations: &mut HashMap<OpaqueNode, Vec<Animation>>, expired_animations: &mut HashMap<OpaqueNode, Vec<Animation>>,
new_animations_receiver: &Receiver<Animation>, new_animations_receiver: &Receiver<Animation>,
@ -70,7 +71,7 @@ pub fn update_animation_state(constellation_chan: &IpcSender<ConstellationMsg>,
let mut animations_still_running = vec![]; let mut animations_still_running = vec![];
for mut running_animation in running_animations.drain(..) { for mut running_animation in running_animations.drain(..) {
let still_running = !running_animation.is_expired() && match running_animation { let still_running = !running_animation.is_expired() && match running_animation {
Animation::Transition(_, started_at, ref frame, _expired) => { Animation::Transition(_, _, started_at, ref frame, _expired) => {
now < started_at + frame.duration now < started_at + frame.duration
} }
Animation::Keyframes(_, _, ref mut state) => { Animation::Keyframes(_, _, ref mut state) => {
@ -85,6 +86,13 @@ pub fn update_animation_state(constellation_chan: &IpcSender<ConstellationMsg>,
continue continue
} }
if let Animation::Transition(_, unsafe_node, _, ref frame, _) = running_animation {
script_chan.send(ConstellationControlMsg::TransitionEnd(unsafe_node,
frame.property_animation.property_name(),
frame.duration))
.unwrap();
}
expired_animations.entry(*key) expired_animations.entry(*key)
.or_insert_with(Vec::new) .or_insert_with(Vec::new)
.push(running_animation); .push(running_animation);

View file

@ -1477,6 +1477,7 @@ impl LayoutThread {
if let Some(mut root_flow) = self.root_flow.clone() { if let Some(mut root_flow) = self.root_flow.clone() {
// Kick off animations if any were triggered, expire completed ones. // Kick off animations if any were triggered, expire completed ones.
animation::update_animation_state(&self.constellation_chan, animation::update_animation_state(&self.constellation_chan,
&self.script_chan,
&mut *self.running_animations.write().unwrap(), &mut *self.running_animations.write().unwrap(),
&mut *self.expired_animations.write().unwrap(), &mut *self.expired_animations.write().unwrap(),
&self.new_animations_receiver, &self.new_animations_receiver,

View file

@ -451,6 +451,14 @@ impl<T: Reflectable> LayoutJS<T> {
debug_assert!(thread_state::get().is_layout()); debug_assert!(thread_state::get().is_layout());
*self.ptr *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. /// Get a reference out of a rooted value.

View file

@ -472,6 +472,7 @@ macro_rules! global_event_handlers(
event_handler!(suspend, GetOnsuspend, SetOnsuspend); event_handler!(suspend, GetOnsuspend, SetOnsuspend);
event_handler!(timeupdate, GetOntimeupdate, SetOntimeupdate); event_handler!(timeupdate, GetOntimeupdate, SetOntimeupdate);
event_handler!(toggle, GetOntoggle, SetOntoggle); event_handler!(toggle, GetOntoggle, SetOntoggle);
event_handler!(transitionend, GetOntransitionend, SetOntransitionend);
event_handler!(volumechange, GetOnvolumechange, SetOnvolumechange); event_handler!(volumechange, GetOnvolumechange, SetOnvolumechange);
event_handler!(waiting, GetOnwaiting, SetOnwaiting); event_handler!(waiting, GetOnwaiting, SetOnwaiting);
) )

View file

@ -404,6 +404,7 @@ pub mod textencoder;
pub mod touch; pub mod touch;
pub mod touchevent; pub mod touchevent;
pub mod touchlist; pub mod touchlist;
pub mod transitionevent;
pub mod treewalker; pub mod treewalker;
pub mod uievent; pub mod uievent;
pub mod url; pub mod url;

View 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()
}
}

View file

@ -89,6 +89,11 @@ interface GlobalEventHandlers {
attribute EventHandler onwaiting; 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 // https://html.spec.whatwg.org/multipage/#windoweventhandlers
[NoInterfaceObject, Exposed=(Window,Worker)] [NoInterfaceObject, Exposed=(Window,Worker)]
interface WindowEventHandlers { interface WindowEventHandlers {

View 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 = "";
};

View file

@ -413,7 +413,7 @@ impl<'ln> ServoLayoutNode<'ln> {
/// Returns the interior of this node as a `LayoutJS`. This is highly unsafe for layout to /// Returns the interior of this node as a `LayoutJS`. This is highly unsafe for layout to
/// call and as such is marked `unsafe`. /// call and as such is marked `unsafe`.
unsafe fn get_jsmanaged(&self) -> &LayoutJS<Node> { pub unsafe fn get_jsmanaged(&self) -> &LayoutJS<Node> {
&self.node &self.node
} }
} }

View file

@ -23,13 +23,17 @@ use devtools_traits::{ScriptToDevtoolsControlMsg, WorkerId};
use devtools_traits::CSSError; use devtools_traits::CSSError;
use document_loader::DocumentLoader; use document_loader::DocumentLoader;
use dom::bindings::cell::DOMRefCell; 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::DocumentBinding::{DocumentMethods, DocumentReadyState};
use dom::bindings::codegen::Bindings::EventBinding::EventInit;
use dom::bindings::codegen::Bindings::LocationBinding::LocationMethods; use dom::bindings::codegen::Bindings::LocationBinding::LocationMethods;
use dom::bindings::codegen::Bindings::TransitionEventBinding::TransitionEventInit;
use dom::bindings::codegen::Bindings::WindowBinding::WindowMethods; use dom::bindings::codegen::Bindings::WindowBinding::WindowMethods;
use dom::bindings::conversions::{ConversionResult, FromJSValConvertible, StringificationBehavior}; use dom::bindings::conversions::{ConversionResult, FromJSValConvertible, StringificationBehavior};
use dom::bindings::inheritance::Castable; use dom::bindings::inheritance::Castable;
use dom::bindings::js::{JS, MutNullableHeap, Root, RootCollection}; use dom::bindings::js::{JS, MutNullableHeap, Root, RootCollection};
use dom::bindings::js::{RootCollectionPtr, RootedReference}; use dom::bindings::js::{RootCollectionPtr, RootedReference};
use dom::bindings::num::Finite;
use dom::bindings::refcounted::Trusted; use dom::bindings::refcounted::Trusted;
use dom::bindings::reflector::Reflectable; use dom::bindings::reflector::Reflectable;
use dom::bindings::str::DOMString; use dom::bindings::str::DOMString;
@ -47,6 +51,7 @@ use dom::serviceworkerregistration::ServiceWorkerRegistration;
use dom::servoparser::{ParserContext, ServoParser}; use dom::servoparser::{ParserContext, ServoParser};
use dom::servoparser::html::{ParseContext, parse_html}; use dom::servoparser::html::{ParseContext, parse_html};
use dom::servoparser::xml::{self, parse_xml}; use dom::servoparser::xml::{self, parse_xml};
use dom::transitionevent::TransitionEvent;
use dom::uievent::UIEvent; use dom::uievent::UIEvent;
use dom::window::{ReflowReason, Window}; use dom::window::{ReflowReason, Window};
use dom::worker::TrustedWorkerAddress; use dom::worker::TrustedWorkerAddress;
@ -65,6 +70,7 @@ use js::jsapi::{JSAutoCompartment, JSContext, JS_SetWrapObjectCallbacks};
use js::jsapi::{JSTracer, SetWindowProxyClass}; use js::jsapi::{JSTracer, SetWindowProxyClass};
use js::jsval::UndefinedValue; use js::jsval::UndefinedValue;
use js::rust::Runtime; use js::rust::Runtime;
use layout_wrapper::ServoLayoutNode;
use mem::heap_size_of_self_and_children; use mem::heap_size_of_self_and_children;
use msg::constellation_msg::{FrameType, LoadData, PipelineId, PipelineNamespace}; use msg::constellation_msg::{FrameType, LoadData, PipelineId, PipelineNamespace};
use msg::constellation_msg::{ReferrerPolicy, WindowSizeType}; use msg::constellation_msg::{ReferrerPolicy, WindowSizeType};
@ -97,6 +103,7 @@ use std::sync::{Arc, Mutex};
use std::sync::atomic::{AtomicBool, Ordering}; use std::sync::atomic::{AtomicBool, Ordering};
use std::sync::mpsc::{Receiver, Select, Sender, channel}; use std::sync::mpsc::{Receiver, Select, Sender, channel};
use style::context::ReflowGoal; use style::context::ReflowGoal;
use style::dom::{TNode, UnsafeNode};
use style::thread_state; use style::thread_state;
use task_source::TaskSource; use task_source::TaskSource;
use task_source::dom_manipulation::{DOMManipulationTask, DOMManipulationTaskSource}; use task_source::dom_manipulation::{DOMManipulationTask, DOMManipulationTaskSource};
@ -917,6 +924,8 @@ impl ScriptThread {
self.handle_webdriver_msg(pipeline_id, msg), self.handle_webdriver_msg(pipeline_id, msg),
ConstellationControlMsg::TickAllAnimations(pipeline_id) => ConstellationControlMsg::TickAllAnimations(pipeline_id) =>
self.handle_tick_all_animations(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) => ConstellationControlMsg::WebFontLoaded(pipeline_id) =>
self.handle_web_font_loaded(pipeline_id), self.handle_web_font_loaded(pipeline_id),
ConstellationControlMsg::DispatchFrameLoadEvent { ConstellationControlMsg::DispatchFrameLoadEvent {
@ -1522,6 +1531,35 @@ impl ScriptThread {
document.run_the_animation_frame_callbacks(); 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. /// Handles a Web font being loaded. Does nothing if the page no longer exists.
fn handle_web_font_loaded(&self, pipeline_id: PipelineId) { fn handle_web_font_loaded(&self, pipeline_id: PipelineId) {
if let Some(context) = self.find_child_context(pipeline_id) { if let Some(context) = self.find_child_context(pipeline_id) {

View file

@ -66,7 +66,7 @@ use serde::{Deserialize, Deserializer, Serialize, Serializer};
use std::collections::HashMap; use std::collections::HashMap;
use std::fmt; use std::fmt;
use std::sync::mpsc::{Receiver, Sender}; use std::sync::mpsc::{Receiver, Sender};
use style_traits::{PagePx, ViewportPx}; use style_traits::{PagePx, UnsafeNode, ViewportPx};
use url::Url; use url::Url;
use util::ipc::OptionalOpaqueIpcSender; use util::ipc::OptionalOpaqueIpcSender;
use webdriver_msg::{LoadStatus, WebDriverScriptCommand}; use webdriver_msg::{LoadStatus, WebDriverScriptCommand};
@ -197,6 +197,8 @@ pub enum ConstellationControlMsg {
WebDriverScriptCommand(PipelineId, WebDriverScriptCommand), WebDriverScriptCommand(PipelineId, WebDriverScriptCommand),
/// Notifies script thread that all animations are done /// Notifies script thread that all animations are done
TickAllAnimations(PipelineId), TickAllAnimations(PipelineId),
/// Notifies the script thread of a transition end
TransitionEnd(UnsafeNode, String, f64),
/// Notifies the script thread that a new Web font has been loaded, and thus the page should be /// Notifies the script thread that a new Web font has been loaded, and thus the page should be
/// reflowed. /// reflowed.
WebFontLoaded(PipelineId), WebFontLoaded(PipelineId),
@ -238,6 +240,7 @@ impl fmt::Debug for ConstellationControlMsg {
FocusIFrame(..) => "FocusIFrame", FocusIFrame(..) => "FocusIFrame",
WebDriverScriptCommand(..) => "WebDriverScriptCommand", WebDriverScriptCommand(..) => "WebDriverScriptCommand",
TickAllAnimations(..) => "TickAllAnimations", TickAllAnimations(..) => "TickAllAnimations",
TransitionEnd(..) => "TransitionEnd",
WebFontLoaded(..) => "WebFontLoaded", WebFontLoaded(..) => "WebFontLoaded",
DispatchFrameLoadEvent { .. } => "DispatchFrameLoadEvent", DispatchFrameLoadEvent { .. } => "DispatchFrameLoadEvent",
FramedContentChanged(..) => "FramedContentChanged", FramedContentChanged(..) => "FramedContentChanged",

View file

@ -6,7 +6,7 @@
use bezier::Bezier; use bezier::Bezier;
use context::SharedStyleContext; use context::SharedStyleContext;
use dom::OpaqueNode; use dom::{OpaqueNode, UnsafeNode};
use euclid::point::Point2D; use euclid::point::Point2D;
use keyframes::{KeyframesStep, KeyframesStepValue}; use keyframes::{KeyframesStep, KeyframesStepValue};
use properties::{self, ComputedValues, Importance}; use properties::{self, ComputedValues, Importance};
@ -186,7 +186,7 @@ pub enum Animation {
/// the f64 field is the start time as returned by `time::precise_time_s()`. /// the f64 field is the start time as returned by `time::precise_time_s()`.
/// ///
/// The `bool` field is werther this animation should no longer run. /// The `bool` field is werther this animation should no longer run.
Transition(OpaqueNode, f64, AnimationFrame, bool), Transition(OpaqueNode, UnsafeNode, f64, AnimationFrame, bool),
/// A keyframes animation is identified by a name, and can have a /// A keyframes animation is identified by a name, and can have a
/// node-dependent state (i.e. iteration count, etc.). /// node-dependent state (i.e. iteration count, etc.).
Keyframes(OpaqueNode, Atom, KeyframesAnimationState), Keyframes(OpaqueNode, Atom, KeyframesAnimationState),
@ -197,7 +197,7 @@ impl Animation {
pub fn mark_as_expired(&mut self) { pub fn mark_as_expired(&mut self) {
debug_assert!(!self.is_expired()); debug_assert!(!self.is_expired());
match *self { match *self {
Animation::Transition(_, _, _, ref mut expired) => *expired = true, Animation::Transition(_, _, _, _, ref mut expired) => *expired = true,
Animation::Keyframes(_, _, ref mut state) => state.expired = true, Animation::Keyframes(_, _, ref mut state) => state.expired = true,
} }
} }
@ -205,7 +205,7 @@ impl Animation {
#[inline] #[inline]
pub fn is_expired(&self) -> bool { pub fn is_expired(&self) -> bool {
match *self { match *self {
Animation::Transition(_, _, _, expired) => expired, Animation::Transition(_, _, _, _, expired) => expired,
Animation::Keyframes(_, _, ref state) => state.expired, Animation::Keyframes(_, _, ref state) => state.expired,
} }
} }
@ -213,7 +213,7 @@ impl Animation {
#[inline] #[inline]
pub fn node(&self) -> &OpaqueNode { pub fn node(&self) -> &OpaqueNode {
match *self { match *self {
Animation::Transition(ref node, _, _, _) => node, Animation::Transition(ref node, _, _, _, _) => node,
Animation::Keyframes(ref node, _, _) => node, Animation::Keyframes(ref node, _, _) => node,
} }
} }
@ -246,6 +246,10 @@ pub struct PropertyAnimation {
} }
impl PropertyAnimation { impl PropertyAnimation {
pub fn property_name(&self) -> String {
self.property.name()
}
/// Creates a new property animation for the given transition index and old and new styles. /// Creates a new property animation for the given transition index and old and new styles.
/// Any number of animations may be returned, from zero (if the property did not animate) to /// Any number of animations may be returned, from zero (if the property did not animate) to
/// one (for a single transition property) to arbitrarily many (for `all`). /// one (for a single transition property) to arbitrarily many (for `all`).
@ -341,7 +345,8 @@ impl PropertyAnimation {
// TODO(emilio): Take rid of this mutex splitting SharedLayoutContex into a // TODO(emilio): Take rid of this mutex splitting SharedLayoutContex into a
// cloneable part and a non-cloneable part.. // cloneable part and a non-cloneable part..
pub fn start_transitions_if_applicable(new_animations_sender: &Sender<Animation>, pub fn start_transitions_if_applicable(new_animations_sender: &Sender<Animation>,
node: OpaqueNode, opaque_node: OpaqueNode,
unsafe_node: UnsafeNode,
old_style: &ComputedValues, old_style: &ComputedValues,
new_style: &mut Arc<ComputedValues>, new_style: &mut Arc<ComputedValues>,
timer: &Timer) timer: &Timer)
@ -362,7 +367,7 @@ pub fn start_transitions_if_applicable(new_animations_sender: &Sender<Animation>
let start_time = let start_time =
now + (box_style.transition_delay_mod(i).seconds() as f64); now + (box_style.transition_delay_mod(i).seconds() as f64);
new_animations_sender new_animations_sender
.send(Animation::Transition(node, start_time, AnimationFrame { .send(Animation::Transition(opaque_node, unsafe_node, start_time, AnimationFrame {
duration: box_style.transition_duration_mod(i).seconds() as f64, duration: box_style.transition_duration_mod(i).seconds() as f64,
property_animation: property_animation, property_animation: property_animation,
}, /* is_expired = */ false)).unwrap(); }, /* is_expired = */ false)).unwrap();
@ -499,7 +504,7 @@ pub fn update_style_for_animation(context: &SharedStyleContext,
debug_assert!(!animation.is_expired()); debug_assert!(!animation.is_expired());
match *animation { match *animation {
Animation::Transition(_, start_time, ref frame, _) => { Animation::Transition(_, _, start_time, ref frame, _) => {
debug!("update_style_for_animation: transition found"); debug!("update_style_for_animation: transition found");
let now = context.timer.seconds(); let now = context.timer.seconds();
let mut new_style = (*style).clone(); let mut new_style = (*style).clone();
@ -673,7 +678,7 @@ pub fn complete_expired_transitions(node: OpaqueNode, style: &mut Arc<ComputedVa
if let Some(ref animations) = animations_to_expire { if let Some(ref animations) = animations_to_expire {
for animation in *animations { for animation in *animations {
// TODO: support animation-fill-mode // TODO: support animation-fill-mode
if let Animation::Transition(_, _, ref frame, _) = *animation { if let Animation::Transition(_, _, _, ref frame, _) = *animation {
frame.property_animation.update(Arc::make_mut(style), 1.0); frame.property_animation.update(Arc::make_mut(style), 1.0);
} }
} }

View file

@ -19,9 +19,7 @@ use std::ops::BitOr;
use std::sync::Arc; use std::sync::Arc;
use string_cache::{Atom, Namespace}; use string_cache::{Atom, Namespace};
/// Opaque type stored in type-unsafe work queues for parallel layout. pub use style_traits::UnsafeNode;
/// Must be transmutable to and from TNode.
pub type UnsafeNode = (usize, usize);
/// An opaque handle to a node, which, unlike UnsafeNode, cannot be transformed /// An opaque handle to a node, which, unlike UnsafeNode, cannot be transformed
/// back into a non-opaque representation. The only safe operation that can be /// back into a non-opaque representation. The only safe operation that can be

View file

@ -569,6 +569,7 @@ trait PrivateMatchMethods: TNode {
animation::start_transitions_if_applicable( animation::start_transitions_if_applicable(
new_animations_sender, new_animations_sender,
this_opaque, this_opaque,
self.to_unsafe(),
&**style, &**style,
&mut this_style, &mut this_style,
&shared_context.timer); &shared_context.timer);

View file

@ -101,6 +101,16 @@ pub enum AnimatedProperty {
} }
impl AnimatedProperty { impl AnimatedProperty {
pub fn name(&self) -> String {
match *self {
% for prop in data.longhands:
% if prop.animatable:
AnimatedProperty::${prop.camel_case}(..) => "${prop.name}".to_owned(),
% endif
% endfor
}
}
pub fn does_animate(&self) -> bool { pub fn does_animate(&self) -> bool {
match *self { match *self {
% for prop in data.longhands: % for prop in data.longhands:

View file

@ -27,6 +27,10 @@ extern crate rustc_serialize;
#[cfg(feature = "servo")] extern crate serde; #[cfg(feature = "servo")] extern crate serde;
#[cfg(feature = "servo")] #[macro_use] extern crate serde_derive; #[cfg(feature = "servo")] #[macro_use] extern crate serde_derive;
/// Opaque type stored in type-unsafe work queues for parallel layout.
/// Must be transmutable to and from TNode.
pub type UnsafeNode = (usize, usize);
/// One CSS "px" in the coordinate system of the "initial viewport": /// One CSS "px" in the coordinate system of the "initial viewport":
/// http://www.w3.org/TR/css-device-adapt/#initial-viewport /// http://www.w3.org/TR/css-device-adapt/#initial-viewport
/// ///

View file

@ -1,5 +1,7 @@
[changing-while-transition.htm] [changing-while-transition.htm]
type: testharness type: testharness
[changing transition-property / values]
expected: FAIL
[changing transition-duration / values] [changing transition-duration / values]
expected: FAIL expected: FAIL

View file

@ -1,14 +1,5 @@
[events-001.htm] [events-001.htm]
type: testharness type: testharness
[transition:all, changing padding-left / events]
expected: FAIL
[transition:all, changing padding / events]
expected: FAIL
[transition:all, changing padding but not padding-bottom / events]
expected: FAIL
[transition:padding, changing padding-left / events] [transition:padding, changing padding-left / events]
expected: FAIL expected: FAIL
@ -18,12 +9,3 @@
[transition:padding, changing padding but not padding-bottom / events] [transition:padding, changing padding but not padding-bottom / events]
expected: FAIL expected: FAIL
[transition:padding-left, changing padding-left / events]
expected: FAIL
[transition:padding-left, changing padding / events]
expected: FAIL
[transition:padding-left, changing padding but not padding-bottom / events]
expected: FAIL

View file

@ -1,8 +0,0 @@
[events-002.htm]
type: testharness
[transitions:all, changing padding-left from nothing / events]
expected: FAIL
[transitions:all, changing padding from nothing / events]
expected: FAIL

View file

@ -1,8 +0,0 @@
[events-003.htm]
type: testharness
[duration: 0.1s, delay: -0.05s / events]
expected: FAIL
[duration: 0.1s, delay: -0.1s / events]
expected: FAIL

View file

@ -1,8 +0,0 @@
[events-004.htm]
type: testharness
[repeating lists / events]
expected: FAIL
[truncating lists / events]
expected: FAIL

View file

@ -1,3 +0,0 @@
[incremental_trailing_whitespace_a.html]
type: reftest
disabled: https://github.com/servo/servo/issues/10473

View file

@ -161,6 +161,7 @@ test_interfaces([
"Touch", "Touch",
"TouchEvent", "TouchEvent",
"TouchList", "TouchList",
"TransitionEvent",
"TreeWalker", "TreeWalker",
"UIEvent", "UIEvent",
"URL", "URL",