aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom
diff options
context:
space:
mode:
authorYerkebulan Tulibergenov <yerkebulan@gmail.com>2025-04-06 16:44:58 -0700
committerGitHub <noreply@github.com>2025-04-06 23:44:58 +0000
commit33b00dbe405ec6b432e465b9ee28d433382d9f32 (patch)
tree9c7599e712d16f535da981000c9681cc5f3f8a8c /components/script/dom
parent1f558a0d49d32bec3ad1006903bed069773d0861 (diff)
downloadservo-33b00dbe405ec6b432e465b9ee28d433382d9f32.tar.gz
servo-33b00dbe405ec6b432e465b9ee28d433382d9f32.zip
Add CanGc as arguments in methods in devtools.rs, CharacterData, CSSStyleRule, CSSStyleSheet (#36375)
Add CanGc as arguments in methods in devtools.rs, CharacterData, CSSStyleRule, CSSStyleSheet Testing: These changes do not require tests because they are a refactor. Addressed part of https://github.com/servo/servo/issues/34573. --------- Signed-off-by: Yerkebulan Tulibergenov <yerkebulan@gmail.com>
Diffstat (limited to 'components/script/dom')
-rw-r--r--components/script/dom/characterdata.rs4
-rw-r--r--components/script/dom/cssstylerule.rs4
-rw-r--r--components/script/dom/cssstylesheet.rs31
3 files changed, 20 insertions, 19 deletions
diff --git a/components/script/dom/characterdata.rs b/components/script/dom/characterdata.rs
index d161fddd8d8..d5d36442ede 100644
--- a/components/script/dom/characterdata.rs
+++ b/components/script/dom/characterdata.rs
@@ -260,9 +260,9 @@ impl CharacterDataMethods<crate::DomTypeHolder> for CharacterData {
}
// https://dom.spec.whatwg.org/#dom-childnode-remove
- fn Remove(&self) {
+ fn Remove(&self, can_gc: CanGc) {
let node = self.upcast::<Node>();
- node.remove_self(CanGc::note());
+ node.remove_self(can_gc);
}
// https://dom.spec.whatwg.org/#dom-nondocumenttypechildnode-previouselementsibling
diff --git a/components/script/dom/cssstylerule.rs b/components/script/dom/cssstylerule.rs
index bb2d7eaadac..2e655fb59cd 100644
--- a/components/script/dom/cssstylerule.rs
+++ b/components/script/dom/cssstylerule.rs
@@ -87,7 +87,7 @@ impl SpecificCSSRule for CSSStyleRule {
impl CSSStyleRuleMethods<crate::DomTypeHolder> for CSSStyleRule {
// https://drafts.csswg.org/cssom/#dom-cssstylerule-style
- fn Style(&self) -> DomRoot<CSSStyleDeclaration> {
+ fn Style(&self, can_gc: CanGc) -> DomRoot<CSSStyleDeclaration> {
self.style_decl.or_init(|| {
let guard = self.cssgroupingrule.shared_lock().read();
CSSStyleDeclaration::new(
@@ -98,7 +98,7 @@ impl CSSStyleRuleMethods<crate::DomTypeHolder> for CSSStyleRule {
),
None,
CSSModificationAccess::ReadWrite,
- CanGc::note(),
+ can_gc,
)
})
}
diff --git a/components/script/dom/cssstylesheet.rs b/components/script/dom/cssstylesheet.rs
index 12358f97028..992b773c554 100644
--- a/components/script/dom/cssstylesheet.rs
+++ b/components/script/dom/cssstylesheet.rs
@@ -70,14 +70,14 @@ impl CSSStyleSheet {
)
}
- fn rulelist(&self) -> DomRoot<CSSRuleList> {
+ fn rulelist(&self, can_gc: CanGc) -> DomRoot<CSSRuleList> {
self.rulelist.or_init(|| {
let rules = self.style_stylesheet.contents.rules.clone();
CSSRuleList::new(
self.global().as_window(),
self,
RulesSource::Rules(rules),
- CanGc::note(),
+ can_gc,
)
})
}
@@ -127,38 +127,38 @@ impl CSSStyleSheet {
impl CSSStyleSheetMethods<crate::DomTypeHolder> for CSSStyleSheet {
/// <https://drafts.csswg.org/cssom/#dom-cssstylesheet-cssrules>
- fn GetCssRules(&self) -> Fallible<DomRoot<CSSRuleList>> {
+ fn GetCssRules(&self, can_gc: CanGc) -> Fallible<DomRoot<CSSRuleList>> {
if !self.origin_clean.get() {
return Err(Error::Security);
}
- Ok(self.rulelist())
+ Ok(self.rulelist(can_gc))
}
/// <https://drafts.csswg.org/cssom/#dom-cssstylesheet-insertrule>
- fn InsertRule(&self, rule: DOMString, index: u32) -> Fallible<u32> {
+ fn InsertRule(&self, rule: DOMString, index: u32, can_gc: CanGc) -> Fallible<u32> {
if !self.origin_clean.get() {
return Err(Error::Security);
}
- self.rulelist()
- .insert_rule(&rule, index, CssRuleTypes::default(), None, CanGc::note())
+ self.rulelist(can_gc)
+ .insert_rule(&rule, index, CssRuleTypes::default(), None, can_gc)
}
/// <https://drafts.csswg.org/cssom/#dom-cssstylesheet-deleterule>
- fn DeleteRule(&self, index: u32) -> ErrorResult {
+ fn DeleteRule(&self, index: u32, can_gc: CanGc) -> ErrorResult {
if !self.origin_clean.get() {
return Err(Error::Security);
}
- self.rulelist().remove_rule(index)
+ self.rulelist(can_gc).remove_rule(index)
}
/// <https://drafts.csswg.org/cssom/#dom-cssstylesheet-rules>
- fn GetRules(&self) -> Fallible<DomRoot<CSSRuleList>> {
- self.GetCssRules()
+ fn GetRules(&self, can_gc: CanGc) -> Fallible<DomRoot<CSSRuleList>> {
+ self.GetCssRules(can_gc)
}
/// <https://drafts.csswg.org/cssom/#dom-cssstylesheet-removerule>
- fn RemoveRule(&self, index: u32) -> ErrorResult {
- self.DeleteRule(index)
+ fn RemoveRule(&self, index: u32, can_gc: CanGc) -> ErrorResult {
+ self.DeleteRule(index, can_gc)
}
/// <https://drafts.csswg.org/cssom/#dom-cssstylesheet-addrule>
@@ -167,6 +167,7 @@ impl CSSStyleSheetMethods<crate::DomTypeHolder> for CSSStyleSheet {
selector: DOMString,
block: DOMString,
optional_index: Option<u32>,
+ can_gc: CanGc,
) -> Fallible<i32> {
// > 1. Let *rule* be an empty string.
// > 2. Append *selector* to *rule*.
@@ -184,10 +185,10 @@ impl CSSStyleSheetMethods<crate::DomTypeHolder> for CSSStyleSheet {
};
// > 6. Let *index* be *optionalIndex* if provided, or the number of CSS rules in the stylesheet otherwise.
- let index = optional_index.unwrap_or_else(|| self.rulelist().Length());
+ let index = optional_index.unwrap_or_else(|| self.rulelist(can_gc).Length());
// > 7. Call `insertRule()`, with *rule* and *index* as arguments.
- self.InsertRule(rule, index)?;
+ self.InsertRule(rule, index, can_gc)?;
// > 8. Return -1.
Ok(-1)