third_party/WebKit/Source/core/inspector/InspectorInstrumentation.cpp - Issue 1666563005: DevTools: merge ScriptCallStack and ScriptAsyncCallStack, move CallStacks from console to Runtime.

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/inspector/InspectorInstrumentation.cpp

Issue 1666563005: DevTools: merge ScriptCallStack and ScriptAsyncCallStack, move CallStacks from console to Runtime. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 11 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/inspector/InspectorDebuggerAgent.cpp ('k') | third_party/WebKit/Source/core/inspector/InspectorResourceAgent.cpp » ('j') | third_party/WebKit/Source/core/inspector/ScriptCallStack.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/inspector/InspectorInstrumentation.cpp

diff --git a/third_party/WebKit/Source/core/inspector/InspectorInstrumentation.cpp b/third_party/WebKit/Source/core/inspector/InspectorInstrumentation.cpp

index dec7526441cb93d18b4e3bdee69e7ec6fbe11f18..0b7540cb7e0d38bb149d36d8adfcc1525ca683ba 100644

--- a/third_party/WebKit/Source/core/inspector/InspectorInstrumentation.cpp

+++ b/third_party/WebKit/Source/core/inspector/InspectorInstrumentation.cpp

@@ -39,7 +39,6 @@

#include "core/inspector/InspectorProfilerAgent.h"

#include "core/inspector/InspectorResourceAgent.h"

#include "core/inspector/InstrumentingAgents.h"

-#include "core/inspector/ScriptAsyncCallStack.h"

#include "core/inspector/ScriptCallStack.h"

#include "core/inspector/WorkerInspectorController.h"

#include "core/page/Page.h"

@@ -132,7 +131,7 @@ void appendAsyncCallStack(ExecutionContext* executionContext, ScriptCallStack* c

if (!instrumentingAgents)

return;

if (InspectorDebuggerAgent* debuggerAgent = instrumentingAgents->inspectorDebuggerAgent())

- callStack->setAsyncCallStack(debuggerAgent->currentAsyncStackTraceForConsole());

+ callStack->setParent(debuggerAgent->currentAsyncStackTraceForConsole());

}

bool consoleAgentEnabled(ExecutionContext* executionContext)