| Index: third_party/WebKit/Source/platform/v8_inspector/V8DebuggerAgentImpl.cpp
|
| diff --git a/third_party/WebKit/Source/platform/v8_inspector/V8DebuggerAgentImpl.cpp b/third_party/WebKit/Source/platform/v8_inspector/V8DebuggerAgentImpl.cpp
|
| index c2b8db6fc9df183a8cf6b07e9cc9959aa2695db3..08c26b99c8c88a715d3574ed0735bf72dde4ff69 100644
|
| --- a/third_party/WebKit/Source/platform/v8_inspector/V8DebuggerAgentImpl.cpp
|
| +++ b/third_party/WebKit/Source/platform/v8_inspector/V8DebuggerAgentImpl.cpp
|
| @@ -155,12 +155,12 @@ static std::unique_ptr<protocol::Debugger::Location> buildProtocolLocation(const
|
| .setColumnNumber(columnNumber).build();
|
| }
|
|
|
| -V8DebuggerAgentImpl::V8DebuggerAgentImpl(V8InspectorSessionImpl* session, protocol::Debugger::Frontend* frontend, protocol::DictionaryValue* state)
|
| +V8DebuggerAgentImpl::V8DebuggerAgentImpl(V8InspectorSessionImpl* session, protocol::FrontendChannel* frontendChannel, protocol::DictionaryValue* state)
|
| : m_debugger(session->debugger())
|
| , m_session(session)
|
| , m_enabled(false)
|
| , m_state(state)
|
| - , m_frontend(frontend)
|
| + , m_frontend(frontendChannel)
|
| , m_isolate(m_debugger->isolate())
|
| , m_breakReason(protocol::Debugger::Paused::ReasonEnum::Other)
|
| , m_scheduledDebuggerStep(NoStep)
|
| @@ -223,7 +223,6 @@ void V8DebuggerAgentImpl::enable(ErrorString* errorString)
|
| }
|
|
|
| enable();
|
| - DCHECK(m_frontend);
|
| }
|
|
|
| void V8DebuggerAgentImpl::disable(ErrorString*)
|
| @@ -1275,9 +1274,9 @@ void V8DebuggerAgentImpl::didParseSource(const V8DebuggerParsedScript& parsedScr
|
| const bool* hasSourceURLParam = hasSourceURL ? &hasSourceURL : nullptr;
|
| const bool* deprecatedCommentWasUsedParam = deprecatedCommentWasUsed ? &deprecatedCommentWasUsed : nullptr;
|
| if (parsedScript.success)
|
| - m_frontend->scriptParsed(parsedScript.scriptId, scriptURL, script.startLine(), script.startColumn(), script.endLine(), script.endColumn(), executionContextId, script.hash(), isContentScriptParam, isInternalScriptParam, isLiveEditParam, sourceMapURLParam, hasSourceURLParam, deprecatedCommentWasUsedParam);
|
| + m_frontend.scriptParsed(parsedScript.scriptId, scriptURL, script.startLine(), script.startColumn(), script.endLine(), script.endColumn(), executionContextId, script.hash(), isContentScriptParam, isInternalScriptParam, isLiveEditParam, sourceMapURLParam, hasSourceURLParam, deprecatedCommentWasUsedParam);
|
| else
|
| - m_frontend->scriptFailedToParse(parsedScript.scriptId, scriptURL, script.startLine(), script.startColumn(), script.endLine(), script.endColumn(), executionContextId, script.hash(), isContentScriptParam, isInternalScriptParam, sourceMapURLParam, hasSourceURLParam, deprecatedCommentWasUsedParam);
|
| + m_frontend.scriptFailedToParse(parsedScript.scriptId, scriptURL, script.startLine(), script.startColumn(), script.endLine(), script.endColumn(), executionContextId, script.hash(), isContentScriptParam, isInternalScriptParam, sourceMapURLParam, hasSourceURLParam, deprecatedCommentWasUsedParam);
|
|
|
| m_scripts.set(parsedScript.scriptId, script);
|
|
|
| @@ -1303,7 +1302,7 @@ void V8DebuggerAgentImpl::didParseSource(const V8DebuggerParsedScript& parsedScr
|
| breakpointObject->getString(DebuggerAgentState::condition, &breakpoint.condition);
|
| std::unique_ptr<protocol::Debugger::Location> location = resolveBreakpoint(cookie.first, parsedScript.scriptId, breakpoint, UserBreakpointSource);
|
| if (location)
|
| - m_frontend->breakpointResolved(cookie.first, std::move(location));
|
| + m_frontend.breakpointResolved(cookie.first, std::move(location));
|
| }
|
| }
|
|
|
| @@ -1363,7 +1362,7 @@ V8DebuggerAgentImpl::SkipPauseRequest V8DebuggerAgentImpl::didPause(v8::Local<v8
|
| }
|
|
|
| ErrorString errorString;
|
| - m_frontend->paused(currentCallFrames(&errorString), m_breakReason, std::move(m_breakAuxData), std::move(hitBreakpointIds), currentAsyncStackTrace());
|
| + m_frontend.paused(currentCallFrames(&errorString), m_breakReason, std::move(m_breakAuxData), std::move(hitBreakpointIds), currentAsyncStackTrace());
|
| m_scheduledDebuggerStep = NoStep;
|
| m_javaScriptPauseScheduled = false;
|
| m_steppingFromFramework = false;
|
| @@ -1384,7 +1383,7 @@ void V8DebuggerAgentImpl::didContinue()
|
| JavaScriptCallFrames emptyCallFrames;
|
| m_pausedCallFrames.swap(emptyCallFrames);
|
| clearBreakDetails();
|
| - m_frontend->resumed();
|
| + m_frontend.resumed();
|
| }
|
|
|
| void V8DebuggerAgentImpl::breakProgram(const String16& breakReason, std::unique_ptr<protocol::DictionaryValue> data)
|
|
|