mirror of
https://github.com/servo/servo.git
synced 2025-08-11 00:15:32 +01:00
Run rustfmt on selectors, servo_arc, and style.
This was generated with: ./mach cargo fmt --package selectors && ./mach cargo fmt --package servo_arc && ./mach cargo fmt --package style Using rustfmt 0.4.1-nightly (a4462d1 2018-03-26)
This commit is contained in:
Bobby Holley
parent
f7ae1a37e3
commit
c99bcdd4b8
181 changed files with 9981 additions and 7933 deletions
|
|
@ -2,16 +2,16 @@
|
|||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
use {Prefix, Namespace};
|
||||
use {Namespace, Prefix};
|
||||
use context::QuirksMode;
|
||||
use cssparser::{Parser, RuleListParser, ParserInput};
|
||||
use error_reporting::{ParseErrorReporter, ContextualParseError};
|
||||
use cssparser::{Parser, ParserInput, RuleListParser};
|
||||
use error_reporting::{ContextualParseError, ParseErrorReporter};
|
||||
use fallible::FallibleVec;
|
||||
use fnv::FnvHashMap;
|
||||
use invalidation::media_queries::{MediaListKey, ToMediaListKey};
|
||||
#[cfg(feature = "gecko")]
|
||||
use malloc_size_of::{MallocSizeOfOps, MallocUnconditionalShallowSizeOf};
|
||||
use media_queries::{MediaList, Device};
|
||||
use media_queries::{Device, MediaList};
|
||||
use parking_lot::RwLock;
|
||||
use parser::{ParserContext, ParserErrorContext};
|
||||
use servo_arc::Arc;
|
||||
|
|
@ -77,7 +77,7 @@ impl StylesheetContents {
|
|||
stylesheet_loader: Option<&StylesheetLoader>,
|
||||
error_reporter: &R,
|
||||
quirks_mode: QuirksMode,
|
||||
line_number_offset: u32
|
||||
line_number_offset: u32,
|
||||
) -> Self {
|
||||
let namespaces = RwLock::new(Namespaces::default());
|
||||
let (rules, source_map_url, source_url) = Stylesheet::parse_rules(
|
||||
|
|
@ -108,7 +108,7 @@ impl StylesheetContents {
|
|||
pub fn iter_rules<'a, 'b, C>(
|
||||
&'a self,
|
||||
device: &'a Device,
|
||||
guard: &'a SharedRwLockReadGuard<'b>
|
||||
guard: &'a SharedRwLockReadGuard<'b>,
|
||||
) -> RulesIterator<'a, 'b, C>
|
||||
where
|
||||
C: NestedRuleIterationCondition,
|
||||
|
|
@ -117,7 +117,7 @@ impl StylesheetContents {
|
|||
device,
|
||||
self.quirks_mode,
|
||||
guard,
|
||||
&self.rules.read_with(guard)
|
||||
&self.rules.read_with(guard),
|
||||
)
|
||||
}
|
||||
|
||||
|
|
@ -138,9 +138,9 @@ impl DeepCloneWithLock for StylesheetContents {
|
|||
params: &DeepCloneParams,
|
||||
) -> Self {
|
||||
// Make a deep clone of the rules, using the new lock.
|
||||
let rules =
|
||||
self.rules.read_with(guard)
|
||||
.deep_clone_with_lock(lock, guard, params);
|
||||
let rules = self.rules
|
||||
.read_with(guard)
|
||||
.deep_clone_with_lock(lock, guard, params);
|
||||
|
||||
Self {
|
||||
rules: Arc::new(lock.wrap(rules)),
|
||||
|
|
@ -206,11 +206,7 @@ pub trait StylesheetInDocument {
|
|||
fn media<'a>(&'a self, guard: &'a SharedRwLockReadGuard) -> Option<&'a MediaList>;
|
||||
|
||||
/// Returns whether the style-sheet applies for the current device.
|
||||
fn is_effective_for_device(
|
||||
&self,
|
||||
device: &Device,
|
||||
guard: &SharedRwLockReadGuard
|
||||
) -> bool {
|
||||
fn is_effective_for_device(&self, device: &Device, guard: &SharedRwLockReadGuard) -> bool {
|
||||
match self.media(guard) {
|
||||
Some(medialist) => medialist.evaluate(device, self.quirks_mode(guard)),
|
||||
None => true,
|
||||
|
|
@ -225,7 +221,7 @@ pub trait StylesheetInDocument {
|
|||
fn iter_rules<'a, 'b, C>(
|
||||
&'a self,
|
||||
device: &'a Device,
|
||||
guard: &'a SharedRwLockReadGuard<'b>
|
||||
guard: &'a SharedRwLockReadGuard<'b>,
|
||||
) -> RulesIterator<'a, 'b, C>
|
||||
where
|
||||
C: NestedRuleIterationCondition,
|
||||
|
|
@ -239,7 +235,7 @@ pub trait StylesheetInDocument {
|
|||
fn effective_rules<'a, 'b>(
|
||||
&'a self,
|
||||
device: &'a Device,
|
||||
guard: &'a SharedRwLockReadGuard<'b>
|
||||
guard: &'a SharedRwLockReadGuard<'b>,
|
||||
) -> EffectiveRulesIterator<'a, 'b> {
|
||||
self.iter_rules::<EffectiveRules>(device, guard)
|
||||
}
|
||||
|
|
@ -277,8 +273,7 @@ impl StylesheetInDocument for Stylesheet {
|
|||
#[derive(Clone)]
|
||||
#[cfg_attr(feature = "servo", derive(MallocSizeOf))]
|
||||
pub struct DocumentStyleSheet(
|
||||
#[cfg_attr(feature = "servo", ignore_malloc_size_of = "Arc")]
|
||||
pub Arc<Stylesheet>
|
||||
#[cfg_attr(feature = "servo", ignore_malloc_size_of = "Arc")] pub Arc<Stylesheet>,
|
||||
);
|
||||
|
||||
impl PartialEq for DocumentStyleSheet {
|
||||
|
|
@ -316,28 +311,26 @@ impl Stylesheet {
|
|||
stylesheet_loader: Option<&StylesheetLoader>,
|
||||
error_reporter: &R,
|
||||
line_number_offset: u32,
|
||||
)
|
||||
where
|
||||
) where
|
||||
R: ParseErrorReporter,
|
||||
{
|
||||
let namespaces = RwLock::new(Namespaces::default());
|
||||
let (rules, source_map_url, source_url) =
|
||||
Stylesheet::parse_rules(
|
||||
css,
|
||||
&url_data,
|
||||
existing.contents.origin,
|
||||
&mut *namespaces.write(),
|
||||
&existing.shared_lock,
|
||||
stylesheet_loader,
|
||||
error_reporter,
|
||||
existing.contents.quirks_mode,
|
||||
line_number_offset
|
||||
);
|
||||
let (rules, source_map_url, source_url) = Stylesheet::parse_rules(
|
||||
css,
|
||||
&url_data,
|
||||
existing.contents.origin,
|
||||
&mut *namespaces.write(),
|
||||
&existing.shared_lock,
|
||||
stylesheet_loader,
|
||||
error_reporter,
|
||||
existing.contents.quirks_mode,
|
||||
line_number_offset,
|
||||
);
|
||||
|
||||
*existing.contents.url_data.write() = url_data;
|
||||
mem::swap(
|
||||
&mut *existing.contents.namespaces.write(),
|
||||
&mut *namespaces.write()
|
||||
&mut *namespaces.write(),
|
||||
);
|
||||
|
||||
// Acquire the lock *after* parsing, to minimize the exclusive section.
|
||||
|
|
@ -356,19 +349,13 @@ impl Stylesheet {
|
|||
stylesheet_loader: Option<&StylesheetLoader>,
|
||||
error_reporter: &R,
|
||||
quirks_mode: QuirksMode,
|
||||
line_number_offset: u32
|
||||
line_number_offset: u32,
|
||||
) -> (Vec<CssRule>, Option<String>, Option<String>) {
|
||||
let mut rules = Vec::new();
|
||||
let mut input = ParserInput::new_with_line_number_offset(css, line_number_offset);
|
||||
let mut input = Parser::new(&mut input);
|
||||
|
||||
let context = ParserContext::new(
|
||||
origin,
|
||||
url_data,
|
||||
None,
|
||||
ParsingMode::DEFAULT,
|
||||
quirks_mode
|
||||
);
|
||||
let context = ParserContext::new(origin, url_data, None, ParsingMode::DEFAULT, quirks_mode);
|
||||
|
||||
let error_context = ParserErrorContext { error_reporter };
|
||||
|
||||
|
|
@ -384,8 +371,7 @@ impl Stylesheet {
|
|||
};
|
||||
|
||||
{
|
||||
let mut iter =
|
||||
RuleListParser::new_for_stylesheet(&mut input, rule_parser);
|
||||
let mut iter = RuleListParser::new_for_stylesheet(&mut input, rule_parser);
|
||||
|
||||
while let Some(result) = iter.next() {
|
||||
match result {
|
||||
|
|
@ -400,9 +386,12 @@ impl Stylesheet {
|
|||
Err((error, slice)) => {
|
||||
let location = error.location;
|
||||
let error = ContextualParseError::InvalidRule(slice, error);
|
||||
iter.parser.context.log_css_error(&iter.parser.error_context,
|
||||
location, error);
|
||||
}
|
||||
iter.parser.context.log_css_error(
|
||||
&iter.parser.error_context,
|
||||
location,
|
||||
error,
|
||||
);
|
||||
},
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -426,9 +415,8 @@ impl Stylesheet {
|
|||
stylesheet_loader: Option<&StylesheetLoader>,
|
||||
error_reporter: &R,
|
||||
quirks_mode: QuirksMode,
|
||||
line_number_offset: u32)
|
||||
-> Stylesheet
|
||||
{
|
||||
line_number_offset: u32,
|
||||
) -> Stylesheet {
|
||||
let contents = StylesheetContents::from_str(
|
||||
css,
|
||||
url_data,
|
||||
|
|
@ -437,7 +425,7 @@ impl Stylesheet {
|
|||
stylesheet_loader,
|
||||
error_reporter,
|
||||
quirks_mode,
|
||||
line_number_offset
|
||||
line_number_offset,
|
||||
);
|
||||
|
||||
Stylesheet {
|
||||
|
|
@ -476,11 +464,8 @@ impl Clone for Stylesheet {
|
|||
// Make a deep clone of the media, using the new lock.
|
||||
let media = self.media.read_with(&guard).clone();
|
||||
let media = Arc::new(lock.wrap(media));
|
||||
let contents = self.contents.deep_clone_with_lock(
|
||||
&lock,
|
||||
&guard,
|
||||
&DeepCloneParams
|
||||
);
|
||||
let contents = self.contents
|
||||
.deep_clone_with_lock(&lock, &guard, &DeepCloneParams);
|
||||
|
||||
Stylesheet {
|
||||
contents,
|
||||
|
|
@ -490,4 +475,3 @@ impl Clone for Stylesheet {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue