Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #12404 - ConnorGBrewster:task_source_cleanup, r=asajeffrey

Browse source 
Clean up task sources and make all tasks cancellable

<!-- Please describe your changes on the following line: -->
This makes it so each task is a thin wrapper over a runnable and whenever a task is queued, it is automatically wrapped by the window's `runnable_wrapper`.

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix  #11703 (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12404)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-07-13 10:18:15 -07:00 • committed by GitHub
commit 3011d4b450
16 changed files with 136 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

11
components/script/dom/document.rs
View file

@ -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);
}

38
components/script/dom/event.rs
View file

@ -8,9 +8,11 @@ use dom::bindings::codegen::Bindings::EventBinding::{EventConstants, EventMethod
use dom::bindings::error::Fallible;
use dom::bindings::global::GlobalRef;
use dom::bindings::js::{JS, MutNullableHeap, Root};
use dom::bindings::refcounted::Trusted;
use dom::bindings::reflector::{Reflector, reflect_dom_object};
use dom::bindings::str::DOMString;
use dom::eventtarget::EventTarget;
use script_thread::Runnable;
use std::cell::Cell;
use std::default::Default;
use string_cache::Atom;
@ -26,7 +28,7 @@ pub enum EventPhase {
Bubbling = EventConstants::BUBBLING_PHASE,
}
#[derive(PartialEq, HeapSizeOf)]
#[derive(PartialEq, HeapSizeOf, Copy, Clone)]
pub enum EventBubbles {
Bubbles,
DoesNotBubble
@ -50,7 +52,7 @@ impl From<bool> for EventBubbles {
}
}
#[derive(PartialEq, HeapSizeOf)]
#[derive(PartialEq, HeapSizeOf, Copy, Clone)]
pub enum EventCancelable {
Cancelable,
NotCancelable
@ -297,3 +299,35 @@ impl Event {
target.dispatch_event(self)
}
}
// https://dom.spec.whatwg.org/#concept-event-fire
pub struct EventRunnable {
pub target: Trusted<EventTarget>,
pub name: Atom,
pub bubbles: EventBubbles,
pub cancelable: EventCancelable,
}
impl Runnable for EventRunnable {
fn name(&self) -> &'static str { "EventRunnable" }
fn handler(self: Box<EventRunnable>) {
let target = self.target.root();
target.fire_event(&*self.name, self.bubbles, self.cancelable);
}
}
// https://html.spec.whatwg.org/multipage/#fire-a-simple-event
pub struct SimpleEventRunnable {
pub target: Trusted<EventTarget>,
pub name: Atom,
}
impl Runnable for SimpleEventRunnable {
fn name(&self) -> &'static str { "SimpleEventRunnable" }
fn handler(self: Box<SimpleEventRunnable>) {
let target = self.target.root();
target.fire_simple_event(&*self.name);
}
}

4
components/script/dom/htmldetailselement.rs
View file

@ -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 {
element: details,
toggle_number: counter
};
let _ = task_source.queue(DOMManipulationTask::Runnable(runnable));
let _ = task_source.queue(runnable, window.r());
}
}
}

3
components/script/dom/htmlformelement.rs
View file

@ -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)]
@ -484,7 +483,7 @@ impl HTMLFormElement {
};
// Step 3
window.dom_manipulation_task_source().queue(DOMManipulationTask::Runnable(nav)).unwrap();
window.dom_manipulation_task_source().queue(nav, window).unwrap();
}
/// Interactively validate the constraints of form elements

9
components/script/dom/htmlimageelement.rs
View file

@ -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)]
@ -141,7 +140,7 @@ impl HTMLImageElement {
// Return the image via a message to the script thread, which marks the element
// as dirty and triggers a reflow.
let image_response = message.to().unwrap();
let runnable = ImageResponseHandlerRunnable::new(
let runnable = box ImageResponseHandlerRunnable::new(
trusted_node.clone(), image_response);
let runnable = wrapper.wrap_runnable(runnable);
let _ = script_chan.send(CommonScriptMsg::RunnableMsg(
@ -180,12 +179,12 @@ impl HTMLImageElement {
}
}
let runnable = Box::new(ImgParseErrorRunnable {
let runnable = box ImgParseErrorRunnable {
img: Trusted::new(self),
src: src.into(),
});
};
let task = window.dom_manipulation_task_source();
let _ = task.queue(DOMManipulationTask::Runnable(runnable));
let _ = task.queue(runnable, window);
}
}
}

6
components/script/dom/htmlinputelement.rs
View file

@ -577,7 +577,8 @@ impl HTMLInputElementMethods for HTMLInputElement {
&self.upcast(),
atom!("select"),
EventBubbles::Bubbles,
EventCancelable::NotCancelable);
EventCancelable::NotCancelable,
window.r());
self.upcast::<Node>().dirty(NodeDamage::OtherNodeDamage);
}
@ -1070,7 +1071,8 @@ impl VirtualMethods for HTMLInputElement {
&self.upcast(),
atom!("input"),
EventBubbles::Bubbles,
EventCancelable::NotCancelable);
EventCancelable::NotCancelable,
window.r());
}
self.upcast::<Node>().dirty(NodeDamage::OtherNodeDamage);

17
components/script/dom/htmlmediaelement.rs
View file

@ -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;
@ -238,11 +237,11 @@ impl HTMLMediaElement {
}
}
let task = Task {
let task = box Task {
elem: Trusted::new(self),
};
let win = window_from_node(self);
let _ = win.dom_manipulation_task_source().queue(DOMManipulationTask::Runnable(box task));
let _ = win.dom_manipulation_task_source().queue(task, win.r());
}
// https://html.spec.whatwg.org/multipage/#internal-pause-steps step 2.2
@ -262,17 +261,17 @@ impl HTMLMediaElement {
}
}
let task = Task {
let task = box Task {
elem: Trusted::new(self),
};
let win = window_from_node(self);
let _ = win.dom_manipulation_task_source().queue(DOMManipulationTask::Runnable(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::Runnable(box task));
let task = box FireSimpleEventTask::new(self, type_);
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::Runnable(box DedicatedMediaSourceFailureTask::new(self)));
let window = window_from_node(self);
let _ = window.dom_manipulation_task_source().queue(box DedicatedMediaSourceFailureTask::new(self), window.r());
}
// https://html.spec.whatwg.org/multipage/#dedicated-media-source-failure-steps

5
components/script/dom/htmlscriptelement.rs
View file

@ -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 {

6
components/script/dom/htmltextareaelement.rs
View file

@ -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);

7
components/script/dom/storage.rs
View file

@ -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::Runnable(
box StorageEventRunnable::new(trusted_storage, key, old_value, new_value))).unwrap();
task_source.queue(box StorageEventRunnable::new(trusted_storage, key, old_value, new_value), window).unwrap();
}
}