Route JS Error Info From Blink to Chrome

Source/core/page/PageConsole.cpp

 /*
  * Copyright (C) 2013 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/PageConsole.h"
 
 #include "core/dom/Document.h"
 #include "core/dom/ScriptableDocumentParser.h"
 #include "core/inspector/ConsoleAPITypes.h"
+#include "core/inspector/InspectorAgent.h"
 #include "core/inspector/InspectorConsoleInstrumentation.h"
 #include "core/inspector/ScriptCallStack.h"
 #include "core/page/Chrome.h"
 #include "core/page/ChromeClient.h"
 #include "core/page/ConsoleTypes.h"
 #include "core/page/Page.h"
 #include "wtf/text/WTFString.h"
 
 namespace WebCore {
 
 namespace {
 
 int muteCount = 0;
 
+PassOwnPtr<ConsoleMessage> createConsoleMessage(Page* page, MessageSource source, MessageLevel level, const String& message, const String& url, unsigned lineNumber, unsigned columnNumber, PassRefPtr<ScriptCallStack> callStack, ScriptState* state, unsigned long requestIdentifier)
+{
+    String executionContextURL = page->mainFrame()->document()->url().string();
+    bool reportDetailedMessage = (state && page->chrome().client()->shouldReportDetailedMessageForContext(state->context()))
+        || page->chrome().client()->shouldReportDetailedMessageForURL(url)
+        || page->chrome().client()->shouldReportDetailedMessageForURL(executionContextURL);
+
+    if (callStack)
+        return adoptPtr(new ConsoleMessage(reportDetailedMessage, source, LogMessageType, level, message, executionContextURL, callStack, requestIdentifier));
+
+    return adoptPtr(new ConsoleMessage(reportDetailedMessage, source, LogMessageType, level, message, executionContextURL, url, lineNumber, columnNumber, state, requestIdentifier));
 }
 
+} // anonymous namespace
+
 PageConsole::PageConsole(Page* page)
     : m_page(page)
 {
 }
 
 PageConsole::~PageConsole() { }
 
 void PageConsole::addMessage(MessageSource source, MessageLevel level, const String& message, unsigned long requestIdentifier, Document* document)
 {
     String url;
@@ skipping 15 matching lines @@
 
 void PageConsole::addMessage(MessageSource source, MessageLevel level, const String& message, const String& url, unsigned lineNumber, unsigned columnNumber, PassRefPtr<ScriptCallStack> callStack, ScriptState* state, unsigned long requestIdentifier)
 {
     if (muteCount && source != ConsoleAPIMessageSource)
         return;
 
     Page* page = this->page();
     if (!page)
         return;
 
+    OwnPtr<ConsoleMessage> consoleMessage = createConsoleMessage(page, source, level, message, url, lineNumber, columnNumber, callStack, state, requestIdentifier);
+
+    if (source != CSSMessageSource)
+        page->chrome().client()->addMessageToConsole(source, level, message, lineNumber, url, consoleMessage->generateJSONWithoutArguments()->toJSONString());
+
     if (callStack)
-        InspectorInstrumentation::addMessageToConsole(page, source, LogMessageType, level, message, callStack, requestIdentifier);
+        InspectorInstrumentation::addMessageToConsole(page, consoleMessage.release(), InspectorAgent::DontCheckFrontend);
     else
-        InspectorInstrumentation::addMessageToConsole(page, source, LogMessageType, level, message, url, lineNumber, columnNumber, state, requestIdentifier);
-
-    if (source == CSSMessageSource)
-        return;
-
-    page->chrome().client()->addMessageToConsole(source, level, message, lineNumber, url);
+        InspectorInstrumentation::addMessageToConsole(page, consoleMessage.release(), InspectorAgent::CheckFrontend);
 }
 
 // static
 void PageConsole::mute()
 {
     muteCount++;
 }
 
 // static
 void PageConsole::unmute()
 {
     ASSERT(muteCount > 0);
     muteCount--;
 }
 
 } // namespace WebCore