From f1516d228f54d2ceed40ce894b3487ef4e6fbb3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= Date: Thu, 8 Feb 2018 11:55:50 +0100 Subject: [PATCH] style: Rename StylesheetSet to DocumentStylesheetSet. MozReview-Commit-ID: 5Xl1eRLu1VF --- components/script/dom/bindings/trace.rs | 4 ++-- components/script/dom/document.rs | 10 +++++----- components/style/stylesheet_set.rs | 18 +++++++++--------- components/style/stylist.rs | 12 ++++++------ 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/components/script/dom/bindings/trace.rs b/components/script/dom/bindings/trace.rs index 97d9f062688..f4930406507 100644 --- a/components/script/dom/bindings/trace.rs +++ b/components/script/dom/bindings/trace.rs @@ -105,7 +105,7 @@ use style::media_queries::MediaList; use style::properties::PropertyDeclarationBlock; use style::selector_parser::{PseudoElement, Snapshot}; use style::shared_lock::{SharedRwLock as StyleSharedRwLock, Locked as StyleLocked}; -use style::stylesheet_set::StylesheetSet; +use style::stylesheet_set::DocumentStylesheetSet; use style::stylesheets::{CssRules, FontFaceRule, KeyframesRule, MediaRule, Stylesheet}; use style::stylesheets::{NamespaceRule, StyleRule, ImportRule, SupportsRule, ViewportRule}; use style::stylesheets::keyframes_rule::Keyframe; @@ -659,7 +659,7 @@ unsafe impl JSTraceable for StyleLocked { } } -unsafe impl JSTraceable for StylesheetSet +unsafe impl JSTraceable for DocumentStylesheetSet where S: JSTraceable + ::style::stylesheets::StylesheetInDocument + PartialEq + 'static, { diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs index 8df8ba23d9a..a24382ab80a 100644 --- a/components/script/dom/document.rs +++ b/components/script/dom/document.rs @@ -135,7 +135,7 @@ use style::media_queries::{Device, MediaList, MediaType}; use style::selector_parser::{RestyleDamage, Snapshot}; use style::shared_lock::{SharedRwLock as StyleSharedRwLock, SharedRwLockReadGuard}; use style::str::{HTML_SPACE_CHARACTERS, split_html_space_chars, str_join}; -use style::stylesheet_set::StylesheetSet; +use style::stylesheet_set::DocumentStylesheetSet; use style::stylesheets::{Stylesheet, StylesheetContents, Origin, OriginSet}; use task_source::TaskSource; use time; @@ -262,7 +262,7 @@ pub struct Document { /// Can be acquired once for accessing many objects. style_shared_lock: StyleSharedRwLock, /// List of stylesheets associated with nodes in this document. |None| if the list needs to be refreshed. - stylesheets: DomRefCell>, + stylesheets: DomRefCell>, stylesheet_list: MutNullableDom, ready_state: Cell, /// Whether the DOMContentLoaded event has already been dispatched. @@ -1466,7 +1466,7 @@ impl Document { // Mark the document element dirty so a reflow will be performed. // - // FIXME(emilio): Use the StylesheetSet invalidation stuff. + // FIXME(emilio): Use the DocumentStylesheetSet invalidation stuff. if let Some(element) = self.GetDocumentElement() { element.upcast::().dirty(NodeDamage::NodeStyleDamaged); } @@ -2264,7 +2264,7 @@ impl Document { PER_PROCESS_AUTHOR_SHARED_LOCK.clone() //StyleSharedRwLock::new() }, - stylesheets: DomRefCell::new(StylesheetSet::new()), + stylesheets: DomRefCell::new(DocumentStylesheetSet::new()), stylesheet_list: MutNullableDom::new(None), ready_state: Cell::new(ready_state), domcontentloaded_dispatched: Cell::new(domcontentloaded_dispatched), @@ -3807,7 +3807,7 @@ impl DocumentMethods for Document { self.scripts.set(None); self.anchors.set(None); self.applets.set(None); - *self.stylesheets.borrow_mut() = StylesheetSet::new(); + *self.stylesheets.borrow_mut() = DocumentStylesheetSet::new(); self.animation_frame_ident.set(0); self.animation_frame_list.borrow_mut().clear(); self.pending_restyles.borrow_mut().clear(); diff --git a/components/style/stylesheet_set.rs b/components/style/stylesheet_set.rs index 0c3a985c26c..b2f44e1bed1 100644 --- a/components/style/stylesheet_set.rs +++ b/components/style/stylesheet_set.rs @@ -370,7 +370,7 @@ where /// The set of stylesheets effective for a given document. #[cfg_attr(feature = "servo", derive(MallocSizeOf))] -pub struct StylesheetSet +pub struct DocumentStylesheetSet where S: StylesheetInDocument + PartialEq + 'static, { @@ -387,13 +387,13 @@ where author_style_disabled: bool, } -impl StylesheetSet +impl DocumentStylesheetSet where S: StylesheetInDocument + PartialEq + 'static, { /// Create a new empty StylesheetSet. pub fn new() -> Self { - StylesheetSet { + Self { collections: Default::default(), invalidations: StylesheetInvalidationSet::new(), origins_dirty: OriginSet::empty(), @@ -438,7 +438,7 @@ where sheet: S, guard: &SharedRwLockReadGuard ) { - debug!("StylesheetSet::append_stylesheet"); + debug!("DocumentStylesheetSet::append_stylesheet"); self.collect_invalidations_for(device, &sheet, guard); let origin = sheet.contents(guard).origin; self.collections.borrow_mut_for_origin(&origin).append(sheet); @@ -451,7 +451,7 @@ where sheet: S, guard: &SharedRwLockReadGuard ) { - debug!("StylesheetSet::prepend_stylesheet"); + debug!("DocumentStylesheetSet::prepend_stylesheet"); self.collect_invalidations_for(device, &sheet, guard); let origin = sheet.contents(guard).origin; @@ -466,7 +466,7 @@ where before_sheet: S, guard: &SharedRwLockReadGuard, ) { - debug!("StylesheetSet::insert_stylesheet_before"); + debug!("DocumentStylesheetSet::insert_stylesheet_before"); self.collect_invalidations_for(device, &sheet, guard); let origin = sheet.contents(guard).origin; @@ -491,7 +491,7 @@ where /// Notes that the author style has been disabled for this document. pub fn set_author_style_disabled(&mut self, disabled: bool) { - debug!("StylesheetSet::set_author_style_disabled"); + debug!("DocumentStylesheetSet::set_author_style_disabled"); if self.author_style_disabled == disabled { return; } @@ -517,7 +517,7 @@ where { use std::mem; - debug!("StylesheetSet::flush"); + debug!("DocumentStylesheetSet::flush"); let had_invalidations = self.invalidations.flush(document_element, snapshots); @@ -546,7 +546,7 @@ where pub fn flush_without_invalidation(&mut self) -> OriginSet { use std::mem; - debug!("StylesheetSet::flush_without_invalidation"); + debug!("DocumentStylesheetSet::flush_without_invalidation"); self.invalidations.clear(); mem::replace(&mut self.origins_dirty, OriginSet::empty()) diff --git a/components/style/stylist.rs b/components/style/stylist.rs index 57e87819498..c32d6d207ee 100644 --- a/components/style/stylist.rs +++ b/components/style/stylist.rs @@ -41,7 +41,7 @@ use smallvec::SmallVec; use std::ops; use std::sync::Mutex; use style_traits::viewport::ViewportConstraints; -use stylesheet_set::{OriginValidity, SheetRebuildKind, StylesheetSet, StylesheetFlusher}; +use stylesheet_set::{OriginValidity, SheetRebuildKind, DocumentStylesheetSet, StylesheetFlusher}; #[cfg(feature = "gecko")] use stylesheets::{CounterStyleRule, FontFaceRule, FontFeatureValuesRule, PageRule}; use stylesheets::{CssRule, Origin, OriginSet, PerOrigin, PerOriginIter}; @@ -328,21 +328,21 @@ impl DocumentCascadeData { } } -/// A wrapper over a StylesheetSet that can be `Sync`, since it's only used and -/// exposed via mutable methods in the `Stylist`. +/// A wrapper over a DocumentStylesheetSet that can be `Sync`, since it's only +/// used and exposed via mutable methods in the `Stylist`. #[cfg_attr(feature = "servo", derive(MallocSizeOf))] -struct StylistStylesheetSet(StylesheetSet); +struct StylistStylesheetSet(DocumentStylesheetSet); // Read above to see why this is fine. unsafe impl Sync for StylistStylesheetSet {} impl StylistStylesheetSet { fn new() -> Self { - StylistStylesheetSet(StylesheetSet::new()) + StylistStylesheetSet(DocumentStylesheetSet::new()) } } impl ops::Deref for StylistStylesheetSet { - type Target = StylesheetSet; + type Target = DocumentStylesheetSet; fn deref(&self) -> &Self::Target { &self.0