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

Unified Diff: third_party/WebKit/Source/core/frame/FrameConsole.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/frame/FrameConsole.cpp
diff --git a/third_party/WebKit/Source/core/frame/FrameConsole.cpp b/third_party/WebKit/Source/core/frame/FrameConsole.cpp
index f749a28722e1f611cc1b618d63db917adba4c6df..2db59019ea1aff896db369ccf901d254de130cfa 100644
--- a/third_party/WebKit/Source/core/frame/FrameConsole.cpp
+++ b/third_party/WebKit/Source/core/frame/FrameConsole.cpp
@@ -28,7 +28,7 @@
#include "core/frame/FrameConsole.h"
-#include "bindings/core/v8/ScriptCallStack.h"
+#include "bindings/core/v8/SourceLocation.h"
#include "core/frame/FrameHost.h"
#include "core/inspector/ConsoleMessage.h"
#include "core/inspector/ConsoleMessageStorage.h"
@@ -90,23 +90,24 @@ void FrameConsole::reportMessageToClient(ConsoleMessage* consoleMessage)
if (consoleMessage->source() == NetworkMessageSource)
return;
+ String url = consoleMessage->location()->url();
String stackTrace;
if (consoleMessage->source() == ConsoleAPIMessageSource) {
if (!frame().host() || (consoleMessage->scriptArguments() && !consoleMessage->scriptArguments()->argumentCount()))
return;
if (!allClientReportingMessageTypes().contains(consoleMessage->type()))
return;
- if (frame().chromeClient().shouldReportDetailedMessageForSource(frame(), consoleMessage->url())) {
- RefPtr<ScriptCallStack> captured = ScriptCallStack::capture();
- if (captured)
- stackTrace = captured->toString();
+ if (frame().chromeClient().shouldReportDetailedMessageForSource(frame(), url)) {
+ OwnPtr<SourceLocation> location = SourceLocation::captureWithFullStackTrace();
+ if (!location->isUnknown())
+ stackTrace = location->toString();
}
} else {
- if (consoleMessage->stackTrace() && frame().chromeClient().shouldReportDetailedMessageForSource(frame(), consoleMessage->url()))
- stackTrace = consoleMessage->stackTrace()->toString();
+ if (!consoleMessage->location()->isUnknown() && frame().chromeClient().shouldReportDetailedMessageForSource(frame(), url))
+ stackTrace = consoleMessage->location()->toString();
}
- frame().chromeClient().addMessageToConsole(m_frame, consoleMessage->source(), consoleMessage->level(), consoleMessage->message(), consoleMessage->lineNumber(), consoleMessage->url(), stackTrace);
+ frame().chromeClient().addMessageToConsole(m_frame, consoleMessage->source(), consoleMessage->level(), consoleMessage->message(), consoleMessage->location()->lineNumber(), url, stackTrace);
}
void FrameConsole::reportWorkerMessage(ConsoleMessage* consoleMessage)
« no previous file with comments | « third_party/WebKit/Source/core/frame/DOMWindow.cpp ('k') | third_party/WebKit/Source/core/frame/csp/CSPDirectiveList.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698