Route JS Error Info From Blink to Chrome

Source/core/page/Console.cpp

 /*
  * Copyright (C) 2007 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 14 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/page/Console.h"
 
 #include "bindings/v8/ScriptCallStackFactory.h"
 #include "bindings/v8/ScriptProfiler.h"
 #include "core/inspector/ConsoleAPITypes.h"
+#include "core/inspector/InspectorAgent.h"
 #include "core/inspector/InspectorConsoleInstrumentation.h"
 #include "core/inspector/ScriptArguments.h"
 #include "core/inspector/ScriptCallStack.h"
 #include "core/inspector/ScriptProfile.h"
 #include "core/page/Chrome.h"
 #include "core/page/ChromeClient.h"
 #include "core/page/ConsoleTypes.h"
 #include "core/page/Frame.h"
 #include "core/page/MemoryInfo.h"
 #include "core/page/Page.h"
@@ skipping 21 matching lines @@
     if (!page)
         return;
 
     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 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(), InspectorAgent::DontCheckFrontend);
 }
 
 void Console::debug(ScriptState* state, PassRefPtr<ScriptArguments> arguments)
 {
     internalAddMessage(page(), LogMessageType, DebugMessageLevel, state, arguments);
 }
 
 void Console::error(ScriptState* state, PassRefPtr<ScriptArguments> arguments)
 {
     internalAddMessage(page(), LogMessageType, ErrorMessageLevel, state, arguments);
@@ skipping 110 matching lines @@
     InspectorInstrumentation::stopConsoleTiming(m_frame, title, callStack.release());
 }
 
 void Console::timeStamp(PassRefPtr<ScriptArguments> arguments)
 {
     InspectorInstrumentation::consoleTimeStamp(m_frame, 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)), InspectorAgent::DontCheckFrontend);
 }
 
 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)), InspectorAgent::DontCheckFrontend);
 }
 
 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)), InspectorAgent::CheckFrontend);
 }
 
 PassRefPtr<MemoryInfo> Console::memory() const
 {
     // FIXME: Because we create a new object here each time,
     // console.memory !== console.memory, which seems wrong.
     return MemoryInfo::create(m_frame);
 }
 
 Page* Console::page() const
 {
     if (!m_frame)
         return 0;
     return m_frame->page();
 }
 
 } // namespace WebCore