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

Unified Diff: Source/core/page/PageConsole.cpp

Issue 18822004: Extension Error Piping - Blink: WebKit Side (Closed) Base URL: https://chromium.googlesource.com/chromium/blink@master
Patch Set: Created 7 years, 4 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 | « Source/core/page/PageConsole.h ('k') | Source/web/ChromeClientImpl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/page/PageConsole.cpp
diff --git a/Source/core/page/PageConsole.cpp b/Source/core/page/PageConsole.cpp
index c79ae4970de3b00f3426c26a98e14cac68a305de..0f2db72c2dde8909a62236152945df5a6b5cdb6a 100644
--- a/Source/core/page/PageConsole.cpp
+++ b/Source/core/page/PageConsole.cpp
@@ -38,6 +38,7 @@
#include "core/page/ChromeClient.h"
#include "core/page/ConsoleTypes.h"
#include "core/page/Page.h"
+#include "wtf/text/StringBuilder.h"
#include "wtf/text/WTFString.h"
namespace WebCore {
@@ -82,16 +83,36 @@ void PageConsole::addMessage(MessageSource source, MessageLevel level, const Str
if (source == CSSMessageSource)
return;
- page->chrome().client().addMessageToConsole(source, level, message, lineNumber, url);
+ String stackTrace;
+ if (page->chrome().client().shouldReportDetailedMessageForSource(url) && callStack)
+ stackTrace = formatStackTraceString(message, callStack);
+
+ page->chrome().client().addMessageToConsole(source, level, message, lineNumber, url, stackTrace);
+}
+
+String PageConsole::formatStackTraceString(const String& originalMessage, PassRefPtr<ScriptCallStack> callStack)
+{
+ StringBuilder stackTrace;
+ for (size_t i = 0; i < callStack->size(); ++i) {
+ const ScriptCallFrame& frame = callStack->at(i);
+ stackTrace.append("\n at " + (frame.functionName().length() ? frame.functionName() : "(anonymous function)"));
+ stackTrace.append(" (");
+ stackTrace.append(frame.sourceURL());
+ stackTrace.append(':');
+ stackTrace.append(String::number(frame.lineNumber()));
+ stackTrace.append(':');
+ stackTrace.append(String::number(frame.columnNumber()));
+ stackTrace.append(')');
+ }
+
+ return stackTrace.toString();
}
-// static
void PageConsole::mute()
{
muteCount++;
}
-// static
void PageConsole::unmute()
{
ASSERT(muteCount > 0);
« no previous file with comments | « Source/core/page/PageConsole.h ('k') | Source/web/ChromeClientImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698