Extension Error Piping - Blink: WebKit Side

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 24 matching lines @@
 #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"
+#include "core/page/PageConsole.h"
 #include "wtf/text/CString.h"
 #include "wtf/text/WTFString.h"
 
 #include "core/platform/chromium/TraceEvent.h"
 
 namespace WebCore {
 
 Console::Console(Frame* frame)
     : DOMWindowProperty(frame)
 {
     ScriptWrappable::init(this);
 }
 
 Console::~Console()
 {
 }
 
 static void internalAddMessage(Page* page, MessageType type, MessageLevel level, ScriptState* state, PassRefPtr<ScriptArguments> prpArguments, bool acceptNoArguments = false, bool printTrace = false)
 {
     RefPtr<ScriptArguments> arguments = prpArguments;
 
     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 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());
+    String stackTrace;
+    if (gotMessage) {
+        RefPtr<ScriptCallStack> callStack(createScriptCallStack(state, 1));
+        if (page->chrome().client().shouldReportDetailedMessageForSource(callStack->at(0).sourceURL())) {
+            callStack = createScriptCallStack(ScriptCallStack::maxCallStackSizeToCapture);
+            stackTrace = PageConsole::formatStackTraceString(message, callStack);
+        }
+        page->chrome().client().addMessageToConsole(ConsoleAPIMessageSource, level, message, callStack->at(0).lineNumber(), callStack->at(0).sourceURL(), stackTrace);
+    }
 }
 
 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 138 matching lines @@
 }
 
 Page* Console::page() const
 {
     if (!m_frame)
         return 0;
     return m_frame->page();
 }
 
 } // namespace WebCore