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

Emit markers for all events, not just UI events.

Browse source
This commit is contained in:
Ms2ger 2015-09-14 17:55:47 +02:00
parent 6dab37c88c
commit b7a0440f91
4 changed files with 69 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

58
components/script/dom/eventdispatcher.rs
View file

@ -5,17 +5,62 @@
use dom::bindings::callback::ExceptionHandling::Report;
use dom::bindings::codegen::Bindings::EventBinding::EventMethods;
use dom::bindings::codegen::InheritTypes::{EventTargetCast, NodeCast};
use dom::bindings::js::JS;
use dom::bindings::global::{GlobalRoot, global_object_for_reflector};
use dom::bindings::js::{JS, Root, RootedReference};
use dom::bindings::trace::RootedVec;
use dom::event::{Event, EventPhase};
use dom::eventtarget::{EventTarget, ListenerPhase};
use dom::eventtarget::{EventTarget, ListenerPhase, EventListenerType};
use dom::node::Node;
use dom::virtualmethods::vtable_for;
use dom::window::Window;
use devtools_traits::{StartedTimelineMarker, TimelineMarker, TimelineMarkerType};
struct AutoDOMEventMarker {
window: Root<Window>,
marker: Option<StartedTimelineMarker>,
}
impl AutoDOMEventMarker {
fn new(window: &Window) -> AutoDOMEventMarker {
AutoDOMEventMarker {
window: Root::from_ref(window),
marker: Some(TimelineMarker::start("DOMEvent".to_owned())),
}
}
}
impl Drop for AutoDOMEventMarker {
fn drop(&mut self) {
self.window.emit_timeline_marker(self.marker.take().unwrap().end());
}
}
fn handle_event(window: Option<&Window>, listener: &EventListenerType,
current_target: &EventTarget, event: &Event) {
let _marker;
if let Some(window) = window {
_marker = AutoDOMEventMarker::new(window);
}
listener.call_or_handle_event(current_target, event, Report);
}
fn dispatch_to_listeners(event: &Event, target: &EventTarget, chain: &[&EventTarget]) {
assert!(!event.stop_propagation());
assert!(!event.stop_immediate());
let window = match global_object_for_reflector(target) {
GlobalRoot::Window(window) => {
if window.need_emit_timeline_marker(TimelineMarkerType::DOMEvent) {
Some(window)
} else {
None
}
},
_ => None,
};
let type_ = event.Type();
/* capturing */
@ -24,8 +69,7 @@ fn dispatch_to_listeners(event: &Event, target: &EventTarget, chain: &[&EventTar
if let Some(listeners) = cur_target.get_listeners_for(&type_, ListenerPhase::Capturing) {
event.set_current_target(cur_target);
for listener in &listeners {
// Explicitly drop any exception on the floor.
listener.call_or_handle_event(*cur_target, event, Report);
handle_event(window.r(), listener, *cur_target, event);
if event.stop_immediate() {
return;
@ -47,8 +91,7 @@ fn dispatch_to_listeners(event: &Event, target: &EventTarget, chain: &[&EventTar
if let Some(listeners) = target.get_listeners(&type_) {
for listener in listeners {
// Explicitly drop any exception on the floor.
listener.call_or_handle_event(target, event, Report);
handle_event(window.r(), &listener, target, event);
if event.stop_immediate() {
return;
@ -70,8 +113,7 @@ fn dispatch_to_listeners(event: &Event, target: &EventTarget, chain: &[&EventTar
if let Some(listeners) = cur_target.get_listeners_for(&type_, ListenerPhase::Bubbling) {
event.set_current_target(cur_target);
for listener in &listeners {
// Explicitly drop any exception on the floor.
listener.call_or_handle_event(*cur_target, event, Report);
handle_event(window.r(), listener, *cur_target, event);
if event.stop_immediate() {
return;

19
components/script/dom/window.rs
View file

@ -1217,16 +1217,21 @@ impl Window {
sender.send(marker).unwrap();
}
pub fn set_devtools_timeline_marker(&self,
marker: TimelineMarkerType,
reply: IpcSender<TimelineMarker>) {
pub fn set_devtools_timeline_markers(&self,
markers: Vec<TimelineMarkerType>,
reply: IpcSender<TimelineMarker>) {
*self.devtools_marker_sender.borrow_mut() = Some(reply);
self.devtools_markers.borrow_mut().insert(marker);
self.devtools_markers.borrow_mut().extend(markers.into_iter());
}
pub fn drop_devtools_timeline_markers(&self) {
self.devtools_markers.borrow_mut().clear();
*self.devtools_marker_sender.borrow_mut() = None;
pub fn drop_devtools_timeline_markers(&self, markers: Vec<TimelineMarkerType>) {
let mut devtools_markers = self.devtools_markers.borrow_mut();
for marker in markers {
devtools_markers.remove(&marker);
}
if devtools_markers.is_empty() {
*self.devtools_marker_sender.borrow_mut() = None;
}
}
pub fn set_webdriver_script_chan(&self, chan: Option<IpcSender<WebDriverJSResult>>) {