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. -->
76 lines
2.3 KiB
Rust
76 lines
2.3 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, ToCssWithGuard};
|
|
use style::stylesheets::import_rule::ImportLayer;
|
|
use style::stylesheets::{CssRuleType, ImportRule};
|
|
use style_traits::ToCss;
|
|
|
|
use crate::dom::bindings::codegen::Bindings::CSSImportRuleBinding::CSSImportRuleMethods;
|
|
use crate::dom::bindings::reflector::reflect_dom_object;
|
|
use crate::dom::bindings::root::DomRoot;
|
|
use crate::dom::bindings::str::DOMString;
|
|
use crate::dom::cssrule::{CSSRule, SpecificCSSRule};
|
|
use crate::dom::cssstylesheet::CSSStyleSheet;
|
|
use crate::dom::window::Window;
|
|
|
|
#[dom_struct]
|
|
pub struct CSSImportRule {
|
|
cssrule: CSSRule,
|
|
#[ignore_malloc_size_of = "Arc"]
|
|
#[no_trace]
|
|
import_rule: Arc<Locked<ImportRule>>,
|
|
}
|
|
|
|
impl CSSImportRule {
|
|
fn new_inherited(
|
|
parent_stylesheet: &CSSStyleSheet,
|
|
import_rule: Arc<Locked<ImportRule>>,
|
|
) -> Self {
|
|
CSSImportRule {
|
|
cssrule: CSSRule::new_inherited(parent_stylesheet),
|
|
import_rule,
|
|
}
|
|
}
|
|
|
|
#[allow(crown::unrooted_must_root)]
|
|
pub fn new(
|
|
window: &Window,
|
|
parent_stylesheet: &CSSStyleSheet,
|
|
import_rule: Arc<Locked<ImportRule>>,
|
|
) -> DomRoot<Self> {
|
|
reflect_dom_object(
|
|
Box::new(Self::new_inherited(parent_stylesheet, import_rule)),
|
|
window,
|
|
)
|
|
}
|
|
}
|
|
|
|
impl SpecificCSSRule for CSSImportRule {
|
|
fn ty(&self) -> CssRuleType {
|
|
CssRuleType::Import
|
|
}
|
|
|
|
fn get_css(&self) -> DOMString {
|
|
let guard = self.cssrule.shared_lock().read();
|
|
self.import_rule
|
|
.read_with(&guard)
|
|
.to_css_string(&guard)
|
|
.into()
|
|
}
|
|
}
|
|
|
|
impl CSSImportRuleMethods for CSSImportRule {
|
|
/// <https://drafts.csswg.org/cssom-1/#dom-cssimportrule-layername>
|
|
fn GetLayerName(&self) -> Option<DOMString> {
|
|
let guard = self.cssrule.shared_lock().read();
|
|
match &self.import_rule.read_with(&guard).layer {
|
|
ImportLayer::None => None,
|
|
ImportLayer::Anonymous => Some(DOMString::new()),
|
|
ImportLayer::Named(name) => Some(DOMString::from_string(name.to_css_string())),
|
|
}
|
|
}
|
|
}
|