Remove "virtual" from all lines that have both "virtual" and "override".
https://bugs.webkit.org/show_bug.cgi?id=155005
Reviewed by Geoffrey Garen.
* Scripts/do-webcore-rename: Added a regular expression to this script to do the job.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@197563 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/JavaScriptCore/inspector/InspectorValues.h b/Source/JavaScriptCore/inspector/InspectorValues.h
index 81b8703..c14efa5 100644
--- a/Source/JavaScriptCore/inspector/InspectorValues.h
+++ b/Source/JavaScriptCore/inspector/InspectorValues.h
@@ -104,19 +104,19 @@
static Ref<InspectorBasicValue> create(int);
static Ref<InspectorBasicValue> create(double);
- virtual bool asBoolean(bool&) const override;
+ bool asBoolean(bool&) const override;
// Numbers from the frontend are always parsed as doubles, so we allow
// clients to convert to integral values with this function.
- virtual bool asInteger(int&) const override;
- virtual bool asInteger(unsigned&) const override;
- virtual bool asInteger(long&) const override;
- virtual bool asInteger(long long&) const override;
- virtual bool asInteger(unsigned long&) const override;
- virtual bool asInteger(unsigned long long&) const override;
- virtual bool asDouble(double&) const override;
- virtual bool asDouble(float&) const override;
+ bool asInteger(int&) const override;
+ bool asInteger(unsigned&) const override;
+ bool asInteger(long&) const override;
+ bool asInteger(long long&) const override;
+ bool asInteger(unsigned long&) const override;
+ bool asInteger(unsigned long long&) const override;
+ bool asDouble(double&) const override;
+ bool asDouble(float&) const override;
- virtual void writeJSON(StringBuilder& output) const override;
+ void writeJSON(StringBuilder& output) const override;
private:
explicit InspectorBasicValue(bool value)
@@ -142,9 +142,9 @@
static Ref<InspectorString> create(const String&);
static Ref<InspectorString> create(const char*);
- virtual bool asString(String& output) const override;
+ bool asString(String& output) const override;
- virtual void writeJSON(StringBuilder& output) const override;
+ void writeJSON(StringBuilder& output) const override;
private:
explicit InspectorString(const String& value)
@@ -171,7 +171,7 @@
protected:
virtual ~InspectorObjectBase();
- virtual bool asObject(RefPtr<InspectorObject>& output) override;
+ bool asObject(RefPtr<InspectorObject>& output) override;
// FIXME: use templates to reduce the amount of duplicated set*() methods.
void setBoolean(const String& name, bool);
@@ -211,7 +211,7 @@
void remove(const String& name);
- virtual void writeJSON(StringBuilder& output) const override;
+ void writeJSON(StringBuilder& output) const override;
iterator begin() { return m_data.begin(); }
iterator end() { return m_data.end(); }
@@ -270,7 +270,7 @@
protected:
virtual ~InspectorArrayBase();
- virtual bool asArray(RefPtr<InspectorArray>&) override;
+ bool asArray(RefPtr<InspectorArray>&) override;
void pushBoolean(bool);
void pushInteger(int);
@@ -282,7 +282,7 @@
RefPtr<InspectorValue> get(size_t index) const;
- virtual void writeJSON(StringBuilder& output) const override;
+ void writeJSON(StringBuilder& output) const override;
iterator begin() { return m_data.begin(); }
iterator end() { return m_data.end(); }
diff --git a/Source/JavaScriptCore/inspector/JSGlobalObjectConsoleClient.h b/Source/JavaScriptCore/inspector/JSGlobalObjectConsoleClient.h
index 12e1e41..3220199 100644
--- a/Source/JavaScriptCore/inspector/JSGlobalObjectConsoleClient.h
+++ b/Source/JavaScriptCore/inspector/JSGlobalObjectConsoleClient.h
@@ -42,13 +42,13 @@
static void setLogToSystemConsole(bool);
protected:
- virtual void messageWithTypeAndLevel(MessageType, MessageLevel, JSC::ExecState*, RefPtr<ScriptArguments>&&) override;
- virtual void count(JSC::ExecState*, RefPtr<ScriptArguments>&&) override;
- virtual void profile(JSC::ExecState*, const String& title) override;
- virtual void profileEnd(JSC::ExecState*, const String& title) override;
- virtual void time(JSC::ExecState*, const String& title) override;
- virtual void timeEnd(JSC::ExecState*, const String& title) override;
- virtual void timeStamp(JSC::ExecState*, RefPtr<ScriptArguments>&&) override;
+ void messageWithTypeAndLevel(MessageType, MessageLevel, JSC::ExecState*, RefPtr<ScriptArguments>&&) override;
+ void count(JSC::ExecState*, RefPtr<ScriptArguments>&&) override;
+ void profile(JSC::ExecState*, const String& title) override;
+ void profileEnd(JSC::ExecState*, const String& title) override;
+ void time(JSC::ExecState*, const String& title) override;
+ void timeEnd(JSC::ExecState*, const String& title) override;
+ void timeStamp(JSC::ExecState*, RefPtr<ScriptArguments>&&) override;
private:
void warnUnimplemented(const String& method);
diff --git a/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.h b/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.h
index 7ee90c1..8d5c3f7 100644
--- a/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.h
+++ b/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.h
@@ -87,22 +87,22 @@
JSC::ConsoleClient* consoleClient() const;
- virtual bool developerExtrasEnabled() const override;
- virtual bool canAccessInspectedScriptState(JSC::ExecState*) const override { return true; }
- virtual InspectorFunctionCallHandler functionCallHandler() const override;
- virtual InspectorEvaluateHandler evaluateHandler() const override;
- virtual void frontendInitialized() override;
- virtual Ref<WTF::Stopwatch> executionStopwatch() override;
- virtual JSGlobalObjectScriptDebugServer& scriptDebugServer() override;
- virtual JSC::VM& vm() override;
+ bool developerExtrasEnabled() const override;
+ bool canAccessInspectedScriptState(JSC::ExecState*) const override { return true; }
+ InspectorFunctionCallHandler functionCallHandler() const override;
+ InspectorEvaluateHandler evaluateHandler() const override;
+ void frontendInitialized() override;
+ Ref<WTF::Stopwatch> executionStopwatch() override;
+ JSGlobalObjectScriptDebugServer& scriptDebugServer() override;
+ JSC::VM& vm() override;
#if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
- virtual AugmentableInspectorControllerClient* augmentableInspectorControllerClient() const override { return m_augmentingClient; }
- virtual void setAugmentableInspectorControllerClient(AugmentableInspectorControllerClient* client) override { m_augmentingClient = client; }
+ AugmentableInspectorControllerClient* augmentableInspectorControllerClient() const override { return m_augmentingClient; }
+ void setAugmentableInspectorControllerClient(AugmentableInspectorControllerClient* client) override { m_augmentingClient = client; }
- virtual const FrontendRouter& frontendRouter() const override { return m_frontendRouter.get(); }
- virtual BackendDispatcher& backendDispatcher() override { return m_backendDispatcher.get(); }
- virtual void appendExtraAgent(std::unique_ptr<InspectorAgentBase>) override;
+ const FrontendRouter& frontendRouter() const override { return m_frontendRouter.get(); }
+ BackendDispatcher& backendDispatcher() override { return m_backendDispatcher.get(); }
+ void appendExtraAgent(std::unique_ptr<InspectorAgentBase>) override;
#endif
private:
diff --git a/Source/JavaScriptCore/inspector/JSGlobalObjectScriptDebugServer.h b/Source/JavaScriptCore/inspector/JSGlobalObjectScriptDebugServer.h
index d808aa5..76b5d78 100644
--- a/Source/JavaScriptCore/inspector/JSGlobalObjectScriptDebugServer.h
+++ b/Source/JavaScriptCore/inspector/JSGlobalObjectScriptDebugServer.h
@@ -39,18 +39,18 @@
JSC::JSGlobalObject& globalObject() const { return m_globalObject; }
private:
- virtual void attachDebugger() override;
- virtual void detachDebugger(bool isBeingDestroyed) override;
+ void attachDebugger() override;
+ void detachDebugger(bool isBeingDestroyed) override;
- virtual void didPause(JSC::JSGlobalObject*) override { }
- virtual void didContinue(JSC::JSGlobalObject*) override { }
- virtual void runEventLoopWhilePaused() override;
- virtual bool isContentScript(JSC::ExecState*) const override { return false; }
+ void didPause(JSC::JSGlobalObject*) override { }
+ void didContinue(JSC::JSGlobalObject*) override { }
+ void runEventLoopWhilePaused() override;
+ bool isContentScript(JSC::ExecState*) const override { return false; }
// NOTE: Currently all exceptions are reported at the API boundary through reportAPIException.
// Until a time comes where an exception can be caused outside of the API (e.g. setTimeout
// or some other async operation in a pure JSContext) we can ignore exceptions reported here.
- virtual void reportException(JSC::ExecState*, JSC::Exception*) const override { }
+ void reportException(JSC::ExecState*, JSC::Exception*) const override { }
JSC::JSGlobalObject& m_globalObject;
};
diff --git a/Source/JavaScriptCore/inspector/ScriptDebugServer.h b/Source/JavaScriptCore/inspector/ScriptDebugServer.h
index ea210d3d..89d3fd1 100644
--- a/Source/JavaScriptCore/inspector/ScriptDebugServer.h
+++ b/Source/JavaScriptCore/inspector/ScriptDebugServer.h
@@ -92,12 +92,12 @@
private:
typedef HashMap<JSC::BreakpointID, BreakpointActions> BreakpointIDToActionsMap;
- virtual void sourceParsed(JSC::ExecState*, JSC::SourceProvider*, int errorLine, const String& errorMsg) override final;
- virtual bool needPauseHandling(JSC::JSGlobalObject*) override final { return true; }
- virtual void handleBreakpointHit(JSC::JSGlobalObject*, const JSC::Breakpoint&) override final;
- virtual void handleExceptionInBreakpointCondition(JSC::ExecState*, JSC::Exception*) const override final;
- virtual void handlePause(JSC::JSGlobalObject*, JSC::Debugger::ReasonForPause) override final;
- virtual void notifyDoneProcessingDebuggerEvents() override final;
+ void sourceParsed(JSC::ExecState*, JSC::SourceProvider*, int errorLine, const String& errorMsg) override final;
+ bool needPauseHandling(JSC::JSGlobalObject*) override final { return true; }
+ void handleBreakpointHit(JSC::JSGlobalObject*, const JSC::Breakpoint&) override final;
+ void handleExceptionInBreakpointCondition(JSC::ExecState*, JSC::Exception*) const override final;
+ void handlePause(JSC::JSGlobalObject*, JSC::Debugger::ReasonForPause) override final;
+ void notifyDoneProcessingDebuggerEvents() override final;
Deprecated::ScriptValue exceptionOrCaughtValue(JSC::ExecState*);
diff --git a/Source/JavaScriptCore/inspector/agents/InspectorAgent.h b/Source/JavaScriptCore/inspector/agents/InspectorAgent.h
index eda7449..b5efede 100644
--- a/Source/JavaScriptCore/inspector/agents/InspectorAgent.h
+++ b/Source/JavaScriptCore/inspector/agents/InspectorAgent.h
@@ -51,12 +51,12 @@
InspectorAgent(AgentContext&);
virtual ~InspectorAgent();
- virtual void didCreateFrontendAndBackend(FrontendRouter*, BackendDispatcher*) override;
- virtual void willDestroyFrontendAndBackend(DisconnectReason) override;
+ void didCreateFrontendAndBackend(FrontendRouter*, BackendDispatcher*) override;
+ void willDestroyFrontendAndBackend(DisconnectReason) override;
- virtual void enable(ErrorString&) override;
- virtual void disable(ErrorString&) override;
- virtual void initialized(ErrorString&) override;
+ void enable(ErrorString&) override;
+ void disable(ErrorString&) override;
+ void initialized(ErrorString&) override;
void inspect(RefPtr<Protocol::Runtime::RemoteObject>&& objectToInspect, RefPtr<InspectorObject>&& hints);
void evaluateForTestInFrontend(const String& script);
diff --git a/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.h b/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.h
index 0e228d9..873f6d3 100644
--- a/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.h
+++ b/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.h
@@ -55,14 +55,14 @@
InspectorConsoleAgent(AgentContext&);
virtual ~InspectorConsoleAgent();
- virtual void didCreateFrontendAndBackend(FrontendRouter*, BackendDispatcher*) override;
- virtual void willDestroyFrontendAndBackend(DisconnectReason) override;
+ void didCreateFrontendAndBackend(FrontendRouter*, BackendDispatcher*) override;
+ void willDestroyFrontendAndBackend(DisconnectReason) override;
- virtual void enable(ErrorString&) override;
- virtual void disable(ErrorString&) override;
- virtual void clearMessages(ErrorString&) override;
- virtual void setMonitoringXHREnabled(ErrorString&, bool enabled) override = 0;
- virtual void addInspectedNode(ErrorString&, int nodeId) override = 0;
+ void enable(ErrorString&) override;
+ void disable(ErrorString&) override;
+ void clearMessages(ErrorString&) override;
+ void setMonitoringXHREnabled(ErrorString&, bool enabled) override = 0;
+ void addInspectedNode(ErrorString&, int nodeId) override = 0;
bool enabled() const { return m_enabled; }
void reset();
diff --git a/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.h b/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.h
index c09332c..6332b77 100644
--- a/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.h
+++ b/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.h
@@ -61,27 +61,27 @@
virtual ~InspectorDebuggerAgent();
- virtual void didCreateFrontendAndBackend(FrontendRouter*, BackendDispatcher*) override;
- virtual void willDestroyFrontendAndBackend(DisconnectReason) override;
+ void didCreateFrontendAndBackend(FrontendRouter*, BackendDispatcher*) override;
+ void willDestroyFrontendAndBackend(DisconnectReason) override;
- virtual void enable(ErrorString&) override;
- virtual void disable(ErrorString&) override;
- virtual void setBreakpointsActive(ErrorString&, bool active) override;
- virtual void setBreakpointByUrl(ErrorString&, int lineNumber, const String* optionalURL, const String* optionalURLRegex, const int* optionalColumnNumber, const Inspector::InspectorObject* options, Inspector::Protocol::Debugger::BreakpointId*, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Debugger::Location>>& locations) override;
- virtual void setBreakpoint(ErrorString&, const Inspector::InspectorObject& location, const Inspector::InspectorObject* options, Inspector::Protocol::Debugger::BreakpointId*, RefPtr<Inspector::Protocol::Debugger::Location>& actualLocation) override;
- virtual void removeBreakpoint(ErrorString&, const String& breakpointIdentifier) override;
- virtual void continueToLocation(ErrorString&, const InspectorObject& location) override;
- virtual void searchInContent(ErrorString&, const String& scriptID, const String& query, const bool* optionalCaseSensitive, const bool* optionalIsRegex, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::GenericTypes::SearchMatch>>&) override;
- virtual void getScriptSource(ErrorString&, const String& scriptID, String* scriptSource) override;
- virtual void getFunctionDetails(ErrorString&, const String& functionId, RefPtr<Inspector::Protocol::Debugger::FunctionDetails>&) override;
- virtual void pause(ErrorString&) override;
- virtual void resume(ErrorString&) override;
- virtual void stepOver(ErrorString&) override;
- virtual void stepInto(ErrorString&) override;
- virtual void stepOut(ErrorString&) override;
- virtual void setPauseOnExceptions(ErrorString&, const String& pauseState) override;
- virtual void evaluateOnCallFrame(ErrorString&, const String& callFrameId, const String& expression, const String* objectGroup, const bool* includeCommandLineAPI, const bool* doNotPauseOnExceptionsAndMuteConsole, const bool* returnByValue, const bool* generatePreview, const bool* saveResult, RefPtr<Inspector::Protocol::Runtime::RemoteObject>& result, Inspector::Protocol::OptOutput<bool>* wasThrown, Inspector::Protocol::OptOutput<int>* savedResultIndex) override;
- virtual void setOverlayMessage(ErrorString&, const String*) override;
+ void enable(ErrorString&) override;
+ void disable(ErrorString&) override;
+ void setBreakpointsActive(ErrorString&, bool active) override;
+ void setBreakpointByUrl(ErrorString&, int lineNumber, const String* optionalURL, const String* optionalURLRegex, const int* optionalColumnNumber, const Inspector::InspectorObject* options, Inspector::Protocol::Debugger::BreakpointId*, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Debugger::Location>>& locations) override;
+ void setBreakpoint(ErrorString&, const Inspector::InspectorObject& location, const Inspector::InspectorObject* options, Inspector::Protocol::Debugger::BreakpointId*, RefPtr<Inspector::Protocol::Debugger::Location>& actualLocation) override;
+ void removeBreakpoint(ErrorString&, const String& breakpointIdentifier) override;
+ void continueToLocation(ErrorString&, const InspectorObject& location) override;
+ void searchInContent(ErrorString&, const String& scriptID, const String& query, const bool* optionalCaseSensitive, const bool* optionalIsRegex, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::GenericTypes::SearchMatch>>&) override;
+ void getScriptSource(ErrorString&, const String& scriptID, String* scriptSource) override;
+ void getFunctionDetails(ErrorString&, const String& functionId, RefPtr<Inspector::Protocol::Debugger::FunctionDetails>&) override;
+ void pause(ErrorString&) override;
+ void resume(ErrorString&) override;
+ void stepOver(ErrorString&) override;
+ void stepInto(ErrorString&) override;
+ void stepOut(ErrorString&) override;
+ void setPauseOnExceptions(ErrorString&, const String& pauseState) override;
+ void evaluateOnCallFrame(ErrorString&, const String& callFrameId, const String& expression, const String* objectGroup, const bool* includeCommandLineAPI, const bool* doNotPauseOnExceptionsAndMuteConsole, const bool* returnByValue, const bool* generatePreview, const bool* saveResult, RefPtr<Inspector::Protocol::Runtime::RemoteObject>& result, Inspector::Protocol::OptOutput<bool>* wasThrown, Inspector::Protocol::OptOutput<int>* savedResultIndex) override;
+ void setOverlayMessage(ErrorString&, const String*) override;
bool isPaused();
@@ -117,8 +117,8 @@
virtual void enable();
virtual void disable(bool skipRecompile);
- virtual void didPause(JSC::ExecState*, const Deprecated::ScriptValue& callFrames, const Deprecated::ScriptValue& exceptionOrCaughtValue) override;
- virtual void didContinue() override;
+ void didPause(JSC::ExecState*, const Deprecated::ScriptValue& callFrames, const Deprecated::ScriptValue& exceptionOrCaughtValue) override;
+ void didContinue() override;
virtual String sourceMapURLForScript(const Script&);
@@ -127,11 +127,11 @@
private:
Ref<Inspector::Protocol::Array<Inspector::Protocol::Debugger::CallFrame>> currentCallFrames(const InjectedScript&);
- virtual void didParseSource(JSC::SourceID, const Script&) override final;
- virtual void failedToParseSource(const String& url, const String& data, int firstLine, int errorLine, const String& errorMessage) override final;
+ void didParseSource(JSC::SourceID, const Script&) override final;
+ void failedToParseSource(const String& url, const String& data, int firstLine, int errorLine, const String& errorMessage) override final;
- virtual void breakpointActionSound(int breakpointActionIdentifier) override;
- virtual void breakpointActionProbe(JSC::ExecState*, const ScriptBreakpointAction&, unsigned batchId, unsigned sampleId, const Deprecated::ScriptValue& sample) override final;
+ void breakpointActionSound(int breakpointActionIdentifier) override;
+ void breakpointActionProbe(JSC::ExecState*, const ScriptBreakpointAction&, unsigned batchId, unsigned sampleId, const Deprecated::ScriptValue& sample) override final;
RefPtr<Inspector::Protocol::Debugger::Location> resolveBreakpoint(const String& breakpointIdentifier, JSC::SourceID, const ScriptBreakpoint&);
bool assertPaused(ErrorString&);
diff --git a/Source/JavaScriptCore/inspector/agents/InspectorHeapAgent.h b/Source/JavaScriptCore/inspector/agents/InspectorHeapAgent.h
index 18e48df..b1974e3 100644
--- a/Source/JavaScriptCore/inspector/agents/InspectorHeapAgent.h
+++ b/Source/JavaScriptCore/inspector/agents/InspectorHeapAgent.h
@@ -43,17 +43,17 @@
InspectorHeapAgent(AgentContext&);
virtual ~InspectorHeapAgent();
- virtual void didCreateFrontendAndBackend(FrontendRouter*, BackendDispatcher*) override;
- virtual void willDestroyFrontendAndBackend(DisconnectReason) override;
+ void didCreateFrontendAndBackend(FrontendRouter*, BackendDispatcher*) override;
+ void willDestroyFrontendAndBackend(DisconnectReason) override;
// HeapBackendDispatcherHandler
- virtual void enable(ErrorString&) override;
- virtual void disable(ErrorString&) override;
- virtual void gc(ErrorString&) override;
+ void enable(ErrorString&) override;
+ void disable(ErrorString&) override;
+ void gc(ErrorString&) override;
// HeapObserver
- virtual void willGarbageCollect() override;
- virtual void didGarbageCollect(JSC::HeapOperation) override;
+ void willGarbageCollect() override;
+ void didGarbageCollect(JSC::HeapOperation) override;
private:
std::unique_ptr<HeapFrontendDispatcher> m_frontendDispatcher;
diff --git a/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.h b/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.h
index e3385b9..8404ae0 100644
--- a/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.h
+++ b/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.h
@@ -55,23 +55,23 @@
public:
virtual ~InspectorRuntimeAgent();
- virtual void willDestroyFrontendAndBackend(DisconnectReason) override;
+ void willDestroyFrontendAndBackend(DisconnectReason) override;
- virtual void enable(ErrorString&) override { m_enabled = true; }
- virtual void disable(ErrorString&) override { m_enabled = false; }
- virtual void parse(ErrorString&, const String& expression, Inspector::Protocol::Runtime::SyntaxErrorType* result, Inspector::Protocol::OptOutput<String>* message, RefPtr<Inspector::Protocol::Runtime::ErrorRange>&) override final;
- virtual void evaluate(ErrorString&, const String& expression, const String* objectGroup, const bool* includeCommandLineAPI, const bool* doNotPauseOnExceptionsAndMuteConsole, const int* executionContextId, const bool* returnByValue, const bool* generatePreview, const bool* saveResult, RefPtr<Inspector::Protocol::Runtime::RemoteObject>& result, Inspector::Protocol::OptOutput<bool>* wasThrown, Inspector::Protocol::OptOutput<int>* savedResultIndex) override final;
- virtual void callFunctionOn(ErrorString&, const String& objectId, const String& expression, const Inspector::InspectorArray* optionalArguments, const bool* doNotPauseOnExceptionsAndMuteConsole, const bool* returnByValue, const bool* generatePreview, RefPtr<Inspector::Protocol::Runtime::RemoteObject>& result, Inspector::Protocol::OptOutput<bool>* wasThrown) override final;
- virtual void releaseObject(ErrorString&, const ErrorString& objectId) override final;
- virtual void getProperties(ErrorString&, const String& objectId, const bool* ownProperties, const bool* generatePreview, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::PropertyDescriptor>>& result, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::InternalPropertyDescriptor>>& internalProperties) override final;
- virtual void getDisplayableProperties(ErrorString&, const String& objectId, const bool* generatePreview, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::PropertyDescriptor>>& result, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::InternalPropertyDescriptor>>& internalProperties) override final;
- virtual void getCollectionEntries(ErrorString&, const String& objectId, const String* objectGroup, const int* startIndex, const int* numberToFetch, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::CollectionEntry>>& entries) override final;
- virtual void saveResult(ErrorString&, const Inspector::InspectorObject& callArgument, const int* executionContextId, Inspector::Protocol::OptOutput<int>* savedResultIndex) override final;
- virtual void releaseObjectGroup(ErrorString&, const String& objectGroup) override final;
- virtual void getRuntimeTypesForVariablesAtOffsets(ErrorString&, const Inspector::InspectorArray& locations, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::TypeDescription>>&) override;
- virtual void enableTypeProfiler(ErrorString&) override;
- virtual void disableTypeProfiler(ErrorString&) override;
- virtual void getBasicBlocks(ErrorString&, const String& in_sourceID, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::BasicBlock>>& out_basicBlocks) override;
+ void enable(ErrorString&) override { m_enabled = true; }
+ void disable(ErrorString&) override { m_enabled = false; }
+ void parse(ErrorString&, const String& expression, Inspector::Protocol::Runtime::SyntaxErrorType* result, Inspector::Protocol::OptOutput<String>* message, RefPtr<Inspector::Protocol::Runtime::ErrorRange>&) override final;
+ void evaluate(ErrorString&, const String& expression, const String* objectGroup, const bool* includeCommandLineAPI, const bool* doNotPauseOnExceptionsAndMuteConsole, const int* executionContextId, const bool* returnByValue, const bool* generatePreview, const bool* saveResult, RefPtr<Inspector::Protocol::Runtime::RemoteObject>& result, Inspector::Protocol::OptOutput<bool>* wasThrown, Inspector::Protocol::OptOutput<int>* savedResultIndex) override final;
+ void callFunctionOn(ErrorString&, const String& objectId, const String& expression, const Inspector::InspectorArray* optionalArguments, const bool* doNotPauseOnExceptionsAndMuteConsole, const bool* returnByValue, const bool* generatePreview, RefPtr<Inspector::Protocol::Runtime::RemoteObject>& result, Inspector::Protocol::OptOutput<bool>* wasThrown) override final;
+ void releaseObject(ErrorString&, const ErrorString& objectId) override final;
+ void getProperties(ErrorString&, const String& objectId, const bool* ownProperties, const bool* generatePreview, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::PropertyDescriptor>>& result, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::InternalPropertyDescriptor>>& internalProperties) override final;
+ void getDisplayableProperties(ErrorString&, const String& objectId, const bool* generatePreview, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::PropertyDescriptor>>& result, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::InternalPropertyDescriptor>>& internalProperties) override final;
+ void getCollectionEntries(ErrorString&, const String& objectId, const String* objectGroup, const int* startIndex, const int* numberToFetch, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::CollectionEntry>>& entries) override final;
+ void saveResult(ErrorString&, const Inspector::InspectorObject& callArgument, const int* executionContextId, Inspector::Protocol::OptOutput<int>* savedResultIndex) override final;
+ void releaseObjectGroup(ErrorString&, const String& objectGroup) override final;
+ void getRuntimeTypesForVariablesAtOffsets(ErrorString&, const Inspector::InspectorArray& locations, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::TypeDescription>>&) override;
+ void enableTypeProfiler(ErrorString&) override;
+ void disableTypeProfiler(ErrorString&) override;
+ void getBasicBlocks(ErrorString&, const String& in_sourceID, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::BasicBlock>>& out_basicBlocks) override;
bool enabled() const { return m_enabled; }
diff --git a/Source/JavaScriptCore/inspector/agents/InspectorScriptProfilerAgent.h b/Source/JavaScriptCore/inspector/agents/InspectorScriptProfilerAgent.h
index f62e008..ef87db3 100644
--- a/Source/JavaScriptCore/inspector/agents/InspectorScriptProfilerAgent.h
+++ b/Source/JavaScriptCore/inspector/agents/InspectorScriptProfilerAgent.h
@@ -46,17 +46,17 @@
InspectorScriptProfilerAgent(AgentContext&);
virtual ~InspectorScriptProfilerAgent();
- virtual void didCreateFrontendAndBackend(FrontendRouter*, BackendDispatcher*) override;
- virtual void willDestroyFrontendAndBackend(DisconnectReason) override;
+ void didCreateFrontendAndBackend(FrontendRouter*, BackendDispatcher*) override;
+ void willDestroyFrontendAndBackend(DisconnectReason) override;
// ScriptProfilerBackendDispatcherHandler
- virtual void startTracking(ErrorString&, const bool* includeSamples) override;
- virtual void stopTracking(ErrorString&) override;
+ void startTracking(ErrorString&, const bool* includeSamples) override;
+ void stopTracking(ErrorString&) override;
// Debugger::ProfilingClient
- virtual bool isAlreadyProfiling() const override;
- virtual double willEvaluateScript() override;
- virtual void didEvaluateScript(double, JSC::ProfilingReason) override;
+ bool isAlreadyProfiling() const override;
+ double willEvaluateScript() override;
+ void didEvaluateScript(double, JSC::ProfilingReason) override;
private:
struct Event {
diff --git a/Source/JavaScriptCore/inspector/agents/JSGlobalObjectConsoleAgent.h b/Source/JavaScriptCore/inspector/agents/JSGlobalObjectConsoleAgent.h
index f966e92..b1dae4c 100644
--- a/Source/JavaScriptCore/inspector/agents/JSGlobalObjectConsoleAgent.h
+++ b/Source/JavaScriptCore/inspector/agents/JSGlobalObjectConsoleAgent.h
@@ -39,8 +39,8 @@
virtual ~JSGlobalObjectConsoleAgent() { }
// FIXME: XHRs and Nodes only makes sense debugging a Web context. Can this be moved to a different agent?
- virtual void setMonitoringXHREnabled(ErrorString&, bool enabled) override;
- virtual void addInspectedNode(ErrorString&, int nodeId) override;
+ void setMonitoringXHREnabled(ErrorString&, bool enabled) override;
+ void addInspectedNode(ErrorString&, int nodeId) override;
};
} // namespace Inspector
diff --git a/Source/JavaScriptCore/inspector/agents/JSGlobalObjectDebuggerAgent.h b/Source/JavaScriptCore/inspector/agents/JSGlobalObjectDebuggerAgent.h
index 450ecf2..91a57c9 100644
--- a/Source/JavaScriptCore/inspector/agents/JSGlobalObjectDebuggerAgent.h
+++ b/Source/JavaScriptCore/inspector/agents/JSGlobalObjectDebuggerAgent.h
@@ -40,14 +40,14 @@
JSGlobalObjectDebuggerAgent(JSAgentContext&, InspectorConsoleAgent*);
virtual ~JSGlobalObjectDebuggerAgent() { }
- virtual InjectedScript injectedScriptForEval(ErrorString&, const int* executionContextId) override;
+ InjectedScript injectedScriptForEval(ErrorString&, const int* executionContextId) override;
- virtual void breakpointActionLog(JSC::ExecState*, const String&) override;
+ void breakpointActionLog(JSC::ExecState*, const String&) override;
// NOTE: JavaScript inspector does not yet need to mute a console because no messages
// are sent to the console outside of the API boundary or console object.
- virtual void muteConsole() override { }
- virtual void unmuteConsole() override { }
+ void muteConsole() override { }
+ void unmuteConsole() override { }
private:
InspectorConsoleAgent* m_consoleAgent { nullptr };
diff --git a/Source/JavaScriptCore/inspector/agents/JSGlobalObjectRuntimeAgent.h b/Source/JavaScriptCore/inspector/agents/JSGlobalObjectRuntimeAgent.h
index dfa5ab1..3880e9f 100644
--- a/Source/JavaScriptCore/inspector/agents/JSGlobalObjectRuntimeAgent.h
+++ b/Source/JavaScriptCore/inspector/agents/JSGlobalObjectRuntimeAgent.h
@@ -38,14 +38,14 @@
public:
JSGlobalObjectRuntimeAgent(JSAgentContext&);
- virtual void didCreateFrontendAndBackend(FrontendRouter*, BackendDispatcher*) override;
+ void didCreateFrontendAndBackend(FrontendRouter*, BackendDispatcher*) override;
- virtual InjectedScript injectedScriptForEval(ErrorString&, const int* executionContextId) override;
+ InjectedScript injectedScriptForEval(ErrorString&, const int* executionContextId) override;
// NOTE: JavaScript inspector does not yet need to mute a console because no messages
// are sent to the console outside of the API boundary or console object.
- virtual void muteConsole() override { }
- virtual void unmuteConsole() override { }
+ void muteConsole() override { }
+ void unmuteConsole() override { }
private:
std::unique_ptr<RuntimeFrontendDispatcher> m_frontendDispatcher;
diff --git a/Source/JavaScriptCore/inspector/augmentable/AlternateDispatchableAgent.h b/Source/JavaScriptCore/inspector/augmentable/AlternateDispatchableAgent.h
index ed332ab..e03dbad 100644
--- a/Source/JavaScriptCore/inspector/augmentable/AlternateDispatchableAgent.h
+++ b/Source/JavaScriptCore/inspector/augmentable/AlternateDispatchableAgent.h
@@ -53,11 +53,11 @@
m_alternateDispatcher->setBackendDispatcher(nullptr);
}
- virtual void didCreateFrontendAndBackend(FrontendRouter*, BackendDispatcher*) override
+ void didCreateFrontendAndBackend(FrontendRouter*, BackendDispatcher*) override
{
}
- virtual void willDestroyFrontendAndBackend(DisconnectReason) override
+ void willDestroyFrontendAndBackend(DisconnectReason) override
{
}
diff --git a/Source/JavaScriptCore/inspector/remote/RemoteAutomationTarget.h b/Source/JavaScriptCore/inspector/remote/RemoteAutomationTarget.h
index 0b289db..ce46f02 100644
--- a/Source/JavaScriptCore/inspector/remote/RemoteAutomationTarget.h
+++ b/Source/JavaScriptCore/inspector/remote/RemoteAutomationTarget.h
@@ -43,8 +43,8 @@
void setIsPaired(bool);
virtual String name() const = 0;
- virtual RemoteControllableTarget::Type type() const override { return RemoteControllableTarget::Type::Automation; }
- virtual bool remoteControlAllowed() const override { return !m_paired; };
+ RemoteControllableTarget::Type type() const override { return RemoteControllableTarget::Type::Automation; }
+ bool remoteControlAllowed() const override { return !m_paired; };
private:
bool m_paired { false };
diff --git a/Source/JavaScriptCore/inspector/remote/RemoteConnectionToTarget.h b/Source/JavaScriptCore/inspector/remote/RemoteConnectionToTarget.h
index d3e8d31..192ca0e 100644
--- a/Source/JavaScriptCore/inspector/remote/RemoteConnectionToTarget.h
+++ b/Source/JavaScriptCore/inspector/remote/RemoteConnectionToTarget.h
@@ -63,8 +63,8 @@
void clearQueue() { m_queue.clear(); }
// FrontendChannel overrides.
- virtual ConnectionType connectionType() const override { return ConnectionType::Remote; }
- virtual bool sendMessageToFrontend(const String&) override;
+ ConnectionType connectionType() const override { return ConnectionType::Remote; }
+ bool sendMessageToFrontend(const String&) override;
private:
void dispatchAsyncOnTarget(void (^block)());
diff --git a/Source/JavaScriptCore/inspector/remote/RemoteInspectionTarget.h b/Source/JavaScriptCore/inspector/remote/RemoteInspectionTarget.h
index f595ddf..f644e78 100644
--- a/Source/JavaScriptCore/inspector/remote/RemoteInspectionTarget.h
+++ b/Source/JavaScriptCore/inspector/remote/RemoteInspectionTarget.h
@@ -57,7 +57,7 @@
virtual void unpauseForInitializedInspector();
// RemoteControllableTarget overrides.
- virtual bool remoteControlAllowed() const override;
+ bool remoteControlAllowed() const override;
private:
bool m_allowed {false};
RetainPtr<CFRunLoopRef> m_runLoop;
diff --git a/Source/JavaScriptCore/inspector/remote/RemoteInspector.h b/Source/JavaScriptCore/inspector/remote/RemoteInspector.h
index 3f2c50f..233e43e 100644
--- a/Source/JavaScriptCore/inspector/remote/RemoteInspector.h
+++ b/Source/JavaScriptCore/inspector/remote/RemoteInspector.h
@@ -104,9 +104,9 @@
void sendAutomaticInspectionCandidateMessage();
- virtual void xpcConnectionReceivedMessage(RemoteInspectorXPCConnection*, NSString *messageName, NSDictionary *userInfo) override;
- virtual void xpcConnectionFailed(RemoteInspectorXPCConnection*) override;
- virtual void xpcConnectionUnhandledMessage(RemoteInspectorXPCConnection*, xpc_object_t) override;
+ void xpcConnectionReceivedMessage(RemoteInspectorXPCConnection*, NSString *messageName, NSDictionary *userInfo) override;
+ void xpcConnectionFailed(RemoteInspectorXPCConnection*) override;
+ void xpcConnectionUnhandledMessage(RemoteInspectorXPCConnection*, xpc_object_t) override;
void receivedSetupMessage(NSDictionary *userInfo);
void receivedDataMessage(NSDictionary *userInfo);
diff --git a/Source/JavaScriptCore/inspector/scripts/codegen/cpp_generator_templates.py b/Source/JavaScriptCore/inspector/scripts/codegen/cpp_generator_templates.py
index 5c30d09..be2e979 100755
--- a/Source/JavaScriptCore/inspector/scripts/codegen/cpp_generator_templates.py
+++ b/Source/JavaScriptCore/inspector/scripts/codegen/cpp_generator_templates.py
@@ -101,7 +101,7 @@
"""${classAndExportMacro} ${domainName}BackendDispatcher final : public SupplementalBackendDispatcher {
public:
static Ref<${domainName}BackendDispatcher> create(BackendDispatcher&, ${domainName}BackendDispatcherHandler*);
- virtual void dispatch(long requestId, const String& method, Ref<InspectorObject>&& message) override;
+ void dispatch(long requestId, const String& method, Ref<InspectorObject>&& message) override;
${commandDeclarations}
private:
${domainName}BackendDispatcher(BackendDispatcher&, ${domainName}BackendDispatcherHandler*);
diff --git a/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result b/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result
index a414504..7d23bb7 100644
--- a/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result
+++ b/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result
@@ -188,7 +188,7 @@
class DatabaseBackendDispatcher final : public SupplementalBackendDispatcher {
public:
static Ref<DatabaseBackendDispatcher> create(BackendDispatcher&, DatabaseBackendDispatcherHandler*);
- virtual void dispatch(long requestId, const String& method, Ref<InspectorObject>&& message) override;
+ void dispatch(long requestId, const String& method, Ref<InspectorObject>&& message) override;
private:
void executeSQLSyncOptionalReturnValues(long requestId, RefPtr<InspectorObject>&& parameters);
void executeSQLAsyncOptionalReturnValues(long requestId, RefPtr<InspectorObject>&& parameters);
@@ -843,10 +843,10 @@
class ObjCInspectorDatabaseBackendDispatcher final : public AlternateDatabaseBackendDispatcher {
public:
ObjCInspectorDatabaseBackendDispatcher(id<TestProtocolDatabaseDomainHandler> handler) { m_delegate = handler; }
- virtual void executeSQLSyncOptionalReturnValues(long requestId, int in_databaseId, const String& in_query) override;
- virtual void executeSQLAsyncOptionalReturnValues(long requestId, int in_databaseId, const String& in_query) override;
- virtual void executeSQLSync(long requestId, int in_databaseId, const String& in_query) override;
- virtual void executeSQLAsync(long requestId, int in_databaseId, const String& in_query) override;
+ void executeSQLSyncOptionalReturnValues(long requestId, int in_databaseId, const String& in_query) override;
+ void executeSQLAsyncOptionalReturnValues(long requestId, int in_databaseId, const String& in_query) override;
+ void executeSQLSync(long requestId, int in_databaseId, const String& in_query) override;
+ void executeSQLAsync(long requestId, int in_databaseId, const String& in_query) override;
private:
RetainPtr<id<TestProtocolDatabaseDomainHandler>> m_delegate;
};
diff --git a/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result b/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result
index 47fc4e9..8f06200 100644
--- a/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result
+++ b/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result
@@ -171,7 +171,7 @@
class DatabaseBackendDispatcher final : public SupplementalBackendDispatcher {
public:
static Ref<DatabaseBackendDispatcher> create(BackendDispatcher&, DatabaseBackendDispatcherHandler*);
- virtual void dispatch(long requestId, const String& method, Ref<InspectorObject>&& message) override;
+ void dispatch(long requestId, const String& method, Ref<InspectorObject>&& message) override;
private:
void executeAllOptionalParameters(long requestId, RefPtr<InspectorObject>&& parameters);
void executeNoOptionalParameters(long requestId, RefPtr<InspectorObject>&& parameters);
@@ -744,8 +744,8 @@
class ObjCInspectorDatabaseBackendDispatcher final : public AlternateDatabaseBackendDispatcher {
public:
ObjCInspectorDatabaseBackendDispatcher(id<TestProtocolDatabaseDomainHandler> handler) { m_delegate = handler; }
- virtual void executeAllOptionalParameters(long requestId, const Inspector::InspectorArray* in_columnNames, const String* in_notes, const double* in_timestamp, const Inspector::InspectorObject* in_values, const Inspector::InspectorValue* in_payload, const int* in_databaseId, const Inspector::InspectorObject* in_sqlError, const String* in_screenColor, const Inspector::InspectorArray* in_alternateColors, const String* in_printColor) override;
- virtual void executeNoOptionalParameters(long requestId, const Inspector::InspectorArray& in_columnNames, const String& in_notes, double in_timestamp, const Inspector::InspectorObject& in_values, Inspector::InspectorValue in_payload, int in_databaseId, const Inspector::InspectorObject& in_sqlError, const String& in_screenColor, const Inspector::InspectorArray& in_alternateColors, const String& in_printColor) override;
+ void executeAllOptionalParameters(long requestId, const Inspector::InspectorArray* in_columnNames, const String* in_notes, const double* in_timestamp, const Inspector::InspectorObject* in_values, const Inspector::InspectorValue* in_payload, const int* in_databaseId, const Inspector::InspectorObject* in_sqlError, const String* in_screenColor, const Inspector::InspectorArray* in_alternateColors, const String* in_printColor) override;
+ void executeNoOptionalParameters(long requestId, const Inspector::InspectorArray& in_columnNames, const String& in_notes, double in_timestamp, const Inspector::InspectorObject& in_values, Inspector::InspectorValue in_payload, int in_databaseId, const Inspector::InspectorObject& in_sqlError, const String& in_screenColor, const Inspector::InspectorArray& in_alternateColors, const String& in_printColor) override;
private:
RetainPtr<id<TestProtocolDatabaseDomainHandler>> m_delegate;
};
diff --git a/Source/JavaScriptCore/inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result b/Source/JavaScriptCore/inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result
index 396da3c..f8df9e1 100644
--- a/Source/JavaScriptCore/inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result
+++ b/Source/JavaScriptCore/inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result
@@ -189,7 +189,7 @@
class Network1BackendDispatcher final : public SupplementalBackendDispatcher {
public:
static Ref<Network1BackendDispatcher> create(BackendDispatcher&, Network1BackendDispatcherHandler*);
- virtual void dispatch(long requestId, const String& method, Ref<InspectorObject>&& message) override;
+ void dispatch(long requestId, const String& method, Ref<InspectorObject>&& message) override;
private:
void loadResource1(long requestId, RefPtr<InspectorObject>&& parameters);
#if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
@@ -206,7 +206,7 @@
class Network3BackendDispatcher final : public SupplementalBackendDispatcher {
public:
static Ref<Network3BackendDispatcher> create(BackendDispatcher&, Network3BackendDispatcherHandler*);
- virtual void dispatch(long requestId, const String& method, Ref<InspectorObject>&& message) override;
+ void dispatch(long requestId, const String& method, Ref<InspectorObject>&& message) override;
private:
void loadResource1(long requestId, RefPtr<InspectorObject>&& parameters);
void loadResource2(long requestId, RefPtr<InspectorObject>&& parameters);
@@ -765,7 +765,7 @@
class ObjCInspectorNetwork1BackendDispatcher final : public AlternateNetwork1BackendDispatcher {
public:
ObjCInspectorNetwork1BackendDispatcher(id<TestProtocolNetwork1DomainHandler> handler) { m_delegate = handler; }
- virtual void loadResource1(long requestId) override;
+ void loadResource1(long requestId) override;
private:
RetainPtr<id<TestProtocolNetwork1DomainHandler>> m_delegate;
};
@@ -775,13 +775,13 @@
class ObjCInspectorNetwork3BackendDispatcher final : public AlternateNetwork3BackendDispatcher {
public:
ObjCInspectorNetwork3BackendDispatcher(id<TestProtocolNetwork3DomainHandler> handler) { m_delegate = handler; }
- virtual void loadResource1(long requestId) override;
- virtual void loadResource2(long requestId) override;
- virtual void loadResource3(long requestId) override;
- virtual void loadResource4(long requestId) override;
- virtual void loadResource5(long requestId) override;
- virtual void loadResource6(long requestId) override;
- virtual void loadResource7(long requestId) override;
+ void loadResource1(long requestId) override;
+ void loadResource2(long requestId) override;
+ void loadResource3(long requestId) override;
+ void loadResource4(long requestId) override;
+ void loadResource5(long requestId) override;
+ void loadResource6(long requestId) override;
+ void loadResource7(long requestId) override;
private:
RetainPtr<id<TestProtocolNetwork3DomainHandler>> m_delegate;
};
diff --git a/Source/JavaScriptCore/inspector/scripts/tests/expected/enum-values.json-result b/Source/JavaScriptCore/inspector/scripts/tests/expected/enum-values.json-result
index 0514f4b..9cc2106 100644
--- a/Source/JavaScriptCore/inspector/scripts/tests/expected/enum-values.json-result
+++ b/Source/JavaScriptCore/inspector/scripts/tests/expected/enum-values.json-result
@@ -170,7 +170,7 @@
class CommandDomainBackendDispatcher final : public SupplementalBackendDispatcher {
public:
static Ref<CommandDomainBackendDispatcher> create(BackendDispatcher&, CommandDomainBackendDispatcherHandler*);
- virtual void dispatch(long requestId, const String& method, Ref<InspectorObject>&& message) override;
+ void dispatch(long requestId, const String& method, Ref<InspectorObject>&& message) override;
private:
void commandWithEnumReturnValue(long requestId, RefPtr<InspectorObject>&& parameters);
#if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
@@ -589,7 +589,7 @@
class ObjCInspectorCommandDomainBackendDispatcher final : public AlternateCommandDomainBackendDispatcher {
public:
ObjCInspectorCommandDomainBackendDispatcher(id<TestProtocolCommandDomainDomainHandler> handler) { m_delegate = handler; }
- virtual void commandWithEnumReturnValue(long requestId) override;
+ void commandWithEnumReturnValue(long requestId) override;
private:
RetainPtr<id<TestProtocolCommandDomainDomainHandler>> m_delegate;
};
diff --git a/Source/JavaScriptCore/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result b/Source/JavaScriptCore/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result
index f7c6b1c..601a902 100644
--- a/Source/JavaScriptCore/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result
+++ b/Source/JavaScriptCore/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result
@@ -166,7 +166,7 @@
class Network1BackendDispatcher final : public SupplementalBackendDispatcher {
public:
static Ref<Network1BackendDispatcher> create(BackendDispatcher&, Network1BackendDispatcherHandler*);
- virtual void dispatch(long requestId, const String& method, Ref<InspectorObject>&& message) override;
+ void dispatch(long requestId, const String& method, Ref<InspectorObject>&& message) override;
private:
void loadResource(long requestId, RefPtr<InspectorObject>&& parameters);
#if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
@@ -632,7 +632,7 @@
class ObjCInspectorNetwork1BackendDispatcher final : public AlternateNetwork1BackendDispatcher {
public:
ObjCInspectorNetwork1BackendDispatcher(id<TestProtocolNetwork1DomainHandler> handler) { m_delegate = handler; }
- virtual void loadResource(long requestId) override;
+ void loadResource(long requestId) override;
private:
RetainPtr<id<TestProtocolNetwork1DomainHandler>> m_delegate;
};
