Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-12 08:55:32 +01:00
Code Issues Projects Releases Packages Wiki Activity

style: Centralize specified url value handling, and refcount urls.

Browse source
This commit is contained in:
Emilio Cobos Álvarez 2016-10-16 15:08:30 +02:00
parent 89c46369a2
commit 5f2e7af864
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
22 changed files with 267 additions and 187 deletions
Download patch file Download diff file Expand all files Collapse all files

19
tests/unit/style/properties/serialization.rs
View file

@ -9,9 +9,8 @@ pub use style::values::specified::{BorderStyle, BorderWidth, CSSColor, Length};
pub use style::values::specified::{LengthOrPercentage, LengthOrPercentageOrAuto, LengthOrPercentageOrAutoOrContent};
pub use style::properties::longhands::outline_color::computed_value::T as ComputedColor;
pub use style::values::RGBA;
pub use style::values::specified::UrlExtraData;
pub use style::values::specified::url::{UrlExtraData, SpecifiedUrl};
pub use style_traits::ToCss;
pub use url::Url;
#[test]
fn property_declaration_block_should_serialize_correctly() {
@ -430,9 +429,7 @@ mod shorthand_serialization {
let position = DeclaredValue::Value(ListStylePosition::inside);
let image = DeclaredValue::Value(ListStyleImage::Url(
Url::parse("http://servo/test.png").unwrap(),
UrlExtraData {},
));
SpecifiedUrl::new_for_testing("http://servo/test.png")));
let style_type = DeclaredValue::Value(ListStyleType::disc);
properties.push(PropertyDeclaration::ListStylePosition(position));
@ -747,8 +744,7 @@ mod shorthand_serialization {
let attachment = single_vec_keyword_value!(attachment, scroll);
let image = single_vec_value!(image,
Some(Image::Url(Url::parse("http://servo/test.png").unwrap(),
UrlExtraData {})));
Some(Image::Url(SpecifiedUrl::new_for_testing("http://servo/test.png"))));
let size = single_vec_variant_value!(size,
size::single_value::SpecifiedValue::Explicit(
@ -802,8 +798,7 @@ mod shorthand_serialization {
let attachment = single_vec_keyword_value!(attachment, scroll);
let image = single_vec_value!(image,
Some(Image::Url(Url::parse("http://servo/test.png").unwrap(),
UrlExtraData {})));
Some(Image::Url(SpecifiedUrl::new_for_testing("http://servo/test.png"))));
let size = single_vec_variant_value!(size,
size::single_value::SpecifiedValue::Explicit(
@ -917,8 +912,7 @@ mod shorthand_serialization {
let image = single_vec_value_typedef!(image,
image::single_value::SpecifiedValue::Image(
Image::Url(Url::parse("http://servo/test.png").unwrap(),
UrlExtraData {})));
Image::Url(SpecifiedUrl::new_for_testing("http://servo/test.png"))));
let mode = single_vec_keyword_value!(mode, luminance);
@ -968,8 +962,7 @@ mod shorthand_serialization {
let image = single_vec_value_typedef!(image,
image::single_value::SpecifiedValue::Image(
Image::Url(Url::parse("http://servo/test.png").unwrap(),
UrlExtraData {})));
Image::Url(SpecifiedUrl::new_for_testing("http://servo/test.png"))));
let mode = single_vec_keyword_value!(mode, luminance);