mirror of
https://github.com/servo/servo.git
synced 2025-08-06 14:10:11 +01:00
Introduce TaskOnce
Having both TaskBox and TaskOnce allows us to remove the superfluous inner boxing from CancellableTask<T>.
This commit is contained in:
parent
52527d6f9d
commit
6c9fb5ae7a
26 changed files with 144 additions and 124 deletions
|
@ -40,7 +40,7 @@ use std::marker::PhantomData;
|
|||
use std::os;
|
||||
use std::rc::Rc;
|
||||
use std::sync::{Arc, Weak};
|
||||
use task::TaskBox;
|
||||
use task::TaskOnce;
|
||||
|
||||
|
||||
#[allow(missing_docs)] // FIXME
|
||||
|
@ -122,7 +122,7 @@ impl TrustedPromise {
|
|||
|
||||
/// A task which will reject the promise.
|
||||
#[allow(unrooted_must_root)]
|
||||
pub fn reject_task(self, error: Error) -> impl TaskBox {
|
||||
pub fn reject_task(self, error: Error) -> impl TaskOnce {
|
||||
let this = self;
|
||||
task!(reject_promise: move || {
|
||||
debug!("Rejecting promise.");
|
||||
|
@ -135,7 +135,7 @@ impl TrustedPromise {
|
|||
|
||||
/// A task which will resolve the promise.
|
||||
#[allow(unrooted_must_root)]
|
||||
pub fn resolve_task<T>(self, value: T) -> impl TaskBox
|
||||
pub fn resolve_task<T>(self, value: T) -> impl TaskOnce
|
||||
where
|
||||
T: ToJSValConvertible + Send,
|
||||
{
|
||||
|
|
|
@ -40,7 +40,7 @@ use std::collections::HashMap;
|
|||
use std::rc::Rc;
|
||||
use std::str::FromStr;
|
||||
use std::sync::{Arc, Mutex};
|
||||
use task::TaskBox;
|
||||
use task::TaskOnce;
|
||||
|
||||
const KEY_CONVERSION_ERROR: &'static str = "This `manufacturerData` key can not be parsed as unsigned short:";
|
||||
const FILTER_EMPTY_ERROR: &'static str = "'filters' member, if present, must be nonempty to find any devices.";
|
||||
|
@ -229,18 +229,17 @@ pub fn response_async<T: AsyncBluetoothListener + DomObject + 'static>(
|
|||
action: BluetoothResponseResult,
|
||||
}
|
||||
|
||||
impl<T> TaskBox for ListenerTask<T>
|
||||
impl<T> TaskOnce for ListenerTask<T>
|
||||
where
|
||||
T: AsyncBluetoothListener + DomObject,
|
||||
{
|
||||
fn run_box(self: Box<Self>) {
|
||||
let this = *self;
|
||||
let mut context = this.context.lock().unwrap();
|
||||
context.response(this.action);
|
||||
fn run_once(self) {
|
||||
let mut context = self.context.lock().unwrap();
|
||||
context.response(self.action);
|
||||
}
|
||||
}
|
||||
|
||||
let task = box ListenerTask {
|
||||
let task = ListenerTask {
|
||||
context: context.clone(),
|
||||
action: message.to().unwrap(),
|
||||
};
|
||||
|
|
|
@ -1716,7 +1716,7 @@ impl Document {
|
|||
debug!("Document loads are complete.");
|
||||
let document = Trusted::new(self);
|
||||
self.window.dom_manipulation_task_source().queue(
|
||||
box task!(fire_load_event: move || {
|
||||
task!(fire_load_event: move || {
|
||||
let document = document.root();
|
||||
let window = document.window();
|
||||
if !window.is_alive() {
|
||||
|
|
|
@ -119,7 +119,7 @@ use style::thread_state;
|
|||
use style::values::{CSSFloat, Either};
|
||||
use style::values::{specified, computed};
|
||||
use stylesheet_loader::StylesheetOwner;
|
||||
use task::TaskBox;
|
||||
use task::TaskOnce;
|
||||
|
||||
// TODO: Update focus state when the top-level browsing context gains or loses system focus,
|
||||
// and when the element enters or leaves a browsing context container.
|
||||
|
@ -3047,9 +3047,9 @@ impl ElementPerformFullscreenEnter {
|
|||
}
|
||||
}
|
||||
|
||||
impl TaskBox for ElementPerformFullscreenEnter {
|
||||
impl TaskOnce for ElementPerformFullscreenEnter {
|
||||
#[allow(unrooted_must_root)]
|
||||
fn run_box(self: Box<Self>) {
|
||||
fn run_once(self) {
|
||||
let element = self.element.root();
|
||||
let document = document_from_node(element.r());
|
||||
|
||||
|
@ -3100,9 +3100,9 @@ impl ElementPerformFullscreenExit {
|
|||
}
|
||||
}
|
||||
|
||||
impl TaskBox for ElementPerformFullscreenExit {
|
||||
impl TaskOnce for ElementPerformFullscreenExit {
|
||||
#[allow(unrooted_must_root)]
|
||||
fn run_box(self: Box<Self>) {
|
||||
fn run_once(self) {
|
||||
let element = self.element.root();
|
||||
let document = document_from_node(element.r());
|
||||
// TODO Step 9.1-5
|
||||
|
|
|
@ -23,7 +23,7 @@ use dom_struct::dom_struct;
|
|||
use servo_atoms::Atom;
|
||||
use std::cell::Cell;
|
||||
use std::default::Default;
|
||||
use task::TaskBox;
|
||||
use task::TaskOnce;
|
||||
use time;
|
||||
|
||||
#[dom_struct]
|
||||
|
@ -388,8 +388,8 @@ pub struct EventTask {
|
|||
pub cancelable: EventCancelable,
|
||||
}
|
||||
|
||||
impl TaskBox for EventTask {
|
||||
fn run_box(self: Box<Self>) {
|
||||
impl TaskOnce for EventTask {
|
||||
fn run_once(self) {
|
||||
let target = self.target.root();
|
||||
let bubbles = self.bubbles;
|
||||
let cancelable = self.cancelable;
|
||||
|
@ -403,8 +403,8 @@ pub struct SimpleEventTask {
|
|||
pub name: Atom,
|
||||
}
|
||||
|
||||
impl TaskBox for SimpleEventTask {
|
||||
fn run_box(self: Box<Self>) {
|
||||
impl TaskOnce for SimpleEventTask {
|
||||
fn run_once(self) {
|
||||
let target = self.target.root();
|
||||
target.fire_event(self.name);
|
||||
}
|
||||
|
|
|
@ -100,7 +100,7 @@ impl EventSourceContext {
|
|||
let event_source = self.event_source.clone();
|
||||
// FIXME(nox): Why are errors silenced here?
|
||||
let _ = global.networking_task_source().queue(
|
||||
box task!(announce_the_event_source_connection: move || {
|
||||
task!(announce_the_event_source_connection: move || {
|
||||
let event_source = event_source.root();
|
||||
if event_source.ready_state.get() != ReadyState::Closed {
|
||||
event_source.ready_state.set(ReadyState::Open);
|
||||
|
@ -121,7 +121,7 @@ impl EventSourceContext {
|
|||
let event_source = self.event_source.clone();
|
||||
// FIXME(nox): Why are errors silenced here?
|
||||
let _ = global.networking_task_source().queue(
|
||||
box task!(fail_the_event_source_connection: move || {
|
||||
task!(fail_the_event_source_connection: move || {
|
||||
let event_source = event_source.root();
|
||||
if event_source.ready_state.get() != ReadyState::Closed {
|
||||
event_source.ready_state.set(ReadyState::Closed);
|
||||
|
@ -145,7 +145,7 @@ impl EventSourceContext {
|
|||
let global = event_source.global();
|
||||
// FIXME(nox): Why are errors silenced here?
|
||||
let _ = global.networking_task_source().queue(
|
||||
box task!(reestablish_the_event_source_onnection: move || {
|
||||
task!(reestablish_the_event_source_onnection: move || {
|
||||
let event_source = trusted_event_source.root();
|
||||
|
||||
// Step 1.1.
|
||||
|
@ -242,7 +242,7 @@ impl EventSourceContext {
|
|||
let event = Trusted::new(&*event);
|
||||
// FIXME(nox): Why are errors silenced here?
|
||||
let _ = global.networking_task_source().queue(
|
||||
box task!(dispatch_the_event_source_event: move || {
|
||||
task!(dispatch_the_event_source_event: move || {
|
||||
let event_source = event_source.root();
|
||||
if event_source.ready_state.get() != ReadyState::Closed {
|
||||
event.root().upcast::<Event>().fire(&event_source.upcast());
|
||||
|
|
|
@ -416,11 +416,11 @@ fn perform_annotated_read_operation(
|
|||
) {
|
||||
// Step 4
|
||||
let task = FileReadingTask::ProcessRead(filereader.clone(), gen_id);
|
||||
task_source.queue_with_canceller(box task, &canceller).unwrap();
|
||||
task_source.queue_with_canceller(task, &canceller).unwrap();
|
||||
|
||||
let task = FileReadingTask::ProcessReadData(filereader.clone(), gen_id);
|
||||
task_source.queue_with_canceller(box task, &canceller).unwrap();
|
||||
task_source.queue_with_canceller(task, &canceller).unwrap();
|
||||
|
||||
let task = FileReadingTask::ProcessReadEOF(filereader, gen_id, data, blob_contents);
|
||||
task_source.queue_with_canceller(box task, &canceller).unwrap();
|
||||
task_source.queue_with_canceller(task, &canceller).unwrap();
|
||||
}
|
||||
|
|
|
@ -70,7 +70,7 @@ impl VirtualMethods for HTMLDetailsElement {
|
|||
let this = Trusted::new(self);
|
||||
// FIXME(nox): Why are errors silenced here?
|
||||
let _ = window.dom_manipulation_task_source().queue(
|
||||
box task!(details_notification_task_steps: move || {
|
||||
task!(details_notification_task_steps: move || {
|
||||
let this = this.root();
|
||||
if counter == this.toggle_counter.get() {
|
||||
this.upcast::<EventTarget>().fire_event(atom!("toggle"));
|
||||
|
|
|
@ -440,7 +440,7 @@ impl HTMLFormElement {
|
|||
let pipeline_id = window.upcast::<GlobalScope>().pipeline_id();
|
||||
let script_chan = window.main_thread_script_chan().clone();
|
||||
let this = Trusted::new(self);
|
||||
let task = box task!(navigate_to_form_planned_navigation: move || {
|
||||
let task = task!(navigate_to_form_planned_navigation: move || {
|
||||
if generation_id != this.root().generation_id.get() {
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -236,7 +236,7 @@ impl HTMLIFrameElement {
|
|||
let pipeline_id = self.pipeline_id().unwrap();
|
||||
// FIXME(nox): Why are errors silenced here?
|
||||
let _ = window.dom_manipulation_task_source().queue(
|
||||
box task!(iframe_load_event_steps: move || {
|
||||
task!(iframe_load_event_steps: move || {
|
||||
this.root().iframe_load_event_steps(pipeline_id);
|
||||
}),
|
||||
window.upcast(),
|
||||
|
|
|
@ -174,7 +174,7 @@ impl HTMLImageElement {
|
|||
let image = message.to().unwrap();
|
||||
// FIXME(nox): Why are errors silenced here?
|
||||
let _ = task_source.queue_with_canceller(
|
||||
box task!(process_image_response: move || {
|
||||
task!(process_image_response: move || {
|
||||
let element = element.root();
|
||||
// Ignore any image response for a previous request that has been discarded.
|
||||
if generation == element.generation.get() {
|
||||
|
@ -425,7 +425,7 @@ impl HTMLImageElement {
|
|||
// Step 9.
|
||||
// FIXME(nox): Why are errors silenced here?
|
||||
let _ = task_source.queue(
|
||||
box task!(image_null_source_error: move || {
|
||||
task!(image_null_source_error: move || {
|
||||
let this = this.root();
|
||||
{
|
||||
let mut current_request =
|
||||
|
@ -451,7 +451,7 @@ impl HTMLImageElement {
|
|||
let target = Trusted::new(self.upcast::<EventTarget>());
|
||||
// FIXME(nox): Why are errors silenced here?
|
||||
let _ = task_source.queue(
|
||||
box task!(fire_progress_event: move || {
|
||||
task!(fire_progress_event: move || {
|
||||
let target = target.root();
|
||||
|
||||
let event = ProgressEvent::new(
|
||||
|
@ -480,7 +480,7 @@ impl HTMLImageElement {
|
|||
let src = String::from(src);
|
||||
// FIXME(nox): Why are errors silenced here?
|
||||
let _ = task_source.queue(
|
||||
box task!(image_selected_source_error: move || {
|
||||
task!(image_selected_source_error: move || {
|
||||
let this = this.root();
|
||||
{
|
||||
let mut current_request =
|
||||
|
@ -549,7 +549,7 @@ impl HTMLImageElement {
|
|||
let this = Trusted::new(self);
|
||||
let src = String::from(src);
|
||||
let _ = window.dom_manipulation_task_source().queue(
|
||||
box task!(image_load_event: move || {
|
||||
task!(image_load_event: move || {
|
||||
let this = this.root();
|
||||
{
|
||||
let mut current_request =
|
||||
|
|
|
@ -154,7 +154,7 @@ impl HTMLMediaElement {
|
|||
let target = Trusted::new(self.upcast::<EventTarget>());
|
||||
// FIXME(nox): Why are errors silenced here?
|
||||
let _ = window.dom_manipulation_task_source().queue(
|
||||
box task!(internal_pause_steps: move || {
|
||||
task!(internal_pause_steps: move || {
|
||||
let target = target.root();
|
||||
|
||||
// Step 2.3.1.
|
||||
|
@ -186,7 +186,7 @@ impl HTMLMediaElement {
|
|||
let window = window_from_node(self);
|
||||
// FIXME(nox): Why are errors silenced here?
|
||||
let _ = window.dom_manipulation_task_source().queue(
|
||||
box task!(notify_about_playing: move || {
|
||||
task!(notify_about_playing: move || {
|
||||
let target = target.root();
|
||||
|
||||
// Step 2.1.
|
||||
|
@ -495,7 +495,7 @@ impl HTMLMediaElement {
|
|||
let window = window_from_node(self);
|
||||
// FIXME(nox): Why are errors silenced here?
|
||||
let _ = window.dom_manipulation_task_source().queue(
|
||||
box task!(dedicated_media_source_failure_steps: move || {
|
||||
task!(dedicated_media_source_failure_steps: move || {
|
||||
let this = this.root();
|
||||
|
||||
// Step 1.
|
||||
|
|
|
@ -19,7 +19,7 @@ use js::jsapi::{HandleValue, JSContext};
|
|||
use script_traits::{ScriptMsg, DOMMessage};
|
||||
use servo_url::ServoUrl;
|
||||
use std::cell::Cell;
|
||||
use task::TaskBox;
|
||||
use task::TaskOnce;
|
||||
|
||||
pub type TrustedServiceWorkerAddress = Trusted<ServiceWorker>;
|
||||
|
||||
|
@ -104,10 +104,9 @@ impl ServiceWorkerMethods for ServiceWorker {
|
|||
event_handler!(statechange, GetOnstatechange, SetOnstatechange);
|
||||
}
|
||||
|
||||
impl TaskBox for SimpleWorkerErrorHandler<ServiceWorker> {
|
||||
impl TaskOnce for SimpleWorkerErrorHandler<ServiceWorker> {
|
||||
#[allow(unrooted_must_root)]
|
||||
fn run_box(self: Box<Self>) {
|
||||
let this = *self;
|
||||
ServiceWorker::dispatch_simple_error(this.addr);
|
||||
fn run_once(self) {
|
||||
ServiceWorker::dispatch_simple_error(self.addr);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -167,7 +167,7 @@ impl Storage {
|
|||
let global = self.global();
|
||||
let this = Trusted::new(self);
|
||||
global.as_window().dom_manipulation_task_source().queue(
|
||||
box task!(send_storage_notification: move || {
|
||||
task!(send_storage_notification: move || {
|
||||
let this = this.root();
|
||||
let global = this.global();
|
||||
let event = StorageEvent::new(
|
||||
|
|
|
@ -37,7 +37,7 @@ use std::borrow::ToOwned;
|
|||
use std::cell::Cell;
|
||||
use std::ptr;
|
||||
use std::thread;
|
||||
use task::{TaskBox, TaskCanceller};
|
||||
use task::{TaskOnce, TaskCanceller};
|
||||
use task_source::TaskSource;
|
||||
use task_source::networking::NetworkingTaskSource;
|
||||
|
||||
|
@ -74,7 +74,7 @@ pub fn close_the_websocket_connection(
|
|||
code: Option<u16>,
|
||||
reason: String,
|
||||
) {
|
||||
let close_task = box CloseTask {
|
||||
let close_task = CloseTask {
|
||||
address: address,
|
||||
failed: false,
|
||||
code: code,
|
||||
|
@ -88,7 +88,7 @@ pub fn fail_the_websocket_connection(
|
|||
task_source: &NetworkingTaskSource,
|
||||
canceller: &TaskCanceller,
|
||||
) {
|
||||
let close_task = box CloseTask {
|
||||
let close_task = CloseTask {
|
||||
address: address,
|
||||
failed: true,
|
||||
code: Some(close_code::ABNORMAL),
|
||||
|
@ -206,14 +206,14 @@ impl WebSocket {
|
|||
while let Ok(event) = dom_event_receiver.recv() {
|
||||
match event {
|
||||
WebSocketNetworkEvent::ConnectionEstablished { protocol_in_use } => {
|
||||
let open_thread = box ConnectionEstablishedTask {
|
||||
let open_thread = ConnectionEstablishedTask {
|
||||
address: address.clone(),
|
||||
protocol_in_use,
|
||||
};
|
||||
task_source.queue_with_canceller(open_thread, &canceller).unwrap();
|
||||
},
|
||||
WebSocketNetworkEvent::MessageReceived(message) => {
|
||||
let message_thread = box MessageReceivedTask {
|
||||
let message_thread = MessageReceivedTask {
|
||||
address: address.clone(),
|
||||
message: message,
|
||||
};
|
||||
|
@ -397,9 +397,9 @@ struct ConnectionEstablishedTask {
|
|||
protocol_in_use: Option<String>,
|
||||
}
|
||||
|
||||
impl TaskBox for ConnectionEstablishedTask {
|
||||
impl TaskOnce for ConnectionEstablishedTask {
|
||||
/// https://html.spec.whatwg.org/multipage/#feedback-from-the-protocol:concept-websocket-established
|
||||
fn run_box(self: Box<Self>) {
|
||||
fn run_once(self) {
|
||||
let ws = self.address.root();
|
||||
|
||||
// Step 1.
|
||||
|
@ -422,13 +422,13 @@ struct BufferedAmountTask {
|
|||
address: Trusted<WebSocket>,
|
||||
}
|
||||
|
||||
impl TaskBox for BufferedAmountTask {
|
||||
impl TaskOnce for BufferedAmountTask {
|
||||
// See https://html.spec.whatwg.org/multipage/#dom-websocket-bufferedamount
|
||||
//
|
||||
// To be compliant with standards, we need to reset bufferedAmount only when the event loop
|
||||
// reaches step 1. In our implementation, the bytes will already have been sent on a background
|
||||
// thread.
|
||||
fn run_box(self: Box<Self>) {
|
||||
fn run_once(self) {
|
||||
let ws = self.address.root();
|
||||
|
||||
ws.buffered_amount.set(0);
|
||||
|
@ -443,8 +443,8 @@ struct CloseTask {
|
|||
reason: Option<String>,
|
||||
}
|
||||
|
||||
impl TaskBox for CloseTask {
|
||||
fn run_box(self: Box<Self>) {
|
||||
impl TaskOnce for CloseTask {
|
||||
fn run_once(self) {
|
||||
let ws = self.address.root();
|
||||
|
||||
if ws.ready_state.get() == WebSocketRequestState::Closed {
|
||||
|
@ -483,9 +483,9 @@ struct MessageReceivedTask {
|
|||
message: MessageData,
|
||||
}
|
||||
|
||||
impl TaskBox for MessageReceivedTask {
|
||||
impl TaskOnce for MessageReceivedTask {
|
||||
#[allow(unsafe_code)]
|
||||
fn run_box(self: Box<Self>) {
|
||||
fn run_once(self) {
|
||||
let ws = self.address.root();
|
||||
debug!("MessageReceivedTask::handler({:p}): readyState={:?}", &*ws,
|
||||
ws.ready_state.get());
|
||||
|
|
|
@ -1977,7 +1977,7 @@ impl Window {
|
|||
serialize_with_transfer_result: StructuredCloneData,
|
||||
) {
|
||||
let this = Trusted::new(self);
|
||||
let task = box task!(post_serialised_message: move || {
|
||||
let task = task!(post_serialised_message: move || {
|
||||
let this = this.root();
|
||||
|
||||
// Step 7.1.
|
||||
|
@ -2012,7 +2012,7 @@ impl Window {
|
|||
// TODO(#12718): Use the "posted message task source".
|
||||
let _ = self.script_chan.send(CommonScriptMsg::Task(
|
||||
ScriptThreadEventCategory::DomEvent,
|
||||
self.task_canceller().wrap_task(task),
|
||||
box self.task_canceller().wrap_task(task),
|
||||
));
|
||||
}
|
||||
}
|
||||
|
|
|
@ -28,7 +28,7 @@ use std::cell::Cell;
|
|||
use std::sync::{Arc, Mutex};
|
||||
use std::sync::atomic::{AtomicBool, Ordering};
|
||||
use std::sync::mpsc::{Sender, channel};
|
||||
use task::TaskBox;
|
||||
use task::TaskOnce;
|
||||
|
||||
pub type TrustedWorkerAddress = Trusted<Worker>;
|
||||
|
||||
|
@ -175,10 +175,9 @@ impl WorkerMethods for Worker {
|
|||
event_handler!(error, GetOnerror, SetOnerror);
|
||||
}
|
||||
|
||||
impl TaskBox for SimpleWorkerErrorHandler<Worker> {
|
||||
impl TaskOnce for SimpleWorkerErrorHandler<Worker> {
|
||||
#[allow(unrooted_must_root)]
|
||||
fn run_box(self: Box<Self>) {
|
||||
let this = *self;
|
||||
Worker::dispatch_simple_error(this.addr);
|
||||
fn run_once(self) {
|
||||
Worker::dispatch_simple_error(self.addr);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue