| Index: third_party/WebKit/Source/core/events/DOMWindowEventQueue.cpp
|
| diff --git a/third_party/WebKit/Source/core/events/DOMWindowEventQueue.cpp b/third_party/WebKit/Source/core/events/DOMWindowEventQueue.cpp
|
| index 0bfdb66218bc64002c4b02ffa109822598e7acdd..48dc8bdc38c90054327f0b9737c113323dcd1e24 100644
|
| --- a/third_party/WebKit/Source/core/events/DOMWindowEventQueue.cpp
|
| +++ b/third_party/WebKit/Source/core/events/DOMWindowEventQueue.cpp
|
| @@ -86,8 +86,8 @@ bool DOMWindowEventQueue::enqueueEvent(Event* event) {
|
| return false;
|
|
|
| DCHECK(event->target());
|
| - InspectorInstrumentation::asyncTaskScheduled(
|
| - event->target()->getExecutionContext(), event->type(), event);
|
| + probe::asyncTaskScheduled(event->target()->getExecutionContext(),
|
| + event->type(), event);
|
|
|
| bool wasAdded = m_queuedEvents.insert(event).isNewEntry;
|
| DCHECK(wasAdded); // It should not have already been in the list.
|
| @@ -102,8 +102,7 @@ bool DOMWindowEventQueue::cancelEvent(Event* event) {
|
| HeapListHashSet<Member<Event>, 16>::iterator it = m_queuedEvents.find(event);
|
| bool found = it != m_queuedEvents.end();
|
| if (found) {
|
| - InspectorInstrumentation::asyncTaskCanceled(
|
| - event->target()->getExecutionContext(), event);
|
| + probe::asyncTaskCanceled(event->target()->getExecutionContext(), event);
|
| m_queuedEvents.remove(it);
|
| }
|
| if (m_queuedEvents.isEmpty())
|
| @@ -115,9 +114,10 @@ void DOMWindowEventQueue::close() {
|
| m_isClosed = true;
|
| m_pendingEventTimer->stop();
|
| for (const auto& queuedEvent : m_queuedEvents) {
|
| - if (queuedEvent)
|
| - InspectorInstrumentation::asyncTaskCanceled(
|
| - queuedEvent->target()->getExecutionContext(), queuedEvent);
|
| + if (queuedEvent) {
|
| + probe::asyncTaskCanceled(queuedEvent->target()->getExecutionContext(),
|
| + queuedEvent);
|
| + }
|
| }
|
| m_queuedEvents.clear();
|
| }
|
| @@ -143,8 +143,7 @@ void DOMWindowEventQueue::pendingEventTimerFired() {
|
|
|
| void DOMWindowEventQueue::dispatchEvent(Event* event) {
|
| EventTarget* eventTarget = event->target();
|
| - InspectorInstrumentation::AsyncTask asyncTask(
|
| - eventTarget->getExecutionContext(), event);
|
| + probe::AsyncTask asyncTask(eventTarget->getExecutionContext(), event);
|
| if (LocalDOMWindow* window = eventTarget->toLocalDOMWindow())
|
| window->dispatchEvent(event, nullptr);
|
| else
|
|
|