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
|
2024-07-03 15:15:35 +00:00
|
|
|
index d08e389678df3348acc0085d9b3af2725a32cdae..ff2b512131e1e81d417b5007d5b248b5f9256add 100644
|
2022-06-28 14:34:00 +00:00
|
|
|
--- a/BUILD.gn
|
|
|
|
+++ b/BUILD.gn
|
2024-07-03 15:15:35 +00:00
|
|
|
@@ -976,7 +976,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",
|
2024-07-03 15:15:35 +00:00
|
|
|
"//third_party/breakpad:symupload($host_toolchain)",
|
2022-06-28 14:34:00 +00:00
|
|
|
"//ui/base:ui_base_unittests",
|
2024-07-03 15:15:35 +00:00
|
|
|
@@ -985,6 +984,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
|
2024-06-07 21:18:35 +00:00
|
|
|
index 163eacc8bb6654880d37111923a87ea5a6134485..565258e9bd4cc52e347e1f4a72ee29ec4a847690 100644
|
2020-06-22 17:35:10 +00:00
|
|
|
--- a/chrome/browser/printing/print_job.cc
|
|
|
|
+++ b/chrome/browser/printing/print_job.cc
|
2024-05-10 15:21:10 +00:00
|
|
|
@@ -97,6 +97,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
|
2024-05-10 15:21:10 +00:00
|
|
|
@@ -111,6 +112,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
|
|
|
|
2024-05-10 15:21:10 +00:00
|
|
|
@@ -151,10 +153,8 @@ void PrintJob::Initialize(std::unique_ptr<PrinterQuery> query,
|
2023-05-23 19:58:58 +00:00
|
|
|
|
|
|
|
#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),
|
2024-05-10 15:21:10 +00:00
|
|
|
@@ -405,8 +405,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
|
2024-05-10 15:21:10 +00:00
|
|
|
@@ -498,8 +500,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
|
2024-06-07 21:18:35 +00:00
|
|
|
index c68d3d2f7fdaab62aac24b79e0cf71e0eb84cf72..3084546bee021eb2752335b8d31d48d28a6e5af1 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
|
2024-05-10 15:21:10 +00:00
|
|
|
@@ -87,6 +87,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,
|
2024-05-10 15:21:10 +00:00
|
|
|
@@ -95,9 +109,9 @@ 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) {
|
2024-04-17 16:04:47 +00:00
|
|
|
- if (!want_pdf_settings) {
|
|
|
|
+#if 0 // Electron does not use Chromium error dialogs
|
2023-03-20 11:06:57 +00:00
|
|
|
ShowPrintErrorDialogForInvalidPrinterError();
|
2024-04-17 16:04:47 +00:00
|
|
|
- }
|
2023-03-20 11:06:57 +00:00
|
|
|
+#endif
|
|
|
|
std::move(callback).Run(nullptr);
|
|
|
|
return;
|
2023-03-10 16:07:42 +00:00
|
|
|
}
|
2024-05-10 15:21:10 +00:00
|
|
|
@@ -107,9 +121,9 @@ void OnDidGetDefaultPrintSettings(
|
2023-03-20 11:06:57 +00:00
|
|
|
params->document_cookie = printer_query->cookie();
|
|
|
|
|
|
|
|
if (!PrintMsgPrintParamsIsValid(*params)) {
|
2024-04-17 16:04:47 +00:00
|
|
|
- if (!want_pdf_settings) {
|
|
|
|
+#if 0 // Electron does not use Chromium error dialogs
|
2023-03-20 11:06:57 +00:00
|
|
|
ShowPrintErrorDialogForInvalidPrinterError();
|
2024-04-17 16:04:47 +00:00
|
|
|
- }
|
2023-03-10 16:07:42 +00:00
|
|
|
+#endif
|
2023-03-20 11:06:57 +00:00
|
|
|
std::move(callback).Run(nullptr);
|
|
|
|
return;
|
|
|
|
}
|
2024-05-10 15:21:10 +00:00
|
|
|
@@ -121,11 +135,15 @@ void OnDidGetDefaultPrintSettings(
|
2024-01-03 08:52:49 +00:00
|
|
|
void OnDidScriptedPrint(
|
|
|
|
scoped_refptr<PrintQueriesQueue> queue,
|
|
|
|
std::unique_ptr<PrinterQuery> printer_query,
|
|
|
|
- mojom::PrintManagerHost::ScriptedPrintCallback callback) {
|
|
|
|
+ mojom::PrintManagerHost::ScriptedPrintCallback callback,
|
|
|
|
+ base::OnceCallback<void()> cancel_job) {
|
|
|
|
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 ||
|
|
|
|
!printer_query->settings().dpi()) {
|
2024-01-03 08:52:49 +00:00
|
|
|
+ if (printer_query->last_status() == mojom::ResultCode::kCanceled) {
|
|
|
|
+ std::move(cancel_job).Run();
|
|
|
|
+ }
|
|
|
|
std::move(callback).Run(nullptr);
|
2023-03-20 11:06:57 +00:00
|
|
|
return;
|
2022-02-01 19:00:09 +00:00
|
|
|
}
|
2024-05-10 15:21:10 +00:00
|
|
|
@@ -182,9 +200,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_);
|
2024-04-17 16:04:47 +00:00
|
|
|
+#if 0
|
2018-10-13 01:57:04 +00:00
|
|
|
Profile* profile =
|
|
|
|
Profile::FromBrowserContext(web_contents->GetBrowserContext());
|
2024-04-17 16:04:47 +00:00
|
|
|
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() {
|
2024-05-10 15:21:10 +00:00
|
|
|
@@ -208,12 +228,16 @@ 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,
|
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
|
|
|
|
2024-01-03 08:52:49 +00:00
|
|
|
- GetPrintRenderFrame(rfh)->PrintRequestedPages();
|
2018-11-09 03:42:34 +00:00
|
|
|
+ callback_ = std::move(callback);
|
2019-11-08 18:01:50 +00:00
|
|
|
+
|
2024-04-17 16:04:47 +00:00
|
|
|
+ GetPrintRenderFrame(rfh)->PrintRequestedPages(std::move(settings));
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2024-01-03 08:52:49 +00:00
|
|
|
for (auto& observer : GetTestObservers()) {
|
|
|
|
observer.OnPrintNow(rfh);
|
2024-06-07 21:18:35 +00:00
|
|
|
@@ -295,7 +319,7 @@ void PrintViewManagerBase::PrintDocument(
|
|
|
|
const gfx::Size& page_size,
|
|
|
|
const gfx::Rect& content_area,
|
|
|
|
const gfx::Point& offsets) {
|
|
|
|
-#if BUILDFLAG(ENTERPRISE_CONTENT_ANALYSIS)
|
|
|
|
+#if 0
|
|
|
|
if (content_analysis_before_printing_document_) {
|
|
|
|
std::move(content_analysis_before_printing_document_)
|
|
|
|
.Run(print_data, page_size, content_area, offsets);
|
2024-05-10 15:21:10 +00:00
|
|
|
@@ -342,12 +366,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) {
|
2024-05-10 15:21:10 +00:00
|
|
|
@@ -355,7 +380,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));
|
2024-05-10 15:21:10 +00:00
|
|
|
@@ -367,6 +393,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));
|
|
|
|
}
|
2024-06-07 21:18:35 +00:00
|
|
|
@@ -436,7 +466,7 @@ void PrintViewManagerBase::StartLocalPrintJob(
|
|
|
|
PrinterHandler::PrintCallback callback) {
|
|
|
|
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
|
|
|
|
|
|
|
-#if BUILDFLAG(ENTERPRISE_CONTENT_ANALYSIS)
|
|
|
|
+#if 0
|
|
|
|
// Populating `content_analysis_before_printing_document_` if needed should be
|
|
|
|
// done first in this function's workflow, this way other code can check if
|
|
|
|
// content analysis is going to happen and delay starting `print_job_` to
|
|
|
|
@@ -669,7 +699,7 @@ void PrintViewManagerBase::GetDefaultPrintSettings(
|
|
|
|
|
|
|
|
#if BUILDFLAG(ENABLE_OOP_PRINTING)
|
|
|
|
if (ShouldPrintJobOop() &&
|
|
|
|
-#if BUILDFLAG(ENTERPRISE_CONTENT_ANALYSIS)
|
|
|
|
+#if 0
|
|
|
|
!analyzing_content_ &&
|
|
|
|
#endif
|
|
|
|
!query_with_ui_client_id().has_value()) {
|
|
|
|
@@ -697,7 +727,7 @@ void PrintViewManagerBase::GetDefaultPrintSettings(
|
|
|
|
|
|
|
|
// Sometimes it is desired to get the PDF settings as opposed to the settings
|
|
|
|
// of the default system print driver.
|
|
|
|
-#if BUILDFLAG(ENTERPRISE_CONTENT_ANALYSIS)
|
|
|
|
+#if 0
|
|
|
|
bool want_pdf_settings = analyzing_content_;
|
|
|
|
#else
|
|
|
|
bool want_pdf_settings = false;
|
|
|
|
@@ -741,10 +771,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
|
2024-04-17 16:04:47 +00:00
|
|
|
// `job_settings` does not yet contain the rasterized PDF dpi, so if the user
|
|
|
|
// has the print preference set, fetch it for use in
|
|
|
|
// `PrintSettingsFromJobSettings()`.
|
|
|
|
- content::BrowserContext* context =
|
|
|
|
- web_contents() ? web_contents()->GetBrowserContext() : nullptr;
|
|
|
|
- PrefService* prefs =
|
|
|
|
- context ? Profile::FromBrowserContext(context)->GetPrefs() : nullptr;
|
|
|
|
+ PrefService* prefs = nullptr;
|
|
|
|
if (prefs && prefs->HasPrefPath(prefs::kPrintRasterizePdfDpi)) {
|
|
|
|
int value = prefs->GetInteger(prefs::kPrintRasterizePdfDpi);
|
2021-08-24 00:52:17 +00:00
|
|
|
if (value > 0)
|
2024-06-07 21:18:35 +00:00
|
|
|
@@ -769,8 +796,22 @@ void PrintViewManagerBase::UpdatePrintSettings(
|
2023-06-15 14:46:38 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2023-07-10 13:26:29 +00:00
|
|
|
-#if BUILDFLAG(IS_WIN)
|
2024-05-10 15:21:10 +00:00
|
|
|
- // TODO(crbug.com/40260379): Remove this if the printable areas can be made
|
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
|
2024-05-10 15:21:10 +00:00
|
|
|
+ // TODO(crbug.com/1424368): Remove this if the printable areas can be made
|
2023-06-15 14:46:38 +00:00
|
|
|
// fully available from `PrintBackend::GetPrinterSemanticCapsAndDefaults()`
|
2023-07-10 13:26:29 +00:00
|
|
|
// for in-browser queries.
|
2024-05-10 15:21:10 +00:00
|
|
|
if (printer_type == mojom::PrinterType::kLocal) {
|
2024-06-07 21:18:35 +00:00
|
|
|
@@ -791,8 +832,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(
|
2024-06-07 21:18:35 +00:00
|
|
|
@@ -808,7 +847,7 @@ void PrintViewManagerBase::SetAccessibilityTree(
|
2023-01-31 11:06:11 +00:00
|
|
|
void PrintViewManagerBase::IsPrintingEnabled(
|
|
|
|
IsPrintingEnabledCallback callback) {
|
|
|
|
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
2024-04-15 22:10:32 +00:00
|
|
|
- std::move(callback).Run(GetPrintingEnabledBooleanPref());
|
2023-01-31 11:06:11 +00:00
|
|
|
+ std::move(callback).Run(true);
|
|
|
|
}
|
|
|
|
|
|
|
|
void PrintViewManagerBase::ScriptedPrint(mojom::ScriptedPrintParamsPtr params,
|
2024-06-07 21:18:35 +00:00
|
|
|
@@ -834,7 +873,7 @@ void PrintViewManagerBase::ScriptedPrint(mojom::ScriptedPrintParamsPtr params,
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
-#if BUILDFLAG(ENTERPRISE_CONTENT_ANALYSIS)
|
|
|
|
+#if 0
|
|
|
|
std::optional<enterprise_connectors::ContentAnalysisDelegate::Data>
|
|
|
|
scanning_data = enterprise_data_protection::GetPrintAnalysisData(
|
|
|
|
web_contents(), enterprise_data_protection::PrintScanningContext::
|
|
|
|
@@ -864,11 +903,9 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie,
|
2023-01-06 02:35:34 +00:00
|
|
|
// destroyed. In such cases the error notification to the user will
|
2024-04-17 16:04:47 +00:00
|
|
|
// have already been displayed, and a second message should not be
|
|
|
|
// shown.
|
|
|
|
- if (print_job_ && print_job_->document() &&
|
|
|
|
- print_job_->document()->cookie() == cookie) {
|
|
|
|
+#if 0 // Electron does not use Chromium error dialogs
|
2023-03-10 16:07:42 +00:00
|
|
|
ShowPrintErrorDialogForGenericError();
|
2024-04-17 16:04:47 +00:00
|
|
|
- }
|
2023-03-10 16:07:42 +00:00
|
|
|
-
|
|
|
|
+#endif
|
|
|
|
ReleasePrinterQuery();
|
|
|
|
}
|
|
|
|
|
2024-06-07 21:18:35 +00:00
|
|
|
@@ -880,15 +917,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(
|
2024-06-07 21:18:35 +00:00
|
|
|
@@ -936,7 +982,7 @@ void PrintViewManagerBase::SystemDialogCancelled() {
|
2024-04-17 16:04:47 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
bool PrintViewManagerBase::GetPrintingEnabledBooleanPref() const {
|
|
|
|
- return printing_enabled_.GetValue();
|
|
|
|
+ return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
void PrintViewManagerBase::OnDocDone(int job_id, PrintedDocument* document) {
|
2024-06-07 21:18:35 +00:00
|
|
|
@@ -953,7 +999,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
|
|
|
|
2024-06-07 21:18:35 +00:00
|
|
|
@@ -962,9 +1013,9 @@ void PrintViewManagerBase::OnCanceling() {
|
2023-03-10 16:07:42 +00:00
|
|
|
}
|
|
|
|
|
2022-11-17 19:59:23 +00:00
|
|
|
void PrintViewManagerBase::OnFailed() {
|
2024-04-17 16:04:47 +00:00
|
|
|
- if (!canceling_job_)
|
2023-03-10 16:07:42 +00:00
|
|
|
+#if 0 // Electron does not use Chromium error dialogs
|
|
|
|
ShowPrintErrorDialogForGenericError();
|
|
|
|
-
|
|
|
|
+#endif
|
|
|
|
TerminatePrintJob(true);
|
|
|
|
}
|
|
|
|
|
2024-06-07 21:18:35 +00:00
|
|
|
@@ -974,7 +1025,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;
|
|
|
|
}
|
|
|
|
|
2024-06-07 21:18:35 +00:00
|
|
|
@@ -1027,7 +1078,10 @@ bool PrintViewManagerBase::SetupNewPrintJob(
|
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
|
|
|
|
2024-06-07 21:18:35 +00:00
|
|
|
@@ -1047,7 +1101,7 @@ bool PrintViewManagerBase::SetupNewPrintJob(
|
2022-07-21 10:46:15 +00:00
|
|
|
#endif
|
|
|
|
print_job_->AddObserver(*this);
|
|
|
|
|
|
|
|
- printing_succeeded_ = false;
|
|
|
|
+ printing_status_ = PrintStatus::kFailed;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2024-06-07 21:18:35 +00:00
|
|
|
@@ -1105,7 +1159,7 @@ void PrintViewManagerBase::ReleasePrintJob() {
|
|
|
|
// Ensure that any residual registration of printing client is released.
|
|
|
|
// This might be necessary in some abnormal cases, such as the associated
|
|
|
|
// render process having terminated.
|
|
|
|
-#if BUILDFLAG(ENTERPRISE_CONTENT_ANALYSIS)
|
|
|
|
+#if 0
|
|
|
|
if (!analyzing_content_) {
|
|
|
|
UnregisterSystemPrintClient();
|
|
|
|
}
|
|
|
|
@@ -1115,6 +1169,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
|
|
|
|
2024-06-07 21:18:35 +00:00
|
|
|
@@ -1122,7 +1181,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);
|
2024-06-07 21:18:35 +00:00
|
|
|
@@ -1164,7 +1223,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) {
|
2024-06-07 21:18:35 +00:00
|
|
|
@@ -1187,7 +1246,7 @@ bool PrintViewManagerBase::OpportunisticallyCreatePrintJob(int cookie) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
-#if BUILDFLAG(ENTERPRISE_CONTENT_ANALYSIS)
|
|
|
|
+#if 0
|
|
|
|
// Don't start printing if enterprise checks are being performed to check if
|
|
|
|
// printing is allowed, or if content analysis is going to take place right
|
|
|
|
// before starting `print_job_`.
|
|
|
|
@@ -1318,6 +1377,8 @@ void PrintViewManagerBase::CompleteScriptedPrint(
|
2024-01-03 08:52:49 +00:00
|
|
|
auto callback_wrapper = base::BindOnce(
|
|
|
|
&PrintViewManagerBase::ScriptedPrintReply, weak_ptr_factory_.GetWeakPtr(),
|
|
|
|
std::move(callback), render_process_host->GetID());
|
|
|
|
+ auto cancel_job_wrapper = base::BindOnce(
|
|
|
|
+ &PrintViewManagerBase::UserInitCanceled, weak_ptr_factory_.GetWeakPtr());
|
|
|
|
#if BUILDFLAG(IS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING)
|
|
|
|
DisableThirdPartyBlocking();
|
|
|
|
#endif
|
2024-06-07 21:18:35 +00:00
|
|
|
@@ -1332,10 +1393,10 @@ void PrintViewManagerBase::CompleteScriptedPrint(
|
2024-01-03 08:52:49 +00:00
|
|
|
params->expected_pages_count, params->has_selection, params->margin_type,
|
|
|
|
params->is_scripted, !render_process_host->IsPdf(),
|
|
|
|
base::BindOnce(&OnDidScriptedPrint, queue_, std::move(printer_query),
|
|
|
|
- std::move(callback_wrapper)));
|
|
|
|
+ std::move(callback_wrapper), std::move(cancel_job_wrapper)));
|
2022-05-17 16:48:40 +00:00
|
|
|
}
|
|
|
|
|
2024-06-07 21:18:35 +00:00
|
|
|
-#if BUILDFLAG(ENTERPRISE_CONTENT_ANALYSIS)
|
|
|
|
+#if 0
|
|
|
|
void PrintViewManagerBase::CompletePrintDocumentAfterContentAnalysis(
|
|
|
|
scoped_refptr<base::RefCountedMemory> print_data,
|
|
|
|
const gfx::Size& page_size,
|
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
|
2024-06-07 21:18:35 +00:00
|
|
|
index 1917f8b94962d7a4c83f139623a5f5d352011627..47ef610c43c4dcfee0cf528eb2e6075b579117ee 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
|
2024-05-10 15:21:10 +00:00
|
|
|
@@ -52,6 +52,8 @@ class PrinterQuery;
|
2024-01-25 17:46:30 +00:00
|
|
|
// rollout.
|
|
|
|
BASE_DECLARE_FEATURE(kCheckPrintRfhIsActive);
|
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:
|
2024-05-10 15:21:10 +00:00
|
|
|
@@ -87,7 +89,9 @@ 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-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.
|
2024-05-10 15:21:10 +00:00
|
|
|
@@ -141,8 +145,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
|
2024-05-10 15:21:10 +00:00
|
|
|
@@ -150,6 +156,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:
|
2024-05-10 15:21:10 +00:00
|
|
|
#if BUILDFLAG(ENTERPRISE_CONTENT_ANALYSIS)
|
2024-04-15 22:10:32 +00:00
|
|
|
using PrintDocumentCallback =
|
2024-06-07 21:18:35 +00:00
|
|
|
@@ -229,7 +243,7 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
|
|
|
|
mojom::ScriptedPrintParamsPtr params,
|
|
|
|
ScriptedPrintCallback callback);
|
|
|
|
|
|
|
|
-#if BUILDFLAG(ENTERPRISE_CONTENT_ANALYSIS)
|
|
|
|
+#if 0
|
|
|
|
// Helper method bound to `content_analysis_before_printing_document_` when
|
|
|
|
// content analysis should happen right before the document is to be printed.
|
|
|
|
// This method is virtual for testing purposes.
|
2024-05-10 15:21:10 +00:00
|
|
|
@@ -293,6 +307,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);
|
2024-05-10 15:21:10 +00:00
|
|
|
@@ -387,8 +402,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
|
2024-04-15 22:10:32 +00:00
|
|
|
index 0e48a7582d86c85a826de08af655b29a3ef74fd2..2e67a73611ca2c55ffc002341b0878de7191c932 100644
|
2023-01-06 02:35:34 +00:00
|
|
|
--- a/chrome/browser/printing/printer_query.cc
|
|
|
|
+++ b/chrome/browser/printing/printer_query.cc
|
2023-11-14 21:21:32 +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)
|
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
|
2024-06-07 21:18:35 +00:00
|
|
|
index 3c2fdc9f9a6c60efc4b0afacbfb83eef55917791..8fd9aff538fa03da6c171927c316d4f611c46da1 100644
|
2019-11-05 23:41:20 +00:00
|
|
|
--- a/components/printing/common/print.mojom
|
|
|
|
+++ b/components/printing/common/print.mojom
|
2024-06-07 21:18:35 +00:00
|
|
|
@@ -303,7 +303,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();
|
2024-04-17 16:04:47 +00:00
|
|
|
+ PrintRequestedPages(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
|
2024-06-07 21:18:35 +00:00
|
|
|
@@ -392,6 +392,9 @@ interface PrintManagerHost {
|
2022-02-01 19:00:09 +00:00
|
|
|
[Sync]
|
2024-01-03 08:52:49 +00:00
|
|
|
ScriptedPrint(ScriptedPrintParams params) => (PrintPagesParams? settings);
|
|
|
|
|
2023-03-10 16:07:42 +00:00
|
|
|
+ // Tells the browser that there are invalid printer settings.
|
|
|
|
+ ShowInvalidPrinterSettingsError();
|
2024-01-03 08:52:49 +00:00
|
|
|
+
|
2023-03-10 16:07:42 +00:00
|
|
|
// Tells the browser printing failed.
|
|
|
|
PrintingFailed(int32 cookie, PrintFailureReason reason);
|
2024-01-03 08:52:49 +00:00
|
|
|
|
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
|
2024-06-07 21:18:35 +00:00
|
|
|
index 1c12ab70d993b742ee73b1235ecfdd3239125e97..b24751087f4015fc6b93518af95b0911529d3c6e 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
|
2024-06-07 21:18:35 +00:00
|
|
|
@@ -51,6 +51,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"
|
2024-06-07 21:18:35 +00:00
|
|
|
@@ -1224,14 +1225,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,
|
2024-04-17 16:04:47 +00:00
|
|
|
+ base::Value::Dict());
|
2023-08-15 15:49:41 +00:00
|
|
|
if (!weak_this) {
|
|
|
|
return;
|
|
|
|
}
|
2024-06-07 21:18:35 +00:00
|
|
|
@@ -1262,12 +1263,14 @@ 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() {
|
2024-06-07 21:18:35 +00:00
|
|
|
- PrintRequestedPagesInternal(/*already_notified_frame=*/false);
|
2024-04-17 16:04:47 +00:00
|
|
|
+void PrintRenderFrameHelper::PrintRequestedPages(base::Value::Dict settings) {
|
2024-06-07 21:18:35 +00:00
|
|
|
+ PrintRequestedPagesInternal(/*already_notified_frame=*/false,
|
|
|
|
+ std::move(settings));
|
|
|
|
}
|
|
|
|
|
|
|
|
void PrintRenderFrameHelper::PrintRequestedPagesInternal(
|
|
|
|
- bool already_notified_frame) {
|
|
|
|
+ bool already_notified_frame,
|
|
|
|
+ base::Value::Dict settings) {
|
2019-11-05 23:41:20 +00:00
|
|
|
ScopedIPC scoped_ipc(weak_ptr_factory_.GetWeakPtr());
|
2024-06-07 21:18:35 +00:00
|
|
|
if (ipc_nesting_level_ > kAllowedIpcDepthForPrint) {
|
2018-10-13 01:57:04 +00:00
|
|
|
return;
|
2024-06-07 21:18:35 +00:00
|
|
|
@@ -1284,9 +1287,10 @@ void PrintRenderFrameHelper::PrintRequestedPagesInternal(
|
|
|
|
|
|
|
|
is_loading_ = frame->WillPrintSoon();
|
|
|
|
if (is_loading_) {
|
|
|
|
- on_stop_loading_closure_ = base::BindOnce(
|
|
|
|
- &PrintRenderFrameHelper::PrintRequestedPagesInternal,
|
|
|
|
- weak_ptr_factory_.GetWeakPtr(), /*already_notified_frame=*/true);
|
|
|
|
+ on_stop_loading_closure_ =
|
|
|
|
+ base::BindOnce(&PrintRenderFrameHelper::PrintRequestedPagesInternal,
|
|
|
|
+ weak_ptr_factory_.GetWeakPtr(),
|
|
|
|
+ /*already_notified_frame=*/true, std::move(settings));
|
|
|
|
SetupOnStopLoadingTimeout();
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
@@ -1296,7 +1300,7 @@ void PrintRenderFrameHelper::PrintRequestedPagesInternal(
|
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);
|
2024-04-17 16:04:47 +00:00
|
|
|
+ Print(frame, plugin, PrintRequestType::kRegular, std::move(settings));
|
2020-10-16 01:30:41 +00:00
|
|
|
|
2023-08-15 15:49:41 +00:00
|
|
|
if (render_frame_gone_) {
|
|
|
|
return;
|
2024-06-07 21:18:35 +00:00
|
|
|
@@ -1453,6 +1457,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)
|
2024-06-07 21:18:35 +00:00
|
|
|
@@ -2045,17 +2051,19 @@ 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,
|
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-09-19 17:34:56 +00:00
|
|
|
|
2024-04-17 16:04:47 +00:00
|
|
|
+ bool silent = settings.FindBool("silent").value_or(false);
|
2019-02-26 21:35:27 +00:00
|
|
|
FrameReference frame_ref(frame);
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2023-09-19 17:34:56 +00:00
|
|
|
- if (!InitPrintSettings(frame, node)) {
|
|
|
|
+ if (!InitPrintSettings(frame, node, std::move(settings))) {
|
|
|
|
// Browser triggered this code path. It already knows about the failure.
|
|
|
|
notify_browser_of_print_failure_ = false;
|
|
|
|
-
|
|
|
|
+ GetPrintManagerHost()->ShowInvalidPrinterSettingsError();
|
2023-08-04 08:47:29 +00:00
|
|
|
DidFinishPrinting(PrintingResult::kFailPrintInit);
|
2023-09-19 17:34:56 +00:00
|
|
|
return;
|
2018-10-13 01:57:04 +00:00
|
|
|
}
|
2024-06-07 21:18:35 +00:00
|
|
|
@@ -2076,8 +2084,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
|
|
|
+ }
|
chore: bump chromium to 118.0.5975.0 (main) (#39531)
* chore: bump chromium in DEPS to 118.0.5951.0
* chore: update printing.patch
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4727894
No logic changes, but patch needed to be manually re-applied due to upstream code shear
* chore: update port_autofill_colors_to_the_color_pipeline.patch
No manual changes; patch applied with fuzz
* chore: update patches
* chore: bump chromium in DEPS to 118.0.5953.0
* chore: update patches
* chore: bump chromium in DEPS to 118.0.5955.0
* chore: update patches
* chore: bump chromium in DEPS to 118.0.5957.0
* chore: update patches
* chore: include path of native_web_keyboard_event.h
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4758689
* chore: remove reference to eextensions/browser/notification-types.h
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4771627
* chore: update references to renamed upstream field NativeWebKeyboardEvent.skip_if_unhandled (formerly known as skip_in_browser
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4758689
Need a second pair of eyes on this commit. In particular the reference in content_converter.cc, skipInBrowser, seems to not be set or documented anywhere? Is this unused/vestigal code?
* chore: sync signature of ElectronExtensionsBrowserClient::IsValidContext() to upstream change
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4784198
* chore: add auto_pip_setting_helper.[cc,h] to chromium_src build
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4688277
Exiting upstream code used by chromium_src now depends on this new upstream class
* chore: bump chromium in DEPS to 118.0.5959.0
* chore: update add_maximized_parameter_to_linuxui_getwindowframeprovider.patch
Xref: add_maximized_parameter_to_linuxui_getwindowframeprovider.patch
manually adjust patch to minor upstream chagnes
* chore: update patches
* chore: bump chromium in DEPS to 118.0.5961.0
* chore: bump chromium in DEPS to 118.0.5963.0
* chore: update patches
* 4780994: Rename various base files to "apple" since iOS uses them too
https://chromium-review.googlesource.com/c/chromium/src/+/4780994
* Many files moved from `mac` -> `apple`
This commit follows a handful of CLs that simply rename files/symbols to change `mac`
to `apple`
to signify their use across both macOS and iOS:
- 4784010: Move scoped_nsautorelease_pool to base/apple, leave a forwarding header
- 4790744: Move foundation_util to base/apple, leave a forwarding header
- 4790741: Move scoped_cftypreref to base/apple, leave a forwarding header
- 4787627: Move and rename macOS+iOS base/ files in PA to "apple"
- 4780399: Move OSStatus logging to base/apple
- 4787387: Remove forwarding headers
- 4781113: Rename message_pump_mac to "apple" because iOS uses it too
* fixup minor patch update error
A function param got dropped from this patch somewhere earlier
* chore: bump chromium in DEPS to 118.0.5965.2
* chore: update patches
* 4799213: Move ScopedTypeRef and ScopedCFTypeRef into base::apple::
https://chromium-review.googlesource.com/c/chromium/src/+/4799213
* Fix removed include to BrowserContext
In crrev.com/c/4767962 an include to BrowserContext was removed,
which was necessary for compilation. This broke only for us because
"chrome/browser/profiles/profile.h" includes that class, but we remove
all references to profiles.
* chore: bump chromium in DEPS to 118.0.5967.0
* chore: update patches
* chore: bump chromium in DEPS to 118.0.5969.0
* chore: update patches
* chore: bump chromium in DEPS to 118.0.5971.0
* chore: bump chromium in DEPS to 118.0.5973.0
* chore: update patches
* 4772121: [OOPIF PDF] Replace PDFWebContentsHelper with PDFDocumentHelper
https://chromium-review.googlesource.com/c/chromium/src/+/4772121
* 4811164: [Extensions] Do some cleanup in ChromeManagementAPIDelegate.
https://chromium-review.googlesource.com/c/chromium/src/+/4811164
* 4809488: Remove duplicate dnd functionality between Web and Renderer prefs
https://chromium-review.googlesource.com/c/chromium/src/+/4809488
Given that this is no longer an option of web preferences, we should
consider deprecating this option and then removing it.
* chore: bump chromium in DEPS to 118.0.5975.0
* chore: update patches
* fixup! chore: add auto_pip_settings_helper.{cc|h} to chromium_src build
* Reland "[windows] Remove RegKey::DeleteEmptyKey"
Refs https://chromium-review.googlesource.com/c/chromium/src/+/4813255
* Ensure StrCat means StrCat
Refs https://chromium-review.googlesource.com/c/chromium/src/+/1117180
* fixup! Remove RegKey::DeleteEmptyKey
* Consistently reject large p and large q in DH
Refs https://boringssl-review.googlesource.com/c/boringssl/+/62226
---------
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: clavin <clavin@electronjs.org>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
2023-09-01 06:54:59 +00:00
|
|
|
// Check if `this` is still valid.
|
2018-10-13 01:57:04 +00:00
|
|
|
if (!self)
|
|
|
|
return;
|
2024-06-07 21:18:35 +00:00
|
|
|
@@ -2338,29 +2353,37 @@ void PrintRenderFrameHelper::IPCProcessed() {
|
2018-10-13 01:57:04 +00:00
|
|
|
}
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2023-09-19 17:34:56 +00:00
|
|
|
bool PrintRenderFrameHelper::InitPrintSettings(blink::WebLocalFrame* frame,
|
|
|
|
- const blink::WebNode& node) {
|
|
|
|
+ const blink::WebNode& node,
|
|
|
|
+ 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
|
|
|
|
2024-04-15 22:10:32 +00:00
|
|
|
bool center_on_paper = !IsPrintingPdfFrame(frame, node);
|
2021-10-25 15:52:52 +00:00
|
|
|
- settings.params->print_scaling_option =
|
|
|
|
+ settings->params->print_scaling_option =
|
2024-04-15 22:10:32 +00:00
|
|
|
center_on_paper ? mojom::PrintScalingOption::kCenterShrinkToFitPaper
|
|
|
|
: mojom::PrintScalingOption::kSourceSize;
|
2024-05-10 15:21:10 +00:00
|
|
|
- RecordDebugEvent(settings.params->printed_doc_type ==
|
|
|
|
+ RecordDebugEvent(settings->params->printed_doc_type ==
|
|
|
|
mojom::SkiaDocumentType::kMSKP
|
|
|
|
? DebugEvent::kSetPrintSettings5
|
|
|
|
: DebugEvent::kSetPrintSettings6);
|
2021-10-25 15:52:52 +00:00
|
|
|
- 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-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
|
2024-06-07 21:18:35 +00:00
|
|
|
index 14de029740ffbebe06d309651c1a2c007d9fb96b..e9bf9c5bef2a9235260e7d6c8d26d41528e38661 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
|
2024-06-07 21:18:35 +00:00
|
|
|
@@ -251,7 +251,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;
|
2024-04-17 16:04:47 +00:00
|
|
|
+ void PrintRequestedPages(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)
|
2024-06-07 21:18:35 +00:00
|
|
|
@@ -318,7 +318,8 @@ 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,
|
2024-04-17 16:04:47 +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);
|
2024-06-07 21:18:35 +00:00
|
|
|
@@ -328,7 +329,8 @@ class PrintRenderFrameHelper
|
2018-10-13 01:57:04 +00:00
|
|
|
// Initialize print page settings with default settings.
|
|
|
|
// Used only for native printing workflow.
|
2023-09-19 17:34:56 +00:00
|
|
|
bool InitPrintSettings(blink::WebLocalFrame* frame,
|
|
|
|
- const blink::WebNode& node);
|
|
|
|
+ const blink::WebNode& node,
|
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.
|
2023-09-19 17:34:56 +00:00
|
|
|
uint32_t CalculateNumberOfPages(blink::WebLocalFrame* frame,
|
2024-06-07 21:18:35 +00:00
|
|
|
@@ -625,7 +627,8 @@ class PrintRenderFrameHelper
|
|
|
|
};
|
|
|
|
|
|
|
|
void SetupOnStopLoadingTimeout();
|
|
|
|
- void PrintRequestedPagesInternal(bool already_notified_frame);
|
|
|
|
+ void PrintRequestedPagesInternal(bool already_notified_frame,
|
|
|
|
+ base::Value::Dict settings);
|
|
|
|
|
|
|
|
ScriptingThrottler scripting_throttler_;
|
|
|
|
|
2022-06-28 14:34:00 +00:00
|
|
|
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
|
2024-07-03 15:15:35 +00:00
|
|
|
index c2b6ffbafe1cac3f81efb4a125ce8bf5bada5272..49d9943512685d6b6cf1d470059b701e0eced33f 100644
|
2022-06-28 14:34:00 +00:00
|
|
|
--- a/content/browser/BUILD.gn
|
|
|
|
+++ b/content/browser/BUILD.gn
|
2024-07-03 15:15:35 +00:00
|
|
|
@@ -2979,8 +2979,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
|
2024-06-07 21:18:35 +00:00
|
|
|
index e9d9b148387313d8f6dd399d69a69272a511e6b4..a97983e9736daffdfeb713ae7b263f146f79ad0b 100644
|
2019-08-07 14:47:24 +00:00
|
|
|
--- a/printing/printing_context.cc
|
|
|
|
+++ b/printing/printing_context.cc
|
2024-01-25 17:46:30 +00:00
|
|
|
@@ -154,7 +154,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
|
2024-01-25 17:46:30 +00:00
|
|
|
index 63f170c95050416c595e62f4c460c4cd6b7dbd1c..157e3d046889f9c63fdf0fd5d503890fb82c038d 100644
|
2019-08-07 14:47:24 +00:00
|
|
|
--- a/printing/printing_context.h
|
|
|
|
+++ b/printing/printing_context.h
|
2024-01-25 17:46:30 +00:00
|
|
|
@@ -206,6 +206,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
|
|
|
|
2024-01-25 17:46:30 +00:00
|
|
|
#if BUILDFLAG(ENABLE_OOP_PRINTING)
|
|
|
|
@@ -224,9 +227,6 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
|
2023-11-14 21:21:32 +00:00
|
|
|
Delegate* delegate,
|
|
|
|
ProcessBehavior process_behavior);
|
2021-09-01 19:55:07 +00:00
|
|
|
|
|
|
|
- // Reinitializes the settings for object reuse.
|
|
|
|
- void ResetSettings();
|
|
|
|
-
|
2023-11-14 21:21:32 +00:00
|
|
|
// Does bookkeeping when an error occurs.
|
|
|
|
virtual mojom::ResultCode OnError();
|
|
|
|
|
2022-06-28 14:34:00 +00:00
|
|
|
diff --git a/sandbox/policy/mac/sandbox_mac.mm b/sandbox/policy/mac/sandbox_mac.mm
|
2024-03-05 16:47:48 +00:00
|
|
|
index e89fd87753bad3c5663fa53f8dcc4542e7e307e5..2b433a0705234af6f9808ee741a9795d5e251785 100644
|
2022-06-28 14:34:00 +00:00
|
|
|
--- a/sandbox/policy/mac/sandbox_mac.mm
|
|
|
|
+++ b/sandbox/policy/mac/sandbox_mac.mm
|
2023-11-28 21:40:12 +00:00
|
|
|
@@ -38,6 +38,10 @@
|
2023-08-15 15:49:41 +00:00
|
|
|
#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) {
|