Update to Chromium version 122.0.6261.0 (#1250580)

Frame identifiers have changed from int64_t to string type. This is due
to https://crbug.com/1502660 which removes access to frame routing IDs
in the renderer process. New cross-process frame identifiers are 160-bit
values (32-bit child process ID + 128-bit local frame token) and most
easily represented as strings. All other frame-related expectations and
behaviors remain the same.
This commit is contained in:
Marshall Greenblatt
2024-01-25 21:12:43 -05:00
parent 2a86a02bdd
commit 2f1e782f62
156 changed files with 1452 additions and 1436 deletions

View File

@ -1,5 +1,5 @@
diff --git chrome/browser/printing/printer_query.cc chrome/browser/printing/printer_query.cc
index 75fb743f95c37..a79ca84b4ff4c 100644
index 418f53b0db3a2..4abcc0005eb1d 100644
--- chrome/browser/printing/printer_query.cc
+++ chrome/browser/printing/printer_query.cc
@@ -124,6 +124,7 @@ PrinterQuery::PrinterQuery(content::GlobalRenderFrameHostId rfh_id)
@ -11,12 +11,12 @@ index 75fb743f95c37..a79ca84b4ff4c 100644
PrinterQuery::~PrinterQuery() {
diff --git printing/printing_context.h printing/printing_context.h
index 6db58a9992642..ac57e5c200079 100644
index 63f170c950504..962e60d23da59 100644
--- printing/printing_context.h
+++ printing/printing_context.h
@@ -204,6 +204,13 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
int job_id() const { return job_id_; }
@@ -215,6 +215,13 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
void SetJobId(int job_id);
#endif
+ void set_render_ids(int render_process_id, int render_frame_id) {
+ render_process_id_ = render_process_id;
@ -28,9 +28,9 @@ index 6db58a9992642..ac57e5c200079 100644
protected:
PrintingContext(Delegate* delegate, ProcessBehavior process_behavior);
@@ -234,6 +241,10 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
// The job id for the current job. The value is 0 if no jobs are active.
int job_id_;
@@ -248,6 +255,10 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
// management.
int job_id_ = kNoPrintJobId;
+ // Routing IDs for the frame that owns this object.
+ int render_process_id_ = 0;