Index: third_party/WebKit/Source/core/inspector/InspectorDebuggerAgent.h |
diff --git a/third_party/WebKit/Source/core/inspector/InspectorDebuggerAgent.h b/third_party/WebKit/Source/core/inspector/InspectorDebuggerAgent.h |
index c8f1d75d663c4f0973e9d6c51ec66936cc021518..93d04f30a5e54b5f6f5abaff3540b145cce06c96 100644 |
--- a/third_party/WebKit/Source/core/inspector/InspectorDebuggerAgent.h |
+++ b/third_party/WebKit/Source/core/inspector/InspectorDebuggerAgent.h |
@@ -50,9 +50,9 @@ public: |
void disable(ErrorString*) override; |
void setBreakpointsActive(ErrorString*, bool active) override; |
void setSkipAllPauses(ErrorString*, bool skipped) override; |
- void setBreakpointByUrl(ErrorString*, int lineNumber, const Maybe<String>& url, const Maybe<String>& urlRegex, const Maybe<int>& columnNumber, const Maybe<String>& condition, String* breakpointId, OwnPtr<protocol::Array<protocol::Debugger::Location>>* locations) override; |
- void setBreakpoint(ErrorString*, PassOwnPtr<protocol::Debugger::Location>, const Maybe<String>& condition, String* breakpointId, OwnPtr<protocol::Debugger::Location>* actualLocation) override; |
- void removeBreakpoint(ErrorString*, const String& breakpointId) override; |
+ void setBreakpointByUrl(ErrorString*, int lineNumber, const Maybe<String16>& url, const Maybe<String16>& urlRegex, const Maybe<int>& columnNumber, const Maybe<String16>& condition, protocol::Debugger::BreakpointId*, OwnPtr<protocol::Array<protocol::Debugger::Location>>* locations) override; |
+ void setBreakpoint(ErrorString*, PassOwnPtr<protocol::Debugger::Location>, const Maybe<String16>& condition, protocol::Debugger::BreakpointId*, OwnPtr<protocol::Debugger::Location>* actualLocation) override; |
+ void removeBreakpoint(ErrorString*, const protocol::Debugger::BreakpointId&) override; |
void continueToLocation(ErrorString*, PassOwnPtr<protocol::Debugger::Location>, const Maybe<bool>& interstatementLocation) override; |
void stepOver(ErrorString*) override; |
void stepInto(ErrorString*) override; |
@@ -60,27 +60,27 @@ public: |
void pause(ErrorString*) override; |
void resume(ErrorString*) override; |
void stepIntoAsync(ErrorString*) override; |
- void searchInContent(ErrorString*, const String& scriptId, const String& query, const Maybe<bool>& caseSensitive, const Maybe<bool>& isRegex, OwnPtr<protocol::Array<protocol::Debugger::SearchMatch>>* result) override; |
+ void searchInContent(ErrorString*, const String16& scriptId, const String16& query, const Maybe<bool>& caseSensitive, const Maybe<bool>& isRegex, OwnPtr<protocol::Array<protocol::Debugger::SearchMatch>>* result) override; |
void canSetScriptSource(ErrorString*, bool* result) override; |
- void setScriptSource(ErrorString*, const String& scriptId, const String& scriptSource, const Maybe<bool>& preview, Maybe<protocol::Array<protocol::Debugger::CallFrame>>* callFrames, Maybe<bool>* stackChanged, Maybe<protocol::Runtime::StackTrace>* asyncStackTrace, Maybe<protocol::Debugger::SetScriptSourceError>* compileError) override; |
- void restartFrame(ErrorString*, const String& callFrameId, OwnPtr<protocol::Array<protocol::Debugger::CallFrame>>* callFrames, Maybe<protocol::Runtime::StackTrace>* asyncStackTrace) override; |
- void getScriptSource(ErrorString*, const String& scriptId, String* scriptSource) override; |
- void getFunctionDetails(ErrorString*, const String& functionId, OwnPtr<protocol::Debugger::FunctionDetails>*) override; |
- void getGeneratorObjectDetails(ErrorString*, const String& objectId, OwnPtr<protocol::Debugger::GeneratorObjectDetails>*) override; |
- void getCollectionEntries(ErrorString*, const String& objectId, OwnPtr<protocol::Array<protocol::Debugger::CollectionEntry>>* entries) override; |
- void setPauseOnExceptions(ErrorString*, const String& state) override; |
- void evaluateOnCallFrame(ErrorString*, const String& callFrameId, const String& expression, const Maybe<String>& objectGroup, const Maybe<bool>& includeCommandLineAPI, const Maybe<bool>& doNotPauseOnExceptionsAndMuteConsole, const Maybe<bool>& returnByValue, const Maybe<bool>& generatePreview, OwnPtr<protocol::Runtime::RemoteObject>* result, Maybe<bool>* wasThrown, Maybe<protocol::Runtime::ExceptionDetails>*) override; |
- void setVariableValue(ErrorString*, int scopeNumber, const String& variableName, PassOwnPtr<protocol::Runtime::CallArgument> newValue, const Maybe<String>& callFrameId, const Maybe<String>& functionObjectId) override; |
- void getStepInPositions(ErrorString*, const String& callFrameId, Maybe<protocol::Array<protocol::Debugger::Location>>* stepInPositions) override; |
+ void setScriptSource(ErrorString*, const String16& scriptId, const String16& scriptSource, const Maybe<bool>& preview, Maybe<protocol::Array<protocol::Debugger::CallFrame>>* callFrames, Maybe<bool>* stackChanged, Maybe<protocol::Runtime::StackTrace>* asyncStackTrace, Maybe<protocol::Debugger::SetScriptSourceError>* compileError) override; |
+ void restartFrame(ErrorString*, const String16& callFrameId, OwnPtr<protocol::Array<protocol::Debugger::CallFrame>>* callFrames, Maybe<protocol::Runtime::StackTrace>* asyncStackTrace) override; |
+ void getScriptSource(ErrorString*, const String16& scriptId, String16* scriptSource) override; |
+ void getFunctionDetails(ErrorString*, const String16& functionId, OwnPtr<protocol::Debugger::FunctionDetails>*) override; |
+ void getGeneratorObjectDetails(ErrorString*, const String16& objectId, OwnPtr<protocol::Debugger::GeneratorObjectDetails>*) override; |
+ void getCollectionEntries(ErrorString*, const String16& objectId, OwnPtr<protocol::Array<protocol::Debugger::CollectionEntry>>* entries) override; |
+ void setPauseOnExceptions(ErrorString*, const String16& state) override; |
+ void evaluateOnCallFrame(ErrorString*, const String16& callFrameId, const String16& expression, const Maybe<String16>& objectGroup, const Maybe<bool>& includeCommandLineAPI, const Maybe<bool>& doNotPauseOnExceptionsAndMuteConsole, const Maybe<bool>& returnByValue, const Maybe<bool>& generatePreview, OwnPtr<protocol::Runtime::RemoteObject>* result, Maybe<bool>* wasThrown, Maybe<protocol::Runtime::ExceptionDetails>*) override; |
+ void setVariableValue(ErrorString*, int scopeNumber, const String16& variableName, PassOwnPtr<protocol::Runtime::CallArgument> newValue, const Maybe<String16>& callFrameId, const Maybe<String16>& functionObjectId) override; |
+ void getStepInPositions(ErrorString*, const String16& callFrameId, Maybe<protocol::Array<protocol::Debugger::Location>>* stepInPositions) override; |
void getBacktrace(ErrorString*, OwnPtr<protocol::Array<protocol::Debugger::CallFrame>>* callFrames, Maybe<protocol::Runtime::StackTrace>* asyncStackTrace) override; |
void setAsyncCallStackDepth(ErrorString*, int maxDepth) override; |
void enablePromiseTracker(ErrorString*, const Maybe<bool>& captureStacks) override; |
void disablePromiseTracker(ErrorString*) override; |
- void getPromiseById(ErrorString*, int promiseId, const Maybe<String>& objectGroup, OwnPtr<protocol::Runtime::RemoteObject>* promise) override; |
+ void getPromiseById(ErrorString*, int promiseId, const Maybe<String16>& objectGroup, OwnPtr<protocol::Runtime::RemoteObject>* promise) override; |
void flushAsyncOperationEvents(ErrorString*) override; |
void setAsyncOperationBreakpoint(ErrorString*, int operationId) override; |
void removeAsyncOperationBreakpoint(ErrorString*, int operationId) override; |
- void setBlackboxedRanges(ErrorString*, const String& scriptId, PassOwnPtr<protocol::Array<protocol::Debugger::ScriptPosition>> positions) override; |
+ void setBlackboxedRanges(ErrorString*, const String16& scriptId, PassOwnPtr<protocol::Array<protocol::Debugger::ScriptPosition>> positions) override; |
// Called by InspectorInstrumentation. |
bool isPaused(); |