aboutsummaryrefslogtreecommitdiffstats
path: root/components/style/stylesheets
diff options
context:
space:
mode:
Diffstat (limited to 'components/style/stylesheets')
-rw-r--r--components/style/stylesheets/keyframes_rule.rs4
-rw-r--r--components/style/stylesheets/mod.rs4
-rw-r--r--components/style/stylesheets/origin.rs8
-rw-r--r--components/style/stylesheets/stylesheet.rs4
4 files changed, 10 insertions, 10 deletions
diff --git a/components/style/stylesheets/keyframes_rule.rs b/components/style/stylesheets/keyframes_rule.rs
index d0372c7d240..d85b0e06ea6 100644
--- a/components/style/stylesheets/keyframes_rule.rs
+++ b/components/style/stylesheets/keyframes_rule.rs
@@ -15,7 +15,7 @@ use properties::longhands::transition_timing_function::single_value::SpecifiedVa
use servo_arc::Arc;
use shared_lock::{DeepCloneParams, DeepCloneWithLock, SharedRwLock, SharedRwLockReadGuard, Locked, ToCssWithGuard};
use std::fmt;
-use style_traits::{ParsingMode, ToCss, ParseError, StyleParseErrorKind};
+use style_traits::{PARSING_MODE_DEFAULT, ToCss, ParseError, StyleParseErrorKind};
use stylesheets::{CssRuleType, StylesheetContents};
use stylesheets::rule_parser::VendorPrefix;
use values::{KeyframesName, serialize_percentage};
@@ -218,7 +218,7 @@ impl Keyframe {
parent_stylesheet_contents.origin,
&url_data,
Some(CssRuleType::Keyframe),
- ParsingMode::DEFAULT,
+ PARSING_MODE_DEFAULT,
parent_stylesheet_contents.quirks_mode
);
let error_context = ParserErrorContext { error_reporter: &error_reporter };
diff --git a/components/style/stylesheets/mod.rs b/components/style/stylesheets/mod.rs
index f419b9602ed..dff69880418 100644
--- a/components/style/stylesheets/mod.rs
+++ b/components/style/stylesheets/mod.rs
@@ -31,7 +31,7 @@ use parser::{ParserContext, ParserErrorContext};
use servo_arc::Arc;
use shared_lock::{DeepCloneParams, DeepCloneWithLock, Locked, SharedRwLock, SharedRwLockReadGuard, ToCssWithGuard};
use std::fmt;
-use style_traits::ParsingMode;
+use style_traits::PARSING_MODE_DEFAULT;
pub use self::counter_style_rule::CounterStyleRule;
pub use self::document_rule::DocumentRule;
@@ -241,7 +241,7 @@ impl CssRule {
parent_stylesheet_contents.origin,
&url_data,
None,
- ParsingMode::DEFAULT,
+ PARSING_MODE_DEFAULT,
parent_stylesheet_contents.quirks_mode,
);
diff --git a/components/style/stylesheets/origin.rs b/components/style/stylesheets/origin.rs
index 5defc2a3db2..a64214691c0 100644
--- a/components/style/stylesheets/origin.rs
+++ b/components/style/stylesheets/origin.rs
@@ -41,13 +41,13 @@ impl Origin {
bitflags! {
/// A set of origins. This is equivalent to Gecko's OriginFlags.
#[cfg_attr(feature = "servo", derive(MallocSizeOf))]
- pub struct OriginSet: u8 {
+ pub flags OriginSet: u8 {
/// <https://drafts.csswg.org/css-cascade/#cascade-origin-user-agent>
- const ORIGIN_USER_AGENT = Origin::UserAgent as u8;
+ const ORIGIN_USER_AGENT = Origin::UserAgent as u8,
/// <https://drafts.csswg.org/css-cascade/#cascade-origin-user>
- const ORIGIN_USER = Origin::User as u8;
+ const ORIGIN_USER = Origin::User as u8,
/// <https://drafts.csswg.org/css-cascade/#cascade-origin-author>
- const ORIGIN_AUTHOR = Origin::Author as u8;
+ const ORIGIN_AUTHOR = Origin::Author as u8,
}
}
diff --git a/components/style/stylesheets/stylesheet.rs b/components/style/stylesheets/stylesheet.rs
index 02d87f1ceea..29ffbf1fa98 100644
--- a/components/style/stylesheets/stylesheet.rs
+++ b/components/style/stylesheets/stylesheet.rs
@@ -18,7 +18,7 @@ use servo_arc::Arc;
use shared_lock::{DeepCloneParams, DeepCloneWithLock, Locked, SharedRwLock, SharedRwLockReadGuard};
use std::mem;
use std::sync::atomic::{AtomicBool, Ordering};
-use style_traits::ParsingMode;
+use style_traits::PARSING_MODE_DEFAULT;
use stylesheets::{CssRule, CssRules, Origin, UrlExtraData};
use stylesheets::loader::StylesheetLoader;
use stylesheets::rule_parser::{State, TopLevelRuleParser};
@@ -364,7 +364,7 @@ impl Stylesheet {
origin,
url_data,
None,
- ParsingMode::DEFAULT,
+ PARSING_MODE_DEFAULT,
quirks_mode
);
let error_context = ParserErrorContext { error_reporter };