mirror of
https://github.com/servo/servo.git
synced 2025-06-06 16:45:39 +00:00
`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. -->
125 lines
4.6 KiB
Rust
125 lines
4.6 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 std::mem;
|
|
|
|
use cssparser::{Parser as CssParser, ParserInput as CssParserInput, ToCss};
|
|
use dom_struct::dom_struct;
|
|
use selectors::parser::{ParseRelative, SelectorList};
|
|
use servo_arc::Arc;
|
|
use style::selector_parser::SelectorParser;
|
|
use style::shared_lock::{Locked, ToCssWithGuard};
|
|
use style::stylesheets::{CssRuleType, Origin, StyleRule};
|
|
|
|
use crate::dom::bindings::codegen::Bindings::CSSStyleRuleBinding::CSSStyleRuleMethods;
|
|
use crate::dom::bindings::inheritance::Castable;
|
|
use crate::dom::bindings::reflector::{reflect_dom_object, DomObject};
|
|
use crate::dom::bindings::root::{Dom, DomRoot, MutNullableDom};
|
|
use crate::dom::bindings::str::DOMString;
|
|
use crate::dom::cssrule::{CSSRule, SpecificCSSRule};
|
|
use crate::dom::cssstyledeclaration::{CSSModificationAccess, CSSStyleDeclaration, CSSStyleOwner};
|
|
use crate::dom::cssstylesheet::CSSStyleSheet;
|
|
use crate::dom::node::{stylesheets_owner_from_node, Node};
|
|
use crate::dom::window::Window;
|
|
|
|
#[dom_struct]
|
|
pub struct CSSStyleRule {
|
|
cssrule: CSSRule,
|
|
#[ignore_malloc_size_of = "Arc"]
|
|
#[no_trace]
|
|
stylerule: Arc<Locked<StyleRule>>,
|
|
style_decl: MutNullableDom<CSSStyleDeclaration>,
|
|
}
|
|
|
|
impl CSSStyleRule {
|
|
fn new_inherited(
|
|
parent_stylesheet: &CSSStyleSheet,
|
|
stylerule: Arc<Locked<StyleRule>>,
|
|
) -> CSSStyleRule {
|
|
CSSStyleRule {
|
|
cssrule: CSSRule::new_inherited(parent_stylesheet),
|
|
stylerule,
|
|
style_decl: Default::default(),
|
|
}
|
|
}
|
|
|
|
#[allow(crown::unrooted_must_root)]
|
|
pub fn new(
|
|
window: &Window,
|
|
parent_stylesheet: &CSSStyleSheet,
|
|
stylerule: Arc<Locked<StyleRule>>,
|
|
) -> DomRoot<CSSStyleRule> {
|
|
reflect_dom_object(
|
|
Box::new(CSSStyleRule::new_inherited(parent_stylesheet, stylerule)),
|
|
window,
|
|
)
|
|
}
|
|
}
|
|
|
|
impl SpecificCSSRule for CSSStyleRule {
|
|
fn ty(&self) -> CssRuleType {
|
|
CssRuleType::Style
|
|
}
|
|
|
|
fn get_css(&self) -> DOMString {
|
|
let guard = self.cssrule.shared_lock().read();
|
|
self.stylerule
|
|
.read_with(&guard)
|
|
.to_css_string(&guard)
|
|
.into()
|
|
}
|
|
}
|
|
|
|
impl CSSStyleRuleMethods for CSSStyleRule {
|
|
// https://drafts.csswg.org/cssom/#dom-cssstylerule-style
|
|
fn Style(&self) -> DomRoot<CSSStyleDeclaration> {
|
|
self.style_decl.or_init(|| {
|
|
let guard = self.cssrule.shared_lock().read();
|
|
CSSStyleDeclaration::new(
|
|
self.global().as_window(),
|
|
CSSStyleOwner::CSSRule(
|
|
Dom::from_ref(self.upcast()),
|
|
self.stylerule.read_with(&guard).block.clone(),
|
|
),
|
|
None,
|
|
CSSModificationAccess::ReadWrite,
|
|
)
|
|
})
|
|
}
|
|
|
|
// https://drafts.csswg.org/cssom/#dom-cssstylerule-selectortext
|
|
fn SelectorText(&self) -> DOMString {
|
|
let guard = self.cssrule.shared_lock().read();
|
|
let stylerule = self.stylerule.read_with(&guard);
|
|
DOMString::from_string(stylerule.selectors.to_css_string())
|
|
}
|
|
|
|
// https://drafts.csswg.org/cssom/#dom-cssstylerule-selectortext
|
|
fn SetSelectorText(&self, value: DOMString) {
|
|
let contents = &self.cssrule.parent_stylesheet().style_stylesheet().contents;
|
|
// It's not clear from the spec if we should use the stylesheet's namespaces.
|
|
// https://github.com/w3c/csswg-drafts/issues/1511
|
|
let namespaces = contents.namespaces.read();
|
|
let url_data = contents.url_data.read();
|
|
let parser = SelectorParser {
|
|
stylesheet_origin: Origin::Author,
|
|
namespaces: &namespaces,
|
|
url_data: &url_data,
|
|
for_supports_rule: false,
|
|
};
|
|
let mut css_parser = CssParserInput::new(&value);
|
|
let mut css_parser = CssParser::new(&mut css_parser);
|
|
// TODO: Maybe allow setting relative selectors from the OM, if we're in a nested style
|
|
// rule?
|
|
if let Ok(mut s) = SelectorList::parse(&parser, &mut css_parser, ParseRelative::No) {
|
|
// This mirrors what we do in CSSStyleOwner::mutate_associated_block.
|
|
let mut guard = self.cssrule.shared_lock().write();
|
|
let stylerule = self.stylerule.write_with(&mut guard);
|
|
mem::swap(&mut stylerule.selectors, &mut s);
|
|
if let Some(owner) = self.cssrule.parent_stylesheet().get_owner() {
|
|
stylesheets_owner_from_node(owner.upcast::<Node>()).invalidate_stylesheets();
|
|
}
|
|
}
|
|
}
|
|
}
|