Extension Error Piping - Blink: WebKit Side

Source/core/page/Console.cpp

Index: Source/core/page/Console.cpp
diff --git a/Source/core/page/Console.cpp b/Source/core/page/Console.cpp
index bd34162ac01de4fa12be8ecbfa4529726f6c7d9f..4a42f739ed74aa84f6986c9098ea6264fc8bdb55 100644
--- a/Source/core/page/Console.cpp
+++ b/Source/core/page/Console.cpp
@@ -39,6 +39,7 @@
 #include "core/page/Chrome.h"
 #include "core/page/ChromeClient.h"
 #include "core/page/ConsoleTypes.h"
+#include "core/page/FormatConsoleMessage.h"
 #include "core/page/Frame.h"
 #include "core/page/MemoryInfo.h"
 #include "core/page/Page.h"
@@ -69,16 +70,18 @@ static void internalAddMessage(Page* page, MessageType type, MessageLevel level,
     if (!acceptNoArguments && !arguments->argumentCount())
         return;
 
-    size_t stackSize = printTrace ? ScriptCallStack::maxCallStackSizeToCapture : 1;
-    RefPtr<ScriptCallStack> callStack(createScriptCallStack(state, stackSize));
-    const ScriptCallFrame& lastCaller = callStack->at(0);
-
     String message;
     bool gotMessage = arguments->getFirstArgumentAsString(message);
     InspectorInstrumentation::addMessageToConsole(page, ConsoleAPIMessageSource, type, level, message, state, arguments);
 
-    if (gotMessage)
-        page->chrome().client()->addMessageToConsole(ConsoleAPIMessageSource, type, level, message, lastCaller.lineNumber(), lastCaller.sourceURL());
+    if (gotMessage) {
+        RefPtr<ScriptCallStack> callStack(createScriptCallStack(state, 1));
+        if (page->chrome().client()->shouldReportDetailedMessageForSource(callStack->at(0).sourceURL())) {
+            callStack = createScriptCallStack(ScriptCallStack::maxCallStackSizeToCapture);
+            message = formatConsoleMessage(message, callStack);
+        }
+        page->chrome().client()->addMessageToConsole(ConsoleAPIMessageSource, type, level, message, callStack->at(0).lineNumber(), callStack->at(0).sourceURL());
+    }
 }
 
 void Console::debug(ScriptState* state, PassRefPtr<ScriptArguments> arguments)