From 1d8e64c8ee2145ae471e51736ae3a7492a302459 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= Date: Tue, 10 Apr 2018 16:54:57 +0200 Subject: [PATCH] style: Simplify ImageValue. Bug: 1452987 Reviewed-by: heycam MozReview-Commit-ID: 5LRaaEPSSdY --- components/style/gecko/url.rs | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/components/style/gecko/url.rs b/components/style/gecko/url.rs index 81ff4c73807..1b5bc424e4d 100644 --- a/components/style/gecko/url.rs +++ b/components/style/gecko/url.rs @@ -56,14 +56,10 @@ impl CssUrl { /// Convert from URLValueData to SpecifiedUrl. unsafe fn from_url_value_data(url: &URLValueData) -> Result { + let arc_type = + &url.mString as *const _ as *const RawOffsetArc; Ok(CssUrl { - serialization: if url.mUsingRustString { - let arc_type = - url.mStrings.mRustString.as_ref() as *const _ as *const RawOffsetArc; - Arc::from_raw_offset((*arc_type).clone()) - } else { - Arc::new(url.mStrings.mString.as_ref().to_string()) - }, + serialization: Arc::from_raw_offset((*arc_type).clone()), extra_data: url.mExtraData.to_safe(), }) }