Skip to content

Commit

Permalink
style: Fix Servo_IsCssPropertyRecordedInUseCounter so that we also re…
Browse files Browse the repository at this point in the history
…port 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
  • Loading branch information
emilio committed Nov 30, 2019
1 parent 22509ac commit d06212c
Showing 1 changed file with 12 additions and 4 deletions.
16 changes: 12 additions & 4 deletions components/style/properties/properties.mako.rs
Expand Up @@ -1813,8 +1813,8 @@ pub enum CountedUnknownProperty {
}

impl CountedUnknownProperty {
/// Parse the counted unknown property.
pub fn parse_for_test(property_name: &str) -> Option<Self> {
/// Parse the counted unknown property, for testing purposes only.
pub fn parse_for_testing(property_name: &str) -> Option<Self> {
ascii_case_insensitive_phf_map! {
unknown_id -> CountedUnknownProperty = {
% for property in data.counted_unknown_properties:
Expand All @@ -1826,6 +1826,7 @@ impl CountedUnknownProperty {
}

/// Returns the underlying index, used for use counter.
#[inline]
pub fn bit(self) -> usize {
self as usize
}
Expand All @@ -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, ()> {
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>,
Expand Down

0 comments on commit d06212c

Please sign in to comment.