Changeset 92256 in webkit

Timestamp:

Aug 2, 2011 8:25:57 PM (13 years ago)

Author:

hayato@chromium.org

Message:

Make EventDispatchMediator RefCounted.
​https://bugs.webkit.org/show_bug.cgi?id=65529

Reviewed by Dimitri Glazkov.

Make EventDispatchMediator RefCounted so that it can be enqueued into a
ScopedEventQueue and called later.
A necessary change for ScopedEventQueue should be addressed in another patch.

No changes to functionality so no new tests.

• dom/Event.cpp:

(WebCore::EventDispatchMediator::create):

• dom/Event.h:
• dom/EventDispatcher.cpp:

(WebCore::EventDispatcher::dispatchEvent):

• dom/EventDispatcher.h:
• dom/KeyboardEvent.cpp:

(WebCore::KeyboardEventDispatchMediator::create):

• dom/KeyboardEvent.h:
• dom/MouseEvent.cpp:

(WebCore::MouseEventDispatchMediator::create):

• dom/MouseEvent.h:
• dom/Node.cpp:

(WebCore::Node::dispatchEvent):
(WebCore::Node::dispatchKeyEvent):
(WebCore::Node::dispatchMouseEvent):
(WebCore::Node::dispatchWheelEvent):

• dom/WheelEvent.cpp:

(WebCore::WheelEventDispatchMediator::create):

• dom/WheelEvent.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Event.cpp (modified) (1 diff)
• dom/Event.h (modified) (1 diff)
• dom/EventDispatcher.cpp (modified) (1 diff)
• dom/EventDispatcher.h (modified) (1 diff)
• dom/KeyboardEvent.cpp (modified) (1 diff)
• dom/KeyboardEvent.h (modified) (1 diff)
• dom/MouseEvent.cpp (modified) (1 diff)
• dom/MouseEvent.h (modified) (1 diff)
• dom/Node.cpp (modified) (4 diffs)
• dom/WheelEvent.cpp (modified) (1 diff)
• dom/WheelEvent.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-02  Hayato Ito  <hayato@chromium.org>
+
+        Make EventDispatchMediator RefCounted.
+        https://bugs.webkit.org/show_bug.cgi?id=65529
+
+        Reviewed by Dimitri Glazkov.
+
+        Make EventDispatchMediator RefCounted so that it can be enqueued into a
+        ScopedEventQueue and called later.
+        A necessary change for ScopedEventQueue should be addressed in another patch.
+
+        No changes to functionality so no new tests.
+
+        * dom/Event.cpp:
+        (WebCore::EventDispatchMediator::create):
+        * dom/Event.h:
+        * dom/EventDispatcher.cpp:
+        (WebCore::EventDispatcher::dispatchEvent):
+        * dom/EventDispatcher.h:
+        * dom/KeyboardEvent.cpp:
+        (WebCore::KeyboardEventDispatchMediator::create):
+        * dom/KeyboardEvent.h:
+        * dom/MouseEvent.cpp:
+        (WebCore::MouseEventDispatchMediator::create):
+        * dom/MouseEvent.h:
+        * dom/Node.cpp:
+        (WebCore::Node::dispatchEvent):
+        (WebCore::Node::dispatchKeyEvent):
+        (WebCore::Node::dispatchMouseEvent):
+        (WebCore::Node::dispatchWheelEvent):
+        * dom/WheelEvent.cpp:
+        (WebCore::WheelEventDispatchMediator::create):
+        * dom/WheelEvent.h:
+
 2011-08-02  David Reveman  <reveman@chromium.org>
 

trunk/Source/WebCore/dom/Event.cpp

@@ -290 +290 @@
 }
 
+PassRefPtr<EventDispatchMediator> EventDispatchMediator::create(PassRefPtr<Event> event)
+{
+    return adoptRef(new EventDispatchMediator(event));
+}
+
 EventDispatchMediator::EventDispatchMediator(PassRefPtr<Event> event)
     : m_event(event)

trunk/Source/WebCore/dom/Event.h

@@ -200 +200 @@
     };
 
