third_party/WebKit/Source/core/inspector/InspectorResourceAgent.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/InspectorResourceAgent.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/InspectorInstrumentation.cpp ('k') | third_party/WebKit/Source/core/inspector/ScriptAsyncCallStack.h » ('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/InspectorResourceAgent.cpp

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

index 732cf7ff99f8b422a35bfd72d6fadb7655218e71..0aedb613a87722259dee77b17dae23c464c9dab3 100644

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

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

@@ -52,7 +52,6 @@

#include "core/inspector/InspectedFrames.h"

#include "core/inspector/InstrumentingAgents.h"

#include "core/inspector/NetworkResourcesData.h"

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

#include "core/inspector/ScriptCallStack.h"

#include "core/loader/DocumentLoader.h"

#include "core/loader/FrameLoader.h"

@@ -777,11 +776,7 @@ PassRefPtr<TypeBuilder::Network::Initiator> InspectorResourceAgent::buildInitiat

if (stackTrace) {

RefPtr<TypeBuilder::Network::Initiator> initiatorObject = TypeBuilder::Network::Initiator::create()

.setType(TypeBuilder::Network::Initiator::Type::Script);

- if (stackTrace->size() > 0)

- initiatorObject->setStackTrace(stackTrace->buildInspectorArray());

- RefPtr<ScriptAsyncCallStack> asyncStackTrace = stackTrace->asyncCallStack();

- if (asyncStackTrace)

- initiatorObject->setAsyncStackTrace(asyncStackTrace->buildInspectorObject());

+ initiatorObject->setStack(stackTrace->buildInspectorObject());

return initiatorObject;

}