Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1279)

Unified Diff: Source/core/page/Console.cpp

Issue 20191003: Route JS Error Info From Blink to Chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/blink@gclient
Patch Set: Adam's requests Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/page/Console.cpp
diff --git a/Source/core/page/Console.cpp b/Source/core/page/Console.cpp
index bd34162ac01de4fa12be8ecbfa4529726f6c7d9f..fca1aad25f46178af3dac31b981213492f308f05 100644
--- a/Source/core/page/Console.cpp
+++ b/Source/core/page/Console.cpp
@@ -32,6 +32,7 @@
#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"
@@ -73,12 +74,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(), InspectorAgent::DontCheckFrontend);
}
void Console::debug(ScriptState* state, PassRefPtr<ScriptArguments> arguments)
@@ -209,17 +216,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)), 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

Powered by Google App Engine
This is Rietveld 408576698