Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1739)

Unified Diff: third_party/WebKit/Source/core/inspector/InspectorConsoleAgent.cpp

Issue 2016123002: Remove ScriptCallStack. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2006893004
Patch Set: rebased Created 4 years, 7 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
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 bffc48f5a8897dc5640453e217b3f90863808676..1c1be9213a91b5e436c3e92a5ef6040ecb3c2364 100644
--- a/third_party/WebKit/Source/core/inspector/InspectorConsoleAgent.cpp
+++ b/third_party/WebKit/Source/core/inspector/InspectorConsoleAgent.cpp
@@ -26,6 +26,7 @@
#include "core/inspector/InspectorConsoleAgent.h"
#include "bindings/core/v8/ScriptValue.h"
+#include "bindings/core/v8/SourceLocation.h"
#include "core/inspector/ConsoleMessage.h"
#include "core/inspector/ConsoleMessageStorage.h"
#include "core/inspector/IdentifiersFactory.h"
@@ -162,11 +163,11 @@ void InspectorConsoleAgent::sendConsoleMessageToFrontend(ConsoleMessage* console
.setTimestamp(timestamp ? *timestamp : consoleMessage->timestamp()).build();
// FIXME: only send out type for ConsoleAPI source messages.
jsonObj->setType(messageTypeValue(consoleMessage->type()));
- jsonObj->setLine(static_cast<int>(consoleMessage->lineNumber()));
- jsonObj->setColumn(static_cast<int>(consoleMessage->columnNumber()));
- if (consoleMessage->scriptId())
- jsonObj->setScriptId(String::number(consoleMessage->scriptId()));
- jsonObj->setUrl(consoleMessage->url());
+ jsonObj->setLine(static_cast<int>(consoleMessage->location()->lineNumber()));
+ jsonObj->setColumn(static_cast<int>(consoleMessage->location()->columnNumber()));
+ if (consoleMessage->location()->scriptId())
+ jsonObj->setScriptId(String::number(consoleMessage->location()->scriptId()));
+ jsonObj->setUrl(consoleMessage->location()->url());
if (consoleMessage->source() == NetworkMessageSource && consoleMessage->requestIdentifier())
jsonObj->setNetworkRequestId(IdentifiersFactory::requestId(consoleMessage->requestIdentifier()));
ScriptArguments* arguments = consoleMessage->scriptArguments();
@@ -197,8 +198,9 @@ void InspectorConsoleAgent::sendConsoleMessageToFrontend(ConsoleMessage* console
if (jsonArgs)
jsonObj->setParameters(std::move(jsonArgs));
}
- if (consoleMessage->stackTrace())
- jsonObj->setStack(consoleMessage->stackTrace()->buildInspectorObject());
+ std::unique_ptr<protocol::Runtime::StackTrace> stackTrace = consoleMessage->location()->buildInspectorObject();
+ if (stackTrace)
+ jsonObj->setStack(std::move(stackTrace));
if (consoleMessage->messageId())
jsonObj->setMessageId(consoleMessage->messageId());
if (consoleMessage->relatedMessageId())

Powered by Google App Engine
This is Rietveld 408576698