Index: Source/core/inspector/InspectorConsoleAgent.cpp |
diff --git a/Source/core/inspector/InspectorConsoleAgent.cpp b/Source/core/inspector/InspectorConsoleAgent.cpp |
index b4fcec92523e2c0dfae483fce70504d866700b03..2fede4641868301a01ce347da3efc824931bb82c 100644 |
--- a/Source/core/inspector/InspectorConsoleAgent.cpp |
+++ b/Source/core/inspector/InspectorConsoleAgent.cpp |
@@ -159,7 +159,7 @@ void InspectorConsoleAgent::addMessageToConsole(MessageSource source, MessageTyp |
clearMessages(&error); |
} |
- addConsoleMessage(adoptPtr(new ConsoleMessage(!isWorkerAgent(), source, type, level, message, callStack, requestIdentifier))); |
+ addConsoleMessage(adoptPtr(new ConsoleMessage(!isWorkerAgent(), source, type, level, message, String(), callStack, requestIdentifier))); |
} |
void InspectorConsoleAgent::addMessageToConsole(MessageSource source, MessageType type, MessageLevel level, const String& message, ScriptState* state, PassRefPtr<ScriptArguments> arguments, unsigned long requestIdentifier) |
@@ -169,7 +169,15 @@ void InspectorConsoleAgent::addMessageToConsole(MessageSource source, MessageTyp |
clearMessages(&error); |
} |
- addConsoleMessage(adoptPtr(new ConsoleMessage(!isWorkerAgent(), source, type, level, message, arguments, state, requestIdentifier))); |
+ addConsoleMessage(adoptPtr(new ConsoleMessage(!isWorkerAgent(), source, type, level, message, String(), arguments, state, requestIdentifier))); |
+} |
+ |
+void InspectorConsoleAgent::addMessageToConsole(PassOwnPtr<ConsoleMessage> message, InspectorAgent::CheckFrontendBehavior behavior) |
+{ |
+ bool generateCallStack = !isWorkerAgent() && (behavior == InspectorAgent::DontCheckFrontend || m_frontend); |
+ if (generateCallStack && !message->hasGeneratedCallStack()) |
+ message->generateCallStack(ScriptCallStack::maxCallStackSizeToCapture); |
+ addConsoleMessage(message); |
} |
void InspectorConsoleAgent::addMessageToConsole(MessageSource source, MessageType type, MessageLevel level, const String& message, const String& scriptId, unsigned lineNumber, unsigned columnNumber, ScriptState* state, unsigned long requestIdentifier) |
@@ -180,7 +188,7 @@ void InspectorConsoleAgent::addMessageToConsole(MessageSource source, MessageTyp |
} |
bool canGenerateCallStack = !isWorkerAgent() && m_frontend; |
- addConsoleMessage(adoptPtr(new ConsoleMessage(canGenerateCallStack, source, type, level, message, scriptId, lineNumber, columnNumber, state, requestIdentifier))); |
+ addConsoleMessage(adoptPtr(new ConsoleMessage(canGenerateCallStack, source, type, level, message, String(), scriptId, lineNumber, columnNumber, state, requestIdentifier))); |
} |
Vector<unsigned> InspectorConsoleAgent::consoleMessageArgumentCounts() |