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

style: Don't try to compute @viewport unnecessarily.

Browse source 
If the viewport rule is not enabled, there's just no point in computing it.

Bug: 1372058
This commit is contained in:
Emilio Cobos Álvarez 2017-06-12 02:49:16 +02:00
parent cb04ef933b
commit f8755d6cf0
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
3 changed files with 38 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

14
components/style/stylesheets/rule_parser.rs
View file

@ -30,6 +30,7 @@ use stylesheets::keyframes_rule::parse_keyframe_list;
use stylesheets::loader::NoOpLoader;
use stylesheets::stylesheet::{Namespaces, Stylesheet};
use stylesheets::supports_rule::SupportsCondition;
use stylesheets::viewport_rule;
use values::CustomIdent;
use values::KeyframesName;
use values::specified::url::SpecifiedUrl;
@ -325,17 +326,6 @@ impl<'a, 'b> NestedRuleParser<'a, 'b> {
}
}
#[cfg(feature = "servo")]
fn is_viewport_enabled() -> bool {
use servo_config::prefs::PREFS;
PREFS.get("layout.viewport.enabled").as_boolean().unwrap_or(false)
}
#[cfg(not(feature = "servo"))]
fn is_viewport_enabled() -> bool {
false // Gecko doesn't support @viewport.
}
impl<'a, 'b, 'i> AtRuleParser<'i> for NestedRuleParser<'a, 'b> {
type Prelude = AtRulePrelude;
type AtRule = CssRule;
@ -380,7 +370,7 @@ impl<'a, 'b, 'i> AtRuleParser<'i> for NestedRuleParser<'a, 'b> {
Ok(AtRuleType::WithBlock(AtRulePrelude::CounterStyle(name)))
},
"viewport" => {
if is_viewport_enabled() {
if viewport_rule::enabled() {
Ok(AtRuleType::WithBlock(AtRulePrelude::Viewport))
} else {
Err(StyleParseError::UnsupportedAtRule(name.clone()).into())