| Index: Source/core/inspector/InspectorDebuggerAgent.h
|
| diff --git a/Source/core/inspector/InspectorDebuggerAgent.h b/Source/core/inspector/InspectorDebuggerAgent.h
|
| index 6bfdc559477170eb486fcf1dd3185cfb90ca5635..738c014d875e455037612e73868bc34fbe8dc6e6 100644
|
| --- a/Source/core/inspector/InspectorDebuggerAgent.h
|
| +++ b/Source/core/inspector/InspectorDebuggerAgent.h
|
| @@ -90,12 +90,12 @@ public:
|
| virtual ~InspectorDebuggerAgent();
|
| virtual void trace(Visitor*);
|
|
|
| - virtual void canSetScriptSource(ErrorString*, bool* result) OVERRIDE FINAL { *result = true; }
|
| + virtual void canSetScriptSource(ErrorString*, bool* result) override final { *result = true; }
|
|
|
| - virtual void init() OVERRIDE FINAL;
|
| - virtual void setFrontend(InspectorFrontend*) OVERRIDE FINAL;
|
| - virtual void clearFrontend() OVERRIDE FINAL;
|
| - virtual void restore() OVERRIDE FINAL;
|
| + virtual void init() override final;
|
| + virtual void setFrontend(InspectorFrontend*) override final;
|
| + virtual void clearFrontend() override final;
|
| + virtual void restore() override final;
|
|
|
| bool isPaused();
|
| bool runningNestedMessageLoop();
|
| @@ -105,30 +105,29 @@ public:
|
| PassOwnPtr<ScriptSourceCode> preprocess(LocalFrame*, const ScriptSourceCode&);
|
|
|
| // Part of the protocol.
|
| - virtual void enable(ErrorString*) OVERRIDE FINAL;
|
| - virtual void disable(ErrorString*) OVERRIDE FINAL;
|
| - virtual void setBreakpointsActive(ErrorString*, bool active) OVERRIDE FINAL;
|
| - virtual void setSkipAllPauses(ErrorString*, bool skipped, const bool* untilReload) OVERRIDE FINAL;
|
| -
|
| - virtual void setBreakpointByUrl(ErrorString*, int lineNumber, const String* optionalURL, const String* optionalURLRegex, const int* optionalColumnNumber, const String* optionalCondition, const bool* isAntiBreakpoint, TypeBuilder::Debugger::BreakpointId*, RefPtr<TypeBuilder::Array<TypeBuilder::Debugger::Location> >& locations) OVERRIDE FINAL;
|
| - virtual void setBreakpoint(ErrorString*, const RefPtr<JSONObject>& location, const String* optionalCondition, TypeBuilder::Debugger::BreakpointId*, RefPtr<TypeBuilder::Debugger::Location>& actualLocation) OVERRIDE FINAL;
|
| - virtual void removeBreakpoint(ErrorString*, const String& breakpointId) OVERRIDE FINAL;
|
| - virtual void continueToLocation(ErrorString*, const RefPtr<JSONObject>& location, const bool* interstateLocationOpt) OVERRIDE FINAL;
|
| - virtual void getStepInPositions(ErrorString*, const String& callFrameId, RefPtr<TypeBuilder::Array<TypeBuilder::Debugger::Location> >& positions) OVERRIDE FINAL;
|
| - virtual void getBacktrace(ErrorString*, RefPtr<TypeBuilder::Array<TypeBuilder::Debugger::CallFrame> >&, RefPtr<TypeBuilder::Debugger::StackTrace>&) OVERRIDE FINAL;
|
| -
|
| - virtual void searchInContent(ErrorString*, const String& scriptId, const String& query, const bool* optionalCaseSensitive, const bool* optionalIsRegex, RefPtr<TypeBuilder::Array<TypeBuilder::Page::SearchMatch> >&) OVERRIDE FINAL;
|
| - virtual void setScriptSource(ErrorString*, RefPtr<TypeBuilder::Debugger::SetScriptSourceError>&, const String& scriptId, const String& newContent, const bool* preview, RefPtr<TypeBuilder::Array<TypeBuilder::Debugger::CallFrame> >& newCallFrames, RefPtr<JSONObject>& result, RefPtr<TypeBuilder::Debugger::StackTrace>& asyncStackTrace) OVERRIDE FINAL;
|
| - virtual void restartFrame(ErrorString*, const String& callFrameId, RefPtr<TypeBuilder::Array<TypeBuilder::Debugger::CallFrame> >& newCallFrames, RefPtr<JSONObject>& result, RefPtr<TypeBuilder::Debugger::StackTrace>& asyncStackTrace) OVERRIDE FINAL;
|
| - virtual void getScriptSource(ErrorString*, const String& scriptId, String* scriptSource) OVERRIDE FINAL;
|
| - virtual void getFunctionDetails(ErrorString*, const String& functionId, RefPtr<TypeBuilder::Debugger::FunctionDetails>&) OVERRIDE FINAL;
|
| - virtual void getCollectionEntries(ErrorString*, const String& objectId, RefPtr<TypeBuilder::Array<TypeBuilder::Debugger::CollectionEntry> >&) OVERRIDE FINAL;
|
| - virtual void pause(ErrorString*) OVERRIDE FINAL;
|
| - virtual void resume(ErrorString*) OVERRIDE FINAL;
|
| - virtual void stepOver(ErrorString*) OVERRIDE FINAL;
|
| - virtual void stepInto(ErrorString*) OVERRIDE FINAL;
|
| - virtual void stepOut(ErrorString*) OVERRIDE FINAL;
|
| - virtual void setPauseOnExceptions(ErrorString*, const String& pauseState) OVERRIDE FINAL;
|
| + virtual void enable(ErrorString*) override final;
|
| + virtual void disable(ErrorString*) override final;
|
| + virtual void setBreakpointsActive(ErrorString*, bool active) override final;
|
| + virtual void setSkipAllPauses(ErrorString*, bool skipped, const bool* untilReload) override final;
|
| +
|
| + virtual void setBreakpointByUrl(ErrorString*, int lineNumber, const String* optionalURL, const String* optionalURLRegex, const int* optionalColumnNumber, const String* optionalCondition, const bool* isAntiBreakpoint, TypeBuilder::Debugger::BreakpointId*, RefPtr<TypeBuilder::Array<TypeBuilder::Debugger::Location> >& locations) override final;
|
| + virtual void setBreakpoint(ErrorString*, const RefPtr<JSONObject>& location, const String* optionalCondition, TypeBuilder::Debugger::BreakpointId*, RefPtr<TypeBuilder::Debugger::Location>& actualLocation) override final;
|
| + virtual void removeBreakpoint(ErrorString*, const String& breakpointId) override final;
|
| + virtual void continueToLocation(ErrorString*, const RefPtr<JSONObject>& location, const bool* interstateLocationOpt) override final;
|
| + virtual void getStepInPositions(ErrorString*, const String& callFrameId, RefPtr<TypeBuilder::Array<TypeBuilder::Debugger::Location> >& positions) override final;
|
| + virtual void getBacktrace(ErrorString*, RefPtr<TypeBuilder::Array<TypeBuilder::Debugger::CallFrame> >&, RefPtr<TypeBuilder::Debugger::StackTrace>&) override final;
|
| + virtual void searchInContent(ErrorString*, const String& scriptId, const String& query, const bool* optionalCaseSensitive, const bool* optionalIsRegex, RefPtr<TypeBuilder::Array<TypeBuilder::Page::SearchMatch> >&) override final;
|
| + virtual void setScriptSource(ErrorString*, RefPtr<TypeBuilder::Debugger::SetScriptSourceError>&, const String& scriptId, const String& newContent, const bool* preview, RefPtr<TypeBuilder::Array<TypeBuilder::Debugger::CallFrame> >& newCallFrames, RefPtr<JSONObject>& result, RefPtr<TypeBuilder::Debugger::StackTrace>& asyncStackTrace) override final;
|
| + virtual void restartFrame(ErrorString*, const String& callFrameId, RefPtr<TypeBuilder::Array<TypeBuilder::Debugger::CallFrame> >& newCallFrames, RefPtr<JSONObject>& result, RefPtr<TypeBuilder::Debugger::StackTrace>& asyncStackTrace) override final;
|
| + virtual void getScriptSource(ErrorString*, const String& scriptId, String* scriptSource) override final;
|
| + virtual void getFunctionDetails(ErrorString*, const String& functionId, RefPtr<TypeBuilder::Debugger::FunctionDetails>&) override final;
|
| + virtual void getCollectionEntries(ErrorString*, const String& objectId, RefPtr<TypeBuilder::Array<TypeBuilder::Debugger::CollectionEntry> >&) override final;
|
| + virtual void pause(ErrorString*) override final;
|
| + virtual void resume(ErrorString*) override final;
|
| + virtual void stepOver(ErrorString*) override final;
|
| + virtual void stepInto(ErrorString*) override final;
|
| + virtual void stepOut(ErrorString*) override final;
|
| + virtual void setPauseOnExceptions(ErrorString*, const String& pauseState) override final;
|
| virtual void evaluateOnCallFrame(ErrorString*,
|
| const String& callFrameId,
|
| const String& expression,
|
| @@ -139,17 +138,17 @@ public:
|
| const bool* generatePreview,
|
| RefPtr<TypeBuilder::Runtime::RemoteObject>& result,
|
| TypeBuilder::OptOutput<bool>* wasThrown,
|
| - RefPtr<TypeBuilder::Debugger::ExceptionDetails>&) OVERRIDE FINAL;
|
| - virtual void compileScript(ErrorString*, const String& expression, const String& sourceURL, const int* executionContextId, TypeBuilder::OptOutput<TypeBuilder::Debugger::ScriptId>*, RefPtr<TypeBuilder::Debugger::ExceptionDetails>&) OVERRIDE;
|
| - virtual void runScript(ErrorString*, const TypeBuilder::Debugger::ScriptId&, const int* executionContextId, const String* objectGroup, const bool* doNotPauseOnExceptionsAndMuteConsole, RefPtr<TypeBuilder::Runtime::RemoteObject>& result, RefPtr<TypeBuilder::Debugger::ExceptionDetails>&) OVERRIDE;
|
| - virtual void setOverlayMessage(ErrorString*, const String*) OVERRIDE;
|
| - virtual void setVariableValue(ErrorString*, int in_scopeNumber, const String& in_variableName, const RefPtr<JSONObject>& in_newValue, const String* in_callFrame, const String* in_functionObjectId) OVERRIDE FINAL;
|
| - virtual void skipStackFrames(ErrorString*, const String* pattern, const bool* skipContentScripts) OVERRIDE FINAL;
|
| - virtual void setAsyncCallStackDepth(ErrorString*, int depth) OVERRIDE FINAL;
|
| - virtual void enablePromiseTracker(ErrorString*) OVERRIDE FINAL;
|
| - virtual void disablePromiseTracker(ErrorString*) OVERRIDE FINAL;
|
| - virtual void getPromises(ErrorString*, RefPtr<TypeBuilder::Array<TypeBuilder::Debugger::PromiseDetails> >& promises) OVERRIDE FINAL;
|
| - virtual void getPromiseById(ErrorString*, int promiseId, const String* objectGroup, RefPtr<TypeBuilder::Runtime::RemoteObject>& promise) OVERRIDE FINAL;
|
| + RefPtr<TypeBuilder::Debugger::ExceptionDetails>&) override final;
|
| + virtual void compileScript(ErrorString*, const String& expression, const String& sourceURL, const int* executionContextId, TypeBuilder::OptOutput<TypeBuilder::Debugger::ScriptId>*, RefPtr<TypeBuilder::Debugger::ExceptionDetails>&) override;
|
| + virtual void runScript(ErrorString*, const TypeBuilder::Debugger::ScriptId&, const int* executionContextId, const String* objectGroup, const bool* doNotPauseOnExceptionsAndMuteConsole, RefPtr<TypeBuilder::Runtime::RemoteObject>& result, RefPtr<TypeBuilder::Debugger::ExceptionDetails>&) override;
|
| + virtual void setOverlayMessage(ErrorString*, const String*) override;
|
| + virtual void setVariableValue(ErrorString*, int in_scopeNumber, const String& in_variableName, const RefPtr<JSONObject>& in_newValue, const String* in_callFrame, const String* in_functionObjectId) override final;
|
| + virtual void skipStackFrames(ErrorString*, const String* pattern, const bool* skipContentScripts) override final;
|
| + virtual void setAsyncCallStackDepth(ErrorString*, int depth) override final;
|
| + virtual void enablePromiseTracker(ErrorString*) override final;
|
| + virtual void disablePromiseTracker(ErrorString*) override final;
|
| + virtual void getPromises(ErrorString*, RefPtr<TypeBuilder::Array<TypeBuilder::Debugger::PromiseDetails> >& promises) override final;
|
| + virtual void getPromiseById(ErrorString*, int promiseId, const String* objectGroup, RefPtr<TypeBuilder::Runtime::RemoteObject>& promise) override final;
|
|
|
| void schedulePauseOnNextStatement(InspectorFrontend::Debugger::Reason::Enum breakReason, PassRefPtr<JSONObject> data);
|
| void didInstallTimer(ExecutionContext*, int timerId, int timeout, bool singleShot);
|
| @@ -218,8 +217,8 @@ protected:
|
|
|
| virtual void enable();
|
| virtual void disable();
|
| - virtual SkipPauseRequest didPause(ScriptState*, const ScriptValue& callFrames, const ScriptValue& exception, const Vector<String>& hitBreakpoints) OVERRIDE FINAL;
|
| - virtual void didContinue() OVERRIDE FINAL;
|
| + virtual SkipPauseRequest didPause(ScriptState*, const ScriptValue& callFrames, const ScriptValue& exception, const Vector<String>& hitBreakpoints) override final;
|
| + virtual void didContinue() override final;
|
| void reset();
|
| void pageDidCommitLoad();
|
|
|
| @@ -234,11 +233,11 @@ private:
|
| PassRefPtr<TypeBuilder::Array<TypeBuilder::Debugger::CallFrame> > currentCallFrames();
|
| PassRefPtr<TypeBuilder::Debugger::StackTrace> currentAsyncStackTrace();
|
|
|
| - virtual void didParseSource(const String& scriptId, const Script&, CompileResult) OVERRIDE FINAL;
|
| - virtual bool v8AsyncTaskEventsEnabled() const OVERRIDE FINAL;
|
| - virtual void didReceiveV8AsyncTaskEvent(ExecutionContext*, const String& eventType, const String& eventName, int id) OVERRIDE FINAL;
|
| - virtual bool v8PromiseEventsEnabled() const OVERRIDE FINAL;
|
| - virtual void didReceiveV8PromiseEvent(ScriptState*, v8::Handle<v8::Object> promise, v8::Handle<v8::Value> parentPromise, int status) OVERRIDE FINAL;
|
| + virtual void didParseSource(const String& scriptId, const Script&, CompileResult) override final;
|
| + virtual bool v8AsyncTaskEventsEnabled() const override final;
|
| + virtual void didReceiveV8AsyncTaskEvent(ExecutionContext*, const String& eventType, const String& eventName, int id) override final;
|
| + virtual bool v8PromiseEventsEnabled() const override final;
|
| + virtual void didReceiveV8PromiseEvent(ScriptState*, v8::Handle<v8::Object> promise, v8::Handle<v8::Value> parentPromise, int status) override final;
|
|
|
| void setPauseOnExceptionsImpl(ErrorString*, int);
|
|
|
|
|