- Revision
- 142329
- Author
- hara...@chromium.org
- Date
- 2013-02-08 16:20:17 -0800 (Fri, 08 Feb 2013)
Log Message
{FocusIn,FocusOut,Focus,Blur}EventDispatchMediator should be in FocusEvent.cpp
https://bugs.webkit.org/show_bug.cgi?id=109265
Reviewed by Dimitri Glazkov.
Conventionally we put XXXEventDispatchMediator to XXXEvent.cpp.
We should move {FocusIn,FocusOut,Focus,Blur}EventDispatchMediator to FocusEvent.cpp.
No tests. No change in behavior.
* dom/EventDispatchMediator.cpp:
* dom/EventDispatchMediator.h:
* dom/FocusEvent.cpp:
(WebCore::FocusEventDispatchMediator::create):
(WebCore):
(WebCore::FocusEventDispatchMediator::FocusEventDispatchMediator):
(WebCore::FocusEventDispatchMediator::dispatchEvent):
(WebCore::BlurEventDispatchMediator::create):
(WebCore::BlurEventDispatchMediator::BlurEventDispatchMediator):
(WebCore::BlurEventDispatchMediator::dispatchEvent):
(WebCore::FocusInEventDispatchMediator::create):
(WebCore::FocusInEventDispatchMediator::FocusInEventDispatchMediator):
(WebCore::FocusInEventDispatchMediator::dispatchEvent):
(WebCore::FocusOutEventDispatchMediator::create):
(WebCore::FocusOutEventDispatchMediator::FocusOutEventDispatchMediator):
(WebCore::FocusOutEventDispatchMediator::dispatchEvent):
* dom/FocusEvent.h:
(WebCore):
(FocusEventDispatchMediator):
(BlurEventDispatchMediator):
(FocusInEventDispatchMediator):
(FocusOutEventDispatchMediator):
* dom/UIEvent.cpp:
* dom/UIEvent.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (142328 => 142329)
--- trunk/Source/WebCore/ChangeLog 2013-02-09 00:13:47 UTC (rev 142328)
+++ trunk/Source/WebCore/ChangeLog 2013-02-09 00:20:17 UTC (rev 142329)
@@ -1,3 +1,40 @@
+2013-02-08 Kentaro Hara <hara...@chromium.org>
+
+ {FocusIn,FocusOut,Focus,Blur}EventDispatchMediator should be in FocusEvent.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=109265
+
+ Reviewed by Dimitri Glazkov.
+
+ Conventionally we put XXXEventDispatchMediator to XXXEvent.cpp.
+ We should move {FocusIn,FocusOut,Focus,Blur}EventDispatchMediator to FocusEvent.cpp.
+
+ No tests. No change in behavior.
+
+ * dom/EventDispatchMediator.cpp:
+ * dom/EventDispatchMediator.h:
+ * dom/FocusEvent.cpp:
+ (WebCore::FocusEventDispatchMediator::create):
+ (WebCore):
+ (WebCore::FocusEventDispatchMediator::FocusEventDispatchMediator):
+ (WebCore::FocusEventDispatchMediator::dispatchEvent):
+ (WebCore::BlurEventDispatchMediator::create):
+ (WebCore::BlurEventDispatchMediator::BlurEventDispatchMediator):
+ (WebCore::BlurEventDispatchMediator::dispatchEvent):
+ (WebCore::FocusInEventDispatchMediator::create):
+ (WebCore::FocusInEventDispatchMediator::FocusInEventDispatchMediator):
+ (WebCore::FocusInEventDispatchMediator::dispatchEvent):
+ (WebCore::FocusOutEventDispatchMediator::create):
+ (WebCore::FocusOutEventDispatchMediator::FocusOutEventDispatchMediator):
+ (WebCore::FocusOutEventDispatchMediator::dispatchEvent):
+ * dom/FocusEvent.h:
+ (WebCore):
+ (FocusEventDispatchMediator):
+ (BlurEventDispatchMediator):
+ (FocusInEventDispatchMediator):
+ (FocusOutEventDispatchMediator):
+ * dom/UIEvent.cpp:
+ * dom/UIEvent.h:
+
2013-02-08 Jer Noble <jer.no...@apple.com>
Unreviewed build fix. MSVC (and other compilers) need a default: case in switch statement.
Modified: trunk/Source/WebCore/dom/EventDispatchMediator.cpp (142328 => 142329)
--- trunk/Source/WebCore/dom/EventDispatchMediator.cpp 2013-02-09 00:13:47 UTC (rev 142328)
+++ trunk/Source/WebCore/dom/EventDispatchMediator.cpp 2013-02-09 00:20:17 UTC (rev 142329)
@@ -52,38 +52,4 @@
return dispatcher->dispatchEvent(m_event.get());
}
-PassRefPtr<FocusEventDispatchMediator> FocusEventDispatchMediator::create(PassRefPtr<Event> event, PassRefPtr<Node> oldFocusedNode)
-{
- return adoptRef(new FocusEventDispatchMediator(event, oldFocusedNode));
-}
-
-FocusEventDispatchMediator::FocusEventDispatchMediator(PassRefPtr<Event> event, PassRefPtr<Node> oldFocusedNode)
- : EventDispatchMediator(event)
- , m_oldFocusedNode(oldFocusedNode)
-{
-}
-
-bool FocusEventDispatchMediator::dispatchEvent(EventDispatcher* dispatcher) const
-{
- dispatcher->adjustRelatedTarget(event(), m_oldFocusedNode);
- return EventDispatchMediator::dispatchEvent(dispatcher);
-}
-
-PassRefPtr<BlurEventDispatchMediator> BlurEventDispatchMediator::create(PassRefPtr<Event> event, PassRefPtr<Node> newFocusedNode)
-{
- return adoptRef(new BlurEventDispatchMediator(event, newFocusedNode));
-}
-
-BlurEventDispatchMediator::BlurEventDispatchMediator(PassRefPtr<Event> event, PassRefPtr<Node> newFocusedNode)
- : EventDispatchMediator(event)
- , m_newFocusedNode(newFocusedNode)
-{
-}
-
-bool BlurEventDispatchMediator::dispatchEvent(EventDispatcher* dispatcher) const
-{
- dispatcher->adjustRelatedTarget(event(), m_newFocusedNode);
- return EventDispatchMediator::dispatchEvent(dispatcher);
-}
-
} // namespace WebCore
Modified: trunk/Source/WebCore/dom/EventDispatchMediator.h (142328 => 142329)
--- trunk/Source/WebCore/dom/EventDispatchMediator.h 2013-02-09 00:13:47 UTC (rev 142328)
+++ trunk/Source/WebCore/dom/EventDispatchMediator.h 2013-02-09 00:20:17 UTC (rev 142329)
@@ -57,24 +57,6 @@
RefPtr<Event> m_event;
};
-class FocusEventDispatchMediator : public EventDispatchMediator {
-public:
- static PassRefPtr<FocusEventDispatchMediator> create(PassRefPtr<Event>, PassRefPtr<Node> oldFocusedNode);
-private:
- FocusEventDispatchMediator(PassRefPtr<Event>, PassRefPtr<Node> oldFocusedNode);
- virtual bool dispatchEvent(EventDispatcher*) const OVERRIDE;
- RefPtr<Node> m_oldFocusedNode;
-};
-
-class BlurEventDispatchMediator : public EventDispatchMediator {
-public:
- static PassRefPtr<BlurEventDispatchMediator> create(PassRefPtr<Event>, PassRefPtr<Node> newFocusedNode);
-private:
- BlurEventDispatchMediator(PassRefPtr<Event>, PassRefPtr<Node> newFocusedNode);
- virtual bool dispatchEvent(EventDispatcher*) const OVERRIDE;
- RefPtr<Node> m_newFocusedNode;
-};
-
} // namespace WebCore
#endif // EventDispatchMediator_h
Modified: trunk/Source/WebCore/dom/FocusEvent.cpp (142328 => 142329)
--- trunk/Source/WebCore/dom/FocusEvent.cpp 2013-02-09 00:13:47 UTC (rev 142328)
+++ trunk/Source/WebCore/dom/FocusEvent.cpp 2013-02-09 00:20:17 UTC (rev 142329)
@@ -27,7 +27,9 @@
#include "FocusEvent.h"
#include "Event.h"
+#include "EventDispatcher.h"
#include "EventNames.h"
+#include "Node.h"
namespace WebCore {
@@ -62,4 +64,72 @@
{
}
+PassRefPtr<FocusEventDispatchMediator> FocusEventDispatchMediator::create(PassRefPtr<Event> event, PassRefPtr<Node> oldFocusedNode)
+{
+ return adoptRef(new FocusEventDispatchMediator(event, oldFocusedNode));
+}
+
+FocusEventDispatchMediator::FocusEventDispatchMediator(PassRefPtr<Event> event, PassRefPtr<Node> oldFocusedNode)
+ : EventDispatchMediator(event)
+ , m_oldFocusedNode(oldFocusedNode)
+{
+}
+
+bool FocusEventDispatchMediator::dispatchEvent(EventDispatcher* dispatcher) const
+{
+ dispatcher->adjustRelatedTarget(event(), m_oldFocusedNode);
+ return EventDispatchMediator::dispatchEvent(dispatcher);
+}
+
+PassRefPtr<BlurEventDispatchMediator> BlurEventDispatchMediator::create(PassRefPtr<Event> event, PassRefPtr<Node> newFocusedNode)
+{
+ return adoptRef(new BlurEventDispatchMediator(event, newFocusedNode));
+}
+
+BlurEventDispatchMediator::BlurEventDispatchMediator(PassRefPtr<Event> event, PassRefPtr<Node> newFocusedNode)
+ : EventDispatchMediator(event)
+ , m_newFocusedNode(newFocusedNode)
+{
+}
+
+bool BlurEventDispatchMediator::dispatchEvent(EventDispatcher* dispatcher) const
+{
+ dispatcher->adjustRelatedTarget(event(), m_newFocusedNode);
+ return EventDispatchMediator::dispatchEvent(dispatcher);
+}
+
+PassRefPtr<FocusInEventDispatchMediator> FocusInEventDispatchMediator::create(PassRefPtr<Event> event, PassRefPtr<Node> oldFocusedNode)
+{
+ return adoptRef(new FocusInEventDispatchMediator(event, oldFocusedNode));
+}
+
+FocusInEventDispatchMediator::FocusInEventDispatchMediator(PassRefPtr<Event> event, PassRefPtr<Node> oldFocusedNode)
+ : EventDispatchMediator(event)
+ , m_oldFocusedNode(oldFocusedNode)
+{
+}
+
+bool FocusInEventDispatchMediator::dispatchEvent(EventDispatcher* dispatcher) const
+{
+ dispatcher->adjustRelatedTarget(event(), m_oldFocusedNode);
+ return EventDispatchMediator::dispatchEvent(dispatcher);
+}
+
+PassRefPtr<FocusOutEventDispatchMediator> FocusOutEventDispatchMediator::create(PassRefPtr<Event> event, PassRefPtr<Node> newFocusedNode)
+{
+ return adoptRef(new FocusOutEventDispatchMediator(event, newFocusedNode));
+}
+
+FocusOutEventDispatchMediator::FocusOutEventDispatchMediator(PassRefPtr<Event> event, PassRefPtr<Node> newFocusedNode)
+ : EventDispatchMediator(event)
+ , m_newFocusedNode(newFocusedNode)
+{
+}
+
+bool FocusOutEventDispatchMediator::dispatchEvent(EventDispatcher* dispatcher) const
+{
+ dispatcher->adjustRelatedTarget(event(), m_newFocusedNode);
+ return EventDispatchMediator::dispatchEvent(dispatcher);
+}
+
} // namespace WebCore
Modified: trunk/Source/WebCore/dom/FocusEvent.h (142328 => 142329)
--- trunk/Source/WebCore/dom/FocusEvent.h 2013-02-09 00:13:47 UTC (rev 142328)
+++ trunk/Source/WebCore/dom/FocusEvent.h 2013-02-09 00:20:17 UTC (rev 142329)
@@ -31,6 +31,8 @@
namespace WebCore {
+class Node;
+
struct FocusEventInit : public UIEventInit {
FocusEventInit();
@@ -74,6 +76,42 @@
return static_cast<FocusEvent*>(event);
}
+class FocusEventDispatchMediator : public EventDispatchMediator {
+public:
+ static PassRefPtr<FocusEventDispatchMediator> create(PassRefPtr<Event>, PassRefPtr<Node> oldFocusedNode);
+private:
+ FocusEventDispatchMediator(PassRefPtr<Event>, PassRefPtr<Node> oldFocusedNode);
+ virtual bool dispatchEvent(EventDispatcher*) const OVERRIDE;
+ RefPtr<Node> m_oldFocusedNode;
+};
+
+class BlurEventDispatchMediator : public EventDispatchMediator {
+public:
+ static PassRefPtr<BlurEventDispatchMediator> create(PassRefPtr<Event>, PassRefPtr<Node> newFocusedNode);
+private:
+ BlurEventDispatchMediator(PassRefPtr<Event>, PassRefPtr<Node> newFocusedNode);
+ virtual bool dispatchEvent(EventDispatcher*) const OVERRIDE;
+ RefPtr<Node> m_newFocusedNode;
+};
+
+class FocusInEventDispatchMediator : public EventDispatchMediator {
+public:
+ static PassRefPtr<FocusInEventDispatchMediator> create(PassRefPtr<Event>, PassRefPtr<Node> oldFocusedNode);
+private:
+ explicit FocusInEventDispatchMediator(PassRefPtr<Event>, PassRefPtr<Node> oldFocusedNode);
+ virtual bool dispatchEvent(EventDispatcher*) const OVERRIDE;
+ RefPtr<Node> m_oldFocusedNode;
+};
+
+class FocusOutEventDispatchMediator : public EventDispatchMediator {
+public:
+ static PassRefPtr<FocusOutEventDispatchMediator> create(PassRefPtr<Event>, PassRefPtr<Node> newFocusedNode);
+private:
+ explicit FocusOutEventDispatchMediator(PassRefPtr<Event>, PassRefPtr<Node> newFocusedNode);
+ virtual bool dispatchEvent(EventDispatcher*) const OVERRIDE;
+ RefPtr<Node> m_newFocusedNode;
+};
+
} // namespace WebCore
#endif // FocusEvent_h
Modified: trunk/Source/WebCore/dom/UIEvent.cpp (142328 => 142329)
--- trunk/Source/WebCore/dom/UIEvent.cpp 2013-02-09 00:13:47 UTC (rev 142328)
+++ trunk/Source/WebCore/dom/UIEvent.cpp 2013-02-09 00:20:17 UTC (rev 142329)
@@ -115,38 +115,4 @@
return 0;
}
-PassRefPtr<FocusInEventDispatchMediator> FocusInEventDispatchMediator::create(PassRefPtr<Event> event, PassRefPtr<Node> oldFocusedNode)
-{
- return adoptRef(new FocusInEventDispatchMediator(event, oldFocusedNode));
-}
-
-FocusInEventDispatchMediator::FocusInEventDispatchMediator(PassRefPtr<Event> event, PassRefPtr<Node> oldFocusedNode)
- : EventDispatchMediator(event)
- , m_oldFocusedNode(oldFocusedNode)
-{
-}
-
-bool FocusInEventDispatchMediator::dispatchEvent(EventDispatcher* dispatcher) const
-{
- dispatcher->adjustRelatedTarget(event(), m_oldFocusedNode);
- return EventDispatchMediator::dispatchEvent(dispatcher);
-}
-
-PassRefPtr<FocusOutEventDispatchMediator> FocusOutEventDispatchMediator::create(PassRefPtr<Event> event, PassRefPtr<Node> newFocusedNode)
-{
- return adoptRef(new FocusOutEventDispatchMediator(event, newFocusedNode));
-}
-
-FocusOutEventDispatchMediator::FocusOutEventDispatchMediator(PassRefPtr<Event> event, PassRefPtr<Node> newFocusedNode)
- : EventDispatchMediator(event)
- , m_newFocusedNode(newFocusedNode)
-{
-}
-
-bool FocusOutEventDispatchMediator::dispatchEvent(EventDispatcher* dispatcher) const
-{
- dispatcher->adjustRelatedTarget(event(), m_newFocusedNode);
- return EventDispatchMediator::dispatchEvent(dispatcher);
-}
-
} // namespace WebCore
Modified: trunk/Source/WebCore/dom/UIEvent.h (142328 => 142329)
--- trunk/Source/WebCore/dom/UIEvent.h 2013-02-09 00:13:47 UTC (rev 142328)
+++ trunk/Source/WebCore/dom/UIEvent.h 2013-02-09 00:20:17 UTC (rev 142329)
@@ -84,24 +84,6 @@
int m_detail;
};
-class FocusInEventDispatchMediator : public EventDispatchMediator {
-public:
- static PassRefPtr<FocusInEventDispatchMediator> create(PassRefPtr<Event>, PassRefPtr<Node> oldFocusedNode);
-private:
- explicit FocusInEventDispatchMediator(PassRefPtr<Event>, PassRefPtr<Node> oldFocusedNode);
- virtual bool dispatchEvent(EventDispatcher*) const OVERRIDE;
- RefPtr<Node> m_oldFocusedNode;
-};
-
-class FocusOutEventDispatchMediator : public EventDispatchMediator {
-public:
- static PassRefPtr<FocusOutEventDispatchMediator> create(PassRefPtr<Event>, PassRefPtr<Node> newFocusedNode);
-private:
- explicit FocusOutEventDispatchMediator(PassRefPtr<Event>, PassRefPtr<Node> newFocusedNode);
- virtual bool dispatchEvent(EventDispatcher*) const OVERRIDE;
- RefPtr<Node> m_newFocusedNode;
-};
-
} // namespace WebCore
#endif // UIEvent_h
