Skip to content

Commit e653604

Browse files
devtools-botdevtools-bot
committed
Roll protocol to r1601035
1 parent 0c3ac05 commit e653604

File tree

10 files changed

+1179
-414
lines changed

10 files changed

+1179
-414
lines changed

‎changelog.md‎

Lines changed: 599 additions & 196 deletions
Large diffs are not rendered by default.

‎json/browser_protocol.json‎

Lines changed: 47 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -2229,49 +2229,6 @@
22292229
}
22302230
]
22312231
},
2232-
{
2233-
"id": "AdScriptIdentifier",
2234-
"description": "Metadata about the ad script that was on the stack that caused the current\nscript in the `AdAncestry` to be considered ad related.",
2235-
"type": "object",
2236-
"properties": [
2237-
{
2238-
"name": "scriptId",
2239-
"description": "The script's v8 identifier.",
2240-
"$ref": "Runtime.ScriptId"
2241-
},
2242-
{
2243-
"name": "debuggerId",
2244-
"description": "v8's debugging id for the v8::Context.",
2245-
"$ref": "Runtime.UniqueDebuggerId"
2246-
},
2247-
{
2248-
"name": "name",
2249-
"description": "The script's url (or generated name based on id if inline script).",
2250-
"type": "string"
2251-
}
2252-
]
2253-
},
2254-
{
2255-
"id": "AdAncestry",
2256-
"description": "Providence about how an ad script was determined to be such. It is an ad\nbecause its url matched a filterlist rule, or because some other ad script\nwas on the stack when this script was loaded.",
2257-
"type": "object",
2258-
"properties": [
2259-
{
2260-
"name": "adAncestryChain",
2261-
"description": "The ad-script in the stack when the offending script was loaded. This is\nrecursive down to the root script that was tagged due to the filterlist\nrule.",
2262-
"type": "array",
2263-
"items": {
2264-
"$ref": "AdScriptIdentifier"
2265-
}
2266-
},
2267-
{
2268-
"name": "rootScriptFilterlistRule",
2269-
"description": "The filterlist rule that caused the root (last) script in\n`adAncestry` to be ad-tagged.",
2270-
"optional": true,
2271-
"type": "string"
2272-
}
2273-
]
2274-
},
22752232
{
22762233
"id": "SelectivePermissionsInterventionIssueDetails",
22772234
"description": "The issue warns about blocked calls to privacy sensitive APIs via the\nSelective Permissions Intervention.",
@@ -2285,7 +2242,7 @@
22852242
{
22862243
"name": "adAncestry",
22872244
"description": "Why the ad script using the API is considered an ad.",
2288-
"$ref": "AdAncestry"
2245+
"$ref": "Network.AdAncestry"
22892246
},
22902247
{
22912248
"name": "stackTrace",
@@ -17287,6 +17244,51 @@
1728717244
}
1728817245
]
1728917246
},
17247+
{
17248+
"id": "AdScriptIdentifier",
17249+
"description": "Identifies the script on the stack that caused a resource or element to be\nlabeled as an ad. For resources, this indicates the context that triggered\nthe fetch. For elements, this indicates the context that caused the element\nto be appended to the DOM.",
17250+
"experimental": true,
17251+
"type": "object",
17252+
"properties": [
17253+
{
17254+
"name": "scriptId",
17255+
"description": "The script's V8 identifier.",
17256+
"$ref": "Runtime.ScriptId"
17257+
},
17258+
{
17259+
"name": "debuggerId",
17260+
"description": "V8's debugging ID for the v8::Context.",
17261+
"$ref": "Runtime.UniqueDebuggerId"
17262+
},
17263+
{
17264+
"name": "name",
17265+
"description": "The script's url (or generated name based on id if inline script).",
17266+
"type": "string"
17267+
}
17268+
]
17269+
},
17270+
{
17271+
"id": "AdAncestry",
17272+
"description": "Encapsulates the script ancestry and the root script filter list rule that\ncaused the resource or element to be labeled as an ad.",
17273+
"experimental": true,
17274+
"type": "object",
17275+
"properties": [
17276+
{
17277+
"name": "ancestryChain",
17278+
"description": "A chain of `AdScriptIdentifier`s representing the ancestry of an ad\nscript that led to the creation of a resource or element. The chain is\nordered from the script itself (lowest level) up to its root ancestor\nthat was flagged by a filter list.",
17279+
"type": "array",
17280+
"items": {
17281+
"$ref": "AdScriptIdentifier"
17282+
}
17283+
},
17284+
{
17285+
"name": "rootScriptFilterlistRule",
17286+
"description": "The filter list rule that caused the root (last) script in\n`ancestryChain` to be tagged as an ad.",
17287+
"optional": true,
17288+
"type": "string"
17289+
}
17290+
]
17291+
},
1729017292
{
1729117293
"id": "CrossOriginOpenerPolicyValue",
1729217294
"experimental": true,
@@ -21471,46 +21473,6 @@
2147121473
}
2147221474
]
2147321475
},
21474-
{
21475-
"id": "AdScriptId",
21476-
"description": "Identifies the script which caused a script or frame to be labelled as an\nad.",
21477-
"experimental": true,
21478-
"type": "object",
21479-
"properties": [
21480-
{
21481-
"name": "scriptId",
21482-
"description": "Script Id of the script which caused a script or frame to be labelled as\nan ad.",
21483-
"$ref": "Runtime.ScriptId"
21484-
},
21485-
{
21486-
"name": "debuggerId",
21487-
"description": "Id of scriptId's debugger.",
21488-
"$ref": "Runtime.UniqueDebuggerId"
21489-
}
21490-
]
21491-
},
21492-
{
21493-
"id": "AdScriptAncestry",
21494-
"description": "Encapsulates the script ancestry and the root script filterlist rule that\ncaused the frame to be labelled as an ad. Only created when `ancestryChain`\nis not empty.",
21495-
"experimental": true,
21496-
"type": "object",
21497-
"properties": [
21498-
{
21499-
"name": "ancestryChain",
21500-
"description": "A chain of `AdScriptId`s representing the ancestry of an ad script that\nled to the creation of a frame. The chain is ordered from the script\nitself (lower level) up to its root ancestor that was flagged by\nfilterlist.",
21501-
"type": "array",
21502-
"items": {
21503-
"$ref": "AdScriptId"
21504-
}
21505-
},
21506-
{
21507-
"name": "rootScriptFilterlistRule",
21508-
"description": "The filterlist rule that caused the root (last) script in\n`ancestryChain` to be ad-tagged. Only populated if the rule is\navailable.",
21509-
"optional": true,
21510-
"type": "string"
21511-
}
21512-
]
21513-
},
2151421476
{
2151521477
"id": "SecureContextType",
2151621478
"description": "Indicates whether the frame is a secure context and why it is the case.",
@@ -23448,7 +23410,7 @@
2344823410
"name": "adScriptAncestry",
2344923411
"description": "The ancestry chain of ad script identifiers leading to this frame's\ncreation, along with the root script's filterlist rule. The ancestry\nchain is ordered from the most immediate script (in the frame creation\nstack) to more distant ancestors (that created the immediately preceding\nscript). Only sent if frame is labelled as an ad and ids are available.",
2345023412
"optional": true,
23451-
"$ref": "AdScriptAncestry"
23413+
"$ref": "Network.AdAncestry"
2345223414
}
2345323415
]
2345423416
},

