Skip to content

Commit d3fe5eb

Browse files
jackfranklinDevtools-frontend LUCI CQ
authored andcommitted
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/8729335449768310497 [email protected] Bug: none Change-Id: I2825d8378a3be75808c3631dd0b557620397da71 Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6072289 Commit-Queue: Jack Franklin <[email protected]> Reviewed-by: Jack Franklin <[email protected]> Reviewed-by: Danil Somsikov <[email protected]> Reviewed-by: Alex Rudenko <[email protected]>
1 parent ad9b44a commit d3fe5eb

File tree

9 files changed

+185
-23
lines changed

9 files changed

+185
-23
lines changed

DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ vars = {
2424
'inspector_protocol_revision': '69d69ddf3aa698b171886551a4a672c5af1ad902',
2525

2626
# Keeping track of the last time we rollerd the browser protocol files.
27-
'chromium_browser_protocol_revision' : '56ac24cc4d67be24eee8014986058c646344339c',
27+
'chromium_browser_protocol_revision' : '3ec35b727a0c624e0a2b820cadb7e59394be498e',
2828

2929
'clang_format_url': 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git',
3030
'clang_format_revision': '37f6e68a107df43b7d7e044fd36a13cbae3413f2',

front_end/generated/InspectorBackendCommands.js

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

front_end/generated/protocol-mapping.d.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1250,6 +1250,16 @@ export namespace ProtocolMapping {
12501250
paramsType: [Protocol.CSS.GetComputedStyleForNodeRequest];
12511251
returnType: Protocol.CSS.GetComputedStyleForNodeResponse;
12521252
};
1253+
/**
1254+
* Resolve the specified values in the context of the provided element.
1255+
* For example, a value of '1em' is evaluated according to the computed
1256+
* 'font-size' of the element and a value 'calc(1px + 2px)' will be
1257+
* resolved to '3px'.
1258+
*/
1259+
'CSS.resolveValues': {
1260+
paramsType: [Protocol.CSS.ResolveValuesRequest];
1261+
returnType: Protocol.CSS.ResolveValuesResponse;
1262+
};
12531263
/**
12541264
* Returns the styles defined inline (explicitly in the "style" attribute and implicitly, using DOM
12551265
* attributes) for a DOM node identified by `nodeId`.

front_end/generated/protocol-proxy-api.d.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -662,6 +662,14 @@ declare namespace ProtocolProxyApi {
662662
*/
663663
invoke_getComputedStyleForNode(params: Protocol.CSS.GetComputedStyleForNodeRequest): Promise<Protocol.CSS.GetComputedStyleForNodeResponse>;
664664

665+
/**
666+
* Resolve the specified values in the context of the provided element.
667+
* For example, a value of '1em' is evaluated according to the computed
668+
* 'font-size' of the element and a value 'calc(1px + 2px)' will be
669+
* resolved to '3px'.
670+
*/
671+
invoke_resolveValues(params: Protocol.CSS.ResolveValuesRequest): Promise<Protocol.CSS.ResolveValuesResponse>;
672+
665673
/**
666674
* Returns the styles defined inline (explicitly in the "style" attribute and implicitly, using DOM
667675
* attributes) for a DOM node identified by `nodeId`.

front_end/generated/protocol.ts

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3225,6 +3225,35 @@ export namespace CSS {
32253225
computedStyle: CSSComputedStyleProperty[];
32263226
}
32273227

3228+
export interface ResolveValuesRequest {
3229+
/**
3230+
* Substitution functions (var()/env()/attr()) and cascade-dependent
3231+
* keywords (revert/revert-layer) do not work.
3232+
*/
3233+
values: string[];
3234+
/**
3235+
* Id of the node in whose context the expression is evaluated
3236+
*/
3237+
nodeId: DOM.NodeId;
3238+
/**
3239+
* Only longhands and custom property names are accepted.
3240+
*/
3241+
propertyName?: string;
3242+
/**
3243+
* Pseudo element type, only works for pseudo elements that generate
3244+
* elements in the tree, such as ::before and ::after.
3245+
*/
3246+
pseudoType?: DOM.PseudoType;
3247+
/**
3248+
* Pseudo element custom ident.
3249+
*/
3250+
pseudoIdentifier?: string;
3251+
}
3252+
3253+
export interface ResolveValuesResponse extends ProtocolResponseWithError {
3254+
results: string[];
3255+
}
3256+
32283257
export interface GetInlineStylesForNodeRequest {
32293258
nodeId: DOM.NodeId;
32303259
}
@@ -10603,6 +10632,9 @@ export namespace Network {
1060310632
blockedCookies: BlockedSetCookieWithReason[];
1060410633
/**
1060510634
* Raw response headers as they were received over the wire.
10635+
* Duplicate headers in the response are represented as a single key with their values
10636+
* concatentated using `\n` as the separator.
10637+
* See also `headersText` that contains verbatim text for HTTP/1.*.
1060610638
*/
1060710639
headers: Headers;
1060810640
/**
@@ -10649,6 +10681,9 @@ export namespace Network {
1064910681
requestId: RequestId;
1065010682
/**
1065110683
* Raw response headers as they were received over the wire.
10684+
* Duplicate headers in the response are represented as a single key with their values
10685+
* concatentated using `\n` as the separator.
10686+
* See also `headersText` that contains verbatim text for HTTP/1.*.
1065210687
*/
1065310688
headers: Headers;
1065410689
}
@@ -17356,6 +17391,17 @@ export namespace Preload {
1735617391
nodeIds: DOM.BackendNodeId[];
1735717392
}
1735817393

