Update to Chromium version 114.0.5735.0 (#1135570)

- Mac: 13.3 SDK (Xcode 14.3) is now supported (see https://crbug.com/1431897).
- Mac: Removed UnderlayOpenGLHostingWindow which is no longer used.
This commit is contained in:
Marshall Greenblatt
2023-04-26 15:55:59 -04:00
parent 09c4142dad
commit ab94a13522
87 changed files with 602 additions and 724 deletions

View File

@@ -1,8 +1,8 @@
diff --git chrome/browser/printing/printer_query.cc chrome/browser/printing/printer_query.cc
index 7f77a94ddcdbc..149fe2bd90a13 100644
index 0b6ff160cc053..987d9cf9b43c0 100644
--- chrome/browser/printing/printer_query.cc
+++ chrome/browser/printing/printer_query.cc
@@ -116,6 +116,7 @@ PrinterQuery::PrinterQuery(content::GlobalRenderFrameHostId rfh_id)
@@ -122,6 +122,7 @@ PrinterQuery::PrinterQuery(content::GlobalRenderFrameHostId rfh_id)
rfh_id_(rfh_id),
cookie_(PrintSettings::NewCookie()) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@@ -11,10 +11,10 @@ index 7f77a94ddcdbc..149fe2bd90a13 100644
PrinterQuery::~PrinterQuery() {
diff --git printing/printing_context.h printing/printing_context.h
index 7582c73418e74..f5b477c18c65a 100644
index 2fb3aef0797f2..73248cd2d2039 100644
--- printing/printing_context.h
+++ printing/printing_context.h
@@ -173,6 +173,13 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
@@ -180,6 +180,13 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
int job_id() const { return job_id_; }
@@ -28,7 +28,7 @@ index 7582c73418e74..f5b477c18c65a 100644
protected:
explicit PrintingContext(Delegate* delegate);
@@ -219,6 +226,10 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
@@ -224,6 +231,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_;