diff options
author | Emilio Cobos Álvarez <emilio@crisal.io> | 2018-04-17 19:55:25 +0200 |
---|---|---|
committer | Emilio Cobos Álvarez <emilio@crisal.io> | 2018-04-17 20:02:58 +0200 |
commit | 827b82dc398faa70b042d283ce9c65e7ea15da02 (patch) | |
tree | 90138b90875ff6d4fcd99916139343735da1d7d3 | |
parent | f5c85a816a44f31bdcf37f7a3b4dd4ed44627aef (diff) | |
download | servo-827b82dc398faa70b042d283ce9c65e7ea15da02.tar.gz servo-827b82dc398faa70b042d283ce9c65e7ea15da02.zip |
style: Fix build bustage after afe484e46b631689357de183020419ab1a49dcdf.
-rw-r--r-- | components/script/dom/document.rs | 18 | ||||
-rw-r--r-- | components/style/stylesheets/import_rule.rs | 34 |
2 files changed, 42 insertions, 10 deletions
diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs index 01b9a13ba40..71df0e70356 100644 --- a/components/script/dom/document.rs +++ b/components/script/dom/document.rs @@ -135,7 +135,7 @@ use style::selector_parser::{RestyleDamage, Snapshot}; use style::shared_lock::{SharedRwLock as StyleSharedRwLock, SharedRwLockReadGuard}; use style::str::{split_html_space_chars, str_join}; use style::stylesheet_set::DocumentStylesheetSet; -use style::stylesheets::{Stylesheet, StylesheetContents, Origin, OriginSet}; +use style::stylesheets::{CssRule, Stylesheet, Origin, OriginSet}; use task_source::TaskSource; use time; use timers::OneshotTimerCallback; @@ -216,17 +216,25 @@ impl PartialEq for StyleSheetInDocument { } impl ::style::stylesheets::StylesheetInDocument for StyleSheetInDocument { - fn contents(&self, guard: &SharedRwLockReadGuard) -> &StylesheetContents { - self.sheet.contents(guard) + fn origin(&self, guard: &SharedRwLockReadGuard) -> Origin { + self.sheet.origin(guard) } - fn media<'a>(&'a self, guard: &'a SharedRwLockReadGuard) -> Option<&'a MediaList> { - self.sheet.media(guard) + fn quirks_mode(&self, guard: &SharedRwLockReadGuard) -> QuirksMode { + self.sheet.quirks_mode(guard) } fn enabled(&self) -> bool { self.sheet.enabled() } + + fn media<'a>(&'a self, guard: &'a SharedRwLockReadGuard) -> Option<&'a MediaList> { + self.sheet.media(guard) + } + + fn rules<'a, 'b: 'a>(&'a self, guard: &'b SharedRwLockReadGuard) -> &'a [CssRule] { + self.sheet.rules(guard) + } } /// <https://dom.spec.whatwg.org/#document> diff --git a/components/style/stylesheets/import_rule.rs b/components/style/stylesheets/import_rule.rs index 5fe5f9549d2..fb50ec69732 100644 --- a/components/style/stylesheets/import_rule.rs +++ b/components/style/stylesheets/import_rule.rs @@ -83,11 +83,7 @@ impl DeepCloneWithLock for ImportSheet { } } -/// A sheet that is held from an import rule. -#[cfg(feature = "servo")] -#[derive(Debug)] -pub struct ImportSheet(pub ::servo_arc::Arc<::stylesheets::Stylesheet>); - +#[cfg(feature = "gecko")] impl StylesheetInDocument for ImportSheet { fn origin(&self, _guard: &SharedRwLockReadGuard) -> Origin { match *self { @@ -125,6 +121,34 @@ impl StylesheetInDocument for ImportSheet { } } +/// A sheet that is held from an import rule. +#[cfg(feature = "servo")] +#[derive(Debug)] +pub struct ImportSheet(pub ::servo_arc::Arc<::stylesheets::Stylesheet>); + +#[cfg(feature = "servo")] +impl StylesheetInDocument for ImportSheet { + fn origin(&self, guard: &SharedRwLockReadGuard) -> Origin { + self.0.origin(guard) + } + + fn quirks_mode(&self, guard: &SharedRwLockReadGuard) -> QuirksMode { + self.0.quirks_mode(guard) + } + + fn enabled(&self) -> bool { + self.0.enabled() + } + + fn media<'a>(&'a self, guard: &'a SharedRwLockReadGuard) -> Option<&'a MediaList> { + self.0.media(guard) + } + + fn rules<'a, 'b: 'a>(&'a self, guard: &'b SharedRwLockReadGuard) -> &'a [CssRule] { + self.0.rules(guard) + } +} + #[cfg(feature = "servo")] impl DeepCloneWithLock for ImportSheet { fn deep_clone_with_lock( |