17394+
/**
17395+
* Chrome manages different types of preloads together using a
17396+
* concept of preloading pipeline. For example, if a site uses a
17397+
* SpeculationRules for prerender, Chrome first starts a prefetch and
17398+
* then upgrades it to prerender.
17399+
*
17400+
* CDP events for them are emitted separately but they share
17401+
* `PreloadPipelineId`.
17402+
*/
17403+
export type PreloadPipelineId = OpaqueIdentifier<string, 'Protocol.Preload.PreloadPipelineId'>;
17404+
1735917405
/**
1736017406
* List of FinalStatus reasons for Prerender2.
1736117407
*/
@@ -17521,6 +17567,7 @@ export namespace Preload {
1752117567
*/
1752217568
export interface PrefetchStatusUpdatedEvent {
1752317569
key: PreloadingAttemptKey;
17570+
pipelineId: PreloadPipelineId;
1752417571
/**
1752517572
* The frame id of the frame initiating prefetch.
1752617573
*/
@@ -17536,6 +17583,7 @@ export namespace Preload {
1753617583
*/
1753717584
export interface PrerenderStatusUpdatedEvent {
1753817585
key: PreloadingAttemptKey;
17586+
pipelineId: PreloadPipelineId;
1753917587
status: PreloadingStatus;
1754017588
prerenderStatus?: PrerenderFinalStatus;
1754117589
/**

front_end/models/javascript_metadata/NativeFunctions.js

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1668,12 +1668,7 @@ export const NativeFunctions = [
16681668
{
16691669
name: "createConicGradient",
16701670
signatures: [["startAngle","cx","cy"]],
1671-
receivers: ["CanvasRenderingContext2D","PaintRenderingContext2D"]
1672-
},
1673-
{
1674-
name: "createConicGradient",
1675-
signatures: [["startAngle","centerX","centerY"]],
1676-
receivers: ["OffscreenCanvasRenderingContext2D"]
1671+
receivers: ["CanvasRenderingContext2D","OffscreenCanvasRenderingContext2D","PaintRenderingContext2D"]
16771672
},
16781673
{
16791674
name: "createLinearGradient",
@@ -7448,14 +7443,6 @@ export const NativeFunctions = [
74487443
name: "setExpires",
74497444
signatures: [["expires"]]
74507445
},
7451-
{
7452-
name: "transferToGPUTexture",
7453-
signatures: [["options"]]
7454-
},
7455-
{
7456-
name: "CanvasFilter",
7457-
signatures: [["init"]]
7458-
},
74597446
{
74607447
name: "beginLayer",
74617448
signatures: [["?options"]]
@@ -7464,10 +7451,6 @@ export const NativeFunctions = [
74647451
name: "fillTextCluster",
74657452
signatures: [["textCluster","x","y"]]
74667453
},
7467-
{
7468-
name: "placeElement",
7469-
signatures: [["element","x","y"]]
7470-
},
74717454
{
74727455
name: "createMesh2DVertexBuffer",
74737456
signatures: [["buffer"]]
@@ -7484,6 +7467,18 @@ export const NativeFunctions = [
74847467
name: "drawMesh",
74857468
signatures: [["vertex_buffer","uv_buffer","index_buffer","image"]]
74867469
},
7470+
{
7471+
name: "transferToGPUTexture",
7472+
signatures: [["options"]]
7473+
},
7474+
{
7475+
name: "CanvasFilter",
7476+
signatures: [["init"]]
7477+
},
7478+
{
7479+
name: "placeElement",
7480+
signatures: [["element","x","y"]]
7481+
},
74877482
{
74887483
name: "Path2D",
74897484
signatures: [["?path"]]

front_end/panels/application/preloading/PreloadingView.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,7 @@ class NavigationEmulator {
201201
const prerenderUrl = 'https://example.com' + json['prerender'][0]['urls'][0];
202202

203203
this.prerenderStatusUpdatedEvent = {
204+
pipelineId: 'test-pipeline-id' as Protocol.Preload.PreloadPipelineId,
204205
key: {
205206
loaderId: this.loaderId,
206207
action: Protocol.Preload.SpeculationAction.Prerender,

third_party/blink/public/devtools_protocol/browser_protocol.json

Lines changed: 63 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4697,6 +4697,54 @@
46974697
}
46984698
]
46994699
},
4700+
{
4701+
"name": "resolveValues",
4702+
"description": "Resolve the specified values in the context of the provided element.\nFor example, a value of '1em' is evaluated according to the computed\n'font-size' of the element and a value 'calc(1px + 2px)' will be\nresolved to '3px'.",
4703+
"parameters": [
4704+
{
4705+
"name": "values",
4706+
"description": "Substitution functions (var()/env()/attr()) and cascade-dependent\nkeywords (revert/revert-layer) do not work.",
4707+
"type": "array",
4708+
"items": {
4709+
"type": "string"
4710+
}
4711+
},
4712+
{
4713+
"name": "nodeId",
4714+
"description": "Id of the node in whose context the expression is evaluated",
4715+
"$ref": "DOM.NodeId"
4716+
},
4717+
{
4718+
"name": "propertyName",
4719+
"description": "Only longhands and custom property names are accepted.",
4720+
"optional": true,
4721+
"type": "string"
4722+
},
4723+
{
4724+
"name": "pseudoType",
4725+
"description": "Pseudo element type, only works for pseudo elements that generate\nelements in the tree, such as ::before and ::after.",
4726+
"experimental": true,
4727+
"optional": true,
4728+
"$ref": "DOM.PseudoType"
4729+
},
4730+
{
4731+
"name": "pseudoIdentifier",
4732+
"description": "Pseudo element custom ident.",
4733+
"experimental": true,
4734+
"optional": true,
4735+
"type": "string"
4736+
}
4737+
],
4738+
"returns": [
4739+
{
4740+
"name": "results",
4741+
"type": "array",
4742+
"items": {
4743+
"type": "string"
4744+
}
4745+
}
4746+
]
4747+
},
47004748
{
47014749
"name": "getInlineStylesForNode",
47024750
"description": "Returns the styles defined inline (explicitly in the \"style\" attribute and implicitly, using DOM\nattributes) for a DOM node identified by `nodeId`.",
@@ -15772,7 +15820,7 @@
1577215820
},
1577315821
{
1577415822
"name": "headers",
15775-
"description": "Raw response headers as they were received over the wire.",
15823+
"description": "Raw response headers as they were received over the wire.\nDuplicate headers in the response are represented as a single key with their values\nconcatentated using `\\n` as the separator.\nSee also `headersText` that contains verbatim text for HTTP/1.*.",
1577615824
"$ref": "Headers"
1577715825
},
1577815826
{
@@ -15827,7 +15875,7 @@
1582715875
},
1582815876
{
1582915877
"name": "headers",
15830-
"description": "Raw response headers as they were received over the wire.",
15878+
"description": "Raw response headers as they were received over the wire.\nDuplicate headers in the response are represented as a single key with their values\nconcatentated using `\\n` as the separator.\nSee also `headersText` that contains verbatim text for HTTP/1.*.",
1583115879
"$ref": "Headers"
1583215880
}
1583315881
]
@@ -26354,6 +26402,11 @@
2635426402
}
2635526403
]
2635626404
},
26405+
{
26406+
"id": "PreloadPipelineId",
26407+
"description": "Chrome manages different types of preloads together using a\nconcept of preloading pipeline. For example, if a site uses a\nSpeculationRules for prerender, Chrome first starts a prefetch and\nthen upgrades it to prerender.\n\nCDP events for them are emitted separately but they share\n`PreloadPipelineId`.",
26408+
"type": "string"
26409+
},
2635726410
{
2635826411
"id": "PrerenderFinalStatus",
2635926412
"description": "List of FinalStatus reasons for Prerender2.",
@@ -26568,6 +26621,10 @@
2656826621
"name": "key",
2656926622
"$ref": "PreloadingAttemptKey"
2657026623
},
26624+
{
26625+
"name": "pipelineId",
26626+
"$ref": "PreloadPipelineId"
26627+
},
2657126628
{
2657226629
"name": "initiatingFrameId",
2657326630
"description": "The frame id of the frame initiating prefetch.",
@@ -26599,6 +26656,10 @@
2659926656
"name": "key",
2660026657
"$ref": "PreloadingAttemptKey"
2660126658
},
26659+
{
26660+
"name": "pipelineId",
26661+
"$ref": "PreloadPipelineId"
26662+
},
2660226663
{
2660326664
"name": "status",
2660426665
"$ref": "PreloadingStatus"

0 commit comments

Comments
 (0)