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
|
2020-09-30 18:42:57 +00:00
|
|
|
index 4f3b68135f9bb29f2c36055f50e1725a9b36a856..c788d412544fdcc8992512784449752631aaf595 100644
|
2020-06-22 17:35:10 +00:00
|
|
|
--- a/chrome/browser/printing/print_job.cc
|
|
|
|
+++ b/chrome/browser/printing/print_job.cc
|
2020-09-30 18:42:57 +00:00
|
|
|
@@ -349,18 +349,25 @@ void PrintJob::StartPdfToEmfConversion(
|
|
|
|
// seems to work with the fix for this bug applied.
|
|
|
|
const PrintSettings& settings = document()->settings();
|
|
|
|
bool print_text_with_gdi =
|
|
|
|
- settings.print_text_with_gdi() && !settings.printer_is_xps() &&
|
|
|
|
+#if defined(OS_WIN)
|
|
|
|
+ settings.is_modifiable()
|
|
|
|
+#else
|
|
|
|
+ settings.print_text_with_gdi()
|
|
|
|
+#endif
|
|
|
|
+ && !settings.printer_is_xps() &&
|
|
|
|
base::FeatureList::IsEnabled(::features::kGdiTextPrinting);
|
|
|
|
|
2020-06-22 17:35:10 +00:00
|
|
|
// 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
|
|
|
|
// pointer checks to avoid crashing.
|
|
|
|
+#if 0
|
|
|
|
content::WebContents* web_contents = worker_->GetWebContents();
|
|
|
|
content::BrowserContext* context =
|
|
|
|
web_contents ? web_contents->GetBrowserContext() : nullptr;
|
|
|
|
PrefService* prefs =
|
|
|
|
context ? Profile::FromBrowserContext(context)->GetPrefs() : nullptr;
|
|
|
|
- bool print_with_reduced_rasterization = PrintWithReducedRasterization(prefs);
|
|
|
|
+#endif
|
|
|
|
+ bool print_with_reduced_rasterization = PrintWithReducedRasterization(nullptr);
|
|
|
|
|
|
|
|
using RenderMode = PdfRenderSettings::Mode;
|
|
|
|
RenderMode mode;
|
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
|
2020-10-16 01:30:41 +00:00
|
|
|
index 89c7798d8ddf21eb74e726c142377afa05b59c26..dd75b8e82552a54868ce86caf90ba175af64e937 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
|
2020-09-21 08:00:36 +00:00
|
|
|
@@ -21,7 +21,6 @@
|
2018-10-13 01:57:04 +00:00
|
|
|
#include "chrome/browser/browser_process.h"
|
|
|
|
#include "chrome/browser/chrome_notification_types.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"
|
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"
|
2020-09-21 08:00:36 +00:00
|
|
|
@@ -29,6 +28,7 @@
|
2018-10-13 01:57:04 +00:00
|
|
|
#include "content/public/browser/render_frame_host.h"
|
2019-01-12 01:00:43 +00:00
|
|
|
#include "content/public/browser/web_contents.h"
|
2019-10-28 22:12:35 +00:00
|
|
|
#include "printing/backend/print_backend.h"
|
2019-01-12 01:00:43 +00:00
|
|
|
+#include "electron/grit/electron_resources.h"
|
|
|
|
#include "printing/print_job_constants.h"
|
|
|
|
#include "printing/printed_document.h"
|
|
|
|
#include "printing/printing_utils.h"
|
2020-09-21 08:00:36 +00:00
|
|
|
@@ -236,16 +236,21 @@ void PrintJobWorker::UpdatePrintSettings(base::Value new_settings,
|
2020-07-14 01:13:34 +00:00
|
|
|
#endif // defined(OS_LINUX) && defined(USE_CUPS) && !defined(OS_CHROMEOS)
|
2019-10-28 22:12:35 +00:00
|
|
|
}
|
|
|
|
|
2020-04-13 23:39:26 +00:00
|
|
|
- PrintingContext::Result result;
|
|
|
|
{
|
|
|
|
#if defined(OS_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();
|
|
|
|
+ PrintingContext::Result get_default_result = printing_context_->UseDefaultSettings();
|
|
|
|
+ if (get_default_result == PrintingContext::Result::OK) {
|
|
|
|
+ PrintingContext::Result update_result =
|
|
|
|
+ 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);
|
|
|
|
}
|
|
|
|
|
|
|
|
#if defined(OS_CHROMEOS)
|
2020-09-21 08:00:36 +00:00
|
|
|
@@ -261,6 +266,13 @@ void PrintJobWorker::UpdatePrintSettingsFromPOD(
|
2019-06-12 19:34:07 +00:00
|
|
|
|
|
|
|
void PrintJobWorker::GetSettingsDone(SettingsCallback callback,
|
|
|
|
PrintingContext::Result result) {
|
|
|
|
+ if (result == PrintingContext::CANCEL) {
|
|
|
|
+ print_job_->PostTask(
|
|
|
|
+ FROM_HERE,
|
|
|
|
+ base::BindOnce(&NotificationCallback, base::RetainedRef(print_job_),
|
|
|
|
+ JobEventDetails::USER_INIT_CANCELED, 0,
|
|
|
|
+ base::RetainedRef(document_)));
|
|
|
|
+ }
|
2019-08-24 01:14:23 +00:00
|
|
|
std::move(callback).Run(printing_context_->TakeAndResetSettings(), result);
|
2019-06-12 19:34:07 +00:00
|
|
|
}
|
|
|
|
|
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
|
2020-10-16 01:30:41 +00:00
|
|
|
index ad70dada204132ce44d6613378072a080771148a..02ecf3e77bee365eef4dc8a985cfe092785b8b8e 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
|
2020-09-21 08:00:36 +00:00
|
|
|
@@ -28,10 +28,7 @@
|
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"
|
|
|
|
-#include "chrome/grit/generated_resources.h"
|
2020-05-26 20:06:26 +00:00
|
|
|
#include "chromeos/constants/chromeos_features.h"
|
2018-10-13 01:57:04 +00:00
|
|
|
#include "components/prefs/pref_service.h"
|
|
|
|
#include "components/printing/browser/print_composite_client.h"
|
2020-09-21 08:00:36 +00:00
|
|
|
@@ -48,6 +45,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"
|
2020-10-16 01:30:41 +00:00
|
|
|
@@ -72,6 +70,8 @@ using PrintSettingsCallback =
|
2019-07-03 01:22:09 +00:00
|
|
|
base::OnceCallback<void(std::unique_ptr<PrinterQuery>)>;
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2018-10-13 01:57:04 +00:00
|
|
|
void ShowWarningMessageBox(const base::string16& 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)
|
2020-10-16 01:30:41 +00:00
|
|
|
@@ -80,6 +80,7 @@ void ShowWarningMessageBox(const base::string16& 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
|
|
|
|
2018-10-13 01:57:04 +00:00
|
|
|
chrome::ShowWarningMessageBox(nullptr, base::string16(), 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)
|
2020-10-16 01:30:41 +00:00
|
|
|
@@ -172,12 +173,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_);
|
2019-07-03 01:22:09 +00:00
|
|
|
+#if 0
|
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() {
|
2020-10-16 01:30:41 +00:00
|
|
|
@@ -185,7 +188,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) {
|
2018-10-13 01:57:04 +00:00
|
|
|
DisconnectFromCurrentPrintJob();
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2020-05-26 20:06:26 +00:00
|
|
|
// Don't print / print preview crashed tabs.
|
2020-10-16 01:30:41 +00:00
|
|
|
@@ -193,7 +199,14 @@ bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh) {
|
2019-11-05 23:41:20 +00:00
|
|
|
return false;
|
|
|
|
|
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
|
|
|
+
|
|
|
|
+ if (!callback_.is_null()) {
|
|
|
|
+ registrar_.Add(this, chrome::NOTIFICATION_PRINT_JOB_EVENT,
|
|
|
|
+ content::NotificationService::AllSources());
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ GetPrintRenderFrame(rfh)->PrintRequestedPages(silent, std::move(settings));
|
2019-11-05 23:41:20 +00:00
|
|
|
return true;
|
2018-10-13 01:57:04 +00:00
|
|
|
}
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2020-10-16 01:30:41 +00:00
|
|
|
@@ -314,9 +327,9 @@ void PrintViewManagerBase::StartLocalPrintJob(
|
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() {
|
2020-10-16 01:30:41 +00:00
|
|
|
@@ -441,7 +454,7 @@ 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();
|
|
|
|
+ // 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();
|
2020-10-16 01:30:41 +00:00
|
|
|
@@ -460,6 +473,11 @@ void PrintViewManagerBase::OnScriptedPrint(
|
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(
|
2020-10-16 01:30:41 +00:00
|
|
|
@@ -529,9 +547,13 @@ void PrintViewManagerBase::OnNotifyPrintJobEvent(
|
2019-06-12 19:34:07 +00:00
|
|
|
content::NotificationService::NoDetails());
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
- case JobEventDetails::USER_INIT_DONE:
|
|
|
|
- case JobEventDetails::DEFAULT_INIT_DONE:
|
|
|
|
case JobEventDetails::USER_INIT_CANCELED: {
|
2019-07-01 21:03:19 +00:00
|
|
|
+ printing_cancelled_ = true;
|
2019-06-12 19:34:07 +00:00
|
|
|
+ ReleasePrintJob();
|
|
|
|
+ break;
|
|
|
|
+ }
|
|
|
|
+ case JobEventDetails::USER_INIT_DONE:
|
|
|
|
+ case JobEventDetails::DEFAULT_INIT_DONE: {
|
|
|
|
NOTREACHED();
|
|
|
|
break;
|
|
|
|
}
|
2020-10-16 01:30:41 +00:00
|
|
|
@@ -627,8 +649,10 @@ bool PrintViewManagerBase::CreateNewPrintJob(
|
2019-06-12 19:34:07 +00:00
|
|
|
DCHECK(!quit_inner_loop_);
|
|
|
|
DCHECK(query);
|
|
|
|
|
|
|
|
- // Disconnect the current |print_job_|.
|
|
|
|
- DisconnectFromCurrentPrintJob();
|
2020-01-27 18:54:56 +00:00
|
|
|
+ if (callback_.is_null()) {
|
|
|
|
+ // Disconnect the current |print_job_| only when calling window.print()
|
|
|
|
+ DisconnectFromCurrentPrintJob();
|
|
|
|
+ }
|
2019-07-03 01:22:09 +00:00
|
|
|
|
2019-06-12 19:34:07 +00:00
|
|
|
// We can't print if there is no renderer.
|
|
|
|
if (!web_contents()->GetRenderViewHost() ||
|
2020-10-16 01:30:41 +00:00
|
|
|
@@ -649,8 +673,6 @@ bool PrintViewManagerBase::CreateNewPrintJob(
|
2020-05-26 20:06:26 +00:00
|
|
|
print_job_->SetSource(source, /*source_id=*/"");
|
|
|
|
#endif
|
2019-09-18 19:58:00 +00:00
|
|
|
|
2019-06-12 19:34:07 +00:00
|
|
|
- registrar_.Add(this, chrome::NOTIFICATION_PRINT_JOB_EVENT,
|
|
|
|
- content::Source<PrintJob>(print_job_.get()));
|
|
|
|
printing_succeeded_ = false;
|
|
|
|
return true;
|
|
|
|
}
|
2020-10-16 01:30:41 +00:00
|
|
|
@@ -699,14 +721,22 @@ 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()) {
|
2020-08-20 06:28:24 +00:00
|
|
|
+ registrar_.Remove(this, chrome::NOTIFICATION_PRINT_JOB_EVENT,
|
|
|
|
+ content::NotificationService::AllSources());
|
|
|
|
+
|
2019-07-01 21:03:19 +00:00
|
|
|
+ std::string cb_str = "";
|
|
|
|
+ if (!printing_succeeded_)
|
|
|
|
+ cb_str = printing_cancelled_ ? "cancelled" : "failed";
|
|
|
|
+ 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
|
|
|
|
2019-11-05 23:41:20 +00:00
|
|
|
if (rfh)
|
|
|
|
GetPrintRenderFrame(rfh)->PrintingDone(printing_succeeded_);
|
2019-06-12 19:34:07 +00:00
|
|
|
|
2019-08-05 13:19:01 +00:00
|
|
|
- registrar_.Remove(this, chrome::NOTIFICATION_PRINT_JOB_EVENT,
|
2019-06-12 19:34:07 +00:00
|
|
|
- content::Source<PrintJob>(print_job_.get()));
|
|
|
|
// Don't close the worker thread.
|
|
|
|
print_job_ = nullptr;
|
|
|
|
}
|
2020-10-16 01:30:41 +00:00
|
|
|
@@ -742,7 +772,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
|
2020-10-16 01:30:41 +00:00
|
|
|
index 1498facaafeacebeb38b96ff46c0f48c5a650ad0..095d9dfcc3ee14b646b63c29e406434c1623704a 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
|
2020-09-21 08:00:36 +00:00
|
|
|
@@ -38,6 +38,8 @@ class PrintJob;
|
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.
|
|
|
|
class PrintViewManagerBase : public content::NotificationObserver,
|
|
|
|
public PrintManager {
|
2020-09-21 08:00:36 +00:00
|
|
|
@@ -47,7 +49,10 @@ class PrintViewManagerBase : public content::NotificationObserver,
|
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)
|
|
|
|
// Prints the document in |print_data| with settings specified in
|
2020-09-21 08:00:36 +00:00
|
|
|
@@ -214,9 +219,15 @@ class PrintViewManagerBase : public content::NotificationObserver,
|
2018-11-09 03:42:34 +00:00
|
|
|
// The current RFH that is printing with a system printing dialog.
|
2020-09-21 08:00:36 +00:00
|
|
|
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
|
|
|
|
2019-07-01 21:03:19 +00:00
|
|
|
+ // Indication of whether the print job was manually cancelled
|
|
|
|
+ bool printing_cancelled_ = 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.
|
2018-10-13 01:57:04 +00:00
|
|
|
diff --git a/chrome/browser/printing/printing_message_filter.cc b/chrome/browser/printing/printing_message_filter.cc
|
2020-10-16 01:30:41 +00:00
|
|
|
index 90996efd58d5428e511bf0e656b64871aebe66e9..4f6e07c5eeb215d7bb8577ff39a07b1a6d808615 100644
|
2018-10-13 01:57:04 +00:00
|
|
|
--- a/chrome/browser/printing/printing_message_filter.cc
|
|
|
|
+++ b/chrome/browser/printing/printing_message_filter.cc
|
2020-09-21 08:00:36 +00:00
|
|
|
@@ -22,6 +22,7 @@
|
2018-11-09 03:42:34 +00:00
|
|
|
#include "components/printing/browser/print_manager_utils.h"
|
2020-09-21 08:00:36 +00:00
|
|
|
#include "components/printing/common/print.mojom.h"
|
2018-11-09 03:42:34 +00:00
|
|
|
#include "components/printing/common/print_messages.h"
|
|
|
|
+#include "content/public/browser/browser_context.h"
|
2019-03-06 17:50:12 +00:00
|
|
|
#include "content/public/browser/browser_task_traits.h"
|
2018-11-09 03:42:34 +00:00
|
|
|
#include "content/public/browser/render_frame_host.h"
|
|
|
|
#include "content/public/browser/web_contents.h"
|
2020-09-21 08:00:36 +00:00
|
|
|
@@ -91,19 +92,22 @@ void PrintingMessageFilter::SetDelegateForTesting(TestDelegate* delegate) {
|
2019-04-20 17:20:37 +00:00
|
|
|
g_test_delegate = delegate;
|
2019-03-06 17:50:12 +00:00
|
|
|
}
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2018-10-13 01:57:04 +00:00
|
|
|
-PrintingMessageFilter::PrintingMessageFilter(int render_process_id,
|
|
|
|
- Profile* profile)
|
2018-11-09 03:42:34 +00:00
|
|
|
+PrintingMessageFilter::PrintingMessageFilter(
|
|
|
|
+ int render_process_id,
|
|
|
|
+ content::BrowserContext* browser_context)
|
2018-10-13 01:57:04 +00:00
|
|
|
: BrowserMessageFilter(PrintMsgStart),
|
|
|
|
render_process_id_(render_process_id),
|
|
|
|
queue_(g_browser_process->print_job_manager()->queue()) {
|
|
|
|
DCHECK(queue_.get());
|
|
|
|
printing_shutdown_notifier_ =
|
|
|
|
PrintingMessageFilterShutdownNotifierFactory::GetInstance()
|
2018-11-09 03:42:34 +00:00
|
|
|
- ->Get(profile)
|
|
|
|
+ ->Get(browser_context)
|
|
|
|
->Subscribe(base::Bind(&PrintingMessageFilter::ShutdownOnUIThread,
|
|
|
|
base::Unretained(this)));
|
2019-06-12 19:34:07 +00:00
|
|
|
+ #if 0
|
2018-10-13 01:57:04 +00:00
|
|
|
is_printing_enabled_.Init(prefs::kPrintingEnabled, profile->GetPrefs());
|
2020-06-01 20:34:34 +00:00
|
|
|
is_printing_enabled_.MoveToSequence(content::GetIOThreadTaskRunner({}));
|
2019-06-12 19:34:07 +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
|
|
|
PrintingMessageFilter::~PrintingMessageFilter() {
|
2020-10-16 01:30:41 +00:00
|
|
|
@@ -180,12 +184,13 @@ void PrintingMessageFilter::OnScriptedPrintReply(
|
2019-07-03 01:22:09 +00:00
|
|
|
void PrintingMessageFilter::OnUpdatePrintSettings(int document_cookie,
|
2019-01-24 09:42:21 +00:00
|
|
|
base::Value job_settings,
|
|
|
|
IPC::Message* reply_msg) {
|
2019-07-03 01:22:09 +00:00
|
|
|
+#if 0
|
2018-11-09 03:42:34 +00:00
|
|
|
if (!is_printing_enabled_.GetValue()) {
|
2020-04-21 00:25:38 +00:00
|
|
|
// Reply with null query.
|
2019-07-03 01:22:09 +00:00
|
|
|
OnUpdatePrintSettingsReply(nullptr, reply_msg);
|
2018-10-13 01:57:04 +00:00
|
|
|
return;
|
|
|
|
}
|
2020-04-21 00:25:38 +00:00
|
|
|
-
|
2019-07-03 01:22:09 +00:00
|
|
|
+#endif
|
2020-04-21 00:25:38 +00:00
|
|
|
if (!job_settings.is_dict() ||
|
|
|
|
!job_settings.FindIntKey(kSettingPrinterType)) {
|
|
|
|
// Reply with null query.
|
2020-10-16 01:30:41 +00:00
|
|
|
@@ -219,7 +224,9 @@ void PrintingMessageFilter::OnUpdatePrintSettingsReply(
|
2019-08-07 14:47:24 +00:00
|
|
|
IPC::Message* reply_msg) {
|
2020-09-21 08:00:36 +00:00
|
|
|
mojom::PrintPagesParams params;
|
|
|
|
params.params = mojom::PrintParams::New();
|
|
|
|
- if (printer_query && printer_query->last_status() == PrintingContext::OK) {
|
2019-08-07 14:47:24 +00:00
|
|
|
+ // We call update without first printing from defaults,
|
|
|
|
+ // so the last printer status will still be defaulted to PrintingContext::FAILED
|
2020-09-21 08:00:36 +00:00
|
|
|
+ if (printer_query) {
|
|
|
|
RenderParamsFromPrintSettings(printer_query->settings(),
|
|
|
|
params.params.get());
|
|
|
|
params.params->document_cookie = printer_query->cookie();
|
2020-10-16 01:30:41 +00:00
|
|
|
@@ -256,7 +263,7 @@ void PrintingMessageFilter::OnUpdatePrintSettingsReply(
|
2020-06-22 17:35:10 +00:00
|
|
|
#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
|
2020-09-21 08:00:36 +00:00
|
|
|
void PrintingMessageFilter::OnCheckForCancel(const mojom::PreviewIds& ids,
|
2020-06-22 17:35:10 +00:00
|
|
|
bool* cancel) {
|
|
|
|
- *cancel = PrintPreviewUI::ShouldCancelRequest(ids);
|
|
|
|
+ *cancel = false;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2018-10-13 01:57:04 +00:00
|
|
|
diff --git a/chrome/browser/printing/printing_message_filter.h b/chrome/browser/printing/printing_message_filter.h
|
2020-10-16 01:30:41 +00:00
|
|
|
index 87b1cd59ed79d6b81860fd2deb415020450523c1..a0bd1370a637168a4159c1b24f412dd3507f1ea2 100644
|
2018-10-13 01:57:04 +00:00
|
|
|
--- a/chrome/browser/printing/printing_message_filter.h
|
|
|
|
+++ b/chrome/browser/printing/printing_message_filter.h
|
2020-09-21 08:00:36 +00:00
|
|
|
@@ -22,6 +22,10 @@
|
|
|
|
|
2019-02-04 05:49:22 +00:00
|
|
|
class Profile;
|
2018-11-09 03:42:34 +00:00
|
|
|
|
2018-11-09 07:16:43 +00:00
|
|
|
+namespace content {
|
|
|
|
+class BrowserContext;
|
|
|
|
+}
|
|
|
|
+
|
2018-11-09 03:42:34 +00:00
|
|
|
namespace printing {
|
2018-11-09 07:16:43 +00:00
|
|
|
|
|
|
|
class PrintQueriesQueue;
|
2020-09-21 08:00:36 +00:00
|
|
|
@@ -42,7 +46,8 @@ class PrintingMessageFilter : public content::BrowserMessageFilter {
|
2019-04-20 17:20:37 +00:00
|
|
|
|
|
|
|
static void SetDelegateForTesting(TestDelegate* delegate);
|
2019-03-06 17:50:12 +00:00
|
|
|
|
2018-10-13 01:57:04 +00:00
|
|
|
- PrintingMessageFilter(int render_process_id, Profile* profile);
|
2018-11-09 03:42:34 +00:00
|
|
|
+ PrintingMessageFilter(int render_process_id,
|
|
|
|
+ content::BrowserContext* browser_context);
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2019-02-04 05:49:22 +00:00
|
|
|
// content::BrowserMessageFilter:
|
|
|
|
bool OnMessageReceived(const IPC::Message& message) override;
|
2019-11-05 23:41:20 +00:00
|
|
|
diff --git a/components/printing/common/print.mojom b/components/printing/common/print.mojom
|
2020-10-16 01:30:41 +00:00
|
|
|
index 4b140a2a0f431cd7b06a8d1b6f9e84981f4ce7e7..14779debdacc7b5f78aa0799f197241dba914aff 100644
|
2019-11-05 23:41:20 +00:00
|
|
|
--- a/components/printing/common/print.mojom
|
|
|
|
+++ b/components/printing/common/print.mojom
|
2020-09-21 08:00:36 +00:00
|
|
|
@@ -230,7 +230,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
|
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
|
2020-10-16 01:30:41 +00:00
|
|
|
index 58e8aa32aa5f291b000753dc4487835a53df34c5..b5529c8b2697af7e94311707a5d14f9cedab434c 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
|
2020-09-21 08:00:36 +00:00
|
|
|
@@ -38,6 +38,7 @@
|
2020-07-14 01:13:34 +00:00
|
|
|
#include "printing/buildflags/buildflags.h"
|
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"
|
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"
|
2020-10-16 01:30:41 +00:00
|
|
|
@@ -1143,7 +1144,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 */);
|
2020-09-21 08:00:36 +00:00
|
|
|
|
2018-11-09 03:42:34 +00:00
|
|
|
if (weak_this)
|
2020-10-16 01:30:41 +00:00
|
|
|
web_frame->DispatchAfterPrintEvent();
|
|
|
|
@@ -1170,7 +1172,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());
|
2018-10-13 01:57:04 +00:00
|
|
|
if (ipc_nesting_level_ > 1)
|
|
|
|
return;
|
2020-10-16 01:30:41 +00:00
|
|
|
@@ -1185,7 +1187,7 @@ void PrintRenderFrameHelper::PrintRequestedPages() {
|
|
|
|
// that instead.
|
|
|
|
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();
|
|
|
|
@@ -1204,7 +1206,8 @@ void PrintRenderFrameHelper::PrintForSystemDialog() {
|
|
|
|
}
|
|
|
|
|
|
|
|
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
|
2020-10-16 01:30:41 +00:00
|
|
|
@@ -1252,6 +1255,8 @@ void PrintRenderFrameHelper::PrintPreview(base::Value settings) {
|
2018-10-13 01:57:04 +00:00
|
|
|
if (ipc_nesting_level_ > 1)
|
|
|
|
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()) {
|
2020-10-16 01:30:41 +00:00
|
|
|
@@ -1788,7 +1793,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;
|
2020-10-16 01:30:41 +00:00
|
|
|
@@ -1803,7 +1809,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) {
|
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;
|
|
|
|
@@ -1811,7 +1819,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.
|
|
|
|
}
|
2020-10-16 01:30:41 +00:00
|
|
|
@@ -1830,10 +1838,41 @@ 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
|
|
|
|
2020-09-21 08:00:36 +00:00
|
|
|
mojom::PrintPagesParams print_settings;
|
|
|
|
- print_settings.params = mojom::PrintParams::New();
|
2020-10-16 01:30:41 +00:00
|
|
|
+
|
2018-10-13 01:57:04 +00:00
|
|
|
auto self = weak_ptr_factory_.GetWeakPtr();
|
|
|
|
- GetPrintSettingsFromUser(frame_ref.GetFrame(), node, expected_page_count,
|
2019-01-08 23:59:47 +00:00
|
|
|
- print_request_type, &print_settings);
|
2019-06-27 03:53:17 +00:00
|
|
|
+ if (silent)
|
2020-09-21 08:00:36 +00:00
|
|
|
+ print_settings.params = mojom::PrintParams::New(
|
|
|
|
+ print_pages_params_->params->page_size,
|
|
|
|
+ print_pages_params_->params->content_size,
|
|
|
|
+ print_pages_params_->params->printable_area,
|
|
|
|
+ print_pages_params_->params->margin_top,
|
|
|
|
+ print_pages_params_->params->margin_left,
|
|
|
|
+ print_pages_params_->params->page_orientation,
|
|
|
|
+ print_pages_params_->params->dpi,
|
|
|
|
+ print_pages_params_->params->scale_factor,
|
|
|
|
+ print_pages_params_->params->document_cookie,
|
|
|
|
+ print_pages_params_->params->selection_only,
|
|
|
|
+ print_pages_params_->params->supports_alpha_blend,
|
|
|
|
+ print_pages_params_->params->preview_ui_id,
|
|
|
|
+ print_pages_params_->params->preview_request_id,
|
|
|
|
+ print_pages_params_->params->is_first_request,
|
|
|
|
+ print_pages_params_->params->print_scaling_option,
|
|
|
|
+ print_pages_params_->params->print_to_pdf,
|
|
|
|
+ print_pages_params_->params->display_header_footer,
|
|
|
|
+ print_pages_params_->params->title,
|
|
|
|
+ print_pages_params_->params->url,
|
|
|
|
+ print_pages_params_->params->header_template,
|
|
|
|
+ print_pages_params_->params->footer_template,
|
|
|
|
+ print_pages_params_->params->rasterize_pdf,
|
|
|
|
+ print_pages_params_->params->should_print_backgrounds,
|
|
|
|
+ print_pages_params_->params->printed_doc_type,
|
|
|
|
+ print_pages_params_->params->prefer_css_page_size,
|
|
|
|
+ print_pages_params_->params->pages_per_sheet);
|
|
|
|
+ else {
|
|
|
|
+ print_settings.params = mojom::PrintParams::New();
|
2018-10-13 01:57:04 +00:00
|
|
|
+ GetPrintSettingsFromUser(frame_ref.GetFrame(), node, expected_page_count,
|
2019-06-27 03:53:17 +00:00
|
|
|
+ print_request_type, &print_settings);
|
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;
|
2020-10-16 01:30:41 +00:00
|
|
|
@@ -2077,7 +2116,9 @@ void PrintRenderFrameHelper::IPCProcessed() {
|
|
|
|
}
|
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) {
|
|
|
|
+bool PrintRenderFrameHelper::InitPrintSettings(
|
|
|
|
+ bool fit_to_paper_size,
|
2018-11-09 03:42:34 +00:00
|
|
|
+ const base::DictionaryValue& new_settings) {
|
2020-09-21 08:00:36 +00:00
|
|
|
mojom::PrintPagesParams settings;
|
|
|
|
settings.params = mojom::PrintParams::New();
|
2020-10-16 01:30:41 +00:00
|
|
|
GetPrintManagerHost()->GetDefaultPrintSettings(&settings.params);
|
|
|
|
@@ -2101,12 +2142,14 @@ bool PrintRenderFrameHelper::InitPrintSettings(bool fit_to_paper_size) {
|
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;
|
|
|
|
diff --git a/components/printing/renderer/print_render_frame_helper.h b/components/printing/renderer/print_render_frame_helper.h
|
2020-10-16 01:30:41 +00:00
|
|
|
index 78d76aadc206a0922163f87f0575ca0cfe344880..d51fff55ebd5c9d1a39637039b279b491d025b08 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
|
2020-10-16 01:30:41 +00:00
|
|
|
@@ -230,7 +230,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;
|
2019-11-05 23:41:20 +00:00
|
|
|
void PrintForSystemDialog() override;
|
2018-10-13 01:57:04 +00:00
|
|
|
#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
|
2020-05-26 20:06:26 +00:00
|
|
|
void SetPrintPreviewUI(
|
2020-10-16 01:30:41 +00:00
|
|
|
@@ -297,7 +297,9 @@ class PrintRenderFrameHelper
|
|
|
|
// 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);
|
|
|
|
@@ -306,12 +308,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
|
2020-10-16 01:30:41 +00:00
|
|
|
index 49e0e83868dc8f4e32eab5b08172f0697552a532..eb8fd82289e6bb370934883c039bdde704604768 100644
|
2019-08-07 14:47:24 +00:00
|
|
|
--- a/printing/printing_context.cc
|
|
|
|
+++ b/printing/printing_context.cc
|
2020-10-16 01:30:41 +00:00
|
|
|
@@ -96,7 +96,6 @@ PrintingContext::Result PrintingContext::UsePdfSettings() {
|
2019-08-07 14:47:24 +00:00
|
|
|
|
|
|
|
PrintingContext::Result PrintingContext::UpdatePrintSettings(
|
|
|
|
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
|
2020-10-16 01:30:41 +00:00
|
|
|
index 896d1b26f492862b3ae501ca5b756cfb201d1c75..a3762cb0e222d425359bd803c8406f7a11b59ade 100644
|
2019-08-07 14:47:24 +00:00
|
|
|
--- a/printing/printing_context.h
|
|
|
|
+++ b/printing/printing_context.h
|
2020-10-16 01:30:41 +00:00
|
|
|
@@ -134,12 +134,12 @@ class PRINTING_EXPORT PrintingContext {
|
2019-08-07 14:47:24 +00:00
|
|
|
|
|
|
|
int job_id() const { return job_id_; }
|
|
|
|
|
|
|
|
- protected:
|
|
|
|
- explicit PrintingContext(Delegate* delegate);
|
|
|
|
-
|
|
|
|
// Reinitializes the settings for object reuse.
|
|
|
|
void ResetSettings();
|
|
|
|
|
|
|
|
+ protected:
|
|
|
|
+ explicit PrintingContext(Delegate* delegate);
|
|
|
|
+
|
|
|
|
// Does bookkeeping when an error occurs.
|
|
|
|
PrintingContext::Result OnError();
|
|
|
|
|