From 996df8a4aa6ca3dd2b731a79305dafb9785ca7bb Mon Sep 17 00:00:00 2001 From: devtools-ci-autoroll-builder Date: Tue, 10 Dec 2024 04:06:19 -0800 Subject: [PATCH] Roll browser-protocol This roll requires a manual review. See http://go/reviewed-rolls for guidance. In case of failures or errors, reach out to someone from config/owner/COMMON_OWNERS. Roll created at https://cr-buildbucket.appspot.com/build/8728939088830489089 R=devtools-waterfall-sheriff-onduty@rotations.google.com Bug: none Change-Id: Ib264870769bdf5b8b13e43082a6d00ecfc83bc6c Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6084655 Reviewed-by: Alex Rudenko Reviewed-by: Eric Leese Owners-Override: Eric Leese Commit-Queue: Eric Leese --- DEPS | 2 +- front_end/generated/InspectorBackendCommands.js | 4 ++-- front_end/generated/protocol.ts | 8 ++++++++ .../models/javascript_metadata/NativeFunctions.js | 14 ++++++-------- .../ui/legacy/components/utils/Linkifier.test.ts | 4 ++++ .../public/devtools_protocol/browser_protocol.json | 10 ++++++++++ .../blink/renderer/core/css/css_properties.json5 | 4 ++-- v8/include/js_protocol.pdl | 4 ++++ 8 files changed, 37 insertions(+), 13 deletions(-) diff --git a/DEPS b/DEPS index 1a1db3a741..8cb9a9dc4b 100644 --- a/DEPS +++ b/DEPS @@ -24,7 +24,7 @@ vars = { 'inspector_protocol_revision': '69d69ddf3aa698b171886551a4a672c5af1ad902', # Keeping track of the last time we rollerd the browser protocol files. - 'chromium_browser_protocol_revision' : '3ec35b727a0c624e0a2b820cadb7e59394be498e', + 'chromium_browser_protocol_revision' : 'a4d27b40bc7e114c8a581eec4c55f5be438a11ec', 'clang_format_url': 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git', 'clang_format_revision': '37f6e68a107df43b7d7e044fd36a13cbae3413f2', diff --git a/front_end/generated/InspectorBackendCommands.js b/front_end/generated/InspectorBackendCommands.js index 3d1a489e86..5b3d49a64d 100644 --- a/front_end/generated/InspectorBackendCommands.js +++ b/front_end/generated/InspectorBackendCommands.js @@ -1371,8 +1371,8 @@ inspectorBackend.registerEvent("Debugger.breakpointResolved", ["breakpointId", " inspectorBackend.registerEnum("Debugger.PausedEventReason", {Ambiguous: "ambiguous", Assert: "assert", CSPViolation: "CSPViolation", DebugCommand: "debugCommand", DOM: "DOM", EventListener: "EventListener", Exception: "exception", Instrumentation: "instrumentation", OOM: "OOM", Other: "other", PromiseRejection: "promiseRejection", XHR: "XHR", Step: "step"}); inspectorBackend.registerEvent("Debugger.paused", ["callFrames", "reason", "data", "hitBreakpoints", "asyncStackTrace", "asyncStackTraceId", "asyncCallStackTraceId"]); inspectorBackend.registerEvent("Debugger.resumed", []); -inspectorBackend.registerEvent("Debugger.scriptFailedToParse", ["scriptId", "url", "startLine", "startColumn", "endLine", "endColumn", "executionContextId", "hash", "executionContextAuxData", "sourceMapURL", "hasSourceURL", "isModule", "length", "stackTrace", "codeOffset", "scriptLanguage", "embedderName"]); -inspectorBackend.registerEvent("Debugger.scriptParsed", ["scriptId", "url", "startLine", "startColumn", "endLine", "endColumn", "executionContextId", "hash", "executionContextAuxData", "isLiveEdit", "sourceMapURL", "hasSourceURL", "isModule", "length", "stackTrace", "codeOffset", "scriptLanguage", "debugSymbols", "embedderName"]); +inspectorBackend.registerEvent("Debugger.scriptFailedToParse", ["scriptId", "url", "startLine", "startColumn", "endLine", "endColumn", "executionContextId", "hash", "buildId", "executionContextAuxData", "sourceMapURL", "hasSourceURL", "isModule", "length", "stackTrace", "codeOffset", "scriptLanguage", "embedderName"]); +inspectorBackend.registerEvent("Debugger.scriptParsed", ["scriptId", "url", "startLine", "startColumn", "endLine", "endColumn", "executionContextId", "hash", "buildId", "executionContextAuxData", "isLiveEdit", "sourceMapURL", "hasSourceURL", "isModule", "length", "stackTrace", "codeOffset", "scriptLanguage", "debugSymbols", "embedderName"]); inspectorBackend.registerEnum("Debugger.ContinueToLocationRequestTargetCallFrames", {Any: "any", Current: "current"}); inspectorBackend.registerCommand("Debugger.continueToLocation", [{"name": "location", "type": "object", "optional": false, "description": "Location to continue to.", "typeRef": "Debugger.Location"}, {"name": "targetCallFrames", "type": "string", "optional": true, "description": "", "typeRef": "Debugger.ContinueToLocationRequestTargetCallFrames"}], [], "Continues execution until specific location is reached."); inspectorBackend.registerCommand("Debugger.disable", [], [], "Disables debugger for given page."); diff --git a/front_end/generated/protocol.ts b/front_end/generated/protocol.ts index 986c62a417..2d5811c52b 100644 --- a/front_end/generated/protocol.ts +++ b/front_end/generated/protocol.ts @@ -18741,6 +18741,10 @@ export namespace Debugger { * Content hash of the script, SHA-256. */ hash: string; + /** + * For Wasm modules, the content of the `build_id` custom section. + */ + buildId: string; /** * Embedder-specific auxiliary data likely matching {isDefault: boolean, type: 'default'|'isolated'|'worker', frameId: string} */ @@ -18816,6 +18820,10 @@ export namespace Debugger { * Content hash of the script, SHA-256. */ hash: string; + /** + * For Wasm modules, the content of the `build_id` custom section. + */ + buildId: string; /** * Embedder-specific auxiliary data likely matching {isDefault: boolean, type: 'default'|'isolated'|'worker', frameId: string} */ diff --git a/front_end/models/javascript_metadata/NativeFunctions.js b/front_end/models/javascript_metadata/NativeFunctions.js index 66c94082e2..76a61bdc17 100644 --- a/front_end/models/javascript_metadata/NativeFunctions.js +++ b/front_end/models/javascript_metadata/NativeFunctions.js @@ -6464,13 +6464,7 @@ export const NativeFunctions = [ }, { name: "caretPositionFromPoint", - signatures: [["x","y","?options"]], - receivers: ["Document"] - }, - { - name: "caretPositionFromPoint", - signatures: [["x"]], - receivers: ["TextMetrics"] + signatures: [["x","y","?options"]] }, { name: "hasPrivateToken", @@ -6872,6 +6866,10 @@ export const NativeFunctions = [ name: "ImageData", signatures: [["sw","sh","?settings"],["data","sw","?sh","?settings"]] }, + { + name: "getIndexFromOffset", + signatures: [["x"]] + }, { name: "getSelectionRects", signatures: [["start","end"]] @@ -7449,7 +7447,7 @@ export const NativeFunctions = [ }, { name: "fillTextCluster", - signatures: [["textCluster","x","y"]] + signatures: [["textCluster","x","y","?options"]] }, { name: "createMesh2DVertexBuffer", diff --git a/front_end/ui/legacy/components/utils/Linkifier.test.ts b/front_end/ui/legacy/components/utils/Linkifier.test.ts index 083bb05c67..7f7fd56b7b 100644 --- a/front_end/ui/legacy/components/utils/Linkifier.test.ts +++ b/front_end/ui/legacy/components/utils/Linkifier.test.ts @@ -128,6 +128,7 @@ describeWithMockConnection('Linkifier', () => { endColumn: 10, executionContextId, hash: '', + buildId: '', isLiveEdit: false, sourceMapURL: undefined, hasSourceURL: false, @@ -165,6 +166,7 @@ describeWithMockConnection('Linkifier', () => { endColumn: 10, executionContextId, hash: '', + buildId: '', isLiveEdit: false, sourceMapURL: undefined, hasSourceURL: false, @@ -193,6 +195,7 @@ describeWithMockConnection('Linkifier', () => { endColumn: 10, executionContextId, hash: '', + buildId: '', isLiveEdit: false, sourceMapURL: undefined, hasSourceURL: false, @@ -243,6 +246,7 @@ describeWithMockConnection('Linkifier', () => { endColumn: 10, executionContextId, hash: '', + buildId: '', isLiveEdit: false, sourceMapURL: undefined, hasSourceURL: false, diff --git a/third_party/blink/public/devtools_protocol/browser_protocol.json b/third_party/blink/public/devtools_protocol/browser_protocol.json index 794fc5fd44..82f83a4cd2 100644 --- a/third_party/blink/public/devtools_protocol/browser_protocol.json +++ b/third_party/blink/public/devtools_protocol/browser_protocol.json @@ -28564,6 +28564,11 @@ "description": "Content hash of the script, SHA-256.", "type": "string" }, + { + "name": "buildId", + "description": "For Wasm modules, the content of the `build_id` custom section.", + "type": "string" + }, { "name": "executionContextAuxData", "description": "Embedder-specific auxiliary data likely matching {isDefault: boolean, type: 'default'|'isolated'|'worker', frameId: string}", @@ -28668,6 +28673,11 @@ "description": "Content hash of the script, SHA-256.", "type": "string" }, + { + "name": "buildId", + "description": "For Wasm modules, the content of the `build_id` custom section.", + "type": "string" + }, { "name": "executionContextAuxData", "description": "Embedder-specific auxiliary data likely matching {isDefault: boolean, type: 'default'|'isolated'|'worker', frameId: string}", diff --git a/third_party/blink/renderer/core/css/css_properties.json5 b/third_party/blink/renderer/core/css/css_properties.json5 index 8a30f42273..0a27db1ec3 100644 --- a/third_party/blink/renderer/core/css/css_properties.json5 +++ b/third_party/blink/renderer/core/css/css_properties.json5 @@ -5770,7 +5770,7 @@ name: "touch-action", property_methods: ["ParseSingleValue", "CSSValueFromComputedStyleInternal"], field_group: "*", - field_size: 8, // FIXME: Make this use "kTouchActionBits". + field_size: 9, // FIXME: Make this use "kTouchActionBits". field_template: "primitive", include_paths: ["third_party/blink/renderer/platform/graphics/touch_action.h"], default_value: "TouchAction::kAuto", @@ -6255,7 +6255,7 @@ }, { name: "column-rule-style", - property_methods: ["CSSValueFromComputedStyleInternal"], + property_methods: ["ParseSingleValue", "CSSValueFromComputedStyleInternal"], field_group: "*", field_template: "external", include_paths: ["third_party/blink/renderer/core/style/gap_data_list.h"], diff --git a/v8/include/js_protocol.pdl b/v8/include/js_protocol.pdl index b96102b7f8..52f3b02ceb 100644 --- a/v8/include/js_protocol.pdl +++ b/v8/include/js_protocol.pdl @@ -641,6 +641,8 @@ domain Debugger Runtime.ExecutionContextId executionContextId # Content hash of the script, SHA-256. string hash + # For Wasm modules, the content of the `build_id` custom section. + string buildId # Embedder-specific auxiliary data likely matching {isDefault: boolean, type: 'default'|'isolated'|'worker', frameId: string} optional object executionContextAuxData # URL of source map associated with script (if any). @@ -680,6 +682,8 @@ domain Debugger Runtime.ExecutionContextId executionContextId # Content hash of the script, SHA-256. string hash + # For Wasm modules, the content of the `build_id` custom section. + string buildId # Embedder-specific auxiliary data likely matching {isDefault: boolean, type: 'default'|'isolated'|'worker', frameId: string} optional object executionContextAuxData # True, if this script is generated as a result of the live edit operation.