mirror of
https://github.com/servo/servo.git
synced 2025-07-24 15:50:21 +01:00
f9e154af55
`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. <!-- Please describe your changes on the following line: --> --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes do not require tests because the fix is only relevant for CSS Nesting, which is currently disabled <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
81 lines
2.7 KiB
Rust
81 lines
2.7 KiB
Rust
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
|
|
|
use dom_struct::dom_struct;
|
|
use servo_arc::Arc;
|
|
use style::shared_lock::{Locked, SharedRwLock};
|
|
use style::stylesheets::{CssRuleTypes, CssRules as StyleCssRules};
|
|
|
|
use crate::dom::bindings::codegen::Bindings::CSSGroupingRuleBinding::CSSGroupingRuleMethods;
|
|
use crate::dom::bindings::error::{ErrorResult, Fallible};
|
|
use crate::dom::bindings::inheritance::Castable;
|
|
use crate::dom::bindings::reflector::DomObject;
|
|
use crate::dom::bindings::root::{DomRoot, MutNullableDom};
|
|
use crate::dom::bindings::str::DOMString;
|
|
use crate::dom::cssrule::CSSRule;
|
|
use crate::dom::cssrulelist::{CSSRuleList, RulesSource};
|
|
use crate::dom::cssstylesheet::CSSStyleSheet;
|
|
|
|
#[dom_struct]
|
|
pub struct CSSGroupingRule {
|
|
cssrule: CSSRule,
|
|
#[ignore_malloc_size_of = "Arc"]
|
|
#[no_trace]
|
|
rules: Arc<Locked<StyleCssRules>>,
|
|
rulelist: MutNullableDom<CSSRuleList>,
|
|
}
|
|
|
|
impl CSSGroupingRule {
|
|
pub fn new_inherited(
|
|
parent_stylesheet: &CSSStyleSheet,
|
|
rules: Arc<Locked<StyleCssRules>>,
|
|
) -> CSSGroupingRule {
|
|
CSSGroupingRule {
|
|
cssrule: CSSRule::new_inherited(parent_stylesheet),
|
|
rules,
|
|
rulelist: MutNullableDom::new(None),
|
|
}
|
|
}
|
|
|
|
fn rulelist(&self) -> DomRoot<CSSRuleList> {
|
|
let parent_stylesheet = self.upcast::<CSSRule>().parent_stylesheet();
|
|
self.rulelist.or_init(|| {
|
|
CSSRuleList::new(
|
|
self.global().as_window(),
|
|
parent_stylesheet,
|
|
RulesSource::Rules(self.rules.clone()),
|
|
)
|
|
})
|
|
}
|
|
|
|
pub fn parent_stylesheet(&self) -> &CSSStyleSheet {
|
|
self.cssrule.parent_stylesheet()
|
|
}
|
|
|
|
pub fn shared_lock(&self) -> &SharedRwLock {
|
|
self.cssrule.shared_lock()
|
|
}
|
|
}
|
|
|
|
impl CSSGroupingRuleMethods for CSSGroupingRule {
|
|
// https://drafts.csswg.org/cssom/#dom-cssgroupingrule-cssrules
|
|
fn CssRules(&self) -> DomRoot<CSSRuleList> {
|
|
// XXXManishearth check origin clean flag
|
|
self.rulelist()
|
|
}
|
|
|
|
// https://drafts.csswg.org/cssom/#dom-cssgroupingrule-insertrule
|
|
fn InsertRule(&self, rule: DOMString, index: u32) -> Fallible<u32> {
|
|
// TODO: this should accumulate the rule types of all ancestors.
|
|
let rule_type = self.cssrule.as_specific().ty();
|
|
let containing_rule_types = CssRuleTypes::from(rule_type);
|
|
self.rulelist()
|
|
.insert_rule(&rule, index, containing_rule_types)
|
|
}
|
|
|
|
// https://drafts.csswg.org/cssom/#dom-cssgroupingrule-deleterule
|
|
fn DeleteRule(&self, index: u32) -> ErrorResult {
|
|
self.rulelist().remove_rule(index)
|
|
}
|
|
}
|