aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom
diff options
context:
space:
mode:
Diffstat (limited to 'components/script/dom')
-rw-r--r--components/script/dom/document.rs11
-rw-r--r--components/script/dom/htmldetailselement.rs6
-rw-r--r--components/script/dom/htmlformelement.rs5
-rw-r--r--components/script/dom/htmlimageelement.rs7
-rw-r--r--components/script/dom/htmlinputelement.rs6
-rw-r--r--components/script/dom/htmlmediaelement.rs11
-rw-r--r--components/script/dom/htmlscriptelement.rs5
-rw-r--r--components/script/dom/htmltextareaelement.rs6
-rw-r--r--components/script/dom/storage.rs7
9 files changed, 32 insertions, 32 deletions
diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs
index 68cd619ba43..d5fc2d39606 100644
--- a/components/script/dom/document.rs
+++ b/components/script/dom/document.rs
@@ -1488,11 +1488,12 @@ impl Document {
update_with_current_time_ms(&self.dom_content_loaded_event_start);
- self.window().dom_manipulation_task_source().queue_event(self.upcast(), atom!("DOMContentLoaded"),
- EventBubbles::Bubbles, EventCancelable::NotCancelable);
- self.window().reflow(ReflowGoal::ForDisplay,
- ReflowQueryType::NoQuery,
- ReflowReason::DOMContentLoaded);
+ let window = self.window();
+ window.dom_manipulation_task_source().queue_event(self.upcast(), atom!("DOMContentLoaded"),
+ EventBubbles::Bubbles, EventCancelable::NotCancelable, window);
+ window.reflow(ReflowGoal::ForDisplay,
+ ReflowQueryType::NoQuery,
+ ReflowReason::DOMContentLoaded);
update_with_current_time_ms(&self.dom_content_loaded_event_end);
}
diff --git a/components/script/dom/htmldetailselement.rs b/components/script/dom/htmldetailselement.rs
index 4b9d5146b95..a116c09a755 100644
--- a/components/script/dom/htmldetailselement.rs
+++ b/components/script/dom/htmldetailselement.rs
@@ -19,7 +19,6 @@ use script_thread::Runnable;
use std::cell::Cell;
use string_cache::Atom;
use task_source::TaskSource;
-use task_source::dom_manipulation::DOMManipulationTask;
#[dom_struct]
pub struct HTMLDetailsElement {
@@ -72,14 +71,13 @@ impl VirtualMethods for HTMLDetailsElement {
self.toggle_counter.set(counter);
let window = window_from_node(self);
- let window = window.r();
let task_source = window.dom_manipulation_task_source();
let details = Trusted::new(self);
- let runnable = box DetailsNotificationRunnable {
+ let runnable = DetailsNotificationRunnable {
element: details,
toggle_number: counter
};
- let _ = task_source.queue(DOMManipulationTask(runnable));
+ let _ = task_source.queue(runnable, window.r());
}
}
}
diff --git a/components/script/dom/htmlformelement.rs b/components/script/dom/htmlformelement.rs
index 4cd367d5032..eb23c52c775 100644
--- a/components/script/dom/htmlformelement.rs
+++ b/components/script/dom/htmlformelement.rs
@@ -53,7 +53,6 @@ use string_cache::Atom;
use style::attr::AttrValue;
use style::str::split_html_space_chars;
use task_source::TaskSource;
-use task_source::dom_manipulation::DOMManipulationTask;
use url::form_urlencoded;
#[derive(JSTraceable, PartialEq, Clone, Copy, HeapSizeOf)]
@@ -475,7 +474,7 @@ impl HTMLFormElement {
self.generation_id.set(GenerationId(prev_id + 1));
// Step 2
- let nav = box PlannedNavigation {
+ let nav = PlannedNavigation {
load_data: load_data,
pipeline_id: window.pipeline(),
script_chan: window.main_thread_script_chan().clone(),
@@ -484,7 +483,7 @@ impl HTMLFormElement {
};
// Step 3
- window.dom_manipulation_task_source().queue(DOMManipulationTask(nav)).unwrap();
+ window.dom_manipulation_task_source().queue(nav, window).unwrap();
}
/// Interactively validate the constraints of form elements
diff --git a/components/script/dom/htmlimageelement.rs b/components/script/dom/htmlimageelement.rs
index 110138134c5..7a47293eb42 100644
--- a/components/script/dom/htmlimageelement.rs
+++ b/components/script/dom/htmlimageelement.rs
@@ -32,7 +32,6 @@ use std::sync::Arc;
use string_cache::Atom;
use style::attr::{AttrValue, LengthOrPercentageOrAuto};
use task_source::TaskSource;
-use task_source::dom_manipulation::DOMManipulationTask;
use url::Url;
#[derive(JSTraceable, HeapSizeOf)]
@@ -180,12 +179,12 @@ impl HTMLImageElement {
}
}
- let runnable = Box::new(ImgParseErrorRunnable {
+ let runnable = ImgParseErrorRunnable {
img: Trusted::new(self),
src: src.into(),
- });
+ };
let task = window.dom_manipulation_task_source();
- let _ = task.queue(DOMManipulationTask(runnable));
+ let _ = task.queue(runnable, window);
}
}
}
diff --git a/components/script/dom/htmlinputelement.rs b/components/script/dom/htmlinputelement.rs
index d8acc2dbe75..3cf8cea392a 100644
--- a/components/script/dom/htmlinputelement.rs
+++ b/components/script/dom/htmlinputelement.rs
@@ -576,7 +576,8 @@ impl HTMLInputElementMethods for HTMLInputElement {
&self.upcast(),
atom!("select"),
EventBubbles::Bubbles,
- EventCancelable::NotCancelable);
+ EventCancelable::NotCancelable,
+ window.r());
self.upcast::<Node>().dirty(NodeDamage::OtherNodeDamage);
}
@@ -1061,7 +1062,8 @@ impl VirtualMethods for HTMLInputElement {
&self.upcast(),
atom!("input"),
EventBubbles::Bubbles,
- EventCancelable::NotCancelable);
+ EventCancelable::NotCancelable,
+ window.r());
}
self.upcast::<Node>().dirty(NodeDamage::OtherNodeDamage);
diff --git a/components/script/dom/htmlmediaelement.rs b/components/script/dom/htmlmediaelement.rs
index 3c9a4665303..16c41811384 100644
--- a/components/script/dom/htmlmediaelement.rs
+++ b/components/script/dom/htmlmediaelement.rs
@@ -33,7 +33,6 @@ use std::cell::Cell;
use std::sync::{Arc, Mutex};
use string_cache::Atom;
use task_source::TaskSource;
-use task_source::dom_manipulation::DOMManipulationTask;
use time::{self, Timespec, Duration};
use url::Url;
@@ -242,7 +241,7 @@ impl HTMLMediaElement {
elem: Trusted::new(self),
};
let win = window_from_node(self);
- let _ = win.dom_manipulation_task_source().queue(DOMManipulationTask(box task));
+ let _ = win.dom_manipulation_task_source().queue(task, win.r());
}
// https://html.spec.whatwg.org/multipage/#internal-pause-steps step 2.2
@@ -266,13 +265,13 @@ impl HTMLMediaElement {
elem: Trusted::new(self),
};
let win = window_from_node(self);
- let _ = win.dom_manipulation_task_source().queue(DOMManipulationTask(box task));
+ let _ = win.dom_manipulation_task_source().queue(task, win.r());
}
fn queue_fire_simple_event(&self, type_: &'static str) {
let win = window_from_node(self);
let task = FireSimpleEventTask::new(self, type_);
- let _ = win.dom_manipulation_task_source().queue(DOMManipulationTask(box task));
+ let _ = win.dom_manipulation_task_source().queue(task, win.r());
}
fn fire_simple_event(&self, type_: &str) {
@@ -498,8 +497,8 @@ impl HTMLMediaElement {
}
fn queue_dedicated_media_source_failure_steps(&self) {
- let _ = window_from_node(self).dom_manipulation_task_source().queue(
- DOMManipulationTask(box DedicatedMediaSourceFailureTask::new(self)));
+ let window = window_from_node(self);
+ let _ = window.dom_manipulation_task_source().queue(DedicatedMediaSourceFailureTask::new(self), window.r());
}
// https://html.spec.whatwg.org/multipage/#dedicated-media-source-failure-steps
diff --git a/components/script/dom/htmlscriptelement.rs b/components/script/dom/htmlscriptelement.rs
index 2d10e5f43d8..5195b0e53a6 100644
--- a/components/script/dom/htmlscriptelement.rs
+++ b/components/script/dom/htmlscriptelement.rs
@@ -460,12 +460,13 @@ impl HTMLScriptElement {
if external {
self.dispatch_load_event();
} else {
- window.dom_manipulation_task_source().queue_simple_event(self.upcast(), atom!("load"));
+ window.dom_manipulation_task_source().queue_simple_event(self.upcast(), atom!("load"), window.r());
}
}
pub fn queue_error_event(&self) {
- window_from_node(self).dom_manipulation_task_source().queue_simple_event(self.upcast(), atom!("error"));
+ let window = window_from_node(self);
+ window.dom_manipulation_task_source().queue_simple_event(self.upcast(), atom!("error"), window.r());
}
pub fn dispatch_before_script_execute_event(&self) -> bool {
diff --git a/components/script/dom/htmltextareaelement.rs b/components/script/dom/htmltextareaelement.rs
index 69fe9046dad..5fb3a6ea102 100644
--- a/components/script/dom/htmltextareaelement.rs
+++ b/components/script/dom/htmltextareaelement.rs
@@ -260,7 +260,8 @@ impl HTMLTextAreaElementMethods for HTMLTextAreaElement {
&self.upcast(),
atom!("select"),
EventBubbles::Bubbles,
- EventCancelable::NotCancelable);
+ EventCancelable::NotCancelable,
+ window.r());
self.upcast::<Node>().dirty(NodeDamage::OtherNodeDamage);
}
}
@@ -383,7 +384,8 @@ impl VirtualMethods for HTMLTextAreaElement {
&self.upcast(),
atom!("input"),
EventBubbles::Bubbles,
- EventCancelable::NotCancelable);
+ EventCancelable::NotCancelable,
+ window.r());
}
self.upcast::<Node>().dirty(NodeDamage::OtherNodeDamage);
diff --git a/components/script/dom/storage.rs b/components/script/dom/storage.rs
index d44f9684027..20b5d4924a8 100644
--- a/components/script/dom/storage.rs
+++ b/components/script/dom/storage.rs
@@ -19,7 +19,6 @@ use net_traits::IpcSend;
use net_traits::storage_thread::{StorageThreadMsg, StorageType};
use script_thread::{Runnable, ScriptThread};
use task_source::TaskSource;
-use task_source::dom_manipulation::DOMManipulationTask;
use url::Url;
#[dom_struct]
@@ -159,10 +158,10 @@ impl Storage {
new_value: Option<String>) {
let global_root = self.global();
let global_ref = global_root.r();
- let task_source = global_ref.as_window().dom_manipulation_task_source();
+ let window = global_ref.as_window();
+ let task_source = window.dom_manipulation_task_source();
let trusted_storage = Trusted::new(self);
- task_source.queue(DOMManipulationTask(
- box StorageEventRunnable::new(trusted_storage, key, old_value, new_value))).unwrap();
+ task_source.queue(StorageEventRunnable::new(trusted_storage, key, old_value, new_value), window).unwrap();
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-04 13:07:03 +0000