Adjust use counters for editing and legacy events.

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 529 matching lines @@
     if (listenersVector) {
         firedEventListeners = fireEventListeners(event, d, *listenersVector);
     } else if (legacyListenersVector) {
         AtomicString unprefixedTypeName = event->type();
         event->setType(legacyTypeName);
         firedEventListeners = fireEventListeners(event, d, *legacyListenersVector);
         event->setType(unprefixedTypeName);
     }
 
     // Only invoke the callback if event listeners were fired for this phase.
-    if (firedEventListeners)
+    if (firedEventListeners) {
         event->doneDispatchingEventAtCurrentTarget();
 
-    // TODO(dtapuska): Should we really do counting here for these events
-    // if we really didn't fire a listener? For example having a bubbling
-    // listener on an event that doesn't bubble likely records a UMA
-    // metric where it probably shouldn't because it was never fired.
-    // See https://crbug.com/612829
-    Editor::countEvent(getExecutionContext(), event);
-    countLegacyEvents(legacyTypeName, listenersVector, legacyListenersVector);
+        // Only count uma metrics if we really fired an event listener.
+        Editor::countEvent(getExecutionContext(), event);
+        countLegacyEvents(legacyTypeName, listenersVector, legacyListenersVector);
+    }
     return dispatchEventResult(*event);
 }
 
 bool EventTarget::checkTypeThenUseCount(
     const Event* event, const AtomicString& eventTypeToCount, const UseCounter::Feature feature)
 {
     if (event->type() == eventTypeToCount) {
         if (LocalDOMWindow* executingWindow = this->executingWindow())
             UseCounter::count(executingWindow->document(), feature);
         return true;
@@ skipping 145 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