mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2024-12-13 01:56:20 +01:00
66648c2343
- Remove CefRequestContextHandler::OnBeforePluginLoad and CefRequestContext::PurgePluginListCache (fixes issue #3047). These methods stopped being relevant after the removal of Flash support in January 2021. The last remaining PPAPI plugin (PDF viewer) will switch to a non-plugin implementation in the near future (see https://crbug.com/702993#c58) and functionality related to plugin filtering has already been removed in https://crrev.com/343ae351c9.
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 4b508191cf196..3c91214e09a69 100644
|
|
--- chrome/browser/printing/print_job_worker.cc
|
|
+++ chrome/browser/printing/print_job_worker.cc
|
|
@@ -148,6 +148,7 @@ PrintJobWorker::PrintJobWorker(int render_process_id, int render_frame_id)
|
|
PrintingContext::Create(printing_context_delegate_.get())),
|
|
thread_("Printing_Worker") {
|
|
DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
|
|
+ printing_context_->set_render_ids(render_process_id, render_frame_id);
|
|
}
|
|
|
|
PrintJobWorker::~PrintJobWorker() {
|
|
diff --git printing/printing_context.h printing/printing_context.h
|
|
index b28af89c67f88..53f107bf413fa 100644
|
|
--- printing/printing_context.h
|
|
+++ printing/printing_context.h
|
|
@@ -143,6 +143,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);
|
|
|
|
@@ -170,6 +177,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;
|
|
};
|
|
|
|
} // namespace printing
|