bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 102.0.5005.0 (#992738)

Browse Source 
Linux: 32-bit x86 builds are no longer supported (see issue #2676).
This commit is contained in:
Marshall Greenblatt
2022-04-27 15:24:24 -04:00
parent 916360e2e5
commit b62dd2b6ee
38 changed files with 170 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patch/patches/print_preview_123.patch
View File

@@ -46,13 +46,13 @@ index d656ccabc3899..a4b7ce6a7dcd8 100644
#include "chrome/browser/printing/print_view_manager.h"
#include "chrome/browser/task_manager/web_contents_tags.h"
diff --git chrome/browser/printing/print_view_manager_base.cc chrome/browser/printing/print_view_manager_base.cc
index 3a3f733c45e08..c9a2d7672346a 100644
index fb69efbfa8e35..060aad00efe18 100644
--- chrome/browser/printing/print_view_manager_base.cc
+++ chrome/browser/printing/print_view_manager_base.cc
@@ -224,12 +224,12 @@ void UpdatePrintSettingsOnIO(
@@ -223,12 +223,12 @@ void UpdatePrintSettingsOnIO(
mojom::PrintManagerHost::UpdatePrintSettingsCallback callback,
scoped_refptr<PrintQueriesQueue> queue,
base::Value job_settings,
base::Value::Dict job_settings,
- base::WeakPtr<PrintViewManagerBase> manager) {
+ base::WeakPtr<PrintViewManagerBase> manager,
+ const content::GlobalRenderFrameHostId& global_id) {
@@ -65,15 +65,15 @@ index 3a3f733c45e08..c9a2d7672346a 100644
}
auto* printer_query_ptr = printer_query.get();
printer_query_ptr->SetSettings(
@@ -680,6 +680,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
job_settings.SetIntKey(kSettingRasterizePdfDpi, value);
@@ -694,6 +694,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
job_settings.Set(kSettingRasterizePdfDpi, value);
}
+ content::RenderFrameHost* render_frame_host = GetCurrentTargetFrame();
auto callback_wrapper =
base::BindOnce(&PrintViewManagerBase::UpdatePrintSettingsReply,
weak_ptr_factory_.GetWeakPtr(), std::move(callback));
@@ -687,7 +688,8 @@ void PrintViewManagerBase::UpdatePrintSettings(
@@ -701,7 +702,8 @@ void PrintViewManagerBase::UpdatePrintSettings(
FROM_HERE,
base::BindOnce(&UpdatePrintSettingsOnIO, cookie,
std::move(callback_wrapper), queue_,
@@ -84,10 +84,10 @@ index 3a3f733c45e08..c9a2d7672346a 100644
#endif // BUILDFLAG(ENABLE_PRINT_PREVIEW)
diff --git chrome/browser/printing/print_view_manager_base.h chrome/browser/printing/print_view_manager_base.h
index 3a4cfa1e44d78..341d0f56a42b1 100644
index 48895e0f8a846..699d9f0029c04 100644
--- chrome/browser/printing/print_view_manager_base.h
+++ chrome/browser/printing/print_view_manager_base.h
@@ -160,9 +160,6 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
@@ -184,9 +184,6 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
// Manages the low-level talk to the printer.
scoped_refptr<PrintJob> print_job_;
@@ -136,7 +136,7 @@ index f6098966f5b34..da78289b66155 100644
}
diff --git chrome/browser/ui/webui/print_preview/print_preview_ui.cc chrome/browser/ui/webui/print_preview/print_preview_ui.cc
index 8574017c74653..0ca94f8d1da47 100644
index 70a13e9c0c5e4..1eb0e9c8faa62 100644
--- chrome/browser/ui/webui/print_preview/print_preview_ui.cc
+++ chrome/browser/ui/webui/print_preview/print_preview_ui.cc
@@ -22,6 +22,7 @@
@@ -161,7 +161,7 @@ index 8574017c74653..0ca94f8d1da47 100644
constexpr char kInvalidArgsForDidStartPreview[] =
"Invalid arguments for DidStartPreview";
constexpr char kInvalidPageNumberForDidPreviewPage[] =
@@ -330,7 +338,7 @@ void AddPrintPreviewStrings(content::WebUIDataSource* source) {
@@ -326,7 +334,7 @@ void AddPrintPreviewStrings(content::WebUIDataSource* source) {
source->AddLocalizedStrings(kLocalizedStrings);
#if !BUILDFLAG(IS_CHROMEOS)