2023-01-30 18:43:54 +01:00
|
|
|
diff --git chrome/browser/printing/printer_query.cc chrome/browser/printing/printer_query.cc
|
2023-04-20 15:50:27 +02:00
|
|
|
index c52b6b1bfcd6b..dd99ad48f8504 100644
|
2023-01-30 18:43:54 +01:00
|
|
|
--- chrome/browser/printing/printer_query.cc
|
|
|
|
+++ chrome/browser/printing/printer_query.cc
|
2023-04-20 15:50:27 +02:00
|
|
|
@@ -121,6 +121,7 @@ PrinterQuery::PrinterQuery(content::GlobalRenderFrameHostId rfh_id)
|
2023-01-30 18:43:54 +01:00
|
|
|
rfh_id_(rfh_id),
|
|
|
|
cookie_(PrintSettings::NewCookie()) {
|
2022-06-17 15:28:55 +02:00
|
|
|
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
2022-03-26 02:12:30 +01:00
|
|
|
+ printing_context_->set_render_ids(rfh_id.child_id, rfh_id.frame_routing_id);
|
2017-06-15 17:27:56 +02:00
|
|
|
}
|
|
|
|
|
2023-01-30 18:43:54 +01:00
|
|
|
PrinterQuery::~PrinterQuery() {
|
2017-06-15 17:27:56 +02:00
|
|
|
diff --git printing/printing_context.h printing/printing_context.h
|
2023-04-20 15:50:27 +02:00
|
|
|
index 2fb3aef0797f2..73248cd2d2039 100644
|
2017-06-15 17:27:56 +02:00
|
|
|
--- printing/printing_context.h
|
|
|
|
+++ printing/printing_context.h
|
2023-04-20 15:50:27 +02:00
|
|
|
@@ -180,6 +180,13 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
|
2017-06-15 17:27:56 +02:00
|
|
|
|
|
|
|
int job_id() const { return job_id_; }
|
|
|
|
|
|
|
|
+ void set_render_ids(int render_process_id, int render_frame_id) {
|
|
|
|
+ render_process_id_ = render_process_id;
|
|
|
|
+ render_frame_id_ = render_frame_id;
|
|
|
|
+ }
|
|
|
|
+ int render_process_id() const { return render_process_id_; }
|
|
|
|
+ int render_frame_id() const { return render_frame_id_; }
|
|
|
|
+
|
|
|
|
protected:
|
|
|
|
explicit PrintingContext(Delegate* delegate);
|
|
|
|
|
2023-04-20 15:50:27 +02:00
|
|
|
@@ -224,6 +231,10 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
|
2017-06-15 17:27:56 +02:00
|
|
|
// The job id for the current job. The value is 0 if no jobs are active.
|
|
|
|
int job_id_;
|
2021-12-16 23:35:54 +01:00
|
|
|
|
2017-06-15 17:27:56 +02:00
|
|
|
+ // Routing IDs for the frame that owns this object.
|
|
|
|
+ int render_process_id_ = 0;
|
|
|
|
+ int render_frame_id_ = 0;
|
2021-12-16 23:35:54 +01:00
|
|
|
+
|
|
|
|
private:
|
|
|
|
#if BUILDFLAG(ENABLE_OOP_PRINTING)
|
|
|
|
// If this instance of PrintingContext should skip making any system calls
|