-class EventDispatchMediator {
+class EventDispatchMediator : public RefCounted<Event> {
 public:
+    static PassRefPtr<EventDispatchMediator> create(PassRefPtr<Event>);
+    virtual ~EventDispatchMediator();
+
+    virtual bool dispatchEvent(EventDispatcher*) const;
+
+protected:
     explicit EventDispatchMediator(PassRefPtr<Event>);
-    virtual ~EventDispatchMediator();
-
-    virtual bool dispatchEvent(EventDispatcher*) const;
-
-protected:
     EventDispatchMediator();
 

trunk/Source/WebCore/dom/EventDispatcher.cpp

@@ -47 +47 @@
 static HashSet<Node*>* gNodesDispatchingSimulatedClicks = 0;
 
-bool EventDispatcher::dispatchEvent(Node* node, const EventDispatchMediator& mediator)
+bool EventDispatcher::dispatchEvent(Node* node, PassRefPtr<EventDispatchMediator> mediator)
 {
     ASSERT(!eventDispatchForbidden());
 
     EventDispatcher dispatcher(node);
-    return mediator.dispatchEvent(&dispatcher);
+    return mediator->dispatchEvent(&dispatcher);
 }
 

trunk/Source/WebCore/dom/EventDispatcher.h

@@ -49 +49 @@
 class EventDispatcher {
 public:
-    static bool dispatchEvent(Node*, const EventDispatchMediator&);
+    static bool dispatchEvent(Node*, PassRefPtr<EventDispatchMediator>);
     static void dispatchScopedEvent(Node*, PassRefPtr<Event>);
+    static void dispatchScopedEventDispatchMediator(Node*, PassRefPtr<EventDispatchMediator>);
 
     static void dispatchSimulatedClick(Node*, PassRefPtr<Event> underlyingEvent, bool sendMouseEvents, bool showPressedLook);

trunk/Source/WebCore/dom/KeyboardEvent.cpp

@@ -160 +160 @@
 }
 
+PassRefPtr<KeyboardEventDispatchMediator> KeyboardEventDispatchMediator::create(PassRefPtr<KeyboardEvent> event)
+{
+    return adoptRef(new KeyboardEventDispatchMediator(event));
+}
+
 KeyboardEventDispatchMediator::KeyboardEventDispatchMediator(PassRefPtr<KeyboardEvent> event)
     : EventDispatchMediator(event)

trunk/Source/WebCore/dom/KeyboardEvent.h

@@ -118 +118 @@
 class KeyboardEventDispatchMediator : public EventDispatchMediator {
 public:
+    static PassRefPtr<KeyboardEventDispatchMediator> create(PassRefPtr<KeyboardEvent>);
+private:
     explicit KeyboardEventDispatchMediator(PassRefPtr<KeyboardEvent>);
-
-private:
     virtual bool dispatchEvent(EventDispatcher*) const;
 };

trunk/Source/WebCore/dom/MouseEvent.cpp

@@ -160 +160 @@
 }
 
+PassRefPtr<MouseEventDispatchMediator> MouseEventDispatchMediator::create(PassRefPtr<MouseEvent> mouseEvent)
+{
+    return adoptRef(new MouseEventDispatchMediator(mouseEvent));
+}
+
 MouseEventDispatchMediator::MouseEventDispatchMediator(PassRefPtr<MouseEvent> mouseEvent)
     : EventDispatchMediator(mouseEvent)

trunk/Source/WebCore/dom/MouseEvent.h

@@ -101 +101 @@
 class MouseEventDispatchMediator : public EventDispatchMediator {
 public:
-    explicit MouseEventDispatchMediator(PassRefPtr<MouseEvent>);
+    static PassRefPtr<MouseEventDispatchMediator> create(PassRefPtr<MouseEvent>);
 
 private:
+    explicit MouseEventDispatchMediator(PassRefPtr<MouseEvent>);
     MouseEvent* event() const;
 

trunk/Source/WebCore/dom/Node.cpp

@@ -2715 +2715 @@
 bool Node::dispatchEvent(PassRefPtr<Event> event)
 {
-    return EventDispatcher::dispatchEvent(this, EventDispatchMediator(event));
+    return EventDispatcher::dispatchEvent(this, EventDispatchMediator::create(event));
 }
 
@@ -2747 +2747 @@
 bool Node::dispatchKeyEvent(const PlatformKeyboardEvent& event)
 {
-    return EventDispatcher::dispatchEvent(this, KeyboardEventDispatchMediator(KeyboardEvent::create(event, document()->defaultView())));
+    return EventDispatcher::dispatchEvent(this, KeyboardEventDispatchMediator::create(KeyboardEvent::create(event, document()->defaultView())));
 }
 
@@ -2753 +2753 @@
     int detail, Node* relatedTarget)
 {
-    return EventDispatcher::dispatchEvent(this, MouseEventDispatchMediator(MouseEvent::create(eventType, document()->defaultView(), event, detail, relatedTarget)));
+    return EventDispatcher::dispatchEvent(this, MouseEventDispatchMediator::create(MouseEvent::create(eventType, document()->defaultView(), event, detail, relatedTarget)));
 }
 
@@ -2763 +2763 @@
 bool Node::dispatchWheelEvent(const PlatformWheelEvent& event)
 {
-    return EventDispatcher::dispatchEvent(this, WheelEventDispatchMediator(event, document()->defaultView()));
+    return EventDispatcher::dispatchEvent(this, WheelEventDispatchMediator::create(event, document()->defaultView()));
 }
 

trunk/Source/WebCore/dom/WheelEvent.cpp

@@ -92 +92 @@
 }
 
+PassRefPtr<WheelEventDispatchMediator> WheelEventDispatchMediator::create(const PlatformWheelEvent& event, PassRefPtr<AbstractView> view)
+{
+    return adoptRef(new WheelEventDispatchMediator(event, view));
+}
+
 WheelEventDispatchMediator::WheelEventDispatchMediator(const PlatformWheelEvent& event, PassRefPtr<AbstractView> view)
 {

trunk/Source/WebCore/dom/WheelEvent.h

@@ -84 +84 @@
 class WheelEventDispatchMediator : public EventDispatchMediator {
 public:
+    static PassRefPtr<WheelEventDispatchMediator> create(const PlatformWheelEvent&, PassRefPtr<AbstractView>);
+private:
     WheelEventDispatchMediator(const PlatformWheelEvent&, PassRefPtr<AbstractView>);
-
-private:
     WheelEvent* event() const;
     virtual bool dispatchEvent(EventDispatcher*) const;