mirror of
https://github.com/servo/servo.git
synced 2025-06-06 16:45:39 +00: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. -->
86 lines
2.8 KiB
Rust
86 lines
2.8 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::ToCssWithGuard;
|
|
use style::stylesheets::{CssRuleType, MediaRule};
|
|
use style_traits::ToCss;
|
|
|
|
use crate::dom::bindings::codegen::Bindings::CSSMediaRuleBinding::CSSMediaRuleMethods;
|
|
use crate::dom::bindings::reflector::{reflect_dom_object, DomObject};
|
|
use crate::dom::bindings::root::{DomRoot, MutNullableDom};
|
|
use crate::dom::bindings::str::DOMString;
|
|
use crate::dom::cssconditionrule::CSSConditionRule;
|
|
use crate::dom::cssrule::SpecificCSSRule;
|
|
use crate::dom::cssstylesheet::CSSStyleSheet;
|
|
use crate::dom::medialist::MediaList;
|
|
use crate::dom::window::Window;
|
|
|
|
#[dom_struct]
|
|
pub struct CSSMediaRule {
|
|
cssconditionrule: CSSConditionRule,
|
|
#[ignore_malloc_size_of = "Arc"]
|
|
#[no_trace]
|
|
mediarule: Arc<MediaRule>,
|
|
medialist: MutNullableDom<MediaList>,
|
|
}
|
|
|
|
impl CSSMediaRule {
|
|
fn new_inherited(parent_stylesheet: &CSSStyleSheet, mediarule: Arc<MediaRule>) -> CSSMediaRule {
|
|
let list = mediarule.rules.clone();
|
|
CSSMediaRule {
|
|
cssconditionrule: CSSConditionRule::new_inherited(parent_stylesheet, list),
|
|
mediarule,
|
|
medialist: MutNullableDom::new(None),
|
|
}
|
|
}
|
|
|
|
#[allow(crown::unrooted_must_root)]
|
|
pub fn new(
|
|
window: &Window,
|
|
parent_stylesheet: &CSSStyleSheet,
|
|
mediarule: Arc<MediaRule>,
|
|
) -> DomRoot<CSSMediaRule> {
|
|
reflect_dom_object(
|
|
Box::new(CSSMediaRule::new_inherited(parent_stylesheet, mediarule)),
|
|
window,
|
|
)
|
|
}
|
|
|
|
fn medialist(&self) -> DomRoot<MediaList> {
|
|
self.medialist.or_init(|| {
|
|
MediaList::new(
|
|
self.global().as_window(),
|
|
self.cssconditionrule.parent_stylesheet(),
|
|
self.mediarule.media_queries.clone(),
|
|
)
|
|
})
|
|
}
|
|
|
|
/// <https://drafts.csswg.org/css-conditional-3/#the-cssmediarule-interface>
|
|
pub fn get_condition_text(&self) -> DOMString {
|
|
let guard = self.cssconditionrule.shared_lock().read();
|
|
let list = self.mediarule.media_queries.read_with(&guard);
|
|
list.to_css_string().into()
|
|
}
|
|
}
|
|
|
|
impl SpecificCSSRule for CSSMediaRule {
|
|
fn ty(&self) -> CssRuleType {
|
|
CssRuleType::Media
|
|
}
|
|
|
|
fn get_css(&self) -> DOMString {
|
|
let guard = self.cssconditionrule.shared_lock().read();
|
|
self.mediarule.to_css_string(&guard).into()
|
|
}
|
|
}
|
|
|
|
impl CSSMediaRuleMethods for CSSMediaRule {
|
|
// https://drafts.csswg.org/cssom/#dom-cssgroupingrule-media
|
|
fn Media(&self) -> DomRoot<MediaList> {
|
|
self.medialist()
|
|
}
|
|
}
|