From e75b1c3b32e5c2d064316c1fe133b2bdb86fba2b Mon Sep 17 00:00:00 2001 From: Cameron McCormack Date: Tue, 24 May 2016 12:06:28 +1000 Subject: [PATCH] Re-use Url serialization in values::specified::Image. --- components/style/values.rs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/components/style/values.rs b/components/style/values.rs index 2f295bd8775..9492a028cfc 100644 --- a/components/style/values.rs +++ b/components/style/values.rs @@ -90,13 +90,13 @@ pub const FONT_MEDIUM_PX: i32 = 16; pub mod specified { use app_units::Au; - use cssparser::{self, CssStringWriter, Parser, ToCss, Token}; + use cssparser::{self, Parser, ToCss, Token}; use euclid::size::Size2D; use parser::ParserContext; use std::ascii::AsciiExt; use std::cmp; use std::f32::consts::PI; - use std::fmt::{self, Write}; + use std::fmt; use std::ops::Mul; use style_traits::values::specified::AllowedNumericType; use super::AuExtensionMethods; @@ -1224,12 +1224,10 @@ pub mod specified { impl ToCss for Image { fn to_css(&self, dest: &mut W) -> fmt::Result where W: fmt::Write { + use values::LocalToCss; match *self { Image::Url(ref url) => { - try!(dest.write_str("url(\"")); - try!(write!(&mut CssStringWriter::new(dest), "{}", url)); - try!(dest.write_str("\")")); - Ok(()) + url.to_css(dest) } Image::LinearGradient(ref gradient) => gradient.to_css(dest) }