From 153ec64c1511b48b4279bed0338ebbc7b13d92c4 Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Thu, 22 Sep 2016 18:46:27 +0530 Subject: [PATCH] Rename SpecifiedExplicitSize to ExplicitSize --- .../style/properties/longhand/background.mako.rs | 12 ++++++------ tests/unit/style/properties/serialization.rs | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/components/style/properties/longhand/background.mako.rs b/components/style/properties/longhand/background.mako.rs index c2c6212a60f..2dd8675466c 100644 --- a/components/style/properties/longhand/background.mako.rs +++ b/components/style/properties/longhand/background.mako.rs @@ -191,7 +191,7 @@ ${helpers.single_keyword("background-origin", } } - impl HasViewportPercentage for SpecifiedExplicitSize { + impl HasViewportPercentage for ExplicitSize { fn has_viewport_percentage(&self) -> bool { return self.width.has_viewport_percentage() || self.height.has_viewport_percentage(); } @@ -199,12 +199,12 @@ ${helpers.single_keyword("background-origin", #[derive(Clone, PartialEq, Debug)] #[cfg_attr(feature = "servo", derive(HeapSizeOf))] - pub struct SpecifiedExplicitSize { + pub struct ExplicitSize { pub width: specified::LengthOrPercentageOrAuto, pub height: specified::LengthOrPercentageOrAuto, } - impl ToCss for SpecifiedExplicitSize { + impl ToCss for ExplicitSize { fn to_css(&self, dest: &mut W) -> fmt::Result where W: fmt::Write { try!(self.width.to_css(dest)); try!(dest.write_str(" ")); @@ -232,7 +232,7 @@ ${helpers.single_keyword("background-origin", #[derive(Clone, PartialEq, Debug)] #[cfg_attr(feature = "servo", derive(HeapSizeOf))] pub enum SpecifiedValue { - Explicit(SpecifiedExplicitSize), + Explicit(ExplicitSize), Cover, Contain, } @@ -274,7 +274,7 @@ ${helpers.single_keyword("background-origin", } #[inline] pub fn get_initial_specified_value() -> SpecifiedValue { - SpecifiedValue::Explicit(SpecifiedExplicitSize { + SpecifiedValue::Explicit(ExplicitSize { width: specified::LengthOrPercentageOrAuto::Auto, height: specified::LengthOrPercentageOrAuto::Auto, }) @@ -311,7 +311,7 @@ ${helpers.single_keyword("background-origin", height = try!(specified::LengthOrPercentageOrAuto::parse(input)); } - Ok(SpecifiedValue::Explicit(SpecifiedExplicitSize { + Ok(SpecifiedValue::Explicit(ExplicitSize { width: width, height: height, })) diff --git a/tests/unit/style/properties/serialization.rs b/tests/unit/style/properties/serialization.rs index c43fc5e93c1..add62581f61 100644 --- a/tests/unit/style/properties/serialization.rs +++ b/tests/unit/style/properties/serialization.rs @@ -742,7 +742,7 @@ mod shorthand_serialization { let size = single_vec_variant_value!(size, size::single_value::SpecifiedValue::Explicit( - size::single_value::SpecifiedExplicitSize { + size::single_value::ExplicitSize { width: LengthOrPercentageOrAuto::Length(Length::from_px(70f32)), height: LengthOrPercentageOrAuto::Length(Length::from_px(50f32)) } @@ -797,7 +797,7 @@ mod shorthand_serialization { let size = single_vec_variant_value!(size, size::single_value::SpecifiedValue::Explicit( - size::single_value::SpecifiedExplicitSize { + size::single_value::ExplicitSize { width: LengthOrPercentageOrAuto::Length(Length::from_px(70f32)), height: LengthOrPercentageOrAuto::Length(Length::from_px(50f32)) }