Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 06:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

style: Rename StylesheetSet to DocumentStylesheetSet.

Browse source 
MozReview-Commit-ID: 5Xl1eRLu1VF
This commit is contained in:
Emilio Cobos Álvarez 2018-02-08 11:55:50 +01:00
parent 7e501f50f7
commit f1516d228f
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
4 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

18
components/style/stylesheet_set.rs
View file

@ -370,7 +370,7 @@ where
/// The set of stylesheets effective for a given document.
#[cfg_attr(feature = "servo", derive(MallocSizeOf))]
pub struct StylesheetSet<S>
pub struct DocumentStylesheetSet<S>
where
S: StylesheetInDocument + PartialEq + 'static,
{
@ -387,13 +387,13 @@ where
author_style_disabled: bool,
}
impl<S> StylesheetSet<S>
impl<S> DocumentStylesheetSet<S>
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())

12
components/style/stylist.rs
View file

@ -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<StylistSheet>);
struct StylistStylesheetSet(DocumentStylesheetSet<StylistSheet>);
// 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<StylistSheet>;
type Target = DocumentStylesheetSet<StylistSheet>;
fn deref(&self) -> &Self::Target {
&self.0