third_party/WebKit/Source/core/inspector/InspectorConsoleAgent.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/InspectorConsoleAgent.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: testts Created 4 years, 10 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/ConsoleMessage.cpp ('k') | third_party/WebKit/Source/core/inspector/InspectorDebuggerAgent.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 8f5cf9625b9e7b82bc8da8338bae506f39b309a2..528dbcdc33165fa122c798ef56126b48062cd9ca 100644

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

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

@@ -31,7 +31,7 @@

#include "core/inspector/IdentifiersFactory.h"

#include "core/inspector/InstrumentingAgents.h"

#include "core/inspector/ScriptArguments.h"

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

+#include "core/inspector/ScriptCallStack.h"

#include "core/inspector/v8/InjectedScript.h"

#include "core/inspector/v8/InjectedScriptManager.h"

#include "core/inspector/v8/V8Debugger.h"

@@ -223,13 +223,8 @@ void InspectorConsoleAgent::sendConsoleMessageToFrontend(ConsoleMessage* console

jsonObj->setParameters(jsonArgs);

}

- if (consoleMessage->callStack()) {

- if (consoleMessage->callStack()->size())

- jsonObj->setStackTrace(consoleMessage->callStack()->buildInspectorArray());

- RefPtr<ScriptAsyncCallStack> asyncCallStack = consoleMessage->callStack()->asyncCallStack();

- if (asyncCallStack)

- jsonObj->setAsyncStackTrace(asyncCallStack->buildInspectorObject());

- }

+ if (consoleMessage->callStack())

+ jsonObj->setStack(consoleMessage->callStack()->buildInspectorObject());

if (consoleMessage->messageId())

jsonObj->setMessageId(consoleMessage->messageId());

if (consoleMessage->relatedMessageId())