2018-10-24 18:24:11 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2019-06-12 19:34:07 +00:00
|
|
|
From: Shelley Vohr <shelley.vohr@gmail.com>
|
|
|
|
Date: Fri, 7 Jun 2019 13:59:37 -0700
|
2019-08-24 01:14:23 +00:00
|
|
|
Subject: printing.patch
|
2018-10-24 18:24:11 +00:00
|
|
|
|
|
|
|
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
|
|
|
|
|
2019-06-12 19:34:07 +00:00
|
|
|
This patch also fixes callback for manual user cancellation and success.
|
|
|
|
|
2020-06-22 17:35:10 +00:00
|
|
|
diff --git a/chrome/browser/printing/print_job.cc b/chrome/browser/printing/print_job.cc
|
2022-02-25 18:17:35 +00:00
|
|
|
index 8d40bbf98d4d58704f118cb42039b0956a9f6639..06196c0fa02012a5faa82471bd39fac087918f54 100644
|
2020-06-22 17:35:10 +00:00
|
|
|
--- a/chrome/browser/printing/print_job.cc
|
|
|
|
+++ b/chrome/browser/printing/print_job.cc
|
2022-02-25 18:17:35 +00:00
|
|
|
@@ -89,6 +89,7 @@ bool PrintWithReducedRasterization(PrefService* prefs) {
|
2021-10-06 02:21:00 +00:00
|
|
|
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
|
2022-02-25 18:17:35 +00:00
|
|
|
@@ -97,6 +98,7 @@ PrefService* GetPrefsForWebContents(content::WebContents* web_contents) {
|
2021-10-06 02:21:00 +00:00
|
|
|
web_contents ? web_contents->GetBrowserContext() : nullptr;
|
|
|
|
return context ? Profile::FromBrowserContext(context)->GetPrefs() : nullptr;
|
|
|
|
}
|
|
|
|
+#endif
|
|
|
|
|
2022-02-10 02:58:52 +00:00
|
|
|
#endif // BUILDFLAG(IS_WIN)
|
2021-10-06 02:21:00 +00:00
|
|
|
|
2022-02-25 18:17:35 +00:00
|
|
|
@@ -356,8 +358,10 @@ void PrintJob::StartPdfToEmfConversion(
|
2022-01-10 22:31:39 +00:00
|
|
|
|
2020-09-30 18:42:57 +00:00
|
|
|
const PrintSettings& settings = document()->settings();
|
|
|
|
|
2020-06-22 17:35:10 +00:00
|
|
|
+#if 0
|
2021-10-06 02:21:00 +00:00
|
|
|
PrefService* prefs = GetPrefsForWebContents(worker_->GetWebContents());
|
2020-06-22 17:35:10 +00:00
|
|
|
- bool print_with_reduced_rasterization = PrintWithReducedRasterization(prefs);
|
|
|
|
+#endif
|
|
|
|
+ bool print_with_reduced_rasterization = PrintWithReducedRasterization(nullptr);
|
|
|
|
|
|
|
|
using RenderMode = PdfRenderSettings::Mode;
|
2022-01-10 22:31:39 +00:00
|
|
|
RenderMode mode = print_with_reduced_rasterization
|
2022-02-25 18:17:35 +00:00
|
|
|
@@ -447,8 +451,10 @@ void PrintJob::StartPdfToPostScriptConversion(
|
2021-10-06 02:21:00 +00:00
|
|
|
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;
|
|
|
|
}
|
2021-07-26 16:02:16 +00:00
|
|
|
diff --git a/chrome/browser/printing/print_job.h b/chrome/browser/printing/print_job.h
|
2022-02-25 18:17:35 +00:00
|
|
|
index 650c78f16c812170aeda99d75300ff88f47347a0..c33ce445a23f97a744db3a4ac30ef471c359553b 100644
|
2021-07-26 16:02:16 +00:00
|
|
|
--- a/chrome/browser/printing/print_job.h
|
|
|
|
+++ b/chrome/browser/printing/print_job.h
|
2022-02-25 18:17:35 +00:00
|
|
|
@@ -261,6 +261,9 @@ class JobEventDetails : public base::RefCountedThreadSafe<JobEventDetails> {
|
2021-07-26 16:02:16 +00:00
|
|
|
public:
|
|
|
|
// Event type.
|
|
|
|
enum Type {
|
|
|
|
+ // Print... dialog box has been closed with CANCEL button.
|
|
|
|
+ USER_INIT_CANCELED,
|
|
|
|
+
|
|
|
|
// A new document started printing.
|
|
|
|
NEW_DOC,
|
|
|
|
|
2018-10-13 01:57:04 +00:00
|
|
|
diff --git a/chrome/browser/printing/print_job_worker.cc b/chrome/browser/printing/print_job_worker.cc
|
2022-02-25 18:17:35 +00:00
|
|
|
index 7dbb9aea759e4a80a4ef3133eeffcd952bbe6d50..62fbaa0e24dff2037f47ef4ccf09993aa79b3ef8 100644
|
2018-10-13 01:57:04 +00:00
|
|
|
--- a/chrome/browser/printing/print_job_worker.cc
|
|
|
|
+++ b/chrome/browser/printing/print_job_worker.cc
|
2022-01-10 22:31:39 +00:00
|
|
|
@@ -20,13 +20,13 @@
|
|
|
|
#include "build/build_config.h"
|
2018-10-13 01:57:04 +00:00
|
|
|
#include "chrome/browser/browser_process.h"
|
|
|
|
#include "chrome/browser/printing/print_job.h"
|
|
|
|
-#include "chrome/grit/generated_resources.h"
|
2019-10-28 22:12:35 +00:00
|
|
|
#include "components/crash/core/common/crash_keys.h"
|
2022-01-10 22:31:39 +00:00
|
|
|
#include "components/device_event_log/device_event_log.h"
|
2019-01-12 01:00:43 +00:00
|
|
|
#include "content/public/browser/browser_task_traits.h"
|
2018-10-13 01:57:04 +00:00
|
|
|
#include "content/public/browser/browser_thread.h"
|
|
|
|
#include "content/public/browser/render_frame_host.h"
|
2019-01-12 01:00:43 +00:00
|
|
|
#include "content/public/browser/web_contents.h"
|
|
|
|
+#include "electron/grit/electron_resources.h"
|
2021-07-26 16:02:16 +00:00
|
|
|
#include "printing/backend/print_backend.h"
|
2021-10-21 18:51:36 +00:00
|
|
|
#include "printing/buildflags/buildflags.h"
|
2021-07-26 16:02:16 +00:00
|
|
|
#include "printing/mojom/print.mojom.h"
|
2022-02-10 02:58:52 +00:00
|
|
|
@@ -239,16 +239,21 @@ void PrintJobWorker::UpdatePrintSettings(base::Value new_settings,
|
|
|
|
#endif // BUILDFLAG(IS_LINUX) && defined(USE_CUPS)
|
2019-10-28 22:12:35 +00:00
|
|
|
}
|
|
|
|
|
2021-10-21 18:51:36 +00:00
|
|
|
- mojom::ResultCode result;
|
2020-04-13 23:39:26 +00:00
|
|
|
{
|
2022-02-10 02:58:52 +00:00
|
|
|
#if BUILDFLAG(IS_WIN)
|
2020-04-13 23:39:26 +00:00
|
|
|
// 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();
|
2021-10-21 18:51:36 +00:00
|
|
|
+ mojom::ResultCode get_default_result = printing_context_->UseDefaultSettings();
|
|
|
|
+ if (get_default_result == mojom::ResultCode::kSuccess) {
|
|
|
|
+ mojom::ResultCode update_result =
|
2020-04-13 23:39:26 +00:00
|
|
|
+ printing_context_->UpdatePrintSettings(std::move(new_settings));
|
|
|
|
+ GetSettingsDone(std::move(callback), update_result);
|
|
|
|
+ }
|
|
|
|
}
|
2019-08-07 14:47:24 +00:00
|
|
|
- GetSettingsDone(std::move(callback), result);
|
|
|
|
}
|
|
|
|
|
2022-02-10 02:58:52 +00:00
|
|
|
#if BUILDFLAG(IS_CHROMEOS)
|
|
|
|
diff --git a/chrome/browser/printing/print_job_worker_oop.cc b/chrome/browser/printing/print_job_worker_oop.cc
|
2022-02-25 18:17:35 +00:00
|
|
|
index 457749cf31578666304c30a5df1b8428629caafe..21c4a76411ee06775fb5bbb2d5a2ac17911d1c2a 100644
|
2022-02-10 02:58:52 +00:00
|
|
|
--- a/chrome/browser/printing/print_job_worker_oop.cc
|
|
|
|
+++ b/chrome/browser/printing/print_job_worker_oop.cc
|
2022-02-25 18:17:35 +00:00
|
|
|
@@ -225,7 +225,7 @@ void PrintJobWorkerOop::OnFailure() {
|
2022-02-10 02:58:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void PrintJobWorkerOop::ShowErrorDialog() {
|
|
|
|
- ShowPrintErrorDialog();
|
|
|
|
+ // [electron]: removed.
|
|
|
|
}
|
|
|
|
|
|
|
|
void PrintJobWorkerOop::UnregisterServiceManagerClient() {
|
2018-10-13 01:57:04 +00:00
|
|
|
diff --git a/chrome/browser/printing/print_view_manager_base.cc b/chrome/browser/printing/print_view_manager_base.cc
|
2022-02-25 18:17:35 +00:00
|
|
|
index 9ed04fffa69c23834dec23836532dc3cc71299a6..2e332aab1d316569998f8d349af386bd0828b8a1 100644
|
2018-10-13 01:57:04 +00:00
|
|
|
--- a/chrome/browser/printing/print_view_manager_base.cc
|
|
|
|
+++ b/chrome/browser/printing/print_view_manager_base.cc
|
2022-01-10 22:31:39 +00:00
|
|
|
@@ -29,10 +29,10 @@
|
2018-11-09 03:42:34 +00:00
|
|
|
#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"
|
2018-10-13 01:57:04 +00:00
|
|
|
#include "chrome/common/pref_names.h"
|
2021-02-09 20:16:21 +00:00
|
|
|
+#if 0
|
|
|
|
#include "chrome/grit/generated_resources.h"
|
|
|
|
+#endif
|
2018-10-13 01:57:04 +00:00
|
|
|
#include "components/prefs/pref_service.h"
|
|
|
|
#include "components/printing/browser/print_composite_client.h"
|
2021-02-09 20:16:21 +00:00
|
|
|
#include "components/printing/browser/print_manager_utils.h"
|
2022-01-10 22:31:39 +00:00
|
|
|
@@ -47,6 +47,7 @@
|
2018-11-09 03:42:34 +00:00
|
|
|
#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"
|
2018-11-09 07:16:43 +00:00
|
|
|
#include "printing/metafile_skia.h"
|
2022-02-25 18:17:35 +00:00
|
|
|
@@ -81,6 +82,8 @@ using PrintSettingsCallback =
|
|
|
|
base::OnceCallback<void(std::unique_ptr<PrinterQuery>)>;
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2021-03-15 18:32:18 +00:00
|
|
|
void ShowWarningMessageBox(const std::u16string& message) {
|
2018-10-13 01:57:04 +00:00
|
|
|
+ LOG(ERROR) << "Invalid printer settings " << message;
|
|
|
|
+#if 0
|
|
|
|
// Runs always on the UI thread.
|
|
|
|
static bool is_dialog_shown = false;
|
|
|
|
if (is_dialog_shown)
|
2022-02-25 18:17:35 +00:00
|
|
|
@@ -89,6 +92,7 @@ void ShowWarningMessageBox(const std::u16string& message) {
|
2018-10-13 01:57:04 +00:00
|
|
|
base::AutoReset<bool> auto_reset(&is_dialog_shown, true);
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2021-03-15 18:32:18 +00:00
|
|
|
chrome::ShowWarningMessageBox(nullptr, std::u16string(), message);
|
2019-07-03 01:22:09 +00:00
|
|
|
+#endif
|
2018-10-13 01:57:04 +00:00
|
|
|
}
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2018-10-13 01:57:04 +00:00
|
|
|
#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
|
2022-02-25 18:17:35 +00:00
|
|
|
@@ -188,7 +192,9 @@ void UpdatePrintSettingsReplyOnIO(
|
2021-06-03 08:05:04 +00:00
|
|
|
DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
|
2020-10-28 00:33:04 +00:00
|
|
|
DCHECK(printer_query);
|
2021-06-03 08:05:04 +00:00
|
|
|
mojom::PrintPagesParamsPtr params = CreateEmptyPrintPagesParamsPtr();
|
2021-10-21 18:51:36 +00:00
|
|
|
- if (printer_query->last_status() == mojom::ResultCode::kSuccess) {
|
2020-10-28 00:33:04 +00:00
|
|
|
+ // 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();
|
2022-02-25 18:17:35 +00:00
|
|
|
@@ -241,6 +247,7 @@ void ScriptedPrintReplyOnIO(
|
2022-02-01 19:00:09 +00:00
|
|
|
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(),
|
2022-02-25 18:17:35 +00:00
|
|
|
@@ -250,8 +257,9 @@ void ScriptedPrintReplyOnIO(
|
2022-02-01 19:00:09 +00:00
|
|
|
}
|
|
|
|
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));
|
2022-02-25 18:17:35 +00:00
|
|
|
@@ -290,12 +298,14 @@ PrintViewManagerBase::PrintViewManagerBase(content::WebContents* web_contents)
|
2020-09-21 08:00:36 +00:00
|
|
|
: PrintManager(web_contents),
|
2019-07-24 22:58:51 +00:00
|
|
|
queue_(g_browser_process->print_job_manager()->queue()) {
|
2018-10-13 01:57:04 +00:00
|
|
|
DCHECK(queue_);
|
2020-10-19 21:31:25 +00:00
|
|
|
+#if 0 // Printing is always enabled.
|
2018-10-13 01:57:04 +00:00
|
|
|
Profile* profile =
|
|
|
|
Profile::FromBrowserContext(web_contents->GetBrowserContext());
|
|
|
|
printing_enabled_.Init(
|
|
|
|
prefs::kPrintingEnabled, profile->GetPrefs(),
|
2019-07-03 01:22:09 +00:00
|
|
|
base::BindRepeating(&PrintViewManagerBase::UpdatePrintingEnabled,
|
|
|
|
weak_ptr_factory_.GetWeakPtr()));
|
|
|
|
+#endif
|
2018-10-13 01:57:04 +00:00
|
|
|
}
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2018-10-13 01:57:04 +00:00
|
|
|
PrintViewManagerBase::~PrintViewManagerBase() {
|
2022-02-25 18:17:35 +00:00
|
|
|
@@ -303,7 +313,10 @@ PrintViewManagerBase::~PrintViewManagerBase() {
|
2018-10-13 01:57:04 +00:00
|
|
|
DisconnectFromCurrentPrintJob();
|
|
|
|
}
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2018-10-13 01:57:04 +00:00
|
|
|
-bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh) {
|
|
|
|
+bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh,
|
2019-11-08 18:01:50 +00:00
|
|
|
+ bool silent,
|
|
|
|
+ base::Value settings,
|
|
|
|
+ CompletionCallback callback) {
|
2022-02-10 02:58:52 +00:00
|
|
|
// Remember the ID for `rfh`, to enable checking that the `RenderFrameHost`
|
|
|
|
// is still valid after a possible inner message loop runs in
|
|
|
|
// `DisconnectFromCurrentPrintJob()`.
|
2022-02-25 18:17:35 +00:00
|
|
|
@@ -326,7 +339,9 @@ bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh) {
|
2021-07-26 16:02:16 +00:00
|
|
|
// go in `ReleasePrintJob()`.
|
2019-11-05 23:41:20 +00:00
|
|
|
|
2018-10-13 01:57:04 +00:00
|
|
|
SetPrintingRFH(rfh);
|
2019-11-05 23:41:20 +00:00
|
|
|
- GetPrintRenderFrame(rfh)->PrintRequestedPages();
|
2018-11-09 03:42:34 +00:00
|
|
|
+ callback_ = std::move(callback);
|
2019-11-08 18:01:50 +00:00
|
|
|
+
|
|
|
|
+ GetPrintRenderFrame(rfh)->PrintRequestedPages(silent, std::move(settings));
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2021-10-21 18:51:36 +00:00
|
|
|
for (auto& observer : GetObservers())
|
|
|
|
observer.OnPrintNow(rfh);
|
2022-02-25 18:17:35 +00:00
|
|
|
@@ -470,7 +485,8 @@ void PrintViewManagerBase::GetDefaultPrintSettingsReply(
|
2022-02-01 19:00:09 +00:00
|
|
|
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)) {
|
2022-02-25 18:17:35 +00:00
|
|
|
@@ -478,16 +494,19 @@ void PrintViewManagerBase::ScriptedPrintReply(
|
2022-02-01 19:00:09 +00:00
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
2018-11-09 03:42:34 +00:00
|
|
|
void PrintViewManagerBase::UpdatePrintingEnabled() {
|
|
|
|
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
2018-10-13 01:57:04 +00:00
|
|
|
// The Unretained() is safe because ForEachFrame() is synchronous.
|
2018-11-09 03:42:34 +00:00
|
|
|
- web_contents()->ForEachFrame(base::BindRepeating(
|
|
|
|
- &PrintViewManagerBase::SendPrintingEnabled, base::Unretained(this),
|
2018-10-13 01:57:04 +00:00
|
|
|
- printing_enabled_.GetValue()));
|
2018-11-09 03:42:34 +00:00
|
|
|
+ web_contents()->ForEachFrame(
|
|
|
|
+ base::BindRepeating(&PrintViewManagerBase::SendPrintingEnabled,
|
|
|
|
+ base::Unretained(this), true));
|
2018-10-13 01:57:04 +00:00
|
|
|
}
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2018-10-13 01:57:04 +00:00
|
|
|
void PrintViewManagerBase::NavigationStopped() {
|
2022-02-25 18:17:35 +00:00
|
|
|
@@ -601,12 +620,13 @@ void PrintViewManagerBase::DidPrintDocument(
|
2020-10-19 21:31:25 +00:00
|
|
|
void PrintViewManagerBase::GetDefaultPrintSettings(
|
|
|
|
GetDefaultPrintSettingsCallback callback) {
|
|
|
|
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
|
|
|
+#if 0 // Printing is always enabled.
|
|
|
|
if (!printing_enabled_.GetValue()) {
|
2021-06-03 08:05:04 +00:00
|
|
|
GetDefaultPrintSettingsReply(std::move(callback),
|
|
|
|
mojom::PrintParams::New());
|
2020-10-19 21:31:25 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
-
|
|
|
|
+#endif
|
2021-06-03 08:05:04 +00:00
|
|
|
content::RenderFrameHost* render_frame_host = GetCurrentTargetFrame();
|
|
|
|
auto callback_wrapper =
|
|
|
|
base::BindOnce(&PrintViewManagerBase::GetDefaultPrintSettingsReply,
|
2022-02-25 18:17:35 +00:00
|
|
|
@@ -624,18 +644,20 @@ void PrintViewManagerBase::UpdatePrintSettings(
|
2020-10-28 00:33:04 +00:00
|
|
|
base::Value job_settings,
|
|
|
|
UpdatePrintSettingsCallback callback) {
|
|
|
|
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
2021-06-03 08:05:04 +00:00
|
|
|
+#if 0 // Printing is always enabled.
|
2020-10-28 00:33:04 +00:00
|
|
|
if (!printing_enabled_.GetValue()) {
|
2021-06-03 08:05:04 +00:00
|
|
|
UpdatePrintSettingsReply(std::move(callback),
|
|
|
|
CreateEmptyPrintPagesParamsPtr(), false);
|
2020-10-28 00:33:04 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
-
|
2021-06-03 08:05:04 +00:00
|
|
|
+#endif
|
2020-10-28 00:33:04 +00:00
|
|
|
if (!job_settings.FindIntKey(kSettingPrinterType)) {
|
2021-06-03 08:05:04 +00:00
|
|
|
UpdatePrintSettingsReply(std::move(callback),
|
|
|
|
CreateEmptyPrintPagesParamsPtr(), false);
|
2021-08-24 00:52:17 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
+#if 0
|
|
|
|
content::BrowserContext* context =
|
|
|
|
web_contents() ? web_contents()->GetBrowserContext() : nullptr;
|
|
|
|
PrefService* prefs =
|
2022-02-25 18:17:35 +00:00
|
|
|
@@ -645,6 +667,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
|
2021-08-24 00:52:17 +00:00
|
|
|
if (value > 0)
|
|
|
|
job_settings.SetIntKey(kSettingRasterizePdfDpi, value);
|
|
|
|
}
|
|
|
|
+#endif
|
|
|
|
|
|
|
|
auto callback_wrapper =
|
2022-01-10 22:31:39 +00:00
|
|
|
base::BindOnce(&PrintViewManagerBase::UpdatePrintSettingsReply,
|
2022-02-25 18:17:35 +00:00
|
|
|
@@ -670,7 +693,7 @@ void PrintViewManagerBase::ScriptedPrint(mojom::ScriptedPrintParamsPtr params,
|
2022-02-01 19:00:09 +00:00
|
|
|
// 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;
|
|
|
|
}
|
|
|
|
int process_id = render_process_host->GetID();
|
2022-02-25 18:17:35 +00:00
|
|
|
@@ -693,7 +716,6 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie) {
|
2020-09-21 08:00:36 +00:00
|
|
|
PrintManager::PrintingFailed(cookie);
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2018-10-13 01:57:04 +00:00
|
|
|
#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
|
2018-11-09 03:42:34 +00:00
|
|
|
- ShowPrintErrorDialog();
|
2018-10-13 01:57:04 +00:00
|
|
|
#endif
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2018-10-13 01:57:04 +00:00
|
|
|
ReleasePrinterQuery();
|
2022-02-25 18:17:35 +00:00
|
|
|
@@ -708,6 +730,11 @@ void PrintViewManagerBase::RemoveObserver(Observer& observer) {
|
2020-07-10 16:42:22 +00:00
|
|
|
}
|
|
|
|
|
2020-09-21 08:00:36 +00:00
|
|
|
void PrintViewManagerBase::ShowInvalidPrinterSettingsError() {
|
2020-07-10 16:42:22 +00:00
|
|
|
+ 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(
|
2022-02-25 18:17:35 +00:00
|
|
|
@@ -718,8 +745,10 @@ void PrintViewManagerBase::RenderFrameHostStateChanged(
|
2021-11-24 08:45:59 +00:00
|
|
|
content::RenderFrameHost* render_frame_host,
|
|
|
|
content::RenderFrameHost::LifecycleState /*old_state*/,
|
|
|
|
content::RenderFrameHost::LifecycleState new_state) {
|
|
|
|
+#if 0 // Printing is always enabled.
|
|
|
|
if (new_state == content::RenderFrameHost::LifecycleState::kActive)
|
|
|
|
SendPrintingEnabled(printing_enabled_.GetValue(), render_frame_host);
|
|
|
|
+#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
void PrintViewManagerBase::DidStartLoading() {
|
2022-02-25 18:17:35 +00:00
|
|
|
@@ -779,6 +808,11 @@ void PrintViewManagerBase::OnJobDone() {
|
2022-01-10 22:31:39 +00:00
|
|
|
ReleasePrintJob();
|
|
|
|
}
|
|
|
|
|
2022-02-01 19:00:09 +00:00
|
|
|
+void PrintViewManagerBase::UserInitCanceled() {
|
|
|
|
+ printing_canceled_ = true;
|
2022-01-10 22:31:39 +00:00
|
|
|
+ ReleasePrintJob();
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
void PrintViewManagerBase::OnFailed() {
|
|
|
|
TerminatePrintJob(true);
|
|
|
|
}
|
2022-02-25 18:17:35 +00:00
|
|
|
@@ -840,7 +874,10 @@ bool PrintViewManagerBase::CreateNewPrintJob(
|
2019-06-12 19:34:07 +00:00
|
|
|
|
2021-08-11 21:04:56 +00:00
|
|
|
// Disconnect the current |print_job_|.
|
|
|
|
auto weak_this = weak_ptr_factory_.GetWeakPtr();
|
2019-06-12 19:34:07 +00:00
|
|
|
- DisconnectFromCurrentPrintJob();
|
2020-01-27 18:54:56 +00:00
|
|
|
+ if (callback_.is_null()) {
|
|
|
|
+ // Disconnect the current |print_job_| only when calling window.print()
|
|
|
|
+ DisconnectFromCurrentPrintJob();
|
|
|
|
+ }
|
2021-08-11 21:04:56 +00:00
|
|
|
if (!weak_this)
|
|
|
|
return false;
|
2019-07-03 01:22:09 +00:00
|
|
|
|
2022-02-25 18:17:35 +00:00
|
|
|
@@ -915,6 +952,13 @@ void PrintViewManagerBase::ReleasePrintJob() {
|
2018-10-13 01:57:04 +00:00
|
|
|
content::RenderFrameHost* rfh = printing_rfh_;
|
|
|
|
printing_rfh_ = nullptr;
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2019-07-01 21:03:19 +00:00
|
|
|
+ if (!callback_.is_null()) {
|
|
|
|
+ std::string cb_str = "";
|
|
|
|
+ if (!printing_succeeded_)
|
2022-02-01 19:00:09 +00:00
|
|
|
+ cb_str = printing_canceled_ ? "canceled" : "failed";
|
2019-07-01 21:03:19 +00:00
|
|
|
+ std::move(callback_).Run(printing_succeeded_, cb_str);
|
|
|
|
+ }
|
2018-10-13 01:57:04 +00:00
|
|
|
+
|
|
|
|
if (!print_job_)
|
|
|
|
return;
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2022-02-25 18:17:35 +00:00
|
|
|
@@ -964,7 +1008,7 @@ bool PrintViewManagerBase::RunInnerMessageLoop() {
|
2020-01-27 18:54:56 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
bool PrintViewManagerBase::OpportunisticallyCreatePrintJob(int cookie) {
|
|
|
|
- if (print_job_)
|
|
|
|
+ if (print_job_ && print_job_->document())
|
|
|
|
return true;
|
|
|
|
|
|
|
|
if (!cookie) {
|
2018-10-13 01:57:04 +00:00
|
|
|
diff --git a/chrome/browser/printing/print_view_manager_base.h b/chrome/browser/printing/print_view_manager_base.h
|
2022-02-10 02:58:52 +00:00
|
|
|
index 2661776307f773ac8f2c62529ec86349b045ee8f..4fa8f358ee59baed32ef4fd0684d010256206a54 100644
|
2018-10-13 01:57:04 +00:00
|
|
|
--- a/chrome/browser/printing/print_view_manager_base.h
|
|
|
|
+++ b/chrome/browser/printing/print_view_manager_base.h
|
2022-01-10 22:31:39 +00:00
|
|
|
@@ -37,6 +37,8 @@ namespace printing {
|
2018-11-09 03:42:34 +00:00
|
|
|
class PrintQueriesQueue;
|
|
|
|
class PrinterQuery;
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2019-07-01 21:03:19 +00:00
|
|
|
+using CompletionCallback = base::OnceCallback<void(bool, const std::string&)>;
|
2018-11-09 03:42:34 +00:00
|
|
|
+
|
|
|
|
// Base class for managing the print commands for a WebContents.
|
2022-01-10 22:31:39 +00:00
|
|
|
class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
|
|
|
|
public:
|
|
|
|
@@ -58,7 +60,10 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
|
2018-10-13 01:57:04 +00:00
|
|
|
// 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,
|
2019-11-08 18:01:50 +00:00
|
|
|
+ bool silent,
|
|
|
|
+ base::Value settings,
|
2018-11-09 03:42:34 +00:00
|
|
|
+ CompletionCallback callback);
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2018-10-13 01:57:04 +00:00
|
|
|
#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
|
2022-02-10 02:58:52 +00:00
|
|
|
// Prints the document in `print_data` with settings specified in
|
2022-02-01 19:00:09 +00:00
|
|
|
@@ -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
|
2022-02-10 02:58:52 +00:00
|
|
|
@@ -193,7 +199,8 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
|
2022-02-01 19:00:09 +00:00
|
|
|
// 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
|
2022-02-10 02:58:52 +00:00
|
|
|
@@ -248,9 +255,15 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
|
2018-11-09 03:42:34 +00:00
|
|
|
// The current RFH that is printing with a system printing dialog.
|
2022-01-10 22:31:39 +00:00
|
|
|
raw_ptr<content::RenderFrameHost> printing_rfh_ = nullptr;
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2019-06-12 19:34:07 +00:00
|
|
|
+ // Respond with success of the print job.
|
2018-11-09 03:42:34 +00:00
|
|
|
+ CompletionCallback callback_;
|
2018-10-13 01:57:04 +00:00
|
|
|
+
|
2018-11-09 03:42:34 +00:00
|
|
|
// Indication of success of the print job.
|
2020-09-21 08:00:36 +00:00
|
|
|
bool printing_succeeded_ = false;
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2022-02-01 19:00:09 +00:00
|
|
|
+ // Indication of whether the print job was manually canceled
|
|
|
|
+ bool printing_canceled_ = false;
|
2019-07-01 21:03:19 +00:00
|
|
|
+
|
|
|
|
// 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.
|
2019-11-05 23:41:20 +00:00
|
|
|
diff --git a/components/printing/common/print.mojom b/components/printing/common/print.mojom
|
2022-02-01 19:00:09 +00:00
|
|
|
index 51ebcb4ae399018d3fd8566656596a7ef1f148af..c0fbff95137e2e5bccb9702a8cc858df2d989964 100644
|
2019-11-05 23:41:20 +00:00
|
|
|
--- a/components/printing/common/print.mojom
|
|
|
|
+++ b/components/printing/common/print.mojom
|
2021-08-24 00:52:17 +00:00
|
|
|
@@ -274,7 +274,7 @@ interface PrintPreviewUI {
|
2019-11-05 23:41:20 +00:00
|
|
|
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();
|
2019-11-08 18:01:50 +00:00
|
|
|
+ PrintRequestedPages(bool silent, mojo_base.mojom.DictionaryValue settings);
|
2019-11-05 23:41:20 +00:00
|
|
|
|
|
|
|
// 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
|
2022-02-01 19:00:09 +00:00
|
|
|
@@ -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();
|
2018-10-13 01:57:04 +00:00
|
|
|
diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc
|
2022-02-25 18:17:35 +00:00
|
|
|
index 553b199325714b2ac91c996ef5d32abf76169573..93821dc9c6d79d2c13e6c8db12a75cd9c832bf5a 100644
|
2018-10-13 01:57:04 +00:00
|
|
|
--- a/components/printing/renderer/print_render_frame_helper.cc
|
|
|
|
+++ b/components/printing/renderer/print_render_frame_helper.cc
|
2022-02-25 18:17:35 +00:00
|
|
|
@@ -40,6 +40,7 @@
|
2019-06-27 03:53:17 +00:00
|
|
|
#include "printing/metafile_skia.h"
|
2020-05-26 20:06:26 +00:00
|
|
|
#include "printing/mojom/print.mojom.h"
|
2021-02-09 20:16:21 +00:00
|
|
|
#include "printing/print_job_constants.h"
|
2019-06-27 03:53:17 +00:00
|
|
|
+#include "printing/print_settings.h"
|
|
|
|
#include "printing/units.h"
|
2020-08-15 01:51:28 +00:00
|
|
|
#include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
|
2019-09-18 19:58:00 +00:00
|
|
|
#include "third_party/blink/public/common/associated_interfaces/associated_interface_registry.h"
|
2022-02-25 18:17:35 +00:00
|
|
|
@@ -1254,7 +1255,8 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) {
|
2020-10-16 01:30:41 +00:00
|
|
|
if (!weak_this)
|
|
|
|
return;
|
|
|
|
|
|
|
|
- Print(web_frame, blink::WebNode(), PrintRequestType::kScripted);
|
|
|
|
+ Print(web_frame, blink::WebNode(), PrintRequestType::kScripted,
|
|
|
|
+ false /* silent */, base::DictionaryValue() /* new_settings */);
|
2021-05-05 23:26:17 +00:00
|
|
|
if (!weak_this)
|
|
|
|
return;
|
2020-09-21 08:00:36 +00:00
|
|
|
|
2022-02-25 18:17:35 +00:00
|
|
|
@@ -1285,7 +1287,7 @@ void PrintRenderFrameHelper::BindPrintRenderFrameReceiver(
|
2019-11-05 23:41:20 +00:00
|
|
|
receivers_.Add(this, std::move(receiver));
|
2018-10-13 01:57:04 +00:00
|
|
|
}
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2019-11-05 23:41:20 +00:00
|
|
|
-void PrintRenderFrameHelper::PrintRequestedPages() {
|
2019-11-08 18:01:50 +00:00
|
|
|
+void PrintRenderFrameHelper::PrintRequestedPages(bool silent, base::Value settings) {
|
2019-11-05 23:41:20 +00:00
|
|
|
ScopedIPC scoped_ipc(weak_ptr_factory_.GetWeakPtr());
|
2021-07-26 16:02:16 +00:00
|
|
|
if (ipc_nesting_level_ > kAllowedIpcDepthForPrint)
|
2018-10-13 01:57:04 +00:00
|
|
|
return;
|
2022-02-25 18:17:35 +00:00
|
|
|
@@ -1300,7 +1302,7 @@ void PrintRenderFrameHelper::PrintRequestedPages() {
|
2021-11-24 08:45:59 +00:00
|
|
|
// plugin node and print that instead.
|
2020-10-16 01:30:41 +00:00
|
|
|
auto plugin = delegate_->GetPdfElement(frame);
|
2020-09-21 08:00:36 +00:00
|
|
|
|
2020-10-16 01:30:41 +00:00
|
|
|
- Print(frame, plugin, PrintRequestType::kRegular);
|
|
|
|
+ Print(frame, plugin, PrintRequestType::kRegular, silent, std::move(settings));
|
2020-09-21 08:00:36 +00:00
|
|
|
|
2019-11-05 23:41:20 +00:00
|
|
|
if (!render_frame_gone_)
|
2020-10-16 01:30:41 +00:00
|
|
|
frame->DispatchAfterPrintEvent();
|
2022-02-25 18:17:35 +00:00
|
|
|
@@ -1331,7 +1333,8 @@ void PrintRenderFrameHelper::PrintForSystemDialog() {
|
2020-10-16 01:30:41 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
Print(frame, print_preview_context_.source_node(),
|
|
|
|
- PrintRequestType::kRegular);
|
|
|
|
+ PrintRequestType::kRegular, false,
|
|
|
|
+ base::DictionaryValue());
|
2019-11-05 23:41:20 +00:00
|
|
|
if (!render_frame_gone_)
|
2020-09-21 08:00:36 +00:00
|
|
|
print_preview_context_.DispatchAfterPrintEvent();
|
2018-10-13 01:57:04 +00:00
|
|
|
// WARNING: |this| may be gone at this point. Do not do any more work here and
|
2022-02-25 18:17:35 +00:00
|
|
|
@@ -1378,6 +1381,8 @@ void PrintRenderFrameHelper::PrintPreview(base::Value settings) {
|
2021-07-26 16:02:16 +00:00
|
|
|
if (ipc_nesting_level_ > kAllowedIpcDepthForPrint)
|
2018-10-13 01:57:04 +00:00
|
|
|
return;
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2018-10-13 01:57:04 +00:00
|
|
|
+ blink::WebLocalFrame* frame = render_frame()->GetWebFrame();
|
|
|
|
+ print_preview_context_.InitWithFrame(frame);
|
|
|
|
print_preview_context_.OnPrintPreview();
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2020-06-22 17:35:10 +00:00
|
|
|
if (print_preview_context_.IsForArc()) {
|
2022-02-25 18:17:35 +00:00
|
|
|
@@ -1915,7 +1920,8 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
|
2020-08-15 01:51:28 +00:00
|
|
|
return;
|
2018-11-09 03:42:34 +00:00
|
|
|
|
|
|
|
Print(duplicate_node.GetDocument().GetFrame(), duplicate_node,
|
2020-10-16 01:30:41 +00:00
|
|
|
- PrintRequestType::kRegular);
|
2020-09-21 08:00:36 +00:00
|
|
|
+ PrintRequestType::kRegular, false /* silent */,
|
2020-10-16 01:30:41 +00:00
|
|
|
+ base::DictionaryValue() /* new_settings */);
|
2018-11-09 03:42:34 +00:00
|
|
|
// Check if |this| is still valid.
|
2020-08-15 01:51:28 +00:00
|
|
|
if (!weak_this)
|
2018-11-09 03:42:34 +00:00
|
|
|
return;
|
2022-02-25 18:17:35 +00:00
|
|
|
@@ -1930,7 +1936,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
|
2020-10-16 01:30:41 +00:00
|
|
|
|
|
|
|
void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
|
|
|
|
const blink::WebNode& node,
|
|
|
|
- PrintRequestType print_request_type) {
|
|
|
|
+ PrintRequestType print_request_type,
|
|
|
|
+ bool silent,
|
|
|
|
+ base::Value settings) {
|
2018-10-13 01:57:04 +00:00
|
|
|
// If still not finished with earlier print request simply ignore.
|
|
|
|
if (prep_frame_view_)
|
2020-10-16 01:30:41 +00:00
|
|
|
return;
|
2022-02-25 18:17:35 +00:00
|
|
|
@@ -1938,7 +1946,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
|
2019-02-26 21:35:27 +00:00
|
|
|
FrameReference frame_ref(frame);
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2020-09-21 08:00:36 +00:00
|
|
|
uint32_t expected_page_count = 0;
|
2018-10-13 01:57:04 +00:00
|
|
|
- if (!CalculateNumberOfPages(frame, node, &expected_page_count)) {
|
2019-11-08 18:01:50 +00:00
|
|
|
+ if (!CalculateNumberOfPages(frame, node, &expected_page_count, base::Value::AsDictionaryValue(settings))) {
|
2018-10-13 01:57:04 +00:00
|
|
|
DidFinishPrinting(FAIL_PRINT_INIT);
|
|
|
|
return; // Failed to init print page settings.
|
|
|
|
}
|
2022-02-25 18:17:35 +00:00
|
|
|
@@ -1957,8 +1965,15 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
|
2020-09-21 08:00:36 +00:00
|
|
|
print_pages_params_->params->print_scaling_option;
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2018-10-13 01:57:04 +00:00
|
|
|
auto self = weak_ptr_factory_.GetWeakPtr();
|
2021-01-12 23:31:23 +00:00
|
|
|
- mojom::PrintPagesParamsPtr print_settings = GetPrintSettingsFromUser(
|
|
|
|
+ mojom::PrintPagesParamsPtr print_settings;
|
|
|
|
+
|
|
|
|
+ if (silent) {
|
|
|
|
+ print_settings = mojom::PrintPagesParams::New();
|
2021-08-24 00:52:17 +00:00
|
|
|
+ print_settings->params = print_pages_params_->params->Clone();
|
2021-01-12 23:31:23 +00:00
|
|
|
+ } else {
|
|
|
|
+ print_settings = GetPrintSettingsFromUser(
|
|
|
|
frame_ref.GetFrame(), node, expected_page_count, print_request_type);
|
2020-09-21 08:00:36 +00:00
|
|
|
+ }
|
2018-10-13 01:57:04 +00:00
|
|
|
// Check if |this| is still valid.
|
|
|
|
if (!self)
|
|
|
|
return;
|
2022-02-25 18:17:35 +00:00
|
|
|
@@ -2206,36 +2221,51 @@ void PrintRenderFrameHelper::IPCProcessed() {
|
2020-10-16 01:30:41 +00:00
|
|
|
}
|
2018-10-13 01:57:04 +00:00
|
|
|
}
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2018-10-13 01:57:04 +00:00
|
|
|
-bool PrintRenderFrameHelper::InitPrintSettings(bool fit_to_paper_size) {
|
2021-10-25 15:52:52 +00:00
|
|
|
- mojom::PrintPagesParams settings;
|
|
|
|
- settings.params = mojom::PrintParams::New();
|
|
|
|
- GetPrintManagerHost()->GetDefaultPrintSettings(&settings.params);
|
2018-10-13 01:57:04 +00:00
|
|
|
+bool PrintRenderFrameHelper::InitPrintSettings(
|
|
|
|
+ bool fit_to_paper_size,
|
2018-11-09 03:42:34 +00:00
|
|
|
+ const base::DictionaryValue& new_settings) {
|
2021-10-25 15:52:52 +00:00
|
|
|
+ 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);
|
2018-11-09 03:42:34 +00:00
|
|
|
return result;
|
|
|
|
}
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2018-11-09 03:42:34 +00:00
|
|
|
-bool PrintRenderFrameHelper::CalculateNumberOfPages(blink::WebLocalFrame* frame,
|
|
|
|
- const blink::WebNode& node,
|
2020-09-21 08:00:36 +00:00
|
|
|
- uint32_t* number_of_pages) {
|
2018-11-09 03:42:34 +00:00
|
|
|
+bool PrintRenderFrameHelper::CalculateNumberOfPages(
|
|
|
|
+ blink::WebLocalFrame* frame,
|
|
|
|
+ const blink::WebNode& node,
|
2020-09-21 08:00:36 +00:00
|
|
|
+ uint32_t* number_of_pages,
|
2018-11-09 03:42:34 +00:00
|
|
|
+ const base::DictionaryValue& settings) {
|
2018-10-13 01:57:04 +00:00
|
|
|
DCHECK(frame);
|
2019-01-16 18:07:52 +00:00
|
|
|
bool fit_to_paper_size = !IsPrintingNodeOrPdfFrame(frame, node);
|
2018-10-13 01:57:04 +00:00
|
|
|
- if (!InitPrintSettings(fit_to_paper_size)) {
|
2018-11-09 03:42:34 +00:00
|
|
|
+ if (!InitPrintSettings(fit_to_paper_size, settings)) {
|
2018-10-13 01:57:04 +00:00
|
|
|
notify_browser_of_print_failure_ = false;
|
2020-09-21 08:00:36 +00:00
|
|
|
GetPrintManagerHost()->ShowInvalidPrinterSettingsError();
|
2018-10-13 01:57:04 +00:00
|
|
|
return false;
|
2022-02-25 18:17:35 +00:00
|
|
|
@@ -2380,7 +2410,7 @@ mojom::PrintPagesParamsPtr PrintRenderFrameHelper::GetPrintSettingsFromUser(
|
2022-02-01 19:00:09 +00:00
|
|
|
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();
|
|
|
|
},
|
2022-02-25 18:17:35 +00:00
|
|
|
@@ -2625,18 +2655,7 @@ void PrintRenderFrameHelper::RequestPrintPreview(PrintPreviewRequestType type,
|
2021-02-09 20:16:21 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
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(
|
2018-10-13 01:57:04 +00:00
|
|
|
diff --git a/components/printing/renderer/print_render_frame_helper.h b/components/printing/renderer/print_render_frame_helper.h
|
2022-02-10 02:58:52 +00:00
|
|
|
index 2b703118bf94a82262adc293368dcfcdb67807ff..a07f307ff48f3ce5409354a5ba8d54b43325da73 100644
|
2018-10-13 01:57:04 +00:00
|
|
|
--- a/components/printing/renderer/print_render_frame_helper.h
|
|
|
|
+++ b/components/printing/renderer/print_render_frame_helper.h
|
2022-02-10 02:58:52 +00:00
|
|
|
@@ -254,7 +254,7 @@ class PrintRenderFrameHelper
|
2019-11-05 23:41:20 +00:00
|
|
|
mojo::PendingAssociatedReceiver<mojom::PrintRenderFrame> receiver);
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2019-11-05 23:41:20 +00:00
|
|
|
// printing::mojom::PrintRenderFrame:
|
|
|
|
- void PrintRequestedPages() override;
|
2019-11-08 18:01:50 +00:00
|
|
|
+ void PrintRequestedPages(bool silent, base::Value settings) override;
|
2018-10-13 01:57:04 +00:00
|
|
|
#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
|
2021-05-14 01:21:36 +00:00
|
|
|
void PrintForSystemDialog() override;
|
2020-05-26 20:06:26 +00:00
|
|
|
void SetPrintPreviewUI(
|
2022-02-10 02:58:52 +00:00
|
|
|
@@ -321,7 +321,9 @@ class PrintRenderFrameHelper
|
2020-10-16 01:30:41 +00:00
|
|
|
// WARNING: |this| may be gone after this method returns.
|
2018-10-13 01:57:04 +00:00
|
|
|
void Print(blink::WebLocalFrame* frame,
|
|
|
|
const blink::WebNode& node,
|
2020-10-16 01:30:41 +00:00
|
|
|
- PrintRequestType print_request_type);
|
|
|
|
+ PrintRequestType print_request_type,
|
2018-11-09 03:42:34 +00:00
|
|
|
+ bool silent,
|
2020-10-16 01:30:41 +00:00
|
|
|
+ base::Value settings);
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2018-10-13 01:57:04 +00:00
|
|
|
// Notification when printing is done - signal tear-down/free resources.
|
2020-10-16 01:30:41 +00:00
|
|
|
void DidFinishPrinting(PrintingResult result);
|
2022-02-10 02:58:52 +00:00
|
|
|
@@ -330,12 +332,14 @@ class PrintRenderFrameHelper
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2018-10-13 01:57:04 +00:00
|
|
|
// 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,
|
2018-11-09 03:42:34 +00:00
|
|
|
+ const base::DictionaryValue& settings);
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2018-10-13 01:57:04 +00:00
|
|
|
// Calculate number of pages in source document.
|
2018-11-09 03:42:34 +00:00
|
|
|
bool CalculateNumberOfPages(blink::WebLocalFrame* frame,
|
|
|
|
const blink::WebNode& node,
|
2020-09-21 08:00:36 +00:00
|
|
|
- uint32_t* number_of_pages);
|
|
|
|
+ uint32_t* number_of_pages,
|
2018-11-09 03:42:34 +00:00
|
|
|
+ const base::DictionaryValue& settings);
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2018-10-13 01:57:04 +00:00
|
|
|
#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
|
|
|
|
// Set options for print preset from source PDF document.
|
2019-08-07 14:47:24 +00:00
|
|
|
diff --git a/printing/printing_context.cc b/printing/printing_context.cc
|
2022-02-10 02:58:52 +00:00
|
|
|
index 3d8281c8af9a4339bdd492c67edafc4ec6efb09d..6f8b9d42e051579cf1d0774afa771a7e45d31ff2 100644
|
2019-08-07 14:47:24 +00:00
|
|
|
--- a/printing/printing_context.cc
|
|
|
|
+++ b/printing/printing_context.cc
|
2022-01-10 22:31:39 +00:00
|
|
|
@@ -120,7 +120,6 @@ mojom::ResultCode PrintingContext::UsePdfSettings() {
|
2019-08-07 14:47:24 +00:00
|
|
|
|
2021-10-21 18:51:36 +00:00
|
|
|
mojom::ResultCode PrintingContext::UpdatePrintSettings(
|
2019-08-07 14:47:24 +00:00
|
|
|
base::Value job_settings) {
|
|
|
|
- ResetSettings();
|
2020-09-21 08:00:36 +00:00
|
|
|
{
|
|
|
|
std::unique_ptr<PrintSettings> settings =
|
|
|
|
PrintSettingsFromJobSettings(job_settings);
|
2019-08-07 14:47:24 +00:00
|
|
|
diff --git a/printing/printing_context.h b/printing/printing_context.h
|
2022-02-10 02:58:52 +00:00
|
|
|
index 3f36303105b7979a1a771bf26b42596abe5b3cce..52f740bb832db4a8d76431d9bc77cab10bb7e0c7 100644
|
2019-08-07 14:47:24 +00:00
|
|
|
--- a/printing/printing_context.h
|
|
|
|
+++ b/printing/printing_context.h
|
2022-02-10 02:58:52 +00:00
|
|
|
@@ -170,6 +170,9 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
|
2019-08-07 14:47:24 +00:00
|
|
|
|
2022-02-10 02:58:52 +00:00
|
|
|
bool PrintingAborted() const { return abort_printing_; }
|
2019-08-07 14:47:24 +00:00
|
|
|
|
2021-09-01 19:55:07 +00:00
|
|
|
+ // Reinitializes the settings for object reuse.
|
|
|
|
+ void ResetSettings();
|
2019-08-07 14:47:24 +00:00
|
|
|
+
|
2022-01-10 22:31:39 +00:00
|
|
|
int job_id() const { return job_id_; }
|
2021-09-01 19:55:07 +00:00
|
|
|
|
2022-01-10 22:31:39 +00:00
|
|
|
protected:
|
2022-02-10 02:58:52 +00:00
|
|
|
@@ -180,9 +183,6 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
|
2022-01-10 22:31:39 +00:00
|
|
|
static std::unique_ptr<PrintingContext> CreateImpl(Delegate* delegate,
|
|
|
|
bool skip_system_calls);
|
2021-09-01 19:55:07 +00:00
|
|
|
|
|
|
|
- // Reinitializes the settings for object reuse.
|
|
|
|
- void ResetSettings();
|
|
|
|
-
|
2022-01-10 22:31:39 +00:00
|
|
|
// Determine if system calls should be skipped by this instance.
|
|
|
|
bool skip_system_calls() const {
|
|
|
|
#if BUILDFLAG(ENABLE_OOP_PRINTING)
|