2 files changed, 26 insertions, 3 deletions
diff --git a/src/components/script/dom/eventdispatcher.rs b/src/components/script/dom/eventdispatcher.rs
index 2c3ccc0da32..7edc4f5df1d 100644
--- a/src/components/script/dom/eventdispatcher.rs
+++ b/src/components/script/dom/eventdispatcher.rs
@@ -9,12 +9,14 @@ use dom::node::AbstractNode;
 use servo_util::tree::{TreeNodeRef};
 
 // See http://dom.spec.whatwg.org/#concept-event-dispatch for the full dispatch algorithm
-pub fn dispatch_event(target: AbstractEventTarget, event: AbstractEvent) -> bool {
+pub fn dispatch_event(target: AbstractEventTarget,
+                      pseudo_target: Option<AbstractEventTarget>,
+                      event: AbstractEvent) -> bool {
     assert!(!event.event().dispatching);
 
     {
         let event = event.mut_event();
-        event.target = Some(target);
+        event.target = Some(pseudo_target.unwrap_or(target));
         event.dispatching = true;
     }
 
diff --git a/src/components/script/dom/eventtarget.rs b/src/components/script/dom/eventtarget.rs
index ae87a5d73ac..77753fd3b5a 100644
--- a/src/components/script/dom/eventtarget.rs
+++ b/src/components/script/dom/eventtarget.rs
@@ -5,9 +5,11 @@
 use dom::bindings::utils::{Reflectable, Reflector, DOMString, Fallible};
 use dom::bindings::utils::{null_str_as_word_null, InvalidState};
 use dom::bindings::codegen::EventListenerBinding::EventListener;
+use dom::document::AbstractDocument;
 use dom::event::AbstractEvent;
 use dom::eventdispatcher::dispatch_event;
 use dom::node::{AbstractNode, ScriptView};
+use dom::window::Window;
 
 use std::cast;
 use std::hashmap::HashMap;
@@ -54,6 +56,18 @@ impl AbstractEventTarget {
         }
     }
 
+    pub fn from_window(window: @mut Window) -> AbstractEventTarget {
+        AbstractEventTarget {
+            eventtarget: unsafe { cast::transmute(window) }
+        }
+    }
+
+    pub fn from_document(document: AbstractDocument) -> AbstractEventTarget {
+        unsafe {
+            cast::transmute(document)
+        }
+    }
+
     pub fn type_id(&self) -> EventTargetTypeId {
         self.eventtarget().type_id
     }
@@ -164,10 +178,17 @@ impl EventTarget {
     }
 
     pub fn DispatchEvent(&self, abstract_self: AbstractEventTarget, event: AbstractEvent) -> Fallible<bool> {
+        self.dispatch_event_with_target(abstract_self, None, event)
+    }
+
+    pub fn dispatch_event_with_target(&self,
+                                      abstract_self: AbstractEventTarget,
+                                      abstract_target: Option<AbstractEventTarget>,
+                                      event: AbstractEvent) -> Fallible<bool> {
         if event.event().dispatching || !event.event().initialized {
             return Err(InvalidState);
         }
-        Ok(dispatch_event(abstract_self, event))
+        Ok(dispatch_event(abstract_self, abstract_target, event))
     }
 }