From 97422ad2520499e0b70ad49dfdbc1e0ff4b56353 Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Thu, 3 Sep 2015 03:16:00 +0530 Subject: [PATCH] Various fixes in style --- components/style/animation.rs | 14 +++++++------- components/style/media_queries.rs | 8 ++++---- components/style/viewport.rs | 18 +++++++++--------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/components/style/animation.rs b/components/style/animation.rs index 3f1a20c529c..34043e47a98 100644 --- a/components/style/animation.rs +++ b/components/style/animation.rs @@ -798,26 +798,26 @@ fn build_identity_transform_list(list: &Vec) -> Vec { + match *operation { + TransformOperation::Matrix(..) => { let identity = ComputedMatrix::identity(); result.push(TransformOperation::Matrix(identity)); } - &TransformOperation::Skew(..) => { + TransformOperation::Skew(..) => { result.push(TransformOperation::Skew(0.0, 0.0)); } - &TransformOperation::Translate(..) => { + TransformOperation::Translate(..) => { result.push(TransformOperation::Translate(LengthOrPercentage::zero(), LengthOrPercentage::zero(), Au(0))); } - &TransformOperation::Scale(..) => { + TransformOperation::Scale(..) => { result.push(TransformOperation::Scale(1.0, 1.0, 1.0)); } - &TransformOperation::Rotate(..) => { + TransformOperation::Rotate(..) => { result.push(TransformOperation::Rotate(0.0, 0.0, 1.0, Angle(0.0))); } - &TransformOperation::Perspective(..) => { + TransformOperation::Perspective(..) => { // http://dev.w3.org/csswg/css-transforms/#identity-transform-function let identity = ComputedMatrix::identity(); result.push(TransformOperation::Matrix(identity)); diff --git a/components/style/media_queries.rs b/components/style/media_queries.rs index 111354145e6..bddfedb9c37 100644 --- a/components/style/media_queries.rs +++ b/components/style/media_queries.rs @@ -25,16 +25,16 @@ pub enum Range { impl Range { fn to_computed_range(&self, viewport_size: Size2D) -> Range { - let compute_width = |width| { + let compute_width = |&width| { match width { - &specified::Length::Absolute(value) => value, - &specified::Length::FontRelative(value) => { + specified::Length::Absolute(value) => value, + specified::Length::FontRelative(value) => { // http://dev.w3.org/csswg/mediaqueries3/#units // em units are relative to the initial font-size. let initial_font_size = longhands::font_size::get_initial_value(); value.to_computed_value(initial_font_size, initial_font_size) } - &specified::Length::ViewportPercentage(value) => + specified::Length::ViewportPercentage(value) => value.to_computed_value(viewport_size), _ => unreachable!() } diff --git a/components/style/viewport.rs b/components/style/viewport.rs index 247cd6400ae..bdc9b6176f5 100644 --- a/components/style/viewport.rs +++ b/components/style/viewport.rs @@ -46,10 +46,10 @@ impl ToCss for Zoom { fn to_css(&self, dest: &mut W) -> fmt::Result where W: fmt::Write { - match self { - &Zoom::Number(number) => write!(dest, "{}", number), - &Zoom::Percentage(percentage) => write!(dest, "{}%", percentage * 100.), - &Zoom::Auto => write!(dest, "auto") + match *self { + Zoom::Number(number) => write!(dest, "{}", number), + Zoom::Percentage(percentage) => write!(dest, "{}%", percentage * 100.), + Zoom::Auto => write!(dest, "auto") } } } @@ -71,10 +71,10 @@ impl Zoom { #[inline] pub fn to_f32(&self) -> Option { - match self { - &Zoom::Number(number) => Some(number as f32), - &Zoom::Percentage(percentage) => Some(percentage as f32), - &Zoom::Auto => None + match *self { + Zoom::Number(number) => Some(number as f32), + Zoom::Percentage(percentage) => Some(percentage as f32), + Zoom::Auto => None } } } @@ -193,7 +193,7 @@ pub struct ViewportRule { } impl ViewportRule { - pub fn parse<'a>(input: &mut Parser, context: &'a ParserContext) + pub fn parse(input: &mut Parser, context: &ParserContext) -> Result { let parser = ViewportRuleParser { context: context };