Changeset 157203 in webkit


Ignore:
Timestamp:
Oct 9, 2013 6:44:42 PM (10 years ago)
Author:
rniwa@webkit.org
Message:

EventDispatchMediator is goner
https://bugs.webkit.org/show_bug.cgi?id=122581

Reviewed by Antti Koivisto.

Killed the death.

  • CMakeLists.txt:
  • GNUmakefile.list.am:
  • WebCore.vcxproj/WebCore.vcxproj:
  • WebCore.vcxproj/WebCore.vcxproj.filters:
  • WebCore.xcodeproj/project.pbxproj:
  • dom/DOMAllInOne.cpp:
  • dom/Element.cpp:

(WebCore::Element::dispatchWheelEvent):
(WebCore::Element::dispatchKeyEvent):
(WebCore::Element::dispatchFocusEvent):
(WebCore::Element::dispatchBlurEvent):

  • dom/EventDispatchMediator.cpp: Removed.
  • dom/EventDispatchMediator.h: Removed.
  • dom/EventDispatcher.cpp:

(WebCore::EventDispatcher::dispatchEvent):
(WebCore::EventDispatcher::dispatchScopedEvent):

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

(WebCore::Node::dispatchScopedEvent):
(WebCore::Node::dispatchEvent):
(WebCore::Node::dispatchGestureEvent):
(WebCore::Node::dispatchTouchEvent):
(WebCore::Node::dispatchUIRequestEvent):

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

(WebCore::ScopedEventQueue::~ScopedEventQueue):
(WebCore::ScopedEventQueue::enqueueEvent):
(WebCore::ScopedEventQueue::dispatchAllEvents):
(WebCore::ScopedEventQueue::dispatchEvent):

  • dom/ScopedEventQueue.h:
  • dom/TouchEvent.cpp:
  • dom/TouchEvent.h:
  • dom/UIEvent.h:
  • dom/WheelEvent.h:
