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
|
2022-09-08 23:23:08 +00:00
|
|
|
index 5396a2163add191edcd9d54da7974a5e75ee792e..77a6c439fdbf2444e4532579a0e97f5d8cce214a 100644
|
2022-06-28 14:34:00 +00:00
|
|
|
--- a/BUILD.gn
|
|
|
|
+++ b/BUILD.gn
|
2022-09-07 07:46:37 +00:00
|
|
|
@@ -984,7 +984,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",
|
2022-09-07 07:46:37 +00:00
|
|
|
@@ -993,6 +992,10 @@ if (is_win) {
|
2022-06-28 14:34:00 +00:00
|
|
|
"//ui/views:views_unittests",
|
|
|
|
"//url:url_unittests",
|
|
|
|
]
|
|
|
|
+
|
|
|
|
+ if (enable_basic_printing) {
|
|
|
|
+ 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
|
2022-05-17 16:48:40 +00:00
|
|
|
index 331a084371402b5a2440b5d60feac8f0189e84b9..6755d1f497cef4deea6b83df1d8720dcf54817e9 100644
|
2020-06-22 17:35:10 +00:00
|
|
|
--- a/chrome/browser/printing/print_job.cc
|
|
|
|
+++ b/chrome/browser/printing/print_job.cc
|
2022-05-17 16:48:40 +00:00
|
|
|
@@ -90,6 +90,7 @@ bool PrintWithReducedRasterization(PrefService* prefs) {
|
2021-10-06 02:21:00 +00:00
|
|
|
return base::FeatureList::IsEnabled(features::kPrintWithReducedRasterization);
|
|
|
|
}
|
|
|
|
|
|
|
|
+#if 0
|
|
|
|
PrefService* GetPrefsForWebContents(content::WebContents* web_contents) {
|
|
|
|
// TODO(thestig): Figure out why crbug.com/1083911 occurred, which is likely
|
|
|
|
// because `web_contents` was null. As a result, this section has many more
|
2022-05-17 16:48:40 +00:00
|
|
|
@@ -98,6 +99,7 @@ PrefService* GetPrefsForWebContents(content::WebContents* web_contents) {
|
2021-10-06 02:21:00 +00:00
|
|
|
web_contents ? web_contents->GetBrowserContext() : nullptr;
|
|
|
|
return context ? Profile::FromBrowserContext(context)->GetPrefs() : nullptr;
|
|
|
|
}
|
|
|
|
+#endif
|
|
|
|
|
2022-02-10 02:58:52 +00:00
|
|
|
#endif // BUILDFLAG(IS_WIN)
|
2021-10-06 02:21:00 +00:00
|
|
|
|
2022-05-17 16:48:40 +00:00
|
|
|
@@ -351,8 +353,10 @@ void PrintJob::StartPdfToEmfConversion(
|
2022-01-10 22:31:39 +00:00
|
|
|
|
2020-09-30 18:42:57 +00:00
|
|
|
const PrintSettings& settings = document()->settings();
|
|
|
|
|
2020-06-22 17:35:10 +00:00
|
|
|
+#if 0
|
2021-10-06 02:21:00 +00:00
|
|
|
PrefService* prefs = GetPrefsForWebContents(worker_->GetWebContents());
|
2020-06-22 17:35:10 +00:00
|
|
|
- bool print_with_reduced_rasterization = PrintWithReducedRasterization(prefs);
|
|
|
|
+#endif
|
|
|
|
+ bool print_with_reduced_rasterization = PrintWithReducedRasterization(nullptr);
|
|
|
|
|
|
|
|
using RenderMode = PdfRenderSettings::Mode;
|
2022-01-10 22:31:39 +00:00
|
|
|
RenderMode mode = print_with_reduced_rasterization
|
2022-05-17 16:48:40 +00:00
|
|
|
@@ -442,8 +446,10 @@ void PrintJob::StartPdfToPostScriptConversion(
|
2021-10-06 02:21:00 +00:00
|
|
|
if (ps_level2) {
|
|
|
|
mode = PdfRenderSettings::Mode::POSTSCRIPT_LEVEL2;
|
|
|
|
} else {
|
|
|
|
+#if 0
|
|
|
|
PrefService* prefs = GetPrefsForWebContents(worker_->GetWebContents());
|
|
|
|
- mode = PrintWithPostScriptType42Fonts(prefs)
|
|
|
|
+#endif
|
|
|
|
+ mode = PrintWithPostScriptType42Fonts(nullptr)
|
|
|
|
? PdfRenderSettings::Mode::POSTSCRIPT_LEVEL3_WITH_TYPE42_FONTS
|
|
|
|
: PdfRenderSettings::Mode::POSTSCRIPT_LEVEL3;
|
|
|
|
}
|
2018-10-13 01:57:04 +00:00
|
|
|
diff --git a/chrome/browser/printing/print_job_worker.cc b/chrome/browser/printing/print_job_worker.cc
|
2022-09-07 07:46:37 +00:00
|
|
|
index f0d4596f0e95391e752c48dc6ac12f76397c27f1..b7313ce8037c88aa5b8826dc2edcb0dfa4ebee46 100644
|
2018-10-13 01:57:04 +00:00
|
|
|
--- a/chrome/browser/printing/print_job_worker.cc
|
|
|
|
+++ b/chrome/browser/printing/print_job_worker.cc
|
2022-03-25 01:39:03 +00:00
|
|
|
@@ -20,7 +20,6 @@
|
2022-01-10 22:31:39 +00:00
|
|
|
#include "build/build_config.h"
|
2018-10-13 01:57:04 +00:00
|
|
|
#include "chrome/browser/browser_process.h"
|
|
|
|
#include "chrome/browser/printing/print_job.h"
|
|
|
|
-#include "chrome/grit/generated_resources.h"
|
2019-10-28 22:12:35 +00:00
|
|
|
#include "components/crash/core/common/crash_keys.h"
|
2022-01-10 22:31:39 +00:00
|
|
|
#include "components/device_event_log/device_event_log.h"
|
2019-01-12 01:00:43 +00:00
|
|
|
#include "content/public/browser/browser_task_traits.h"
|
2022-03-25 01:39:03 +00:00
|
|
|
@@ -28,6 +27,7 @@
|
|
|
|
#include "content/public/browser/global_routing_id.h"
|
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"
|
2022-04-06 16:34:35 +00:00
|
|
|
+#include "chrome/grit/generated_resources.h"
|
2021-07-26 16:02:16 +00:00
|
|
|
#include "printing/backend/print_backend.h"
|
2021-10-21 18:51:36 +00:00
|
|
|
#include "printing/buildflags/buildflags.h"
|
2021-07-26 16:02:16 +00:00
|
|
|
#include "printing/mojom/print.mojom.h"
|
2022-09-07 07:46:37 +00:00
|
|
|
@@ -208,16 +208,19 @@ void PrintJobWorker::SetSettings(base::Value::Dict new_settings,
|
2022-02-10 02:58:52 +00:00
|
|
|
#endif // BUILDFLAG(IS_LINUX) && defined(USE_CUPS)
|
2019-10-28 22:12:35 +00:00
|
|
|
}
|
|
|
|
|
2021-10-21 18:51:36 +00:00
|
|
|
- mojom::ResultCode result;
|
2020-04-13 23:39:26 +00:00
|
|
|
{
|
2022-02-10 02:58:52 +00:00
|
|
|
#if BUILDFLAG(IS_WIN)
|
2020-04-13 23:39:26 +00:00
|
|
|
// Blocking is needed here because Windows printer drivers are oftentimes
|
|
|
|
// not thread-safe and have to be accessed on the UI thread.
|
|
|
|
base::ScopedAllowBlocking allow_blocking;
|
|
|
|
#endif
|
|
|
|
- result = printing_context_->UpdatePrintSettings(std::move(new_settings));
|
|
|
|
+ // Reset settings from previous print job
|
|
|
|
+ printing_context_->ResetSettings();
|
2022-07-19 09:45:10 +00:00
|
|
|
+ mojom::ResultCode result_code = printing_context_->UseDefaultSettings();
|
|
|
|
+ if (result_code == mojom::ResultCode::kSuccess)
|
|
|
|
+ result_code = printing_context_->UpdatePrintSettings(std::move(new_settings));
|
|
|
|
+ GetSettingsDone(std::move(callback), result_code);
|
2020-04-13 23:39:26 +00:00
|
|
|
}
|
2019-08-07 14:47:24 +00:00
|
|
|
- GetSettingsDone(std::move(callback), result);
|
|
|
|
}
|
|
|
|
|
2022-02-10 02:58:52 +00:00
|
|
|
#if BUILDFLAG(IS_CHROMEOS)
|
|
|
|
diff --git a/chrome/browser/printing/print_job_worker_oop.cc b/chrome/browser/printing/print_job_worker_oop.cc
|
2022-08-17 18:35:53 +00:00
|
|
|
index 398d59a0ebad165981e9e96b29ffc672e4b841eb..e420d87ef0e90cddb740ac4b24f92519a6eb3347 100644
|
2022-02-10 02:58:52 +00:00
|
|
|
--- a/chrome/browser/printing/print_job_worker_oop.cc
|
|
|
|
+++ b/chrome/browser/printing/print_job_worker_oop.cc
|
2022-08-17 18:35:53 +00:00
|
|
|
@@ -356,7 +356,7 @@ void PrintJobWorkerOop::OnFailure() {
|
2022-02-10 02:58:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void PrintJobWorkerOop::ShowErrorDialog() {
|
|
|
|
- ShowPrintErrorDialog();
|
|
|
|
+ // [electron]: removed.
|
|
|
|
}
|
|
|
|
|
|
|
|
void PrintJobWorkerOop::UnregisterServiceManagerClient() {
|
2018-10-13 01:57:04 +00:00
|
|
|
diff --git a/chrome/browser/printing/print_view_manager_base.cc b/chrome/browser/printing/print_view_manager_base.cc
|
2022-09-07 07:46:37 +00:00
|
|
|
index b73982f234aaca5492fdf06a46e0231e66e3504f..ad4631f6ae9211fe6e5d09c46a8b26538b90c1b2 100644
|
2018-10-13 01:57:04 +00:00
|
|
|
--- a/chrome/browser/printing/print_view_manager_base.cc
|
|
|
|
+++ b/chrome/browser/printing/print_view_manager_base.cc
|
2022-05-31 06:21:25 +00:00
|
|
|
@@ -30,8 +30,6 @@
|
2018-11-09 03:42:34 +00:00
|
|
|
#include "chrome/browser/printing/print_view_manager_common.h"
|
|
|
|
#include "chrome/browser/printing/printer_query.h"
|
|
|
|
#include "chrome/browser/profiles/profile.h"
|
|
|
|
-#include "chrome/browser/ui/simple_message_box.h"
|
|
|
|
-#include "chrome/browser/ui/webui/print_preview/printer_handler.h"
|
2018-10-13 01:57:04 +00:00
|
|
|
#include "chrome/common/pref_names.h"
|
2021-02-09 20:16:21 +00:00
|
|
|
#include "chrome/grit/generated_resources.h"
|
2018-10-13 01:57:04 +00:00
|
|
|
#include "components/prefs/pref_service.h"
|
2022-09-07 07:46:37 +00:00
|
|
|
@@ -82,10 +80,23 @@ 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 "";
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
using PrintSettingsCallback =
|
2022-02-25 18:17:35 +00:00
|
|
|
base::OnceCallback<void(std::unique_ptr<PrinterQuery>)>;
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2021-03-15 18:32:18 +00:00
|
|
|
void ShowWarningMessageBox(const std::u16string& message) {
|
2018-10-13 01:57:04 +00:00
|
|
|
+ LOG(ERROR) << "Invalid printer settings " << message;
|
|
|
|
+#if 0
|
|
|
|
// Runs always on the UI thread.
|
|
|
|
static bool is_dialog_shown = false;
|
|
|
|
if (is_dialog_shown)
|
2022-09-07 07:46:37 +00:00
|
|
|
@@ -94,6 +105,7 @@ void ShowWarningMessageBox(const std::u16string& message) {
|
2018-10-13 01:57:04 +00:00
|
|
|
base::AutoReset<bool> auto_reset(&is_dialog_shown, true);
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2021-03-15 18:32:18 +00:00
|
|
|
chrome::ShowWarningMessageBox(nullptr, std::u16string(), message);
|
2019-07-03 01:22:09 +00:00
|
|
|
+#endif
|
2018-10-13 01:57:04 +00:00
|
|
|
}
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2022-06-27 20:50:08 +00:00
|
|
|
void OnDidGetDefaultPrintSettings(
|
2022-09-07 07:46:37 +00:00
|
|
|
@@ -143,7 +155,9 @@ void OnDidUpdatePrintSettings(
|
2022-06-27 20:50:08 +00:00
|
|
|
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
2020-10-28 00:33:04 +00:00
|
|
|
DCHECK(printer_query);
|
2021-06-03 08:05:04 +00:00
|
|
|
mojom::PrintPagesParamsPtr params = CreateEmptyPrintPagesParamsPtr();
|
2021-10-21 18:51:36 +00:00
|
|
|
- if (printer_query->last_status() == mojom::ResultCode::kSuccess) {
|
2020-10-28 00:33:04 +00:00
|
|
|
+ // We call update without first printing from defaults,
|
|
|
|
+ // so the last printer status will still be defaulted to PrintingContext::FAILED
|
|
|
|
+ if (printer_query) {
|
|
|
|
RenderParamsFromPrintSettings(printer_query->settings(),
|
|
|
|
params->params.get());
|
|
|
|
params->params->document_cookie = printer_query->cookie();
|
2022-09-07 07:46:37 +00:00
|
|
|
@@ -171,6 +185,7 @@ void OnDidScriptedPrint(
|
2022-02-01 19:00:09 +00:00
|
|
|
mojom::PrintManagerHost::ScriptedPrintCallback callback) {
|
2022-06-27 20:50:08 +00:00
|
|
|
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
2022-02-01 19:00:09 +00:00
|
|
|
mojom::PrintPagesParamsPtr params = CreateEmptyPrintPagesParamsPtr();
|
|
|
|
+
|
|
|
|
if (printer_query->last_status() == mojom::ResultCode::kSuccess &&
|
|
|
|
printer_query->settings().dpi()) {
|
|
|
|
RenderParamsFromPrintSettings(printer_query->settings(),
|
2022-09-07 07:46:37 +00:00
|
|
|
@@ -180,7 +195,8 @@ void OnDidScriptedPrint(
|
2022-02-01 19:00:09 +00:00
|
|
|
}
|
|
|
|
bool has_valid_cookie = params->params->document_cookie;
|
|
|
|
bool has_dpi = !params->params->dpi.IsEmpty();
|
2022-06-27 20:50:08 +00:00
|
|
|
- std::move(callback).Run(std::move(params));
|
2022-02-01 19:00:09 +00:00
|
|
|
+ bool canceled = printer_query->last_status() == mojom::ResultCode::kCanceled;
|
2022-06-27 20:50:08 +00:00
|
|
|
+ std::move(callback).Run(std::move(params), canceled);
|
2022-02-01 19:00:09 +00:00
|
|
|
|
|
|
|
if (has_dpi && has_valid_cookie) {
|
|
|
|
queue->QueuePrinterQuery(std::move(printer_query));
|
2022-09-07 07:46:37 +00:00
|
|
|
@@ -195,12 +211,14 @@ PrintViewManagerBase::PrintViewManagerBase(content::WebContents* web_contents)
|
2020-09-21 08:00:36 +00:00
|
|
|
: PrintManager(web_contents),
|
2019-07-24 22:58:51 +00:00
|
|
|
queue_(g_browser_process->print_job_manager()->queue()) {
|
2018-10-13 01:57:04 +00:00
|
|
|
DCHECK(queue_);
|
2020-10-19 21:31:25 +00:00
|
|
|
+#if 0 // Printing is always enabled.
|
2018-10-13 01:57:04 +00:00
|
|
|
Profile* profile =
|
|
|
|
Profile::FromBrowserContext(web_contents->GetBrowserContext());
|
|
|
|
printing_enabled_.Init(
|
|
|
|
prefs::kPrintingEnabled, profile->GetPrefs(),
|
2019-07-03 01:22:09 +00:00
|
|
|
base::BindRepeating(&PrintViewManagerBase::UpdatePrintingEnabled,
|
|
|
|
weak_ptr_factory_.GetWeakPtr()));
|
|
|
|
+#endif
|
2018-10-13 01:57:04 +00:00
|
|
|
}
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2018-10-13 01:57:04 +00:00
|
|
|
PrintViewManagerBase::~PrintViewManagerBase() {
|
2022-09-07 07:46:37 +00:00
|
|
|
@@ -208,7 +226,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,
|
2022-05-19 08:05:07 +00:00
|
|
|
+ base::Value::Dict settings,
|
2019-11-08 18:01:50 +00:00
|
|
|
+ CompletionCallback callback) {
|
2022-02-10 02:58:52 +00:00
|
|
|
// Remember the ID for `rfh`, to enable checking that the `RenderFrameHost`
|
|
|
|
// is still valid after a possible inner message loop runs in
|
|
|
|
// `DisconnectFromCurrentPrintJob()`.
|
2022-09-07 07:46:37 +00:00
|
|
|
@@ -236,7 +257,10 @@ bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh) {
|
2022-03-30 18:08:58 +00:00
|
|
|
#endif
|
2019-11-05 23:41:20 +00:00
|
|
|
|
2018-10-13 01:57:04 +00:00
|
|
|
SetPrintingRFH(rfh);
|
2022-09-07 07:46:37 +00:00
|
|
|
- CompletePrintNow(rfh);
|
|
|
|
+ //CompletePrintNow(rfh);
|
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
|
|
|
|
2022-09-07 07:46:37 +00:00
|
|
|
@@ -395,7 +419,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)
|
2022-09-07 07:46:37 +00:00
|
|
|
@@ -410,15 +435,18 @@ void PrintViewManagerBase::ScriptedPrintReply(
|
2022-02-01 19:00:09 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
+ if (canceled)
|
|
|
|
+ UserInitCanceled();
|
|
|
|
+
|
|
|
|
set_cookie(params->params->document_cookie);
|
|
|
|
- std::move(callback).Run(std::move(params));
|
|
|
|
+ std::move(callback).Run(std::move(params), canceled);
|
|
|
|
}
|
|
|
|
|
2018-11-09 03:42:34 +00:00
|
|
|
void PrintViewManagerBase::UpdatePrintingEnabled() {
|
2022-09-07 07:46:37 +00:00
|
|
|
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
2022-06-27 20:50:08 +00:00
|
|
|
web_contents()->GetPrimaryMainFrame()->ForEachRenderFrameHost(
|
2022-09-07 07:46:37 +00:00
|
|
|
[this](content::RenderFrameHost* rfh) {
|
|
|
|
- SendPrintingEnabled(printing_enabled_.GetValue(), rfh);
|
|
|
|
+ SendPrintingEnabled(true, rfh);
|
|
|
|
});
|
2018-10-13 01:57:04 +00:00
|
|
|
}
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2022-09-07 07:46:37 +00:00
|
|
|
@@ -535,11 +563,14 @@ void PrintViewManagerBase::DidPrintDocument(
|
2020-10-19 21:31:25 +00:00
|
|
|
void PrintViewManagerBase::GetDefaultPrintSettings(
|
|
|
|
GetDefaultPrintSettingsCallback callback) {
|
|
|
|
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
|
|
|
+#if 0 // Printing is always enabled.
|
2022-03-30 18:08:58 +00:00
|
|
|
+
|
2020-10-19 21:31:25 +00:00
|
|
|
if (!printing_enabled_.GetValue()) {
|
2021-06-03 08:05:04 +00:00
|
|
|
GetDefaultPrintSettingsReply(std::move(callback),
|
|
|
|
mojom::PrintParams::New());
|
2020-10-19 21:31:25 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
+#endif
|
2022-03-30 18:08:58 +00:00
|
|
|
#if BUILDFLAG(ENABLE_OOP_PRINTING)
|
|
|
|
if (printing::features::kEnableOopPrintDriversJobPrint.Get() &&
|
|
|
|
!service_manager_client_id_.has_value()) {
|
2022-09-07 07:46:37 +00:00
|
|
|
@@ -577,18 +608,20 @@ 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);
|
2021-06-03 08:05:04 +00:00
|
|
|
+#if 0 // Printing is always enabled.
|
2020-10-28 00:33:04 +00:00
|
|
|
if (!printing_enabled_.GetValue()) {
|
2021-06-03 08:05:04 +00:00
|
|
|
UpdatePrintSettingsReply(std::move(callback),
|
|
|
|
CreateEmptyPrintPagesParamsPtr(), false);
|
2020-10-28 00:33:04 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
-
|
2021-06-03 08:05:04 +00:00
|
|
|
+#endif
|
2022-05-17 16:48:40 +00:00
|
|
|
if (!job_settings.FindInt(kSettingPrinterType)) {
|
2021-06-03 08:05:04 +00:00
|
|
|
UpdatePrintSettingsReply(std::move(callback),
|
|
|
|
CreateEmptyPrintPagesParamsPtr(), false);
|
2021-08-24 00:52:17 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
+#if 0
|
|
|
|
content::BrowserContext* context =
|
|
|
|
web_contents() ? web_contents()->GetBrowserContext() : nullptr;
|
|
|
|
PrefService* prefs =
|
2022-09-07 07:46:37 +00:00
|
|
|
@@ -598,6 +631,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
|
|
|
}
|
|
|
|
+#endif
|
|
|
|
|
|
|
|
auto callback_wrapper =
|
2022-01-10 22:31:39 +00:00
|
|
|
base::BindOnce(&PrintViewManagerBase::UpdatePrintSettingsReply,
|
2022-09-07 07:46:37 +00:00
|
|
|
@@ -629,14 +663,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);
|
|
|
|
- std::move(callback).Run(CreateEmptyPrintPagesParamsPtr());
|
|
|
|
+ std::move(callback).Run(CreateEmptyPrintPagesParamsPtr(), false);
|
|
|
|
return;
|
|
|
|
}
|
2022-03-30 18:08:58 +00:00
|
|
|
#if BUILDFLAG(ENABLE_OOP_PRINTING)
|
|
|
|
if (printing::features::kEnableOopPrintDriversJobPrint.Get() &&
|
|
|
|
!service_manager_client_id_.has_value()) {
|
|
|
|
// Renderer process has requested settings outside of the expected setup.
|
|
|
|
- std::move(callback).Run(CreateEmptyPrintPagesParamsPtr());
|
|
|
|
+ std::move(callback).Run(CreateEmptyPrintPagesParamsPtr(), false);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif
|
2022-09-07 07:46:37 +00:00
|
|
|
@@ -674,7 +708,6 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie,
|
2022-05-17 16:48:40 +00:00
|
|
|
PrintManager::PrintingFailed(cookie, reason);
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2022-03-25 01:39:03 +00:00
|
|
|
#if !BUILDFLAG(IS_ANDROID) // Android does not implement this function.
|
2018-11-09 03:42:34 +00:00
|
|
|
- ShowPrintErrorDialog();
|
2018-10-13 01:57:04 +00:00
|
|
|
#endif
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2018-10-13 01:57:04 +00:00
|
|
|
ReleasePrinterQuery();
|
2022-09-07 07:46:37 +00:00
|
|
|
@@ -689,6 +722,11 @@ void PrintViewManagerBase::RemoveObserver(Observer& observer) {
|
2020-07-10 16:42:22 +00:00
|
|
|
}
|
|
|
|
|
2020-09-21 08:00:36 +00:00
|
|
|
void PrintViewManagerBase::ShowInvalidPrinterSettingsError() {
|
2020-07-10 16:42:22 +00:00
|
|
|
+ if (!callback_.is_null()) {
|
2022-07-21 10:46:15 +00:00
|
|
|
+ printing_status_ = PrintStatus::kInvalid;
|
|
|
|
+ TerminatePrintJob(true);
|
2020-07-10 16:42:22 +00:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
base::ThreadTaskRunnerHandle::Get()->PostTask(
|
|
|
|
FROM_HERE, base::BindOnce(&ShowWarningMessageBox,
|
|
|
|
l10n_util::GetStringUTF16(
|
2022-09-07 07:46:37 +00:00
|
|
|
@@ -699,10 +737,12 @@ 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 &&
|
|
|
|
render_frame_host->GetProcess()->IsPdf()) {
|
2021-11-24 08:45:59 +00:00
|
|
|
SendPrintingEnabled(printing_enabled_.GetValue(), render_frame_host);
|
2022-03-25 01:39:03 +00:00
|
|
|
}
|
2021-11-24 08:45:59 +00:00
|
|
|
+#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
void PrintViewManagerBase::DidStartLoading() {
|
2022-09-07 07:46:37 +00:00
|
|
|
@@ -758,7 +798,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
|
|
|
|
2022-09-07 07:46:37 +00:00
|
|
|
@@ -772,7 +817,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;
|
|
|
|
}
|
|
|
|
|
2022-09-07 07:46:37 +00:00
|
|
|
@@ -820,7 +865,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
|
|
|
|
2022-09-07 07:46:37 +00:00
|
|
|
@@ -841,7 +889,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;
|
|
|
|
}
|
|
|
|
|
2022-09-07 07:46:37 +00:00
|
|
|
@@ -901,6 +949,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
|
|
|
|
2022-09-07 07:46:37 +00:00
|
|
|
@@ -908,7 +961,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);
|
2022-09-07 07:46:37 +00:00
|
|
|
@@ -950,7 +1003,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) {
|
2022-09-07 07:46:37 +00:00
|
|
|
@@ -1058,7 +1111,7 @@ void PrintViewManagerBase::SendPrintingEnabled(bool enabled,
|
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
|
|
|
|
|
|
|
for (auto& observer : GetObservers())
|
|
|
|
observer.OnPrintNow(rfh);
|
2018-10-13 01:57:04 +00:00
|
|
|
diff --git a/chrome/browser/printing/print_view_manager_base.h b/chrome/browser/printing/print_view_manager_base.h
|
2022-09-07 07:46:37 +00:00
|
|
|
index 871e00c49028ccf58d207f904c22e0107f3c2b65..c9b136ab165410eb533f84254454dac0b6674f14 100644
|
2018-10-13 01:57:04 +00:00
|
|
|
--- a/chrome/browser/printing/print_view_manager_base.h
|
|
|
|
+++ b/chrome/browser/printing/print_view_manager_base.h
|
2022-09-07 07:46:37 +00:00
|
|
|
@@ -42,6 +42,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:
|
2022-09-07 07:46:37 +00:00
|
|
|
@@ -65,7 +67,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
|
|
|
|
2018-10-13 01:57:04 +00:00
|
|
|
#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
|
2022-02-10 02:58:52 +00:00
|
|
|
// Prints the document in `print_data` with settings specified in
|
2022-09-07 07:46:37 +00:00
|
|
|
@@ -123,6 +128,7 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
|
2022-02-01 19:00:09 +00:00
|
|
|
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
|
2022-09-07 07:46:37 +00:00
|
|
|
@@ -130,6 +136,14 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
|
2022-07-21 10:46:15 +00:00
|
|
|
void AddObserver(Observer& observer);
|
|
|
|
void RemoveObserver(Observer& observer);
|
|
|
|
|
|
|
|
+ enum class PrintStatus {
|
|
|
|
+ kSucceeded,
|
|
|
|
+ kCanceled,
|
|
|
|
+ kFailed,
|
|
|
|
+ kInvalid,
|
|
|
|
+ kUnknown
|
|
|
|
+ };
|
|
|
|
+
|
|
|
|
protected:
|
|
|
|
explicit PrintViewManagerBase(content::WebContents* web_contents);
|
|
|
|
|
2022-09-07 07:46:37 +00:00
|
|
|
@@ -251,7 +265,8 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
|
2022-02-01 19:00:09 +00:00
|
|
|
// Runs `callback` with `params` to reply to ScriptedPrint().
|
|
|
|
void ScriptedPrintReply(ScriptedPrintCallback callback,
|
|
|
|
int process_id,
|
|
|
|
- mojom::PrintPagesParamsPtr params);
|
|
|
|
+ mojom::PrintPagesParamsPtr params,
|
|
|
|
+ bool canceled);
|
|
|
|
|
|
|
|
// Requests the RenderView to render all the missing pages for the print job.
|
|
|
|
// No-op if no print job is pending. Returns true if at least one page has
|
2022-09-07 07:46:37 +00:00
|
|
|
@@ -324,8 +339,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
|
|
|
|
2019-07-01 21:03:19 +00:00
|
|
|
// Set while running an inner message loop inside RenderAllMissingPagesNow().
|
|
|
|
// This means we are _blocking_ until all the necessary pages have been
|
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
|
2022-07-20 11:03:34 +00:00
|
|
|
index f3c3f85edb19489d079dc93411be64828ae581e2..ff303dcbc034cd8f1530fe1543729e98d3035826 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
|
2022-07-20 11:03:34 +00:00
|
|
|
index 0e788384809f9f7218c6483822ffea08f86b4f79..c6f08845cb292ff406db5560c9a744dc7ab1c712 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;
|
2019-11-05 23:41:20 +00:00
|
|
|
diff --git a/components/printing/common/print.mojom b/components/printing/common/print.mojom
|
2022-09-07 07:46:37 +00:00
|
|
|
index 255a68703b848064de894122386279168590bb4f..e138abd3dbad430254936aa5fe6337c576bea8a7 100644
|
2019-11-05 23:41:20 +00:00
|
|
|
--- a/components/printing/common/print.mojom
|
|
|
|
+++ b/components/printing/common/print.mojom
|
2022-09-07 07:46:37 +00:00
|
|
|
@@ -286,7 +286,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
|
2022-09-07 07:46:37 +00:00
|
|
|
@@ -369,7 +369,7 @@ interface PrintManagerHost {
|
2022-02-01 19:00:09 +00:00
|
|
|
// Request the print settings from the user. This step is about showing
|
|
|
|
// UI to the user to select the final print settings.
|
|
|
|
[Sync]
|
|
|
|
- ScriptedPrint(ScriptedPrintParams params) => (PrintPagesParams settings);
|
|
|
|
+ ScriptedPrint(ScriptedPrintParams params) => (PrintPagesParams settings, bool canceled);
|
|
|
|
|
|
|
|
// Tells the browser that there are invalid printer settings.
|
|
|
|
ShowInvalidPrinterSettingsError();
|
2018-10-13 01:57:04 +00:00
|
|
|
diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc
|
2022-09-07 07:46:37 +00:00
|
|
|
index 1908f32f88245e4edf2c75cc4f5378310b27f569..17d1dea5013fabf0379846b6dc9d68d120e488bc 100644
|
2018-10-13 01:57:04 +00:00
|
|
|
--- a/components/printing/renderer/print_render_frame_helper.cc
|
|
|
|
+++ b/components/printing/renderer/print_render_frame_helper.cc
|
2022-05-17 16:48:40 +00:00
|
|
|
@@ -42,6 +42,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"
|
2020-08-15 01:51:28 +00:00
|
|
|
#include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
|
2019-09-18 19:58:00 +00:00
|
|
|
#include "third_party/blink/public/common/associated_interfaces/associated_interface_registry.h"
|
2022-09-07 07:46:37 +00:00
|
|
|
@@ -1283,7 +1284,8 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) {
|
2020-10-16 01:30:41 +00:00
|
|
|
if (!weak_this)
|
|
|
|
return;
|
|
|
|
|
|
|
|
- Print(web_frame, blink::WebNode(), PrintRequestType::kScripted);
|
|
|
|
+ Print(web_frame, blink::WebNode(), PrintRequestType::kScripted,
|
2022-05-19 08:05:07 +00:00
|
|
|
+ false /* silent */, base::Value::Dict() /* new_settings */);
|
2021-05-05 23:26:17 +00:00
|
|
|
if (!weak_this)
|
|
|
|
return;
|
2020-09-21 08:00:36 +00:00
|
|
|
|
2022-09-07 07:46:37 +00:00
|
|
|
@@ -1314,7 +1316,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;
|
2022-09-07 07:46:37 +00:00
|
|
|
@@ -1329,7 +1331,7 @@ void PrintRenderFrameHelper::PrintRequestedPages() {
|
2021-11-24 08:45:59 +00:00
|
|
|
// plugin node and print that instead.
|
2020-10-16 01:30:41 +00:00
|
|
|
auto plugin = delegate_->GetPdfElement(frame);
|
2020-09-21 08:00:36 +00:00
|
|
|
|
2020-10-16 01:30:41 +00:00
|
|
|
- Print(frame, plugin, PrintRequestType::kRegular);
|
|
|
|
+ Print(frame, plugin, PrintRequestType::kRegular, silent, std::move(settings));
|
2020-09-21 08:00:36 +00:00
|
|
|
|
2019-11-05 23:41:20 +00:00
|
|
|
if (!render_frame_gone_)
|
2020-10-16 01:30:41 +00:00
|
|
|
frame->DispatchAfterPrintEvent();
|
2022-09-07 07:46:37 +00:00
|
|
|
@@ -1411,7 +1413,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());
|
2019-11-05 23:41:20 +00:00
|
|
|
if (!render_frame_gone_)
|
2020-09-21 08:00:36 +00:00
|
|
|
print_preview_context_.DispatchAfterPrintEvent();
|
2018-10-13 01:57:04 +00:00
|
|
|
// WARNING: |this| may be gone at this point. Do not do any more work here and
|
2022-09-07 07:46:37 +00:00
|
|
|
@@ -1460,6 +1463,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)
|
2022-09-07 07:46:37 +00:00
|
|
|
@@ -2072,7 +2077,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 */,
|
2022-05-19 08:05:07 +00:00
|
|
|
+ base::Value::Dict() /* new_settings */);
|
2018-11-09 03:42:34 +00:00
|
|
|
// Check if |this| is still valid.
|
2020-08-15 01:51:28 +00:00
|
|
|
if (!weak_this)
|
2018-11-09 03:42:34 +00:00
|
|
|
return;
|
2022-09-07 07:46:37 +00:00
|
|
|
@@ -2087,7 +2093,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;
|
2022-09-07 07:46:37 +00:00
|
|
|
@@ -2095,7 +2103,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))) {
|
2018-10-13 01:57:04 +00:00
|
|
|
DidFinishPrinting(FAIL_PRINT_INIT);
|
|
|
|
return; // Failed to init print page settings.
|
|
|
|
}
|
2022-09-07 07:46:37 +00:00
|
|
|
@@ -2114,8 +2122,15 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
|
2020-09-21 08:00:36 +00:00
|
|
|
print_pages_params_->params->print_scaling_option;
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2018-10-13 01:57:04 +00:00
|
|
|
auto self = weak_ptr_factory_.GetWeakPtr();
|
2021-01-12 23:31:23 +00:00
|
|
|
- mojom::PrintPagesParamsPtr print_settings = GetPrintSettingsFromUser(
|
|
|
|
+ mojom::PrintPagesParamsPtr print_settings;
|
|
|
|
+
|
|
|
|
+ if (silent) {
|
|
|
|
+ print_settings = mojom::PrintPagesParams::New();
|
2021-08-24 00:52:17 +00:00
|
|
|
+ print_settings->params = print_pages_params_->params->Clone();
|
2021-01-12 23:31:23 +00:00
|
|
|
+ } else {
|
|
|
|
+ print_settings = GetPrintSettingsFromUser(
|
|
|
|
frame_ref.GetFrame(), node, expected_page_count, print_request_type);
|
2020-09-21 08:00:36 +00:00
|
|
|
+ }
|
2018-10-13 01:57:04 +00:00
|
|
|
// Check if |this| is still valid.
|
|
|
|
if (!self)
|
|
|
|
return;
|
2022-09-07 07:46:37 +00:00
|
|
|
@@ -2380,36 +2395,52 @@ void PrintRenderFrameHelper::IPCProcessed() {
|
2020-10-16 01:30:41 +00:00
|
|
|
}
|
2018-10-13 01:57:04 +00:00
|
|
|
}
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2018-10-13 01:57:04 +00:00
|
|
|
-bool PrintRenderFrameHelper::InitPrintSettings(bool fit_to_paper_size) {
|
2021-10-25 15:52:52 +00:00
|
|
|
- mojom::PrintPagesParams settings;
|
|
|
|
- settings.params = mojom::PrintParams::New();
|
|
|
|
- GetPrintManagerHost()->GetDefaultPrintSettings(&settings.params);
|
2018-10-13 01:57:04 +00:00
|
|
|
+bool PrintRenderFrameHelper::InitPrintSettings(
|
|
|
|
+ bool fit_to_paper_size,
|
2022-05-19 08:05:07 +00:00
|
|
|
+ base::Value::Dict new_settings) {
|
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 {
|
|
|
|
+ bool canceled = false;
|
|
|
|
+ int cookie =
|
|
|
|
+ print_pages_params_ ? print_pages_params_->params->document_cookie : 0;
|
2022-05-17 16:48:40 +00:00
|
|
|
+ GetPrintManagerHost()->UpdatePrintSettings(
|
2022-05-19 08:05:07 +00:00
|
|
|
+ cookie, std::move(new_settings), &settings, &canceled);
|
2021-10-25 15:52:52 +00:00
|
|
|
+ if (canceled)
|
|
|
|
+ return false;
|
|
|
|
+ }
|
|
|
|
|
|
|
|
// Check if the printer returned any settings, if the settings is empty, we
|
|
|
|
// can safely assume there are no printer drivers configured. So we safely
|
|
|
|
// terminate.
|
|
|
|
bool result = true;
|
|
|
|
- if (!PrintMsg_Print_Params_IsValid(*settings.params))
|
|
|
|
+ if (!PrintMsg_Print_Params_IsValid(*settings->params))
|
|
|
|
result = false;
|
|
|
|
|
|
|
|
// Reset to default values.
|
|
|
|
ignore_css_margins_ = false;
|
|
|
|
- settings.pages.clear();
|
|
|
|
+ settings->pages.clear();
|
|
|
|
|
|
|
|
- settings.params->print_scaling_option =
|
|
|
|
+ settings->params->print_scaling_option =
|
|
|
|
fit_to_paper_size ? mojom::PrintScalingOption::kFitToPrintableArea
|
|
|
|
: mojom::PrintScalingOption::kSourceSize;
|
|
|
|
|
|
|
|
- SetPrintPagesParams(settings);
|
|
|
|
+ SetPrintPagesParams(*settings);
|
2018-11-09 03:42:34 +00:00
|
|
|
return result;
|
|
|
|
}
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2018-11-09 03:42:34 +00:00
|
|
|
-bool PrintRenderFrameHelper::CalculateNumberOfPages(blink::WebLocalFrame* frame,
|
|
|
|
- const blink::WebNode& node,
|
2020-09-21 08:00:36 +00:00
|
|
|
- uint32_t* number_of_pages) {
|
2018-11-09 03:42:34 +00:00
|
|
|
+bool PrintRenderFrameHelper::CalculateNumberOfPages(
|
|
|
|
+ blink::WebLocalFrame* frame,
|
|
|
|
+ const blink::WebNode& node,
|
2020-09-21 08:00:36 +00:00
|
|
|
+ uint32_t* number_of_pages,
|
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))) {
|
2018-10-13 01:57:04 +00:00
|
|
|
notify_browser_of_print_failure_ = false;
|
2020-09-21 08:00:36 +00:00
|
|
|
GetPrintManagerHost()->ShowInvalidPrinterSettingsError();
|
2018-10-13 01:57:04 +00:00
|
|
|
return false;
|
2022-09-07 07:46:37 +00:00
|
|
|
@@ -2534,7 +2565,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
|
2022-07-20 11:03:34 +00:00
|
|
|
index 66026548181a897c161d7202646f33fd8847ccb8..113a8165b5db6294087773e5a4b2f0035f4c8f5d 100644
|
2018-10-13 01:57:04 +00:00
|
|
|
--- a/components/printing/renderer/print_render_frame_helper.h
|
|
|
|
+++ b/components/printing/renderer/print_render_frame_helper.h
|
2022-05-17 16:48:40 +00:00
|
|
|
@@ -255,7 +255,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)
|
2022-07-20 11:03:34 +00:00
|
|
|
@@ -328,7 +328,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);
|
2022-07-20 11:03:34 +00:00
|
|
|
@@ -337,12 +339,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
|
2022-09-08 23:23:08 +00:00
|
|
|
index ba3e4bc8a46d8936435a015cc8bbd7e83be08943..5c2979a98fa0b05067801a6dd3109f375681868d 100644
|
2022-06-28 14:34:00 +00:00
|
|
|
--- a/content/browser/BUILD.gn
|
|
|
|
+++ b/content/browser/BUILD.gn
|
2022-09-08 23:23:08 +00:00
|
|
|
@@ -2812,8 +2812,9 @@ source_set("browser") {
|
2022-06-28 14:34:00 +00:00
|
|
|
"//ppapi/shared_impl",
|
|
|
|
]
|
|
|
|
|
|
|
|
- assert(enable_basic_printing)
|
|
|
|
- deps += [ "//printing" ]
|
|
|
|
+ if (enable_basic_printing) {
|
|
|
|
+ deps += [ "//printing" ]
|
|
|
|
+ }
|
|
|
|
|
2022-06-28 23:40:23 +00:00
|
|
|
if (is_chromeos) {
|
2022-06-28 14:34:00 +00:00
|
|
|
sources += [
|
|
|
|
diff --git a/content/browser/utility_sandbox_delegate_win.cc b/content/browser/utility_sandbox_delegate_win.cc
|
2022-09-07 07:46:37 +00:00
|
|
|
index d072c23a079bbe269b90d39882bf688a0c17280e..9ebc07769f13d384ebe9bca318a3634234b913be 100644
|
2022-06-28 14:34:00 +00:00
|
|
|
--- a/content/browser/utility_sandbox_delegate_win.cc
|
|
|
|
+++ b/content/browser/utility_sandbox_delegate_win.cc
|
2022-09-07 07:46:37 +00:00
|
|
|
@@ -99,6 +99,7 @@ bool NetworkPreSpawnTarget(sandbox::TargetConfig* config) {
|
2022-06-28 14:34:00 +00:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
+#if BUILDFLAG(ENABLE_PRINTING)
|
|
|
|
// Sets the sandbox policy for the print backend service process.
|
2022-09-07 07:46:37 +00:00
|
|
|
bool PrintBackendPreSpawnTarget(sandbox::TargetConfig* config) {
|
|
|
|
DCHECK(!config->IsConfigured());
|
|
|
|
@@ -170,6 +171,7 @@ bool XrCompositingPreSpawnTarget(sandbox::TargetConfig* config,
|
|
|
|
|
2022-06-28 14:34:00 +00:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
+#endif
|
|
|
|
} // namespace
|
|
|
|
|
2022-08-17 18:35:53 +00:00
|
|
|
std::string UtilitySandboxedProcessLauncherDelegate::GetSandboxTag() {
|
2019-08-07 14:47:24 +00:00
|
|
|
diff --git a/printing/printing_context.cc b/printing/printing_context.cc
|
2022-08-17 18:35:53 +00:00
|
|
|
index 6cca846b9831da669ca52aff776caf5a23f6f4d1..39d1032f276181a535de9fba89c2246c7a9814d7 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
|
2022-08-17 18:35:53 +00:00
|
|
|
index 0e6dd8092f6025790560ca2bab2d68daf47caff2..a4aa6e21b1d37e534b543ad8b112070eedd12d2e 100644
|
2019-08-07 14:47:24 +00:00
|
|
|
--- a/printing/printing_context.h
|
|
|
|
+++ b/printing/printing_context.h
|
2022-06-01 06:12:47 +00:00
|
|
|
@@ -171,6 +171,9 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
|
2019-08-07 14:47:24 +00:00
|
|
|
|
2022-02-10 02:58:52 +00:00
|
|
|
bool PrintingAborted() const { return abort_printing_; }
|
2019-08-07 14:47:24 +00:00
|
|
|
|
2021-09-01 19:55:07 +00:00
|
|
|
+ // Reinitializes the settings for object reuse.
|
|
|
|
+ void ResetSettings();
|
2019-08-07 14:47:24 +00:00
|
|
|
+
|
2022-01-10 22:31:39 +00:00
|
|
|
int job_id() const { return job_id_; }
|
2021-09-01 19:55:07 +00:00
|
|
|
|
2022-01-10 22:31:39 +00:00
|
|
|
protected:
|
2022-06-01 06:12:47 +00:00
|
|
|
@@ -181,9 +184,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
|
2022-09-07 07:46:37 +00:00
|
|
|
index 106ede6555aa87ff7e0728b34c909cf3796678df..ef34788e9ac5ada4bdb85f524ad7fadd27c61509 100644
|
2022-06-28 14:34:00 +00:00
|
|
|
--- a/sandbox/policy/mac/sandbox_mac.mm
|
|
|
|
+++ b/sandbox/policy/mac/sandbox_mac.mm
|
2022-07-13 21:26:16 +00:00
|
|
|
@@ -22,7 +22,6 @@
|
2022-06-28 14:34:00 +00:00
|
|
|
#include "sandbox/policy/mac/nacl_loader.sb.h"
|
|
|
|
#include "sandbox/policy/mac/network.sb.h"
|
|
|
|
#include "sandbox/policy/mac/ppapi.sb.h"
|
|
|
|
-#include "sandbox/policy/mac/print_backend.sb.h"
|
|
|
|
#include "sandbox/policy/mac/print_compositor.sb.h"
|
|
|
|
#include "sandbox/policy/mac/renderer.sb.h"
|
|
|
|
#include "sandbox/policy/mac/screen_ai.sb.h"
|
2022-07-13 21:26:16 +00:00
|
|
|
@@ -30,6 +29,10 @@
|
2022-06-28 14:34:00 +00:00
|
|
|
#include "sandbox/policy/mac/utility.sb.h"
|
|
|
|
#include "sandbox/policy/mojom/sandbox.mojom.h"
|
|
|
|
|
|
|
|
+#if BUILDFLAG(ENABLE_PRINTING)
|
|
|
|
+#include "sandbox/policy/mac/print_backend.sb.h"
|
|
|
|
+#endif
|
|
|
|
+
|
|
|
|
namespace sandbox {
|
|
|
|
namespace policy {
|
|
|
|
|