‎package-lock.json‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "devtools-protocol",
3-
"version": "0.0.1596832",
3+
"version": "0.0.1601035",
44
"description": "The Chrome DevTools Protocol JSON",
55
"repository": "https://github.com/ChromeDevTools/devtools-protocol",
66
"author": "The Chromium Authors",

‎pdl/domains/Audits.pdl‎

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -688,38 +688,14 @@ experimental domain Audits
688688
# Used for messages about activation disabled reason
689689
optional string disableReason
690690

691-
# Metadata about the ad script that was on the stack that caused the current
692-
# script in the `AdAncestry` to be considered ad related.
693-
type AdScriptIdentifier extends object
694-
properties
695-
# The script's v8 identifier.
696-
Runtime.ScriptId scriptId
697-
# v8's debugging id for the v8::Context.
698-
Runtime.UniqueDebuggerId debuggerId
699-
# The script's url (or generated name based on id if inline script).
700-
string name
701-
702-
# Providence about how an ad script was determined to be such. It is an ad
703-
# because its url matched a filterlist rule, or because some other ad script
704-
# was on the stack when this script was loaded.
705-
type AdAncestry extends object
706-
properties
707-
# The ad-script in the stack when the offending script was loaded. This is
708-
# recursive down to the root script that was tagged due to the filterlist
709-
# rule.
710-
array of AdScriptIdentifier adAncestryChain
711-
# The filterlist rule that caused the root (last) script in
712-
# `adAncestry` to be ad-tagged.
713-
optional string rootScriptFilterlistRule
714-
715691
# The issue warns about blocked calls to privacy sensitive APIs via the
716692
# Selective Permissions Intervention.
717693
type SelectivePermissionsInterventionIssueDetails extends object
718694
properties
719695
# Which API was intervened on.
720696
string apiName
721697
# Why the ad script using the API is considered an ad.
722-
AdAncestry adAncestry
698+
Network.AdAncestry adAncestry
723699
# The stack trace at the time of the intervention.
724700
optional Runtime.StackTrace stackTrace
725701

