Backed out changeset dda1c7951937 for build bustage force-cargo-libra…

…ry-build. r=backout on a CLOSED TREE Backs out #19660
servo · Dec 31, 2017 · cf8b8db · cf8b8db
1 parent d3f603e
commit cf8b8db
Show file tree

Hide file tree

Showing 2 changed files with 72 additions and 100 deletions.
diff --git a/components/style/gecko/generated/structs.rs b/components/style/gecko/generated/structs.rs
diff --git a/components/style/gecko/wrapper.rs b/components/style/gecko/wrapper.rs
@@ -536,9 +536,8 @@ impl<'le> GeckoElement<'le> {
     fn get_extended_slots(
         &self,
     ) -> Option<&structs::FragmentOrElement_nsExtendedDOMSlots> {
-        self.get_dom_slots().and_then(|s| unsafe {
-            (s._base.mExtendedSlots.mPtr as *const structs::FragmentOrElement_nsExtendedDOMSlots).as_ref()
-        })
+        self.get_dom_slots()
+            .and_then(|s| unsafe { s.mExtendedSlots.mPtr.as_ref() })
     }
 
     #[inline]
@@ -593,7 +592,7 @@ impl<'le> GeckoElement<'le> {
     fn get_non_xul_xbl_binding_parent_raw_content(&self) -> *mut nsIContent {
         debug_assert!(!self.is_xul_element());
         self.get_extended_slots()
-            .map_or(ptr::null_mut(), |slots| slots._base.mBindingParent)
+            .map_or(ptr::null_mut(), |slots| slots.mBindingParent)
     }
 
     fn has_xbl_binding_parent(&self) -> bool {