mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
Implement CSSNestedDeclarations (#36248)
This is the CSSOM interface that represents a nested declarations rule. https://drafts.csswg.org/css-nesting/#the-cssnestrule Testing: `/_mozilla/mozilla/interfaces.https.html`. And once `CSSStyleRule` becomes a `CSSGroupingRule` subclass, this will be further covered by `/css/css-nestting/`. This is part of #36245 Signed-off-by: Oriol Brufau <obrufau@igalia.com>
This commit is contained in:
parent
e8d5a019a4
commit
bc6926d1fe
7 changed files with 120 additions and 2 deletions
91
components/script/dom/cssnesteddeclarations.rs
Normal file
91
components/script/dom/cssnesteddeclarations.rs
Normal file
|
@ -0,0 +1,91 @@
|
||||||
|
/* 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::{CssRuleType, NestedDeclarationsRule};
|
||||||
|
|
||||||
|
use crate::dom::bindings::codegen::Bindings::CSSNestedDeclarationsBinding::CSSNestedDeclarationsMethods;
|
||||||
|
use crate::dom::bindings::inheritance::Castable;
|
||||||
|
use crate::dom::bindings::reflector::{DomGlobal, reflect_dom_object};
|
||||||
|
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::window::Window;
|
||||||
|
use crate::script_runtime::CanGc;
|
||||||
|
|
||||||
|
#[dom_struct]
|
||||||
|
pub(crate) struct CSSNestedDeclarations {
|
||||||
|
cssrule: CSSRule,
|
||||||
|
#[ignore_malloc_size_of = "Arc"]
|
||||||
|
#[no_trace]
|
||||||
|
nesteddeclarationsrule: Arc<Locked<NestedDeclarationsRule>>,
|
||||||
|
style_decl: MutNullableDom<CSSStyleDeclaration>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl CSSNestedDeclarations {
|
||||||
|
pub(crate) fn new_inherited(
|
||||||
|
parent_stylesheet: &CSSStyleSheet,
|
||||||
|
nesteddeclarationsrule: Arc<Locked<NestedDeclarationsRule>>,
|
||||||
|
) -> Self {
|
||||||
|
Self {
|
||||||
|
cssrule: CSSRule::new_inherited(parent_stylesheet),
|
||||||
|
nesteddeclarationsrule,
|
||||||
|
style_decl: Default::default(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg_attr(crown, allow(crown::unrooted_must_root))]
|
||||||
|
pub(crate) fn new(
|
||||||
|
window: &Window,
|
||||||
|
parent_stylesheet: &CSSStyleSheet,
|
||||||
|
nesteddeclarationsrule: Arc<Locked<NestedDeclarationsRule>>,
|
||||||
|
can_gc: CanGc,
|
||||||
|
) -> DomRoot<Self> {
|
||||||
|
reflect_dom_object(
|
||||||
|
Box::new(Self::new_inherited(
|
||||||
|
parent_stylesheet,
|
||||||
|
nesteddeclarationsrule,
|
||||||
|
)),
|
||||||
|
window,
|
||||||
|
can_gc,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl SpecificCSSRule for CSSNestedDeclarations {
|
||||||
|
fn ty(&self) -> CssRuleType {
|
||||||
|
CssRuleType::NestedDeclarations
|
||||||
|
}
|
||||||
|
|
||||||
|
fn get_css(&self) -> DOMString {
|
||||||
|
let guard = self.cssrule.shared_lock().read();
|
||||||
|
self.nesteddeclarationsrule
|
||||||
|
.read_with(&guard)
|
||||||
|
.to_css_string(&guard)
|
||||||
|
.into()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl CSSNestedDeclarationsMethods<crate::DomTypeHolder> for CSSNestedDeclarations {
|
||||||
|
/// <https://drafts.csswg.org/css-nesting/#dom-cssnesteddeclarations-style>
|
||||||
|
fn Style(&self, can_gc: CanGc) -> 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.nesteddeclarationsrule.read_with(&guard).block.clone(),
|
||||||
|
),
|
||||||
|
None,
|
||||||
|
CSSModificationAccess::ReadWrite,
|
||||||
|
can_gc,
|
||||||
|
)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
|
@ -21,6 +21,7 @@ use crate::dom::csslayerblockrule::CSSLayerBlockRule;
|
||||||
use crate::dom::csslayerstatementrule::CSSLayerStatementRule;
|
use crate::dom::csslayerstatementrule::CSSLayerStatementRule;
|
||||||
use crate::dom::cssmediarule::CSSMediaRule;
|
use crate::dom::cssmediarule::CSSMediaRule;
|
||||||
use crate::dom::cssnamespacerule::CSSNamespaceRule;
|
use crate::dom::cssnamespacerule::CSSNamespaceRule;
|
||||||
|
use crate::dom::cssnesteddeclarations::CSSNestedDeclarations;
|
||||||
use crate::dom::cssstylerule::CSSStyleRule;
|
use crate::dom::cssstylerule::CSSStyleRule;
|
||||||
use crate::dom::cssstylesheet::CSSStyleSheet;
|
use crate::dom::cssstylesheet::CSSStyleSheet;
|
||||||
use crate::dom::csssupportsrule::CSSSupportsRule;
|
use crate::dom::csssupportsrule::CSSSupportsRule;
|
||||||
|
@ -69,6 +70,8 @@ impl CSSRule {
|
||||||
rule as &dyn SpecificCSSRule
|
rule as &dyn SpecificCSSRule
|
||||||
} else if let Some(rule) = self.downcast::<CSSLayerStatementRule>() {
|
} else if let Some(rule) = self.downcast::<CSSLayerStatementRule>() {
|
||||||
rule as &dyn SpecificCSSRule
|
rule as &dyn SpecificCSSRule
|
||||||
|
} else if let Some(rule) = self.downcast::<CSSNestedDeclarations>() {
|
||||||
|
rule as &dyn SpecificCSSRule
|
||||||
} else {
|
} else {
|
||||||
unreachable!()
|
unreachable!()
|
||||||
}
|
}
|
||||||
|
@ -125,7 +128,12 @@ impl CSSRule {
|
||||||
StyleCssRule::Scope(_) => unimplemented!(), // TODO
|
StyleCssRule::Scope(_) => unimplemented!(), // TODO
|
||||||
StyleCssRule::StartingStyle(_) => unimplemented!(), // TODO
|
StyleCssRule::StartingStyle(_) => unimplemented!(), // TODO
|
||||||
StyleCssRule::PositionTry(_) => unimplemented!(), // TODO
|
StyleCssRule::PositionTry(_) => unimplemented!(), // TODO
|
||||||
StyleCssRule::NestedDeclarations(_) => unimplemented!(), // TODO
|
StyleCssRule::NestedDeclarations(s) => DomRoot::upcast(CSSNestedDeclarations::new(
|
||||||
|
window,
|
||||||
|
parent_stylesheet,
|
||||||
|
s,
|
||||||
|
can_gc,
|
||||||
|
)),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -271,6 +271,7 @@ pub(crate) mod csslayerblockrule;
|
||||||
pub(crate) mod csslayerstatementrule;
|
pub(crate) mod csslayerstatementrule;
|
||||||
pub(crate) mod cssmediarule;
|
pub(crate) mod cssmediarule;
|
||||||
pub(crate) mod cssnamespacerule;
|
pub(crate) mod cssnamespacerule;
|
||||||
|
pub(crate) mod cssnesteddeclarations;
|
||||||
pub(crate) mod cssrule;
|
pub(crate) mod cssrule;
|
||||||
pub(crate) mod cssrulelist;
|
pub(crate) mod cssrulelist;
|
||||||
pub(crate) mod cssstyledeclaration;
|
pub(crate) mod cssstyledeclaration;
|
||||||
|
|
|
@ -107,6 +107,10 @@ DOMInterfaces = {
|
||||||
'canGc': ['Media'],
|
'canGc': ['Media'],
|
||||||
},
|
},
|
||||||
|
|
||||||
|
'CSSNestedDeclarations': {
|
||||||
|
'canGc': ['Style'],
|
||||||
|
},
|
||||||
|
|
||||||
'CSSRuleList': {
|
'CSSRuleList': {
|
||||||
'canGc': ['Item', 'IndexedGetter'],
|
'canGc': ['Item', 'IndexedGetter'],
|
||||||
},
|
},
|
||||||
|
|
|
@ -0,0 +1,13 @@
|
||||||
|
/* 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 http://mozilla.org/MPL/2.0/.
|
||||||
|
*
|
||||||
|
* The origin of this IDL file is
|
||||||
|
* https://drafts.csswg.org/css-nesting-1/#the-cssnestrule
|
||||||
|
*/
|
||||||
|
|
||||||
|
[Exposed=Window]
|
||||||
|
interface CSSNestedDeclarations : CSSRule {
|
||||||
|
// CSSStyleDeclaration instead of CSSStyleProperties for now, see #36260.
|
||||||
|
[SameObject, PutForwards=cssText] readonly attribute CSSStyleDeclaration style;
|
||||||
|
};
|
2
tests/wpt/mozilla/meta/MANIFEST.json
vendored
2
tests/wpt/mozilla/meta/MANIFEST.json
vendored
|
@ -13503,7 +13503,7 @@
|
||||||
]
|
]
|
||||||
],
|
],
|
||||||
"interfaces.https.html": [
|
"interfaces.https.html": [
|
||||||
"eda7cb2e00ffeb1a51e31ad42b2846d159eeb638",
|
"dce05a55fd33326768635c6b3cdb193d526fccdd",
|
||||||
[
|
[
|
||||||
null,
|
null,
|
||||||
{}
|
{}
|
||||||
|
|
|
@ -53,6 +53,7 @@ test_interfaces([
|
||||||
"CSSLayerStatementRule",
|
"CSSLayerStatementRule",
|
||||||
"CSSMediaRule",
|
"CSSMediaRule",
|
||||||
"CSSNamespaceRule",
|
"CSSNamespaceRule",
|
||||||
|
"CSSNestedDeclarations",
|
||||||
"CSSRule",
|
"CSSRule",
|
||||||
"CSSRuleList",
|
"CSSRuleList",
|
||||||
"CSSStyleDeclaration",
|
"CSSStyleDeclaration",
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue