mirror of
https://github.com/servo/servo.git
synced 2025-07-23 07:13:52 +01:00
Add task_source directory
Use DOMManipulationTaskSource whenever possible
This commit is contained in:
parent
fa93d3f467
commit
3f2cbf0025
17 changed files with 261 additions and 185 deletions
63
components/script/task_source/dom_manipulation.rs
Normal file
63
components/script/task_source/dom_manipulation.rs
Normal file
|
@ -0,0 +1,63 @@
|
|||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
use dom::bindings::refcounted::Trusted;
|
||||
use dom::event::{EventBubbles, EventCancelable};
|
||||
use dom::eventtarget::EventTarget;
|
||||
use script_thread::{MainThreadRunnable, MainThreadScriptMsg, Runnable, ScriptThread};
|
||||
use std::result::Result;
|
||||
use std::sync::mpsc::Sender;
|
||||
use string_cache::Atom;
|
||||
use task_source::TaskSource;
|
||||
|
||||
#[derive(JSTraceable)]
|
||||
pub struct DOMManipulationTaskSource(pub Sender<MainThreadScriptMsg>);
|
||||
|
||||
impl TaskSource<DOMManipulationTask> for DOMManipulationTaskSource {
|
||||
fn queue(&self, msg: DOMManipulationTask) -> Result<(), ()> {
|
||||
let DOMManipulationTaskSource(ref chan) = *self;
|
||||
chan.send(MainThreadScriptMsg::DOMManipulation(msg)).map_err(|_| ())
|
||||
}
|
||||
|
||||
fn clone(&self) -> Box<TaskSource<DOMManipulationTask> + Send> {
|
||||
let DOMManipulationTaskSource(ref chan) = *self;
|
||||
box DOMManipulationTaskSource((*chan).clone())
|
||||
}
|
||||
}
|
||||
|
||||
pub enum DOMManipulationTask {
|
||||
// https://html.spec.whatwg.org/multipage/#the-end step 7
|
||||
DocumentProgress(Box<Runnable + Send>),
|
||||
// https://dom.spec.whatwg.org/#concept-event-fire
|
||||
FireEvent(Atom, Trusted<EventTarget>, EventBubbles, EventCancelable),
|
||||
// https://html.spec.whatwg.org/multipage/#fire-a-simple-event
|
||||
FireSimpleEvent(Atom, Trusted<EventTarget>),
|
||||
// https://html.spec.whatwg.org/multipage/#details-notification-task-steps
|
||||
FireToggleEvent(Box<Runnable + Send>),
|
||||
// https://html.spec.whatwg.org/multipage/#planned-navigation
|
||||
PlannedNavigation(Box<Runnable + Send>),
|
||||
// https://html.spec.whatwg.org/multipage/#send-a-storage-notification
|
||||
SendStorageNotification(Box<MainThreadRunnable + Send>)
|
||||
}
|
||||
|
||||
impl DOMManipulationTask {
|
||||
pub fn handle_msg(self, script_thread: &ScriptThread) {
|
||||
use self::DOMManipulationTask::*;
|
||||
|
||||
match self {
|
||||
DocumentProgress(runnable) => runnable.handler(),
|
||||
FireEvent(name, element, bubbles, cancelable) => {
|
||||
let target = element.root();
|
||||
target.fire_event(&*name, bubbles, cancelable);
|
||||
}
|
||||
FireSimpleEvent(name, element) => {
|
||||
let target = element.root();
|
||||
target.fire_simple_event(&*name);
|
||||
}
|
||||
FireToggleEvent(runnable) => runnable.handler(),
|
||||
PlannedNavigation(runnable) => runnable.handler(),
|
||||
SendStorageNotification(runnable) => runnable.handler(script_thread)
|
||||
}
|
||||
}
|
||||
}
|
21
components/script/task_source/file_reading.rs
Normal file
21
components/script/task_source/file_reading.rs
Normal file
|
@ -0,0 +1,21 @@
|
|||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
use script_thread::{CommonScriptMsg, MainThreadScriptMsg, ScriptChan};
|
||||
use std::sync::mpsc::Sender;
|
||||
|
||||
#[derive(JSTraceable)]
|
||||
pub struct FileReadingTaskSource(pub Sender<MainThreadScriptMsg>);
|
||||
|
||||
impl ScriptChan for FileReadingTaskSource {
|
||||
fn send(&self, msg: CommonScriptMsg) -> Result<(), ()> {
|
||||
let FileReadingTaskSource(ref chan) = *self;
|
||||
chan.send(MainThreadScriptMsg::Common(msg)).map_err(|_| ())
|
||||
}
|
||||
|
||||
fn clone(&self) -> Box<ScriptChan + Send> {
|
||||
let FileReadingTaskSource(ref chan) = *self;
|
||||
box FileReadingTaskSource((*chan).clone())
|
||||
}
|
||||
}
|
21
components/script/task_source/history_traversal.rs
Normal file
21
components/script/task_source/history_traversal.rs
Normal file
|
@ -0,0 +1,21 @@
|
|||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
use script_thread::{CommonScriptMsg, MainThreadScriptMsg, ScriptChan};
|
||||
use std::sync::mpsc::Sender;
|
||||
|
||||
#[derive(JSTraceable)]
|
||||
pub struct HistoryTraversalTaskSource(pub Sender<MainThreadScriptMsg>);
|
||||
|
||||
impl ScriptChan for HistoryTraversalTaskSource {
|
||||
fn send(&self, msg: CommonScriptMsg) -> Result<(), ()> {
|
||||
let HistoryTraversalTaskSource(ref chan) = *self;
|
||||
chan.send(MainThreadScriptMsg::Common(msg)).map_err(|_| ())
|
||||
}
|
||||
|
||||
fn clone(&self) -> Box<ScriptChan + Send> {
|
||||
let HistoryTraversalTaskSource(ref chan) = *self;
|
||||
box HistoryTraversalTaskSource((*chan).clone())
|
||||
}
|
||||
}
|
16
components/script/task_source/mod.rs
Normal file
16
components/script/task_source/mod.rs
Normal file
|
@ -0,0 +1,16 @@
|
|||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
pub mod dom_manipulation;
|
||||
pub mod file_reading;
|
||||
pub mod history_traversal;
|
||||
pub mod networking;
|
||||
pub mod user_interaction;
|
||||
|
||||
use std::result::Result;
|
||||
|
||||
pub trait TaskSource<T> {
|
||||
fn queue(&self, msg: T) -> Result<(), ()>;
|
||||
fn clone(&self) -> Box<TaskSource<T> + Send>;
|
||||
}
|
21
components/script/task_source/networking.rs
Normal file
21
components/script/task_source/networking.rs
Normal file
|
@ -0,0 +1,21 @@
|
|||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
use script_thread::{CommonScriptMsg, MainThreadScriptMsg, ScriptChan};
|
||||
use std::sync::mpsc::Sender;
|
||||
|
||||
#[derive(JSTraceable)]
|
||||
pub struct NetworkingTaskSource(pub Sender<MainThreadScriptMsg>);
|
||||
|
||||
impl ScriptChan for NetworkingTaskSource {
|
||||
fn send(&self, msg: CommonScriptMsg) -> Result<(), ()> {
|
||||
let NetworkingTaskSource(ref chan) = *self;
|
||||
chan.send(MainThreadScriptMsg::Common(msg)).map_err(|_| ())
|
||||
}
|
||||
|
||||
fn clone(&self) -> Box<ScriptChan + Send> {
|
||||
let NetworkingTaskSource(ref chan) = *self;
|
||||
box NetworkingTaskSource((*chan).clone())
|
||||
}
|
||||
}
|
21
components/script/task_source/user_interaction.rs
Normal file
21
components/script/task_source/user_interaction.rs
Normal file
|
@ -0,0 +1,21 @@
|
|||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
use script_thread::{CommonScriptMsg, MainThreadScriptMsg, ScriptChan};
|
||||
use std::sync::mpsc::Sender;
|
||||
|
||||
#[derive(JSTraceable)]
|
||||
pub struct UserInteractionTaskSource(pub Sender<MainThreadScriptMsg>);
|
||||
|
||||
impl ScriptChan for UserInteractionTaskSource {
|
||||
fn send(&self, msg: CommonScriptMsg) -> Result<(), ()> {
|
||||
let UserInteractionTaskSource(ref chan) = *self;
|
||||
chan.send(MainThreadScriptMsg::Common(msg)).map_err(|_| ())
|
||||
}
|
||||
|
||||
fn clone(&self) -> Box<ScriptChan + Send> {
|
||||
let UserInteractionTaskSource(ref chan) = *self;
|
||||
box UserInteractionTaskSource((*chan).clone())
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue