| Index: third_party/WebKit/Source/modules/indexeddb/IDBEventDispatcher.cpp
|
| diff --git a/third_party/WebKit/Source/modules/indexeddb/IDBEventDispatcher.cpp b/third_party/WebKit/Source/modules/indexeddb/IDBEventDispatcher.cpp
|
| index a17f89bdfa292260b070d43c62f730721a217875..1c8d91b7bd054de69db0edfa70b1934791b5bc37 100644
|
| --- a/third_party/WebKit/Source/modules/indexeddb/IDBEventDispatcher.cpp
|
| +++ b/third_party/WebKit/Source/modules/indexeddb/IDBEventDispatcher.cpp
|
| @@ -28,7 +28,6 @@
|
|
|
| #include "modules/indexeddb/IDBEventDispatcher.h"
|
|
|
| -#include "core/frame/UseCounter.h"
|
| #include "modules/EventModules.h"
|
| #include "modules/EventTargetModules.h"
|
|
|
| @@ -51,31 +50,15 @@ DispatchEventResult IDBEventDispatcher::dispatch(
|
| event->setEventPhase(Event::kAtTarget);
|
| event->setCurrentTarget(eventTargets[0].get());
|
| eventTargets[0]->fireEventListeners(event);
|
| - if (event->propagationStopped() || !event->bubbles())
|
| + if (event->propagationStopped() || !event->bubbles() || event->cancelBubble())
|
| goto doneDispatching;
|
| - if (event->bubbles() && event->cancelBubble()) {
|
| - for (size_t i = 1; i < size; ++i) { // Don't do the first element.
|
| - if (eventTargets[i]->hasEventListeners(event->type()))
|
| - UseCounter::count(eventTargets[i]->getExecutionContext(),
|
| - UseCounter::EventCancelBubbleAffected);
|
| - }
|
| - goto doneDispatching;
|
| - }
|
|
|
| event->setEventPhase(Event::kBubblingPhase);
|
| for (size_t i = 1; i < size; ++i) { // Don't do the first element.
|
| event->setCurrentTarget(eventTargets[i].get());
|
| eventTargets[i]->fireEventListeners(event);
|
| - if (event->propagationStopped())
|
| - goto doneDispatching;
|
| - if (event->cancelBubble()) {
|
| - for (size_t j = i + 1; j < size; ++j) {
|
| - if (eventTargets[j]->hasEventListeners(event->type()))
|
| - UseCounter::count(eventTargets[j]->getExecutionContext(),
|
| - UseCounter::EventCancelBubbleAffected);
|
| - }
|
| + if (event->propagationStopped() || event->cancelBubble())
|
| goto doneDispatching;
|
| - }
|
| }
|
|
|
| doneDispatching:
|
|
|