From d06212c6c0058af222deef6e41dc50d3baf971d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= Date: Wed, 27 Nov 2019 20:51:20 +0000 Subject: [PATCH] style: Fix Servo_IsCssPropertyRecordedInUseCounter so that we also report disabled properties. When zoom is disabled, we still count it, but with the current code the testing function will throw instead of returning the right value, which means we'd fail layout/style/test/test_use_counters.html. Differential Revision: https://phabricator.services.mozilla.com/D55005 --- components/style/properties/properties.mako.rs | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/components/style/properties/properties.mako.rs b/components/style/properties/properties.mako.rs index 484b52e8c870..0a26ae4555b1 100644 --- a/components/style/properties/properties.mako.rs +++ b/components/style/properties/properties.mako.rs @@ -1813,8 +1813,8 @@ pub enum CountedUnknownProperty { } impl CountedUnknownProperty { - /// Parse the counted unknown property. - pub fn parse_for_test(property_name: &str) -> Option { + /// Parse the counted unknown property, for testing purposes only. + pub fn parse_for_testing(property_name: &str) -> Option { ascii_case_insensitive_phf_map! { unknown_id -> CountedUnknownProperty = { % for property in data.counted_unknown_properties: @@ -1826,6 +1826,7 @@ impl CountedUnknownProperty { } /// Returns the underlying index, used for use counter. + #[inline] pub fn bit(self) -> usize { self as usize } @@ -1842,9 +1843,16 @@ impl PropertyId { }) } - /// Returns a given property from the string `s`. + /// Returns a given property from the given name, _regardless of whether it + /// is enabled or not_, or Err(()) for unknown properties. /// - /// Returns Err(()) for unknown properties. + /// Do not use for non-testing purposes. + pub fn parse_unchecked_for_testing(name: &str) -> Result { + Self::parse_unchecked(name, None) + } + + /// Returns a given property from the given name, _regardless of whether it + /// is enabled or not_, or Err(()) for unknown properties. fn parse_unchecked( property_name: &str, use_counters: Option< &UseCounters>,