Enumerate the return value of dispatchEvent so it is clear.

third_party/WebKit/Source/core/events/EventTarget.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  *           (C) 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ skipping 229 matching lines @@
 }
 
 bool EventTarget::clearAttributeEventListener(const AtomicString& eventType)
 {
     EventListener* listener = getAttributeEventListener(eventType);
     if (!listener)
         return false;
     return removeEventListener(eventType, listener, false);
 }
 
-bool EventTarget::dispatchEventForBindings(PassRefPtrWillBeRawPtr<Event> event, ExceptionState& exceptionState)
+bool EventTarget::dispatchEventForBindings(PassRefPtrWillBeRawPtr<Event> dispatchEvent, ExceptionState& exceptionState)
 {
+    RefPtrWillBeRawPtr<Event> event = dispatchEvent;
+    if (!event) {
+        exceptionState.throwDOMException(InvalidStateError, "The event provided is null.");

[philipj_slow, 2015/12/04 22:38:51]

Why did you add back the null check? If it was while resolving conflicts, make
sure to check if any other conflicts were also resolved incorrectly.

[dtapuska, 2015/12/07 14:25:30]

Ah yes resolve issue because I needed to hold onto the dispatchedEvent.

+        return false;
+    }
     if (event->type().isEmpty()) {
         exceptionState.throwDOMException(InvalidStateError, "The event provided is uninitialized.");
         return false;
     }
     if (event->isBeingDispatched()) {
         exceptionState.throwDOMException(InvalidStateError, "The event is already being dispatched.");
         return false;
     }
 
     if (!executionContext())
         return false;
 
     event->setTrusted(false);
-    return dispatchEventInternal(event);
+
+    // Return whether the event was cancelled or not to JS not that it

[philipj_slow, 2015/12/04 22:38:51]

Does this change observable behavior? I can't understand the "not that it might
have actually been handled" bit, missing words or typo?

[dtapuska, 2015/12/07 14:25:30]

Well it may in some cases; Touch and Mouse event listener mediators that
returned the event was handled by the default event handler may return false now
instead of true. But this in fact is a bug in itself as non-trusted events
should never invoke the default event handler according to the spec. I currently
have a bug in my pool for that (aside from click). 

[philipj_slow, 2015/12/07 15:03:56]

It would be good if any observable changes are done separately, or if they
really cannot be avoided, tests are needed.

+    // might have actually been handled; so throw away the result of
+    // dispatchEventInternal.
+    dispatchEventInternal(event);
+    return !event->defaultPrevented();
 }
 
-bool EventTarget::dispatchEvent(PassRefPtrWillBeRawPtr<Event> event)
+WebInputEventResult EventTarget::dispatchEvent(PassRefPtrWillBeRawPtr<Event> event)
 {
     event->setTrusted(true);
     return dispatchEventInternal(event);
 }
 
-bool EventTarget::dispatchEventInternal(PassRefPtrWillBeRawPtr<Event> event)
+WebInputEventResult EventTarget::dispatchEventInternal(PassRefPtrWillBeRawPtr<Event> event)
 {
     event->setTarget(this);
     event->setCurrentTarget(this);
     event->setEventPhase(Event::AT_TARGET);
-    bool defaultWasNotPrevented = fireEventListeners(event.get());
+    WebInputEventResult result = fireEventListeners(event.get());
     event->setEventPhase(0);
-    return defaultWasNotPrevented;
+    return result;
 }
 
 void EventTarget::uncaughtExceptionInEventHandler()
 {
 }
 
 static const AtomicString& legacyType(const Event* event)
 {
     if (event->type() == EventTypeNames::transitionend)
         return EventTypeNames::webkitTransitionEnd;
@@ skipping 43 matching lines @@
             if (listenersVector)
                 UseCounter::count(executingWindow->document(), prefixedAndUnprefixedFeature);
             else
                 UseCounter::count(executingWindow->document(), prefixedFeature);
         } else if (listenersVector) {
             UseCounter::count(executingWindow->document(), unprefixedFeature);
         }
     }
 }
 
-bool EventTarget::fireEventListeners(Event* event)
+WebInputEventResult EventTarget::fireEventListeners(Event* event)
 {
     ASSERT(!EventDispatchForbiddenScope::isEventDispatchForbidden());
     ASSERT(event && !event->type().isEmpty());
 
     EventTargetData* d = eventTargetData();
     if (!d)
-        return true;
+        return WebInputEventResult::NotHandled;
 
     EventListenerVector* legacyListenersVector = nullptr;
     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);
     }
 
     Editor::countEvent(executionContext(), event);
     countLegacyEvents(legacyTypeName, listenersVector, legacyListenersVector);
-    return !event->defaultPrevented();
+    return event->eventResult();
 }
 
 void EventTarget::fireEventListeners(Event* event, EventTargetData* d, EventListenerVector& entry)
 {
     RefPtrWillBeRawPtr<EventTarget> protect(this);
 
     // Fire all listeners registered for this event. Don't fire listeners removed
     // during event dispatch. Also, don't fire event listeners added during event
     // dispatch. Conveniently, all new event listeners will be added after or at
     // index |size|, so iterating up to (but not including) |size| naturally excludes
@@ skipping 83 matching lines @@
     // they have one less listener to invoke.
     if (d->firingEventIterators) {
         for (size_t i = 0; i < d->firingEventIterators->size(); ++i) {
             d->firingEventIterators->at(i).iterator = 0;
             d->firingEventIterators->at(i).end = 0;
         }
     }
 }
 
 } // namespace blink