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

Replace Root::deref() calls by Root::r() calls where possible.

Browse source 
This changes those calls that were already sound.
This commit is contained in:
Ms2ger 2015-01-01 12:20:52 +01:00
parent c9f26dfd59
commit 1dad710063
61 changed files with 479 additions and 471 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -43,12 +43,12 @@ pub fn dispatch_event<'a, 'b>(target: JSRef<'a, EventTarget>,
/* capturing */
for cur_target in chain.as_slice().iter().rev() {
let stopped = match cur_target.get_listeners_for(type_.as_slice(), ListenerPhase::Capturing) {
let stopped = match cur_target.r().get_listeners_for(type_.as_slice(), ListenerPhase::Capturing) {
Some(listeners) => {
event.set_current_target(cur_target.deref().clone());
event.set_current_target(cur_target.r());
for listener in listeners.iter() {
// Explicitly drop any exception on the floor.
let _ = listener.HandleEvent_(**cur_target, event, ReportExceptions);
let _ = listener.HandleEvent_(cur_target.r(), event, ReportExceptions);
if event.stop_immediate() {
break;
@ -88,12 +88,12 @@ pub fn dispatch_event<'a, 'b>(target: JSRef<'a, EventTarget>,
event.set_phase(EventPhase::Bubbling);
for cur_target in chain.iter() {
let stopped = match cur_target.get_listeners_for(type_.as_slice(), ListenerPhase::Bubbling) {
let stopped = match cur_target.r().get_listeners_for(type_.as_slice(), ListenerPhase::Bubbling) {
Some(listeners) => {
event.set_current_target(cur_target.deref().clone());
event.set_current_target(cur_target.r());
for listener in listeners.iter() {
// Explicitly drop any exception on the floor.
let _ = listener.HandleEvent_(**cur_target, event, ReportExceptions);
let _ = listener.HandleEvent_(cur_target.r(), event, ReportExceptions);
if event.stop_immediate() {
break;
@ -114,7 +114,7 @@ pub fn dispatch_event<'a, 'b>(target: JSRef<'a, EventTarget>,
let target = event.GetTarget().root();
match target {
Some(target) => {
let node: Option<JSRef<Node>> = NodeCast::to_ref(*target);
let node: Option<JSRef<Node>> = NodeCast::to_ref(target.r());
match node {
Some(node) => {
let vtable = vtable_for(&node);