From 9ab27845168677673a89db3cf5fd46cb0f3302e2 Mon Sep 17 00:00:00 2001 From: Xidorn Quan Date: Wed, 16 May 2018 22:21:57 +1000 Subject: [PATCH] Bug 1461858 followup - Use RefPtr::new instead of RefPtr::from_ptr_ref + clone. --HG-- extra : source : 4a743827a83a7130ea8de9916cf3f83448596ffb --- servo/components/style/gecko/conversions.rs | 4 ++-- servo/components/style/properties/gecko.mako.rs | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/servo/components/style/gecko/conversions.rs b/servo/components/style/gecko/conversions.rs index 314ded9cb1cf..bbc2776daa94 100644 --- a/servo/components/style/gecko/conversions.rs +++ b/servo/components/style/gecko/conversions.rs @@ -679,8 +679,8 @@ pub mod basic_shape { match other.mType { StyleShapeSourceType::URL => unsafe { let shape_image = &*other.mShapeImage.mPtr; - let other_url = RefPtr::from_ptr_ref(shape_image.__bindgen_anon_1.mURLValue.as_ref()); - let url = ComputedUrl::from_url_value(other_url.clone()); + let other_url = RefPtr::new(*shape_image.__bindgen_anon_1.mURLValue.as_ref()); + let url = ComputedUrl::from_url_value(other_url); ShapeSource::ImageOrUrl(url) }, StyleShapeSourceType::Image => { diff --git a/servo/components/style/properties/gecko.mako.rs b/servo/components/style/properties/gecko.mako.rs index bb71edaa7c31..b86a59fc6e57 100644 --- a/servo/components/style/properties/gecko.mako.rs +++ b/servo/components/style/properties/gecko.mako.rs @@ -760,8 +760,8 @@ def set_gecko_property(ffi_name, expr): nsStyleSVGPaintType::eStyleSVGPaintType_ContextStroke => SVGPaintKind::ContextStroke, nsStyleSVGPaintType::eStyleSVGPaintType_Server => { SVGPaintKind::PaintServer(unsafe { - let url = RefPtr::from_ptr_ref(paint.mPaint.mPaintServer.as_ref()); - ComputedUrl::from_url_value(url.clone()) + let url = RefPtr::new(*paint.mPaint.mPaintServer.as_ref()); + ComputedUrl::from_url_value(url) }) } nsStyleSVGPaintType::eStyleSVGPaintType_Color => { @@ -4546,8 +4546,8 @@ fn static_assert() { }, NS_STYLE_FILTER_URL => { filters.push(Filter::Url(unsafe { - let url = RefPtr::from_ptr_ref(filter.__bindgen_anon_1.mURL.as_ref()); - ComputedUrl::from_url_value(url.clone()) + let url = RefPtr::new(*filter.__bindgen_anon_1.mURL.as_ref()); + ComputedUrl::from_url_value(url) })); } _ => {},