| Index: Source/core/inspector/InspectorDebuggerAgent.cpp
|
| diff --git a/Source/core/inspector/InspectorDebuggerAgent.cpp b/Source/core/inspector/InspectorDebuggerAgent.cpp
|
| index 2aa150d3968e827651dae9facdecc02c44e3ad17..9c25987e753108fad8250a4b6f0aba6b9ce08fb0 100644
|
| --- a/Source/core/inspector/InspectorDebuggerAgent.cpp
|
| +++ b/Source/core/inspector/InspectorDebuggerAgent.cpp
|
| @@ -345,7 +345,7 @@ static bool matches(const String& url, const String& pattern, bool isRegex)
|
| return url == pattern;
|
| }
|
|
|
| -void InspectorDebuggerAgent::setBreakpointByUrl(ErrorString* errorString, int lineNumber, const String* const optionalURL, const String* const optionalURLRegex, const int* const optionalColumnNumber, const String* const optionalCondition, BreakpointId* outBreakpointId, RefPtr<Array<TypeBuilder::Debugger::Location> >& locations)
|
| +void InspectorDebuggerAgent::setBreakpointByUrl(ErrorString* errorString, int lineNumber, const String* const optionalURL, const String* const optionalURLRegex, const int* const optionalColumnNumber, const String* const optionalCondition, BreakpointId* outBreakpointId, RefPtr<Array<TypeBuilder::Debugger::Location>>& locations)
|
| {
|
| locations = Array<TypeBuilder::Debugger::Location>::create();
|
| if (!optionalURL == !optionalURLRegex) {
|
| @@ -463,7 +463,7 @@ void InspectorDebuggerAgent::continueToLocation(ErrorString* errorString, const
|
| resume(errorString);
|
| }
|
|
|
| -void InspectorDebuggerAgent::getStepInPositions(ErrorString* errorString, const String& callFrameId, RefPtr<Array<TypeBuilder::Debugger::Location> >& positions)
|
| +void InspectorDebuggerAgent::getStepInPositions(ErrorString* errorString, const String& callFrameId, RefPtr<Array<TypeBuilder::Debugger::Location>>& positions)
|
| {
|
| if (!isPaused() || m_currentCallStack.isEmpty()) {
|
| *errorString = "Attempt to access callframe when debugger is not on pause";
|
| @@ -478,7 +478,7 @@ void InspectorDebuggerAgent::getStepInPositions(ErrorString* errorString, const
|
| injectedScript.getStepInPositions(errorString, m_currentCallStack, callFrameId, positions);
|
| }
|
|
|
| -void InspectorDebuggerAgent::getBacktrace(ErrorString* errorString, RefPtr<Array<CallFrame> >& callFrames, RefPtr<StackTrace>& asyncStackTrace)
|
| +void InspectorDebuggerAgent::getBacktrace(ErrorString* errorString, RefPtr<Array<CallFrame>>& callFrames, RefPtr<StackTrace>& asyncStackTrace)
|
| {
|
| if (!assertPaused(errorString))
|
| return;
|
| @@ -590,7 +590,7 @@ PassRefPtr<TypeBuilder::Debugger::Location> InspectorDebuggerAgent::resolveBreak
|
| return location;
|
| }
|
|
|
| -void InspectorDebuggerAgent::searchInContent(ErrorString* error, const String& scriptId, const String& query, const bool* const optionalCaseSensitive, const bool* const optionalIsRegex, RefPtr<Array<blink::TypeBuilder::Page::SearchMatch> >& results)
|
| +void InspectorDebuggerAgent::searchInContent(ErrorString* error, const String& scriptId, const String& query, const bool* const optionalCaseSensitive, const bool* const optionalIsRegex, RefPtr<Array<blink::TypeBuilder::Page::SearchMatch>>& results)
|
| {
|
| ScriptsMap::iterator it = m_scripts.find(scriptId);
|
| if (it != m_scripts.end())
|
| @@ -599,7 +599,7 @@ void InspectorDebuggerAgent::searchInContent(ErrorString* error, const String& s
|
| *error = "No script for id: " + scriptId;
|
| }
|
|
|
| -void InspectorDebuggerAgent::setScriptSource(ErrorString* error, RefPtr<TypeBuilder::Debugger::SetScriptSourceError>& errorData, const String& scriptId, const String& newContent, const bool* const preview, RefPtr<Array<CallFrame> >& newCallFrames, RefPtr<JSONObject>& result, RefPtr<StackTrace>& asyncStackTrace)
|
| +void InspectorDebuggerAgent::setScriptSource(ErrorString* error, RefPtr<TypeBuilder::Debugger::SetScriptSourceError>& errorData, const String& scriptId, const String& newContent, const bool* const preview, RefPtr<Array<CallFrame>>& newCallFrames, RefPtr<JSONObject>& result, RefPtr<StackTrace>& asyncStackTrace)
|
| {
|
| if (!scriptDebugServer().setScriptSource(scriptId, newContent, asBool(preview), error, errorData, &m_currentCallStack, &result))
|
| return;
|
| @@ -617,7 +617,7 @@ void InspectorDebuggerAgent::setScriptSource(ErrorString* error, RefPtr<TypeBuil
|
| pageAgent->addEditedResourceContent(url, newContent);
|
| }
|
|
|
| -void InspectorDebuggerAgent::restartFrame(ErrorString* errorString, const String& callFrameId, RefPtr<Array<CallFrame> >& newCallFrames, RefPtr<JSONObject>& result, RefPtr<StackTrace>& asyncStackTrace)
|
| +void InspectorDebuggerAgent::restartFrame(ErrorString* errorString, const String& callFrameId, RefPtr<Array<CallFrame>>& newCallFrames, RefPtr<JSONObject>& result, RefPtr<StackTrace>& asyncStackTrace)
|
| {
|
| if (!isPaused() || m_currentCallStack.isEmpty()) {
|
| *errorString = "Attempt to access callframe when debugger is not on pause";
|
| @@ -674,7 +674,7 @@ void InspectorDebuggerAgent::getGeneratorObjectDetails(ErrorString* errorString,
|
| injectedScript.getGeneratorObjectDetails(errorString, objectId, &details);
|
| }
|
|
|
| -void InspectorDebuggerAgent::getCollectionEntries(ErrorString* errorString, const String& objectId, RefPtr<TypeBuilder::Array<CollectionEntry> >& entries)
|
| +void InspectorDebuggerAgent::getCollectionEntries(ErrorString* errorString, const String& objectId, RefPtr<TypeBuilder::Array<CollectionEntry>>& entries)
|
| {
|
| InjectedScript injectedScript = m_injectedScriptManager->injectedScriptForObjectId(objectId);
|
| if (injectedScript.isEmpty()) {
|
| @@ -1035,7 +1035,7 @@ void InspectorDebuggerAgent::disablePromiseTracker(ErrorString*)
|
| promiseTracker().setEnabled(false, false);
|
| }
|
|
|
| -void InspectorDebuggerAgent::getPromises(ErrorString* errorString, RefPtr<Array<PromiseDetails> >& promises)
|
| +void InspectorDebuggerAgent::getPromises(ErrorString* errorString, RefPtr<Array<PromiseDetails>>& promises)
|
| {
|
| if (!promiseTracker().isEnabled()) {
|
| *errorString = "Promise tracking is disabled";
|
| @@ -1245,7 +1245,7 @@ void InspectorDebuggerAgent::changeJavaScriptRecursionLevel(int step)
|
| }
|
| }
|
|
|
| -PassRefPtr<Array<CallFrame> > InspectorDebuggerAgent::currentCallFrames()
|
| +PassRefPtr<Array<CallFrame>> InspectorDebuggerAgent::currentCallFrames()
|
| {
|
| if (!m_pausedScriptState || m_currentCallStack.isEmpty())
|
| return Array<CallFrame>::create();
|
| @@ -1427,7 +1427,7 @@ ScriptDebugListener::SkipPauseRequest InspectorDebuggerAgent::didPause(ScriptSta
|
| }
|
| }
|
|
|
| - RefPtr<Array<String> > hitBreakpointIds = Array<String>::create();
|
| + RefPtr<Array<String>> hitBreakpointIds = Array<String>::create();
|
|
|
| for (const auto& point : hitBreakpoints) {
|
| DebugServerBreakpointToBreakpointIdAndSourceMap::iterator breakpointIterator = m_serverBreakpoints.find(point);
|
|
|