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

chore: bump chromium to 113.0.5660.0 (main) (#37612)

Browse source 
* chore: bump chromium in DEPS to 113.0.5657.0

* chore: bump chromium in DEPS to 113.0.5660.0

* chore: update patches

printing.patch
4347664
4347664
4338810
4339496

mas_disable_remote_layer.patch
4334544
4335299

* Add API to verify `TOP_LEVEL_STORAGE_ACCESS` permission status

4306712

* Move os_crypt into a sync/ subdirectory.

4336304

* chore: generate libc++ headers

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
This commit is contained in:
electron-roller[bot] 2023-03-20 07:06:57 -04:00 • committed by GitHub
parent 9611b641c9
commit 5261e08d0c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
64 changed files with 391 additions and 377 deletions
Download patch file Download diff file Expand all files Collapse all files

244
patches/chromium/printing.patch
View file

@ -78,10 +78,10 @@ index 044b34d3738985f3e38476c37a189a5c06ed5353..8cf9832ca1ba864860bccb9b8cb4180d
: 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 138d3e393154b186c5b30c3914f3e21d452d20b9..f7ed9d9a14d802c4e656cd19fdd89c3ab7a577db 100644
index 58a8f21df0925d8f9b0e7effce83aab1c031d45e..93eaad3275257228ad1c20b3408bb21e014f3e9b 100644
--- a/chrome/browser/printing/print_view_manager_base.cc
+++ b/chrome/browser/printing/print_view_manager_base.cc
@@ -22,7 +22,9 @@
@@ -23,7 +23,9 @@
#include "chrome/browser/bad_message.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chrome_notification_types.h"
@ -91,7 +91,7 @@ index 138d3e393154b186c5b30c3914f3e21d452d20b9..f7ed9d9a14d802c4e656cd19fdd89c3a
#include "chrome/browser/printing/print_job.h"
#include "chrome/browser/printing/print_job_manager.h"
#include "chrome/browser/printing/print_view_manager_common.h"
@@ -77,6 +79,17 @@ namespace printing {
@@ -79,6 +81,17 @@ namespace printing {
namespace {
@ -109,38 +109,56 @@ index 138d3e393154b186c5b30c3914f3e21d452d20b9..f7ed9d9a14d802c4e656cd19fdd89c3a
using PrintSettingsCallback =
base::OnceCallback<void(std::unique_ptr<PrinterQuery>)>;
@@ -87,15 +100,18 @@ void OnDidGetDefaultPrintSettings(
mojom::PrintManagerHost::GetDefaultPrintSettingsCallback callback) {
@@ -90,9 +103,11 @@ void OnDidGetDefaultPrintSettings(
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
mojom::PrintParamsPtr params = mojom::PrintParams::New();
- if (printer_query &&
- printer_query->last_status() == mojom::ResultCode::kSuccess) {
+ // We call update without first printing from defaults,
+ // so the last printer status will still be defaulted to PrintingContext::FAILED
+ if (printer_query) {
RenderParamsFromPrintSettings(printer_query->settings(), params.get());
params->document_cookie = printer_query->cookie();
}
if (printer_query->last_status() != mojom::ResultCode::kSuccess) {
+#if 0 // Electron does not use Chrome error dialogs
if (!want_pdf_settings && !PrintMsgPrintParamsIsValid(*params)) {
ShowPrintErrorDialogForInvalidPrinterError();
}
if (!want_pdf_settings) {
ShowPrintErrorDialogForInvalidPrinterError();
}
+#endif
std::move(callback).Run(std::move(params));
@@ -165,7 +181,8 @@ void OnDidScriptedPrint(
std::move(callback).Run(nullptr);
return;
}
bool has_valid_cookie = params->params->document_cookie;
bool has_dpi = !params->params->dpi.IsEmpty();
@@ -102,9 +117,11 @@ void OnDidGetDefaultPrintSettings(
params->document_cookie = printer_query->cookie();
if (!PrintMsgPrintParamsIsValid(*params)) {
+#if 0 // Electron does not use Chrome error dialogs
if (!want_pdf_settings) {
ShowPrintErrorDialogForInvalidPrinterError();
}
+#endif
std::move(callback).Run(nullptr);
return;
}
@@ -121,7 +138,7 @@ void OnDidScriptedPrint(
if (printer_query->last_status() != mojom::ResultCode::kSuccess ||
!printer_query->settings().dpi()) {
- std::move(callback).Run(nullptr);
+ std::move(callback).Run(nullptr, false);
return;
}
@@ -131,12 +148,13 @@ void OnDidScriptedPrint(
params->params.get());
params->params->document_cookie = printer_query->cookie();
if (!PrintMsgPrintParamsIsValid(*params->params)) {
- std::move(callback).Run(nullptr);
+ std::move(callback).Run(nullptr, false);
return;
}
params->pages = printer_query->settings().ranges();
- std::move(callback).Run(std::move(params));
+ bool canceled = printer_query->last_status() == mojom::ResultCode::kCanceled;
+ std::move(callback).Run(std::move(params), canceled);
queue->QueuePrinterQuery(std::move(printer_query));
}
if (has_dpi && has_valid_cookie) {
queue->QueuePrinterQuery(std::move(printer_query));
@@ -178,9 +195,11 @@ PrintViewManagerBase::PrintViewManagerBase(content::WebContents* web_contents)
@@ -173,9 +191,11 @@ PrintViewManagerBase::PrintViewManagerBase(content::WebContents* web_contents)
: PrintManager(web_contents),
queue_(g_browser_process->print_job_manager()->queue()) {
DCHECK(queue_);
@ -153,7 +171,7 @@ index 138d3e393154b186c5b30c3914f3e21d452d20b9..f7ed9d9a14d802c4e656cd19fdd89c3a
}
PrintViewManagerBase::~PrintViewManagerBase() {
@@ -188,7 +207,10 @@ PrintViewManagerBase::~PrintViewManagerBase() {
@@ -183,7 +203,10 @@ PrintViewManagerBase::~PrintViewManagerBase() {
DisconnectFromCurrentPrintJob();
}
@ -165,7 +183,7 @@ index 138d3e393154b186c5b30c3914f3e21d452d20b9..f7ed9d9a14d802c4e656cd19fdd89c3a
// Remember the ID for `rfh`, to enable checking that the `RenderFrameHost`
// is still valid after a possible inner message loop runs in
// `DisconnectFromCurrentPrintJob()`.
@@ -216,7 +238,12 @@ bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh) {
@@ -211,7 +234,12 @@ bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh) {
#endif
SetPrintingRFH(rfh);
@ -178,7 +196,7 @@ index 138d3e393154b186c5b30c3914f3e21d452d20b9..f7ed9d9a14d802c4e656cd19fdd89c3a
return true;
}
@@ -388,7 +415,8 @@ void PrintViewManagerBase::GetDefaultPrintSettingsReply(
@@ -377,7 +405,8 @@ void PrintViewManagerBase::GetDefaultPrintSettingsReply(
void PrintViewManagerBase::ScriptedPrintReply(
ScriptedPrintCallback callback,
int process_id,
@ -188,64 +206,54 @@ index 138d3e393154b186c5b30c3914f3e21d452d20b9..f7ed9d9a14d802c4e656cd19fdd89c3a
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
#if BUILDFLAG(ENABLE_OOP_PRINTING)
@@ -414,8 +442,11 @@ void PrintViewManagerBase::ScriptedPrintReply(
@@ -404,12 +433,15 @@ void PrintViewManagerBase::ScriptedPrintReply(
return;
}
+ if (canceled)
+ UserInitCanceled();
+
set_cookie(params->params->document_cookie);
- std::move(callback).Run(std::move(params));
+ std::move(callback).Run(std::move(params), canceled);
if (params) {
set_cookie(params->params->document_cookie);
- std::move(callback).Run(std::move(params));
+ std::move(callback).Run(std::move(params), canceled);
} else {
set_cookie(0);
- std::move(callback).Run(nullptr);
+ std::move(callback).Run(nullptr, false);
}
}
void PrintViewManagerBase::NavigationStopped() {
@@ -550,11 +581,13 @@ void PrintViewManagerBase::DidPrintDocument(
@@ -545,10 +577,12 @@ void PrintViewManagerBase::DidPrintDocument(
void PrintViewManagerBase::GetDefaultPrintSettings(
GetDefaultPrintSettingsCallback callback) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+#if 0 // Printing is always enabled.
if (!printing_enabled_.GetValue()) {
GetDefaultPrintSettingsReply(std::move(callback),
mojom::PrintParams::New());
GetDefaultPrintSettingsReply(std::move(callback), nullptr);
return;
}
+#endif
#if BUILDFLAG(ENABLE_OOP_PRINTING)
if (printing::features::kEnableOopPrintDriversJobPrint.Get() &&
#if BUILDFLAG(ENABLE_PRINT_CONTENT_ANALYSIS)
@@ -602,11 +635,13 @@ void PrintViewManagerBase::UpdatePrintSettings(
@@ -595,6 +629,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
base::Value::Dict job_settings,
UpdatePrintSettingsCallback callback) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+#if 0 // Printing is always enabled.
if (!printing_enabled_.GetValue()) {
UpdatePrintSettingsReply(std::move(callback),
CreateEmptyPrintPagesParamsPtr(), false);
std::move(callback).Run(nullptr);
return;
}
+#endif
if (!job_settings.FindInt(kSettingPrinterType)) {
UpdatePrintSettingsReply(std::move(callback),
@@ -614,6 +649,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
return;
}
+#if 0
content::BrowserContext* context =
web_contents() ? web_contents()->GetBrowserContext() : nullptr;
PrefService* prefs =
@@ -623,6 +659,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
@@ -628,6 +663,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
if (value > 0)
job_settings.Set(kSettingRasterizePdfDpi, value);
}
+#endif
auto callback_wrapper =
base::BindOnce(&PrintViewManagerBase::UpdatePrintSettingsReply,
@@ -641,7 +678,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
std::unique_ptr<PrintSettings> print_settings =
PrintSettingsFromJobSettings(job_settings);
@@ -656,7 +692,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
void PrintViewManagerBase::IsPrintingEnabled(
IsPrintingEnabledCallback callback) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@ -254,24 +262,24 @@ index 138d3e393154b186c5b30c3914f3e21d452d20b9..f7ed9d9a14d802c4e656cd19fdd89c3a
}
void PrintViewManagerBase::ScriptedPrint(mojom::ScriptedPrintParamsPtr params,
@@ -657,14 +694,14 @@ void PrintViewManagerBase::ScriptedPrint(mojom::ScriptedPrintParamsPtr params,
@@ -672,14 +708,14 @@ 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);
- std::move(callback).Run(CreateEmptyPrintPagesParamsPtr());
+ std::move(callback).Run(CreateEmptyPrintPagesParamsPtr(), false);
- std::move(callback).Run(nullptr);
+ std::move(callback).Run(nullptr, false);
return;
}
#if BUILDFLAG(ENABLE_OOP_PRINTING)
if (printing::features::kEnableOopPrintDriversJobPrint.Get() &&
!query_with_ui_client_id_.has_value()) {
// Renderer process has requested settings outside of the expected setup.
- std::move(callback).Run(CreateEmptyPrintPagesParamsPtr());
+ std::move(callback).Run(CreateEmptyPrintPagesParamsPtr(), false);
- std::move(callback).Run(nullptr);
+ std::move(callback).Run(nullptr, false);
return;
}
#endif
@@ -702,6 +739,7 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie,
@@ -717,6 +753,7 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie,
PrintManager::PrintingFailed(cookie, reason);
@ -279,7 +287,7 @@ index 138d3e393154b186c5b30c3914f3e21d452d20b9..f7ed9d9a14d802c4e656cd19fdd89c3a
// `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
@@ -711,7 +749,7 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie,
@@ -726,7 +763,7 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie,
print_job_->document()->cookie() == cookie) {
ShowPrintErrorDialogForGenericError();
}
@ -288,7 +296,7 @@ index 138d3e393154b186c5b30c3914f3e21d452d20b9..f7ed9d9a14d802c4e656cd19fdd89c3a
ReleasePrinterQuery();
}
@@ -723,15 +761,24 @@ void PrintViewManagerBase::RemoveObserver(Observer& observer) {
@@ -738,15 +775,24 @@ void PrintViewManagerBase::RemoveObserver(Observer& observer) {
observers_.RemoveObserver(&observer);
}
@ -313,7 +321,7 @@ index 138d3e393154b186c5b30c3914f3e21d452d20b9..f7ed9d9a14d802c4e656cd19fdd89c3a
}
void PrintViewManagerBase::RenderFrameDeleted(
@@ -783,7 +830,12 @@ void PrintViewManagerBase::OnJobDone() {
@@ -798,7 +844,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.
@ -327,7 +335,7 @@ index 138d3e393154b186c5b30c3914f3e21d452d20b9..f7ed9d9a14d802c4e656cd19fdd89c3a
ReleasePrintJob();
}
@@ -792,9 +844,10 @@ void PrintViewManagerBase::OnCanceling() {
@@ -807,9 +858,10 @@ void PrintViewManagerBase::OnCanceling() {
}
void PrintViewManagerBase::OnFailed() {
@ -339,7 +347,7 @@ index 138d3e393154b186c5b30c3914f3e21d452d20b9..f7ed9d9a14d802c4e656cd19fdd89c3a
TerminatePrintJob(true);
}
@@ -804,7 +857,7 @@ bool PrintViewManagerBase::RenderAllMissingPagesNow() {
@@ -819,7 +871,7 @@ bool PrintViewManagerBase::RenderAllMissingPagesNow() {
// Is the document already complete?
if (print_job_->document() && print_job_->document()->IsComplete()) {
@ -348,7 +356,7 @@ index 138d3e393154b186c5b30c3914f3e21d452d20b9..f7ed9d9a14d802c4e656cd19fdd89c3a
return true;
}
@@ -852,7 +905,10 @@ bool PrintViewManagerBase::CreateNewPrintJob(
@@ -867,7 +919,10 @@ bool PrintViewManagerBase::CreateNewPrintJob(
// Disconnect the current `print_job_`.
auto weak_this = weak_ptr_factory_.GetWeakPtr();
@ -360,7 +368,7 @@ index 138d3e393154b186c5b30c3914f3e21d452d20b9..f7ed9d9a14d802c4e656cd19fdd89c3a
if (!weak_this)
return false;
@@ -873,7 +929,7 @@ bool PrintViewManagerBase::CreateNewPrintJob(
@@ -888,7 +943,7 @@ bool PrintViewManagerBase::CreateNewPrintJob(
#endif
print_job_->AddObserver(*this);
@ -369,7 +377,7 @@ index 138d3e393154b186c5b30c3914f3e21d452d20b9..f7ed9d9a14d802c4e656cd19fdd89c3a
return true;
}
@@ -935,6 +991,11 @@ void PrintViewManagerBase::ReleasePrintJob() {
@@ -950,6 +1005,11 @@ void PrintViewManagerBase::ReleasePrintJob() {
}
#endif
@ -381,7 +389,7 @@ index 138d3e393154b186c5b30c3914f3e21d452d20b9..f7ed9d9a14d802c4e656cd19fdd89c3a
if (!print_job_)
return;
@@ -942,7 +1003,7 @@ void PrintViewManagerBase::ReleasePrintJob() {
@@ -957,7 +1017,7 @@ void PrintViewManagerBase::ReleasePrintJob() {
// printing_rfh_ should only ever point to a RenderFrameHost with a live
// RenderFrame.
DCHECK(rfh->IsRenderFrameLive());
@ -390,7 +398,7 @@ index 138d3e393154b186c5b30c3914f3e21d452d20b9..f7ed9d9a14d802c4e656cd19fdd89c3a
}
print_job_->RemoveObserver(*this);
@@ -984,7 +1045,7 @@ bool PrintViewManagerBase::RunInnerMessageLoop() {
@@ -999,7 +1059,7 @@ bool PrintViewManagerBase::RunInnerMessageLoop() {
}
bool PrintViewManagerBase::OpportunisticallyCreatePrintJob(int cookie) {
@ -399,7 +407,7 @@ index 138d3e393154b186c5b30c3914f3e21d452d20b9..f7ed9d9a14d802c4e656cd19fdd89c3a
return true;
if (!cookie) {
@@ -1101,7 +1162,7 @@ void PrintViewManagerBase::ReleasePrinterQuery() {
@@ -1116,7 +1176,7 @@ void PrintViewManagerBase::ReleasePrinterQuery() {
}
void PrintViewManagerBase::CompletePrintNow(content::RenderFrameHost* rfh) {
@ -408,6 +416,15 @@ index 138d3e393154b186c5b30c3914f3e21d452d20b9..f7ed9d9a14d802c4e656cd19fdd89c3a
for (auto& observer : GetObservers())
observer.OnPrintNow(rfh);
@@ -1164,7 +1224,7 @@ void PrintViewManagerBase::CompleteScriptedPrintAfterContentAnalysis(
bool allowed) {
if (!allowed || !printing_rfh_ || IsCrashed() ||
!printing_rfh_->IsRenderFrameLive()) {
- std::move(callback).Run(nullptr);
+ std::move(callback).Run(nullptr, false);
return;
}
CompleteScriptedPrint(printing_rfh_, std::move(params), std::move(callback));
diff --git a/chrome/browser/printing/print_view_manager_base.h b/chrome/browser/printing/print_view_manager_base.h
index 52faaedf4c93fa02548355218933df45db091e3e..67fe40ff154b99fbf0e66621b91834d1fb55bda6 100644
--- a/chrome/browser/printing/print_view_manager_base.h
@ -562,10 +579,10 @@ index ca71560874a0189068dd11fbc039f5673bf6bd96..a8551d95e64da2afbc1685b2df8f1fc3
mojom::PrintFailureReason reason) override;
diff --git a/components/printing/common/print.mojom b/components/printing/common/print.mojom
index 8c6b0aee3964791ad7d73ee8bc367456280a3eec..e42e8bceb792f9fa9c0b2d32853746c7714e1bd8 100644
index c440ebb5c43d7d6bd6aa1a32aad77980644f9f3e..6a1872f69998fb7dbcef048eb580fdf908c6f8af 100644
--- a/components/printing/common/print.mojom
+++ b/components/printing/common/print.mojom
@@ -291,7 +291,7 @@ union PrintWithParamsResult {
@@ -288,7 +288,7 @@ union PrintWithParamsResult {
interface PrintRenderFrame {
// Tells the RenderFrame to switch the CSS to print media type, render every
// requested page, and then switch back the CSS to display media type.
@ -574,12 +591,12 @@ index 8c6b0aee3964791ad7d73ee8bc367456280a3eec..e42e8bceb792f9fa9c0b2d32853746c7
// Requests the frame to be printed with specified parameters. This is used
// to programmatically produce PDF by request from the browser (e.g. over
@@ -382,7 +382,10 @@ interface PrintManagerHost {
// Requests the print settings from the user. This step is about showing
// UI to the user to select the final print settings.
@@ -380,7 +380,10 @@ interface PrintManagerHost {
// UI to the user to select the final print settings. If the user cancels or
// an error occurs, return null.
[Sync]
- ScriptedPrint(ScriptedPrintParams params) => (PrintPagesParams settings);
+ ScriptedPrint(ScriptedPrintParams params) => (PrintPagesParams settings, bool canceled);
- ScriptedPrint(ScriptedPrintParams params) => (PrintPagesParams? settings);
+ ScriptedPrint(ScriptedPrintParams params) => (PrintPagesParams? settings, bool canceled);
+
+ // Tells the browser that there are invalid printer settings.
+ ShowInvalidPrinterSettingsError();
@ -587,7 +604,7 @@ index 8c6b0aee3964791ad7d73ee8bc367456280a3eec..e42e8bceb792f9fa9c0b2d32853746c7
// 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 37ee29375fae6bd1fe2811a157bdb0e6d836c5f0..d561a2c507e77f234b4013764c0bf3ac38d32dce 100644
index 7e7acaa2b35a931ba1c52191a816dd5b93c98b11..a7f5581bc26354014a73544ad8a7997464b4061c 100644
--- a/components/printing/renderer/print_render_frame_helper.cc
+++ b/components/printing/renderer/print_render_frame_helper.cc
@@ -45,6 +45,7 @@
@ -598,7 +615,7 @@ index 37ee29375fae6bd1fe2811a157bdb0e6d836c5f0..d561a2c507e77f234b4013764c0bf3ac
#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"
@@ -1335,7 +1336,8 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) {
@@ -1314,7 +1315,8 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) {
if (!weak_this)
return;
@ -608,7 +625,7 @@ index 37ee29375fae6bd1fe2811a157bdb0e6d836c5f0..d561a2c507e77f234b4013764c0bf3ac
if (!weak_this)
return;
@@ -1366,7 +1368,7 @@ void PrintRenderFrameHelper::BindPrintRenderFrameReceiver(
@@ -1345,7 +1347,7 @@ void PrintRenderFrameHelper::BindPrintRenderFrameReceiver(
receivers_.Add(this, std::move(receiver));
}
@ -617,7 +634,7 @@ index 37ee29375fae6bd1fe2811a157bdb0e6d836c5f0..d561a2c507e77f234b4013764c0bf3ac
ScopedIPC scoped_ipc(weak_ptr_factory_.GetWeakPtr());
if (ipc_nesting_level_ > kAllowedIpcDepthForPrint)
return;
@@ -1381,7 +1383,7 @@ void PrintRenderFrameHelper::PrintRequestedPages() {
@@ -1360,7 +1362,7 @@ void PrintRenderFrameHelper::PrintRequestedPages() {
// plugin node and print that instead.
auto plugin = delegate_->GetPdfElement(frame);
@ -626,7 +643,7 @@ index 37ee29375fae6bd1fe2811a157bdb0e6d836c5f0..d561a2c507e77f234b4013764c0bf3ac
if (!render_frame_gone_)
frame->DispatchAfterPrintEvent();
@@ -1463,7 +1465,8 @@ void PrintRenderFrameHelper::PrintForSystemDialog() {
@@ -1441,7 +1443,8 @@ void PrintRenderFrameHelper::PrintForSystemDialog() {
}
Print(frame, print_preview_context_.source_node(),
@ -636,7 +653,7 @@ index 37ee29375fae6bd1fe2811a157bdb0e6d836c5f0..d561a2c507e77f234b4013764c0bf3ac
if (!render_frame_gone_)
print_preview_context_.DispatchAfterPrintEvent();
// WARNING: |this| may be gone at this point. Do not do any more work here and
@@ -1512,6 +1515,8 @@ void PrintRenderFrameHelper::PrintPreview(base::Value::Dict settings) {
@@ -1490,6 +1493,8 @@ void PrintRenderFrameHelper::PrintPreview(base::Value::Dict settings) {
if (ipc_nesting_level_ > kAllowedIpcDepthForPrint)
return;
@ -645,7 +662,7 @@ index 37ee29375fae6bd1fe2811a157bdb0e6d836c5f0..d561a2c507e77f234b4013764c0bf3ac
print_preview_context_.OnPrintPreview();
#if BUILDFLAG(IS_CHROMEOS_ASH)
@@ -2122,7 +2127,8 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
@@ -2104,7 +2109,8 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
return;
Print(duplicate_node.GetDocument().GetFrame(), duplicate_node,
@ -655,7 +672,7 @@ index 37ee29375fae6bd1fe2811a157bdb0e6d836c5f0..d561a2c507e77f234b4013764c0bf3ac
// Check if |this| is still valid.
if (!weak_this)
return;
@@ -2137,7 +2143,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
@@ -2119,7 +2125,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
const blink::WebNode& node,
@ -666,7 +683,7 @@ index 37ee29375fae6bd1fe2811a157bdb0e6d836c5f0..d561a2c507e77f234b4013764c0bf3ac
// If still not finished with earlier print request simply ignore.
if (prep_frame_view_)
return;
@@ -2145,7 +2153,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
@@ -2127,7 +2135,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
FrameReference frame_ref(frame);
uint32_t expected_page_count = 0;
@ -675,7 +692,7 @@ index 37ee29375fae6bd1fe2811a157bdb0e6d836c5f0..d561a2c507e77f234b4013764c0bf3ac
DidFinishPrinting(FAIL_PRINT_INIT);
return; // Failed to init print page settings.
}
@@ -2164,8 +2172,15 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
@@ -2146,8 +2154,15 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
print_pages_params_->params->print_scaling_option;
auto self = weak_ptr_factory_.GetWeakPtr();
@ -692,50 +709,47 @@ index 37ee29375fae6bd1fe2811a157bdb0e6d836c5f0..d561a2c507e77f234b4013764c0bf3ac
// Check if |this| is still valid.
if (!self)
return;
@@ -2420,36 +2435,51 @@ void PrintRenderFrameHelper::IPCProcessed() {
@@ -2402,37 +2417,49 @@ void PrintRenderFrameHelper::IPCProcessed() {
}
}
-bool PrintRenderFrameHelper::InitPrintSettings(bool fit_to_paper_size) {
- mojom::PrintPagesParams settings;
- settings.params = mojom::PrintParams::New();
- GetPrintManagerHost()->GetDefaultPrintSettings(&settings.params);
+bool PrintRenderFrameHelper::InitPrintSettings(
+ bool fit_to_paper_size,
+ base::Value::Dict new_settings) {
// Reset to default values.
ignore_css_margins_ = false;
- mojom::PrintPagesParams settings;
- GetPrintManagerHost()->GetDefaultPrintSettings(&settings.params);
+ mojom::PrintPagesParamsPtr settings;
+
+ if (new_settings.empty()) {
+ settings = mojom::PrintPagesParams::New();
+ settings->params = mojom::PrintParams::New();
+ GetPrintManagerHost()->GetDefaultPrintSettings(&settings->params);
+ } else {
+ bool canceled = false;
+ GetPrintManagerHost()->UpdatePrintSettings(
+ std::move(new_settings), &settings, &canceled);
+ if (canceled)
+ return false;
+ std::move(new_settings), &settings);
+ }
// Check if the printer returned any settings, if the settings is empty, we
// can safely assume there are no printer drivers configured. So we safely
// terminate.
- const bool result = PrintMsgPrintParamsIsValid(*settings.params);
+ const bool result = PrintMsgPrintParamsIsValid(*settings->params);
// Reset to default values.
ignore_css_margins_ = false;
- settings.pages.clear();
+ settings->pages.clear();
// Check if the printer returned any settings, if the settings are null,
// assume there are no printer drivers configured. So safely terminate.
- if (!settings.params) {
+ if (!settings->params) {
// Caller will reset `print_pages_params_`.
return false;
}
- settings.params->print_scaling_option =
+ settings->params->print_scaling_option =
fit_to_paper_size ? mojom::PrintScalingOption::kFitToPrintableArea
: mojom::PrintScalingOption::kSourceSize;
- CHECK(PrintMsgPrintParamsIsValid(*settings.params));
- SetPrintPagesParams(settings);
+ CHECK(PrintMsgPrintParamsIsValid(*settings->params));
+ SetPrintPagesParams(*settings);
return result;
return true;
}
-bool PrintRenderFrameHelper::CalculateNumberOfPages(blink::WebLocalFrame* frame,
@ -756,7 +770,7 @@ index 37ee29375fae6bd1fe2811a157bdb0e6d836c5f0..d561a2c507e77f234b4013764c0bf3ac
return false;
}
@@ -2570,7 +2600,7 @@ mojom::PrintPagesParamsPtr PrintRenderFrameHelper::GetPrintSettingsFromUser(
@@ -2537,7 +2564,7 @@ mojom::PrintPagesParamsPtr PrintRenderFrameHelper::GetPrintSettingsFromUser(
std::move(params),
base::BindOnce(
[](base::OnceClosure quit_closure, mojom::PrintPagesParamsPtr* output,
@ -766,7 +780,7 @@ index 37ee29375fae6bd1fe2811a157bdb0e6d836c5f0..d561a2c507e77f234b4013764c0bf3ac
std::move(quit_closure).Run();
},
diff --git a/components/printing/renderer/print_render_frame_helper.h b/components/printing/renderer/print_render_frame_helper.h
index c7be37dc31f4725c945e7fde016b542d6e2b5902..03eff9ffcec9c655542d9c6508d9eb2fcad95583 100644
index 12dab2542d58b5a61eefd38420ee68687274b461..737a67a59f7a3e6fe026631def02d4c196b8875d 100644
--- a/components/printing/renderer/print_render_frame_helper.h
+++ b/components/printing/renderer/print_render_frame_helper.h
@@ -253,7 +253,7 @@ class PrintRenderFrameHelper
@ -807,10 +821,10 @@ index c7be37dc31f4725c945e7fde016b542d6e2b5902..03eff9ffcec9c655542d9c6508d9eb2f
#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
// Set options for print preset from source PDF document.
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index 29e6932405dc48ecd29beb620bedef40ddb4c481..aec1fddcdb0e5e4e4b6fa0927cb6ebba05430382 100644
index 4eb28092c67a0b88228919d0d075a7d7d71b4776..4cabad83bd9de68424abb7961d45cf096e5afcb1 100644
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -2826,8 +2826,9 @@ source_set("browser") {
@@ -2830,8 +2830,9 @@ source_set("browser") {
"//ppapi/shared_impl",
]