Fix InsertRule to use the right CssRuleTypes #32125
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
CSSRule::Type() returns an u16 for CSSOM. InsertRule() was incorrectly using this to create a CssRuleTypes. Instead of CssRuleTypes::from_bits(rule_type), it should be something like CssRuleTypes::from_bits(1 << rule_type). However, that would only work when Type() provides an actual value, which per https://drafts.csswg.org/cssom/#dom-cssrule-type only happens for old rule types. New rule types just return 0. Therefore, this patch changes the signature of SpecificCSSRule::ty() to return the actual CssRuleType, and then CSSRule::Type() can zero it out when necessary. The fix is only relevant for CSS Nesting, which is currently disabled on Servo, so no test is necessary.
|
🔨 Triggering try run (#8774416732) for Linux WPT, MacOS, Windows, Android |
|
Test results for linux-wpt-layout-2013 from try job (#8774416732): Flaky unexpected result (17)
Stable unexpected results that are known to be intermittent (8)
|
|
Test results for linux-wpt-layout-2020 from try job (#8774416732): Flaky unexpected result (21)
Stable unexpected results that are known to be intermittent (8)
|
|
✨ Try run (#8774416732) succeeded. |
mrobinson
approved these changes
Apr 22, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
CSSRule::Type()returns an u16 for CSSOM.InsertRule()was incorrectly using this to create aCssRuleTypes.Instead of
CssRuleTypes::from_bits(rule_type), it should be something likeCssRuleTypes::from_bits(1 << rule_type).However, that would only work when
Type()provides an actual value, which per https://drafts.csswg.org/cssom/#dom-cssrule-type only happens for old rule types. New rule types just return 0.Therefore, this patch changes the signature of
SpecificCSSRule::ty()to return the actualCssRuleType, and thenCSSRule::Type()can zero it out when necessary.The fix is only relevant for CSS Nesting, which is currently disabled on Servo, so no test is necessary.
./mach build -ddoes not report any errors./mach test-tidydoes not report any errors