Route JS Error Info From Blink to Chrome

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..6d4bb35fd3c1c12756d3d6a3aa075ca7d0860523 100644
--- a/Source/core/page/Console.cpp
+++ b/Source/core/page/Console.cpp
@@ -73,12 +73,18 @@ static void internalAddMessage(Page* page, MessageType type, MessageLevel level,
     RefPtr<ScriptCallStack> callStack(createScriptCallStack(state, stackSize));
     const ScriptCallFrame& lastCaller = callStack->at(0);
 
+    String executionContextURL = state->scriptExecutionContext()->url().string();
+    bool reportDetailedMessage = page->chrome().client()->shouldReportDetailedMessageForContext(state->context()) || page->chrome().client()->shouldReportDetailedMessageForURL(executionContextURL);
+
     String message;
     bool gotMessage = arguments->getFirstArgumentAsString(message);
-    InspectorInstrumentation::addMessageToConsole(page, ConsoleAPIMessageSource, type, level, message, state, arguments);
+
+    OwnPtr<ConsoleMessage> consoleMessage = adoptPtr(new ConsoleMessage(reportDetailedMessage, ConsoleAPIMessageSource, type, level, message, executionContextURL, prpArguments, state, 0));
 
     if (gotMessage)
-        page->chrome().client()->addMessageToConsole(ConsoleAPIMessageSource, type, level, message, lastCaller.lineNumber(), lastCaller.sourceURL());
+        page->chrome().client()->addMessageToConsole(ConsoleAPIMessageSource, level, message, lastCaller.lineNumber(), lastCaller.sourceURL(), consoleMessage->generateJSONWithoutArguments()->toJSONString());
+
+    InspectorInstrumentation::addMessageToConsole(page, consoleMessage.release());
 }
 
 void Console::debug(ScriptState* state, PassRefPtr<ScriptArguments> arguments)
@@ -209,17 +215,17 @@ void Console::timeStamp(PassRefPtr<ScriptArguments> arguments)
 
 void Console::group(ScriptState* state, PassRefPtr<ScriptArguments> arguments)
 {
-    InspectorInstrumentation::addMessageToConsole(page(), ConsoleAPIMessageSource, StartGroupMessageType, LogMessageLevel, String(), state, arguments);
+    InspectorInstrumentation::addMessageToConsole(page(), adoptPtr(new ConsoleMessage(false, ConsoleAPIMessageSource, StartGroupMessageType, LogMessageLevel, String(), String(), arguments, state, 0)));
 }
 
 void Console::groupCollapsed(ScriptState* state, PassRefPtr<ScriptArguments> arguments)
 {
-    InspectorInstrumentation::addMessageToConsole(page(), ConsoleAPIMessageSource, StartGroupCollapsedMessageType, LogMessageLevel, String(), state, arguments);
+    InspectorInstrumentation::addMessageToConsole(page(), adoptPtr(new ConsoleMessage(false, ConsoleAPIMessageSource, StartGroupCollapsedMessageType, LogMessageLevel, String(), String(), arguments, state, 0)));
 }
 
 void Console::groupEnd()
 {
-    InspectorInstrumentation::addMessageToConsole(page(), ConsoleAPIMessageSource, EndGroupMessageType, LogMessageLevel, String(), String(), 0, 0);
+    InspectorInstrumentation::addMessageToConsole(page(), adoptPtr(new ConsoleMessage(false, ConsoleAPIMessageSource, EndGroupMessageType, LogMessageLevel, String(), String(), String(), 0, 0, 0, 0)), true);
 }
 
 PassRefPtr<MemoryInfo> Console::memory() const