Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-24 15:50:21 +01:00
Code Issues Projects Releases Packages Wiki Activity

tidy: Clean up warnings and tidy lints.

Browse source
This commit is contained in:
Emilio Cobos Álvarez 2016-06-22 16:21:37 +02:00
parent cb3da24f08
commit 9cf2e52d36
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
8 changed files with 78 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

3
components/layout/animation.rs
View file

@ -12,9 +12,8 @@ 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, LayoutMsg as ConstellationMsg};
use std::collections::HashMap; use std::collections::HashMap;
use std::collections::hash_map::Entry;
use std::sync::mpsc::Receiver; use std::sync::mpsc::Receiver;
use style::animation::{Animation, KeyframesAnimationState, KeyframesIterationState, update_style_for_animation}; use style::animation::{Animation, KeyframesIterationState, update_style_for_animation};
use time; use time;
/// Processes any new animations that were discovered after style recalculation. /// Processes any new animations that were discovered after style recalculation.

58
components/style/animation.rs
View file

@ -6,26 +6,24 @@
use app_units::Au; use app_units::Au;
use bezier::Bezier; use bezier::Bezier;
use euclid::point::Point2D; use context::SharedStyleContext;
use dom::{OpaqueNode, TRestyleDamage}; use dom::{OpaqueNode, TRestyleDamage};
use keyframes::KeyframesAnimation; use euclid::point::Point2D;
use keyframes::KeyframesStep; use keyframes::KeyframesStep;
use properties::animated_properties::{AnimatedProperty, TransitionProperty}; use properties::animated_properties::{AnimatedProperty, TransitionProperty};
use properties::longhands::animation_iteration_count::computed_value::AnimationIterationCount;
use properties::longhands::animation_play_state::computed_value::AnimationPlayState;
use properties::longhands::transition_timing_function::computed_value::StartEnd; use properties::longhands::transition_timing_function::computed_value::StartEnd;
use properties::longhands::transition_timing_function::computed_value::TransitionTimingFunction; use properties::longhands::transition_timing_function::computed_value::TransitionTimingFunction;
use properties::longhands::animation_play_state::computed_value::AnimationPlayState;
use properties::longhands::animation_iteration_count::computed_value::AnimationIterationCount;
use properties::style_struct_traits::Box; use properties::style_struct_traits::Box;
use properties::{ComputedValues, ServoComputedValues}; use properties::{self, ComputedValues};
use selector_impl::SelectorImplExt;
use selectors::matching::DeclarationBlock;
use std::sync::mpsc::Sender; use std::sync::mpsc::Sender;
use std::sync::{Arc, Mutex}; use std::sync::{Arc, Mutex};
use string_cache::Atom;
use time; use time;
use values::computed::Time; use values::computed::Time;
use selector_impl::SelectorImplExt;
use context::SharedStyleContext;
use selectors::matching::DeclarationBlock;
use string_cache::Atom;
use properties;
/// This structure represents a keyframes animation current iteration state. /// This structure represents a keyframes animation current iteration state.
/// ///
@ -392,7 +390,8 @@ where Impl: SelectorImplExt,
total_progress = 1.; total_progress = 1.;
} }
debug!("update_style_for_animation: anim \"{}\", steps: {:?}, state: {:?}, progress: {}", name, animation.steps, state, total_progress); debug!("update_style_for_animation: anim \"{}\", steps: {:?}, state: {:?}, progress: {}",
name, animation.steps, state, total_progress);
let mut last_keyframe_position = None; let mut last_keyframe_position = None;
let mut target_keyframe_position = None; let mut target_keyframe_position = None;
@ -410,14 +409,16 @@ where Impl: SelectorImplExt,
} }
} }
debug!("update_style_for_animation: keyframe from {:?} to {:?}", last_keyframe_position, target_keyframe_position); debug!("update_style_for_animation: keyframe from {:?} to {:?}",
last_keyframe_position, target_keyframe_position);
let target_keyframe = match target_keyframe_position { let target_keyframe = match target_keyframe_position {
Some(target) => &animation.steps[target], Some(target) => &animation.steps[target],
None => { None => {
// TODO: The 0. case falls here, maybe we should just resort // TODO: The 0. case falls here, maybe we should just resort
// to the first keyframe instead. // to the first keyframe instead.
warn!("update_style_for_animation: No current keyframe found for animation \"{}\" at progress {}", name, total_progress); warn!("update_style_for_animation: No current keyframe found for animation \"{}\" at progress {}",
name, total_progress);
return; return;
} }
}; };
@ -425,12 +426,14 @@ where Impl: SelectorImplExt,
let last_keyframe = match last_keyframe_position { let last_keyframe = match last_keyframe_position {
Some(last) => &animation.steps[last], Some(last) => &animation.steps[last],
None => { None => {
warn!("update_style_for_animation: No last keyframe found for animation \"{}\" at progress {}", name, total_progress); warn!("update_style_for_animation: No last keyframe found for animation \"{}\" at progress {}",
name, total_progress);
return; return;
} }
}; };
let relative_duration = (target_keyframe.start_percentage.0 - last_keyframe.start_percentage.0) as f64 * duration; let relative_timespan = target_keyframe.start_percentage.0 - last_keyframe.start_percentage.0;
let relative_duration = relative_timespan as f64 * duration;
let last_keyframe_ended_at = state.started_at + (total_duration * last_keyframe.start_percentage.0 as f64); let last_keyframe_ended_at = state.started_at + (total_duration * last_keyframe.start_percentage.0 as f64);
let relative_progress = (now - last_keyframe_ended_at) / relative_duration; let relative_progress = (now - last_keyframe_ended_at) / relative_duration;
@ -446,25 +449,32 @@ where Impl: SelectorImplExt,
timing_function = from_style.as_servo().get_box().animation_timing_function.0[0]; timing_function = from_style.as_servo().get_box().animation_timing_function.0[0];
} }
let mut target_style = compute_style_for_animation_step(context, let target_style = compute_style_for_animation_step(context,
target_keyframe, target_keyframe,
&from_style); &from_style);
let mut new_style = (*style).clone(); let mut new_style = (*style).clone();
let mut style_changed = false; let mut style_changed = false;
for transition_property in &animation.properties_changed { for transition_property in &animation.properties_changed {
debug!("update_style_for_animation: scanning prop {:?} for animation \"{}\"", transition_property, name); debug!("update_style_for_animation: scanning prop {:?} for animation \"{}\"",
if let Some(property_animation) = PropertyAnimation::from_transition_property(*transition_property, transition_property, name);
timing_function, match PropertyAnimation::from_transition_property(*transition_property,
Time(relative_duration as f32), timing_function,
&from_style, Time(relative_duration as f32),
&target_style) { &from_style,
&target_style) {
Some(property_animation) => {
debug!("update_style_for_animation: got property animation for prop {:?}", transition_property); debug!("update_style_for_animation: got property animation for prop {:?}", transition_property);
debug!("update_style_for_animation: {:?}", property_animation); debug!("update_style_for_animation: {:?}", property_animation);
property_animation.update(Arc::make_mut(&mut new_style), relative_progress); property_animation.update(Arc::make_mut(&mut new_style), relative_progress);
style_changed = true; style_changed = true;
} }
None => {
debug!("update_style_for_animation: property animation {:?} not animating",
transition_property);
}
}
} }
if style_changed { if style_changed {

5
components/style/keyframes.rs
View file

@ -3,10 +3,9 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use cssparser::{Parser, Delimiter}; use cssparser::{Parser, Delimiter};
use selectors::matching::DeclarationBlock;
use parser::ParserContext; use parser::ParserContext;
use properties::{ComputedValues, PropertyDeclaration, PropertyDeclarationBlock, parse_property_declaration_list};
use properties::animated_properties::TransitionProperty; use properties::animated_properties::TransitionProperty;
use properties::{PropertyDeclaration, parse_property_declaration_list};
use std::sync::Arc; use std::sync::Arc;
/// Parses a keyframes list, like: /// Parses a keyframes list, like:
@ -165,7 +164,7 @@ impl KeyframesAnimation {
debug_assert!(keyframes.len() > 1); debug_assert!(keyframes.len() > 1);
let mut steps = vec![]; let mut steps = vec![];
let mut animated_properties = get_animated_properties(&keyframes[0]); let animated_properties = get_animated_properties(&keyframes[0]);
if animated_properties.is_empty() { if animated_properties.is_empty() {
return None; return None;
} }

5
components/style/matching.rs
View file

@ -27,8 +27,6 @@ use util::arc_ptr_eq;
use util::cache::{LRUCache, SimpleHashCache}; use util::cache::{LRUCache, SimpleHashCache};
use util::opts; use util::opts;
use util::vec::ForgetfulSink; use util::vec::ForgetfulSink;
use properties::longhands::animation_play_state::computed_value::AnimationPlayState;
use properties::style_struct_traits::Box;
fn create_common_style_affecting_attributes_from_element<E: TElement>(element: &E) fn create_common_style_affecting_attributes_from_element<E: TElement>(element: &E)
-> CommonStyleAffectingAttributes { -> CommonStyleAffectingAttributes {
@ -662,7 +660,8 @@ pub trait MatchMethods : TNode {
local_context: &LocalStyleContext<Self::ConcreteComputedValues>, local_context: &LocalStyleContext<Self::ConcreteComputedValues>,
parent: Option<Self>, parent: Option<Self>,
applicable_declarations: &ApplicableDeclarations<<Self::ConcreteElement as Element>::Impl>) applicable_declarations: &ApplicableDeclarations<<Self::ConcreteElement as Element>::Impl>)
where <Self::ConcreteElement as Element>::Impl: SelectorImplExt<ComputedValues = Self::ConcreteComputedValues> { where <Self::ConcreteElement as Element>::Impl: SelectorImplExt<ComputedValues = Self::ConcreteComputedValues>
{
// Get our parent's style. This must be unsafe so that we don't touch the parent's // Get our parent's style. This must be unsafe so that we don't touch the parent's
// borrow flags. // borrow flags.
// //

67
components/style/properties/data.py
View file

@ -19,36 +19,36 @@ def to_camel_case(ident):
# https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_animated_properties # https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_animated_properties
def is_known_animatable_property(name): def is_known_animatable_property(name):
return name in [ return name in [
"-moz-outline-radius", "-moz-outline-radius-bottomleft", "-moz-outline-radius", "-moz-outline-radius-bottomleft",
"-moz-outline-radius-bottomright", "-moz-outline-radius-topleft", "-moz-outline-radius-bottomright", "-moz-outline-radius-topleft",
"-moz-outline-radius-topright", "-webkit-text-fill-color", "-moz-outline-radius-topright", "-webkit-text-fill-color",
"-webkit-text-stroke", "-webkit-text-stroke-color", "-webkit-text-stroke", "-webkit-text-stroke-color",
"-webkit-touch-callout", "all", "backdrop-filter", "background", "-webkit-touch-callout", "all", "backdrop-filter", "background",
"background-color", "background-position", "background-size", "border", "background-color", "background-position", "background-size", "border",
"border-bottom", "border-bottom-color", "border-bottom-left-radius", "border-bottom", "border-bottom-color", "border-bottom-left-radius",
"border-bottom-right-radius", "border-bottom-width", "border-color", "border-bottom-right-radius", "border-bottom-width", "border-color",
"border-left", "border-left-color", "border-left-width", "border-radius", "border-left", "border-left-color", "border-left-width", "border-radius",
"border-right", "border-right-color", "border-right-width", "border-top", "border-right", "border-right-color", "border-right-width", "border-top",
"border-top-color", "border-top-left-radius", "border-top-right-radius", "border-top-color", "border-top-left-radius", "border-top-right-radius",
"border-top-width", "border-width", "bottom", "box-shadow", "clip", "border-top-width", "border-width", "bottom", "box-shadow", "clip",
"clip-path", "color", "column-count", "column-gap", "column-rule", "clip-path", "color", "column-count", "column-gap", "column-rule",
"column-rule-color", "column-rule-width", "column-width", "columns", "column-rule-color", "column-rule-width", "column-width", "columns",
"filter", "flex", "flex-basis", "flex-grow", "flex-shrink", "font", "filter", "flex", "flex-basis", "flex-grow", "flex-shrink", "font",
"font-size", "font-size-adjust", "font-stretch", "font-weight", "font-size", "font-size-adjust", "font-stretch", "font-weight",
"grid-column-gap", "grid-gap", "grid-row-gap", "height", "left", "grid-column-gap", "grid-gap", "grid-row-gap", "height", "left",
"letter-spacing", "line-height", "margin", "margin-bottom", "letter-spacing", "line-height", "margin", "margin-bottom",
"margin-left", "margin-right", "margin-top", "mask", "mask-position", "margin-left", "margin-right", "margin-top", "mask", "mask-position",
"mask-size", "max-height", "max-width", "min-height", "min-width", "mask-size", "max-height", "max-width", "min-height", "min-width",
"motion-offset", "motion-rotation", "object-position", "opacity", "motion-offset", "motion-rotation", "object-position", "opacity",
"order", "outline", "outline-color", "outline-offset", "outline-width", "order", "outline", "outline-color", "outline-offset", "outline-width",
"padding", "padding-bottom", "padding-left", "padding-right", "padding", "padding-bottom", "padding-left", "padding-right",
"padding-top", "perspective", "perspective-origin", "right", "padding-top", "perspective", "perspective-origin", "right",
"scroll-snap-coordinate", "scroll-snap-destination", "scroll-snap-coordinate", "scroll-snap-destination",
"shape-image-threshold", "shape-margin", "shape-outside", "shape-image-threshold", "shape-margin", "shape-outside",
"text-decoration", "text-decoration-color", "text-emphasis", "text-decoration", "text-decoration-color", "text-emphasis",
"text-emphasis-color", "text-indent", "text-shadow", "top", "transform", "text-emphasis-color", "text-indent", "text-shadow", "top", "transform",
"transform-origin", "vertical-align", "visibility", "width", "transform-origin", "vertical-align", "visibility", "width",
"word-spacing", "z-index" "word-spacing", "z-index"
] ]
@ -56,11 +56,12 @@ def is_known_animatable_property(name):
# following list, and can be implemented removing it from the list and # following list, and can be implemented removing it from the list and
# implementing the Interpolate trait in helpers/animated_properties.mako.rs # implementing the Interpolate trait in helpers/animated_properties.mako.rs
def is_not_supported_animatable_property(name): def is_not_supported_animatable_property(name):
return name in [ return name in [
"flex-basis", "column-width", "column-height", "column-count", "flex-basis", "column-width", "column-height", "column-count",
"column-gap", "box-shadow", "clip", "filter", "transform-origin", "column-gap", "box-shadow", "clip", "filter", "transform-origin",
"perspective-origin", "font-stretch", "letter-spacing", "word-spacing", "perspective-origin", "font-stretch", "letter-spacing", "word-spacing",
"text-decoration" ] "text-decoration"
]
class Keyword(object): class Keyword(object):

12
components/style/properties/helpers/animated_properties.mako.rs
View file

@ -3,9 +3,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use app_units::Au; use app_units::Au;
use bezier::Bezier;
use cssparser::{Color as CSSParserColor, Parser, RGBA, ToCss}; use cssparser::{Color as CSSParserColor, Parser, RGBA, ToCss};
use dom::{OpaqueNode, TRestyleDamage};
use euclid::{Point2D, Size2D}; use euclid::{Point2D, Size2D};
use properties::PropertyDeclaration; use properties::PropertyDeclaration;
use properties::longhands; use properties::longhands;
@ -20,9 +18,6 @@ use properties::longhands::text_shadow::computed_value::TextShadow;
use properties::longhands::transform::computed_value::ComputedMatrix; use properties::longhands::transform::computed_value::ComputedMatrix;
use properties::longhands::transform::computed_value::ComputedOperation as TransformOperation; use properties::longhands::transform::computed_value::ComputedOperation as TransformOperation;
use properties::longhands::transform::computed_value::T as TransformList; use properties::longhands::transform::computed_value::T as TransformList;
use properties::longhands::transition_property;
use properties::longhands::transition_timing_function::computed_value::StartEnd;
use properties::longhands::transition_timing_function::computed_value::TransitionTimingFunction;
use properties::longhands::vertical_align::computed_value::T as VerticalAlign; use properties::longhands::vertical_align::computed_value::T as VerticalAlign;
use properties::longhands::visibility::computed_value::T as Visibility; use properties::longhands::visibility::computed_value::T as Visibility;
use properties::longhands::z_index::computed_value::T as ZIndex; use properties::longhands::z_index::computed_value::T as ZIndex;
@ -33,7 +28,7 @@ use std::iter::repeat;
use super::ComputedValues; use super::ComputedValues;
use values::computed::{Angle, LengthOrPercentageOrAuto, LengthOrPercentageOrNone}; use values::computed::{Angle, LengthOrPercentageOrAuto, LengthOrPercentageOrNone};
use values::computed::{BorderRadiusSize, LengthOrNone}; use values::computed::{BorderRadiusSize, LengthOrNone};
use values::computed::{CalcLengthOrPercentage, Length, LengthOrPercentage, Time}; use values::computed::{CalcLengthOrPercentage, LengthOrPercentage};
// NB: This needs to be here because it needs all the longhands generated // NB: This needs to be here because it needs all the longhands generated
// beforehand. // beforehand.
@ -143,8 +138,9 @@ impl AnimatedProperty {
% for prop in data.longhands: % for prop in data.longhands:
% if prop.animatable: % if prop.animatable:
TransitionProperty::${prop.camel_case} => { TransitionProperty::${prop.camel_case} => {
AnimatedProperty::${prop.camel_case}(old_style.get_${prop.style_struct.ident.strip("_")}().${prop.ident}.clone(), AnimatedProperty::${prop.camel_case}(
new_style.get_${prop.style_struct.ident.strip("_")}().${prop.ident}.clone()) old_style.get_${prop.style_struct.ident.strip("_")}().${prop.ident}.clone(),
new_style.get_${prop.style_struct.ident.strip("_")}().${prop.ident}.clone())
} }
% endif % endif
% endfor % endfor

3
components/style/properties/properties.mako.rs
View file

@ -12,7 +12,7 @@
use std::ascii::AsciiExt; use std::ascii::AsciiExt;
use std::boxed::Box as StdBox; use std::boxed::Box as StdBox;
use std::collections::{HashMap, HashSet}; use std::collections::HashSet;
use std::fmt; use std::fmt;
use std::fmt::Write; use std::fmt::Write;
use std::sync::Arc; use std::sync::Arc;
@ -22,7 +22,6 @@ use cssparser::Color as CSSParserColor;
use cssparser::{Parser, RGBA, AtRuleParser, DeclarationParser, Delimiter, use cssparser::{Parser, RGBA, AtRuleParser, DeclarationParser, Delimiter,
DeclarationListParser, parse_important, ToCss, TokenSerializationType}; DeclarationListParser, parse_important, ToCss, TokenSerializationType};
use error_reporting::ParseErrorReporter; use error_reporting::ParseErrorReporter;
use keyframes::Keyframe;
use url::Url; use url::Url;
use euclid::side_offsets::SideOffsets2D; use euclid::side_offsets::SideOffsets2D;
use euclid::size::Size2D; use euclid::size::Size2D;

1
components/style/selector_matching.rs
View file

@ -7,7 +7,6 @@
use dom::PresentationalHintsSynthetizer; use dom::PresentationalHintsSynthetizer;
use element_state::*; use element_state::*;
use error_reporting::StdoutErrorReporter; use error_reporting::StdoutErrorReporter;
use keyframes::Keyframe;
use keyframes::KeyframesAnimation; use keyframes::KeyframesAnimation;
use media_queries::{Device, MediaType}; use media_queries::{Device, MediaType};
use parser::ParserContextExtraData; use parser::ParserContextExtraData;