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.
|
|
|
|
|
2022-06-28 14:34:00 +00:00
|
|
|
diff --git a/BUILD.gn b/BUILD.gn
|
2023-08-15 19:44:24 +00:00
|
|
|
index dc86196ebcb7bb630dc3ca5b7e78244ae1e5ddd5..3e2cf78dc14a1d4b3d23ec9db4418a132c8b9df2 100644
|
2022-06-28 14:34:00 +00:00
|
|
|
--- a/BUILD.gn
|
|
|
|
+++ b/BUILD.gn
|
2023-08-15 19:44:24 +00:00
|
|
|
@@ -966,7 +966,6 @@ if (is_win) {
|
2022-06-28 14:34:00 +00:00
|
|
|
"//media:media_unittests",
|
|
|
|
"//media/midi:midi_unittests",
|
|
|
|
"//net:net_unittests",
|
|
|
|
- "//printing:printing_unittests",
|
|
|
|
"//sql:sql_unittests",
|
|
|
|
"//third_party/breakpad:symupload($host_toolchain)",
|
|
|
|
"//ui/base:ui_base_unittests",
|
2023-08-15 19:44:24 +00:00
|
|
|
@@ -975,6 +974,10 @@ if (is_win) {
|
2022-06-28 14:34:00 +00:00
|
|
|
"//ui/views:views_unittests",
|
|
|
|
"//url:url_unittests",
|
|
|
|
]
|
|
|
|
+
|
2022-10-27 16:37:04 +00:00
|
|
|
+ if (enable_printing) {
|
2022-06-28 14:34:00 +00:00
|
|
|
+ deps += [ "//printing:printing_unittests" ]
|
|
|
|
+ }
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-06-22 17:35:10 +00:00
|
|
|
diff --git a/chrome/browser/printing/print_job.cc b/chrome/browser/printing/print_job.cc
|
2023-08-15 15:49:41 +00:00
|
|
|
index c27e2d50aa6cd45484c222221c6a8dda50baf8ff..43c48b75806bb08f3a4ea45689fe2469368cca4a 100644
|
2020-06-22 17:35:10 +00:00
|
|
|
--- a/chrome/browser/printing/print_job.cc
|
|
|
|
+++ b/chrome/browser/printing/print_job.cc
|
2023-05-23 19:58:58 +00:00
|
|
|
@@ -93,6 +93,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
|
2023-05-23 19:58:58 +00:00
|
|
|
@@ -107,6 +108,7 @@ content::WebContents* GetWebContents(content::GlobalRenderFrameHostId rfh_id) {
|
2023-01-06 02:35:34 +00:00
|
|
|
auto* rfh = content::RenderFrameHost::FromID(rfh_id);
|
|
|
|
return rfh ? content::WebContents::FromRenderFrameHost(rfh) : nullptr;
|
2021-10-06 02:21:00 +00:00
|
|
|
}
|
|
|
|
+#endif
|
|
|
|
|
2022-02-10 02:58:52 +00:00
|
|
|
#endif // BUILDFLAG(IS_WIN)
|
2021-10-06 02:21:00 +00:00
|
|
|
|
2023-05-23 19:58:58 +00:00
|
|
|
@@ -147,10 +149,8 @@ void PrintJob::Initialize(std::unique_ptr<PrinterQuery> query,
|
|
|
|
|
|
|
|
#if BUILDFLAG(IS_WIN)
|
|
|
|
pdf_page_mapping_ = PageNumber::GetPages(settings->ranges(), page_count);
|
|
|
|
- PrefService* prefs = GetPrefsForWebContents(GetWebContents(rfh_id_));
|
|
|
|
- if (prefs && prefs->IsManagedPreference(prefs::kPdfUseSkiaRendererEnabled)) {
|
|
|
|
- use_skia_ = prefs->GetBoolean(prefs::kPdfUseSkiaRendererEnabled);
|
|
|
|
- }
|
|
|
|
+ // TODO(codebytere): should we enable this later?
|
|
|
|
+ use_skia_ = false;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
auto new_doc = base::MakeRefCounted<PrintedDocument>(std::move(settings),
|
2023-08-15 15:49:41 +00:00
|
|
|
@@ -381,8 +381,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
|
2023-01-06 02:35:34 +00:00
|
|
|
PrefService* prefs = GetPrefsForWebContents(GetWebContents(rfh_id_));
|
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
|
2023-08-15 15:49:41 +00:00
|
|
|
@@ -472,8 +474,10 @@ void PrintJob::StartPdfToPostScriptConversion(
|
2021-10-06 02:21:00 +00:00
|
|
|
if (ps_level2) {
|
|
|
|
mode = PdfRenderSettings::Mode::POSTSCRIPT_LEVEL2;
|
|
|
|
} else {
|
|
|
|
+#if 0
|
2023-01-06 02:35:34 +00:00
|
|
|
PrefService* prefs = GetPrefsForWebContents(GetWebContents(rfh_id_));
|
2021-10-06 02:21:00 +00:00
|
|
|
- mode = PrintWithPostScriptType42Fonts(prefs)
|
|
|
|
+#endif
|
|
|
|
+ mode = PrintWithPostScriptType42Fonts(nullptr)
|
|
|
|
? PdfRenderSettings::Mode::POSTSCRIPT_LEVEL3_WITH_TYPE42_FONTS
|
|
|
|
: PdfRenderSettings::Mode::POSTSCRIPT_LEVEL3;
|
|
|
|
}
|
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
|
2023-08-15 19:44:24 +00:00
|
|
|
index 040a37a9eab2af1491f7f8f4dc2e6ed78ac1d20e..fe4b29c905d89d96e3abf163eb25d7fae20e3b22 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
|
2023-03-20 11:06:57 +00:00
|
|
|
@@ -23,7 +23,9 @@
|
2023-03-10 16:07:42 +00:00
|
|
|
#include "chrome/browser/bad_message.h"
|
|
|
|
#include "chrome/browser/browser_process.h"
|
|
|
|
#include "chrome/browser/chrome_notification_types.h"
|
|
|
|
+#if 0 // Electron does not use Chrome error dialogs
|
2023-01-06 02:35:34 +00:00
|
|
|
#include "chrome/browser/printing/print_error_dialog.h"
|
2023-03-10 16:07:42 +00:00
|
|
|
+#endif
|
|
|
|
#include "chrome/browser/printing/print_job.h"
|
|
|
|
#include "chrome/browser/printing/print_job_manager.h"
|
|
|
|
#include "chrome/browser/printing/print_view_manager_common.h"
|
2023-05-23 19:58:58 +00:00
|
|
|
@@ -83,6 +85,20 @@ namespace printing {
|
2022-07-21 10:46:15 +00:00
|
|
|
|
|
|
|
namespace {
|
|
|
|
|
|
|
|
+std::string PrintReasonFromPrintStatus(PrintViewManager::PrintStatus status) {
|
|
|
|
+ if (status == PrintViewManager::PrintStatus::kInvalid) {
|
|
|
|
+ return "Invalid printer settings";
|
|
|
|
+ } else if (status == PrintViewManager::PrintStatus::kCanceled) {
|
|
|
|
+ return "Print job canceled";
|
|
|
|
+ } else if (status == PrintViewManager::PrintStatus::kFailed) {
|
|
|
|
+ return "Print job failed";
|
|
|
|
+ }
|
|
|
|
+ return "";
|
|
|
|
+}
|
|
|
|
+
|
2023-05-10 14:47:48 +00:00
|
|
|
+using PrintSettingsCallback =
|
|
|
|
+ base::OnceCallback<void(std::unique_ptr<PrinterQuery>)>;
|
|
|
|
+
|
|
|
|
void OnDidGetDefaultPrintSettings(
|
|
|
|
scoped_refptr<PrintQueriesQueue> queue,
|
|
|
|
bool want_pdf_settings,
|
2023-05-23 19:58:58 +00:00
|
|
|
@@ -91,9 +107,11 @@ void OnDidGetDefaultPrintSettings(
|
2022-06-27 20:50:08 +00:00
|
|
|
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
2023-03-10 16:07:42 +00:00
|
|
|
|
2023-03-20 11:06:57 +00:00
|
|
|
if (printer_query->last_status() != mojom::ResultCode::kSuccess) {
|
2023-03-10 16:07:42 +00:00
|
|
|
+#if 0 // Electron does not use Chrome error dialogs
|
2023-03-20 11:06:57 +00:00
|
|
|
if (!want_pdf_settings) {
|
|
|
|
ShowPrintErrorDialogForInvalidPrinterError();
|
|
|
|
}
|
|
|
|
+#endif
|
|
|
|
std::move(callback).Run(nullptr);
|
|
|
|
return;
|
2023-03-10 16:07:42 +00:00
|
|
|
}
|
2023-05-23 19:58:58 +00:00
|
|
|
@@ -103,9 +121,11 @@ void OnDidGetDefaultPrintSettings(
|
2023-03-20 11:06:57 +00:00
|
|
|
params->document_cookie = printer_query->cookie();
|
|
|
|
|
|
|
|
if (!PrintMsgPrintParamsIsValid(*params)) {
|
|
|
|
+#if 0 // Electron does not use Chrome error dialogs
|
|
|
|
if (!want_pdf_settings) {
|
|
|
|
ShowPrintErrorDialogForInvalidPrinterError();
|
|
|
|
}
|
2023-03-10 16:07:42 +00:00
|
|
|
+#endif
|
2023-03-20 11:06:57 +00:00
|
|
|
std::move(callback).Run(nullptr);
|
|
|
|
return;
|
|
|
|
}
|
2023-06-12 07:42:18 +00:00
|
|
|
@@ -122,7 +142,8 @@ void OnDidScriptedPrint(
|
2023-03-10 16:07:42 +00:00
|
|
|
|
2023-03-20 11:06:57 +00:00
|
|
|
if (printer_query->last_status() != mojom::ResultCode::kSuccess ||
|
|
|
|
!printer_query->settings().dpi()) {
|
|
|
|
- std::move(callback).Run(nullptr);
|
2023-06-12 07:42:18 +00:00
|
|
|
+ bool canceled = printer_query->last_status() == mojom::ResultCode::kCanceled;
|
|
|
|
+ std::move(callback).Run(nullptr, canceled);
|
2023-03-20 11:06:57 +00:00
|
|
|
return;
|
|
|
|
}
|
2023-03-10 16:07:42 +00:00
|
|
|
|
2023-06-12 07:42:18 +00:00
|
|
|
@@ -132,12 +153,12 @@ void OnDidScriptedPrint(
|
2023-03-20 11:06:57 +00:00
|
|
|
params->params.get());
|
|
|
|
params->params->document_cookie = printer_query->cookie();
|
|
|
|
if (!PrintMsgPrintParamsIsValid(*params->params)) {
|
|
|
|
- std::move(callback).Run(nullptr);
|
|
|
|
+ std::move(callback).Run(nullptr, false);
|
|
|
|
return;
|
2022-02-01 19:00:09 +00:00
|
|
|
}
|
2023-03-20 11:06:57 +00:00
|
|
|
|
|
|
|
params->pages = printer_query->settings().ranges();
|
2022-06-27 20:50:08 +00:00
|
|
|
- std::move(callback).Run(std::move(params));
|
2023-06-12 07:42:18 +00:00
|
|
|
+ std::move(callback).Run(std::move(params), false);
|
2023-03-20 11:06:57 +00:00
|
|
|
queue->QueuePrinterQuery(std::move(printer_query));
|
|
|
|
}
|
2022-02-01 19:00:09 +00:00
|
|
|
|
2023-08-15 19:44:24 +00:00
|
|
|
@@ -189,9 +210,11 @@ 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_);
|
2023-01-06 02:35:34 +00:00
|
|
|
+#if 0 // Printing is always enabled.
|
2018-10-13 01:57:04 +00:00
|
|
|
Profile* profile =
|
|
|
|
Profile::FromBrowserContext(web_contents->GetBrowserContext());
|
2023-03-10 16:07:42 +00:00
|
|
|
- printing_enabled_.Init(prefs::kPrintingEnabled, profile->GetPrefs());
|
|
|
|
+ printing_enabled_.Init(prefs::kPrintingEnabled, profile->GetPrefs());
|
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
|
|
|
PrintViewManagerBase::~PrintViewManagerBase() {
|
2023-08-15 19:44:24 +00:00
|
|
|
@@ -214,12 +237,20 @@ void PrintViewManagerBase::DisableThirdPartyBlocking() {
|
2018-10-13 01:57:04 +00:00
|
|
|
}
|
2023-05-23 19:58:58 +00:00
|
|
|
#endif // BUILDFLAG(IS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING)
|
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,
|
2022-05-19 08:05:07 +00:00
|
|
|
+ base::Value::Dict settings,
|
2019-11-08 18:01:50 +00:00
|
|
|
+ CompletionCallback callback) {
|
2023-06-22 08:51:15 +00:00
|
|
|
if (!StartPrintCommon(rfh)) {
|
|
|
|
return false;
|
|
|
|
}
|
2019-11-05 23:41:20 +00:00
|
|
|
|
2023-03-10 16:07:42 +00:00
|
|
|
+#if 0
|
|
|
|
CompletePrintNow(rfh);
|
|
|
|
+#endif
|
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));
|
2022-09-07 07:46:37 +00:00
|
|
|
return true;
|
|
|
|
}
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2023-08-15 19:44:24 +00:00
|
|
|
@@ -342,12 +373,13 @@ void PrintViewManagerBase::OnDidUpdatePrintableArea(
|
2023-06-15 14:46:38 +00:00
|
|
|
}
|
|
|
|
PRINTER_LOG(EVENT) << "Paper printable area updated for vendor id "
|
|
|
|
<< print_settings->requested_media().vendor_id;
|
|
|
|
- CompleteUpdatePrintSettings(std::move(job_settings),
|
|
|
|
+ CompleteUpdatePrintSettings(nullptr /* printer_query */, std::move(job_settings),
|
|
|
|
std::move(print_settings), std::move(callback));
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
void PrintViewManagerBase::CompleteUpdatePrintSettings(
|
|
|
|
+ std::unique_ptr<PrinterQuery> printer_query,
|
|
|
|
base::Value::Dict job_settings,
|
|
|
|
std::unique_ptr<PrintSettings> print_settings,
|
|
|
|
UpdatePrintSettingsCallback callback) {
|
2023-08-15 19:44:24 +00:00
|
|
|
@@ -355,7 +387,8 @@ void PrintViewManagerBase::CompleteUpdatePrintSettings(
|
2023-06-15 14:46:38 +00:00
|
|
|
settings->pages = GetPageRangesFromJobSettings(job_settings);
|
|
|
|
settings->params = mojom::PrintParams::New();
|
|
|
|
RenderParamsFromPrintSettings(*print_settings, settings->params.get());
|
|
|
|
- settings->params->document_cookie = PrintSettings::NewCookie();
|
|
|
|
+ settings->params->document_cookie = printer_query ? printer_query->cookie()
|
|
|
|
+ : PrintSettings::NewCookie();
|
|
|
|
if (!PrintMsgPrintParamsIsValid(*settings->params)) {
|
|
|
|
mojom::PrinterType printer_type = static_cast<mojom::PrinterType>(
|
|
|
|
*job_settings.FindInt(kSettingPrinterType));
|
2023-08-15 19:44:24 +00:00
|
|
|
@@ -367,6 +400,10 @@ void PrintViewManagerBase::CompleteUpdatePrintSettings(
|
2023-06-15 14:46:38 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
+ if (printer_query && printer_query->cookie() && printer_query->settings().dpi()) {
|
|
|
|
+ queue_->QueuePrinterQuery(std::move(printer_query));
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
set_cookie(settings->params->document_cookie);
|
|
|
|
std::move(callback).Run(std::move(settings));
|
|
|
|
}
|
2023-08-15 19:44:24 +00:00
|
|
|
@@ -502,7 +539,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);
|
|
|
|
|
2022-03-30 18:08:58 +00:00
|
|
|
#if BUILDFLAG(ENABLE_OOP_PRINTING)
|
2023-08-15 19:44:24 +00:00
|
|
|
@@ -517,12 +555,15 @@ void PrintViewManagerBase::ScriptedPrintReply(
|
2022-02-01 19:00:09 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
+ if (canceled)
|
|
|
|
+ UserInitCanceled();
|
|
|
|
+
|
2023-03-20 11:06:57 +00:00
|
|
|
if (params) {
|
|
|
|
set_cookie(params->params->document_cookie);
|
|
|
|
- std::move(callback).Run(std::move(params));
|
|
|
|
+ std::move(callback).Run(std::move(params), canceled);
|
|
|
|
} else {
|
2023-07-16 14:14:43 +00:00
|
|
|
set_cookie(PrintSettings::NewInvalidCookie());
|
2023-03-20 11:06:57 +00:00
|
|
|
- std::move(callback).Run(nullptr);
|
|
|
|
+ std::move(callback).Run(nullptr, false);
|
|
|
|
}
|
2022-02-01 19:00:09 +00:00
|
|
|
}
|
|
|
|
|
2023-08-15 19:44:24 +00:00
|
|
|
@@ -650,10 +691,12 @@ void PrintViewManagerBase::DidPrintDocument(
|
2020-10-19 21:31:25 +00:00
|
|
|
void PrintViewManagerBase::GetDefaultPrintSettings(
|
|
|
|
GetDefaultPrintSettingsCallback callback) {
|
|
|
|
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
2023-01-06 02:35:34 +00:00
|
|
|
+#if 0 // Printing is always enabled.
|
2020-10-19 21:31:25 +00:00
|
|
|
if (!printing_enabled_.GetValue()) {
|
2023-03-20 11:06:57 +00:00
|
|
|
GetDefaultPrintSettingsReply(std::move(callback), nullptr);
|
2020-10-19 21:31:25 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
+#endif
|
2022-03-30 18:08:58 +00:00
|
|
|
#if BUILDFLAG(ENABLE_OOP_PRINTING)
|
|
|
|
if (printing::features::kEnableOopPrintDriversJobPrint.Get() &&
|
2023-01-06 02:35:34 +00:00
|
|
|
#if BUILDFLAG(ENABLE_PRINT_CONTENT_ANALYSIS)
|
2023-08-15 19:44:24 +00:00
|
|
|
@@ -705,10 +748,12 @@ void PrintViewManagerBase::UpdatePrintSettings(
|
2022-05-17 16:48:40 +00:00
|
|
|
base::Value::Dict job_settings,
|
2020-10-28 00:33:04 +00:00
|
|
|
UpdatePrintSettingsCallback callback) {
|
|
|
|
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
2023-01-06 02:35:34 +00:00
|
|
|
+#if 0 // Printing is always enabled.
|
2020-10-28 00:33:04 +00:00
|
|
|
if (!printing_enabled_.GetValue()) {
|
2023-03-20 11:06:57 +00:00
|
|
|
std::move(callback).Run(nullptr);
|
2021-08-24 00:52:17 +00:00
|
|
|
return;
|
2023-04-17 21:40:26 +00:00
|
|
|
}
|
|
|
|
+#endif // Printing is always enabled.
|
|
|
|
|
|
|
|
absl::optional<int> printer_type_value =
|
|
|
|
job_settings.FindInt(kSettingPrinterType);
|
2023-08-15 19:44:24 +00:00
|
|
|
@@ -719,6 +764,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
|
2023-04-17 21:40:26 +00:00
|
|
|
|
|
|
|
mojom::PrinterType printer_type =
|
|
|
|
static_cast<mojom::PrinterType>(*printer_type_value);
|
|
|
|
+#if 0 // Printing is always enabled.
|
|
|
|
if (printer_type != mojom::PrinterType::kExtension &&
|
|
|
|
printer_type != mojom::PrinterType::kPdf &&
|
|
|
|
printer_type != mojom::PrinterType::kLocal) {
|
2023-08-15 19:44:24 +00:00
|
|
|
@@ -738,6 +784,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
|
2021-08-24 00:52:17 +00:00
|
|
|
if (value > 0)
|
2022-05-17 16:48:40 +00:00
|
|
|
job_settings.Set(kSettingRasterizePdfDpi, value);
|
2021-08-24 00:52:17 +00:00
|
|
|
}
|
2023-04-12 11:37:48 +00:00
|
|
|
+#endif // Printing is always enabled.
|
2021-08-24 00:52:17 +00:00
|
|
|
|
2023-03-20 11:06:57 +00:00
|
|
|
std::unique_ptr<PrintSettings> print_settings =
|
|
|
|
PrintSettingsFromJobSettings(job_settings);
|
2023-08-15 19:44:24 +00:00
|
|
|
@@ -757,7 +804,21 @@ void PrintViewManagerBase::UpdatePrintSettings(
|
2023-06-15 14:46:38 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2023-07-10 13:26:29 +00:00
|
|
|
-#if BUILDFLAG(IS_WIN)
|
2023-06-15 14:46:38 +00:00
|
|
|
+ std::unique_ptr<PrinterQuery> query =
|
|
|
|
+ queue_->CreatePrinterQuery(GetCurrentTargetFrame()->GetGlobalId());
|
|
|
|
+ auto* query_ptr = query.get();
|
2023-07-10 13:26:29 +00:00
|
|
|
+ // We need to clone this before calling SetSettings because some environments
|
|
|
|
+ // evaluate job_settings.Clone() first, and some std::move(job_settings) first,
|
|
|
|
+ // for the former things work correctly but for the latter the cloned value is null.
|
|
|
|
+ auto job_settings_copy = job_settings.Clone();
|
2023-06-15 14:46:38 +00:00
|
|
|
+ query_ptr->SetSettings(
|
2023-07-10 13:26:29 +00:00
|
|
|
+ std::move(job_settings_copy),
|
2023-06-15 14:46:38 +00:00
|
|
|
+ base::BindOnce(&PrintViewManagerBase::CompleteUpdatePrintSettings,
|
|
|
|
+ weak_ptr_factory_.GetWeakPtr(), std::move(query),
|
|
|
|
+ std::move(job_settings), std::move(print_settings),
|
|
|
|
+ std::move(callback)));
|
|
|
|
+
|
2023-07-10 13:26:29 +00:00
|
|
|
+#if 0 // See https://chromium-review.googlesource.com/412367
|
2023-06-15 14:46:38 +00:00
|
|
|
// TODO(crbug.com/1424368): Remove this if the printable areas can be made
|
|
|
|
// fully available from `PrintBackend::GetPrinterSemanticCapsAndDefaults()`
|
2023-07-10 13:26:29 +00:00
|
|
|
// for in-browser queries.
|
2023-08-15 19:44:24 +00:00
|
|
|
@@ -779,8 +840,6 @@ void PrintViewManagerBase::UpdatePrintSettings(
|
2023-06-15 14:46:38 +00:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
- CompleteUpdatePrintSettings(std::move(job_settings),
|
|
|
|
- std::move(print_settings), std::move(callback));
|
|
|
|
}
|
|
|
|
|
2023-08-15 15:49:41 +00:00
|
|
|
void PrintViewManagerBase::SetAccessibilityTree(
|
2023-08-15 19:44:24 +00:00
|
|
|
@@ -796,7 +855,7 @@ void PrintViewManagerBase::SetAccessibilityTree(
|
2023-01-31 11:06:11 +00:00
|
|
|
void PrintViewManagerBase::IsPrintingEnabled(
|
|
|
|
IsPrintingEnabledCallback callback) {
|
|
|
|
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
|
|
|
- std::move(callback).Run(printing_enabled_.GetValue());
|
|
|
|
+ std::move(callback).Run(true);
|
|
|
|
}
|
|
|
|
|
|
|
|
void PrintViewManagerBase::ScriptedPrint(mojom::ScriptedPrintParamsPtr params,
|
2023-08-15 19:44:24 +00:00
|
|
|
@@ -812,14 +871,14 @@ 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);
|
2023-03-20 11:06:57 +00:00
|
|
|
- std::move(callback).Run(nullptr);
|
|
|
|
+ std::move(callback).Run(nullptr, false);
|
2022-02-01 19:00:09 +00:00
|
|
|
return;
|
|
|
|
}
|
2022-03-30 18:08:58 +00:00
|
|
|
#if BUILDFLAG(ENABLE_OOP_PRINTING)
|
|
|
|
if (printing::features::kEnableOopPrintDriversJobPrint.Get() &&
|
2023-03-10 16:07:42 +00:00
|
|
|
!query_with_ui_client_id_.has_value()) {
|
2022-03-30 18:08:58 +00:00
|
|
|
// Renderer process has requested settings outside of the expected setup.
|
2023-03-20 11:06:57 +00:00
|
|
|
- std::move(callback).Run(nullptr);
|
|
|
|
+ std::move(callback).Run(nullptr, false);
|
2022-03-30 18:08:58 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif
|
2023-08-15 19:44:24 +00:00
|
|
|
@@ -861,6 +920,7 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie,
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2023-01-06 02:35:34 +00:00
|
|
|
PrintManager::PrintingFailed(cookie, reason);
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2023-03-10 16:07:42 +00:00
|
|
|
+#if 0 // Electron does not use Chromium error dialogs
|
2023-01-06 02:35:34 +00:00
|
|
|
// `PrintingFailed()` can occur because asynchronous compositing results
|
|
|
|
// don't complete until after a print job has already failed and been
|
|
|
|
// destroyed. In such cases the error notification to the user will
|
2023-08-15 19:44:24 +00:00
|
|
|
@@ -870,7 +930,7 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie,
|
2023-03-10 16:07:42 +00:00
|
|
|
print_job_->document()->cookie() == cookie) {
|
|
|
|
ShowPrintErrorDialogForGenericError();
|
|
|
|
}
|
|
|
|
-
|
|
|
|
+#endif
|
|
|
|
ReleasePrinterQuery();
|
|
|
|
}
|
|
|
|
|
2023-08-15 19:44:24 +00:00
|
|
|
@@ -882,15 +942,24 @@ void PrintViewManagerBase::RemoveTestObserver(TestObserver& observer) {
|
2023-06-13 18:45:48 +00:00
|
|
|
test_observers_.RemoveObserver(&observer);
|
2020-07-10 16:42:22 +00:00
|
|
|
}
|
|
|
|
|
2023-03-10 16:07:42 +00:00
|
|
|
+void PrintViewManagerBase::ShowInvalidPrinterSettingsError() {
|
2020-07-10 16:42:22 +00:00
|
|
|
+ if (!callback_.is_null()) {
|
2022-07-21 10:46:15 +00:00
|
|
|
+ printing_status_ = PrintStatus::kInvalid;
|
|
|
|
+ TerminatePrintJob(true);
|
2020-07-10 16:42:22 +00:00
|
|
|
+ }
|
2023-03-10 16:07:42 +00:00
|
|
|
+}
|
2020-07-10 16:42:22 +00:00
|
|
|
+
|
2023-03-10 16:07:42 +00:00
|
|
|
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) {
|
2022-03-25 01:39:03 +00:00
|
|
|
+#if 0
|
|
|
|
if (new_state == content::RenderFrameHost::LifecycleState::kActive &&
|
2022-11-17 19:59:23 +00:00
|
|
|
render_frame_host->GetProcess()->IsPdf() &&
|
|
|
|
!render_frame_host->GetMainFrame()->GetParentOrOuterDocument()) {
|
|
|
|
GetPrintRenderFrame(render_frame_host)->ConnectToPdfRenderer();
|
2022-03-25 01:39:03 +00:00
|
|
|
}
|
2021-11-24 08:45:59 +00:00
|
|
|
+#endif
|
|
|
|
}
|
|
|
|
|
2022-11-17 19:59:23 +00:00
|
|
|
void PrintViewManagerBase::RenderFrameDeleted(
|
2023-08-15 19:44:24 +00:00
|
|
|
@@ -942,7 +1011,12 @@ void PrintViewManagerBase::OnJobDone() {
|
2022-07-21 10:46:15 +00:00
|
|
|
// Printing is done, we don't need it anymore.
|
|
|
|
// print_job_->is_job_pending() may still be true, depending on the order
|
|
|
|
// of object registration.
|
|
|
|
- printing_succeeded_ = true;
|
|
|
|
+ printing_status_ = PrintStatus::kSucceeded;
|
2022-01-10 22:31:39 +00:00
|
|
|
+ ReleasePrintJob();
|
|
|
|
+}
|
|
|
|
+
|
2022-07-21 10:46:15 +00:00
|
|
|
+void PrintViewManagerBase::UserInitCanceled() {
|
|
|
|
+ printing_status_ = PrintStatus::kCanceled;
|
|
|
|
ReleasePrintJob();
|
2022-01-10 22:31:39 +00:00
|
|
|
}
|
2022-07-21 10:46:15 +00:00
|
|
|
|
2023-08-15 19:44:24 +00:00
|
|
|
@@ -951,9 +1025,10 @@ void PrintViewManagerBase::OnCanceling() {
|
2023-03-10 16:07:42 +00:00
|
|
|
}
|
|
|
|
|
2022-11-17 19:59:23 +00:00
|
|
|
void PrintViewManagerBase::OnFailed() {
|
2023-03-10 16:07:42 +00:00
|
|
|
+#if 0 // Electron does not use Chromium error dialogs
|
2023-01-06 02:35:34 +00:00
|
|
|
if (!canceling_job_)
|
2023-03-10 16:07:42 +00:00
|
|
|
ShowPrintErrorDialogForGenericError();
|
|
|
|
-
|
|
|
|
+#endif
|
|
|
|
TerminatePrintJob(true);
|
|
|
|
}
|
|
|
|
|
2023-08-15 19:44:24 +00:00
|
|
|
@@ -963,7 +1038,7 @@ bool PrintViewManagerBase::RenderAllMissingPagesNow() {
|
2022-07-21 10:46:15 +00:00
|
|
|
|
|
|
|
// Is the document already complete?
|
|
|
|
if (print_job_->document() && print_job_->document()->IsComplete()) {
|
|
|
|
- printing_succeeded_ = true;
|
|
|
|
+ printing_status_ = PrintStatus::kSucceeded;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2023-08-15 19:44:24 +00:00
|
|
|
@@ -1011,7 +1086,10 @@ bool PrintViewManagerBase::CreateNewPrintJob(
|
2019-06-12 19:34:07 +00:00
|
|
|
|
2022-06-27 20:50:08 +00:00
|
|
|
// Disconnect the current `print_job_`.
|
2021-08-11 21:04:56 +00:00
|
|
|
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
|
|
|
|
2023-08-15 19:44:24 +00:00
|
|
|
@@ -1032,7 +1110,7 @@ bool PrintViewManagerBase::CreateNewPrintJob(
|
2022-07-21 10:46:15 +00:00
|
|
|
#endif
|
|
|
|
print_job_->AddObserver(*this);
|
|
|
|
|
|
|
|
- printing_succeeded_ = false;
|
|
|
|
+ printing_status_ = PrintStatus::kFailed;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2023-08-15 19:44:24 +00:00
|
|
|
@@ -1100,6 +1178,11 @@ void PrintViewManagerBase::ReleasePrintJob() {
|
2022-06-01 06:12:47 +00:00
|
|
|
}
|
2022-03-30 18:08:58 +00:00
|
|
|
#endif
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2019-07-01 21:03:19 +00:00
|
|
|
+ if (!callback_.is_null()) {
|
2022-07-21 10:46:15 +00:00
|
|
|
+ bool success = printing_status_ == PrintStatus::kSucceeded;
|
|
|
|
+ std::move(callback_).Run(success, PrintReasonFromPrintStatus(printing_status_));
|
2019-07-01 21:03:19 +00:00
|
|
|
+ }
|
2018-10-13 01:57:04 +00:00
|
|
|
+
|
|
|
|
if (!print_job_)
|
|
|
|
return;
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2023-08-15 19:44:24 +00:00
|
|
|
@@ -1107,7 +1190,7 @@ void PrintViewManagerBase::ReleasePrintJob() {
|
2022-07-21 10:46:15 +00:00
|
|
|
// printing_rfh_ should only ever point to a RenderFrameHost with a live
|
|
|
|
// RenderFrame.
|
|
|
|
DCHECK(rfh->IsRenderFrameLive());
|
|
|
|
- GetPrintRenderFrame(rfh)->PrintingDone(printing_succeeded_);
|
|
|
|
+ GetPrintRenderFrame(rfh)->PrintingDone(printing_status_ == PrintStatus::kSucceeded);
|
|
|
|
}
|
|
|
|
|
|
|
|
print_job_->RemoveObserver(*this);
|
2023-08-15 19:44:24 +00:00
|
|
|
@@ -1149,7 +1232,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) {
|
2023-08-15 19:44:24 +00:00
|
|
|
@@ -1295,7 +1378,7 @@ void PrintViewManagerBase::ReleasePrinterQuery() {
|
2022-05-17 16:48:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void PrintViewManagerBase::CompletePrintNow(content::RenderFrameHost* rfh) {
|
|
|
|
- GetPrintRenderFrame(rfh)->PrintRequestedPages();
|
2022-05-19 08:05:07 +00:00
|
|
|
+ GetPrintRenderFrame(rfh)->PrintRequestedPages(/*silent=*/true, /*job_settings=*/base::Value::Dict());
|
2022-05-17 16:48:40 +00:00
|
|
|
|
2023-06-13 18:45:48 +00:00
|
|
|
for (auto& observer : GetTestObservers()) {
|
2022-05-17 16:48:40 +00:00
|
|
|
observer.OnPrintNow(rfh);
|
2023-08-15 19:44:24 +00:00
|
|
|
@@ -1345,7 +1428,7 @@ void PrintViewManagerBase::CompleteScriptedPrintAfterContentAnalysis(
|
2023-08-04 08:47:29 +00:00
|
|
|
set_analyzing_content(/*analyzing=*/false);
|
2023-03-20 11:06:57 +00:00
|
|
|
if (!allowed || !printing_rfh_ || IsCrashed() ||
|
|
|
|
!printing_rfh_->IsRenderFrameLive()) {
|
|
|
|
- std::move(callback).Run(nullptr);
|
|
|
|
+ std::move(callback).Run(nullptr, false);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
CompleteScriptedPrint(printing_rfh_, std::move(params), std::move(callback));
|
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
|
2023-08-15 19:44:24 +00:00
|
|
|
index 9f62238a3f5a73219a604061e434c2a0400fba44..e46800600d53b3f0d1357eaa2fccd7d2e7c59251 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
|
2023-08-15 15:49:41 +00:00
|
|
|
@@ -44,6 +44,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:
|
2023-08-15 15:49:41 +00:00
|
|
|
@@ -77,7 +79,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,
|
2022-03-25 01:39:03 +00:00
|
|
|
+ bool silent = true,
|
2022-05-19 08:05:07 +00:00
|
|
|
+ base::Value::Dict settings = {},
|
2022-03-25 01:39:03 +00:00
|
|
|
+ CompletionCallback callback = {});
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2023-06-22 08:51:15 +00:00
|
|
|
// Like PrintNow(), but for the node under the context menu, instead of the
|
|
|
|
// entire frame.
|
2023-08-15 15:49:41 +00:00
|
|
|
@@ -131,8 +136,10 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
|
2023-03-10 16:07:42 +00:00
|
|
|
void IsPrintingEnabled(IsPrintingEnabledCallback callback) override;
|
|
|
|
void ScriptedPrint(mojom::ScriptedPrintParamsPtr params,
|
|
|
|
ScriptedPrintCallback callback) override;
|
|
|
|
+ void ShowInvalidPrinterSettingsError() override;
|
2022-05-17 16:48:40 +00:00
|
|
|
void PrintingFailed(int32_t cookie,
|
|
|
|
mojom::PrintFailureReason reason) override;
|
2022-02-01 19:00:09 +00:00
|
|
|
+ void UserInitCanceled();
|
|
|
|
|
|
|
|
// Adds and removes observers for `PrintViewManagerBase` events. The order in
|
|
|
|
// which notifications are sent to observers is undefined. Observers must be
|
2023-08-15 15:49:41 +00:00
|
|
|
@@ -140,6 +147,14 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
|
2023-06-13 18:45:48 +00:00
|
|
|
void AddTestObserver(TestObserver& observer);
|
|
|
|
void RemoveTestObserver(TestObserver& observer);
|
2022-07-21 10:46:15 +00:00
|
|
|
|
|
|
|
+ enum class PrintStatus {
|
|
|
|
+ kSucceeded,
|
|
|
|
+ kCanceled,
|
|
|
|
+ kFailed,
|
|
|
|
+ kInvalid,
|
|
|
|
+ kUnknown
|
|
|
|
+ };
|
|
|
|
+
|
|
|
|
protected:
|
|
|
|
explicit PrintViewManagerBase(content::WebContents* web_contents);
|
|
|
|
|
2023-08-15 15:49:41 +00:00
|
|
|
@@ -277,6 +292,7 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
|
2023-06-15 14:46:38 +00:00
|
|
|
bool success);
|
|
|
|
#endif
|
|
|
|
void CompleteUpdatePrintSettings(
|
|
|
|
+ std::unique_ptr<PrinterQuery> printer_query,
|
|
|
|
base::Value::Dict job_settings,
|
|
|
|
std::unique_ptr<PrintSettings> print_settings,
|
|
|
|
UpdatePrintSettingsCallback callback);
|
2023-08-15 19:44:24 +00:00
|
|
|
@@ -306,7 +322,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
|
2023-08-15 19:44:24 +00:00
|
|
|
@@ -387,8 +404,11 @@ 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.
|
2022-07-21 10:46:15 +00:00
|
|
|
- bool printing_succeeded_ = false;
|
|
|
|
+ PrintStatus printing_status_ = PrintStatus::kUnknown;
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2022-11-17 19:59:23 +00:00
|
|
|
// Indication that the job is getting canceled.
|
|
|
|
bool canceling_job_ = false;
|
2023-01-06 02:35:34 +00:00
|
|
|
diff --git a/chrome/browser/printing/printer_query.cc b/chrome/browser/printing/printer_query.cc
|
2023-07-18 22:26:27 +00:00
|
|
|
index 83bce57ef52afa2094e294ae6bbe35e5e9e7797c..a32fc474b7db1bfa07443900eac49184036136da 100644
|
2023-01-06 02:35:34 +00:00
|
|
|
--- a/chrome/browser/printing/printer_query.cc
|
|
|
|
+++ b/chrome/browser/printing/printer_query.cc
|
2023-05-10 14:47:48 +00:00
|
|
|
@@ -355,17 +355,19 @@ void PrinterQuery::UpdatePrintSettings(base::Value::Dict new_settings,
|
2023-01-06 02:35:34 +00:00
|
|
|
#endif // BUILDFLAG(IS_LINUX) && BUILDFLAG(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 result_code = printing_context_->UseDefaultSettings();
|
|
|
|
+ if (result_code == mojom::ResultCode::kSuccess)
|
|
|
|
+ result_code = printing_context_->UpdatePrintSettings(std::move(new_settings));
|
|
|
|
+ InvokeSettingsCallback(std::move(callback), result_code);
|
|
|
|
}
|
|
|
|
-
|
|
|
|
- InvokeSettingsCallback(std::move(callback), result);
|
|
|
|
}
|
|
|
|
|
|
|
|
#if BUILDFLAG(IS_CHROMEOS)
|
2022-03-25 01:39:03 +00:00
|
|
|
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
|
2023-05-10 14:47:48 +00:00
|
|
|
index e83cf407beebcec5ccf7eaa991f43d4d3713833b..5e770a6a840b48e07ff056fe038aad54e526429e 100644
|
2022-03-25 01:39:03 +00:00
|
|
|
--- a/chrome/browser/ui/webui/print_preview/fake_print_render_frame.cc
|
|
|
|
+++ b/chrome/browser/ui/webui/print_preview/fake_print_render_frame.cc
|
2022-05-17 16:48:40 +00:00
|
|
|
@@ -21,7 +21,7 @@ FakePrintRenderFrame::FakePrintRenderFrame(
|
2022-03-25 01:39:03 +00:00
|
|
|
|
|
|
|
FakePrintRenderFrame::~FakePrintRenderFrame() = default;
|
|
|
|
|
|
|
|
-void FakePrintRenderFrame::PrintRequestedPages() {}
|
2022-05-19 08:05:07 +00:00
|
|
|
+void FakePrintRenderFrame::PrintRequestedPages(bool /*silent*/, ::base::Value::Dict /*settings*/) {}
|
2022-03-25 01:39:03 +00:00
|
|
|
|
2022-07-20 11:03:34 +00:00
|
|
|
void FakePrintRenderFrame::PrintWithParams(mojom::PrintPagesParamsPtr params,
|
|
|
|
PrintWithParamsCallback callback) {
|
2022-03-25 01:39:03 +00:00
|
|
|
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
|
2023-05-10 14:47:48 +00:00
|
|
|
index 32403bb077dcbbffe6a3a862feff619e980c5f93..af773c93ab969a5dc483cc63384851ff62cf51ec 100644
|
2022-03-25 01:39:03 +00:00
|
|
|
--- a/chrome/browser/ui/webui/print_preview/fake_print_render_frame.h
|
|
|
|
+++ b/chrome/browser/ui/webui/print_preview/fake_print_render_frame.h
|
2022-05-17 16:48:40 +00:00
|
|
|
@@ -25,7 +25,7 @@ class FakePrintRenderFrame : public mojom::PrintRenderFrame {
|
2022-03-25 01:39:03 +00:00
|
|
|
|
|
|
|
private:
|
|
|
|
// printing::mojom::PrintRenderFrame:
|
|
|
|
- void PrintRequestedPages() override;
|
2022-05-19 08:05:07 +00:00
|
|
|
+ void PrintRequestedPages(bool silent, ::base::Value::Dict settings) override;
|
2022-07-20 11:03:34 +00:00
|
|
|
void PrintWithParams(mojom::PrintPagesParamsPtr params,
|
|
|
|
PrintWithParamsCallback callback) override;
|
2022-03-25 01:39:03 +00:00
|
|
|
void PrintForSystemDialog() override;
|
2023-03-10 16:07:42 +00:00
|
|
|
diff --git a/components/printing/browser/print_manager.cc b/components/printing/browser/print_manager.cc
|
|
|
|
index 21c81377d32ae8d4185598a7eba88ed1d2063ef0..0767f4e9369e926b1cea99178c1a1975941f1765 100644
|
|
|
|
--- a/components/printing/browser/print_manager.cc
|
|
|
|
+++ b/components/printing/browser/print_manager.cc
|
|
|
|
@@ -47,6 +47,8 @@ void PrintManager::IsPrintingEnabled(IsPrintingEnabledCallback callback) {
|
|
|
|
std::move(callback).Run(true);
|
|
|
|
}
|
|
|
|
|
|
|
|
+void PrintManager::ShowInvalidPrinterSettingsError() {}
|
|
|
|
+
|
|
|
|
void PrintManager::PrintingFailed(int32_t cookie,
|
|
|
|
mojom::PrintFailureReason reason) {
|
|
|
|
// Note: Not redundant with cookie checks in the same method in other parts of
|
|
|
|
diff --git a/components/printing/browser/print_manager.h b/components/printing/browser/print_manager.h
|
|
|
|
index ca71560874a0189068dd11fbc039f5673bf6bd96..a8551d95e64da2afbc1685b2df8f1fc377c7117b 100644
|
|
|
|
--- a/components/printing/browser/print_manager.h
|
|
|
|
+++ b/components/printing/browser/print_manager.h
|
|
|
|
@@ -48,6 +48,7 @@ class PrintManager : public content::WebContentsObserver,
|
|
|
|
DidPrintDocumentCallback callback) override;
|
|
|
|
void IsPrintingEnabled(IsPrintingEnabledCallback callback) override;
|
|
|
|
void DidShowPrintDialog() override;
|
|
|
|
+ void ShowInvalidPrinterSettingsError() override;
|
|
|
|
void PrintingFailed(int32_t cookie,
|
|
|
|
mojom::PrintFailureReason reason) override;
|
|
|
|
|
2019-11-05 23:41:20 +00:00
|
|
|
diff --git a/components/printing/common/print.mojom b/components/printing/common/print.mojom
|
2023-08-15 15:49:41 +00:00
|
|
|
index 0f535d5dd1db2e538382a91a0cf06f37d6b4961f..8156c74ad9ffeabfc0d87570a2d2ae1304f1ffa7 100644
|
2019-11-05 23:41:20 +00:00
|
|
|
--- a/components/printing/common/print.mojom
|
|
|
|
+++ b/components/printing/common/print.mojom
|
2023-08-04 08:47:29 +00:00
|
|
|
@@ -302,7 +302,7 @@ union PrintWithParamsResult {
|
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();
|
2022-05-19 08:05:07 +00:00
|
|
|
+ PrintRequestedPages(bool silent, mojo_base.mojom.DictionaryValue settings);
|
2019-11-05 23:41:20 +00:00
|
|
|
|
2022-05-17 16:48:40 +00:00
|
|
|
// Requests the frame to be printed with specified parameters. This is used
|
|
|
|
// to programmatically produce PDF by request from the browser (e.g. over
|
2023-08-04 08:47:29 +00:00
|
|
|
@@ -396,7 +396,10 @@ interface PrintManagerHost {
|
2023-03-20 11:06:57 +00:00
|
|
|
// UI to the user to select the final print settings. If the user cancels or
|
|
|
|
// an error occurs, return null.
|
2022-02-01 19:00:09 +00:00
|
|
|
[Sync]
|
2023-03-20 11:06:57 +00:00
|
|
|
- ScriptedPrint(ScriptedPrintParams params) => (PrintPagesParams? settings);
|
|
|
|
+ ScriptedPrint(ScriptedPrintParams params) => (PrintPagesParams? settings, bool canceled);
|
2023-03-10 16:07:42 +00:00
|
|
|
+
|
|
|
|
+ // Tells the browser that there are invalid printer settings.
|
|
|
|
+ ShowInvalidPrinterSettingsError();
|
2022-02-01 19:00:09 +00:00
|
|
|
|
2023-03-10 16:07:42 +00:00
|
|
|
// Tells the browser printing failed.
|
|
|
|
PrintingFailed(int32 cookie, PrintFailureReason reason);
|
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
|
2023-08-15 19:44:24 +00:00
|
|
|
index 8a510d66964572fab9facf34339239ba14028423..73ba3030b38af91e53fa2ac878fbcb5e61dd25c0 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
|
2023-08-15 19:44:24 +00:00
|
|
|
@@ -45,6 +45,7 @@
|
2020-05-26 20:06:26 +00:00
|
|
|
#include "printing/mojom/print.mojom.h"
|
2022-05-17 16:48:40 +00:00
|
|
|
#include "printing/page_number.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"
|
2022-12-05 22:59:19 +00:00
|
|
|
#include "services/metrics/public/cpp/ukm_source_id.h"
|
2020-08-15 01:51:28 +00:00
|
|
|
#include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
|
2023-08-15 19:44:24 +00:00
|
|
|
@@ -1318,14 +1319,14 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) {
|
2023-08-15 15:49:41 +00:00
|
|
|
}
|
2020-10-16 01:30:41 +00:00
|
|
|
|
2023-08-15 15:49:41 +00:00
|
|
|
print_in_progress_ = true;
|
|
|
|
-
|
|
|
|
auto weak_this = weak_ptr_factory_.GetWeakPtr();
|
|
|
|
web_frame->DispatchBeforePrintEvent(/*print_client=*/nullptr);
|
2023-08-15 19:44:24 +00:00
|
|
|
if (!weak_this) {
|
2023-08-15 15:49:41 +00:00
|
|
|
return;
|
|
|
|
}
|
2020-09-21 08:00:36 +00:00
|
|
|
|
2023-08-15 15:49:41 +00:00
|
|
|
- Print(web_frame, blink::WebNode(), PrintRequestType::kScripted);
|
|
|
|
+ Print(web_frame, blink::WebNode(), PrintRequestType::kScripted,
|
|
|
|
+ false /* silent */, base::Value::Dict() /* new_settings */);
|
|
|
|
if (!weak_this) {
|
|
|
|
return;
|
|
|
|
}
|
2023-08-15 19:44:24 +00:00
|
|
|
@@ -1356,7 +1357,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() {
|
2022-05-19 08:05:07 +00:00
|
|
|
+void PrintRenderFrameHelper::PrintRequestedPages(bool silent, base::Value::Dict 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;
|
2023-08-15 19:44:24 +00:00
|
|
|
@@ -1371,7 +1372,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
|
|
|
|
2023-07-31 17:47:32 +00:00
|
|
|
if (!render_frame_gone_) {
|
2023-08-15 19:44:24 +00:00
|
|
|
frame->DispatchAfterPrintEvent();
|
|
|
|
@@ -1452,7 +1453,8 @@ void PrintRenderFrameHelper::PrintForSystemDialog() {
|
2020-10-16 01:30:41 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
Print(frame, print_preview_context_.source_node(),
|
|
|
|
- PrintRequestType::kRegular);
|
|
|
|
+ PrintRequestType::kRegular, false,
|
2022-05-19 08:05:07 +00:00
|
|
|
+ base::Value::Dict());
|
2023-08-15 15:49:41 +00:00
|
|
|
if (render_frame_gone_) {
|
|
|
|
return;
|
|
|
|
}
|
2023-08-15 19:44:24 +00:00
|
|
|
@@ -1515,6 +1517,8 @@ void PrintRenderFrameHelper::PrintPreview(base::Value::Dict 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
|
|
|
|
2022-03-30 18:08:58 +00:00
|
|
|
#if BUILDFLAG(IS_CHROMEOS_ASH)
|
2023-08-15 19:44:24 +00:00
|
|
|
@@ -2145,7 +2149,8 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
|
2023-08-15 15:49:41 +00:00
|
|
|
}
|
2018-11-09 03:42:34 +00:00
|
|
|
|
2023-08-15 15:49:41 +00:00
|
|
|
Print(duplicate_node.GetDocument().GetFrame(), duplicate_node,
|
|
|
|
- PrintRequestType::kRegular);
|
|
|
|
+ PrintRequestType::kRegular, false /* silent */,
|
|
|
|
+ base::Value::Dict() /* new_settings */);
|
|
|
|
// Check if |this| is still valid.
|
|
|
|
if (!weak_this) {
|
|
|
|
return;
|
2023-08-15 19:44:24 +00:00
|
|
|
@@ -2161,7 +2166,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,
|
2022-05-19 08:05:07 +00:00
|
|
|
+ base::Value::Dict 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;
|
2023-08-15 19:44:24 +00:00
|
|
|
@@ -2169,7 +2176,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)) {
|
2022-05-19 08:05:07 +00:00
|
|
|
+ if (!CalculateNumberOfPages(frame, node, &expected_page_count, std::move(settings))) {
|
2023-08-04 08:47:29 +00:00
|
|
|
DidFinishPrinting(PrintingResult::kFailPrintInit);
|
2018-10-13 01:57:04 +00:00
|
|
|
return; // Failed to init print page settings.
|
|
|
|
}
|
2023-08-15 19:44:24 +00:00
|
|
|
@@ -2188,8 +2195,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;
|
2023-08-15 19:44:24 +00:00
|
|
|
@@ -2433,35 +2447,47 @@ 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) {
|
|
|
|
+bool PrintRenderFrameHelper::InitPrintSettings(
|
|
|
|
+ bool fit_to_paper_size,
|
2022-05-19 08:05:07 +00:00
|
|
|
+ base::Value::Dict new_settings) {
|
2023-03-20 11:06:57 +00:00
|
|
|
// Reset to default values.
|
|
|
|
ignore_css_margins_ = false;
|
|
|
|
|
|
|
|
- mojom::PrintPagesParams settings;
|
|
|
|
- GetPrintManagerHost()->GetDefaultPrintSettings(&settings.params);
|
2021-10-25 15:52:52 +00:00
|
|
|
+ mojom::PrintPagesParamsPtr settings;
|
2022-05-19 08:05:07 +00:00
|
|
|
+ if (new_settings.empty()) {
|
2021-10-25 15:52:52 +00:00
|
|
|
+ settings = mojom::PrintPagesParams::New();
|
|
|
|
+ settings->params = mojom::PrintParams::New();
|
|
|
|
+ GetPrintManagerHost()->GetDefaultPrintSettings(&settings->params);
|
|
|
|
+ } else {
|
2022-05-17 16:48:40 +00:00
|
|
|
+ GetPrintManagerHost()->UpdatePrintSettings(
|
2023-03-20 11:06:57 +00:00
|
|
|
+ std::move(new_settings), &settings);
|
2021-10-25 15:52:52 +00:00
|
|
|
+ }
|
|
|
|
|
2023-03-20 11:06:57 +00:00
|
|
|
// Check if the printer returned any settings, if the settings are null,
|
|
|
|
// assume there are no printer drivers configured. So safely terminate.
|
|
|
|
- if (!settings.params) {
|
2023-05-04 13:10:54 +00:00
|
|
|
+ if (!settings || !settings->params) {
|
2023-03-20 11:06:57 +00:00
|
|
|
// Caller will reset `print_pages_params_`.
|
|
|
|
return false;
|
|
|
|
}
|
2021-10-25 15:52:52 +00:00
|
|
|
|
|
|
|
- settings.params->print_scaling_option =
|
|
|
|
+ settings->params->print_scaling_option =
|
|
|
|
fit_to_paper_size ? mojom::PrintScalingOption::kFitToPrintableArea
|
|
|
|
: mojom::PrintScalingOption::kSourceSize;
|
|
|
|
- SetPrintPagesParams(settings);
|
|
|
|
+ SetPrintPagesParams(*settings);
|
2023-03-20 11:06:57 +00:00
|
|
|
return true;
|
2018-11-09 03:42:34 +00:00
|
|
|
}
|
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,
|
2022-05-19 08:05:07 +00:00
|
|
|
+ base::Value::Dict settings) {
|
2018-10-13 01:57:04 +00:00
|
|
|
DCHECK(frame);
|
2022-03-30 18:08:58 +00:00
|
|
|
bool fit_to_paper_size = !IsPrintingPdfFrame(frame, node);
|
2018-10-13 01:57:04 +00:00
|
|
|
- if (!InitPrintSettings(fit_to_paper_size)) {
|
2022-05-19 08:05:07 +00:00
|
|
|
+ if (!InitPrintSettings(fit_to_paper_size, std::move(settings))) {
|
2023-03-10 16:07:42 +00:00
|
|
|
// Browser triggered this code path. It already knows about the failure.
|
2018-10-13 01:57:04 +00:00
|
|
|
notify_browser_of_print_failure_ = false;
|
2023-03-10 16:07:42 +00:00
|
|
|
+ GetPrintManagerHost()->ShowInvalidPrinterSettingsError();
|
2018-10-13 01:57:04 +00:00
|
|
|
return false;
|
2023-03-10 16:07:42 +00:00
|
|
|
}
|
|
|
|
|
2023-08-15 19:44:24 +00:00
|
|
|
@@ -2566,7 +2592,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();
|
|
|
|
},
|
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
|
2023-08-15 15:49:41 +00:00
|
|
|
index 731b0fa4c0e1b3a5b4ce73d5bf2322767c70f9be..58921e7fdb9c33e21694186f436f409f74c81c3a 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
|
2023-07-01 20:22:55 +00:00
|
|
|
@@ -247,7 +247,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;
|
2022-05-19 08:05:07 +00:00
|
|
|
+ void PrintRequestedPages(bool silent, base::Value::Dict settings) override;
|
2022-07-20 11:03:34 +00:00
|
|
|
void PrintWithParams(mojom::PrintPagesParamsPtr params,
|
|
|
|
PrintWithParamsCallback callback) override;
|
2018-10-13 01:57:04 +00:00
|
|
|
#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
|
2023-07-01 20:22:55 +00:00
|
|
|
@@ -317,7 +317,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,
|
2022-05-19 08:05:07 +00:00
|
|
|
+ base::Value::Dict 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);
|
2023-07-01 20:22:55 +00:00
|
|
|
@@ -326,12 +328,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,
|
2022-05-19 08:05:07 +00:00
|
|
|
+ base::Value::Dict new_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,
|
2022-05-19 08:05:07 +00:00
|
|
|
+ base::Value::Dict 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.
|
2022-06-28 14:34:00 +00:00
|
|
|
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
|
2023-08-15 19:44:24 +00:00
|
|
|
index aeda95912420895271ecdf1883f04da07b32296e..2f165461b7326b4e426d4b2552766896bb273c29 100644
|
2022-06-28 14:34:00 +00:00
|
|
|
--- a/content/browser/BUILD.gn
|
|
|
|
+++ b/content/browser/BUILD.gn
|
2023-08-15 19:44:24 +00:00
|
|
|
@@ -2914,8 +2914,9 @@ source_set("browser") {
|
2022-06-28 14:34:00 +00:00
|
|
|
"//ppapi/shared_impl",
|
|
|
|
]
|
|
|
|
|
2022-10-27 16:37:04 +00:00
|
|
|
- assert(enable_printing)
|
2022-06-28 14:34:00 +00:00
|
|
|
- deps += [ "//printing" ]
|
2022-10-27 16:37:04 +00:00
|
|
|
+ if (enable_printing) {
|
2022-06-28 14:34:00 +00:00
|
|
|
+ deps += [ "//printing" ]
|
|
|
|
+ }
|
|
|
|
|
2022-06-28 23:40:23 +00:00
|
|
|
if (is_chromeos) {
|
2022-06-28 14:34:00 +00:00
|
|
|
sources += [
|
2019-08-07 14:47:24 +00:00
|
|
|
diff --git a/printing/printing_context.cc b/printing/printing_context.cc
|
2023-04-17 21:40:26 +00:00
|
|
|
index 370dedfb4b4649f85a02b3a50ee16f525f57f44a..256666b64d8ffb5b50c9424c40ae1bb4050da6fb 100644
|
2019-08-07 14:47:24 +00:00
|
|
|
--- a/printing/printing_context.cc
|
|
|
|
+++ b/printing/printing_context.cc
|
2022-08-17 18:35:53 +00:00
|
|
|
@@ -143,7 +143,6 @@ void PrintingContext::UsePdfSettings() {
|
2019-08-07 14:47:24 +00:00
|
|
|
|
2021-10-21 18:51:36 +00:00
|
|
|
mojom::ResultCode PrintingContext::UpdatePrintSettings(
|
2022-05-17 16:48:40 +00:00
|
|
|
base::Value::Dict job_settings) {
|
2019-08-07 14:47:24 +00:00
|
|
|
- ResetSettings();
|
2020-09-21 08:00:36 +00:00
|
|
|
{
|
|
|
|
std::unique_ptr<PrintSettings> settings =
|
2022-05-17 16:48:40 +00:00
|
|
|
PrintSettingsFromJobSettings(job_settings);
|
2019-08-07 14:47:24 +00:00
|
|
|
diff --git a/printing/printing_context.h b/printing/printing_context.h
|
2023-04-17 21:40:26 +00:00
|
|
|
index 2fb3aef0797f204f08c20e48987cd8c2703185de..75a70e331f8b539027748dad3252912cb85e8797 100644
|
2019-08-07 14:47:24 +00:00
|
|
|
--- a/printing/printing_context.h
|
|
|
|
+++ b/printing/printing_context.h
|
2023-04-17 21:40:26 +00:00
|
|
|
@@ -178,6 +178,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:
|
2023-04-17 21:40:26 +00:00
|
|
|
@@ -188,9 +191,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)
|
2022-06-28 14:34:00 +00:00
|
|
|
diff --git a/sandbox/policy/mac/sandbox_mac.mm b/sandbox/policy/mac/sandbox_mac.mm
|
2023-08-15 15:49:41 +00:00
|
|
|
index 10096f5a3824c71e6cb13b86ef7bdd02488f76c8..f7de11c89efed78f0280ada29f55f3bbd119ee88 100644
|
2022-06-28 14:34:00 +00:00
|
|
|
--- a/sandbox/policy/mac/sandbox_mac.mm
|
|
|
|
+++ b/sandbox/policy/mac/sandbox_mac.mm
|
2023-08-15 15:49:41 +00:00
|
|
|
@@ -37,6 +37,10 @@
|
|
|
|
#include "sandbox/policy/mac/utility.sb.h"
|
|
|
|
#include "sandbox/policy/mojom/sandbox.mojom.h"
|
2022-06-28 14:34:00 +00:00
|
|
|
|
|
|
|
+#if BUILDFLAG(ENABLE_PRINTING)
|
|
|
|
+#include "sandbox/policy/mac/print_backend.sb.h"
|
|
|
|
+#endif
|
|
|
|
+
|
2023-05-10 14:47:48 +00:00
|
|
|
namespace sandbox::policy {
|
2022-06-28 14:34:00 +00:00
|
|
|
|
2023-05-10 14:47:48 +00:00
|
|
|
base::FilePath GetCanonicalPath(const base::FilePath& path) {
|