cef/patch/patches/printing_context_2196.patch

42 lines
1.6 KiB
Diff

diff --git chrome/browser/printing/printer_query.cc chrome/browser/printing/printer_query.cc
index 83bce57ef52af..cb14470d16e4a 100644
--- chrome/browser/printing/printer_query.cc
+++ chrome/browser/printing/printer_query.cc
@@ -122,6 +122,7 @@ PrinterQuery::PrinterQuery(content::GlobalRenderFrameHostId rfh_id)
rfh_id_(rfh_id),
cookie_(PrintSettings::NewCookie()) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+ printing_context_->set_render_ids(rfh_id.child_id, rfh_id.frame_routing_id);
}
PrinterQuery::~PrinterQuery() {
diff --git printing/printing_context.h printing/printing_context.h
index c753f04d8b73a..7607571f78119 100644
--- printing/printing_context.h
+++ printing/printing_context.h
@@ -176,6 +176,13 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
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);
@@ -220,6 +227,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_;
+ // Routing IDs for the frame that owns this object.
+ int render_process_id_ = 0;
+ int render_frame_id_ = 0;
+
private:
#if BUILDFLAG(ENABLE_OOP_PRINTING)
// If this instance of PrintingContext should skip making any system calls