From fed488cd015310da8cd828fa915ca10ad65817b6 Mon Sep 17 00:00:00 2001 From: Xidorn Quan Date: Wed, 21 Dec 2016 10:14:04 +1100 Subject: [PATCH] Change SpecifiedUrl::for_cascade to take ServoUrl --- components/script/dom/element.rs | 2 +- components/style/values/specified/image.rs | 2 +- components/style/values/specified/url.rs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs index 27386eb2da8..d5181e221fb 100644 --- a/components/script/dom/element.rs +++ b/components/script/dom/element.rs @@ -397,7 +397,7 @@ impl LayoutElementHelpers for LayoutJS { PropertyDeclaration::BackgroundImage(DeclaredValue::Value( background_image::SpecifiedValue(vec![ background_image::single_value::SpecifiedValue(Some( - specified::Image::for_cascade(Some(url.into()), specified::url::UrlExtraData { }) + specified::Image::for_cascade(url.into(), specified::url::UrlExtraData { }) )) ]))))); } diff --git a/components/style/values/specified/image.rs b/components/style/values/specified/image.rs index 479d378a680..af0ed3a2baf 100644 --- a/components/style/values/specified/image.rs +++ b/components/style/values/specified/image.rs @@ -45,7 +45,7 @@ impl Image { /// Creates an already specified image value from an already resolved URL /// for insertion in the cascade. - pub fn for_cascade(url: Option, extra_data: UrlExtraData) -> Self { + pub fn for_cascade(url: ServoUrl, extra_data: UrlExtraData) -> Self { Image::Url(SpecifiedUrl::for_cascade(url, extra_data)) } } diff --git a/components/style/values/specified/url.rs b/components/style/values/specified/url.rs index 878fbc018b8..9e56c925ef8 100644 --- a/components/style/values/specified/url.rs +++ b/components/style/values/specified/url.rs @@ -130,10 +130,10 @@ impl SpecifiedUrl { /// Creates an already specified url value from an already resolved URL /// for insertion in the cascade. - pub fn for_cascade(url: Option, extra_data: UrlExtraData) -> Self { + pub fn for_cascade(url: ServoUrl, extra_data: UrlExtraData) -> Self { SpecifiedUrl { original: None, - resolved: url, + resolved: Some(url), extra_data: extra_data, } }