Changeset 142329 in webkit


Ignore:
Timestamp:
Feb 8, 2013 4:20:17 PM (11 years ago)
Author:
haraken@chromium.org
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:
Location:
trunk/Source/WebCore
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r142328 r142329  
     12013-02-08  Kentaro Hara  <haraken@chromium.org>
     2
     3        {FocusIn,FocusOut,Focus,Blur}EventDispatchMediator should be in FocusEvent.cpp
     4        https://bugs.webkit.org/show_bug.cgi?id=109265
     5
     6        Reviewed by Dimitri Glazkov.
     7
     8        Conventionally we put XXXEventDispatchMediator to XXXEvent.cpp.
     9        We should move {FocusIn,FocusOut,Focus,Blur}EventDispatchMediator to FocusEvent.cpp.
     10
     11        No tests. No change in behavior.
     12
     13        * dom/EventDispatchMediator.cpp:
     14        * dom/EventDispatchMediator.h:
     15        * dom/FocusEvent.cpp:
     16        (WebCore::FocusEventDispatchMediator::create):
     17        (WebCore):
     18        (WebCore::FocusEventDispatchMediator::FocusEventDispatchMediator):
     19        (WebCore::FocusEventDispatchMediator::dispatchEvent):
     20        (WebCore::BlurEventDispatchMediator::create):
     21        (WebCore::BlurEventDispatchMediator::BlurEventDispatchMediator):
     22        (WebCore::BlurEventDispatchMediator::dispatchEvent):
     23        (WebCore::FocusInEventDispatchMediator::create):
     24        (WebCore::FocusInEventDispatchMediator::FocusInEventDispatchMediator):
     25        (WebCore::FocusInEventDispatchMediator::dispatchEvent):
     26        (WebCore::FocusOutEventDispatchMediator::create):
     27        (WebCore::FocusOutEventDispatchMediator::FocusOutEventDispatchMediator):
     28        (WebCore::FocusOutEventDispatchMediator::dispatchEvent):
     29        * dom/FocusEvent.h:
     30        (WebCore):
     31        (FocusEventDispatchMediator):
     32        (BlurEventDispatchMediator):
     33        (FocusInEventDispatchMediator):
     34        (FocusOutEventDispatchMediator):
     35        * dom/UIEvent.cpp:
     36        * dom/UIEvent.h:
     37
    1382013-02-08  Jer Noble  <jer.noble@apple.com>
    239

  • trunk/Source/WebCore/dom/EventDispatchMediator.cpp

    r142240 r142329  
    5353}
    5454
    55 PassRefPtr<FocusEventDispatchMediator> FocusEventDispatchMediator::create(PassRefPtr<Event> event, PassRefPtr<Node> oldFocusedNode)
    56 {
    57     return adoptRef(new FocusEventDispatchMediator(event, oldFocusedNode));
    58 }
    59 
    60 FocusEventDispatchMediator::FocusEventDispatchMediator(PassRefPtr<Event> event, PassRefPtr<Node> oldFocusedNode)
    61     : EventDispatchMediator(event)
    62     , m_oldFocusedNode(oldFocusedNode)
    63 {
    64 }
    65 
    66 bool FocusEventDispatchMediator::dispatchEvent(EventDispatcher* dispatcher) const
    67 {
    68     dispatcher->adjustRelatedTarget(event(), m_oldFocusedNode);
    69     return EventDispatchMediator::dispatchEvent(dispatcher);
    70 }
    71 
    72 PassRefPtr<BlurEventDispatchMediator> BlurEventDispatchMediator::create(PassRefPtr<Event> event, PassRefPtr<Node> newFocusedNode)
    73 {
    74     return adoptRef(new BlurEventDispatchMediator(event, newFocusedNode));
    75 }
    76 
    77 BlurEventDispatchMediator::BlurEventDispatchMediator(PassRefPtr<Event> event, PassRefPtr<Node> newFocusedNode)
    78     : EventDispatchMediator(event)
    79     , m_newFocusedNode(newFocusedNode)
    80 {
    81 }
    82 
    83 bool BlurEventDispatchMediator::dispatchEvent(EventDispatcher* dispatcher) const
    84 {
    85     dispatcher->adjustRelatedTarget(event(), m_newFocusedNode);
    86     return EventDispatchMediator::dispatchEvent(dispatcher);
    87 }
    88 
    8955} // namespace WebCore

  • trunk/Source/WebCore/dom/EventDispatchMediator.h

    r142240 r142329  
    5858};
    5959
    60 class FocusEventDispatchMediator : public EventDispatchMediator {
    61 public:
    62     static PassRefPtr<FocusEventDispatchMediator> create(PassRefPtr<Event>, PassRefPtr<Node> oldFocusedNode);
    63 private:
    64     FocusEventDispatchMediator(PassRefPtr<Event>, PassRefPtr<Node> oldFocusedNode);
    65     virtual bool dispatchEvent(EventDispatcher*) const OVERRIDE;
    66     RefPtr<Node> m_oldFocusedNode;
    67 };
    68 
    69 class BlurEventDispatchMediator : public EventDispatchMediator {
    70 public:
    71     static PassRefPtr<BlurEventDispatchMediator> create(PassRefPtr<Event>, PassRefPtr<Node> newFocusedNode);
    72 private:
    73     BlurEventDispatchMediator(PassRefPtr<Event>, PassRefPtr<Node> newFocusedNode);
    74     virtual bool dispatchEvent(EventDispatcher*) const OVERRIDE;
    75     RefPtr<Node> m_newFocusedNode;
    76 };
    77 
    7860} // namespace WebCore
    7961

  • trunk/Source/WebCore/dom/FocusEvent.cpp

    r142205 r142329  
    2828
    2929#include "Event.h"
     30#include "EventDispatcher.h"
    3031#include "EventNames.h"
     32#include "Node.h"
    3133
    3234namespace WebCore {
    … …  
    6365}
    6466
     67PassRefPtr<FocusEventDispatchMediator> FocusEventDispatchMediator::create(PassRefPtr<Event> event, PassRefPtr<Node> oldFocusedNode)
     68{
     69    return adoptRef(new FocusEventDispatchMediator(event, oldFocusedNode));
     70}
     71
     72FocusEventDispatchMediator::FocusEventDispatchMediator(PassRefPtr<Event> event, PassRefPtr<Node> oldFocusedNode)
     73    : EventDispatchMediator(event)
     74    , m_oldFocusedNode(oldFocusedNode)
     75{
     76}
     77
     78bool FocusEventDispatchMediator::dispatchEvent(EventDispatcher* dispatcher) const
     79{
     80    dispatcher->adjustRelatedTarget(event(), m_oldFocusedNode);
     81    return EventDispatchMediator::dispatchEvent(dispatcher);
     82}
     83
     84PassRefPtr<BlurEventDispatchMediator> BlurEventDispatchMediator::create(PassRefPtr<Event> event, PassRefPtr<Node> newFocusedNode)
     85{
     86    return adoptRef(new BlurEventDispatchMediator(event, newFocusedNode));
     87}
     88
     89BlurEventDispatchMediator::BlurEventDispatchMediator(PassRefPtr<Event> event, PassRefPtr<Node> newFocusedNode)
     90    : EventDispatchMediator(event)
     91    , m_newFocusedNode(newFocusedNode)
     92{
     93}
     94
     95bool BlurEventDispatchMediator::dispatchEvent(EventDispatcher* dispatcher) const
     96{
     97    dispatcher->adjustRelatedTarget(event(), m_newFocusedNode);
     98    return EventDispatchMediator::dispatchEvent(dispatcher);
     99}
     100
     101PassRefPtr<FocusInEventDispatchMediator> FocusInEventDispatchMediator::create(PassRefPtr<Event> event, PassRefPtr<Node> oldFocusedNode)
     102{
     103    return adoptRef(new FocusInEventDispatchMediator(event, oldFocusedNode));
     104}
     105
     106FocusInEventDispatchMediator::FocusInEventDispatchMediator(PassRefPtr<Event> event, PassRefPtr<Node> oldFocusedNode)
     107    : EventDispatchMediator(event)
     108    , m_oldFocusedNode(oldFocusedNode)
     109{
     110}
     111
     112bool FocusInEventDispatchMediator::dispatchEvent(EventDispatcher* dispatcher) const
     113{
     114    dispatcher->adjustRelatedTarget(event(), m_oldFocusedNode);
     115    return EventDispatchMediator::dispatchEvent(dispatcher);
     116}
     117
     118PassRefPtr<FocusOutEventDispatchMediator> FocusOutEventDispatchMediator::create(PassRefPtr<Event> event, PassRefPtr<Node> newFocusedNode)
     119{
     120    return adoptRef(new FocusOutEventDispatchMediator(event, newFocusedNode));
     121}
     122
     123FocusOutEventDispatchMediator::FocusOutEventDispatchMediator(PassRefPtr<Event> event, PassRefPtr<Node> newFocusedNode)
     124    : EventDispatchMediator(event)
     125    , m_newFocusedNode(newFocusedNode)
     126{
     127}
     128
     129bool FocusOutEventDispatchMediator::dispatchEvent(EventDispatcher* dispatcher) const
     130{
     131    dispatcher->adjustRelatedTarget(event(), m_newFocusedNode);
     132    return EventDispatchMediator::dispatchEvent(dispatcher);
     133}
     134
    65135} // namespace WebCore

  • trunk/Source/WebCore/dom/FocusEvent.h

    r142205 r142329  
    3131
    3232namespace WebCore {
     33
     34class Node;
    3335
    3436struct FocusEventInit : public UIEventInit {
    … …  
    7577}
    7678
     79class FocusEventDispatchMediator : public EventDispatchMediator {
     80public:
     81    static PassRefPtr<FocusEventDispatchMediator> create(PassRefPtr<Event>, PassRefPtr<Node> oldFocusedNode);
     82private:
     83    FocusEventDispatchMediator(PassRefPtr<Event>, PassRefPtr<Node> oldFocusedNode);
     84    virtual bool dispatchEvent(EventDispatcher*) const OVERRIDE;
     85    RefPtr<Node> m_oldFocusedNode;
     86};
     87
     88class BlurEventDispatchMediator : public EventDispatchMediator {
     89public:
     90    static PassRefPtr<BlurEventDispatchMediator> create(PassRefPtr<Event>, PassRefPtr<Node> newFocusedNode);
     91private:
     92    BlurEventDispatchMediator(PassRefPtr<Event>, PassRefPtr<Node> newFocusedNode);
     93    virtual bool dispatchEvent(EventDispatcher*) const OVERRIDE;
     94    RefPtr<Node> m_newFocusedNode;
     95};
     96
     97class FocusInEventDispatchMediator : public EventDispatchMediator {
     98public:
     99    static PassRefPtr<FocusInEventDispatchMediator> create(PassRefPtr<Event>, PassRefPtr<Node> oldFocusedNode);
     100private:
     101    explicit FocusInEventDispatchMediator(PassRefPtr<Event>, PassRefPtr<Node> oldFocusedNode);
     102    virtual bool dispatchEvent(EventDispatcher*) const OVERRIDE;
     103    RefPtr<Node> m_oldFocusedNode;
     104};
     105
     106class FocusOutEventDispatchMediator : public EventDispatchMediator {
     107public:
     108    static PassRefPtr<FocusOutEventDispatchMediator> create(PassRefPtr<Event>, PassRefPtr<Node> newFocusedNode);
     109private:
     110    explicit FocusOutEventDispatchMediator(PassRefPtr<Event>, PassRefPtr<Node> newFocusedNode);
     111    virtual bool dispatchEvent(EventDispatcher*) const OVERRIDE;
     112    RefPtr<Node> m_newFocusedNode;
     113};
     114
    77115} // namespace WebCore
    78116

  • trunk/Source/WebCore/dom/UIEvent.cpp

    r140493 r142329  
    116116}
    117117
    118 PassRefPtr<FocusInEventDispatchMediator> FocusInEventDispatchMediator::create(PassRefPtr<Event> event, PassRefPtr<Node> oldFocusedNode)
    119 {
    120     return adoptRef(new FocusInEventDispatchMediator(event, oldFocusedNode));
    121 }
    122 
    123 FocusInEventDispatchMediator::FocusInEventDispatchMediator(PassRefPtr<Event> event, PassRefPtr<Node> oldFocusedNode)
    124     : EventDispatchMediator(event)
    125     , m_oldFocusedNode(oldFocusedNode)
    126 {
    127 }
    128 
    129 bool FocusInEventDispatchMediator::dispatchEvent(EventDispatcher* dispatcher) const
    130 {
    131     dispatcher->adjustRelatedTarget(event(), m_oldFocusedNode);
    132     return EventDispatchMediator::dispatchEvent(dispatcher);
    133 }
    134 
    135 PassRefPtr<FocusOutEventDispatchMediator> FocusOutEventDispatchMediator::create(PassRefPtr<Event> event, PassRefPtr<Node> newFocusedNode)
    136 {
    137     return adoptRef(new FocusOutEventDispatchMediator(event, newFocusedNode));
    138 }
    139 
    140 FocusOutEventDispatchMediator::FocusOutEventDispatchMediator(PassRefPtr<Event> event, PassRefPtr<Node> newFocusedNode)
    141     : EventDispatchMediator(event)
    142     , m_newFocusedNode(newFocusedNode)
    143 {
    144 }
    145 
    146 bool FocusOutEventDispatchMediator::dispatchEvent(EventDispatcher* dispatcher) const
    147 {
    148     dispatcher->adjustRelatedTarget(event(), m_newFocusedNode);
    149     return EventDispatchMediator::dispatchEvent(dispatcher);
    150 }
    151 
    152118} // namespace WebCore

  • trunk/Source/WebCore/dom/UIEvent.h

    r140493 r142329  
    8585};
    8686
    87 class FocusInEventDispatchMediator : public EventDispatchMediator {
    88 public:
    89     static PassRefPtr<FocusInEventDispatchMediator> create(PassRefPtr<Event>, PassRefPtr<Node> oldFocusedNode);
    90 private:
    91     explicit FocusInEventDispatchMediator(PassRefPtr<Event>, PassRefPtr<Node> oldFocusedNode);
    92     virtual bool dispatchEvent(EventDispatcher*) const OVERRIDE;
    93     RefPtr<Node> m_oldFocusedNode;
    94 };
    95 
    96 class FocusOutEventDispatchMediator : public EventDispatchMediator {
    97 public:
    98     static PassRefPtr<FocusOutEventDispatchMediator> create(PassRefPtr<Event>, PassRefPtr<Node> newFocusedNode);
    99 private:
    100     explicit FocusOutEventDispatchMediator(PassRefPtr<Event>, PassRefPtr<Node> newFocusedNode);
    101     virtual bool dispatchEvent(EventDispatcher*) const OVERRIDE;
    102     RefPtr<Node> m_newFocusedNode;
    103 };
    104 
    10587} // namespace WebCore
    10688
Note: See TracChangeset for help on using the changeset viewer.