aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--components/script/dom/eventtarget.rs8
-rw-r--r--components/script/script_task.rs2
2 files changed, 5 insertions, 5 deletions
diff --git a/components/script/dom/eventtarget.rs b/components/script/dom/eventtarget.rs
index 3b353bf27de..3293a099276 100644
--- a/components/script/dom/eventtarget.rs
+++ b/components/script/dom/eventtarget.rs
@@ -108,7 +108,7 @@ impl EventTarget {
pub trait EventTargetHelpers {
fn dispatch_event_with_target(self,
- target: Option<JSRef<EventTarget>>,
+ target: JSRef<EventTarget>,
event: JSRef<Event>) -> bool;
fn dispatch_event(self, event: JSRef<Event>) -> bool;
fn set_inline_event_listener(self,
@@ -130,13 +130,13 @@ pub trait EventTargetHelpers {
impl<'a> EventTargetHelpers for JSRef<'a, EventTarget> {
fn dispatch_event_with_target(self,
- target: Option<JSRef<EventTarget>>,
+ target: JSRef<EventTarget>,
event: JSRef<Event>) -> bool {
- dispatch_event(self, target, event)
+ dispatch_event(self, Some(target), event)
}
fn dispatch_event(self, event: JSRef<Event>) -> bool {
- self.dispatch_event_with_target(None, event)
+ dispatch_event(self, None, event)
}
fn set_inline_event_listener(self,
diff --git a/components/script/script_task.rs b/components/script/script_task.rs
index c5c924349cc..2f2bb5f0bc2 100644
--- a/components/script/script_task.rs
+++ b/components/script/script_task.rs
@@ -859,7 +859,7 @@ impl ScriptTask {
EventBubbles::DoesNotBubble,
EventCancelable::NotCancelable).root();
let wintarget: JSRef<EventTarget> = EventTargetCast::from_ref(*window);
- let _ = wintarget.dispatch_event_with_target(Some(doctarget), *event);
+ let _ = wintarget.dispatch_event_with_target(doctarget, *event);
*page.fragment_name.borrow_mut() = final_url.fragment.clone();