From 9ed48952f5f64b5666fb4c672fa8e8c468113d26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= Date: Mon, 30 Apr 2018 17:50:03 +0200 Subject: [PATCH] style: Merge ServoStyleSheet and StyleSheet. These are the most minimal changes I could make. More cleanups incoming. Bug: 1457920 Reviewed-by: xidorn MozReview-Commit-ID: AdMOA1acQIH --- components/style/gecko/data.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/components/style/gecko/data.rs b/components/style/gecko/data.rs index 567a9b7f6ca..ac41eaa14c3 100644 --- a/components/style/gecko/data.rs +++ b/components/style/gecko/data.rs @@ -9,7 +9,7 @@ use context::QuirksMode; use dom::TElement; use gecko_bindings::bindings::{self, RawServoStyleSet}; use gecko_bindings::structs::{self, RawGeckoPresContextOwned, ServoStyleSetSizes, ServoStyleSheet}; -use gecko_bindings::structs::{ServoStyleSheetInner, StyleSheetInfo, nsIDocument}; +use gecko_bindings::structs::{StyleSheetInfo, nsIDocument}; use gecko_bindings::sugar::ownership::{HasArcFFI, HasBoxFFI, HasFFI, HasSimpleFFI}; use invalidation::media_queries::{MediaListKey, ToMediaListKey}; use malloc_size_of::MallocSizeOfOps; @@ -54,9 +54,9 @@ impl GeckoStyleSheet { unsafe { &*self.0 } } - fn inner(&self) -> &ServoStyleSheetInner { + fn inner(&self) -> &StyleSheetInfo { unsafe { - &*(self.raw()._base.mInner as *const StyleSheetInfo as *const ServoStyleSheetInner) + &*(self.raw().mInner as *const StyleSheetInfo) } } @@ -98,7 +98,7 @@ impl StylesheetInDocument for GeckoStyleSheet { use std::mem; unsafe { - let dom_media_list = self.raw()._base.mMedia.mRawPtr as *const DomMediaList; + let dom_media_list = self.raw().mMedia.mRawPtr as *const DomMediaList; if dom_media_list.is_null() { return None; }