X-Git-Url: https://git.saurik.com/apple/javascriptcore.git/blobdiff_plain/81345200c95645a1b0d2635520f96ad55dfde63f..refs/heads/master:/inspector/agents/JSGlobalObjectDebuggerAgent.cpp diff --git a/inspector/agents/JSGlobalObjectDebuggerAgent.cpp b/inspector/agents/JSGlobalObjectDebuggerAgent.cpp index c087e81..9ae76c6 100644 --- a/inspector/agents/JSGlobalObjectDebuggerAgent.cpp +++ b/inspector/agents/JSGlobalObjectDebuggerAgent.cpp @@ -26,8 +26,7 @@ #include "config.h" #include "JSGlobalObjectDebuggerAgent.h" -#if ENABLE(INSPECTOR) - +#include "ConsoleMessage.h" #include "InjectedScriptManager.h" #include "InspectorConsoleAgent.h" #include "JSGlobalObject.h" @@ -56,10 +55,10 @@ void JSGlobalObjectDebuggerAgent::stopListeningScriptDebugServer(bool isBeingDes scriptDebugServer().removeListener(this, isBeingDestroyed); } -InjectedScript JSGlobalObjectDebuggerAgent::injectedScriptForEval(ErrorString* error, const int* executionContextId) +InjectedScript JSGlobalObjectDebuggerAgent::injectedScriptForEval(ErrorString& error, const int* executionContextId) { if (executionContextId) { - *error = ASCIILiteral("Execution context id is not supported for JSContext inspection as there is only one execution context."); + error = ASCIILiteral("Execution context id is not supported for JSContext inspection as there is only one execution context."); return InjectedScript(); } @@ -69,9 +68,7 @@ InjectedScript JSGlobalObjectDebuggerAgent::injectedScriptForEval(ErrorString* e void JSGlobalObjectDebuggerAgent::breakpointActionLog(JSC::ExecState* exec, const String& message) { - m_consoleAgent->addMessageToConsole(MessageSource::JS, MessageType::Log, MessageLevel::Log, message, createScriptCallStack(exec, ScriptCallStack::maxCallStackSizeToCapture), 0); + m_consoleAgent->addMessageToConsole(std::make_unique(MessageSource::JS, MessageType::Log, MessageLevel::Log, message, createScriptCallStack(exec, ScriptCallStack::maxCallStackSizeToCapture), 0)); } } // namespace Inspector - -#endif // ENABLE(INSPECTOR)