| Index: third_party/WebKit/Source/core/inspector/InspectorDebuggerAgent.cpp
|
| diff --git a/third_party/WebKit/Source/core/inspector/InspectorDebuggerAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorDebuggerAgent.cpp
|
| index 2200437e1b8dc1afded16d64c1188cf2d635d5d2..50efdca09beca86af9366895bdeedec52097e9e3 100644
|
| --- a/third_party/WebKit/Source/core/inspector/InspectorDebuggerAgent.cpp
|
| +++ b/third_party/WebKit/Source/core/inspector/InspectorDebuggerAgent.cpp
|
| @@ -42,7 +42,7 @@ static const char debuggerEnabled[] = "debuggerEnabled";
|
| }
|
|
|
| InspectorDebuggerAgent::InspectorDebuggerAgent(V8RuntimeAgent* runtimeAgent, V8Debugger* debugger, int contextGroupId)
|
| - : InspectorBaseAgent<InspectorDebuggerAgent, InspectorFrontend::Debugger>("Debugger")
|
| + : InspectorBaseAgent<InspectorDebuggerAgent, protocol::Frontend::Debugger>("Debugger")
|
| , m_v8DebuggerAgent(V8DebuggerAgent::create(runtimeAgent, contextGroupId))
|
| , m_debugger(debugger)
|
| {
|
| @@ -58,7 +58,7 @@ InspectorDebuggerAgent::~InspectorDebuggerAgent()
|
| DEFINE_TRACE(InspectorDebuggerAgent)
|
| {
|
| visitor->trace(m_asyncCallTracker);
|
| - InspectorBaseAgent<InspectorDebuggerAgent, InspectorFrontend::Debugger>::trace(visitor);
|
| + InspectorBaseAgent<InspectorDebuggerAgent, protocol::Frontend::Debugger>::trace(visitor);
|
| }
|
|
|
| // Protocol implementation.
|
| @@ -87,12 +87,12 @@ void InspectorDebuggerAgent::setSkipAllPauses(ErrorString* errorString, bool inS
|
| m_v8DebuggerAgent->setSkipAllPauses(errorString, inSkipped);
|
| }
|
|
|
| -void InspectorDebuggerAgent::setBreakpointByUrl(ErrorString* errorString, int inLineNumber, const String* inUrl, const String* inUrlRegex, const int* inColumnNumber, const String* inCondition, TypeBuilder::Debugger::BreakpointId* outBreakpointId, RefPtr<TypeBuilder::Array<TypeBuilder::Debugger::Location>>& outLocations)
|
| +void InspectorDebuggerAgent::setBreakpointByUrl(ErrorString* errorString, int inLineNumber, const String* inUrl, const String* inUrlRegex, const int* inColumnNumber, const String* inCondition, protocol::TypeBuilder::Debugger::BreakpointId* outBreakpointId, RefPtr<protocol::TypeBuilder::Array<protocol::TypeBuilder::Debugger::Location>>& outLocations)
|
| {
|
| m_v8DebuggerAgent->setBreakpointByUrl(errorString, inLineNumber, inUrl, inUrlRegex, inColumnNumber, inCondition, outBreakpointId, outLocations);
|
| }
|
|
|
| -void InspectorDebuggerAgent::setBreakpoint(ErrorString* errorString, const RefPtr<JSONObject>& inLocation, const String* inCondition, TypeBuilder::Debugger::BreakpointId* outBreakpointId, RefPtr<TypeBuilder::Debugger::Location>& outActualLocation)
|
| +void InspectorDebuggerAgent::setBreakpoint(ErrorString* errorString, const RefPtr<JSONObject>& inLocation, const String* inCondition, protocol::TypeBuilder::Debugger::BreakpointId* outBreakpointId, RefPtr<protocol::TypeBuilder::Debugger::Location>& outActualLocation)
|
| {
|
| m_v8DebuggerAgent->setBreakpoint(errorString, inLocation, inCondition, outBreakpointId, outActualLocation);
|
| }
|
| @@ -137,7 +137,7 @@ void InspectorDebuggerAgent::stepIntoAsync(ErrorString* errorString)
|
| m_v8DebuggerAgent->stepIntoAsync(errorString);
|
| }
|
|
|
| -void InspectorDebuggerAgent::searchInContent(ErrorString* errorString, const String& inScriptId, const String& inQuery, const bool* inCaseSensitive, const bool* inIsRegex, RefPtr<TypeBuilder::Array<TypeBuilder::Debugger::SearchMatch>>& outResult)
|
| +void InspectorDebuggerAgent::searchInContent(ErrorString* errorString, const String& inScriptId, const String& inQuery, const bool* inCaseSensitive, const bool* inIsRegex, RefPtr<protocol::TypeBuilder::Array<protocol::TypeBuilder::Debugger::SearchMatch>>& outResult)
|
| {
|
| m_v8DebuggerAgent->searchInContent(errorString, inScriptId, inQuery, inCaseSensitive, inIsRegex, outResult);
|
| }
|
| @@ -147,12 +147,12 @@ void InspectorDebuggerAgent::canSetScriptSource(ErrorString* errorString, bool*
|
| m_v8DebuggerAgent->canSetScriptSource(errorString, outResult);
|
| }
|
|
|
| -void InspectorDebuggerAgent::setScriptSource(ErrorString* errorString, RefPtr<TypeBuilder::Debugger::SetScriptSourceError>& errorData, const String& inScriptId, const String& inScriptSource, const bool* inPreview, RefPtr<TypeBuilder::Array<TypeBuilder::Debugger::CallFrame>>& optOutCallFrames, TypeBuilder::OptOutput<bool>* optOutStackChanged, RefPtr<TypeBuilder::Debugger::StackTrace>& optOutAsyncStackTrace)
|
| +void InspectorDebuggerAgent::setScriptSource(ErrorString* errorString, RefPtr<protocol::TypeBuilder::Debugger::SetScriptSourceError>& errorData, const String& inScriptId, const String& inScriptSource, const bool* inPreview, RefPtr<protocol::TypeBuilder::Array<protocol::TypeBuilder::Debugger::CallFrame>>& optOutCallFrames, protocol::TypeBuilder::OptOutput<bool>* optOutStackChanged, RefPtr<protocol::TypeBuilder::Debugger::StackTrace>& optOutAsyncStackTrace)
|
| {
|
| m_v8DebuggerAgent->setScriptSource(errorString, errorData, inScriptId, inScriptSource, inPreview, optOutCallFrames, optOutStackChanged, optOutAsyncStackTrace);
|
| }
|
|
|
| -void InspectorDebuggerAgent::restartFrame(ErrorString* errorString, const String& inCallFrameId, RefPtr<TypeBuilder::Array<TypeBuilder::Debugger::CallFrame>>& outCallFrames, RefPtr<TypeBuilder::Debugger::StackTrace>& optOutAsyncStackTrace)
|
| +void InspectorDebuggerAgent::restartFrame(ErrorString* errorString, const String& inCallFrameId, RefPtr<protocol::TypeBuilder::Array<protocol::TypeBuilder::Debugger::CallFrame>>& outCallFrames, RefPtr<protocol::TypeBuilder::Debugger::StackTrace>& optOutAsyncStackTrace)
|
| {
|
| m_v8DebuggerAgent->restartFrame(errorString, inCallFrameId, outCallFrames, optOutAsyncStackTrace);
|
| }
|
| @@ -162,17 +162,17 @@ void InspectorDebuggerAgent::getScriptSource(ErrorString* errorString, const Str
|
| m_v8DebuggerAgent->getScriptSource(errorString, inScriptId, outScriptSource);
|
| }
|
|
|
| -void InspectorDebuggerAgent::getFunctionDetails(ErrorString* errorString, const String& inFunctionId, RefPtr<TypeBuilder::Debugger::FunctionDetails>& outDetails)
|
| +void InspectorDebuggerAgent::getFunctionDetails(ErrorString* errorString, const String& inFunctionId, RefPtr<protocol::TypeBuilder::Debugger::FunctionDetails>& outDetails)
|
| {
|
| m_v8DebuggerAgent->getFunctionDetails(errorString, inFunctionId, outDetails);
|
| }
|
|
|
| -void InspectorDebuggerAgent::getGeneratorObjectDetails(ErrorString* errorString, const String& inObjectId, RefPtr<TypeBuilder::Debugger::GeneratorObjectDetails>& outDetails)
|
| +void InspectorDebuggerAgent::getGeneratorObjectDetails(ErrorString* errorString, const String& inObjectId, RefPtr<protocol::TypeBuilder::Debugger::GeneratorObjectDetails>& outDetails)
|
| {
|
| m_v8DebuggerAgent->getGeneratorObjectDetails(errorString, inObjectId, outDetails);
|
| }
|
|
|
| -void InspectorDebuggerAgent::getCollectionEntries(ErrorString* errorString, const String& inObjectId, RefPtr<TypeBuilder::Array<TypeBuilder::Debugger::CollectionEntry>>& outEntries)
|
| +void InspectorDebuggerAgent::getCollectionEntries(ErrorString* errorString, const String& inObjectId, RefPtr<protocol::TypeBuilder::Array<protocol::TypeBuilder::Debugger::CollectionEntry>>& outEntries)
|
| {
|
| m_v8DebuggerAgent->getCollectionEntries(errorString, inObjectId, outEntries);
|
| }
|
| @@ -182,7 +182,7 @@ void InspectorDebuggerAgent::setPauseOnExceptions(ErrorString* errorString, cons
|
| m_v8DebuggerAgent->setPauseOnExceptions(errorString, inState);
|
| }
|
|
|
| -void InspectorDebuggerAgent::evaluateOnCallFrame(ErrorString* errorString, const String& inCallFrameId, const String& inExpression, const String* inObjectGroup, const bool* inIncludeCommandLineAPI, const bool* inDoNotPauseOnExceptionsAndMuteConsole, const bool* inReturnByValue, const bool* inGeneratePreview, RefPtr<TypeBuilder::Runtime::RemoteObject>& outResult, TypeBuilder::OptOutput<bool>* optOutWasThrown, RefPtr<TypeBuilder::Runtime::ExceptionDetails>& optOutExceptionDetails)
|
| +void InspectorDebuggerAgent::evaluateOnCallFrame(ErrorString* errorString, const String& inCallFrameId, const String& inExpression, const String* inObjectGroup, const bool* inIncludeCommandLineAPI, const bool* inDoNotPauseOnExceptionsAndMuteConsole, const bool* inReturnByValue, const bool* inGeneratePreview, RefPtr<protocol::TypeBuilder::Runtime::RemoteObject>& outResult, protocol::TypeBuilder::OptOutput<bool>* optOutWasThrown, RefPtr<protocol::TypeBuilder::Runtime::ExceptionDetails>& optOutExceptionDetails)
|
| {
|
| MuteConsoleScope<InspectorDebuggerAgent> muteScope;
|
| if (asBool(inDoNotPauseOnExceptionsAndMuteConsole))
|
| @@ -195,12 +195,12 @@ void InspectorDebuggerAgent::setVariableValue(ErrorString* errorString, int inSc
|
| m_v8DebuggerAgent->setVariableValue(errorString, inScopeNumber, inVariableName, inNewValue, inCallFrameId, inFunctionObjectId);
|
| }
|
|
|
| -void InspectorDebuggerAgent::getStepInPositions(ErrorString* errorString, const String& inCallFrameId, RefPtr<TypeBuilder::Array<TypeBuilder::Debugger::Location>>& optOutStepInPositions)
|
| +void InspectorDebuggerAgent::getStepInPositions(ErrorString* errorString, const String& inCallFrameId, RefPtr<protocol::TypeBuilder::Array<protocol::TypeBuilder::Debugger::Location>>& optOutStepInPositions)
|
| {
|
| m_v8DebuggerAgent->getStepInPositions(errorString, inCallFrameId, optOutStepInPositions);
|
| }
|
|
|
| -void InspectorDebuggerAgent::getBacktrace(ErrorString* errorString, RefPtr<TypeBuilder::Array<TypeBuilder::Debugger::CallFrame>>& outCallFrames, RefPtr<TypeBuilder::Debugger::StackTrace>& optOutAsyncStackTrace)
|
| +void InspectorDebuggerAgent::getBacktrace(ErrorString* errorString, RefPtr<protocol::TypeBuilder::Array<protocol::TypeBuilder::Debugger::CallFrame>>& outCallFrames, RefPtr<protocol::TypeBuilder::Debugger::StackTrace>& optOutAsyncStackTrace)
|
| {
|
| m_v8DebuggerAgent->getBacktrace(errorString, outCallFrames, optOutAsyncStackTrace);
|
| }
|
| @@ -221,7 +221,7 @@ void InspectorDebuggerAgent::disablePromiseTracker(ErrorString* errorString)
|
| m_v8DebuggerAgent->disablePromiseTracker(errorString);
|
| }
|
|
|
| -void InspectorDebuggerAgent::getPromiseById(ErrorString* errorString, int inPromiseId, const String* inObjectGroup, RefPtr<TypeBuilder::Runtime::RemoteObject>& outPromise)
|
| +void InspectorDebuggerAgent::getPromiseById(ErrorString* errorString, int inPromiseId, const String* inObjectGroup, RefPtr<protocol::TypeBuilder::Runtime::RemoteObject>& outPromise)
|
| {
|
| m_v8DebuggerAgent->getPromiseById(errorString, inPromiseId, inObjectGroup, outPromise);
|
| }
|
| @@ -255,7 +255,7 @@ void InspectorDebuggerAgent::scriptExecutionBlockedByCSP(const String& directive
|
| {
|
| RefPtr<JSONObject> directive = JSONObject::create();
|
| directive->setString("directiveText", directiveText);
|
| - m_v8DebuggerAgent->breakProgramOnException(InspectorFrontend::Debugger::Reason::CSPViolation, directive.release());
|
| + m_v8DebuggerAgent->breakProgramOnException(protocol::Frontend::Debugger::Reason::CSPViolation, directive.release());
|
| }
|
|
|
| void InspectorDebuggerAgent::willExecuteScript(int scriptId)
|
| @@ -280,10 +280,10 @@ void InspectorDebuggerAgent::init()
|
| m_asyncCallTracker = adoptPtrWillBeNoop(new AsyncCallTracker(m_v8DebuggerAgent.get(), m_instrumentingAgents.get()));
|
| }
|
|
|
| -void InspectorDebuggerAgent::setFrontend(InspectorFrontend* frontend)
|
| +void InspectorDebuggerAgent::setFrontend(protocol::Frontend* frontend)
|
| {
|
| InspectorBaseAgent::setFrontend(frontend);
|
| - m_v8DebuggerAgent->setFrontend(InspectorFrontend::Debugger::from(frontend));
|
| + m_v8DebuggerAgent->setFrontend(protocol::Frontend::Debugger::from(frontend));
|
| }
|
|
|
| void InspectorDebuggerAgent::clearFrontend()
|
|
|