| Index: sky/engine/core/events/EventTarget.cpp
|
| diff --git a/sky/engine/core/events/EventTarget.cpp b/sky/engine/core/events/EventTarget.cpp
|
| index 36a41531f6c13f3084b590ce2ff55817d6f18b30..18582fcb58263b19025cca65d00742ac70137b6d 100644
|
| --- a/sky/engine/core/events/EventTarget.cpp
|
| +++ b/sky/engine/core/events/EventTarget.cpp
|
| @@ -156,38 +156,17 @@ void EventTarget::uncaughtExceptionInEventHandler()
|
| {
|
| }
|
|
|
| -static const AtomicString& legacyType(const Event* event)
|
| -{
|
| - if (event->type() == EventTypeNames::wheel)
|
| - return EventTypeNames::mousewheel;
|
| -
|
| - return emptyAtom;
|
| -}
|
| -
|
| bool EventTarget::fireEventListeners(Event* event)
|
| {
|
| ASSERT(!EventDispatchForbiddenScope::isEventDispatchForbidden());
|
| ASSERT(event && !event->type().isEmpty());
|
|
|
| - EventTargetData* d = eventTargetData();
|
| - if (!d)
|
| + EventTargetData* data = eventTargetData();
|
| + if (!data)
|
| return true;
|
|
|
| - EventListenerVector* legacyListenersVector = 0;
|
| - AtomicString legacyTypeName = legacyType(event);
|
| - if (!legacyTypeName.isEmpty())
|
| - legacyListenersVector = d->eventListenerMap.find(legacyTypeName);
|
| -
|
| - EventListenerVector* listenersVector = d->eventListenerMap.find(event->type());
|
| -
|
| - if (listenersVector) {
|
| - fireEventListeners(event, d, *listenersVector);
|
| - } else if (legacyListenersVector) {
|
| - AtomicString unprefixedTypeName = event->type();
|
| - event->setType(legacyTypeName);
|
| - fireEventListeners(event, d, *legacyListenersVector);
|
| - event->setType(unprefixedTypeName);
|
| - }
|
| + if (EventListenerVector* listeners = data->eventListenerMap.find(event->type()))
|
| + fireEventListeners(event, data, *listeners);
|
|
|
| Editor::countEvent(executionContext(), event);
|
| return !event->defaultPrevented();
|
|
|