From 78786f288c4f37d28e18970a059dff1a7987b6af Mon Sep 17 00:00:00 2001 From: Kelly Kostopoulou Date: Thu, 15 Feb 2024 13:51:18 -0600 Subject: [PATCH 1/8] cu-ara changes --- .../generated/InspectorBackendCommands.js | 3 +- front_end/generated/protocol.ts | 7 +++++ .../devtools_protocol/browser_protocol.json | 28 +++++++++++++++++++ .../devtools_protocol/browser_protocol.pdl | 7 +++++ 4 files changed, 44 insertions(+), 1 deletion(-) diff --git a/front_end/generated/InspectorBackendCommands.js b/front_end/generated/InspectorBackendCommands.js index f0cfc38ca91..3862db95f81 100644 --- a/front_end/generated/InspectorBackendCommands.js +++ b/front_end/generated/InspectorBackendCommands.js @@ -1078,7 +1078,8 @@ inspectorBackend.registerType("Storage.AttributionReportingAggregatableValueEntr inspectorBackend.registerType("Storage.AttributionReportingEventTriggerData", [{"name": "data", "type": "string", "optional": false, "description": "", "typeRef": "Storage.UnsignedInt64AsBase10"}, {"name": "priority", "type": "string", "optional": false, "description": "", "typeRef": "Storage.SignedInt64AsBase10"}, {"name": "dedupKey", "type": "string", "optional": true, "description": "", "typeRef": "Storage.UnsignedInt64AsBase10"}, {"name": "filters", "type": "object", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingFilterPair"}]); inspectorBackend.registerType("Storage.AttributionReportingAggregatableTriggerData", [{"name": "keyPiece", "type": "string", "optional": false, "description": "", "typeRef": "Storage.UnsignedInt128AsBase16"}, {"name": "sourceKeys", "type": "array", "optional": false, "description": "", "typeRef": "string"}, {"name": "filters", "type": "object", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingFilterPair"}]); inspectorBackend.registerType("Storage.AttributionReportingAggregatableDedupKey", [{"name": "dedupKey", "type": "string", "optional": true, "description": "", "typeRef": "Storage.UnsignedInt64AsBase10"}, {"name": "filters", "type": "object", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingFilterPair"}]); -inspectorBackend.registerType("Storage.AttributionReportingTriggerRegistration", [{"name": "filters", "type": "object", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingFilterPair"}, {"name": "debugKey", "type": "string", "optional": true, "description": "", "typeRef": "Storage.UnsignedInt64AsBase10"}, {"name": "aggregatableDedupKeys", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingAggregatableDedupKey"}, {"name": "eventTriggerData", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingEventTriggerData"}, {"name": "aggregatableTriggerData", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingAggregatableTriggerData"}, {"name": "aggregatableValues", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingAggregatableValueEntry"}, {"name": "debugReporting", "type": "boolean", "optional": false, "description": "", "typeRef": null}, {"name": "aggregationCoordinatorOrigin", "type": "string", "optional": true, "description": "", "typeRef": null}, {"name": "sourceRegistrationTimeConfig", "type": "string", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingSourceRegistrationTimeConfig"}, {"name": "triggerContextId", "type": "string", "optional": true, "description": "", "typeRef": null}]); +inspectorBackend.registerType("Storage.AttributionReportingEpoch", [{"name": "epoch_start", "type": "number", "optional": false, "description": "", "typeRef": "Storage.UnsignedInt64AsBase10"}, {"name": "epoch_end", "type": "number", "optional": false, "description": "", "typeRef": "Storage.UnsignedInt64AsBase10"}]); +inspectorBackend.registerType("Storage.AttributionReportingTriggerRegistration", [{"name": "filters", "type": "object", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingFilterPair"}, {"name": "debugKey", "type": "string", "optional": true, "description": "", "typeRef": "Storage.UnsignedInt64AsBase10"}, {"name": "aggregatableDedupKeys", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingAggregatableDedupKey"}, {"name": "eventTriggerData", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingEventTriggerData"}, {"name": "aggregatableTriggerData", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingAggregatableTriggerData"}, {"name": "aggregatableValues", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingAggregatableValueEntry"}, {"name": "debugReporting", "type": "boolean", "optional": false, "description": "", "typeRef": null}, {"name": "aggregationCoordinatorOrigin", "type": "string", "optional": true, "description": "", "typeRef": null}, {"name": "sourceRegistrationTimeConfig", "type": "string", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingSourceRegistrationTimeConfig"}, {"name": "triggerContextId", "type": "string", "optional": true, "description": "", "typeRef": null}, {"name": "pamEpsilon", "type": "number", "optional": true, "description": "", "typeRef": null}, {"name": "epochs", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingEpoch"}]); // SystemInfo. inspectorBackend.registerEnum("SystemInfo.SubsamplingFormat", {Yuv420: "yuv420", Yuv422: "yuv422", Yuv444: "yuv444"}); diff --git a/front_end/generated/protocol.ts b/front_end/generated/protocol.ts index 581f4d0cecb..e72937ab6b2 100644 --- a/front_end/generated/protocol.ts +++ b/front_end/generated/protocol.ts @@ -13958,6 +13958,11 @@ export namespace Storage { filters: AttributionReportingFilterPair; } + export interface AttributionReportingEpoch { + epoch_start: UnsignedInt64AsBase10; + epoch_end: UnsignedInt64AsBase10; + } + export interface AttributionReportingAggregatableTriggerData { keyPiece: UnsignedInt128AsBase16; sourceKeys: string[]; @@ -13980,6 +13985,8 @@ export namespace Storage { aggregationCoordinatorOrigin?: string; sourceRegistrationTimeConfig: AttributionReportingSourceRegistrationTimeConfig; triggerContextId?: string; + pamEpsilon?: number; + epochs: AttributionReportingEpoch[]; } export const enum AttributionReportingEventLevelResult { diff --git a/third_party/blink/public/devtools_protocol/browser_protocol.json b/third_party/blink/public/devtools_protocol/browser_protocol.json index b1f555e39a3..fc73798fe38 100644 --- a/third_party/blink/public/devtools_protocol/browser_protocol.json +++ b/third_party/blink/public/devtools_protocol/browser_protocol.json @@ -20905,6 +20905,21 @@ } ] }, + { + "id": "AttributionReportingEpoch", + "experimental": true, + "type": "object", + "properties": [ + { + "name": "epoch_start", + "type": "UnsignedInt64AsBase10" + }, + { + "name": "epoch_end", + "type": "UnsignedInt64AsBase10" + } + ] + }, { "id": "AttributionReportingAggregatableDedupKey", "experimental": true, @@ -20980,6 +20995,19 @@ "name": "triggerContextId", "optional": true, "type": "string" + }, + { + "name": "pamEpsilon", + "optional": true, + "type": "number" + }, + { + "name": "epochs", + "optional": false, + "type": "array", + "items": { + "$ref": "AttributionReportingEpoch" + } } ] }, diff --git a/third_party/blink/public/devtools_protocol/browser_protocol.pdl b/third_party/blink/public/devtools_protocol/browser_protocol.pdl index 720e48fa694..e9a31eacf66 100644 --- a/third_party/blink/public/devtools_protocol/browser_protocol.pdl +++ b/third_party/blink/public/devtools_protocol/browser_protocol.pdl @@ -10172,6 +10172,11 @@ experimental domain Storage optional UnsignedInt64AsBase10 dedupKey AttributionReportingFilterPair filters + experimental type AttributionReportingEpoch extends object + properties + UnsignedInt64AsBase10 epoch_start + UnsignedInt64AsBase10 epoch_end + experimental type AttributionReportingAggregatableTriggerData extends object properties UnsignedInt128AsBase16 keyPiece @@ -10195,6 +10200,8 @@ experimental domain Storage optional string aggregationCoordinatorOrigin AttributionReportingSourceRegistrationTimeConfig sourceRegistrationTimeConfig optional string triggerContextId + optional number pamEpsilon + array of AttributionReportingEpoch epochs experimental type AttributionReportingEventLevelResult extends string enum From 130eca4931e63963d646fa42a3102dbaf1f5a5dc Mon Sep 17 00:00:00 2001 From: Kelly Kostopoulou Date: Thu, 15 Feb 2024 19:39:57 -0600 Subject: [PATCH 2/8] tweaks --- front_end/generated/InspectorBackendCommands.js | 2 +- front_end/generated/protocol.ts | 4 ++-- .../blink/public/devtools_protocol/browser_protocol.json | 4 ++-- .../blink/public/devtools_protocol/browser_protocol.pdl | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/front_end/generated/InspectorBackendCommands.js b/front_end/generated/InspectorBackendCommands.js index 3862db95f81..73c1467dbb5 100644 --- a/front_end/generated/InspectorBackendCommands.js +++ b/front_end/generated/InspectorBackendCommands.js @@ -1078,7 +1078,7 @@ inspectorBackend.registerType("Storage.AttributionReportingAggregatableValueEntr inspectorBackend.registerType("Storage.AttributionReportingEventTriggerData", [{"name": "data", "type": "string", "optional": false, "description": "", "typeRef": "Storage.UnsignedInt64AsBase10"}, {"name": "priority", "type": "string", "optional": false, "description": "", "typeRef": "Storage.SignedInt64AsBase10"}, {"name": "dedupKey", "type": "string", "optional": true, "description": "", "typeRef": "Storage.UnsignedInt64AsBase10"}, {"name": "filters", "type": "object", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingFilterPair"}]); inspectorBackend.registerType("Storage.AttributionReportingAggregatableTriggerData", [{"name": "keyPiece", "type": "string", "optional": false, "description": "", "typeRef": "Storage.UnsignedInt128AsBase16"}, {"name": "sourceKeys", "type": "array", "optional": false, "description": "", "typeRef": "string"}, {"name": "filters", "type": "object", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingFilterPair"}]); inspectorBackend.registerType("Storage.AttributionReportingAggregatableDedupKey", [{"name": "dedupKey", "type": "string", "optional": true, "description": "", "typeRef": "Storage.UnsignedInt64AsBase10"}, {"name": "filters", "type": "object", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingFilterPair"}]); -inspectorBackend.registerType("Storage.AttributionReportingEpoch", [{"name": "epoch_start", "type": "number", "optional": false, "description": "", "typeRef": "Storage.UnsignedInt64AsBase10"}, {"name": "epoch_end", "type": "number", "optional": false, "description": "", "typeRef": "Storage.UnsignedInt64AsBase10"}]); +inspectorBackend.registerType("Storage.AttributionReportingEpoch", [{"name": "epochStart", "type": "number", "optional": false, "description": "", "typeRef": "Storage.UnsignedInt64AsBase10"}, {"name": "epochEnd", "type": "number", "optional": false, "description": "", "typeRef": "Storage.UnsignedInt64AsBase10"}]); inspectorBackend.registerType("Storage.AttributionReportingTriggerRegistration", [{"name": "filters", "type": "object", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingFilterPair"}, {"name": "debugKey", "type": "string", "optional": true, "description": "", "typeRef": "Storage.UnsignedInt64AsBase10"}, {"name": "aggregatableDedupKeys", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingAggregatableDedupKey"}, {"name": "eventTriggerData", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingEventTriggerData"}, {"name": "aggregatableTriggerData", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingAggregatableTriggerData"}, {"name": "aggregatableValues", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingAggregatableValueEntry"}, {"name": "debugReporting", "type": "boolean", "optional": false, "description": "", "typeRef": null}, {"name": "aggregationCoordinatorOrigin", "type": "string", "optional": true, "description": "", "typeRef": null}, {"name": "sourceRegistrationTimeConfig", "type": "string", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingSourceRegistrationTimeConfig"}, {"name": "triggerContextId", "type": "string", "optional": true, "description": "", "typeRef": null}, {"name": "pamEpsilon", "type": "number", "optional": true, "description": "", "typeRef": null}, {"name": "epochs", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingEpoch"}]); // SystemInfo. diff --git a/front_end/generated/protocol.ts b/front_end/generated/protocol.ts index e72937ab6b2..844dc49f21a 100644 --- a/front_end/generated/protocol.ts +++ b/front_end/generated/protocol.ts @@ -13959,8 +13959,8 @@ export namespace Storage { } export interface AttributionReportingEpoch { - epoch_start: UnsignedInt64AsBase10; - epoch_end: UnsignedInt64AsBase10; + epochStart: UnsignedInt64AsBase10; + epochEnd: UnsignedInt64AsBase10; } export interface AttributionReportingAggregatableTriggerData { diff --git a/third_party/blink/public/devtools_protocol/browser_protocol.json b/third_party/blink/public/devtools_protocol/browser_protocol.json index fc73798fe38..657b1b40492 100644 --- a/third_party/blink/public/devtools_protocol/browser_protocol.json +++ b/third_party/blink/public/devtools_protocol/browser_protocol.json @@ -20911,11 +20911,11 @@ "type": "object", "properties": [ { - "name": "epoch_start", + "name": "epochStart", "type": "UnsignedInt64AsBase10" }, { - "name": "epoch_end", + "name": "epochEnd", "type": "UnsignedInt64AsBase10" } ] diff --git a/third_party/blink/public/devtools_protocol/browser_protocol.pdl b/third_party/blink/public/devtools_protocol/browser_protocol.pdl index e9a31eacf66..ecbcb5851be 100644 --- a/third_party/blink/public/devtools_protocol/browser_protocol.pdl +++ b/third_party/blink/public/devtools_protocol/browser_protocol.pdl @@ -10174,8 +10174,8 @@ experimental domain Storage experimental type AttributionReportingEpoch extends object properties - UnsignedInt64AsBase10 epoch_start - UnsignedInt64AsBase10 epoch_end + UnsignedInt64AsBase10 epochStart + UnsignedInt64AsBase10 epochEnd experimental type AttributionReportingAggregatableTriggerData extends object properties From 8fcf4bd5dbe453e7dfa18705f585cae8fe2bc4d6 Mon Sep 17 00:00:00 2001 From: Kelly Kostopoulou Date: Fri, 16 Feb 2024 01:50:08 -0600 Subject: [PATCH 3/8] tweaks --- front_end/generated/InspectorBackendCommands.js | 2 +- front_end/generated/protocol.ts | 2 ++ .../public/devtools_protocol/browser_protocol.json | 13 +++++++++++++ .../public/devtools_protocol/browser_protocol.pdl | 2 ++ 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/front_end/generated/InspectorBackendCommands.js b/front_end/generated/InspectorBackendCommands.js index 73c1467dbb5..25cc6b998cd 100644 --- a/front_end/generated/InspectorBackendCommands.js +++ b/front_end/generated/InspectorBackendCommands.js @@ -1079,7 +1079,7 @@ inspectorBackend.registerType("Storage.AttributionReportingEventTriggerData", [{ inspectorBackend.registerType("Storage.AttributionReportingAggregatableTriggerData", [{"name": "keyPiece", "type": "string", "optional": false, "description": "", "typeRef": "Storage.UnsignedInt128AsBase16"}, {"name": "sourceKeys", "type": "array", "optional": false, "description": "", "typeRef": "string"}, {"name": "filters", "type": "object", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingFilterPair"}]); inspectorBackend.registerType("Storage.AttributionReportingAggregatableDedupKey", [{"name": "dedupKey", "type": "string", "optional": true, "description": "", "typeRef": "Storage.UnsignedInt64AsBase10"}, {"name": "filters", "type": "object", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingFilterPair"}]); inspectorBackend.registerType("Storage.AttributionReportingEpoch", [{"name": "epochStart", "type": "number", "optional": false, "description": "", "typeRef": "Storage.UnsignedInt64AsBase10"}, {"name": "epochEnd", "type": "number", "optional": false, "description": "", "typeRef": "Storage.UnsignedInt64AsBase10"}]); -inspectorBackend.registerType("Storage.AttributionReportingTriggerRegistration", [{"name": "filters", "type": "object", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingFilterPair"}, {"name": "debugKey", "type": "string", "optional": true, "description": "", "typeRef": "Storage.UnsignedInt64AsBase10"}, {"name": "aggregatableDedupKeys", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingAggregatableDedupKey"}, {"name": "eventTriggerData", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingEventTriggerData"}, {"name": "aggregatableTriggerData", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingAggregatableTriggerData"}, {"name": "aggregatableValues", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingAggregatableValueEntry"}, {"name": "debugReporting", "type": "boolean", "optional": false, "description": "", "typeRef": null}, {"name": "aggregationCoordinatorOrigin", "type": "string", "optional": true, "description": "", "typeRef": null}, {"name": "sourceRegistrationTimeConfig", "type": "string", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingSourceRegistrationTimeConfig"}, {"name": "triggerContextId", "type": "string", "optional": true, "description": "", "typeRef": null}, {"name": "pamEpsilon", "type": "number", "optional": true, "description": "", "typeRef": null}, {"name": "epochs", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingEpoch"}]); +inspectorBackend.registerType("Storage.AttributionReportingTriggerRegistration", [{"name": "filters", "type": "object", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingFilterPair"}, {"name": "debugKey", "type": "string", "optional": true, "description": "", "typeRef": "Storage.UnsignedInt64AsBase10"}, {"name": "aggregatableDedupKeys", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingAggregatableDedupKey"}, {"name": "eventTriggerData", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingEventTriggerData"}, {"name": "aggregatableTriggerData", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingAggregatableTriggerData"}, {"name": "aggregatableValues", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingAggregatableValueEntry"}, {"name": "debugReporting", "type": "boolean", "optional": false, "description": "", "typeRef": null}, {"name": "aggregationCoordinatorOrigin", "type": "string", "optional": true, "description": "", "typeRef": null}, {"name": "sourceRegistrationTimeConfig", "type": "string", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingSourceRegistrationTimeConfig"}, {"name": "triggerContextId", "type": "string", "optional": true, "description": "", "typeRef": null}, {"name": "pamEpsilon", "type": "number", "optional": true, "description": "", "typeRef": null}, {"name": "epochs", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingEpoch"}, {"name": "sourceIdCandidates", "type": "array", "optional": false, "description": "", "typeRef": "Storage.UnsignedInt64AsBase10"}, {"name": "attributionLogic", "type": "string", "optional": false, "description": "", "typeRef": "null"}]); // SystemInfo. inspectorBackend.registerEnum("SystemInfo.SubsamplingFormat", {Yuv420: "yuv420", Yuv422: "yuv422", Yuv444: "yuv444"}); diff --git a/front_end/generated/protocol.ts b/front_end/generated/protocol.ts index 844dc49f21a..f1eb6831067 100644 --- a/front_end/generated/protocol.ts +++ b/front_end/generated/protocol.ts @@ -13987,6 +13987,8 @@ export namespace Storage { triggerContextId?: string; pamEpsilon?: number; epochs: AttributionReportingEpoch[]; + sourceIdCandidates: string[]; + attributionLogic: string; } export const enum AttributionReportingEventLevelResult { diff --git a/third_party/blink/public/devtools_protocol/browser_protocol.json b/third_party/blink/public/devtools_protocol/browser_protocol.json index 657b1b40492..5512fcd5d07 100644 --- a/third_party/blink/public/devtools_protocol/browser_protocol.json +++ b/third_party/blink/public/devtools_protocol/browser_protocol.json @@ -21008,6 +21008,19 @@ "items": { "$ref": "AttributionReportingEpoch" } + }, + { + "name": "sourceIdCandidates", + "optional": false, + "type": "array", + "items": { + "$ref": "UnsignedInt64AsBase10" + } + }, + { + "name": "attributionLogic", + "optional": false, + "type": "string" } ] }, diff --git a/third_party/blink/public/devtools_protocol/browser_protocol.pdl b/third_party/blink/public/devtools_protocol/browser_protocol.pdl index ecbcb5851be..251c33aff2a 100644 --- a/third_party/blink/public/devtools_protocol/browser_protocol.pdl +++ b/third_party/blink/public/devtools_protocol/browser_protocol.pdl @@ -10202,6 +10202,8 @@ experimental domain Storage optional string triggerContextId optional number pamEpsilon array of AttributionReportingEpoch epochs + array of UnsignedInt64AsBase10 sourceIdCandidates + string attributionLogic experimental type AttributionReportingEventLevelResult extends string enum From 4160d71d9dc595606be37189458a8c18415b7534 Mon Sep 17 00:00:00 2001 From: Kelly Kostopoulou Date: Fri, 16 Feb 2024 03:29:33 -0600 Subject: [PATCH 4/8] extending source registration --- front_end/generated/InspectorBackendCommands.js | 2 +- front_end/generated/protocol.ts | 2 ++ .../blink/public/devtools_protocol/browser_protocol.json | 4 ++++ .../blink/public/devtools_protocol/browser_protocol.pdl | 1 + 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/front_end/generated/InspectorBackendCommands.js b/front_end/generated/InspectorBackendCommands.js index 25cc6b998cd..86ab9d4ac18 100644 --- a/front_end/generated/InspectorBackendCommands.js +++ b/front_end/generated/InspectorBackendCommands.js @@ -1073,7 +1073,7 @@ inspectorBackend.registerType("Storage.AttributionReportingFilterPair", [{"name" inspectorBackend.registerType("Storage.AttributionReportingAggregationKeysEntry", [{"name": "key", "type": "string", "optional": false, "description": "", "typeRef": null}, {"name": "value", "type": "string", "optional": false, "description": "", "typeRef": "Storage.UnsignedInt128AsBase16"}]); inspectorBackend.registerType("Storage.AttributionReportingEventReportWindows", [{"name": "start", "type": "number", "optional": false, "description": "duration in seconds", "typeRef": null}, {"name": "ends", "type": "array", "optional": false, "description": "duration in seconds", "typeRef": "integer"}]); inspectorBackend.registerType("Storage.AttributionReportingTriggerSpec", [{"name": "triggerData", "type": "array", "optional": false, "description": "number instead of integer because not all uint32 can be represented by int", "typeRef": "number"}, {"name": "eventReportWindows", "type": "object", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingEventReportWindows"}]); -inspectorBackend.registerType("Storage.AttributionReportingSourceRegistration", [{"name": "time", "type": "number", "optional": false, "description": "", "typeRef": "Network.TimeSinceEpoch"}, {"name": "expiry", "type": "number", "optional": false, "description": "duration in seconds", "typeRef": null}, {"name": "triggerSpecs", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingTriggerSpec"}, {"name": "aggregatableReportWindow", "type": "number", "optional": false, "description": "duration in seconds", "typeRef": null}, {"name": "type", "type": "string", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingSourceType"}, {"name": "sourceOrigin", "type": "string", "optional": false, "description": "", "typeRef": null}, {"name": "reportingOrigin", "type": "string", "optional": false, "description": "", "typeRef": null}, {"name": "destinationSites", "type": "array", "optional": false, "description": "", "typeRef": "string"}, {"name": "eventId", "type": "string", "optional": false, "description": "", "typeRef": "Storage.UnsignedInt64AsBase10"}, {"name": "priority", "type": "string", "optional": false, "description": "", "typeRef": "Storage.SignedInt64AsBase10"}, {"name": "filterData", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingFilterDataEntry"}, {"name": "aggregationKeys", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingAggregationKeysEntry"}, {"name": "debugKey", "type": "string", "optional": true, "description": "", "typeRef": "Storage.UnsignedInt64AsBase10"}, {"name": "triggerDataMatching", "type": "string", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingTriggerDataMatching"}]); +inspectorBackend.registerType("Storage.AttributionReportingSourceRegistration", [{"name": "time", "type": "number", "optional": false, "description": "", "typeRef": "Network.TimeSinceEpoch"}, {"name": "expiry", "type": "number", "optional": false, "description": "duration in seconds", "typeRef": null}, {"name": "triggerSpecs", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingTriggerSpec"}, {"name": "aggregatableReportWindow", "type": "number", "optional": false, "description": "duration in seconds", "typeRef": null}, {"name": "type", "type": "string", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingSourceType"}, {"name": "sourceOrigin", "type": "string", "optional": false, "description": "", "typeRef": null}, {"name": "reportingOrigin", "type": "string", "optional": false, "description": "", "typeRef": null}, {"name": "destinationSites", "type": "array", "optional": false, "description": "", "typeRef": "string"}, {"name": "eventId", "type": "string", "optional": false, "description": "", "typeRef": "Storage.UnsignedInt64AsBase10"}, {"name": "priority", "type": "string", "optional": false, "description": "", "typeRef": "Storage.SignedInt64AsBase10"}, {"name": "filterData", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingFilterDataEntry"}, {"name": "aggregationKeys", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingAggregationKeysEntry"}, {"name": "debugKey", "type": "string", "optional": true, "description": "", "typeRef": "Storage.UnsignedInt64AsBase10"}, {"name": "triggerDataMatching", "type": "string", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingTriggerDataMatching"}, {"name": "epoch", "type": "string", "optional": false, "description": "", "typeRef": "Storage.UnsignedInt64AsBase10"}]); inspectorBackend.registerType("Storage.AttributionReportingAggregatableValueEntry", [{"name": "key", "type": "string", "optional": false, "description": "", "typeRef": null}, {"name": "value", "type": "number", "optional": false, "description": "number instead of integer because not all uint32 can be represented by int", "typeRef": null}]); inspectorBackend.registerType("Storage.AttributionReportingEventTriggerData", [{"name": "data", "type": "string", "optional": false, "description": "", "typeRef": "Storage.UnsignedInt64AsBase10"}, {"name": "priority", "type": "string", "optional": false, "description": "", "typeRef": "Storage.SignedInt64AsBase10"}, {"name": "dedupKey", "type": "string", "optional": true, "description": "", "typeRef": "Storage.UnsignedInt64AsBase10"}, {"name": "filters", "type": "object", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingFilterPair"}]); inspectorBackend.registerType("Storage.AttributionReportingAggregatableTriggerData", [{"name": "keyPiece", "type": "string", "optional": false, "description": "", "typeRef": "Storage.UnsignedInt128AsBase16"}, {"name": "sourceKeys", "type": "array", "optional": false, "description": "", "typeRef": "string"}, {"name": "filters", "type": "object", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingFilterPair"}]); diff --git a/front_end/generated/protocol.ts b/front_end/generated/protocol.ts index f1eb6831067..5e994141054 100644 --- a/front_end/generated/protocol.ts +++ b/front_end/generated/protocol.ts @@ -13920,6 +13920,8 @@ export namespace Storage { aggregationKeys: AttributionReportingAggregationKeysEntry[]; debugKey?: UnsignedInt64AsBase10; triggerDataMatching: AttributionReportingTriggerDataMatching; + epoch: UnsignedInt64AsBase10; + } export const enum AttributionReportingSourceRegistrationResult { diff --git a/third_party/blink/public/devtools_protocol/browser_protocol.json b/third_party/blink/public/devtools_protocol/browser_protocol.json index 5512fcd5d07..4e7e0ddad76 100644 --- a/third_party/blink/public/devtools_protocol/browser_protocol.json +++ b/third_party/blink/public/devtools_protocol/browser_protocol.json @@ -20812,6 +20812,10 @@ { "name": "triggerDataMatching", "$ref": "AttributionReportingTriggerDataMatching" + }, + { + "name": "epoch", + "$ref": "UnsignedInt64AsBase10" } ] }, diff --git a/third_party/blink/public/devtools_protocol/browser_protocol.pdl b/third_party/blink/public/devtools_protocol/browser_protocol.pdl index 251c33aff2a..038a196966c 100644 --- a/third_party/blink/public/devtools_protocol/browser_protocol.pdl +++ b/third_party/blink/public/devtools_protocol/browser_protocol.pdl @@ -10132,6 +10132,7 @@ experimental domain Storage array of AttributionReportingAggregationKeysEntry aggregationKeys optional UnsignedInt64AsBase10 debugKey AttributionReportingTriggerDataMatching triggerDataMatching + UnsignedInt64AsBase10 epoch experimental type AttributionReportingSourceRegistrationResult extends string enum From 710b067fac019f2eddb09a199ebdb63c89833daa Mon Sep 17 00:00:00 2001 From: Kelly Kostopoulou Date: Fri, 16 Feb 2024 18:58:35 -0600 Subject: [PATCH 5/8] fix --- front_end/generated/InspectorBackendCommands.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front_end/generated/InspectorBackendCommands.js b/front_end/generated/InspectorBackendCommands.js index 86ab9d4ac18..4e7f97d5e9a 100644 --- a/front_end/generated/InspectorBackendCommands.js +++ b/front_end/generated/InspectorBackendCommands.js @@ -1073,7 +1073,7 @@ inspectorBackend.registerType("Storage.AttributionReportingFilterPair", [{"name" inspectorBackend.registerType("Storage.AttributionReportingAggregationKeysEntry", [{"name": "key", "type": "string", "optional": false, "description": "", "typeRef": null}, {"name": "value", "type": "string", "optional": false, "description": "", "typeRef": "Storage.UnsignedInt128AsBase16"}]); inspectorBackend.registerType("Storage.AttributionReportingEventReportWindows", [{"name": "start", "type": "number", "optional": false, "description": "duration in seconds", "typeRef": null}, {"name": "ends", "type": "array", "optional": false, "description": "duration in seconds", "typeRef": "integer"}]); inspectorBackend.registerType("Storage.AttributionReportingTriggerSpec", [{"name": "triggerData", "type": "array", "optional": false, "description": "number instead of integer because not all uint32 can be represented by int", "typeRef": "number"}, {"name": "eventReportWindows", "type": "object", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingEventReportWindows"}]); -inspectorBackend.registerType("Storage.AttributionReportingSourceRegistration", [{"name": "time", "type": "number", "optional": false, "description": "", "typeRef": "Network.TimeSinceEpoch"}, {"name": "expiry", "type": "number", "optional": false, "description": "duration in seconds", "typeRef": null}, {"name": "triggerSpecs", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingTriggerSpec"}, {"name": "aggregatableReportWindow", "type": "number", "optional": false, "description": "duration in seconds", "typeRef": null}, {"name": "type", "type": "string", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingSourceType"}, {"name": "sourceOrigin", "type": "string", "optional": false, "description": "", "typeRef": null}, {"name": "reportingOrigin", "type": "string", "optional": false, "description": "", "typeRef": null}, {"name": "destinationSites", "type": "array", "optional": false, "description": "", "typeRef": "string"}, {"name": "eventId", "type": "string", "optional": false, "description": "", "typeRef": "Storage.UnsignedInt64AsBase10"}, {"name": "priority", "type": "string", "optional": false, "description": "", "typeRef": "Storage.SignedInt64AsBase10"}, {"name": "filterData", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingFilterDataEntry"}, {"name": "aggregationKeys", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingAggregationKeysEntry"}, {"name": "debugKey", "type": "string", "optional": true, "description": "", "typeRef": "Storage.UnsignedInt64AsBase10"}, {"name": "triggerDataMatching", "type": "string", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingTriggerDataMatching"}, {"name": "epoch", "type": "string", "optional": false, "description": "", "typeRef": "Storage.UnsignedInt64AsBase10"}]); +inspectorBackend.registerType("Storage.AttributionReportingSourceRegistration", [{"name": "time", "type": "number", "optional": false, "description": "", "typeRef": "Network.TimeSinceEpoch"}, {"name": "expiry", "type": "number", "optional": false, "description": "duration in seconds", "typeRef": null}, {"name": "triggerSpecs", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingTriggerSpec"}, {"name": "aggregatableReportWindow", "type": "number", "optional": false, "description": "duration in seconds", "typeRef": null}, {"name": "type", "type": "string", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingSourceType"}, {"name": "sourceOrigin", "type": "string", "optional": false, "description": "", "typeRef": null}, {"name": "reportingOrigin", "type": "string", "optional": false, "description": "", "typeRef": null}, {"name": "destinationSites", "type": "array", "optional": false, "description": "", "typeRef": "string"}, {"name": "eventId", "type": "string", "optional": false, "description": "", "typeRef": "Storage.UnsignedInt64AsBase10"}, {"name": "priority", "type": "string", "optional": false, "description": "", "typeRef": "Storage.SignedInt64AsBase10"}, {"name": "filterData", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingFilterDataEntry"}, {"name": "aggregationKeys", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingAggregationKeysEntry"}, {"name": "debugKey", "type": "string", "optional": true, "description": "", "typeRef": "Storage.UnsignedInt64AsBase10"}, {"name": "triggerDataMatching", "type": "string", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingTriggerDataMatching"}, {"name": "epoch", "type": "number", "optional": false, "description": "", "typeRef": "Storage.UnsignedInt64AsBase10"}]); inspectorBackend.registerType("Storage.AttributionReportingAggregatableValueEntry", [{"name": "key", "type": "string", "optional": false, "description": "", "typeRef": null}, {"name": "value", "type": "number", "optional": false, "description": "number instead of integer because not all uint32 can be represented by int", "typeRef": null}]); inspectorBackend.registerType("Storage.AttributionReportingEventTriggerData", [{"name": "data", "type": "string", "optional": false, "description": "", "typeRef": "Storage.UnsignedInt64AsBase10"}, {"name": "priority", "type": "string", "optional": false, "description": "", "typeRef": "Storage.SignedInt64AsBase10"}, {"name": "dedupKey", "type": "string", "optional": true, "description": "", "typeRef": "Storage.UnsignedInt64AsBase10"}, {"name": "filters", "type": "object", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingFilterPair"}]); inspectorBackend.registerType("Storage.AttributionReportingAggregatableTriggerData", [{"name": "keyPiece", "type": "string", "optional": false, "description": "", "typeRef": "Storage.UnsignedInt128AsBase16"}, {"name": "sourceKeys", "type": "array", "optional": false, "description": "", "typeRef": "string"}, {"name": "filters", "type": "object", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingFilterPair"}]); From 1117d852f8fd570adfba240b612035c5afb8f342 Mon Sep 17 00:00:00 2001 From: Kelly Kostopoulou Date: Mon, 19 Feb 2024 17:42:13 -0600 Subject: [PATCH 6/8] changes to parameter names and types --- front_end/generated/InspectorBackendCommands.js | 4 ++-- front_end/generated/protocol.ts | 6 +++--- .../public/devtools_protocol/browser_protocol.json | 11 ++++------- .../public/devtools_protocol/browser_protocol.pdl | 6 +++--- 4 files changed, 12 insertions(+), 15 deletions(-) diff --git a/front_end/generated/InspectorBackendCommands.js b/front_end/generated/InspectorBackendCommands.js index 4e7f97d5e9a..1b5002c7609 100644 --- a/front_end/generated/InspectorBackendCommands.js +++ b/front_end/generated/InspectorBackendCommands.js @@ -1078,8 +1078,8 @@ inspectorBackend.registerType("Storage.AttributionReportingAggregatableValueEntr inspectorBackend.registerType("Storage.AttributionReportingEventTriggerData", [{"name": "data", "type": "string", "optional": false, "description": "", "typeRef": "Storage.UnsignedInt64AsBase10"}, {"name": "priority", "type": "string", "optional": false, "description": "", "typeRef": "Storage.SignedInt64AsBase10"}, {"name": "dedupKey", "type": "string", "optional": true, "description": "", "typeRef": "Storage.UnsignedInt64AsBase10"}, {"name": "filters", "type": "object", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingFilterPair"}]); inspectorBackend.registerType("Storage.AttributionReportingAggregatableTriggerData", [{"name": "keyPiece", "type": "string", "optional": false, "description": "", "typeRef": "Storage.UnsignedInt128AsBase16"}, {"name": "sourceKeys", "type": "array", "optional": false, "description": "", "typeRef": "string"}, {"name": "filters", "type": "object", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingFilterPair"}]); inspectorBackend.registerType("Storage.AttributionReportingAggregatableDedupKey", [{"name": "dedupKey", "type": "string", "optional": true, "description": "", "typeRef": "Storage.UnsignedInt64AsBase10"}, {"name": "filters", "type": "object", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingFilterPair"}]); -inspectorBackend.registerType("Storage.AttributionReportingEpoch", [{"name": "epochStart", "type": "number", "optional": false, "description": "", "typeRef": "Storage.UnsignedInt64AsBase10"}, {"name": "epochEnd", "type": "number", "optional": false, "description": "", "typeRef": "Storage.UnsignedInt64AsBase10"}]); -inspectorBackend.registerType("Storage.AttributionReportingTriggerRegistration", [{"name": "filters", "type": "object", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingFilterPair"}, {"name": "debugKey", "type": "string", "optional": true, "description": "", "typeRef": "Storage.UnsignedInt64AsBase10"}, {"name": "aggregatableDedupKeys", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingAggregatableDedupKey"}, {"name": "eventTriggerData", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingEventTriggerData"}, {"name": "aggregatableTriggerData", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingAggregatableTriggerData"}, {"name": "aggregatableValues", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingAggregatableValueEntry"}, {"name": "debugReporting", "type": "boolean", "optional": false, "description": "", "typeRef": null}, {"name": "aggregationCoordinatorOrigin", "type": "string", "optional": true, "description": "", "typeRef": null}, {"name": "sourceRegistrationTimeConfig", "type": "string", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingSourceRegistrationTimeConfig"}, {"name": "triggerContextId", "type": "string", "optional": true, "description": "", "typeRef": null}, {"name": "pamEpsilon", "type": "number", "optional": true, "description": "", "typeRef": null}, {"name": "epochs", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingEpoch"}, {"name": "sourceIdCandidates", "type": "array", "optional": false, "description": "", "typeRef": "Storage.UnsignedInt64AsBase10"}, {"name": "attributionLogic", "type": "string", "optional": false, "description": "", "typeRef": "null"}]); +inspectorBackend.registerType("Storage.AttributionReportingAttributionWindow", [{"name": "epochStart", "type": "number", "optional": false, "description": "", "typeRef": "Storage.UnsignedInt64AsBase10"}, {"name": "epochEnd", "type": "number", "optional": false, "description": "", "typeRef": "Storage.UnsignedInt64AsBase10"}]); +inspectorBackend.registerType("Storage.AttributionReportingTriggerRegistration", [{"name": "filters", "type": "object", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingFilterPair"}, {"name": "debugKey", "type": "string", "optional": true, "description": "", "typeRef": "Storage.UnsignedInt64AsBase10"}, {"name": "aggregatableDedupKeys", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingAggregatableDedupKey"}, {"name": "eventTriggerData", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingEventTriggerData"}, {"name": "aggregatableTriggerData", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingAggregatableTriggerData"}, {"name": "aggregatableValues", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingAggregatableValueEntry"}, {"name": "debugReporting", "type": "boolean", "optional": false, "description": "", "typeRef": null}, {"name": "aggregationCoordinatorOrigin", "type": "string", "optional": true, "description": "", "typeRef": null}, {"name": "sourceRegistrationTimeConfig", "type": "string", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingSourceRegistrationTimeConfig"}, {"name": "triggerContextId", "type": "string", "optional": true, "description": "", "typeRef": null}, {"name": "globalEpsilon", "type": "number", "optional": true, "description": "", "typeRef": null}, {"name": "attributionWindow", "type": "object", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingAttributionWindow"}, {"name": "sourceIdCandidates", "type": "array", "optional": false, "description": "", "typeRef": "Storage.UnsignedInt64AsBase10"}, {"name": "attributionLogic", "type": "string", "optional": false, "description": "", "typeRef": "null"}]); // SystemInfo. inspectorBackend.registerEnum("SystemInfo.SubsamplingFormat", {Yuv420: "yuv420", Yuv422: "yuv422", Yuv444: "yuv444"}); diff --git a/front_end/generated/protocol.ts b/front_end/generated/protocol.ts index 5e994141054..e4fc9ef957a 100644 --- a/front_end/generated/protocol.ts +++ b/front_end/generated/protocol.ts @@ -13960,7 +13960,7 @@ export namespace Storage { filters: AttributionReportingFilterPair; } - export interface AttributionReportingEpoch { + export interface AttributionReportingAttributionWindow { epochStart: UnsignedInt64AsBase10; epochEnd: UnsignedInt64AsBase10; } @@ -13987,8 +13987,8 @@ export namespace Storage { aggregationCoordinatorOrigin?: string; sourceRegistrationTimeConfig: AttributionReportingSourceRegistrationTimeConfig; triggerContextId?: string; - pamEpsilon?: number; - epochs: AttributionReportingEpoch[]; + globalEpsilon?: number; + attributionWindow: AttributionReportingAttributionWindow; sourceIdCandidates: string[]; attributionLogic: string; } diff --git a/third_party/blink/public/devtools_protocol/browser_protocol.json b/third_party/blink/public/devtools_protocol/browser_protocol.json index 4e7e0ddad76..eb44c420455 100644 --- a/third_party/blink/public/devtools_protocol/browser_protocol.json +++ b/third_party/blink/public/devtools_protocol/browser_protocol.json @@ -20910,7 +20910,7 @@ ] }, { - "id": "AttributionReportingEpoch", + "id": "AttributionReportingAttributionWindow", "experimental": true, "type": "object", "properties": [ @@ -21001,17 +21001,14 @@ "type": "string" }, { - "name": "pamEpsilon", + "name": "globalEpsilon", "optional": true, "type": "number" }, { - "name": "epochs", + "name": "attributionWindow", "optional": false, - "type": "array", - "items": { - "$ref": "AttributionReportingEpoch" - } + "$ref": "AttributionReportingAttributionWindow" }, { "name": "sourceIdCandidates", diff --git a/third_party/blink/public/devtools_protocol/browser_protocol.pdl b/third_party/blink/public/devtools_protocol/browser_protocol.pdl index 038a196966c..02fb61b8ad9 100644 --- a/third_party/blink/public/devtools_protocol/browser_protocol.pdl +++ b/third_party/blink/public/devtools_protocol/browser_protocol.pdl @@ -10173,7 +10173,7 @@ experimental domain Storage optional UnsignedInt64AsBase10 dedupKey AttributionReportingFilterPair filters - experimental type AttributionReportingEpoch extends object + experimental type AttributionReportingAttributionWindow extends object properties UnsignedInt64AsBase10 epochStart UnsignedInt64AsBase10 epochEnd @@ -10201,8 +10201,8 @@ experimental domain Storage optional string aggregationCoordinatorOrigin AttributionReportingSourceRegistrationTimeConfig sourceRegistrationTimeConfig optional string triggerContextId - optional number pamEpsilon - array of AttributionReportingEpoch epochs + optional number globalEpsilon + AttributionReportingAttributionWindow attributionWindow array of UnsignedInt64AsBase10 sourceIdCandidates string attributionLogic From 4d2c53c34981691c099bbf0284d1e9d2b90aba3d Mon Sep 17 00:00:00 2001 From: Kelly Kostopoulou Date: Wed, 21 Feb 2024 14:44:22 -0600 Subject: [PATCH 7/8] adding aggregatableCapValues --- front_end/generated/InspectorBackendCommands.js | 2 +- front_end/generated/protocol.ts | 2 +- .../blink/public/devtools_protocol/browser_protocol.json | 5 ++--- .../blink/public/devtools_protocol/browser_protocol.pdl | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/front_end/generated/InspectorBackendCommands.js b/front_end/generated/InspectorBackendCommands.js index 1b5002c7609..8b9af5b2d0a 100644 --- a/front_end/generated/InspectorBackendCommands.js +++ b/front_end/generated/InspectorBackendCommands.js @@ -1079,7 +1079,7 @@ inspectorBackend.registerType("Storage.AttributionReportingEventTriggerData", [{ inspectorBackend.registerType("Storage.AttributionReportingAggregatableTriggerData", [{"name": "keyPiece", "type": "string", "optional": false, "description": "", "typeRef": "Storage.UnsignedInt128AsBase16"}, {"name": "sourceKeys", "type": "array", "optional": false, "description": "", "typeRef": "string"}, {"name": "filters", "type": "object", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingFilterPair"}]); inspectorBackend.registerType("Storage.AttributionReportingAggregatableDedupKey", [{"name": "dedupKey", "type": "string", "optional": true, "description": "", "typeRef": "Storage.UnsignedInt64AsBase10"}, {"name": "filters", "type": "object", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingFilterPair"}]); inspectorBackend.registerType("Storage.AttributionReportingAttributionWindow", [{"name": "epochStart", "type": "number", "optional": false, "description": "", "typeRef": "Storage.UnsignedInt64AsBase10"}, {"name": "epochEnd", "type": "number", "optional": false, "description": "", "typeRef": "Storage.UnsignedInt64AsBase10"}]); -inspectorBackend.registerType("Storage.AttributionReportingTriggerRegistration", [{"name": "filters", "type": "object", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingFilterPair"}, {"name": "debugKey", "type": "string", "optional": true, "description": "", "typeRef": "Storage.UnsignedInt64AsBase10"}, {"name": "aggregatableDedupKeys", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingAggregatableDedupKey"}, {"name": "eventTriggerData", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingEventTriggerData"}, {"name": "aggregatableTriggerData", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingAggregatableTriggerData"}, {"name": "aggregatableValues", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingAggregatableValueEntry"}, {"name": "debugReporting", "type": "boolean", "optional": false, "description": "", "typeRef": null}, {"name": "aggregationCoordinatorOrigin", "type": "string", "optional": true, "description": "", "typeRef": null}, {"name": "sourceRegistrationTimeConfig", "type": "string", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingSourceRegistrationTimeConfig"}, {"name": "triggerContextId", "type": "string", "optional": true, "description": "", "typeRef": null}, {"name": "globalEpsilon", "type": "number", "optional": true, "description": "", "typeRef": null}, {"name": "attributionWindow", "type": "object", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingAttributionWindow"}, {"name": "sourceIdCandidates", "type": "array", "optional": false, "description": "", "typeRef": "Storage.UnsignedInt64AsBase10"}, {"name": "attributionLogic", "type": "string", "optional": false, "description": "", "typeRef": "null"}]); +inspectorBackend.registerType("Storage.AttributionReportingTriggerRegistration", [{"name": "filters", "type": "object", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingFilterPair"}, {"name": "debugKey", "type": "string", "optional": true, "description": "", "typeRef": "Storage.UnsignedInt64AsBase10"}, {"name": "aggregatableDedupKeys", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingAggregatableDedupKey"}, {"name": "eventTriggerData", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingEventTriggerData"}, {"name": "aggregatableTriggerData", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingAggregatableTriggerData"}, {"name": "aggregatableValues", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingAggregatableValueEntry"}, {"name": "aggregatableCapValues", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingAggregatableValueEntry"}, {"name": "debugReporting", "type": "boolean", "optional": false, "description": "", "typeRef": null}, {"name": "aggregationCoordinatorOrigin", "type": "string", "optional": true, "description": "", "typeRef": null}, {"name": "sourceRegistrationTimeConfig", "type": "string", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingSourceRegistrationTimeConfig"}, {"name": "triggerContextId", "type": "string", "optional": true, "description": "", "typeRef": null}, {"name": "globalEpsilon", "type": "number", "optional": true, "description": "", "typeRef": null}, {"name": "attributionWindow", "type": "object", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingAttributionWindow"}, {"name": "attributionLogic", "type": "string", "optional": false, "description": "", "typeRef": "null"}]); // SystemInfo. inspectorBackend.registerEnum("SystemInfo.SubsamplingFormat", {Yuv420: "yuv420", Yuv422: "yuv422", Yuv444: "yuv444"}); diff --git a/front_end/generated/protocol.ts b/front_end/generated/protocol.ts index e4fc9ef957a..b51932604a4 100644 --- a/front_end/generated/protocol.ts +++ b/front_end/generated/protocol.ts @@ -13989,7 +13989,7 @@ export namespace Storage { triggerContextId?: string; globalEpsilon?: number; attributionWindow: AttributionReportingAttributionWindow; - sourceIdCandidates: string[]; + aggregatableCapValues: AttributionReportingAggregatableValueEntry[]; attributionLogic: string; } diff --git a/third_party/blink/public/devtools_protocol/browser_protocol.json b/third_party/blink/public/devtools_protocol/browser_protocol.json index eb44c420455..2030f7fa2cb 100644 --- a/third_party/blink/public/devtools_protocol/browser_protocol.json +++ b/third_party/blink/public/devtools_protocol/browser_protocol.json @@ -21011,11 +21011,10 @@ "$ref": "AttributionReportingAttributionWindow" }, { - "name": "sourceIdCandidates", - "optional": false, + "name": "aggregatableCapValues", "type": "array", "items": { - "$ref": "UnsignedInt64AsBase10" + "$ref": "AttributionReportingAggregatableValueEntry" } }, { diff --git a/third_party/blink/public/devtools_protocol/browser_protocol.pdl b/third_party/blink/public/devtools_protocol/browser_protocol.pdl index 02fb61b8ad9..6bfcb7bb28a 100644 --- a/third_party/blink/public/devtools_protocol/browser_protocol.pdl +++ b/third_party/blink/public/devtools_protocol/browser_protocol.pdl @@ -10203,7 +10203,7 @@ experimental domain Storage optional string triggerContextId optional number globalEpsilon AttributionReportingAttributionWindow attributionWindow - array of UnsignedInt64AsBase10 sourceIdCandidates + array of AttributionReportingAggregatableValueEntry aggregatableCapValues string attributionLogic experimental type AttributionReportingEventLevelResult extends string From fda3b5e8f756172438a4659613de80a3a7150c23 Mon Sep 17 00:00:00 2001 From: Kelly Kostopoulou Date: Tue, 12 Mar 2024 18:12:42 -0500 Subject: [PATCH 8/8] changess --- front_end/generated/InspectorBackendCommands.js | 2 +- front_end/generated/protocol.ts | 1 + .../blink/public/devtools_protocol/browser_protocol.json | 5 +++++ .../blink/public/devtools_protocol/browser_protocol.pdl | 1 + 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/front_end/generated/InspectorBackendCommands.js b/front_end/generated/InspectorBackendCommands.js index 8b9af5b2d0a..5e564154376 100644 --- a/front_end/generated/InspectorBackendCommands.js +++ b/front_end/generated/InspectorBackendCommands.js @@ -1079,7 +1079,7 @@ inspectorBackend.registerType("Storage.AttributionReportingEventTriggerData", [{ inspectorBackend.registerType("Storage.AttributionReportingAggregatableTriggerData", [{"name": "keyPiece", "type": "string", "optional": false, "description": "", "typeRef": "Storage.UnsignedInt128AsBase16"}, {"name": "sourceKeys", "type": "array", "optional": false, "description": "", "typeRef": "string"}, {"name": "filters", "type": "object", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingFilterPair"}]); inspectorBackend.registerType("Storage.AttributionReportingAggregatableDedupKey", [{"name": "dedupKey", "type": "string", "optional": true, "description": "", "typeRef": "Storage.UnsignedInt64AsBase10"}, {"name": "filters", "type": "object", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingFilterPair"}]); inspectorBackend.registerType("Storage.AttributionReportingAttributionWindow", [{"name": "epochStart", "type": "number", "optional": false, "description": "", "typeRef": "Storage.UnsignedInt64AsBase10"}, {"name": "epochEnd", "type": "number", "optional": false, "description": "", "typeRef": "Storage.UnsignedInt64AsBase10"}]); -inspectorBackend.registerType("Storage.AttributionReportingTriggerRegistration", [{"name": "filters", "type": "object", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingFilterPair"}, {"name": "debugKey", "type": "string", "optional": true, "description": "", "typeRef": "Storage.UnsignedInt64AsBase10"}, {"name": "aggregatableDedupKeys", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingAggregatableDedupKey"}, {"name": "eventTriggerData", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingEventTriggerData"}, {"name": "aggregatableTriggerData", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingAggregatableTriggerData"}, {"name": "aggregatableValues", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingAggregatableValueEntry"}, {"name": "aggregatableCapValues", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingAggregatableValueEntry"}, {"name": "debugReporting", "type": "boolean", "optional": false, "description": "", "typeRef": null}, {"name": "aggregationCoordinatorOrigin", "type": "string", "optional": true, "description": "", "typeRef": null}, {"name": "sourceRegistrationTimeConfig", "type": "string", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingSourceRegistrationTimeConfig"}, {"name": "triggerContextId", "type": "string", "optional": true, "description": "", "typeRef": null}, {"name": "globalEpsilon", "type": "number", "optional": true, "description": "", "typeRef": null}, {"name": "attributionWindow", "type": "object", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingAttributionWindow"}, {"name": "attributionLogic", "type": "string", "optional": false, "description": "", "typeRef": "null"}]); +inspectorBackend.registerType("Storage.AttributionReportingTriggerRegistration", [{"name": "filters", "type": "object", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingFilterPair"}, {"name": "debugKey", "type": "string", "optional": true, "description": "", "typeRef": "Storage.UnsignedInt64AsBase10"}, {"name": "aggregatableDedupKeys", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingAggregatableDedupKey"}, {"name": "eventTriggerData", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingEventTriggerData"}, {"name": "aggregatableTriggerData", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingAggregatableTriggerData"}, {"name": "aggregatableValues", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingAggregatableValueEntry"}, {"name": "aggregatableCapValues", "type": "array", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingAggregatableValueEntry"}, {"name": "debugReporting", "type": "boolean", "optional": false, "description": "", "typeRef": null}, {"name": "aggregationCoordinatorOrigin", "type": "string", "optional": true, "description": "", "typeRef": null}, {"name": "sourceRegistrationTimeConfig", "type": "string", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingSourceRegistrationTimeConfig"}, {"name": "triggerContextId", "type": "string", "optional": true, "description": "", "typeRef": null}, {"name": "globalEpsilon", "type": "number", "optional": true, "description": "", "typeRef": null}, {"name": "attributionWindow", "type": "object", "optional": false, "description": "", "typeRef": "Storage.AttributionReportingAttributionWindow"}, {"name": "attributionLogic", "type": "string", "optional": false, "description": "", "typeRef": "null"}, {"name": "partitioningLogic", "type": "string", "optional": false, "description": "", "typeRef": "null"}]); // SystemInfo. inspectorBackend.registerEnum("SystemInfo.SubsamplingFormat", {Yuv420: "yuv420", Yuv422: "yuv422", Yuv444: "yuv444"}); diff --git a/front_end/generated/protocol.ts b/front_end/generated/protocol.ts index b51932604a4..d3acb78f640 100644 --- a/front_end/generated/protocol.ts +++ b/front_end/generated/protocol.ts @@ -13991,6 +13991,7 @@ export namespace Storage { attributionWindow: AttributionReportingAttributionWindow; aggregatableCapValues: AttributionReportingAggregatableValueEntry[]; attributionLogic: string; + partitioningLogic: string; } export const enum AttributionReportingEventLevelResult { diff --git a/third_party/blink/public/devtools_protocol/browser_protocol.json b/third_party/blink/public/devtools_protocol/browser_protocol.json index 2030f7fa2cb..475085e581c 100644 --- a/third_party/blink/public/devtools_protocol/browser_protocol.json +++ b/third_party/blink/public/devtools_protocol/browser_protocol.json @@ -21021,6 +21021,11 @@ "name": "attributionLogic", "optional": false, "type": "string" + }, + { + "name": "partitioningLogic", + "optional": false, + "type": "string" } ] }, diff --git a/third_party/blink/public/devtools_protocol/browser_protocol.pdl b/third_party/blink/public/devtools_protocol/browser_protocol.pdl index 6bfcb7bb28a..47749a0509d 100644 --- a/third_party/blink/public/devtools_protocol/browser_protocol.pdl +++ b/third_party/blink/public/devtools_protocol/browser_protocol.pdl @@ -10205,6 +10205,7 @@ experimental domain Storage AttributionReportingAttributionWindow attributionWindow array of AttributionReportingAggregatableValueEntry aggregatableCapValues string attributionLogic + string partitioningLogic experimental type AttributionReportingEventLevelResult extends string enum