mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

chore: bump chromium to 120.0.6099.0 (main) (#40316)

Browse source 
* chore: bump chromium in DEPS to 120.0.6086.0

* chore: update patches

* chore: rename FrameSubscriber::OnNewCropVersion()

Xref: 4905819

just a simple renaming

* chore: rename ToJsTime() to .InMillisecondsFSinceUnixEpoch()

Xref: 4956111

function renamed upstream

* chore: rename ToDoubleT() to .InSecondsFSinceUnixEpoch()

Xref: 4956111

function renamed upstream

* chore: rename FromDoubleT() to .FromSecondsSinceUnixEpoch()

Xref: 4956111

function renamed upstream

* chore: bump chromium in DEPS to 120.0.6088.2

* chore: update patches

* chore: regen filenames.libcxx.gni

* chore: migrate from (removed upstream) inputFormType to formControlType

* chore: bump chromium in DEPS to 120.0.6089.0

* chore: update allow_disabling_blink_scheduler_throttling_per_renderview.patch

Xref: 4828507

manually sync to upstream changes + reduce diff size

* chore: update patches

* chore: bump chromium in DEPS to 120.0.6090.0

* chore: update fix_disabling_background_throttling_in_compositor.patch

no manual changes; patch applied with fuzz 2 (4 lines)

Xref: 4944206

* chore: update fix_handle_no_top_level_aura_window_in_webcontentsimpl.patch

Xref: 4946653

do not patch WebContentsImpl::SetWindowShowState() any longer because it has been removed

* chore: update patches

* chore: bump chromium in DEPS to 120.0.6091.0

* chore: update patches

* chore: bump chromium in DEPS to 120.0.6093.0

* chore: bump chromium in DEPS to 120.0.6095.0

* chore: bump chromium in DEPS to 120.0.6096.0

* chore: bump chromium in DEPS to 120.0.6097.0

* chore: update patches

* chore: update patch after rebase

* 4961495: [document pip] Focus the window when opened manually

4961495

* [Extensions UserScripts] Store extensions with user scripts in tracker

 | 4950530

* chore: bump chromium in DEPS to 120.0.6099.0

* chore: update patches

* chore: update filenames.libcxx.gni

* chore: remove trailing space

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
This commit is contained in:
electron-roller[bot] 2023-11-01 10:02:12 -04:00 • committed by GitHub
parent 83892ab995
commit bc1ba1fe9d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
87 changed files with 611 additions and 424 deletions
Download patch file Download diff file Expand all files Collapse all files

97
patches/chromium/printing.patch
View file

@ -11,10 +11,10 @@ majority of changes originally come from these PRs:
This patch also fixes callback for manual user cancellation and success.
diff --git a/BUILD.gn b/BUILD.gn
index 30a9ed4f5f80cf11f8e8f062af0877758d7d8c2c..fc32380fdcbdc35542a4cfad2720fcfb4050cede 100644
index ad4b830fa0932340b7c6b45d94ebf49afb4b7f73..4acc0a5befd0da25460de37eef7c4aabfd291659 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -970,7 +970,6 @@ if (is_win) {
@@ -964,7 +964,6 @@ if (is_win) {
"//media:media_unittests",
"//media/midi:midi_unittests",
"//net:net_unittests",
@ -22,7 +22,7 @@ index 30a9ed4f5f80cf11f8e8f062af0877758d7d8c2c..fc32380fdcbdc35542a4cfad2720fcfb
"//sql:sql_unittests",
"//third_party/breakpad:symupload($host_toolchain)",
"//ui/base:ui_base_unittests",
@@ -979,6 +978,10 @@ if (is_win) {
@@ -973,6 +972,10 @@ if (is_win) {
"//ui/views:views_unittests",
"//url:url_unittests",
]
@ -91,7 +91,7 @@ index 57c9c4408946066cd89304d50798a3719c8012d5..1c44d16c792a497623333ee4cb89005e
: PdfRenderSettings::Mode::POSTSCRIPT_LEVEL3;
}
diff --git a/chrome/browser/printing/print_view_manager_base.cc b/chrome/browser/printing/print_view_manager_base.cc
index e0d145c82410fd17f5ff478d3839f51ec56b7b6e..5ce7e0a1605d17bbaf6016ddce99a35736baf8c8 100644
index 5c39228c38530a7a631f94a6de3d2f607162650b..442a6f841e1e234413888c0b64d34b0828030494 100644
--- a/chrome/browser/printing/print_view_manager_base.cc
+++ b/chrome/browser/printing/print_view_manager_base.cc
@@ -22,7 +22,9 @@
@ -209,7 +209,7 @@ index e0d145c82410fd17f5ff478d3839f51ec56b7b6e..5ce7e0a1605d17bbaf6016ddce99a357
return true;
}
@@ -339,12 +370,13 @@ void PrintViewManagerBase::OnDidUpdatePrintableArea(
@@ -338,12 +369,13 @@ void PrintViewManagerBase::OnDidUpdatePrintableArea(
}
PRINTER_LOG(EVENT) << "Paper printable area updated for vendor id "
<< print_settings->requested_media().vendor_id;
@ -224,7 +224,7 @@ index e0d145c82410fd17f5ff478d3839f51ec56b7b6e..5ce7e0a1605d17bbaf6016ddce99a357
base::Value::Dict job_settings,
std::unique_ptr<PrintSettings> print_settings,
UpdatePrintSettingsCallback callback) {
@@ -352,7 +384,8 @@ void PrintViewManagerBase::CompleteUpdatePrintSettings(
@@ -351,7 +383,8 @@ void PrintViewManagerBase::CompleteUpdatePrintSettings(
settings->pages = GetPageRangesFromJobSettings(job_settings);
settings->params = mojom::PrintParams::New();
RenderParamsFromPrintSettings(*print_settings, settings->params.get());
@ -234,7 +234,7 @@ index e0d145c82410fd17f5ff478d3839f51ec56b7b6e..5ce7e0a1605d17bbaf6016ddce99a357
if (!PrintMsgPrintParamsIsValid(*settings->params)) {
mojom::PrinterType printer_type = static_cast<mojom::PrinterType>(
*job_settings.FindInt(kSettingPrinterType));
@@ -364,6 +397,10 @@ void PrintViewManagerBase::CompleteUpdatePrintSettings(
@@ -363,6 +396,10 @@ void PrintViewManagerBase::CompleteUpdatePrintSettings(
return;
}
@ -245,7 +245,7 @@ index e0d145c82410fd17f5ff478d3839f51ec56b7b6e..5ce7e0a1605d17bbaf6016ddce99a357
set_cookie(settings->params->document_cookie);
std::move(callback).Run(std::move(settings));
}
@@ -499,7 +536,8 @@ void PrintViewManagerBase::GetDefaultPrintSettingsReply(
@@ -497,7 +534,8 @@ void PrintViewManagerBase::GetDefaultPrintSettingsReply(
void PrintViewManagerBase::ScriptedPrintReply(
ScriptedPrintCallback callback,
int process_id,
@ -255,7 +255,7 @@ index e0d145c82410fd17f5ff478d3839f51ec56b7b6e..5ce7e0a1605d17bbaf6016ddce99a357
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
#if BUILDFLAG(ENABLE_OOP_PRINTING)
@@ -514,12 +552,15 @@ void PrintViewManagerBase::ScriptedPrintReply(
@@ -512,12 +550,15 @@ void PrintViewManagerBase::ScriptedPrintReply(
return;
}
@ -273,7 +273,7 @@ index e0d145c82410fd17f5ff478d3839f51ec56b7b6e..5ce7e0a1605d17bbaf6016ddce99a357
}
}
@@ -647,10 +688,12 @@ void PrintViewManagerBase::DidPrintDocument(
@@ -645,10 +686,12 @@ void PrintViewManagerBase::DidPrintDocument(
void PrintViewManagerBase::GetDefaultPrintSettings(
GetDefaultPrintSettingsCallback callback) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@ -284,9 +284,9 @@ index e0d145c82410fd17f5ff478d3839f51ec56b7b6e..5ce7e0a1605d17bbaf6016ddce99a357
}
+#endif
#if BUILDFLAG(ENABLE_OOP_PRINTING)
if (printing::features::kEnableOopPrintDriversJobPrint.Get() &&
if (features::ShouldPrintJobOop() &&
#if BUILDFLAG(ENABLE_PRINT_CONTENT_ANALYSIS)
@@ -702,10 +745,12 @@ void PrintViewManagerBase::UpdatePrintSettings(
@@ -700,10 +743,12 @@ void PrintViewManagerBase::UpdatePrintSettings(
base::Value::Dict job_settings,
UpdatePrintSettingsCallback callback) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@ -299,7 +299,7 @@ index e0d145c82410fd17f5ff478d3839f51ec56b7b6e..5ce7e0a1605d17bbaf6016ddce99a357
absl::optional<int> printer_type_value =
job_settings.FindInt(kSettingPrinterType);
@@ -716,6 +761,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
@@ -714,6 +759,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
mojom::PrinterType printer_type =
static_cast<mojom::PrinterType>(*printer_type_value);
@ -307,7 +307,7 @@ index e0d145c82410fd17f5ff478d3839f51ec56b7b6e..5ce7e0a1605d17bbaf6016ddce99a357
if (printer_type != mojom::PrinterType::kExtension &&
printer_type != mojom::PrinterType::kPdf &&
printer_type != mojom::PrinterType::kLocal) {
@@ -735,6 +781,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
@@ -733,6 +779,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
if (value > 0)
job_settings.Set(kSettingRasterizePdfDpi, value);
}
@ -315,7 +315,7 @@ index e0d145c82410fd17f5ff478d3839f51ec56b7b6e..5ce7e0a1605d17bbaf6016ddce99a357
std::unique_ptr<PrintSettings> print_settings =
PrintSettingsFromJobSettings(job_settings);
@@ -754,7 +801,21 @@ void PrintViewManagerBase::UpdatePrintSettings(
@@ -752,7 +799,21 @@ void PrintViewManagerBase::UpdatePrintSettings(
}
}
@ -338,7 +338,7 @@ index e0d145c82410fd17f5ff478d3839f51ec56b7b6e..5ce7e0a1605d17bbaf6016ddce99a357
// TODO(crbug.com/1424368): Remove this if the printable areas can be made
// fully available from `PrintBackend::GetPrinterSemanticCapsAndDefaults()`
// for in-browser queries.
@@ -776,8 +837,6 @@ void PrintViewManagerBase::UpdatePrintSettings(
@@ -774,8 +835,6 @@ void PrintViewManagerBase::UpdatePrintSettings(
}
#endif
@ -347,7 +347,7 @@ index e0d145c82410fd17f5ff478d3839f51ec56b7b6e..5ce7e0a1605d17bbaf6016ddce99a357
}
void PrintViewManagerBase::SetAccessibilityTree(
@@ -793,7 +852,7 @@ void PrintViewManagerBase::SetAccessibilityTree(
@@ -791,7 +850,7 @@ void PrintViewManagerBase::SetAccessibilityTree(
void PrintViewManagerBase::IsPrintingEnabled(
IsPrintingEnabledCallback callback) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@ -356,7 +356,7 @@ index e0d145c82410fd17f5ff478d3839f51ec56b7b6e..5ce7e0a1605d17bbaf6016ddce99a357
}
void PrintViewManagerBase::ScriptedPrint(mojom::ScriptedPrintParamsPtr params,
@@ -809,14 +868,14 @@ void PrintViewManagerBase::ScriptedPrint(mojom::ScriptedPrintParamsPtr params,
@@ -807,13 +866,13 @@ void PrintViewManagerBase::ScriptedPrint(mojom::ScriptedPrintParamsPtr params,
// didn't happen for some reason.
bad_message::ReceivedBadMessage(
render_process_host, bad_message::PVMB_SCRIPTED_PRINT_FENCED_FRAME);
@ -365,15 +365,14 @@ index e0d145c82410fd17f5ff478d3839f51ec56b7b6e..5ce7e0a1605d17bbaf6016ddce99a357
return;
}
#if BUILDFLAG(ENABLE_OOP_PRINTING)
if (printing::features::kEnableOopPrintDriversJobPrint.Get() &&
!query_with_ui_client_id_.has_value()) {
if (features::ShouldPrintJobOop() && !query_with_ui_client_id_.has_value()) {
// Renderer process has requested settings outside of the expected setup.
- std::move(callback).Run(nullptr);
+ std::move(callback).Run(nullptr, false);
return;
}
#endif
@@ -858,6 +917,7 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie,
@@ -855,6 +914,7 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie,
PrintManager::PrintingFailed(cookie, reason);
@ -381,7 +380,7 @@ index e0d145c82410fd17f5ff478d3839f51ec56b7b6e..5ce7e0a1605d17bbaf6016ddce99a357
// `PrintingFailed()` can occur because asynchronous compositing results
// don't complete until after a print job has already failed and been
// destroyed. In such cases the error notification to the user will
@@ -867,7 +927,7 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie,
@@ -864,7 +924,7 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie,
print_job_->document()->cookie() == cookie) {
ShowPrintErrorDialogForGenericError();
}
@ -390,7 +389,7 @@ index e0d145c82410fd17f5ff478d3839f51ec56b7b6e..5ce7e0a1605d17bbaf6016ddce99a357
ReleasePrinterQuery();
}
@@ -879,15 +939,24 @@ void PrintViewManagerBase::RemoveTestObserver(TestObserver& observer) {
@@ -876,15 +936,24 @@ void PrintViewManagerBase::RemoveTestObserver(TestObserver& observer) {
test_observers_.RemoveObserver(&observer);
}
@ -415,7 +414,7 @@ index e0d145c82410fd17f5ff478d3839f51ec56b7b6e..5ce7e0a1605d17bbaf6016ddce99a357
}
void PrintViewManagerBase::RenderFrameDeleted(
@@ -939,7 +1008,12 @@ void PrintViewManagerBase::OnJobDone() {
@@ -936,7 +1005,12 @@ void PrintViewManagerBase::OnJobDone() {
// Printing is done, we don't need it anymore.
// print_job_->is_job_pending() may still be true, depending on the order
// of object registration.
@ -429,7 +428,7 @@ index e0d145c82410fd17f5ff478d3839f51ec56b7b6e..5ce7e0a1605d17bbaf6016ddce99a357
ReleasePrintJob();
}
@@ -948,9 +1022,10 @@ void PrintViewManagerBase::OnCanceling() {
@@ -945,9 +1019,10 @@ void PrintViewManagerBase::OnCanceling() {
}
void PrintViewManagerBase::OnFailed() {
@ -441,7 +440,7 @@ index e0d145c82410fd17f5ff478d3839f51ec56b7b6e..5ce7e0a1605d17bbaf6016ddce99a357
TerminatePrintJob(true);
}
@@ -960,7 +1035,7 @@ bool PrintViewManagerBase::RenderAllMissingPagesNow() {
@@ -957,7 +1032,7 @@ bool PrintViewManagerBase::RenderAllMissingPagesNow() {
// Is the document already complete?
if (print_job_->document() && print_job_->document()->IsComplete()) {
@ -450,7 +449,7 @@ index e0d145c82410fd17f5ff478d3839f51ec56b7b6e..5ce7e0a1605d17bbaf6016ddce99a357
return true;
}
@@ -1013,7 +1088,10 @@ bool PrintViewManagerBase::SetupNewPrintJob(
@@ -1010,7 +1085,10 @@ bool PrintViewManagerBase::SetupNewPrintJob(
// Disconnect the current `print_job_`.
auto weak_this = weak_ptr_factory_.GetWeakPtr();
@ -462,7 +461,7 @@ index e0d145c82410fd17f5ff478d3839f51ec56b7b6e..5ce7e0a1605d17bbaf6016ddce99a357
if (!weak_this)
return false;
@@ -1033,7 +1111,7 @@ bool PrintViewManagerBase::SetupNewPrintJob(
@@ -1030,7 +1108,7 @@ bool PrintViewManagerBase::SetupNewPrintJob(
#endif
print_job_->AddObserver(*this);
@ -471,7 +470,7 @@ index e0d145c82410fd17f5ff478d3839f51ec56b7b6e..5ce7e0a1605d17bbaf6016ddce99a357
return true;
}
@@ -1101,6 +1179,11 @@ void PrintViewManagerBase::ReleasePrintJob() {
@@ -1098,6 +1176,11 @@ void PrintViewManagerBase::ReleasePrintJob() {
}
#endif
@ -483,7 +482,7 @@ index e0d145c82410fd17f5ff478d3839f51ec56b7b6e..5ce7e0a1605d17bbaf6016ddce99a357
if (!print_job_)
return;
@@ -1108,7 +1191,7 @@ void PrintViewManagerBase::ReleasePrintJob() {
@@ -1105,7 +1188,7 @@ void PrintViewManagerBase::ReleasePrintJob() {
// printing_rfh_ should only ever point to a RenderFrameHost with a live
// RenderFrame.
DCHECK(rfh->IsRenderFrameLive());
@ -492,7 +491,7 @@ index e0d145c82410fd17f5ff478d3839f51ec56b7b6e..5ce7e0a1605d17bbaf6016ddce99a357
}
print_job_->RemoveObserver(*this);
@@ -1150,7 +1233,7 @@ bool PrintViewManagerBase::RunInnerMessageLoop() {
@@ -1147,7 +1230,7 @@ bool PrintViewManagerBase::RunInnerMessageLoop() {
}
bool PrintViewManagerBase::OpportunisticallyCreatePrintJob(int cookie) {
@ -501,7 +500,7 @@ index e0d145c82410fd17f5ff478d3839f51ec56b7b6e..5ce7e0a1605d17bbaf6016ddce99a357
return true;
if (!cookie) {
@@ -1296,7 +1379,7 @@ void PrintViewManagerBase::ReleasePrinterQuery() {
@@ -1293,7 +1376,7 @@ void PrintViewManagerBase::ReleasePrinterQuery() {
}
void PrintViewManagerBase::CompletePrintNow(content::RenderFrameHost* rfh) {
@ -510,7 +509,7 @@ index e0d145c82410fd17f5ff478d3839f51ec56b7b6e..5ce7e0a1605d17bbaf6016ddce99a357
for (auto& observer : GetTestObservers()) {
observer.OnPrintNow(rfh);
@@ -1346,7 +1429,7 @@ void PrintViewManagerBase::CompleteScriptedPrintAfterContentAnalysis(
@@ -1343,7 +1426,7 @@ void PrintViewManagerBase::CompleteScriptedPrintAfterContentAnalysis(
set_analyzing_content(/*analyzing=*/false);
if (!allowed || !printing_rfh_ || IsCrashed() ||
!printing_rfh_->IsRenderFrameLive()) {
@ -602,10 +601,10 @@ index ae2339d1ab82bd7cfa971ed03a188cfc26d6e1c0..186414ee72c6b431b87b02623abd4d19
// Indication that the job is getting canceled.
bool canceling_job_ = false;
diff --git a/chrome/browser/printing/printer_query.cc b/chrome/browser/printing/printer_query.cc
index e175525a9626624bca06f1ac2b5babd75a8fd833..cbf981c3fc3b7fe8022312d44e054b70d3f5e43b 100644
index 9fefdc150acf87774ca2a20301349f83de575944..13d6af57890b99192f4d3751ac47f2680cbe6266 100644
--- a/chrome/browser/printing/printer_query.cc
+++ b/chrome/browser/printing/printer_query.cc
@@ -353,17 +353,19 @@ void PrinterQuery::UpdatePrintSettings(base::Value::Dict new_settings,
@@ -354,17 +354,19 @@ void PrinterQuery::UpdatePrintSettings(base::Value::Dict new_settings,
#endif // BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_CUPS)
}
@ -706,7 +705,7 @@ index 3f9a514fb41d72c5d06de6ac989f9d7c0513a4e7..0e7ada9df962808dad7caf074a08ebde
// Tells the browser printing failed.
PrintingFailed(int32 cookie, PrintFailureReason reason);
diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc
index ab80b6840e97c112db0fab65e4d0d3fa61f186dd..9524b79c3a9b770312a064e5c25fa0a0d95cd1ed 100644
index 6000a308a23627e87afd9d979f8cb732a0db71bc..dfa51e2d8d31b34a605ac8dbfcb911b81d70da14 100644
--- a/components/printing/renderer/print_render_frame_helper.cc
+++ b/components/printing/renderer/print_render_frame_helper.cc
@@ -47,6 +47,7 @@
@ -717,7 +716,7 @@ index ab80b6840e97c112db0fab65e4d0d3fa61f186dd..9524b79c3a9b770312a064e5c25fa0a0
#include "printing/units.h"
#include "services/metrics/public/cpp/ukm_source_id.h"
#include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
@@ -1215,14 +1216,14 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) {
@@ -1217,14 +1218,14 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) {
}
print_in_progress_ = true;
@ -734,7 +733,7 @@ index ab80b6840e97c112db0fab65e4d0d3fa61f186dd..9524b79c3a9b770312a064e5c25fa0a0
if (!weak_this) {
return;
}
@@ -1253,7 +1254,7 @@ void PrintRenderFrameHelper::BindPrintRenderFrameReceiver(
@@ -1255,7 +1256,7 @@ void PrintRenderFrameHelper::BindPrintRenderFrameReceiver(
receivers_.Add(this, std::move(receiver));
}
@ -743,7 +742,7 @@ index ab80b6840e97c112db0fab65e4d0d3fa61f186dd..9524b79c3a9b770312a064e5c25fa0a0
ScopedIPC scoped_ipc(weak_ptr_factory_.GetWeakPtr());
if (ipc_nesting_level_ > kAllowedIpcDepthForPrint)
return;
@@ -1268,7 +1269,7 @@ void PrintRenderFrameHelper::PrintRequestedPages() {
@@ -1270,7 +1271,7 @@ void PrintRenderFrameHelper::PrintRequestedPages() {
// plugin node and print that instead.
auto plugin = delegate_->GetPdfElement(frame);
@ -752,7 +751,7 @@ index ab80b6840e97c112db0fab65e4d0d3fa61f186dd..9524b79c3a9b770312a064e5c25fa0a0
if (render_frame_gone_) {
return;
@@ -1357,7 +1358,8 @@ void PrintRenderFrameHelper::PrintForSystemDialog() {
@@ -1359,7 +1360,8 @@ void PrintRenderFrameHelper::PrintForSystemDialog() {
}
Print(frame, print_preview_context_.source_node(),
@ -762,7 +761,7 @@ index ab80b6840e97c112db0fab65e4d0d3fa61f186dd..9524b79c3a9b770312a064e5c25fa0a0
if (render_frame_gone_) {
return;
}
@@ -1420,6 +1422,8 @@ void PrintRenderFrameHelper::PrintPreview(base::Value::Dict settings) {
@@ -1422,6 +1424,8 @@ void PrintRenderFrameHelper::PrintPreview(base::Value::Dict settings) {
if (ipc_nesting_level_ > kAllowedIpcDepthForPrint)
return;
@ -771,7 +770,7 @@ index ab80b6840e97c112db0fab65e4d0d3fa61f186dd..9524b79c3a9b770312a064e5c25fa0a0
print_preview_context_.OnPrintPreview();
#if BUILDFLAG(IS_CHROMEOS_ASH)
@@ -2044,7 +2048,8 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
@@ -2046,7 +2050,8 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
}
Print(duplicate_node.GetDocument().GetFrame(), duplicate_node,
@ -781,7 +780,7 @@ index ab80b6840e97c112db0fab65e4d0d3fa61f186dd..9524b79c3a9b770312a064e5c25fa0a0
// Check if `this` is still valid.
if (!weak_this) {
return;
@@ -2060,17 +2065,19 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
@@ -2062,17 +2067,19 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
const blink::WebNode& node,
@ -804,7 +803,7 @@ index ab80b6840e97c112db0fab65e4d0d3fa61f186dd..9524b79c3a9b770312a064e5c25fa0a0
DidFinishPrinting(PrintingResult::kFailPrintInit);
return;
}
@@ -2091,8 +2098,15 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
@@ -2093,8 +2100,15 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
print_pages_params_->params->print_scaling_option;
auto self = weak_ptr_factory_.GetWeakPtr();
@ -821,7 +820,7 @@ index ab80b6840e97c112db0fab65e4d0d3fa61f186dd..9524b79c3a9b770312a064e5c25fa0a0
// Check if `this` is still valid.
if (!self)
return;
@@ -2331,25 +2345,33 @@ void PrintRenderFrameHelper::IPCProcessed() {
@@ -2333,25 +2347,33 @@ void PrintRenderFrameHelper::IPCProcessed() {
}
bool PrintRenderFrameHelper::InitPrintSettings(blink::WebLocalFrame* frame,
@ -861,7 +860,7 @@ index ab80b6840e97c112db0fab65e4d0d3fa61f186dd..9524b79c3a9b770312a064e5c25fa0a0
return true;
}
@@ -2456,7 +2478,7 @@ mojom::PrintPagesParamsPtr PrintRenderFrameHelper::GetPrintSettingsFromUser(
@@ -2458,7 +2480,7 @@ mojom::PrintPagesParamsPtr PrintRenderFrameHelper::GetPrintSettingsFromUser(
std::move(params),
base::BindOnce(
[](base::OnceClosure quit_closure, mojom::PrintPagesParamsPtr* output,
@ -905,10 +904,10 @@ index c68b68767ac52602981278ec655d9ccfad0c30ab..df2ea4524584417d859e1a22ec8a49c8
// Calculate number of pages in source document.
uint32_t CalculateNumberOfPages(blink::WebLocalFrame* frame,
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index c5d07621fec40caf66bfefb3357b7ff2333b5dfb..961aa78f3d158ec3745d1cad215cd547b1b415f4 100644
index 3b4f0f00e2e214b9615a07acfc02c9baf4a2a7ab..7ad4e9e5166265651ef50e3ee5488595ab97bc06 100644
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -2983,8 +2983,9 @@ source_set("browser") {
@@ -2994,8 +2994,9 @@ source_set("browser") {
"//ppapi/shared_impl",
]
@ -957,7 +956,7 @@ index c753f04d8b73a51cb7e05dcdb86afc0e981e7a71..7ec1729e08bf42a51f80885b3838eee9
bool skip_system_calls() const {
#if BUILDFLAG(ENABLE_OOP_PRINTING)
diff --git a/sandbox/policy/mac/sandbox_mac.mm b/sandbox/policy/mac/sandbox_mac.mm
index 10096f5a3824c71e6cb13b86ef7bdd02488f76c8..f7de11c89efed78f0280ada29f55f3bbd119ee88 100644
index 2dd2b99216e6ebc1e326b9ff61ea2254ea7df4e9..3cc24bed974ba52a12272bc856d085cc890859c0 100644
--- a/sandbox/policy/mac/sandbox_mac.mm
+++ b/sandbox/policy/mac/sandbox_mac.mm
@@ -37,6 +37,10 @@