aboutsummaryrefslogtreecommitdiffstats
path: root/components/style/animation.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-03-30 11:04:57 +0530
committerbors-servo <lbergstrom+bors@mozilla.com>2016-03-30 11:04:57 +0530
commit0ec96ac02a6c40ffda98e1074ceb9874dd1fb3cb (patch)
tree3f4321cb5e266bce43438f842124550bb79ba8e8 /components/style/animation.rs
parentf6d60a716c35f8ec968d259bfa1ffa606d8d15d1 (diff)
parent4cb4cc93e4c0c2e92a6bef13d53de771de491bd7 (diff)
downloadservo-0ec96ac02a6c40ffda98e1074ceb9874dd1fb3cb.tar.gz
servo-0ec96ac02a6c40ffda98e1074ceb9874dd1fb3cb.zip
Auto merge of #10277 - perlun:rename-tcomputedvalues-to-computedvalues, r=SimonSapin
Renamed TComputedValues to ComputedValues This is a followup to #10210, and a continuation of #10185. <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10277) <!-- Reviewable:end -->
Diffstat (limited to 'components/style/animation.rs')
-rw-r--r--components/style/animation.rs14
1 files changed, 7 insertions, 7 deletions
diff --git a/components/style/animation.rs b/components/style/animation.rs
index 42fb90e0561..7413270a66f 100644
--- a/components/style/animation.rs
+++ b/components/style/animation.rs
@@ -25,7 +25,7 @@ use properties::longhands::vertical_align::computed_value::T as VerticalAlign;
use properties::longhands::visibility::computed_value::T as Visibility;
use properties::longhands::z_index::computed_value::T as ZIndex;
use properties::style_struct_traits::TAnimation;
-use properties::{ServoComputedValues, TComputedValues};
+use properties::{ComputedValues, ServoComputedValues};
use std::cmp::Ordering;
use std::iter::repeat;
use std::sync::mpsc::Sender;
@@ -930,11 +930,11 @@ impl<T> GetMod for Vec<T> {
/// Inserts transitions into the queue of running animations as applicable for the given style
/// difference. This is called from the layout worker threads. Returns true if any animations were
/// kicked off and false otherwise.
-pub fn start_transitions_if_applicable<C: TComputedValues>(new_animations_sender: &Mutex<Sender<Animation>>,
- node: OpaqueNode,
- old_style: &C,
- new_style: &mut C)
- -> bool {
+pub fn start_transitions_if_applicable<C: ComputedValues>(new_animations_sender: &Mutex<Sender<Animation>>,
+ node: OpaqueNode,
+ old_style: &C,
+ new_style: &mut C)
+ -> bool {
let mut had_animations = false;
for i in 0..new_style.get_animation().transition_count() {
// Create any property animations, if applicable.
@@ -965,7 +965,7 @@ pub fn start_transitions_if_applicable<C: TComputedValues>(new_animations_sender
/// Updates a single animation and associated style based on the current time. If `damage` is
/// provided, inserts the appropriate restyle damage.
-pub fn update_style_for_animation<C: TComputedValues,
+pub fn update_style_for_animation<C: ComputedValues,
Damage: TRestyleDamage<ConcreteComputedValues=C>>(animation: &Animation,
style: &mut Arc<C>,
damage: Option<&mut Damage>) {