style: Change URL value storage in StyleShapeSource. draft
authorTing-Yu Lin <tlin@mozilla.com>
Fri, 29 Sep 2017 16:39:46 +0800
changeset 673014 cda6bcdf6b26e07310ee82bd9b9bfefc6e5a6074
parent 673013 98419e7b43ac10129d08b8b9f1ebd88f2dfe962a
child 733979 94a53898afab16d59cf8d90e59637dab4ac8df67
push id82436
push userbmo:tlin@mozilla.com
push dateSat, 30 Sep 2017 06:12:02 +0000
bugs1404243
milestone58.0a1
style: Change URL value storage in StyleShapeSource. This is due to Bug 1404243 Part 4. MozReview-Commit-ID: CFRCdw2Dayy
servo/components/style/gecko/conversions.rs
--- a/servo/components/style/gecko/conversions.rs
+++ b/servo/components/style/gecko/conversions.rs
@@ -612,17 +612,18 @@ pub mod basic_shape {
         ReferenceBox: From<StyleGeometryBox>,
     {
         fn from(other: &'a StyleShapeSource) -> Self {
             match other.mType {
                 StyleShapeSourceType::None => ShapeSource::None,
                 StyleShapeSourceType::Box => ShapeSource::Box(other.mReferenceBox.into()),
                 StyleShapeSourceType::URL => {
                     unsafe {
-                        let other_url = &(**other.__bindgen_anon_1.mURL.as_ref());
+                        let shape_image = &*other.mShapeImage.mPtr;
+                        let other_url = &(**shape_image.__bindgen_anon_1.mURLValue.as_ref());
                         let url = SpecifiedUrl::from_url_value_data(&other_url._base).unwrap();
                         ShapeSource::Url(url)
                     }
                 },
                 StyleShapeSourceType::Shape => {
                     let other_shape = unsafe { &*other.mBasicShape.mPtr };
                     let shape = other_shape.into();
                     let reference_box = if other.mReferenceBox == StyleGeometryBox::NoBox {