third_party/WebKit/Source/core/frame/DOMTimer.cpp - Issue 1893333004: [DevTools] Bring back InspectorInstrumenetation::didHandleEvent

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/frame/DOMTimer.cpp

Issue 1893333004: [DevTools] Bring back InspectorInstrumenetation::didHandleEvent (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2704

Patch Set: Created 4 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/core/events/EventTarget.cpp ('k') | third_party/WebKit/Source/core/inspector/InspectorDOMDebuggerAgent.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/frame/DOMTimer.cpp

diff --git a/third_party/WebKit/Source/core/frame/DOMTimer.cpp b/third_party/WebKit/Source/core/frame/DOMTimer.cpp

index 6966acef9153b9f1637693f6e501e8b129b46a07..8944f9aabe15fb63818310511ccf0f13335d50ec 100644

--- a/third_party/WebKit/Source/core/frame/DOMTimer.cpp

+++ b/third_party/WebKit/Source/core/frame/DOMTimer.cpp

@@ -108,7 +108,7 @@ void DOMTimer::fired()

UserGestureIndicator gestureIndicator(m_userGestureToken.release());

TRACE_EVENT1("devtools.timeline", "TimerFire", "data", InspectorTimerFireEvent::data(context, m_timeoutID));

- InspectorInstrumentation::allowNativeBreakpoint(context, "timerFired", false);

+ InspectorInstrumentationCookie cookie = InspectorInstrumentation::allowNativeBreakpoint(context, "timerFired", false);

InspectorInstrumentation::AsyncTask asyncTask(context, this);

// Simple case for non-one-shot timers.

@@ -121,6 +121,7 @@ void DOMTimer::fired()

// No access to member variables after this point, it can delete the timer.

m_action->execute(context);

+ InspectorInstrumentation::cancelPauseOnNextStatement(cookie);

return;

}

@@ -130,6 +131,7 @@ void DOMTimer::fired()

context->timers()->removeTimeoutByID(m_timeoutID);

action->execute(context);

+ InspectorInstrumentation::cancelPauseOnNextStatement(cookie);

TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "UpdateCounters", TRACE_EVENT_SCOPE_THREAD, "data", InspectorUpdateCountersEvent::data());