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

style: Fix Servo build.

Browse source
This commit is contained in:
Emilio Cobos Álvarez 2019-11-04 13:34:18 +01:00
parent a44515c314
commit 0f512b4432
No known key found for this signature in database
GPG key ID: E1152D0994E4BF8A
3 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/style/media_queries/media_feature_expression.rs
View file

@ -242,9 +242,13 @@ fn consume_operation_or_colon(input: &mut Parser) -> Result<Option<Operator>, ()
}))
}
#[allow(unused_variables)]
fn disabled_by_pref(feature: &Atom) -> bool {
if *feature == atom!("-moz-touch-enabled") {
return !static_prefs::pref!("layout.css.moz-touch-enabled.enabled");
#[cfg(feature = "gecko")]
{
if *feature == atom!("-moz-touch-enabled") {
return !static_prefs::pref!("layout.css.moz-touch-enabled.enabled");
}
}
false
}

11
components/style/properties/properties.mako.rs
View file

@ -1877,10 +1877,13 @@ impl PropertyId {
return Ok(match *id {
StaticId::Longhand(id) => PropertyId::Longhand(id),
StaticId::Shorthand(id) => {
// We want to count `zoom` even if disabled.
if matches!(id, ShorthandId::Zoom) {
if let Some(counters) = use_counters {
counters.non_custom_properties.record(id.into());
#[cfg(feature = "gecko")]
{
// We want to count `zoom` even if disabled.
if matches!(id, ShorthandId::Zoom) {
if let Some(counters) = use_counters {
counters.non_custom_properties.record(id.into());
}
}
}

1
components/style/values/computed/length.rs
View file

@ -607,7 +607,6 @@ impl Size {
}
/// The computed `<length>` value.
#[cfg_attr(feature = "servo", derive(Deserialize, Serialize))]
#[derive(
Animate,
Clone,