Location:
trunk/Source/WebCore
Files:
2 deleted
20 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/CMakeLists.txt

    r157068 r157203  
    11281128    dom/Event.cpp
    11291129    dom/EventContext.cpp
    1130     dom/EventDispatchMediator.cpp
    11311130    dom/EventDispatcher.cpp
    11321131    dom/EventException.cpp
  • trunk/Source/WebCore/ChangeLog

    r157202 r157203  
     12013-10-09  Ryosuke Niwa  <rniwa@webkit.org>
     2
     3        EventDispatchMediator is goner
     4        https://bugs.webkit.org/show_bug.cgi?id=122581
     5
     6        Reviewed by Antti Koivisto.
     7
     8        Killed the death.
     9
     10        * CMakeLists.txt:
     11        * GNUmakefile.list.am:
     12        * WebCore.vcxproj/WebCore.vcxproj:
     13        * WebCore.vcxproj/WebCore.vcxproj.filters:
     14        * WebCore.xcodeproj/project.pbxproj:
     15        * dom/DOMAllInOne.cpp:
     16        * dom/Element.cpp:
     17        (WebCore::Element::dispatchWheelEvent):
     18        (WebCore::Element::dispatchKeyEvent):
     19        (WebCore::Element::dispatchFocusEvent):
     20        (WebCore::Element::dispatchBlurEvent):
     21        * dom/EventDispatchMediator.cpp: Removed.
     22        * dom/EventDispatchMediator.h: Removed.
     23        * dom/EventDispatcher.cpp:
     24        (WebCore::EventDispatcher::dispatchEvent):
     25        (WebCore::EventDispatcher::dispatchScopedEvent):
     26        * dom/EventDispatcher.h:
     27        * dom/KeyboardEvent.h:
     28        * dom/MouseEvent.h:
     29        * dom/Node.cpp:
     30        (WebCore::Node::dispatchScopedEvent):
     31        (WebCore::Node::dispatchEvent):
     32        (WebCore::Node::dispatchGestureEvent):
     33        (WebCore::Node::dispatchTouchEvent):
     34        (WebCore::Node::dispatchUIRequestEvent):
     35        * dom/Node.h:
     36        * dom/ScopedEventQueue.cpp:
     37        (WebCore::ScopedEventQueue::~ScopedEventQueue):
     38        (WebCore::ScopedEventQueue::enqueueEvent):
     39        (WebCore::ScopedEventQueue::dispatchAllEvents):
     40        (WebCore::ScopedEventQueue::dispatchEvent):
     41        * dom/ScopedEventQueue.h:
     42        * dom/TouchEvent.cpp:
     43        * dom/TouchEvent.h:
     44        * dom/UIEvent.h:
     45        * dom/WheelEvent.h:
     46
    1472013-10-09  Andreas Kling  <akling@apple.com>
    248
  • trunk/Source/WebCore/GNUmakefile.list.am

    r157110 r157203  
    28222822        Source/WebCore/dom/EventContext.cpp \
    28232823        Source/WebCore/dom/EventContext.h \
    2824         Source/WebCore/dom/EventDispatchMediator.cpp \
    2825         Source/WebCore/dom/EventDispatchMediator.h \
    28262824        Source/WebCore/dom/EventDispatcher.cpp \
    28272825        Source/WebCore/dom/EventDispatcher.h \
  • trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj

    r157147 r157203  
    1235812358    </ClCompile>
    1235912359    <ClCompile Include="..\dom\EventDispatcher.cpp">
    12360       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
    12361       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
    12362       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
    12363       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
    12364       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
    12365       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
    12366       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
    12367       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    12368       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
    12369       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
    12370       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
    12371       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
    12372     </ClCompile>
    12373     <ClCompile Include="..\dom\EventDispatchMediator.cpp">
    1237412360      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
    1237512361      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     
    1975119737    <ClInclude Include="..\dom\EventContext.h" />
    1975219738    <ClInclude Include="..\dom\EventDispatcher.h" />
    19753     <ClInclude Include="..\dom\EventDispatchMediator.h" />
    1975419739    <ClInclude Include="..\dom\EventException.h" />
    1975519740    <ClInclude Include="..\dom\EventListener.h" />
  • trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters

    r156991 r157203  
    31813181      <Filter>dom</Filter>
    31823182    </ClCompile>
    3183     <ClCompile Include="..\dom\EventDispatchMediator.cpp">
    3184       <Filter>dom</Filter>
    3185     </ClCompile>
    31863183    <ClCompile Include="..\dom\EventException.cpp">
    31873184      <Filter>dom</Filter>
     
    1003110028    </ClInclude>
    1003210029    <ClInclude Include="..\dom\EventDispatcher.h">
    10033       <Filter>dom</Filter>
    10034     </ClInclude>
    10035     <ClInclude Include="..\dom\EventDispatchMediator.h">
    1003610030      <Filter>dom</Filter>
    1003710031    </ClInclude>
  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r157200 r157203  
    15621562                4AD0173C127E82860015035F /* JSHTMLOutputElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4AD0173A127E82860015035F /* JSHTMLOutputElement.cpp */; };
    15631563                4AD0173D127E82860015035F /* JSHTMLOutputElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 4AD0173B127E82860015035F /* JSHTMLOutputElement.h */; };
    1564                 4AF1AD3E13FD23A400AA9590 /* EventDispatchMediator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4AF1AD3C13FD23A400AA9590 /* EventDispatchMediator.cpp */; };
    1565                 4AF1AD3F13FD23A400AA9590 /* EventDispatchMediator.h in Headers */ = {isa = PBXBuildFile; fileRef = 4AF1AD3D13FD23A400AA9590 /* EventDispatchMediator.h */; settings = {ATTRIBUTES = (Private, ); }; };
    15661564                4B2708C70AF19EE40065127F /* Pasteboard.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B2708C50AF19EE40065127F /* Pasteboard.h */; settings = {ATTRIBUTES = (Private, ); }; };
    15671565                4B2709830AF2E5E00065127F /* PasteboardMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4B2709810AF2E5E00065127F /* PasteboardMac.mm */; };
     
    81208118                4AD0173A127E82860015035F /* JSHTMLOutputElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLOutputElement.cpp; sourceTree = "<group>"; };
    81218119                4AD0173B127E82860015035F /* JSHTMLOutputElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSHTMLOutputElement.h; sourceTree = "<group>"; };
    8122                 4AF1AD3C13FD23A400AA9590 /* EventDispatchMediator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EventDispatchMediator.cpp; sourceTree = "<group>"; };
    8123                 4AF1AD3D13FD23A400AA9590 /* EventDispatchMediator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventDispatchMediator.h; sourceTree = "<group>"; };
    81248120                4B2708C50AF19EE40065127F /* Pasteboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Pasteboard.h; sourceTree = "<group>"; };
    81258121                4B2709810AF2E5E00065127F /* PasteboardMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PasteboardMac.mm; sourceTree = "<group>"; };
     
    2083620832                                418A06CF133C04D500CD379C /* EventDispatcher.cpp */,
    2083720833                                418A06CE133C04D500CD379C /* EventDispatcher.h */,
    20838                                 4AF1AD3C13FD23A400AA9590 /* EventDispatchMediator.cpp */,
    20839                                 4AF1AD3D13FD23A400AA9590 /* EventDispatchMediator.h */,
    2084020834                                978D07BB145A0F560096908D /* EventException.cpp */,
    2084120835                                BC60D9090D2A17CE00B9918F /* EventException.h */,
     
    2231122305                                CDAB6D2917C7DE6C00C60B34 /* MediaControlsHost.h in Headers */,
    2231222306                                418A06D0133C04D500CD379C /* EventDispatcher.h in Headers */,
    22313                                 4AF1AD3F13FD23A400AA9590 /* EventDispatchMediator.h in Headers */,
    2231422307                                BC60D90C0D2A17CE00B9918F /* EventException.h in Headers */,
    2231522308                                97665013144FAA4200F6BB51 /* EventFactory.h in Headers */,
     
    2558425577                                4138D3361244054800323D33 /* EventContext.cpp in Sources */,
    2558525578                                418A06D1133C04D500CD379C /* EventDispatcher.cpp in Sources */,
    25586                                 4AF1AD3E13FD23A400AA9590 /* EventDispatchMediator.cpp in Sources */,
    2558725579                                07969DAB17D14151007FF842 /* JSRTCDataChannel.cpp in Sources */,
    2558825580                                978D07BC145A0F560096908D /* EventException.cpp in Sources */,
  • trunk/Source/WebCore/dom/DOMAllInOne.cpp

    r156390 r157203  
    7373#include "Event.cpp"
    7474#include "EventContext.cpp"
    75 #include "EventDispatchMediator.cpp"
    7675#include "EventDispatcher.cpp"
    7776#include "EventException.cpp"
  • trunk/Source/WebCore/dom/Element.cpp

    r157196 r157203  
    297297        event.timestamp());
    298298
    299     return EventDispatcher::dispatchEvent(this, EventDispatchMediator::create(wheelEvent)) && !wheelEvent->defaultHandled();
     299    return EventDispatcher::dispatchEvent(this, wheelEvent) && !wheelEvent->defaultHandled();
    300300}
    301301
     
    303303{
    304304    RefPtr<KeyboardEvent> event = KeyboardEvent::create(platformEvent, document().defaultView());
    305     return EventDispatcher::dispatchEvent(this, EventDispatchMediator::create(event)) && !event->defaultHandled();
     305    return EventDispatcher::dispatchEvent(this, event) && !event->defaultHandled();
    306306}
    307307
     
    20882088
    20892089    RefPtr<FocusEvent> event = FocusEvent::create(eventNames().focusEvent, false, false, document().defaultView(), 0, oldFocusedElement);
    2090     EventDispatcher::dispatchEvent(this, EventDispatchMediator::create(event.release()));
     2090    EventDispatcher::dispatchEvent(this, event.release());
    20912091}
    20922092
     
    20972097
    20982098    RefPtr<FocusEvent> event = FocusEvent::create(eventNames().blurEvent, false, false, document().defaultView(), 0, newFocusedElement);
    2099     EventDispatcher::dispatchEvent(this, EventDispatchMediator::create(event.release()));
     2099    EventDispatcher::dispatchEvent(this, event.release());
    21002100}
    21012101
  • trunk/Source/WebCore/dom/EventDispatcher.cpp

    r157177 r157203  
    2929#include "ContainerNode.h"
    3030#include "EventContext.h"
    31 #include "EventDispatchMediator.h"
    3231#include "EventRetargeter.h"
    3332#include "FocusEvent.h"
     
    4544namespace WebCore {
    4645
    47 bool EventDispatcher::dispatchEvent(Node* node, PassRefPtr<EventDispatchMediator> mediator)
     46bool EventDispatcher::dispatchEvent(Node* node, PassRefPtr<Event> event)
    4847{
    4948    ASSERT(!NoEventDispatchAssertion::isEventDispatchForbidden());
    50     Event* event = mediator->event();
    5149    if (!event)
    5250        return true;
    5351    EventDispatcher dispatcher(node, event);
    54     return mediator->mediateAndDispatchEvent(&dispatcher);
     52    return dispatcher.dispatch();
    5553}
    5654
     
    6967}
    7068
    71 void EventDispatcher::dispatchScopedEvent(Node& node, PassRefPtr<EventDispatchMediator> mediator)
     69void EventDispatcher::dispatchScopedEvent(Node& node, PassRefPtr<Event> event)
    7270{
    7371    // We need to set the target here because it can go away by the time we actually fire the event.
    74     mediator->event()->setTarget(&EventRetargeter::eventTargetRespectingTargetRules(node));
    75     ScopedEventQueue::instance()->enqueueEventDispatchMediator(mediator);
     72    event->setTarget(&EventRetargeter::eventTargetRespectingTargetRules(node));
     73    ScopedEventQueue::instance()->enqueueEvent(event);
    7674}
    7775
  • trunk/Source/WebCore/dom/EventDispatcher.h

    r157177 r157203  
    3737
    3838class Event;
    39 class EventDispatchMediator;
    4039class EventTarget;
    4140class FrameView;
     
    7877class EventDispatcher {
    7978public:
    80     static bool dispatchEvent(Node*, PassRefPtr<EventDispatchMediator>);
    81     static void dispatchScopedEvent(Node&, PassRefPtr<EventDispatchMediator>);
     79    static bool dispatchEvent(Node*, PassRefPtr<Event>);
     80    static void dispatchScopedEvent(Node&, PassRefPtr<Event>);
    8281
    8382    static void dispatchSimulatedClick(Element*, Event* underlyingEvent, SimulatedClickMouseEventOptions, SimulatedClickVisualOptions);
  • trunk/Source/WebCore/dom/KeyboardEvent.h

    r157195 r157203  
    2525#define KeyboardEvent_h
    2626
    27 #include "EventDispatchMediator.h"
    2827#include "UIEventWithKeyState.h"
    2928#include <wtf/Vector.h>
  • trunk/Source/WebCore/dom/MouseEvent.h

    r157196 r157203  
    2525#define MouseEvent_h
    2626
    27 #include "EventDispatchMediator.h"
    2827#include "MouseRelatedEvent.h"
    2928
  • trunk/Source/WebCore/dom/Node.cpp

    r157196 r157203  
    5353#include "Event.h"
    5454#include "EventContext.h"
    55 #include "EventDispatchMediator.h"
    5655#include "EventDispatcher.h"
    5756#include "EventException.h"
     
    20702069void Node::dispatchScopedEvent(PassRefPtr<Event> event)
    20712070{
    2072     EventDispatcher::dispatchScopedEvent(*this, EventDispatchMediator::create(event));
     2071    EventDispatcher::dispatchScopedEvent(*this, event);
    20732072}
    20742073
     
    20792078        return dispatchTouchEvent(adoptRef(toTouchEvent(event.leakRef())));
    20802079#endif
    2081     return EventDispatcher::dispatchEvent(this, EventDispatchMediator::create(event));
     2080    return EventDispatcher::dispatchEvent(this, event);
    20822081}
    20832082
     
    21142113        return true;
    21152114
    2116     EventDispatcher::dispatchEvent(this, EventDispatchMediator::create(gestureEvent));
     2115    EventDispatcher::dispatchEvent(this, gestureEvent.release());
    21172116
    21182117    ASSERT(!gestureEvent->defaultPrevented());
     
    21242123bool Node::dispatchTouchEvent(PassRefPtr<TouchEvent> event)
    21252124{
    2126     return EventDispatcher::dispatchEvent(this, EventDispatchMediator::create(event));
     2125    return EventDispatcher::dispatchEvent(this, event);
    21272126}
    21282127#endif
     
    21312130bool Node::dispatchUIRequestEvent(PassRefPtr<UIRequestEvent> event)
    21322131{
    2133     EventDispatcher::dispatchEvent(this, EventDispatchMediator::create(event));
     2132    EventDispatcher::dispatchEvent(this, event);
    21342133    return event->defaultHandled() || event->defaultPrevented();
    21352134}
  • trunk/Source/WebCore/dom/Node.h

    r157177 r157203  
    5858class Event;
    5959class EventContext;
    60 class EventDispatchMediator;
    6160class EventListener;
    6261class FloatPoint;
  • trunk/Source/WebCore/dom/ScopedEventQueue.cpp

    r95901 r157203  
    3333
    3434#include "Event.h"
    35 #include "EventDispatchMediator.h"
    3635#include "EventDispatcher.h"
    3736#include "EventTarget.h"
     
    5150{
    5251    ASSERT(!m_scopingLevel);
    53     ASSERT(!m_queuedEventDispatchMediators.size());
     52    ASSERT(!m_queuedEvents.size());
    5453}
    5554
     
    6160}
    6261
    63 void ScopedEventQueue::enqueueEventDispatchMediator(PassRefPtr<EventDispatchMediator> mediator)
     62void ScopedEventQueue::enqueueEvent(PassRefPtr<Event> event)
    6463{
    6564    if (m_scopingLevel)
    66         m_queuedEventDispatchMediators.append(mediator);
     65        m_queuedEvents.append(event);
    6766    else
    68         dispatchEvent(mediator);
     67        dispatchEvent(event);
    6968}
    7069
    7170void ScopedEventQueue::dispatchAllEvents()
    7271{
    73     Vector<RefPtr<EventDispatchMediator> > queuedEventDispatchMediators;
    74     queuedEventDispatchMediators.swap(m_queuedEventDispatchMediators);
     72    Vector<RefPtr<Event>> queuedEvents;
     73    queuedEvents.swap(m_queuedEvents);
    7574
    76     for (size_t i = 0; i < queuedEventDispatchMediators.size(); i++)
    77         dispatchEvent(queuedEventDispatchMediators[i].release());
     75    for (size_t i = 0; i < queuedEvents.size(); i++)
     76        dispatchEvent(queuedEvents[i].release());
    7877}
    7978
    80 void ScopedEventQueue::dispatchEvent(PassRefPtr<EventDispatchMediator> mediator) const
     79void ScopedEventQueue::dispatchEvent(PassRefPtr<Event> event) const
    8180{
    82     ASSERT(mediator->event()->target());
    83     Node* node = mediator->event()->target()->toNode();
    84     EventDispatcher::dispatchEvent(node, mediator);
     81    ASSERT(event->target());
     82    EventDispatcher::dispatchEvent(event->target()->toNode(), event);
    8583}
    8684
  • trunk/Source/WebCore/dom/ScopedEventQueue.h

    r128572 r157203  
    3939namespace WebCore {
    4040
    41 class EventDispatchMediator;
     41class Event;
    4242
    4343class ScopedEventQueue {
     
    4646    ~ScopedEventQueue();
    4747
    48     void enqueueEventDispatchMediator(PassRefPtr<EventDispatchMediator>);
     48    void enqueueEvent(PassRefPtr<Event>);
    4949    void dispatchAllEvents();
    5050    static ScopedEventQueue* instance();
     
    5656    ScopedEventQueue();
    5757    static void initialize();
    58     void dispatchEvent(PassRefPtr<EventDispatchMediator>) const;
     58    void dispatchEvent(PassRefPtr<Event>) const;
    5959
    60     Vector<RefPtr<EventDispatchMediator> > m_queuedEventDispatchMediators;
     60    Vector<RefPtr<Event> > m_queuedEvents;
    6161    unsigned m_scopingLevel;
    6262
  • trunk/Source/WebCore/dom/TouchEvent.cpp

    r157136 r157203  
    103103}
    104104
    105 PassRefPtr<TouchEventDispatchMediator> TouchEventDispatchMediator::create(PassRefPtr<TouchEvent> touchEvent)
    106 {
    107     return adoptRef(new TouchEventDispatchMediator(touchEvent));
    108 }
    109 
    110 TouchEventDispatchMediator::TouchEventDispatchMediator(PassRefPtr<TouchEvent> touchEvent)
    111     : EventDispatchMediator(touchEvent)
    112 {
    113 }
    114 
    115 TouchEvent* TouchEventDispatchMediator::event() const
    116 {
    117     return static_cast<TouchEvent*>(EventDispatchMediator::event());
    118 }
    119 
    120 bool TouchEventDispatchMediator::mediateAndDispatchEvent(EventDispatcher* dispatcher) const
    121 {
    122     EventRetargeter::adjustForTouchEvent(dispatcher->node(), *event(), dispatcher->eventPath());
    123     return dispatcher->dispatch();
    124 }
    125 
    126105} // namespace WebCore
    127106
  • trunk/Source/WebCore/dom/TouchEvent.h

    r157136 r157203  
    3030#if ENABLE(TOUCH_EVENTS)
    3131
    32 #include "EventDispatchMediator.h"
    3332#include "MouseRelatedEvent.h"
    3433#include "TouchList.h"
     
    9695};
    9796
    98 class TouchEventDispatchMediator : public EventDispatchMediator {
    99 public:
    100     static PassRefPtr<TouchEventDispatchMediator> create(PassRefPtr<TouchEvent>);
    101 
    102 private:
    103     explicit TouchEventDispatchMediator(PassRefPtr<TouchEvent>);
    104     TouchEvent* event() const;
    105     virtual bool mediateAndDispatchEvent(EventDispatcher*) const OVERRIDE;
    106 };
    107 
    10897inline TouchEvent* toTouchEvent(Event* event)
    10998{
  • trunk/Source/WebCore/dom/UIEvent.h

    r157044 r157203  
    2727#include "DOMWindow.h"
    2828#include "Event.h"
    29 #include "EventDispatchMediator.h"
    3029
    3130namespace WebCore {
  • trunk/Source/WebCore/dom/WheelEvent.h

    r157195 r157203  
    2626#define WheelEvent_h
    2727
    28 #include "EventDispatchMediator.h"
    2928#include "FloatPoint.h"
    3029#include "MouseEvent.h"
Note: See TracChangeset for help on using the changeset viewer.