| Index: Source/core/inspector/InspectorDebuggerAgent.cpp
|
| diff --git a/Source/core/inspector/InspectorDebuggerAgent.cpp b/Source/core/inspector/InspectorDebuggerAgent.cpp
|
| index 08edc7a2dbcc20a49ef5d7d2a6e9b1736449cd5f..b343c5e2115aa4ba0f551db75e2334bdb5c7266d 100644
|
| --- a/Source/core/inspector/InspectorDebuggerAgent.cpp
|
| +++ b/Source/core/inspector/InspectorDebuggerAgent.cpp
|
| @@ -260,7 +260,7 @@ bool InspectorDebuggerAgent::runningNestedMessageLoop()
|
| void InspectorDebuggerAgent::addMessageToConsole(MessageSource source, MessageType type)
|
| {
|
| if (source == ConsoleAPIMessageSource && type == AssertMessageType && scriptDebugServer().pauseOnExceptionsState() != ScriptDebugServer::DontPauseOnExceptions)
|
| - breakProgram(InspectorFrontend::Debugger::Reason::Assert, 0);
|
| + breakProgram(InspectorFrontend::Debugger::Reason::Assert, nullptr);
|
| }
|
|
|
| void InspectorDebuggerAgent::addMessageToConsole(MessageSource source, MessageType type, MessageLevel, const String&, PassRefPtr<ScriptCallStack>, unsigned long)
|
| @@ -553,16 +553,16 @@ PassRefPtr<TypeBuilder::Debugger::Location> InspectorDebuggerAgent::resolveBreak
|
| {
|
| ScriptsMap::iterator scriptIterator = m_scripts.find(scriptId);
|
| if (scriptIterator == m_scripts.end())
|
| - return 0;
|
| + return nullptr;
|
| Script& script = scriptIterator->value;
|
| if (breakpoint.lineNumber < script.startLine || script.endLine < breakpoint.lineNumber)
|
| - return 0;
|
| + return nullptr;
|
|
|
| int actualLineNumber;
|
| int actualColumnNumber;
|
| String debugServerBreakpointId = scriptDebugServer().setBreakpoint(scriptId, breakpoint, &actualLineNumber, &actualColumnNumber, false);
|
| if (debugServerBreakpointId.isEmpty())
|
| - return 0;
|
| + return nullptr;
|
|
|
| m_serverBreakpoints.set(debugServerBreakpointId, std::make_pair(breakpointId, source));
|
|
|
| @@ -582,10 +582,10 @@ PassRefPtr<TypeBuilder::Debugger::Location> InspectorDebuggerAgent::resolveBreak
|
| static PassRefPtr<JSONObject> scriptToInspectorObject(ScriptObject scriptObject)
|
| {
|
| if (scriptObject.hasNoValue())
|
| - return 0;
|
| + return nullptr;
|
| RefPtr<JSONValue> value = scriptObject.toJSONValue(scriptObject.scriptState());
|
| if (!value)
|
| - return 0;
|
| + return nullptr;
|
| return value->asObject();
|
| }
|
|
|
| @@ -1057,18 +1057,18 @@ PassRefPtr<Array<CallFrame> > InspectorDebuggerAgent::currentCallFrames()
|
| PassRefPtr<StackTrace> InspectorDebuggerAgent::currentAsyncStackTrace()
|
| {
|
| if (!m_pausedScriptState || !m_asyncCallStackTracker.isEnabled())
|
| - return 0;
|
| + return nullptr;
|
| InjectedScript injectedScript = m_injectedScriptManager->injectedScriptFor(m_pausedScriptState);
|
| if (injectedScript.hasNoValue()) {
|
| ASSERT_NOT_REACHED();
|
| - return 0;
|
| + return nullptr;
|
| }
|
| const AsyncCallStackTracker::AsyncCallChain* chain = m_asyncCallStackTracker.currentAsyncCallChain();
|
| if (!chain)
|
| - return 0;
|
| + return nullptr;
|
| const AsyncCallStackTracker::AsyncCallStackVector& callStacks = chain->callStacks();
|
| if (callStacks.isEmpty())
|
| - return 0;
|
| + return nullptr;
|
| RefPtr<StackTrace> result;
|
| int asyncOrdinal = callStacks.size();
|
| for (AsyncCallStackTracker::AsyncCallStackVector::const_reverse_iterator it = callStacks.rbegin(); it != callStacks.rend(); ++it) {
|
| @@ -1243,7 +1243,7 @@ bool InspectorDebuggerAgent::assertPaused(ErrorString* errorString)
|
| void InspectorDebuggerAgent::clearBreakDetails()
|
| {
|
| m_breakReason = InspectorFrontend::Debugger::Reason::Other;
|
| - m_breakAuxData = 0;
|
| + m_breakAuxData = nullptr;
|
| }
|
|
|
| void InspectorDebuggerAgent::setBreakpoint(const String& scriptId, int lineNumber, int columnNumber, BreakpointSource source, const String& condition)
|
|
|