Merge WebKit at r84325: Initial merge by git.

Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b

1 files changed, 13 insertions, 9 deletions

diff --git a/Source/WebCore/dom/EventDispatcher.h b/Source/WebCore/dom/EventDispatcher.h
index d43127f..88e9756 100644
--- a/Source/WebCore/dom/EventDispatcher.h
+++ b/Source/WebCore/dom/EventDispatcher.h
@@ -33,6 +33,7 @@ namespace WebCore {
 
 class Event;
 class EventContext;
+class EventDispatchMediator;
 class EventTarget;
 class FrameView;
 class Node;
@@ -47,32 +48,35 @@ enum EventDispatchBehavior {
 
 class EventDispatcher {
 public:
-    static bool dispatchEvent(Node*, PassRefPtr<Event>);
+    static bool dispatchEvent(Node*, const EventDispatchMediator&);
     static void dispatchScopedEvent(Node*, PassRefPtr<Event>);
 
-    static bool dispatchMouseEvent(Node*, const PlatformMouseEvent&, const AtomicString& eventType, int clickCount = 0, Node* relatedTarget = 0);
     static void dispatchSimulatedClick(Node*, PassRefPtr<Event> underlyingEvent, bool sendMouseEvents, bool showPressedLook);
-    static void dispatchWheelEvent(Node*, PlatformWheelEvent&);
 
     bool dispatchEvent(PassRefPtr<Event>);
+    PassRefPtr<EventTarget> adjustRelatedTarget(Event*, PassRefPtr<EventTarget>);
+    Node* node() const;
+
 private:
     EventDispatcher(Node*);
 
+    PassRefPtr<EventTarget> adjustToShadowBoundaries(PassRefPtr<Node> relatedTarget, const Vector<Node*> relatedTargetAncestors);
     EventDispatchBehavior determineDispatchBehavior(Event*);
-    void getEventAncestors(EventTarget* originalTarget, EventDispatchBehavior);
+    void ensureEventAncestors(Event*);
     const EventContext* topEventContext();
-    bool ancestorsInitialized() const;
-
-    bool dispatchMouseEvent(const AtomicString& eventType, int button, int detail,
-        int pageX, int pageY, int screenX, int screenY, bool ctrlKey, bool altKey, bool shiftKey, bool metaKey,
-        bool isSimulated, Node* relatedTargetArg, PassRefPtr<Event> underlyingEvent);
 
     Vector<EventContext> m_ancestors;
     RefPtr<Node> m_node;
     RefPtr<EventTarget> m_originalTarget;
     RefPtr<FrameView> m_view;
+    bool m_ancestorsInitialized;
 };
 
+inline Node* EventDispatcher::node() const
+{
+    return m_node.get();
+}
+
 }
 
 #endif