mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2024-12-14 02:24:03 +01:00
cd27cbc802
Known issues: - Surface synchronization is now enabled for OSR, see issue #2447. - Jumbo build is broken, fixed in https://crrev.com/868717ce.
42 lines
1.5 KiB
Diff
42 lines
1.5 KiB
Diff
diff --git chrome/browser/printing/print_job_worker.cc chrome/browser/printing/print_job_worker.cc
|
|
index 1065e808e621..ca9a0bd14652 100644
|
|
--- chrome/browser/printing/print_job_worker.cc
|
|
+++ chrome/browser/printing/print_job_worker.cc
|
|
@@ -145,6 +145,7 @@ PrintJobWorker::PrintJobWorker(int render_process_id,
|
|
weak_factory_(this) {
|
|
// The object is created in the IO thread.
|
|
DCHECK(query_->RunsTasksInCurrentSequence());
|
|
+ printing_context_->set_render_ids(render_process_id, render_frame_id);
|
|
}
|
|
|
|
PrintJobWorker::~PrintJobWorker() {
|
|
diff --git printing/printing_context.h printing/printing_context.h
|
|
index 885937908414..03f0f0837f80 100644
|
|
--- printing/printing_context.h
|
|
+++ printing/printing_context.h
|
|
@@ -133,6 +133,13 @@ class PRINTING_EXPORT 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);
|
|
|
|
@@ -157,6 +164,10 @@ class PRINTING_EXPORT 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:
|
|
DISALLOW_COPY_AND_ASSIGN(PrintingContext);
|
|
};
|