Update to Chromium version 99.0.4844.0 (#961656)

This commit is contained in:
Marshall Greenblatt
2022-01-25 15:26:51 -05:00
parent c32f366dfa
commit 1e1133ec66
83 changed files with 664 additions and 717 deletions

View File

@@ -1,8 +1,8 @@
diff --git chrome/browser/printing/print_job_worker.cc chrome/browser/printing/print_job_worker.cc
index d8f67ab511648..707ca0f50328b 100644
index c7a7f857a28d0..9479a7874ea3b 100644
--- chrome/browser/printing/print_job_worker.cc
+++ chrome/browser/printing/print_job_worker.cc
@@ -142,6 +142,7 @@ PrintJobWorker::PrintJobWorker(int render_process_id, int render_frame_id)
@@ -136,6 +136,7 @@ PrintJobWorker::PrintJobWorker(int render_process_id, int render_frame_id)
ShouldPrintingContextSkipSystemCalls())),
thread_("Printing_Worker") {
DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
@@ -11,10 +11,10 @@ index d8f67ab511648..707ca0f50328b 100644
PrintJobWorker::~PrintJobWorker() {
diff --git printing/printing_context.h printing/printing_context.h
index 7d937e7e3f19d..be49a65eeed94 100644
index 3f36303105b79..aea7f788504d6 100644
--- printing/printing_context.h
+++ printing/printing_context.h
@@ -177,6 +177,13 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
@@ -172,6 +172,13 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
int job_id() const { return job_id_; }
@@ -28,7 +28,7 @@ index 7d937e7e3f19d..be49a65eeed94 100644
protected:
explicit PrintingContext(Delegate* delegate);
@@ -221,6 +228,10 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
@@ -216,6 +223,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_;