From f9a06d62a2757eefc729f2126a0d50afa919399f Mon Sep 17 00:00:00 2001 From: webbeef Date: Thu, 10 Oct 2024 08:51:22 -0700 Subject: More CanGc fixes: Range, Event, gpu error, Header (#33774) * Propagate CanGc parameter in Range Signed-off-by: webbeef * Propagate CanGc parameter in gpu code and dependencies Signed-off-by: webbeef * Propagate CanGc parameter in Header and dependencies Signed-off-by: webbeef * Propagate CanGc parameter in Event and dependencies Signed-off-by: webbeef * Propagate CanGc parameter in rtcdatachannel Signed-off-by: webbeef * Propagate CanGc parameter in servoparser Signed-off-by: webbeef --------- Signed-off-by: webbeef --- components/script/dom/htmlscriptelement.rs | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'components/script/dom/htmlscriptelement.rs') diff --git a/components/script/dom/htmlscriptelement.rs b/components/script/dom/htmlscriptelement.rs index 87b8d8a384d..491d7718546 100644 --- a/components/script/dom/htmlscriptelement.rs +++ b/components/script/dom/htmlscriptelement.rs @@ -994,7 +994,7 @@ impl HTMLScriptElement { // Step 2. Err(e) => { warn!("error loading script {:?}", e); - self.dispatch_error_event(); + self.dispatch_error_event(CanGc::note()); return; }, @@ -1043,7 +1043,7 @@ impl HTMLScriptElement { // Step 6. if script.external { - self.dispatch_load_event(); + self.dispatch_load_event(CanGc::note()); } } @@ -1138,19 +1138,21 @@ impl HTMLScriptElement { .queue_simple_event(self.upcast(), atom!("error"), &window); } - pub fn dispatch_load_event(&self) { + pub fn dispatch_load_event(&self, can_gc: CanGc) { self.dispatch_event( atom!("load"), EventBubbles::DoesNotBubble, EventCancelable::NotCancelable, + can_gc, ); } - pub fn dispatch_error_event(&self) { + pub fn dispatch_error_event(&self, can_gc: CanGc) { self.dispatch_event( atom!("error"), EventBubbles::DoesNotBubble, EventCancelable::NotCancelable, + can_gc, ); } @@ -1229,9 +1231,10 @@ impl HTMLScriptElement { type_: Atom, bubbles: EventBubbles, cancelable: EventCancelable, + can_gc: CanGc, ) -> EventStatus { let window = window_from_node(self); - let event = Event::new(window.upcast(), type_, bubbles, cancelable); + let event = Event::new(window.upcast(), type_, bubbles, cancelable, can_gc); event.fire(self.upcast()) } } -- cgit v1.2.3