| Index: third_party/WebKit/Source/core/inspector/InspectorRuntimeAgent.h
|
| diff --git a/third_party/WebKit/Source/core/inspector/InspectorRuntimeAgent.h b/third_party/WebKit/Source/core/inspector/InspectorRuntimeAgent.h
|
| index 36b9d309e49310365c1bdab10cb06bb88fbba752..410324abdff158d1966fccd635418ee5ab423173 100644
|
| --- a/third_party/WebKit/Source/core/inspector/InspectorRuntimeAgent.h
|
| +++ b/third_party/WebKit/Source/core/inspector/InspectorRuntimeAgent.h
|
| @@ -47,6 +47,9 @@ class V8RuntimeAgent;
|
|
|
| typedef String ErrorString;
|
|
|
| +using namespace protocol;
|
| +using protocol::TypeBuilder::OptionalValue;
|
| +
|
| class CORE_EXPORT InspectorRuntimeAgent
|
| : public InspectorBaseAgent<InspectorRuntimeAgent, protocol::Frontend::Runtime>
|
| , public protocol::Dispatcher::RuntimeCommandHandler {
|
| @@ -69,37 +72,18 @@ public:
|
| void restore() override;
|
|
|
| // Part of the protocol.
|
| + void evaluate(ErrorString*, const String& in_expression, const protocol::TypeBuilder::OptionalValue<String>& in_objectGroup, const protocol::TypeBuilder::OptionalValue<bool>& in_includeCommandLineAPI, const protocol::TypeBuilder::OptionalValue<bool>& in_doNotPauseOnExceptionsAndMuteConsole, const protocol::TypeBuilder::OptionalValue<int>& in_contextId, const protocol::TypeBuilder::OptionalValue<bool>& in_returnByValue, const protocol::TypeBuilder::OptionalValue<bool>& in_generatePreview, OwnPtr<protocol::TypeBuilder::Runtime::RemoteObject>* out_result, protocol::TypeBuilder::OptionalValue<bool>* out_wasThrown, OwnPtr<protocol::TypeBuilder::Runtime::ExceptionDetails>* out_exceptionDetails) override;
|
| + void callFunctionOn(ErrorString*, const String& in_objectId, const String& in_functionDeclaration, PassOwnPtr<protocol::TypeBuilder::Array<protocol::TypeBuilder::Runtime::CallArgument>> in_arguments, const protocol::TypeBuilder::OptionalValue<bool>& in_doNotPauseOnExceptionsAndMuteConsole, const protocol::TypeBuilder::OptionalValue<bool>& in_returnByValue, const protocol::TypeBuilder::OptionalValue<bool>& in_generatePreview, OwnPtr<protocol::TypeBuilder::Runtime::RemoteObject>* out_result, protocol::TypeBuilder::OptionalValue<bool>* out_wasThrown) override;
|
| + void getProperties(ErrorString*, const String& in_objectId, const protocol::TypeBuilder::OptionalValue<bool>& in_ownProperties, const protocol::TypeBuilder::OptionalValue<bool>& in_accessorPropertiesOnly, const protocol::TypeBuilder::OptionalValue<bool>& in_generatePreview, OwnPtr<protocol::TypeBuilder::Array<protocol::TypeBuilder::Runtime::PropertyDescriptor>>* out_result, OwnPtr<protocol::TypeBuilder::Array<protocol::TypeBuilder::Runtime::InternalPropertyDescriptor>>* out_internalProperties, OwnPtr<protocol::TypeBuilder::Runtime::ExceptionDetails>* out_exceptionDetails) override;
|
| + void releaseObject(ErrorString*, const String& in_objectId) override;
|
| + void releaseObjectGroup(ErrorString*, const String& in_objectGroup) override;
|
| + void run(ErrorString*) override;
|
| void enable(ErrorString*) override;
|
| void disable(ErrorString*) override;
|
| -
|
| - void evaluate(ErrorString*,
|
| - const String& expression,
|
| - const String* objectGroup,
|
| - const bool* includeCommandLineAPI,
|
| - const bool* doNotPauseOnExceptionsAndMuteConsole,
|
| - const int* executionContextId,
|
| - const bool* returnByValue,
|
| - const bool* generatePreview,
|
| - RefPtr<protocol::TypeBuilder::Runtime::RemoteObject>& result,
|
| - protocol::TypeBuilder::OptOutput<bool>* wasThrown,
|
| - RefPtr<protocol::TypeBuilder::Runtime::ExceptionDetails>&) final;
|
| - void callFunctionOn(ErrorString*,
|
| - const String& objectId,
|
| - const String& expression,
|
| - const RefPtr<JSONArray>* optionalArguments,
|
| - const bool* doNotPauseOnExceptionsAndMuteConsole,
|
| - const bool* returnByValue,
|
| - const bool* generatePreview,
|
| - RefPtr<protocol::TypeBuilder::Runtime::RemoteObject>& result,
|
| - protocol::TypeBuilder::OptOutput<bool>* wasThrown) final;
|
| - void releaseObject(ErrorString*, const String& objectId) final;
|
| - void getProperties(ErrorString*, const String& objectId, const bool* ownProperties, const bool* accessorPropertiesOnly, const bool* generatePreview, RefPtr<protocol::TypeBuilder::Array<protocol::TypeBuilder::Runtime::PropertyDescriptor>>& result, RefPtr<protocol::TypeBuilder::Array<protocol::TypeBuilder::Runtime::InternalPropertyDescriptor>>& internalProperties, RefPtr<protocol::TypeBuilder::Runtime::ExceptionDetails>&) final;
|
| - void releaseObjectGroup(ErrorString*, const String& objectGroup) final;
|
| - void run(ErrorString*) override;
|
| void isRunRequired(ErrorString*, bool* out_result) override;
|
| - void setCustomObjectFormatterEnabled(ErrorString*, bool) final;
|
| - void compileScript(ErrorString*, const String& inExpression, const String& inSourceURL, bool inPersistScript, int inExecutionContextId, protocol::TypeBuilder::OptOutput<protocol::TypeBuilder::Runtime::ScriptId>* optOutScriptId, RefPtr<protocol::TypeBuilder::Runtime::ExceptionDetails>& optOutExceptionDetails) override;
|
| - void runScript(ErrorString*, const String& inScriptId, int inExecutionContextId, const String* inObjectGroup, const bool* inDoNotPauseOnExceptionsAndMuteConsole, const bool* includeCommandLineAPI, RefPtr<protocol::TypeBuilder::Runtime::RemoteObject>& outResult, RefPtr<protocol::TypeBuilder::Runtime::ExceptionDetails>& optOutExceptionDetails) override;
|
| + void setCustomObjectFormatterEnabled(ErrorString*, bool in_enabled) override;
|
| + void compileScript(ErrorString*, const String& in_expression, const String& in_sourceURL, bool in_persistScript, int in_executionContextId, protocol::TypeBuilder::OptionalValue<String>* out_scriptId, OwnPtr<protocol::TypeBuilder::Runtime::ExceptionDetails>* out_exceptionDetails) override;
|
| + void runScript(ErrorString*, const String& in_scriptId, int in_executionContextId, const protocol::TypeBuilder::OptionalValue<String>& in_objectGroup, const protocol::TypeBuilder::OptionalValue<bool>& in_doNotPauseOnExceptionsAndMuteConsole, const protocol::TypeBuilder::OptionalValue<bool>& in_includeCommandLineAPI, OwnPtr<protocol::TypeBuilder::Runtime::RemoteObject>* out_result, OwnPtr<protocol::TypeBuilder::Runtime::ExceptionDetails>* out_exceptionDetails) override;
|
|
|
| virtual void muteConsole() = 0;
|
| virtual void unmuteConsole() = 0;
|
|
|