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

style: Deduplicate system metric atoms.

Browse source 
Now that :-moz-system-metric is gone, there's no real reason for the atoms to
be separate.

Differential Revision: https://phabricator.services.mozilla.com/D3497
This commit is contained in:
Emilio Cobos Álvarez 2018-08-17 01:07:22 +00:00
parent cd4d281984
commit d63ce552f7
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
1 changed files with 23 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

48
components/style/gecko/media_features.rs
View file

@ -401,7 +401,7 @@ fn eval_moz_touch_enabled(
eval_system_metric( eval_system_metric(
device, device,
query_value, query_value,
atom!("touch-enabled"), atom!("-moz-touch-enabled"),
/* accessible_from_content = */ true, /* accessible_from_content = */ true,
) )
} }
@ -424,7 +424,7 @@ fn eval_moz_os_version(
} }
macro_rules! system_metric_feature { macro_rules! system_metric_feature {
($feature_name:expr, $metric_name:expr) => { ($feature_name:expr) => {
{ {
fn __eval( fn __eval(
device: &Device, device: &Device,
@ -434,7 +434,7 @@ macro_rules! system_metric_feature {
eval_system_metric( eval_system_metric(
device, device,
query_value, query_value,
$metric_name, $feature_name,
/* accessible_from_content = */ false, /* accessible_from_content = */ false,
) )
} }
@ -596,28 +596,26 @@ lazy_static! {
Evaluator::Ident(eval_moz_os_version), Evaluator::Ident(eval_moz_os_version),
ParsingRequirements::CHROME_AND_UA_ONLY, ParsingRequirements::CHROME_AND_UA_ONLY,
), ),
// FIXME(emilio): make system metrics store the -moz- atom, and remove system_metric_feature!(atom!("-moz-scrollbar-start-backward")),
// some duplication here. system_metric_feature!(atom!("-moz-scrollbar-start-forward")),
system_metric_feature!(atom!("-moz-scrollbar-start-backward"), atom!("scrollbar-start-backward")), system_metric_feature!(atom!("-moz-scrollbar-end-backward")),
system_metric_feature!(atom!("-moz-scrollbar-start-forward"), atom!("scrollbar-start-forward")), system_metric_feature!(atom!("-moz-scrollbar-end-forward")),
system_metric_feature!(atom!("-moz-scrollbar-end-backward"), atom!("scrollbar-end-backward")), system_metric_feature!(atom!("-moz-scrollbar-thumb-proportional")),
system_metric_feature!(atom!("-moz-scrollbar-end-forward"), atom!("scrollbar-end-forward")), system_metric_feature!(atom!("-moz-overlay-scrollbars")),
system_metric_feature!(atom!("-moz-scrollbar-thumb-proportional"), atom!("scrollbar-thumb-proportional")), system_metric_feature!(atom!("-moz-windows-default-theme")),
system_metric_feature!(atom!("-moz-overlay-scrollbars"), atom!("overlay-scrollbars")), system_metric_feature!(atom!("-moz-mac-graphite-theme")),
system_metric_feature!(atom!("-moz-windows-default-theme"), atom!("windows-default-theme")), system_metric_feature!(atom!("-moz-mac-yosemite-theme")),
system_metric_feature!(atom!("-moz-mac-graphite-theme"), atom!("mac-graphite-theme")), system_metric_feature!(atom!("-moz-windows-accent-color-in-titlebar")),
system_metric_feature!(atom!("-moz-mac-yosemite-theme"), atom!("mac-yosemite-theme")), system_metric_feature!(atom!("-moz-windows-compositor")),
system_metric_feature!(atom!("-moz-windows-accent-color-in-titlebar"), atom!("windows-accent-color-in-titlebar")), system_metric_feature!(atom!("-moz-windows-classic")),
system_metric_feature!(atom!("-moz-windows-compositor"), atom!("windows-compositor")), system_metric_feature!(atom!("-moz-windows-glass")),
system_metric_feature!(atom!("-moz-windows-classic"), atom!("windows-classic")), system_metric_feature!(atom!("-moz-menubar-drag")),
system_metric_feature!(atom!("-moz-windows-glass"), atom!("windows-glass")), system_metric_feature!(atom!("-moz-swipe-animation-enabled")),
system_metric_feature!(atom!("-moz-menubar-drag"), atom!("menubar-drag")), system_metric_feature!(atom!("-moz-gtk-csd-available")),
system_metric_feature!(atom!("-moz-swipe-animation-enabled"), atom!("swipe-animation-enabled")), system_metric_feature!(atom!("-moz-gtk-csd-minimize-button")),
system_metric_feature!(atom!("-moz-gtk-csd-available"), atom!("gtk-csd-available")), system_metric_feature!(atom!("-moz-gtk-csd-maximize-button")),
system_metric_feature!(atom!("-moz-gtk-csd-minimize-button"), atom!("gtk-csd-minimize-button")), system_metric_feature!(atom!("-moz-gtk-csd-close-button")),
system_metric_feature!(atom!("-moz-gtk-csd-maximize-button"), atom!("gtk-csd-maximize-button")), system_metric_feature!(atom!("-moz-system-dark-theme")),
system_metric_feature!(atom!("-moz-gtk-csd-close-button"), atom!("gtk-csd-close-button")),
system_metric_feature!(atom!("-moz-system-dark-theme"), atom!("system-dark-theme")),
// This is the only system-metric media feature that's accessible to // This is the only system-metric media feature that's accessible to
// content as of today. // content as of today.
// FIXME(emilio): Restrict (or remove?) when bug 1035774 lands. // FIXME(emilio): Restrict (or remove?) when bug 1035774 lands.