eliott/servo
1
0
Fork 0
mirror of https://github.com/servo/servo synced 2026-05-02 20:32:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

script: Pass &mut JSContext to CSSKeyframesRule methods (#43571)

Browse Source 
Move `CSSKeyframesRule` methods (`CssRules`, `AppendRule`, `DeleteRule`,
`FindRule`) from `CanGc` to `&mut JSContext`.

Testing: It compiles.
Fixes: Part of #42638

Signed-off-by: arabson99 <arabiusman99@gmail.com>
This commit is contained in:
Abubakar Abdulazeez Usman
2026-03-23 13:19:44 +01:00
committed by GitHub
parent f78ca1cef4
commit dae0edb5b9
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
components/script/dom/css/csskeyframesrule.rs
View File

@@ -6,6 +6,7 @@ use std::cell::RefCell;
use cssparser::{Parser, ParserInput};
use dom_struct::dom_struct;
use js::context::JSContext;
use servo_arc::Arc;
use style::shared_lock::{Locked, SharedRwLockReadGuard, ToCssWithGuard};
use style::stylesheets::keyframes_rule::{Keyframe, KeyframeSelector, KeyframesRule};
@@ -62,14 +63,14 @@ impl CSSKeyframesRule {
)
}
fn rulelist(&self, can_gc: CanGc) -> DomRoot<CSSRuleList> {
fn rulelist(&self, cx: &mut JSContext) -> DomRoot<CSSRuleList> {
self.rule_list.or_init(|| {
let parent_stylesheet = &self.upcast::<CSSRule>().parent_stylesheet();
CSSRuleList::new(
self.global().as_window(),
parent_stylesheet,
RulesSource::Keyframes(self.keyframes_rule.borrow().clone()),
can_gc,
CanGc::from_cx(cx),
)
})
}
@@ -109,12 +110,12 @@ impl CSSKeyframesRule {
impl CSSKeyframesRuleMethods<crate::DomTypeHolder> for CSSKeyframesRule {
/// <https://drafts.csswg.org/css-animations/#dom-csskeyframesrule-cssrules>
fn CssRules(&self, can_gc: CanGc) -> DomRoot<CSSRuleList> {
self.rulelist(can_gc)
fn CssRules(&self, cx: &mut JSContext) -> DomRoot<CSSRuleList> {
self.rulelist(cx)
}
/// <https://drafts.csswg.org/css-animations/#dom-csskeyframesrule-appendrule>
fn AppendRule(&self, rule: DOMString, can_gc: CanGc) {
fn AppendRule(&self, cx: &mut JSContext, rule: DOMString) {
let style_stylesheet = self.css_rule.parent_stylesheet().style_stylesheet();
let rule = rule.str();
let rule = {
@@ -134,22 +135,26 @@ impl CSSKeyframesRuleMethods<crate::DomTypeHolder> for CSSKeyframesRule {
.write_with(&mut guard)
.keyframes
.push(rule);
self.rulelist(can_gc).append_lazy_dom_rule();
self.rulelist(cx).append_lazy_dom_rule();
self.css_rule.parent_stylesheet().notify_invalidations();
}
}
/// <https://drafts.csswg.org/css-animations/#dom-csskeyframesrule-deleterule>
fn DeleteRule(&self, selector: DOMString, can_gc: CanGc) {
fn DeleteRule(&self, cx: &mut JSContext, selector: DOMString) {
if let Some(idx) = self.find_rule(&selector) {
let _ = self.rulelist(can_gc).remove_rule(idx as u32);
let _ = self.rulelist(cx).remove_rule(idx as u32);
}
}
/// <https://drafts.csswg.org/css-animations/#dom-csskeyframesrule-findrule>
fn FindRule(&self, selector: DOMString, can_gc: CanGc) -> Option<DomRoot<CSSKeyframeRule>> {
fn FindRule(
&self,
cx: &mut JSContext,
selector: DOMString,
) -> Option<DomRoot<CSSKeyframeRule>> {
self.find_rule(&selector)
.and_then(|idx| self.rulelist(can_gc).item(idx as u32, can_gc))
.and_then(|idx| self.rulelist(cx).item(idx as u32, CanGc::from_cx(cx)))
.and_then(DomRoot::downcast)
}