123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701702703704705706707708709710711712713714715716717718719720721722723724725726727728729730731732733734735736737738739740741742743744745746747748749750751752753754755756757758759760761762763764765766767768769770771772773774775776777778779780781782783784785786787788789790791792793794795796797798799800801802803804805806807808809810811812813814815816817818819820821822823824825826827828829830831832833834835836837838 |
- From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
- From: Shelley Vohr <[email protected]>
- Date: Fri, 7 Jun 2019 13:59:37 -0700
- Subject: printing.patch
- Add changeset that was previously applied to sources in chromium_src. The
- majority of changes originally come from these PRs:
- * https://github.com/electron/electron/pull/1835
- * https://github.com/electron/electron/pull/8596
- This patch also fixes callback for manual user cancellation and success.
- diff --git a/chrome/browser/printing/print_job.cc b/chrome/browser/printing/print_job.cc
- index 8d40bbf98d4d58704f118cb42039b0956a9f6639..06196c0fa02012a5faa82471bd39fac087918f54 100644
- --- a/chrome/browser/printing/print_job.cc
- +++ b/chrome/browser/printing/print_job.cc
- @@ -89,6 +89,7 @@ bool PrintWithReducedRasterization(PrefService* prefs) {
- return base::FeatureList::IsEnabled(features::kPrintWithReducedRasterization);
- }
-
- +#if 0
- PrefService* GetPrefsForWebContents(content::WebContents* web_contents) {
- // TODO(thestig): Figure out why crbug.com/1083911 occurred, which is likely
- // because `web_contents` was null. As a result, this section has many more
- @@ -97,6 +98,7 @@ PrefService* GetPrefsForWebContents(content::WebContents* web_contents) {
- web_contents ? web_contents->GetBrowserContext() : nullptr;
- return context ? Profile::FromBrowserContext(context)->GetPrefs() : nullptr;
- }
- +#endif
-
- #endif // BUILDFLAG(IS_WIN)
-
- @@ -356,8 +358,10 @@ void PrintJob::StartPdfToEmfConversion(
-
- const PrintSettings& settings = document()->settings();
-
- +#if 0
- PrefService* prefs = GetPrefsForWebContents(worker_->GetWebContents());
- - bool print_with_reduced_rasterization = PrintWithReducedRasterization(prefs);
- +#endif
- + bool print_with_reduced_rasterization = PrintWithReducedRasterization(nullptr);
-
- using RenderMode = PdfRenderSettings::Mode;
- RenderMode mode = print_with_reduced_rasterization
- @@ -447,8 +451,10 @@ void PrintJob::StartPdfToPostScriptConversion(
- if (ps_level2) {
- mode = PdfRenderSettings::Mode::POSTSCRIPT_LEVEL2;
- } else {
- +#if 0
- PrefService* prefs = GetPrefsForWebContents(worker_->GetWebContents());
- - mode = PrintWithPostScriptType42Fonts(prefs)
- +#endif
- + mode = PrintWithPostScriptType42Fonts(nullptr)
- ? PdfRenderSettings::Mode::POSTSCRIPT_LEVEL3_WITH_TYPE42_FONTS
- : PdfRenderSettings::Mode::POSTSCRIPT_LEVEL3;
- }
- diff --git a/chrome/browser/printing/print_job.h b/chrome/browser/printing/print_job.h
- index 650c78f16c812170aeda99d75300ff88f47347a0..c33ce445a23f97a744db3a4ac30ef471c359553b 100644
- --- a/chrome/browser/printing/print_job.h
- +++ b/chrome/browser/printing/print_job.h
- @@ -261,6 +261,9 @@ class JobEventDetails : public base::RefCountedThreadSafe<JobEventDetails> {
- public:
- // Event type.
- enum Type {
- + // Print... dialog box has been closed with CANCEL button.
- + USER_INIT_CANCELED,
- +
- // A new document started printing.
- NEW_DOC,
-
- diff --git a/chrome/browser/printing/print_job_worker.cc b/chrome/browser/printing/print_job_worker.cc
- index 27305997182f0a669291d2f36dd6b0b98c43f314..cbb83e1f5661852d84468ec9d342af1b2d05ae45 100644
- --- a/chrome/browser/printing/print_job_worker.cc
- +++ b/chrome/browser/printing/print_job_worker.cc
- @@ -20,7 +20,6 @@
- #include "build/build_config.h"
- #include "chrome/browser/browser_process.h"
- #include "chrome/browser/printing/print_job.h"
- -#include "chrome/grit/generated_resources.h"
- #include "components/crash/core/common/crash_keys.h"
- #include "components/device_event_log/device_event_log.h"
- #include "content/public/browser/browser_task_traits.h"
- @@ -28,6 +27,7 @@
- #include "content/public/browser/global_routing_id.h"
- #include "content/public/browser/render_frame_host.h"
- #include "content/public/browser/web_contents.h"
- +#include "electron/grit/electron_resources.h"
- #include "printing/backend/print_backend.h"
- #include "printing/buildflags/buildflags.h"
- #include "printing/mojom/print.mojom.h"
- @@ -234,16 +234,21 @@ void PrintJobWorker::UpdatePrintSettings(base::Value new_settings,
- #endif // BUILDFLAG(IS_LINUX) && defined(USE_CUPS)
- }
-
- - mojom::ResultCode result;
- {
- #if BUILDFLAG(IS_WIN)
- // Blocking is needed here because Windows printer drivers are oftentimes
- // not thread-safe and have to be accessed on the UI thread.
- base::ScopedAllowBlocking allow_blocking;
- #endif
- - result = printing_context_->UpdatePrintSettings(std::move(new_settings));
- + // Reset settings from previous print job
- + printing_context_->ResetSettings();
- + mojom::ResultCode get_default_result = printing_context_->UseDefaultSettings();
- + if (get_default_result == mojom::ResultCode::kSuccess) {
- + mojom::ResultCode update_result =
- + printing_context_->UpdatePrintSettings(std::move(new_settings));
- + GetSettingsDone(std::move(callback), update_result);
- + }
- }
- - GetSettingsDone(std::move(callback), result);
- }
-
- #if BUILDFLAG(IS_CHROMEOS)
- diff --git a/chrome/browser/printing/print_job_worker_oop.cc b/chrome/browser/printing/print_job_worker_oop.cc
- index 52a13c0c47f7f3f18c4f552806add67291ce8726..765bde402fec094b51faea68e67d3782bbc06564 100644
- --- a/chrome/browser/printing/print_job_worker_oop.cc
- +++ b/chrome/browser/printing/print_job_worker_oop.cc
- @@ -226,7 +226,7 @@ void PrintJobWorkerOop::OnFailure() {
- }
-
- void PrintJobWorkerOop::ShowErrorDialog() {
- - ShowPrintErrorDialog();
- + // [electron]: removed.
- }
-
- void PrintJobWorkerOop::UnregisterServiceManagerClient() {
- diff --git a/chrome/browser/printing/print_view_manager_base.cc b/chrome/browser/printing/print_view_manager_base.cc
- index 1f37c11047d47bb2d65975fa69f33d822206dd08..d13ee6a81cd7edc5be99f595515ca521e01702ac 100644
- --- a/chrome/browser/printing/print_view_manager_base.cc
- +++ b/chrome/browser/printing/print_view_manager_base.cc
- @@ -30,10 +30,10 @@
- #include "chrome/browser/printing/print_view_manager_common.h"
- #include "chrome/browser/printing/printer_query.h"
- #include "chrome/browser/profiles/profile.h"
- -#include "chrome/browser/ui/simple_message_box.h"
- -#include "chrome/browser/ui/webui/print_preview/printer_handler.h"
- #include "chrome/common/pref_names.h"
- +#if 0
- #include "chrome/grit/generated_resources.h"
- +#endif
- #include "components/prefs/pref_service.h"
- #include "components/printing/browser/print_composite_client.h"
- #include "components/printing/browser/print_manager_utils.h"
- @@ -49,6 +49,7 @@
- #include "content/public/browser/render_process_host.h"
- #include "content/public/browser/render_view_host.h"
- #include "content/public/browser/web_contents.h"
- +#include "electron/grit/electron_resources.h"
- #include "mojo/public/cpp/system/buffer.h"
- #include "printing/buildflags/buildflags.h"
- #include "printing/metafile_skia.h"
- @@ -86,6 +87,8 @@ using PrintSettingsCallback =
- base::OnceCallback<void(std::unique_ptr<PrinterQuery>)>;
-
- void ShowWarningMessageBox(const std::u16string& message) {
- + LOG(ERROR) << "Invalid printer settings " << message;
- +#if 0
- // Runs always on the UI thread.
- static bool is_dialog_shown = false;
- if (is_dialog_shown)
- @@ -94,6 +97,7 @@ void ShowWarningMessageBox(const std::u16string& message) {
- base::AutoReset<bool> auto_reset(&is_dialog_shown, true);
-
- chrome::ShowWarningMessageBox(nullptr, std::u16string(), message);
- +#endif
- }
-
- #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
- @@ -191,7 +195,9 @@ void UpdatePrintSettingsReplyOnIO(
- DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
- DCHECK(printer_query);
- mojom::PrintPagesParamsPtr params = CreateEmptyPrintPagesParamsPtr();
- - if (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->params.get());
- params->params->document_cookie = printer_query->cookie();
- @@ -244,6 +250,7 @@ void ScriptedPrintReplyOnIO(
- mojom::PrintManagerHost::ScriptedPrintCallback callback) {
- DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
- mojom::PrintPagesParamsPtr params = CreateEmptyPrintPagesParamsPtr();
- +
- if (printer_query->last_status() == mojom::ResultCode::kSuccess &&
- printer_query->settings().dpi()) {
- RenderParamsFromPrintSettings(printer_query->settings(),
- @@ -253,8 +260,9 @@ void ScriptedPrintReplyOnIO(
- }
- bool has_valid_cookie = params->params->document_cookie;
- bool has_dpi = !params->params->dpi.IsEmpty();
- + bool canceled = printer_query->last_status() == mojom::ResultCode::kCanceled;
- content::GetUIThreadTaskRunner({})->PostTask(
- - FROM_HERE, base::BindOnce(std::move(callback), std::move(params)));
- + FROM_HERE, base::BindOnce(std::move(callback), std::move(params), canceled));
-
- if (has_dpi && has_valid_cookie) {
- queue->QueuePrinterQuery(std::move(printer_query));
- @@ -292,12 +300,14 @@ PrintViewManagerBase::PrintViewManagerBase(content::WebContents* web_contents)
- : PrintManager(web_contents),
- queue_(g_browser_process->print_job_manager()->queue()) {
- DCHECK(queue_);
- +#if 0 // Printing is always enabled.
- Profile* profile =
- Profile::FromBrowserContext(web_contents->GetBrowserContext());
- printing_enabled_.Init(
- prefs::kPrintingEnabled, profile->GetPrefs(),
- base::BindRepeating(&PrintViewManagerBase::UpdatePrintingEnabled,
- weak_ptr_factory_.GetWeakPtr()));
- +#endif
- }
-
- PrintViewManagerBase::~PrintViewManagerBase() {
- @@ -305,7 +315,10 @@ PrintViewManagerBase::~PrintViewManagerBase() {
- DisconnectFromCurrentPrintJob();
- }
-
- -bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh) {
- +bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh,
- + bool silent,
- + base::Value settings,
- + CompletionCallback callback) {
- // Remember the ID for `rfh`, to enable checking that the `RenderFrameHost`
- // is still valid after a possible inner message loop runs in
- // `DisconnectFromCurrentPrintJob()`.
- @@ -328,7 +341,9 @@ bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh) {
- // go in `ReleasePrintJob()`.
-
- SetPrintingRFH(rfh);
- - GetPrintRenderFrame(rfh)->PrintRequestedPages();
- + callback_ = std::move(callback);
- +
- + GetPrintRenderFrame(rfh)->PrintRequestedPages(silent, std::move(settings));
-
- for (auto& observer : GetObservers())
- observer.OnPrintNow(rfh);
- @@ -471,7 +486,8 @@ void PrintViewManagerBase::GetDefaultPrintSettingsReply(
- void PrintViewManagerBase::ScriptedPrintReply(
- ScriptedPrintCallback callback,
- int process_id,
- - mojom::PrintPagesParamsPtr params) {
- + mojom::PrintPagesParamsPtr params,
- + bool canceled) {
- DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-
- if (!content::RenderProcessHost::FromID(process_id)) {
- @@ -479,16 +495,19 @@ 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);
- }
-
- void PrintViewManagerBase::UpdatePrintingEnabled() {
- DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
- // The Unretained() is safe because ForEachRenderFrameHost() is synchronous.
- - web_contents()->GetMainFrame()->ForEachRenderFrameHost(base::BindRepeating(
- - &PrintViewManagerBase::SendPrintingEnabled, base::Unretained(this),
- - printing_enabled_.GetValue()));
- + web_contents()->GetMainFrame()->ForEachRenderFrameHost(
- + base::BindRepeating(&PrintViewManagerBase::SendPrintingEnabled,
- + base::Unretained(this), true));
- }
-
- void PrintViewManagerBase::NavigationStopped() {
- @@ -602,12 +621,13 @@ 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());
- return;
- }
- -
- +#endif
- content::RenderFrameHost* render_frame_host = GetCurrentTargetFrame();
- auto callback_wrapper =
- base::BindOnce(&PrintViewManagerBase::GetDefaultPrintSettingsReply,
- @@ -624,18 +644,20 @@ void PrintViewManagerBase::UpdatePrintSettings(
- base::Value 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);
- return;
- }
- -
- +#endif
- if (!job_settings.FindIntKey(kSettingPrinterType)) {
- UpdatePrintSettingsReply(std::move(callback),
- CreateEmptyPrintPagesParamsPtr(), false);
- return;
- }
-
- +#if 0
- content::BrowserContext* context =
- web_contents() ? web_contents()->GetBrowserContext() : nullptr;
- PrefService* prefs =
- @@ -645,6 +667,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
- if (value > 0)
- job_settings.SetIntKey(kSettingRasterizePdfDpi, value);
- }
- +#endif
-
- auto callback_wrapper =
- base::BindOnce(&PrintViewManagerBase::UpdatePrintSettingsReply,
- @@ -670,7 +693,7 @@ 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);
- return;
- }
- auto callback_wrapper = base::BindOnce(
- @@ -691,7 +714,6 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie) {
- PrintManager::PrintingFailed(cookie);
-
- #if !BUILDFLAG(IS_ANDROID) // Android does not implement this function.
- - ShowPrintErrorDialog();
- #endif
-
- ReleasePrinterQuery();
- @@ -706,6 +728,11 @@ void PrintViewManagerBase::RemoveObserver(Observer& observer) {
- }
-
- void PrintViewManagerBase::ShowInvalidPrinterSettingsError() {
- + if (!callback_.is_null()) {
- + std::string cb_str = "Invalid printer settings";
- + std::move(callback_).Run(printing_succeeded_, cb_str);
- + }
- +
- base::ThreadTaskRunnerHandle::Get()->PostTask(
- FROM_HERE, base::BindOnce(&ShowWarningMessageBox,
- l10n_util::GetStringUTF16(
- @@ -716,10 +743,12 @@ void PrintViewManagerBase::RenderFrameHostStateChanged(
- content::RenderFrameHost* render_frame_host,
- content::RenderFrameHost::LifecycleState /*old_state*/,
- content::RenderFrameHost::LifecycleState new_state) {
- +#if 0
- if (new_state == content::RenderFrameHost::LifecycleState::kActive &&
- render_frame_host->GetProcess()->IsPdf()) {
- SendPrintingEnabled(printing_enabled_.GetValue(), render_frame_host);
- }
- +#endif
- }
-
- void PrintViewManagerBase::DidStartLoading() {
- @@ -779,6 +808,11 @@ void PrintViewManagerBase::OnJobDone() {
- ReleasePrintJob();
- }
-
- +void PrintViewManagerBase::UserInitCanceled() {
- + printing_canceled_ = true;
- + ReleasePrintJob();
- +}
- +
- void PrintViewManagerBase::OnFailed() {
- TerminatePrintJob(true);
- }
- @@ -840,7 +874,10 @@ bool PrintViewManagerBase::CreateNewPrintJob(
-
- // Disconnect the current |print_job_|.
- auto weak_this = weak_ptr_factory_.GetWeakPtr();
- - DisconnectFromCurrentPrintJob();
- + if (callback_.is_null()) {
- + // Disconnect the current |print_job_| only when calling window.print()
- + DisconnectFromCurrentPrintJob();
- + }
- if (!weak_this)
- return false;
-
- @@ -915,6 +952,13 @@ void PrintViewManagerBase::ReleasePrintJob() {
- content::RenderFrameHost* rfh = printing_rfh_;
- printing_rfh_ = nullptr;
-
- + if (!callback_.is_null()) {
- + std::string cb_str = "";
- + if (!printing_succeeded_)
- + cb_str = printing_canceled_ ? "canceled" : "failed";
- + std::move(callback_).Run(printing_succeeded_, cb_str);
- + }
- +
- if (!print_job_)
- return;
-
- @@ -964,7 +1008,7 @@ bool PrintViewManagerBase::RunInnerMessageLoop() {
- }
-
- bool PrintViewManagerBase::OpportunisticallyCreatePrintJob(int cookie) {
- - if (print_job_)
- + if (print_job_ && print_job_->document())
- return true;
-
- if (!cookie) {
- diff --git a/chrome/browser/printing/print_view_manager_base.h b/chrome/browser/printing/print_view_manager_base.h
- index 2661776307f773ac8f2c62529ec86349b045ee8f..cb41b271adbb02517a5e1ad222d0320000437dfb 100644
- --- a/chrome/browser/printing/print_view_manager_base.h
- +++ b/chrome/browser/printing/print_view_manager_base.h
- @@ -37,6 +37,8 @@ namespace printing {
- class PrintQueriesQueue;
- class PrinterQuery;
-
- +using CompletionCallback = base::OnceCallback<void(bool, const std::string&)>;
- +
- // Base class for managing the print commands for a WebContents.
- class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
- public:
- @@ -58,7 +60,10 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
- // Prints the current document immediately. Since the rendering is
- // asynchronous, the actual printing will not be completed on the return of
- // this function. Returns false if printing is impossible at the moment.
- - virtual bool PrintNow(content::RenderFrameHost* rfh);
- + virtual bool PrintNow(content::RenderFrameHost* rfh,
- + bool silent = true,
- + base::Value settings = {},
- + CompletionCallback callback = {});
-
- #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
- // Prints the document in `print_data` with settings specified in
- @@ -106,6 +111,7 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
- ScriptedPrintCallback callback) override;
- void ShowInvalidPrinterSettingsError() override;
- void PrintingFailed(int32_t cookie) override;
- + void UserInitCanceled();
-
- // Adds and removes observers for `PrintViewManagerBase` events. The order in
- // which notifications are sent to observers is undefined. Observers must be
- @@ -193,7 +199,8 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
- // Runs `callback` with `params` to reply to ScriptedPrint().
- void ScriptedPrintReply(ScriptedPrintCallback callback,
- int process_id,
- - mojom::PrintPagesParamsPtr params);
- + mojom::PrintPagesParamsPtr params,
- + bool canceled);
-
- // Requests the RenderView to render all the missing pages for the print job.
- // No-op if no print job is pending. Returns true if at least one page has
- @@ -248,9 +255,15 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
- // The current RFH that is printing with a system printing dialog.
- raw_ptr<content::RenderFrameHost> printing_rfh_ = nullptr;
-
- + // Respond with success of the print job.
- + CompletionCallback callback_;
- +
- // Indication of success of the print job.
- bool printing_succeeded_ = false;
-
- + // Indication of whether the print job was manually canceled
- + bool printing_canceled_ = false;
- +
- // Set while running an inner message loop inside RenderAllMissingPagesNow().
- // This means we are _blocking_ until all the necessary pages have been
- // rendered or the print settings are being loaded.
- diff --git a/chrome/browser/ui/webui/print_preview/fake_print_render_frame.cc b/chrome/browser/ui/webui/print_preview/fake_print_render_frame.cc
- index 879004c790d57b28e7a816ebf560971876c17168..334509d3ab45af4bb7877f656ca5aca7ee1bce00 100644
- --- a/chrome/browser/ui/webui/print_preview/fake_print_render_frame.cc
- +++ b/chrome/browser/ui/webui/print_preview/fake_print_render_frame.cc
- @@ -20,7 +20,7 @@ FakePrintRenderFrame::FakePrintRenderFrame(
-
- FakePrintRenderFrame::~FakePrintRenderFrame() = default;
-
- -void FakePrintRenderFrame::PrintRequestedPages() {}
- +void FakePrintRenderFrame::PrintRequestedPages(bool /*silent*/, ::base::Value /*settings*/) {}
-
- void FakePrintRenderFrame::PrintForSystemDialog() {}
-
- diff --git a/chrome/browser/ui/webui/print_preview/fake_print_render_frame.h b/chrome/browser/ui/webui/print_preview/fake_print_render_frame.h
- index 10f46664d8337d6be2fac24d9a6933429f3b2c2b..6de833f2da3ae85cf0752284146974f2026ab174 100644
- --- a/chrome/browser/ui/webui/print_preview/fake_print_render_frame.h
- +++ b/chrome/browser/ui/webui/print_preview/fake_print_render_frame.h
- @@ -24,7 +24,7 @@ class FakePrintRenderFrame : public mojom::PrintRenderFrame {
-
- private:
- // printing::mojom::PrintRenderFrame:
- - void PrintRequestedPages() override;
- + void PrintRequestedPages(bool silent, ::base::Value settings) override;
- void PrintForSystemDialog() override;
- void SetPrintPreviewUI(
- mojo::PendingAssociatedRemote<mojom::PrintPreviewUI> preview) override;
- diff --git a/components/printing/browser/print_to_pdf/pdf_print_manager.cc b/components/printing/browser/print_to_pdf/pdf_print_manager.cc
- index 66810a2a5f0c77ba107c71d2abaef8692bda0fea..cd6103af4571f82f11652a3c7ecf0e534428dc49 100644
- --- a/components/printing/browser/print_to_pdf/pdf_print_manager.cc
- +++ b/components/printing/browser/print_to_pdf/pdf_print_manager.cc
- @@ -116,7 +116,8 @@ void PdfPrintManager::PrintToPdf(
- set_cookie(print_pages_params_->params->document_cookie);
- callback_ = std::move(callback);
-
- - GetPrintRenderFrame(rfh)->PrintRequestedPages();
- + // TODO(electron-maintainers): do something with job_settings here?
- + GetPrintRenderFrame(rfh)->PrintRequestedPages(true/*silent*/, base::Value{}/*job_settings*/);
- }
-
- void PdfPrintManager::GetDefaultPrintSettings(
- @@ -138,14 +139,14 @@ void PdfPrintManager::ScriptedPrint(
- if (!printing_rfh_) {
- DLOG(ERROR) << "Unexpected message received before PrintToPdf is "
- "called: ScriptedPrint";
- - std::move(callback).Run(std::move(default_param));
- + std::move(callback).Run(std::move(default_param), true/*canceled*/);
- return;
- }
- if (params->is_scripted &&
- GetCurrentTargetFrame()->IsNestedWithinFencedFrame()) {
- DLOG(ERROR) << "Unexpected message received. Script Print is not allowed"
- " in a fenced frame.";
- - std::move(callback).Run(std::move(default_param));
- + std::move(callback).Run(std::move(default_param), true/*canceled*/);
- return;
- }
- absl::variant<printing::PageRanges, PageRangeError> page_ranges =
- @@ -162,7 +163,7 @@ void PdfPrintManager::ScriptedPrint(
- break;
- }
- ReleaseJob(print_result);
- - std::move(callback).Run(std::move(default_param));
- + std::move(callback).Run(std::move(default_param), true/*canceled*/);
- return;
- }
-
- @@ -170,7 +171,7 @@ void PdfPrintManager::ScriptedPrint(
- print_pages_params_->pages = printing::PageRange::GetPages(
- absl::get<printing::PageRanges>(page_ranges));
-
- - std::move(callback).Run(print_pages_params_->Clone());
- + std::move(callback).Run(print_pages_params_->Clone(), false/*canceled*/);
- }
-
- void PdfPrintManager::ShowInvalidPrinterSettingsError() {
- diff --git a/components/printing/common/print.mojom b/components/printing/common/print.mojom
- index 5afad24754e12554368a6619466ca025edc26180..e2e786692bd877d3b8bf7c31829496afa99ed539 100644
- --- a/components/printing/common/print.mojom
- +++ b/components/printing/common/print.mojom
- @@ -274,7 +274,7 @@ interface PrintPreviewUI {
- 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.
- - PrintRequestedPages();
- + PrintRequestedPages(bool silent, mojo_base.mojom.DeprecatedDictionaryValue settings);
-
- // Tells the RenderFrame to switch the CSS to print media type, render every
- // requested page using the print preview document's frame/node, and then
- @@ -341,7 +341,7 @@ interface PrintManagerHost {
- // Request the print settings from the user. This step is about showing
- // UI to the user to select the final print settings.
- [Sync]
- - ScriptedPrint(ScriptedPrintParams params) => (PrintPagesParams settings);
- + ScriptedPrint(ScriptedPrintParams params) => (PrintPagesParams settings, bool canceled);
-
- // Tells the browser that there are invalid printer settings.
- ShowInvalidPrinterSettingsError();
- diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc
- index 066521576d021cbd3e68057f68199c23a8a30437..72777428d2456191875806bc3c57d0801b43a8ea 100644
- --- a/components/printing/renderer/print_render_frame_helper.cc
- +++ b/components/printing/renderer/print_render_frame_helper.cc
- @@ -40,6 +40,7 @@
- #include "printing/metafile_skia.h"
- #include "printing/mojom/print.mojom.h"
- #include "printing/print_job_constants.h"
- +#include "printing/print_settings.h"
- #include "printing/units.h"
- #include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
- #include "third_party/blink/public/common/associated_interfaces/associated_interface_registry.h"
- @@ -1263,7 +1264,8 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) {
- if (!weak_this)
- return;
-
- - Print(web_frame, blink::WebNode(), PrintRequestType::kScripted);
- + Print(web_frame, blink::WebNode(), PrintRequestType::kScripted,
- + false /* silent */, base::DictionaryValue() /* new_settings */);
- if (!weak_this)
- return;
-
- @@ -1294,7 +1296,7 @@ void PrintRenderFrameHelper::BindPrintRenderFrameReceiver(
- receivers_.Add(this, std::move(receiver));
- }
-
- -void PrintRenderFrameHelper::PrintRequestedPages() {
- +void PrintRenderFrameHelper::PrintRequestedPages(bool silent, base::Value settings) {
- ScopedIPC scoped_ipc(weak_ptr_factory_.GetWeakPtr());
- if (ipc_nesting_level_ > kAllowedIpcDepthForPrint)
- return;
- @@ -1309,7 +1311,7 @@ void PrintRenderFrameHelper::PrintRequestedPages() {
- // plugin node and print that instead.
- auto plugin = delegate_->GetPdfElement(frame);
-
- - Print(frame, plugin, PrintRequestType::kRegular);
- + Print(frame, plugin, PrintRequestType::kRegular, silent, std::move(settings));
-
- if (!render_frame_gone_)
- frame->DispatchAfterPrintEvent();
- @@ -1340,7 +1342,8 @@ void PrintRenderFrameHelper::PrintForSystemDialog() {
- }
-
- Print(frame, print_preview_context_.source_node(),
- - PrintRequestType::kRegular);
- + PrintRequestType::kRegular, false,
- + base::DictionaryValue());
- if (!render_frame_gone_)
- print_preview_context_.DispatchAfterPrintEvent();
- // WARNING: |this| may be gone at this point. Do not do any more work here and
- @@ -1387,6 +1390,8 @@ void PrintRenderFrameHelper::PrintPreview(base::Value settings) {
- if (ipc_nesting_level_ > kAllowedIpcDepthForPrint)
- return;
-
- + blink::WebLocalFrame* frame = render_frame()->GetWebFrame();
- + print_preview_context_.InitWithFrame(frame);
- print_preview_context_.OnPrintPreview();
-
- if (print_preview_context_.IsForArc()) {
- @@ -1924,7 +1929,8 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
- return;
-
- Print(duplicate_node.GetDocument().GetFrame(), duplicate_node,
- - PrintRequestType::kRegular);
- + PrintRequestType::kRegular, false /* silent */,
- + base::DictionaryValue() /* new_settings */);
- // Check if |this| is still valid.
- if (!weak_this)
- return;
- @@ -1939,7 +1945,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
-
- void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
- const blink::WebNode& node,
- - PrintRequestType print_request_type) {
- + PrintRequestType print_request_type,
- + bool silent,
- + base::Value settings) {
- // If still not finished with earlier print request simply ignore.
- if (prep_frame_view_)
- return;
- @@ -1947,7 +1955,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
- FrameReference frame_ref(frame);
-
- uint32_t expected_page_count = 0;
- - if (!CalculateNumberOfPages(frame, node, &expected_page_count)) {
- + if (!CalculateNumberOfPages(frame, node, &expected_page_count, base::Value::AsDictionaryValue(settings))) {
- DidFinishPrinting(FAIL_PRINT_INIT);
- return; // Failed to init print page settings.
- }
- @@ -1966,8 +1974,15 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
- print_pages_params_->params->print_scaling_option;
-
- auto self = weak_ptr_factory_.GetWeakPtr();
- - mojom::PrintPagesParamsPtr print_settings = GetPrintSettingsFromUser(
- + mojom::PrintPagesParamsPtr print_settings;
- +
- + if (silent) {
- + print_settings = mojom::PrintPagesParams::New();
- + print_settings->params = print_pages_params_->params->Clone();
- + } else {
- + print_settings = GetPrintSettingsFromUser(
- frame_ref.GetFrame(), node, expected_page_count, print_request_type);
- + }
- // Check if |this| is still valid.
- if (!self)
- return;
- @@ -2215,36 +2230,51 @@ 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,
- + const base::DictionaryValue& new_settings) {
- + mojom::PrintPagesParamsPtr settings;
- +
- + if (new_settings.DictEmpty()) {
- + settings = mojom::PrintPagesParams::New();
- + settings->params = mojom::PrintParams::New();
- + GetPrintManagerHost()->GetDefaultPrintSettings(&settings->params);
- + } else {
- + bool canceled = false;
- + int cookie =
- + print_pages_params_ ? print_pages_params_->params->document_cookie : 0;
- + GetPrintManagerHost()->UpdatePrintSettings(cookie, new_settings.Clone(), &settings, &canceled);
- + if (canceled)
- + return false;
- + }
-
- // 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.
- bool result = true;
- - if (!PrintMsg_Print_Params_IsValid(*settings.params))
- + if (!PrintMsg_Print_Params_IsValid(*settings->params))
- result = false;
-
- // Reset to default values.
- ignore_css_margins_ = false;
- - settings.pages.clear();
- + settings->pages.clear();
-
- - settings.params->print_scaling_option =
- + settings->params->print_scaling_option =
- fit_to_paper_size ? mojom::PrintScalingOption::kFitToPrintableArea
- : mojom::PrintScalingOption::kSourceSize;
-
- - SetPrintPagesParams(settings);
- + SetPrintPagesParams(*settings);
- return result;
- }
-
- -bool PrintRenderFrameHelper::CalculateNumberOfPages(blink::WebLocalFrame* frame,
- - const blink::WebNode& node,
- - uint32_t* number_of_pages) {
- +bool PrintRenderFrameHelper::CalculateNumberOfPages(
- + blink::WebLocalFrame* frame,
- + const blink::WebNode& node,
- + uint32_t* number_of_pages,
- + const base::DictionaryValue& settings) {
- DCHECK(frame);
- bool fit_to_paper_size = !IsPrintingNodeOrPdfFrame(frame, node);
- - if (!InitPrintSettings(fit_to_paper_size)) {
- + if (!InitPrintSettings(fit_to_paper_size, settings)) {
- notify_browser_of_print_failure_ = false;
- GetPrintManagerHost()->ShowInvalidPrinterSettingsError();
- return false;
- @@ -2389,7 +2419,7 @@ mojom::PrintPagesParamsPtr PrintRenderFrameHelper::GetPrintSettingsFromUser(
- std::move(params),
- base::BindOnce(
- [](base::OnceClosure quit_closure, mojom::PrintPagesParamsPtr* output,
- - mojom::PrintPagesParamsPtr input) {
- + mojom::PrintPagesParamsPtr input, bool canceled) {
- *output = std::move(input);
- std::move(quit_closure).Run();
- },
- @@ -2634,18 +2664,7 @@ void PrintRenderFrameHelper::RequestPrintPreview(PrintPreviewRequestType type,
- }
-
- bool PrintRenderFrameHelper::CheckForCancel() {
- - const mojom::PrintParams& print_params = *print_pages_params_->params;
- - bool cancel = false;
- -
- - if (!GetPrintManagerHost()->CheckForCancel(print_params.preview_ui_id,
- - print_params.preview_request_id,
- - &cancel)) {
- - cancel = true;
- - }
- -
- - if (cancel)
- - notify_browser_of_print_failure_ = false;
- - return cancel;
- + return false;
- }
-
- bool PrintRenderFrameHelper::PreviewPageRendered(
- diff --git a/components/printing/renderer/print_render_frame_helper.h b/components/printing/renderer/print_render_frame_helper.h
- index 2b703118bf94a82262adc293368dcfcdb67807ff..a07f307ff48f3ce5409354a5ba8d54b43325da73 100644
- --- a/components/printing/renderer/print_render_frame_helper.h
- +++ b/components/printing/renderer/print_render_frame_helper.h
- @@ -254,7 +254,7 @@ class PrintRenderFrameHelper
- mojo::PendingAssociatedReceiver<mojom::PrintRenderFrame> receiver);
-
- // printing::mojom::PrintRenderFrame:
- - void PrintRequestedPages() override;
- + void PrintRequestedPages(bool silent, base::Value settings) override;
- #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
- void PrintForSystemDialog() override;
- void SetPrintPreviewUI(
- @@ -321,7 +321,9 @@ class PrintRenderFrameHelper
- // WARNING: |this| may be gone after this method returns.
- void Print(blink::WebLocalFrame* frame,
- const blink::WebNode& node,
- - PrintRequestType print_request_type);
- + PrintRequestType print_request_type,
- + bool silent,
- + base::Value settings);
-
- // Notification when printing is done - signal tear-down/free resources.
- void DidFinishPrinting(PrintingResult result);
- @@ -330,12 +332,14 @@ class PrintRenderFrameHelper
-
- // Initialize print page settings with default settings.
- // Used only for native printing workflow.
- - bool InitPrintSettings(bool fit_to_paper_size);
- + bool InitPrintSettings(bool fit_to_paper_size,
- + const base::DictionaryValue& settings);
-
- // Calculate number of pages in source document.
- bool CalculateNumberOfPages(blink::WebLocalFrame* frame,
- const blink::WebNode& node,
- - uint32_t* number_of_pages);
- + uint32_t* number_of_pages,
- + const base::DictionaryValue& settings);
-
- #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
- // Set options for print preset from source PDF document.
- diff --git a/printing/printing_context.cc b/printing/printing_context.cc
- index 3d8281c8af9a4339bdd492c67edafc4ec6efb09d..6f8b9d42e051579cf1d0774afa771a7e45d31ff2 100644
- --- a/printing/printing_context.cc
- +++ b/printing/printing_context.cc
- @@ -120,7 +120,6 @@ mojom::ResultCode PrintingContext::UsePdfSettings() {
-
- mojom::ResultCode PrintingContext::UpdatePrintSettings(
- base::Value job_settings) {
- - ResetSettings();
- {
- std::unique_ptr<PrintSettings> settings =
- PrintSettingsFromJobSettings(job_settings);
- diff --git a/printing/printing_context.h b/printing/printing_context.h
- index 3f36303105b7979a1a771bf26b42596abe5b3cce..52f740bb832db4a8d76431d9bc77cab10bb7e0c7 100644
- --- a/printing/printing_context.h
- +++ b/printing/printing_context.h
- @@ -170,6 +170,9 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
-
- bool PrintingAborted() const { return abort_printing_; }
-
- + // Reinitializes the settings for object reuse.
- + void ResetSettings();
- +
- int job_id() const { return job_id_; }
-
- protected:
- @@ -180,9 +183,6 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
- static std::unique_ptr<PrintingContext> CreateImpl(Delegate* delegate,
- bool skip_system_calls);
-
- - // Reinitializes the settings for object reuse.
- - void ResetSettings();
- -
- // Determine if system calls should be skipped by this instance.
- bool skip_system_calls() const {
- #if BUILDFLAG(ENABLE_OOP_PRINTING)
|