Bug 1499408 - Followup build fix.
authorCameron McCormack <cam@mcc.id.au>
Wed, 17 Oct 2018 06:56:00 +0300
changeset 500133 7bbf53a4fc3c8d29cc6ebcd6fc4a92e26b106937
parent 500132 29c0fc82e879891cd13464dc028c1d1c4da14ece
child 500134 1b32f9f0a5d33d4e6c1ef171b28bea4519100a2b
push id1864
push userffxbld-merge
push dateMon, 03 Dec 2018 15:51:40 +0000
treeherdermozilla-release@f040763d99ad [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1499408
milestone64.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1499408 - Followup build fix. MozReview-Commit-ID: F88mB13Mwa1
servo/ports/geckolib/glue.rs
--- a/servo/ports/geckolib/glue.rs
+++ b/servo/ports/geckolib/glue.rs
@@ -33,16 +33,17 @@ use style::gecko::restyle_damage::GeckoR
 use style::gecko::selector_parser::{NonTSPseudoClass, PseudoElement};
 use style::gecko::traversal::RecalcStyleOnly;
 use style::gecko::url::CssUrlData;
 use style::gecko::wrapper::{GeckoElement, GeckoNode};
 use style::gecko_bindings::bindings;
 use style::gecko_bindings::bindings::{RawGeckoElementBorrowed, RawGeckoElementBorrowedOrNull, RawGeckoNodeBorrowed};
 use style::gecko_bindings::bindings::{RawGeckoKeyframeListBorrowed, RawGeckoKeyframeListBorrowedMut};
 use style::gecko_bindings::bindings::RawGeckoPresContextBorrowed;
+use style::gecko_bindings::bindings::RawGeckoURLExtraDataBorrowedMut;
 use style::gecko_bindings::bindings::{RawServoAuthorStyles, RawServoAuthorStylesBorrowed};
 use style::gecko_bindings::bindings::{RawServoAuthorStylesBorrowedMut, RawServoAuthorStylesOwned};
 use style::gecko_bindings::bindings::{RawServoCounterStyleRule, RawServoCounterStyleRuleBorrowed};
 use style::gecko_bindings::bindings::{RawServoDeclarationBlockBorrowed, RawServoDeclarationBlockStrong};
 use style::gecko_bindings::bindings::{RawServoFontFaceRuleBorrowed, RawServoFontFaceRuleStrong};
 use style::gecko_bindings::bindings::{RawServoFontFeatureValuesRule, RawServoFontFeatureValuesRuleBorrowed};
 use style::gecko_bindings::bindings::{RawServoImportRule, RawServoImportRuleBorrowed};
 use style::gecko_bindings::bindings::{RawServoKeyframe, RawServoKeyframeBorrowed, RawServoKeyframeStrong};
@@ -5471,18 +5472,18 @@ pub unsafe extern "C" fn Servo_CssUrlDat
     let string = url_data.as_str();
     *utf8_len = string.len() as u32;
     *utf8_chars = string.as_ptr();
 }
 
 #[no_mangle]
 pub extern "C" fn Servo_CssUrlData_GetExtraData(
     url: RawServoCssUrlDataBorrowed,
-) -> *mut URLExtraData {
-    CssUrlData::as_arc(&url).extra_data.0.get()
+) -> RawGeckoURLExtraDataBorrowedMut {
+    unsafe { &mut *CssUrlData::as_arc(&url).extra_data.0.get() }
 }
 
 #[no_mangle]
 pub extern "C" fn Servo_CssUrlData_IsLocalRef(
     url: RawServoCssUrlDataBorrowed
 ) -> bool {
     CssUrlData::as_arc(&url).is_fragment()
 }