‎pdl/domains/Network.pdl‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1799,6 +1799,32 @@ domain Network
17991799
IPAddressSpace initiatorIPAddressSpace
18001800
LocalNetworkAccessRequestPolicy localNetworkAccessRequestPolicy
18011801

1802+
# Identifies the script on the stack that caused a resource or element to be
1803+
# labeled as an ad. For resources, this indicates the context that triggered
1804+
# the fetch. For elements, this indicates the context that caused the element
1805+
# to be appended to the DOM.
1806+
experimental type AdScriptIdentifier extends object
1807+
properties
1808+
# The script's V8 identifier.
1809+
Runtime.ScriptId scriptId
1810+
# V8's debugging ID for the v8::Context.
1811+
Runtime.UniqueDebuggerId debuggerId
1812+
# The script's url (or generated name based on id if inline script).
1813+
string name
1814+
1815+
# Encapsulates the script ancestry and the root script filter list rule that
1816+
# caused the resource or element to be labeled as an ad.
1817+
experimental type AdAncestry extends object
1818+
properties
1819+
# A chain of `AdScriptIdentifier`s representing the ancestry of an ad
1820+
# script that led to the creation of a resource or element. The chain is
1821+
# ordered from the script itself (lowest level) up to its root ancestor
1822+
# that was flagged by a filter list.
1823+
array of AdScriptIdentifier ancestryChain
1824+
# The filter list rule that caused the root (last) script in
1825+
# `ancestryChain` to be tagged as an ad.
1826+
optional string rootScriptFilterlistRule
1827+
18021828
# Fired when additional information about a requestWillBeSent event is available from the
18031829
# network stack. Not every requestWillBeSent event will have an additional
18041830
# requestWillBeSentExtraInfo fired for it, and there is no guarantee whether requestWillBeSent

‎pdl/domains/Page.pdl‎

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -36,31 +36,6 @@ domain Page
3636
AdFrameType adFrameType
3737
optional array of AdFrameExplanation explanations
3838

39-
# Identifies the script which caused a script or frame to be labelled as an
40-
# ad.
41-
experimental type AdScriptId extends object
42-
properties
43-
# Script Id of the script which caused a script or frame to be labelled as
44-
# an ad.
45-
Runtime.ScriptId scriptId
46-
# Id of scriptId's debugger.
47-
Runtime.UniqueDebuggerId debuggerId
48-
49-
# Encapsulates the script ancestry and the root script filterlist rule that
50-
# caused the frame to be labelled as an ad. Only created when `ancestryChain`
51-
# is not empty.
52-
experimental type AdScriptAncestry extends object
53-
properties
54-
# A chain of `AdScriptId`s representing the ancestry of an ad script that
55-
# led to the creation of a frame. The chain is ordered from the script
56-
# itself (lower level) up to its root ancestor that was flagged by
57-
# filterlist.
58-
array of AdScriptId ancestryChain
59-
# The filterlist rule that caused the root (last) script in
60-
# `ancestryChain` to be ad-tagged. Only populated if the rule is
61-
# available.
62-
optional string rootScriptFilterlistRule
63-
6439
# Indicates whether the frame is a secure context and why it is the case.
6540
experimental type SecureContextType extends string
6641
enum
@@ -843,7 +818,7 @@ domain Page
843818
# chain is ordered from the most immediate script (in the frame creation
844819
# stack) to more distant ancestors (that created the immediately preceding
845820
# script). Only sent if frame is labelled as an ad and ids are available.
846-
optional AdScriptAncestry adScriptAncestry
821+
optional Network.AdAncestry adScriptAncestry
847822

848823
# Returns present frame tree structure.
849824
command getFrameTree

0 commit comments

Comments
 (0)