Index: third_party/WebKit/Source/devtools/front_end/sdk/protocol/js_protocol.json |
diff --git a/third_party/WebKit/Source/devtools/front_end/sdk/protocol/js_protocol.json b/third_party/WebKit/Source/devtools/front_end/sdk/protocol/js_protocol.json |
index 9cbc93619ae70e3615ce43ba367f8d27ebee905d..713ae133190dbf0e19c382ffdc356b42a0fb76ea 100644 |
--- a/third_party/WebKit/Source/devtools/front_end/sdk/protocol/js_protocol.json |
+++ b/third_party/WebKit/Source/devtools/front_end/sdk/protocol/js_protocol.json |
@@ -133,17 +133,24 @@ |
{ |
"id": "ExceptionDetails", |
"type": "object", |
- "description": "Detailed information on exception (or error) that was thrown during script compilation or execution.", |
+ "hidden": true, |
+ "description": "Detailed information about exception (or error) that was thrown during script compilation or execution.", |
"properties": [ |
{ "name": "text", "type": "string", "description": "Exception text." }, |
- { "name": "url", "type": "string", "optional": true, "description": "URL of the message origin." }, |
- { "name": "scriptId", "type": "string", "optional": true, "description": "Script ID of the message origin." }, |
- { "name": "line", "type": "integer", "optional": true, "description": "Line number in the resource that generated this message." }, |
- { "name": "column", "type": "integer", "optional": true, "description": "Column number in the resource that generated this message." }, |
- { "name": "stack", "$ref": "StackTrace", "optional": true, "description": "JavaScript stack trace for assertions and error messages." } |
+ { "name": "scriptId", "$ref": "ScriptId", "description": "Script ID of the exception location." }, |
+ { "name": "lineNumber", "type": "integer", "description": "Line number of the exception location (0-based)." }, |
+ { "name": "columnNumber", "type": "integer", "description": "Column number of the exception location (0-based)." }, |
+ { "name": "url", "type": "string", "optional": true, "description": "URL of the exception location, to be used when the script was not reported." }, |
+ { "name": "stackTrace", "$ref": "StackTrace", "optional": true, "description": "JavaScript stack trace if available." } |
] |
}, |
{ |
+ "id": "Timestamp", |
+ "type": "number", |
+ "description": "Number of milliseconds since epoch.", |
+ "hidden": true |
+ }, |
+ { |
"id": "CallFrame", |
"type": "object", |
"description": "Stack entry for runtime errors and assertions.", |
@@ -151,8 +158,8 @@ |
{ "name": "functionName", "type": "string", "description": "JavaScript function name." }, |
{ "name": "scriptId", "$ref": "ScriptId", "description": "JavaScript script id." }, |
{ "name": "url", "type": "string", "description": "JavaScript script name or url." }, |
- { "name": "lineNumber", "type": "integer", "description": "JavaScript script line number." }, |
- { "name": "columnNumber", "type": "integer", "description": "JavaScript script column number." } |
+ { "name": "lineNumber", "type": "integer", "description": "JavaScript script line number (0-based)." }, |
+ { "name": "columnNumber", "type": "integer", "description": "JavaScript script column number (0-based)." } |
] |
}, |
{ |
@@ -308,6 +315,39 @@ |
"description": "Issued when all executionContexts were cleared in browser" |
}, |
{ |
+ "name": "exceptionThrown", |
+ "description": "Issued when exception was thrown and unhandled.", |
+ "parameters": [ |
+ { "name": "exceptionId", "type": "integer", "description": "Exception id." }, |
+ { "name": "timestamp", "$ref": "Timestamp", "description": "Timestamp of the exception." }, |
+ { "name": "details", "$ref": "ExceptionDetails" }, |
+ { "name": "exception", "$ref": "RemoteObject", "optional": true, "description": "Exception object." }, |
+ { "name": "executionContextId", "$ref": "ExecutionContextId", "optional": true, "description": "Identifier of the context where exception happened." } |
+ ], |
+ "hidden": true |
+ }, |
+ { |
+ "name": "exceptionRevoked", |
+ "description": "Issued when unhandled exception was revoked.", |
+ "parameters": [ |
+ { "name": "message", "type": "string", "description": "Message describing why exception was revoked." }, |
+ { "name": "exceptionId", "type": "integer", "description": "The id of revoked exception, as reported in <code>exceptionUnhandled</code>." } |
+ ], |
+ "hidden": true |
+ }, |
+ { |
+ "name": "consoleAPICalled", |
+ "description": "Issued when console API was called.", |
+ "parameters": [ |
+ { "name": "type", "type": "string", "enum": ["log", "debug", "info", "error", "warning", "dir", "dirxml", "table", "trace", "clear", "startGroup", "startGroupCollapsed", "endGroup", "assert", "profile", "profileEnd"], "description": "Type of the call." }, |
+ { "name": "args", "type": "array", "items": { "$ref": "RemoteObject" }, "description": "Call arguments." }, |
+ { "name": "executionContextId", "$ref": "ExecutionContextId", "description": "Identifier of the context where the call was made." }, |
+ { "name": "timestamp", "$ref": "Timestamp", "description": "Call timestamp." }, |
+ { "name": "stackTrace", "$ref": "StackTrace", "optional": true, "description": "Stack trace captured when the call was made." } |
+ ], |
+ "hidden": true |
+ }, |
+ { |
"name": "inspectRequested", |
"parameters": [ |
{ "name": "object", "$ref": "RemoteObject" }, |
@@ -347,24 +387,12 @@ |
"hidden": true, |
"type": "object", |
"properties": [ |
- { "name": "line", "type": "integer" }, |
- { "name": "column", "type": "integer" } |
+ { "name": "lineNumber", "type": "integer" }, |
+ { "name": "columnNumber", "type": "integer" } |
], |
"description": "Location in the source code." |
}, |
{ |
- "id": "FunctionDetails", |
- "hidden": true, |
- "type": "object", |
- "properties": [ |
- { "name": "location", "$ref": "Location", "optional": true, "description": "Location of the function, none for native functions." }, |
- { "name": "functionName", "type": "string", "description": "Name of the function." }, |
- { "name": "isGenerator", "type": "boolean", "description": "Whether this is a generator function." }, |
- { "name": "scopeChain", "type": "array", "optional": true, "items": { "$ref": "Scope" }, "description": "Scope chain for this closure." } |
- ], |
- "description": "Information about the function." |
- }, |
- { |
"id": "CallFrame", |
"type": "object", |
"properties": [ |
@@ -391,17 +419,6 @@ |
"description": "Scope description." |
}, |
{ |
- "id": "SetScriptSourceError", |
- "type": "object", |
- "properties": [ |
- { "name": "message", "type": "string", "description": "Compiler error message" }, |
- { "name": "lineNumber", "type": "integer", "description": "Compile error line number (1-based)" }, |
- { "name": "columnNumber", "type": "integer", "description": "Compile error column number (1-based)" } |
- ], |
- "description": "Error data for setScriptSource command. Contains uncompilable script source error.", |
- "hidden": true |
- }, |
- { |
"id": "SearchMatch", |
"type": "object", |
"description": "Search match for resource.", |
@@ -529,7 +546,7 @@ |
{ "name": "callFrames", "type": "array", "optional": true, "items": { "$ref": "CallFrame" }, "description": "New stack trace in case editing has happened while VM was stopped." }, |
{ "name": "stackChanged", "type": "boolean", "optional": true, "description": "Whether current call stack was modified after applying the changes.", "hidden": true }, |
{ "name": "asyncStackTrace", "$ref": "Runtime.StackTrace", "optional": true, "description": "Async stack trace, if any.", "hidden": true }, |
- { "name": "compileError", "optional": true, "$ref": "SetScriptSourceError", "description": "Error data if any." } |
+ { "name": "compileError", "optional": true, "$ref": "Runtime.ExceptionDetails", "description": "Error data if any." } |
], |
"description": "Edits JavaScript source live." |
}, |
@@ -556,17 +573,6 @@ |
"description": "Returns source for the script with given id." |
}, |
{ |
- "name": "getFunctionDetails", |
- "hidden": true, |
- "parameters": [ |
- { "name": "functionId", "$ref": "Runtime.RemoteObjectId", "description": "Id of the function to get details for." } |
- ], |
- "returns": [ |
- { "name": "details", "$ref": "FunctionDetails", "description": "Information about the function." } |
- ], |
- "description": "Returns detailed information on given function." |
- }, |
- { |
"name": "setPauseOnExceptions", |
"parameters": [ |
{ "name": "state", "type": "string", "enum": ["none", "uncaught", "all"], "description": "Pause on exceptions mode." } |
@@ -689,7 +695,7 @@ |
"name": "paused", |
"parameters": [ |
{ "name": "callFrames", "type": "array", "items": { "$ref": "CallFrame" }, "description": "Call stack the virtual machine stopped on." }, |
- { "name": "reason", "type": "string", "enum": [ "XHR", "DOM", "EventListener", "exception", "assert", "CSPViolation", "debugCommand", "promiseRejection", "other" ], "description": "Pause reason." }, |
+ { "name": "reason", "type": "string", "enum": [ "XHR", "DOM", "EventListener", "exception", "assert", "debugCommand", "promiseRejection", "other" ], "description": "Pause reason." }, |
{ "name": "data", "type": "object", "optional": true, "description": "Object containing break-specific auxiliary properties." }, |
{ "name": "hitBreakpoints", "type": "array", "optional": true, "items": { "type": "string" }, "description": "Hit breakpoints IDs", "hidden": true }, |
{ "name": "asyncStackTrace", "$ref": "Runtime.StackTrace", "optional": true, "description": "Async stack trace, if any.", "hidden": true } |
@@ -708,32 +714,25 @@ |
"dependencies": ["Runtime"], |
"types": [ |
{ |
- "id": "Timestamp", |
- "type": "number", |
- "description": "Number of seconds since epoch.", |
- "hidden": true |
- }, |
- { |
"id": "ConsoleMessage", |
"type": "object", |
"description": "Console message.", |
"properties": [ |
- { "name": "source", "type": "string", "enum": ["xml", "javascript", "network", "console-api", "storage", "appcache", "rendering", "security", "other", "deprecation"], "description": "Message source." }, |
- { "name": "level", "type": "string", "enum": ["log", "warning", "error", "debug", "info", "revokedError"], "description": "Message severity." }, |
+ { "name": "source", "type": "string", "enum": ["xml", "javascript", "network", "console-api", "storage", "appcache", "rendering", "security", "other", "deprecation", "worker"], "description": "Message source." }, |
+ { "name": "level", "type": "string", "enum": ["log", "warning", "error", "debug", "info"], "description": "Message severity." }, |
{ "name": "text", "type": "string", "description": "Message text." }, |
- { "name": "type", "type": "string", "optional": true, "enum": ["log", "dir", "dirxml", "table", "trace", "clear", "startGroup", "startGroupCollapsed", "endGroup", "assert", "profile", "profileEnd"], "description": "Console message type." }, |
+ { "name": "type", "type": "string", "optional": true, "enum": ["log", "dir", "dirxml", "table", "trace", "clear", "startGroup", "startGroupCollapsed", "endGroup", "assert", "profile", "profileEnd"], "description": "Never present. Use Runtime.consoleAPICalled instead." }, |
{ "name": "scriptId", "type": "string", "optional": true, "description": "Script ID of the message origin." }, |
{ "name": "url", "type": "string", "optional": true, "description": "URL of the message origin." }, |
{ "name": "line", "type": "integer", "optional": true, "description": "Line number in the resource that generated this message." }, |
{ "name": "column", "type": "integer", "optional": true, "description": "Column number in the resource that generated this message." }, |
{ "name": "repeatCount", "type": "integer", "optional": true, "description": "Repeat count for repeated messages." }, |
- { "name": "parameters", "type": "array", "items": { "$ref": "Runtime.RemoteObject" }, "optional": true, "description": "Message parameters in case of the formatted message." }, |
+ { "name": "parameters", "type": "array", "items": { "$ref": "Runtime.RemoteObject" }, "optional": true, "description": "Never present. Use Runtime.consoleAPICalled instead." }, |
{ "name": "stack", "$ref": "Runtime.StackTrace", "optional": true, "description": "JavaScript stack trace for assertions and error messages." }, |
{ "name": "networkRequestId", "type": "string", "optional": true, "description": "Identifier of the network request associated with this message." }, |
- { "name": "timestamp", "$ref": "Timestamp", "description": "Timestamp, when this message was fired.", "hidden": true }, |
+ { "name": "timestamp", "$ref": "Runtime.Timestamp", "description": "Timestamp, when this message was fired.", "hidden": true }, |
{ "name": "executionContextId", "$ref": "Runtime.ExecutionContextId", "optional": true, "description": "Identifier of the context where this message was created", "hidden": true }, |
- { "name": "messageId", "type": "integer", "hidden": true, "optional": true, "description": "Message id." }, |
- { "name": "relatedMessageId", "type": "integer", "hidden": true, "optional": true, "description": "Related message id." } |
+ { "name": "workerId", "type": "string", "optional": true, "description": "Identifier of the worker this message came from.", "hidden": true } |
] |
} |
], |
@@ -763,14 +762,15 @@ |
"name": "messageRepeatCountUpdated", |
"parameters": [ |
{ "name": "count", "type": "integer", "description": "New repeat count value." }, |
- { "name": "timestamp", "$ref": "Timestamp", "description": "Timestamp of most recent message in batch.", "hidden": true } |
+ { "name": "timestamp", "$ref": "Runtime.Timestamp", "description": "Timestamp of most recent message in batch.", "hidden": true } |
], |
"description": "Is not issued. Will be gone in the future versions of the protocol.", |
"deprecated": true |
}, |
{ |
"name": "messagesCleared", |
- "description": "Issued when console is cleared. This happens either upon <code>clearMessages</code> command or after page navigation." |
+ "description": "Not issued.", |
+ "deprecated": true |
} |
] |
}, |
@@ -784,13 +784,8 @@ |
"type": "object", |
"description": "CPU Profile node. Holds callsite information, execution statistics and child nodes.", |
"properties": [ |
- { "name": "functionName", "type": "string", "description": "Function name." }, |
- { "name": "scriptId", "$ref": "Runtime.ScriptId", "description": "Script identifier." }, |
- { "name": "url", "type": "string", "description": "URL." }, |
- { "name": "lineNumber", "type": "integer", "description": "1-based line number of the function start position." }, |
- { "name": "columnNumber", "type": "integer", "description": "1-based column number of the function start position." }, |
+ { "name": "callFrame", "$ref": "Runtime.CallFrame", "description": "Function location." }, |
{ "name": "hitCount", "type": "integer", "description": "Number of samples where this node was on top of the call stack." }, |
- { "name": "callUID", "type": "number", "description": "Call UID." }, |
{ "name": "children", "type": "array", "items": { "$ref": "CPUProfileNode" }, "description": "Child nodes." }, |
{ "name": "deoptReason", "type": "string", "description": "The reason of being not optimized. The function may be deoptimized or marked as don't optimize."}, |
{ "name": "id", "type": "integer", "description": "Unique id of the node." }, |
@@ -879,11 +874,7 @@ |
"type": "object", |
"description": "Sampling Heap Profile node. Holds callsite information, allocation statistics and child nodes.", |
"properties": [ |
- { "name": "functionName", "type": "string", "description": "Function name." }, |
- { "name": "scriptId", "$ref": "Runtime.ScriptId", "description": "Script identifier." }, |
- { "name": "url", "type": "string", "description": "URL." }, |
- { "name": "lineNumber", "type": "integer", "description": "1-based line number of the function start position." }, |
- { "name": "columnNumber", "type": "integer", "description": "1-based column number of the function start position." }, |
+ { "name": "callFrame", "$ref": "Runtime.CallFrame", "description": "Function location." }, |
{ "name": "selfSize", "type": "number", "description": "Allocations size in bytes for the node excluding children." }, |
{ "name": "children", "type": "array", "items": { "$ref": "SamplingHeapProfileNode" }, "description": "Child nodes." } |
] |