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 51 matching lines @@
 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));
+    bool reportDetailedMessage = page->chrome().client()->shouldReportDetailedMessage(state->scriptExecutionContext()->url().string());
+
+    size_t stackSize = printTrace || reportDetailedMessage ? ScriptCallStack::maxCallStackSizeToCapture : 1;
+    RefPtr<ScriptCallStack> callStack(createScriptCallStack(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> stackToUse = callStack;
+        // Unfortunately, the check above for whether or not we care is only heuristically correct, since the url isn't always the same as the context in which the script was executed. In this case, we may decide we want detailed information only after we generate the original stack trace.
+        if (!reportDetailedMessage && (reportDetailedMessage = page->chrome().client()->shouldReportDetailedMessage(lastCaller.sourceURL())))
+            stackToUse = createScriptCallStack(ScriptCallStack::maxCallStackSizeToCapture);
+
+        String stackTrace;
+        if (reportDetailedMessage)
+            stackTrace = stackToUse->buildInspectorArray()->toJSONString();
+
+        page->chrome().client()->addMessageToConsole(ConsoleAPIMessageSource, level, message, lastCaller.lineNumber(), lastCaller.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