0dad99561b
* chore: bump chromium in DEPS to 123.0.6273.0 * chore: update patches * chore: bump chromium in DEPS to 123.0.6274.0 * chore: update patches * chore: bump chromium in DEPS to 123.0.6276.0 * chore: update patches * WIP: 5239586: Change View::Layout() to take a PassKey. https://chromium-review.googlesource.com/c/chromium/src/+/5239586 * WIP: 5239586: Change View::Layout() to take a PassKey. https://chromium-review.googlesource.com/c/chromium/src/+/5239586 * chore: bump chromium in DEPS to 123.0.6278.0 * chore: bump chromium in DEPS to 123.0.6280.0 * chore: update patches * chore: use net::CanonicalCookie::SecureAttribute() renamed from IsSecure() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5245913 * refactor: handle multiple requested device ids Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5132210 * refactor: trigger View layouts async with View::InvalidateLayout() Upstream has introduced a PassKey to restrict who can call Layout() directly. I've opted for calling `InvalidateLayout()` which is the approach that upstream recommends. If for some reason this approach doesn't work for us, we could use `DeprecatedLayoutImmediately()` as a stopgap. Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5239586 Xref: https://chromium.googlesource.com/chromium/src/+/main/ui/views/view.h#809 Xref: https://chromium.googlesource.com/chromium/src/+/main/docs/ui/learn/bestpractices/layout.md?pli=1#don_t-invoke-layout_directly * chore: bump chromium in DEPS to 123.0.6282.0 * chore: bump chromium in DEPS to 123.0.6284.0 * chore: update patches * refactor: remove use of blink::MainThreadIsolate() pt 1/3 Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5249640 * refactor: remove use of blink::MainThreadIsolate() pt 2/3 Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5249640 * refactor: remove use of blink::MainThreadIsolate() pt 3/3 Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5249640 * chore: update enum name to ui::AXMode::kPDFPrinting Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5270301 * chore: rebuild filenames.libcxx.gni * chore: sync with upstream rename of PortProvider.TaskForHandle() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5259103 * chore: bump chromium in DEPS to 123.0.6286.0 * chore: bump chromium in DEPS to 123.0.6288.0 * WebPreferences: Initialize in declaration. Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5277099 * chore: update webview_fullscreen.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5053508 Simple update to fix patch shear * chore: update feat_configure_launch_options_for_service_process.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5254861 Simple update to fix patch shear * chore: add IWC::Delegate::RecordResize() stub to fix FTBFS https://chromium-review.googlesource.com/c/chromium/src/+/5268963 * chore: add FormControlType::kButtonPopover to the FormControlType converter Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5230929 * chore: e patches all * chore: node script/gen-libc++-filenames.js * chore: bump chromium in DEPS to 123.0.6290.0 * chore: bump chromium in DEPS to 123.0.6291.0 * chore: bump chromium in DEPS to 123.0.6292.0 * chore: bump chromium in DEPS to 123.0.6294.0 * chore: update fix_aspect_ratio_with_max_size.patch Xref: fix_aspect_ratio_with_max_size.patch note: simple absl::optional -> std::optional conversion * chore: update feat_filter_out_non-shareable_windows_in_the_current_application_in.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5272337 * chore: update add_maximized_parameter_to_linuxui_getwindowframeprovider.patch No manual changes; just adjusting line patch offsets Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5258688 * chore: update feat_configure_launch_options_for_service_process.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5281322 * chore: update fix_select_The_first_menu_item_when_opened_via_keyboard.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5279376 note: simple absl::optional -> std::optional conversion * chore: update feat_allow_code_cache_in_custom_schemes.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5268792 * chore: script/export_all_patches.py * chore: bump chromium in DEPS to 123.0.6296.0 * chore: update patches * fixup! chore: update feat_allow_code_cache_in_custom_schemes.patch * fix: restore MessagePort close event * spec: fix CORB testing Refs https://chromium-review.googlesource.com/c/chromium/src/+/5231506 * fix: use sync layout when content view changes * fixup! chore: update feat_configure_launch_options_for_service_process.patch * Add remote-cocoa support for context menus. Refs https://chromium-review.googlesource.com/c/chromium/src/+/5259806 * Rename //net/base/mac directory to //net/base/apple (1/n) Refs https://chromium-review.googlesource.com/c/chromium/src/+/5211389 * fixup! Add remote-cocoa support for context menus. * [Clipboard] Don't add meta charset tag for async write() method on Mac. Refs https://chromium-review.googlesource.com/c/chromium/src/+/5187335 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: clavin <clavin@electronjs.org> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: deepak1556 <hop2deep@gmail.com>
898 lines
36 KiB
Diff
898 lines
36 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Shelley Vohr <shelley.vohr@gmail.com>
|
|
Date: Fri, 7 Jun 2019 13:59:37 -0700
|
|
Subject: printing.patch
|
|
|
|
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
|
|
|
|
This patch also fixes callback for manual user cancellation and success.
|
|
|
|
diff --git a/BUILD.gn b/BUILD.gn
|
|
index 6ba061b16d2cb283a7bf77c1432b36f5df68b58e..4c66e0bc617642b7bcdef0cc65f95c399deae752 100644
|
|
--- a/BUILD.gn
|
|
+++ b/BUILD.gn
|
|
@@ -972,7 +972,6 @@ if (is_win) {
|
|
"//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",
|
|
@@ -981,6 +980,10 @@ if (is_win) {
|
|
"//ui/views:views_unittests",
|
|
"//url:url_unittests",
|
|
]
|
|
+
|
|
+ if (enable_printing) {
|
|
+ deps += [ "//printing:printing_unittests" ]
|
|
+ }
|
|
}
|
|
}
|
|
|
|
diff --git a/chrome/browser/printing/print_job.cc b/chrome/browser/printing/print_job.cc
|
|
index 874b9efcf9e70650728885519009360ee770a79f..6c4d24d44e69d796bc6bfec5f7092f5b3ae28703 100644
|
|
--- a/chrome/browser/printing/print_job.cc
|
|
+++ b/chrome/browser/printing/print_job.cc
|
|
@@ -96,6 +96,7 @@ bool PrintWithReducedRasterization(PrefService* prefs) {
|
|
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
|
|
@@ -110,6 +111,7 @@ content::WebContents* GetWebContents(content::GlobalRenderFrameHostId rfh_id) {
|
|
auto* rfh = content::RenderFrameHost::FromID(rfh_id);
|
|
return rfh ? content::WebContents::FromRenderFrameHost(rfh) : nullptr;
|
|
}
|
|
+#endif
|
|
|
|
#endif // BUILDFLAG(IS_WIN)
|
|
|
|
@@ -150,10 +152,8 @@ void PrintJob::Initialize(std::unique_ptr<PrinterQuery> query,
|
|
|
|
#if BUILDFLAG(IS_WIN)
|
|
pdf_page_mapping_ = PageNumber::GetPages(settings->ranges(), page_count);
|
|
- PrefService* prefs = GetPrefsForWebContents(GetWebContents(rfh_id_));
|
|
- if (prefs && prefs->IsManagedPreference(prefs::kPdfUseSkiaRendererEnabled)) {
|
|
- use_skia_ = prefs->GetBoolean(prefs::kPdfUseSkiaRendererEnabled);
|
|
- }
|
|
+ // TODO(codebytere): should we enable this later?
|
|
+ use_skia_ = false;
|
|
#endif
|
|
|
|
auto new_doc = base::MakeRefCounted<PrintedDocument>(std::move(settings),
|
|
@@ -404,8 +404,10 @@ void PrintJob::StartPdfToEmfConversion(
|
|
|
|
const PrintSettings& settings = document()->settings();
|
|
|
|
+#if 0
|
|
PrefService* prefs = GetPrefsForWebContents(GetWebContents(rfh_id_));
|
|
- bool print_with_reduced_rasterization = PrintWithReducedRasterization(prefs);
|
|
+#endif
|
|
+ bool print_with_reduced_rasterization = PrintWithReducedRasterization(nullptr);
|
|
|
|
using RenderMode = PdfRenderSettings::Mode;
|
|
RenderMode mode = print_with_reduced_rasterization
|
|
@@ -497,8 +499,10 @@ void PrintJob::StartPdfToPostScriptConversion(
|
|
if (ps_level2) {
|
|
mode = PdfRenderSettings::Mode::POSTSCRIPT_LEVEL2;
|
|
} else {
|
|
+#if 0
|
|
PrefService* prefs = GetPrefsForWebContents(GetWebContents(rfh_id_));
|
|
- mode = PrintWithPostScriptType42Fonts(prefs)
|
|
+#endif
|
|
+ mode = PrintWithPostScriptType42Fonts(nullptr)
|
|
? PdfRenderSettings::Mode::POSTSCRIPT_LEVEL3_WITH_TYPE42_FONTS
|
|
: PdfRenderSettings::Mode::POSTSCRIPT_LEVEL3;
|
|
}
|
|
diff --git a/chrome/browser/printing/print_view_manager_base.cc b/chrome/browser/printing/print_view_manager_base.cc
|
|
index 301a4a47fb4dfb6007c2214b04ffdff744cc3043..427a045c310109475b83a229637f4d09b1e78450 100644
|
|
--- a/chrome/browser/printing/print_view_manager_base.cc
|
|
+++ b/chrome/browser/printing/print_view_manager_base.cc
|
|
@@ -23,7 +23,9 @@
|
|
#include "build/chromeos_buildflags.h"
|
|
#include "chrome/browser/bad_message.h"
|
|
#include "chrome/browser/browser_process.h"
|
|
+#if 0 // Electron does not use Chrome error dialogs
|
|
#include "chrome/browser/printing/print_error_dialog.h"
|
|
+#endif
|
|
#include "chrome/browser/printing/print_job.h"
|
|
#include "chrome/browser/printing/print_job_manager.h"
|
|
#include "chrome/browser/printing/print_view_manager_common.h"
|
|
@@ -81,6 +83,20 @@ namespace printing {
|
|
|
|
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 =
|
|
+ base::OnceCallback<void(std::unique_ptr<PrinterQuery>)>;
|
|
+
|
|
void OnDidGetDefaultPrintSettings(
|
|
scoped_refptr<PrintQueriesQueue> queue,
|
|
bool want_pdf_settings,
|
|
@@ -89,9 +105,11 @@ void OnDidGetDefaultPrintSettings(
|
|
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
|
|
|
if (printer_query->last_status() != mojom::ResultCode::kSuccess) {
|
|
+#if 0 // Electron does not use Chrome error dialogs
|
|
if (!want_pdf_settings) {
|
|
ShowPrintErrorDialogForInvalidPrinterError();
|
|
}
|
|
+#endif
|
|
std::move(callback).Run(nullptr);
|
|
return;
|
|
}
|
|
@@ -101,9 +119,11 @@ void OnDidGetDefaultPrintSettings(
|
|
params->document_cookie = printer_query->cookie();
|
|
|
|
if (!PrintMsgPrintParamsIsValid(*params)) {
|
|
+#if 0 // Electron does not use Chrome error dialogs
|
|
if (!want_pdf_settings) {
|
|
ShowPrintErrorDialogForInvalidPrinterError();
|
|
}
|
|
+#endif
|
|
std::move(callback).Run(nullptr);
|
|
return;
|
|
}
|
|
@@ -115,11 +135,15 @@ void OnDidGetDefaultPrintSettings(
|
|
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);
|
|
|
|
if (printer_query->last_status() != mojom::ResultCode::kSuccess ||
|
|
!printer_query->settings().dpi()) {
|
|
+ if (printer_query->last_status() == mojom::ResultCode::kCanceled) {
|
|
+ std::move(cancel_job).Run();
|
|
+ }
|
|
std::move(callback).Run(nullptr);
|
|
return;
|
|
}
|
|
@@ -176,9 +200,11 @@ PrintViewManagerBase::PrintViewManagerBase(content::WebContents* web_contents)
|
|
: PrintManager(web_contents),
|
|
queue_(g_browser_process->print_job_manager()->queue()) {
|
|
DCHECK(queue_);
|
|
+#if 0 // Printing is always enabled.
|
|
Profile* profile =
|
|
Profile::FromBrowserContext(web_contents->GetBrowserContext());
|
|
- printing_enabled_.Init(prefs::kPrintingEnabled, profile->GetPrefs());
|
|
+ printing_enabled_.Init(prefs::kPrintingEnabled, profile->GetPrefs());
|
|
+#endif
|
|
}
|
|
|
|
PrintViewManagerBase::~PrintViewManagerBase() {
|
|
@@ -202,12 +228,17 @@ void PrintViewManagerBase::DisableThirdPartyBlocking() {
|
|
}
|
|
#endif // BUILDFLAG(IS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING)
|
|
|
|
-bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh) {
|
|
+bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh,
|
|
+ bool silent,
|
|
+ base::Value::Dict settings,
|
|
+ CompletionCallback callback) {
|
|
if (!StartPrintCommon(rfh)) {
|
|
return false;
|
|
}
|
|
|
|
- GetPrintRenderFrame(rfh)->PrintRequestedPages();
|
|
+ callback_ = std::move(callback);
|
|
+
|
|
+ GetPrintRenderFrame(rfh)->PrintRequestedPages(silent, std::move(settings));
|
|
|
|
for (auto& observer : GetTestObservers()) {
|
|
observer.OnPrintNow(rfh);
|
|
@@ -336,12 +367,13 @@ void PrintViewManagerBase::OnDidUpdatePrintableArea(
|
|
}
|
|
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) {
|
|
@@ -349,7 +381,8 @@ void PrintViewManagerBase::CompleteUpdatePrintSettings(
|
|
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));
|
|
@@ -361,6 +394,10 @@ void PrintViewManagerBase::CompleteUpdatePrintSettings(
|
|
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));
|
|
}
|
|
@@ -647,11 +684,12 @@ void PrintViewManagerBase::DidPrintDocument(
|
|
void PrintViewManagerBase::GetDefaultPrintSettings(
|
|
GetDefaultPrintSettingsCallback callback) {
|
|
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
|
+#if 0 // Printing is always enabled.
|
|
if (!printing_enabled_.GetValue()) {
|
|
GetDefaultPrintSettingsReply(std::move(callback), nullptr);
|
|
return;
|
|
}
|
|
-
|
|
+#endif
|
|
content::RenderFrameHost* render_frame_host = GetCurrentTargetFrame();
|
|
if (base::FeatureList::IsEnabled(kCheckPrintRfhIsActive) &&
|
|
!render_frame_host->IsActive()) {
|
|
@@ -710,10 +748,12 @@ void PrintViewManagerBase::UpdatePrintSettings(
|
|
base::Value::Dict job_settings,
|
|
UpdatePrintSettingsCallback callback) {
|
|
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
|
+#if 0 // Printing is always enabled.
|
|
if (!printing_enabled_.GetValue()) {
|
|
std::move(callback).Run(nullptr);
|
|
return;
|
|
}
|
|
+#endif // Printing is always enabled.
|
|
|
|
std::optional<int> printer_type_value =
|
|
job_settings.FindInt(kSettingPrinterType);
|
|
@@ -724,6 +764,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
|
|
|
|
mojom::PrinterType printer_type =
|
|
static_cast<mojom::PrinterType>(*printer_type_value);
|
|
+#if 0 // Printing is always enabled.
|
|
if (printer_type != mojom::PrinterType::kExtension &&
|
|
printer_type != mojom::PrinterType::kPdf &&
|
|
printer_type != mojom::PrinterType::kLocal) {
|
|
@@ -743,6 +784,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
|
|
if (value > 0)
|
|
job_settings.Set(kSettingRasterizePdfDpi, value);
|
|
}
|
|
+#endif // Printing is always enabled.
|
|
|
|
std::unique_ptr<PrintSettings> print_settings =
|
|
PrintSettingsFromJobSettings(job_settings);
|
|
@@ -762,7 +804,21 @@ void PrintViewManagerBase::UpdatePrintSettings(
|
|
}
|
|
}
|
|
|
|
-#if BUILDFLAG(IS_WIN)
|
|
+ std::unique_ptr<PrinterQuery> query =
|
|
+ queue_->CreatePrinterQuery(GetCurrentTargetFrame()->GetGlobalId());
|
|
+ auto* query_ptr = query.get();
|
|
+ // 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();
|
|
+ query_ptr->SetSettings(
|
|
+ std::move(job_settings_copy),
|
|
+ base::BindOnce(&PrintViewManagerBase::CompleteUpdatePrintSettings,
|
|
+ weak_ptr_factory_.GetWeakPtr(), std::move(query),
|
|
+ std::move(job_settings), std::move(print_settings),
|
|
+ std::move(callback)));
|
|
+
|
|
+#if 0 // See https://chromium-review.googlesource.com/412367
|
|
// TODO(crbug.com/1424368): Remove this if the printable areas can be made
|
|
// fully available from `PrintBackend::GetPrinterSemanticCapsAndDefaults()`
|
|
// for in-browser queries.
|
|
@@ -784,8 +840,6 @@ void PrintViewManagerBase::UpdatePrintSettings(
|
|
}
|
|
#endif
|
|
|
|
- CompleteUpdatePrintSettings(std::move(job_settings),
|
|
- std::move(print_settings), std::move(callback));
|
|
}
|
|
|
|
void PrintViewManagerBase::SetAccessibilityTree(
|
|
@@ -801,7 +855,7 @@ void PrintViewManagerBase::SetAccessibilityTree(
|
|
void PrintViewManagerBase::IsPrintingEnabled(
|
|
IsPrintingEnabledCallback callback) {
|
|
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
|
- std::move(callback).Run(printing_enabled_.GetValue());
|
|
+ std::move(callback).Run(true);
|
|
}
|
|
|
|
void PrintViewManagerBase::ScriptedPrint(mojom::ScriptedPrintParamsPtr params,
|
|
@@ -852,6 +906,7 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie,
|
|
|
|
PrintManager::PrintingFailed(cookie, reason);
|
|
|
|
+#if 0 // Electron does not use Chromium error dialogs
|
|
// `PrintingFailed()` can occur because asynchronous compositing results
|
|
// don't complete until after a print job has already failed and been
|
|
// destroyed. In such cases the error notification to the user will
|
|
@@ -861,7 +916,7 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie,
|
|
print_job_->document()->cookie() == cookie) {
|
|
ShowPrintErrorDialogForGenericError();
|
|
}
|
|
-
|
|
+#endif
|
|
ReleasePrinterQuery();
|
|
}
|
|
|
|
@@ -873,15 +928,24 @@ void PrintViewManagerBase::RemoveTestObserver(TestObserver& observer) {
|
|
test_observers_.RemoveObserver(&observer);
|
|
}
|
|
|
|
+void PrintViewManagerBase::ShowInvalidPrinterSettingsError() {
|
|
+ if (!callback_.is_null()) {
|
|
+ printing_status_ = PrintStatus::kInvalid;
|
|
+ TerminatePrintJob(true);
|
|
+ }
|
|
+}
|
|
+
|
|
void PrintViewManagerBase::RenderFrameHostStateChanged(
|
|
content::RenderFrameHost* render_frame_host,
|
|
content::RenderFrameHost::LifecycleState /*old_state*/,
|
|
content::RenderFrameHost::LifecycleState new_state) {
|
|
+#if 0
|
|
if (new_state == content::RenderFrameHost::LifecycleState::kActive &&
|
|
render_frame_host->GetProcess()->IsPdf() &&
|
|
!render_frame_host->GetMainFrame()->GetParentOrOuterDocument()) {
|
|
GetPrintRenderFrame(render_frame_host)->ConnectToPdfRenderer();
|
|
}
|
|
+#endif
|
|
}
|
|
|
|
void PrintViewManagerBase::RenderFrameDeleted(
|
|
@@ -933,7 +997,12 @@ void PrintViewManagerBase::OnJobDone() {
|
|
// 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;
|
|
+ ReleasePrintJob();
|
|
+}
|
|
+
|
|
+void PrintViewManagerBase::UserInitCanceled() {
|
|
+ printing_status_ = PrintStatus::kCanceled;
|
|
ReleasePrintJob();
|
|
}
|
|
|
|
@@ -942,9 +1011,10 @@ void PrintViewManagerBase::OnCanceling() {
|
|
}
|
|
|
|
void PrintViewManagerBase::OnFailed() {
|
|
+#if 0 // Electron does not use Chromium error dialogs
|
|
if (!canceling_job_)
|
|
ShowPrintErrorDialogForGenericError();
|
|
-
|
|
+#endif
|
|
TerminatePrintJob(true);
|
|
}
|
|
|
|
@@ -954,7 +1024,7 @@ bool PrintViewManagerBase::RenderAllMissingPagesNow() {
|
|
|
|
// Is the document already complete?
|
|
if (print_job_->document() && print_job_->document()->IsComplete()) {
|
|
- printing_succeeded_ = true;
|
|
+ printing_status_ = PrintStatus::kSucceeded;
|
|
return true;
|
|
}
|
|
|
|
@@ -1007,7 +1077,10 @@ bool PrintViewManagerBase::SetupNewPrintJob(
|
|
|
|
// Disconnect the current `print_job_`.
|
|
auto weak_this = weak_ptr_factory_.GetWeakPtr();
|
|
- DisconnectFromCurrentPrintJob();
|
|
+ if (callback_.is_null()) {
|
|
+ // Disconnect the current |print_job_| only when calling window.print()
|
|
+ DisconnectFromCurrentPrintJob();
|
|
+ }
|
|
if (!weak_this)
|
|
return false;
|
|
|
|
@@ -1027,7 +1100,7 @@ bool PrintViewManagerBase::SetupNewPrintJob(
|
|
#endif
|
|
print_job_->AddObserver(*this);
|
|
|
|
- printing_succeeded_ = false;
|
|
+ printing_status_ = PrintStatus::kFailed;
|
|
return true;
|
|
}
|
|
|
|
@@ -1095,6 +1168,11 @@ void PrintViewManagerBase::ReleasePrintJob() {
|
|
}
|
|
#endif
|
|
|
|
+ if (!callback_.is_null()) {
|
|
+ bool success = printing_status_ == PrintStatus::kSucceeded;
|
|
+ std::move(callback_).Run(success, PrintReasonFromPrintStatus(printing_status_));
|
|
+ }
|
|
+
|
|
if (!print_job_)
|
|
return;
|
|
|
|
@@ -1102,7 +1180,7 @@ void PrintViewManagerBase::ReleasePrintJob() {
|
|
// 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);
|
|
@@ -1144,7 +1222,7 @@ bool PrintViewManagerBase::RunInnerMessageLoop() {
|
|
}
|
|
|
|
bool PrintViewManagerBase::OpportunisticallyCreatePrintJob(int cookie) {
|
|
- if (print_job_)
|
|
+ if (print_job_ && print_job_->document())
|
|
return true;
|
|
|
|
if (!cookie) {
|
|
@@ -1298,6 +1376,8 @@ void PrintViewManagerBase::CompleteScriptedPrint(
|
|
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
|
|
@@ -1312,7 +1392,7 @@ void PrintViewManagerBase::CompleteScriptedPrint(
|
|
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)));
|
|
}
|
|
|
|
#if BUILDFLAG(ENABLE_PRINT_CONTENT_ANALYSIS)
|
|
diff --git a/chrome/browser/printing/print_view_manager_base.h b/chrome/browser/printing/print_view_manager_base.h
|
|
index 24a2bc8b26462e6cafbcd5eb89e838b73266ec70..402aab3b14e6987bde0e22e6c82ac438d465330a 100644
|
|
--- a/chrome/browser/printing/print_view_manager_base.h
|
|
+++ b/chrome/browser/printing/print_view_manager_base.h
|
|
@@ -49,6 +49,8 @@ class PrinterQuery;
|
|
// rollout.
|
|
BASE_DECLARE_FEATURE(kCheckPrintRfhIsActive);
|
|
|
|
+using CompletionCallback = base::OnceCallback<void(bool, const std::string&)>;
|
|
+
|
|
// Base class for managing the print commands for a WebContents.
|
|
class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
|
|
public:
|
|
@@ -82,7 +84,10 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
|
|
// 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,
|
|
+ bool silent = true,
|
|
+ base::Value::Dict settings = {},
|
|
+ CompletionCallback callback = {});
|
|
|
|
// Like PrintNow(), but for the node under the context menu, instead of the
|
|
// entire frame.
|
|
@@ -136,8 +141,10 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
|
|
void IsPrintingEnabled(IsPrintingEnabledCallback callback) override;
|
|
void ScriptedPrint(mojom::ScriptedPrintParamsPtr params,
|
|
ScriptedPrintCallback callback) override;
|
|
+ void ShowInvalidPrinterSettingsError() override;
|
|
void PrintingFailed(int32_t cookie,
|
|
mojom::PrintFailureReason reason) override;
|
|
+ void UserInitCanceled();
|
|
|
|
// Adds and removes observers for `PrintViewManagerBase` events. The order in
|
|
// which notifications are sent to observers is undefined. Observers must be
|
|
@@ -145,6 +152,14 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
|
|
void AddTestObserver(TestObserver& observer);
|
|
void RemoveTestObserver(TestObserver& observer);
|
|
|
|
+ enum class PrintStatus {
|
|
+ kSucceeded,
|
|
+ kCanceled,
|
|
+ kFailed,
|
|
+ kInvalid,
|
|
+ kUnknown
|
|
+ };
|
|
+
|
|
protected:
|
|
explicit PrintViewManagerBase(content::WebContents* web_contents);
|
|
|
|
@@ -268,6 +283,7 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
|
|
bool success);
|
|
#endif
|
|
void CompleteUpdatePrintSettings(
|
|
+ std::unique_ptr<PrinterQuery> printer_query,
|
|
base::Value::Dict job_settings,
|
|
std::unique_ptr<PrintSettings> print_settings,
|
|
UpdatePrintSettingsCallback callback);
|
|
@@ -362,8 +378,11 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
|
|
// The current RFH that is printing with a system printing dialog.
|
|
raw_ptr<content::RenderFrameHost> printing_rfh_ = nullptr;
|
|
|
|
+ // Respond with success of the print job.
|
|
+ CompletionCallback callback_;
|
|
+
|
|
// Indication of success of the print job.
|
|
- bool printing_succeeded_ = false;
|
|
+ PrintStatus printing_status_ = PrintStatus::kUnknown;
|
|
|
|
// Indication that the job is getting canceled.
|
|
bool canceling_job_ = false;
|
|
diff --git a/chrome/browser/printing/printer_query.cc b/chrome/browser/printing/printer_query.cc
|
|
index 418f53b0db3a2b2624298fca5628aacdd2a99c94..4a110fda692e16ec887cb90c6a2fa611c67b8d6f 100644
|
|
--- a/chrome/browser/printing/printer_query.cc
|
|
+++ b/chrome/browser/printing/printer_query.cc
|
|
@@ -355,17 +355,19 @@ void PrinterQuery::UpdatePrintSettings(base::Value::Dict new_settings,
|
|
#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)
|
|
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
|
|
index ac54519f611f719470c4b7a139a58f489884ede2..89055b6df74389560b6c5884a511897a36425b7b 100644
|
|
--- a/chrome/browser/ui/webui/print_preview/fake_print_render_frame.cc
|
|
+++ b/chrome/browser/ui/webui/print_preview/fake_print_render_frame.cc
|
|
@@ -21,7 +21,7 @@ FakePrintRenderFrame::FakePrintRenderFrame(
|
|
|
|
FakePrintRenderFrame::~FakePrintRenderFrame() = default;
|
|
|
|
-void FakePrintRenderFrame::PrintRequestedPages() {}
|
|
+void FakePrintRenderFrame::PrintRequestedPages(bool /*silent*/, ::base::Value::Dict /*settings*/) {}
|
|
|
|
void FakePrintRenderFrame::PrintWithParams(mojom::PrintPagesParamsPtr params,
|
|
PrintWithParamsCallback callback) {
|
|
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
|
|
index 1e8f7bedaf679ee19788bf181b33e5d574d1f863..8be77b57580621bf659a6a2a63a2be94a2301c70 100644
|
|
--- a/chrome/browser/ui/webui/print_preview/fake_print_render_frame.h
|
|
+++ b/chrome/browser/ui/webui/print_preview/fake_print_render_frame.h
|
|
@@ -25,7 +25,7 @@ class FakePrintRenderFrame : public mojom::PrintRenderFrame {
|
|
|
|
private:
|
|
// printing::mojom::PrintRenderFrame:
|
|
- void PrintRequestedPages() override;
|
|
+ void PrintRequestedPages(bool silent, ::base::Value::Dict settings) override;
|
|
void PrintWithParams(mojom::PrintPagesParamsPtr params,
|
|
PrintWithParamsCallback callback) override;
|
|
void PrintForSystemDialog() override;
|
|
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;
|
|
|
|
diff --git a/components/printing/common/print.mojom b/components/printing/common/print.mojom
|
|
index 4ecdb28904fac480cf102fffdff24ae008ac88cf..e8150c95fafd83d7e2fe1f472a35acec3ca6e391 100644
|
|
--- a/components/printing/common/print.mojom
|
|
+++ b/components/printing/common/print.mojom
|
|
@@ -302,7 +302,7 @@ union PrintWithParamsResult {
|
|
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();
|
|
+ PrintRequestedPages(bool silent, mojo_base.mojom.DictionaryValue settings);
|
|
|
|
// Requests the frame to be printed with specified parameters. This is used
|
|
// to programmatically produce PDF by request from the browser (e.g. over
|
|
@@ -391,6 +391,9 @@ interface PrintManagerHost {
|
|
[Sync]
|
|
ScriptedPrint(ScriptedPrintParams params) => (PrintPagesParams? settings);
|
|
|
|
+ // Tells the browser that there are invalid printer settings.
|
|
+ ShowInvalidPrinterSettingsError();
|
|
+
|
|
// Tells the browser printing failed.
|
|
PrintingFailed(int32 cookie, PrintFailureReason reason);
|
|
|
|
diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc
|
|
index 3f7ddb4b13cee1c0cf7dc6eaae03da0f2dd18242..59734318ca63408d6dbcd002b90991766dd5bf75 100644
|
|
--- a/components/printing/renderer/print_render_frame_helper.cc
|
|
+++ b/components/printing/renderer/print_render_frame_helper.cc
|
|
@@ -47,6 +47,7 @@
|
|
#include "printing/mojom/print.mojom.h"
|
|
#include "printing/page_number.h"
|
|
#include "printing/print_job_constants.h"
|
|
+#include "printing/print_settings.h"
|
|
#include "printing/units.h"
|
|
#include "services/metrics/public/cpp/ukm_source_id.h"
|
|
#include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
|
|
@@ -1228,14 +1229,14 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) {
|
|
}
|
|
|
|
print_in_progress_ = true;
|
|
-
|
|
auto weak_this = weak_ptr_factory_.GetWeakPtr();
|
|
web_frame->DispatchBeforePrintEvent(/*print_client=*/nullptr);
|
|
if (!weak_this) {
|
|
return;
|
|
}
|
|
|
|
- Print(web_frame, blink::WebNode(), PrintRequestType::kScripted);
|
|
+ Print(web_frame, blink::WebNode(), PrintRequestType::kScripted,
|
|
+ false /* silent */, base::Value::Dict() /* new_settings */);
|
|
if (!weak_this) {
|
|
return;
|
|
}
|
|
@@ -1266,7 +1267,7 @@ void PrintRenderFrameHelper::BindPrintRenderFrameReceiver(
|
|
receivers_.Add(this, std::move(receiver));
|
|
}
|
|
|
|
-void PrintRenderFrameHelper::PrintRequestedPages() {
|
|
+void PrintRenderFrameHelper::PrintRequestedPages(bool silent, base::Value::Dict settings) {
|
|
ScopedIPC scoped_ipc(weak_ptr_factory_.GetWeakPtr());
|
|
if (ipc_nesting_level_ > kAllowedIpcDepthForPrint)
|
|
return;
|
|
@@ -1281,7 +1282,7 @@ void PrintRenderFrameHelper::PrintRequestedPages() {
|
|
// plugin node and print that instead.
|
|
auto plugin = delegate_->GetPdfElement(frame);
|
|
|
|
- Print(frame, plugin, PrintRequestType::kRegular);
|
|
+ Print(frame, plugin, PrintRequestType::kRegular, silent, std::move(settings));
|
|
|
|
if (render_frame_gone_) {
|
|
return;
|
|
@@ -1370,7 +1371,8 @@ void PrintRenderFrameHelper::PrintForSystemDialog() {
|
|
}
|
|
|
|
Print(frame, print_preview_context_.source_node(),
|
|
- PrintRequestType::kRegular);
|
|
+ PrintRequestType::kRegular, false,
|
|
+ base::Value::Dict());
|
|
if (render_frame_gone_) {
|
|
return;
|
|
}
|
|
@@ -1433,6 +1435,8 @@ void PrintRenderFrameHelper::PrintPreview(base::Value::Dict settings) {
|
|
if (ipc_nesting_level_ > kAllowedIpcDepthForPrint)
|
|
return;
|
|
|
|
+ blink::WebLocalFrame* frame = render_frame()->GetWebFrame();
|
|
+ print_preview_context_.InitWithFrame(frame);
|
|
print_preview_context_.OnPrintPreview();
|
|
|
|
#if BUILDFLAG(IS_CHROMEOS_ASH)
|
|
@@ -2010,7 +2014,8 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
|
|
}
|
|
|
|
Print(duplicate_node.GetDocument().GetFrame(), duplicate_node,
|
|
- PrintRequestType::kRegular);
|
|
+ PrintRequestType::kRegular, false /* silent */,
|
|
+ base::Value::Dict() /* new_settings */);
|
|
// Check if `this` is still valid.
|
|
if (!weak_this) {
|
|
return;
|
|
@@ -2026,17 +2031,19 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
|
|
|
|
void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
|
|
const blink::WebNode& node,
|
|
- PrintRequestType print_request_type) {
|
|
+ PrintRequestType print_request_type,
|
|
+ bool silent,
|
|
+ base::Value::Dict settings) {
|
|
// If still not finished with earlier print request simply ignore.
|
|
if (prep_frame_view_)
|
|
return;
|
|
|
|
FrameReference frame_ref(frame);
|
|
|
|
- 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();
|
|
DidFinishPrinting(PrintingResult::kFailPrintInit);
|
|
return;
|
|
}
|
|
@@ -2057,8 +2064,15 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
|
|
print_pages_params_->params->print_scaling_option;
|
|
|
|
auto self = weak_ptr_factory_.GetWeakPtr();
|
|
- mojom::PrintPagesParamsPtr print_settings = GetPrintSettingsFromUser(
|
|
+ mojom::PrintPagesParamsPtr print_settings;
|
|
+
|
|
+ if (silent) {
|
|
+ print_settings = mojom::PrintPagesParams::New();
|
|
+ print_settings->params = print_pages_params_->params->Clone();
|
|
+ } else {
|
|
+ print_settings = GetPrintSettingsFromUser(
|
|
frame_ref.GetFrame(), node, expected_page_count, print_request_type);
|
|
+ }
|
|
// Check if `this` is still valid.
|
|
if (!self)
|
|
return;
|
|
@@ -2316,25 +2330,33 @@ void PrintRenderFrameHelper::IPCProcessed() {
|
|
}
|
|
|
|
bool PrintRenderFrameHelper::InitPrintSettings(blink::WebLocalFrame* frame,
|
|
- const blink::WebNode& node) {
|
|
+ const blink::WebNode& node,
|
|
+ base::Value::Dict new_settings) {
|
|
// Reset to default values.
|
|
ignore_css_margins_ = false;
|
|
|
|
- mojom::PrintPagesParams settings;
|
|
- GetPrintManagerHost()->GetDefaultPrintSettings(&settings.params);
|
|
+ mojom::PrintPagesParamsPtr settings;
|
|
+ if (new_settings.empty()) {
|
|
+ settings = mojom::PrintPagesParams::New();
|
|
+ settings->params = mojom::PrintParams::New();
|
|
+ GetPrintManagerHost()->GetDefaultPrintSettings(&settings->params);
|
|
+ } else {
|
|
+ GetPrintManagerHost()->UpdatePrintSettings(
|
|
+ std::move(new_settings), &settings);
|
|
+ }
|
|
|
|
// 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) {
|
|
+ if (!settings || !settings->params) {
|
|
// Caller will reset `print_pages_params_`.
|
|
return false;
|
|
}
|
|
|
|
bool fit_to_paper_size = !IsPrintingPdfFrame(frame, node);
|
|
- settings.params->print_scaling_option =
|
|
+ settings->params->print_scaling_option =
|
|
fit_to_paper_size ? mojom::PrintScalingOption::kFitToPrintableArea
|
|
: mojom::PrintScalingOption::kSourceSize;
|
|
- SetPrintPagesParams(settings);
|
|
+ SetPrintPagesParams(*settings);
|
|
return true;
|
|
}
|
|
|
|
diff --git a/components/printing/renderer/print_render_frame_helper.h b/components/printing/renderer/print_render_frame_helper.h
|
|
index 50c05b02ebe6245cee5dbfd529d4eebbc4f57dde..1326edfcbe4c5eb0a8427071d1ed35c8a895486a 100644
|
|
--- a/components/printing/renderer/print_render_frame_helper.h
|
|
+++ b/components/printing/renderer/print_render_frame_helper.h
|
|
@@ -245,7 +245,7 @@ class PrintRenderFrameHelper
|
|
mojo::PendingAssociatedReceiver<mojom::PrintRenderFrame> receiver);
|
|
|
|
// printing::mojom::PrintRenderFrame:
|
|
- void PrintRequestedPages() override;
|
|
+ void PrintRequestedPages(bool silent, base::Value::Dict settings) override;
|
|
void PrintWithParams(mojom::PrintPagesParamsPtr params,
|
|
PrintWithParamsCallback callback) override;
|
|
#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
|
|
@@ -312,7 +312,9 @@ class PrintRenderFrameHelper
|
|
// WARNING: |this| may be gone after this method returns.
|
|
void Print(blink::WebLocalFrame* frame,
|
|
const blink::WebNode& node,
|
|
- PrintRequestType print_request_type);
|
|
+ PrintRequestType print_request_type,
|
|
+ bool silent,
|
|
+ base::Value::Dict settings);
|
|
|
|
// Notification when printing is done - signal tear-down/free resources.
|
|
void DidFinishPrinting(PrintingResult result);
|
|
@@ -322,7 +324,8 @@ class PrintRenderFrameHelper
|
|
// Initialize print page settings with default settings.
|
|
// Used only for native printing workflow.
|
|
bool InitPrintSettings(blink::WebLocalFrame* frame,
|
|
- const blink::WebNode& node);
|
|
+ const blink::WebNode& node,
|
|
+ base::Value::Dict new_settings);
|
|
|
|
// Calculate number of pages in source document.
|
|
uint32_t CalculateNumberOfPages(blink::WebLocalFrame* frame,
|
|
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
|
|
index 379325292db87e5b8f803bd0dc57d83ebf0f2daa..63b5a8c4d0b4a6f57b192d27477cffbb8a5adb4b 100644
|
|
--- a/content/browser/BUILD.gn
|
|
+++ b/content/browser/BUILD.gn
|
|
@@ -2993,8 +2993,9 @@ source_set("browser") {
|
|
"//ppapi/shared_impl",
|
|
]
|
|
|
|
- assert(enable_printing)
|
|
- deps += [ "//printing" ]
|
|
+ if (enable_printing) {
|
|
+ deps += [ "//printing" ]
|
|
+ }
|
|
|
|
if (is_chromeos) {
|
|
sources += [
|
|
diff --git a/printing/printing_context.cc b/printing/printing_context.cc
|
|
index 9866f21c5530ac389f3392350de1f6f413df147a..8656f221a96622cd7684e4c4c4a4c080a3963362 100644
|
|
--- a/printing/printing_context.cc
|
|
+++ b/printing/printing_context.cc
|
|
@@ -154,7 +154,6 @@ void PrintingContext::UsePdfSettings() {
|
|
|
|
mojom::ResultCode PrintingContext::UpdatePrintSettings(
|
|
base::Value::Dict job_settings) {
|
|
- ResetSettings();
|
|
{
|
|
std::unique_ptr<PrintSettings> settings =
|
|
PrintSettingsFromJobSettings(job_settings);
|
|
diff --git a/printing/printing_context.h b/printing/printing_context.h
|
|
index 63f170c95050416c595e62f4c460c4cd6b7dbd1c..157e3d046889f9c63fdf0fd5d503890fb82c038d 100644
|
|
--- a/printing/printing_context.h
|
|
+++ b/printing/printing_context.h
|
|
@@ -206,6 +206,9 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
|
|
|
|
bool PrintingAborted() const { return abort_printing_; }
|
|
|
|
+ // Reinitializes the settings for object reuse.
|
|
+ void ResetSettings();
|
|
+
|
|
int job_id() const { return job_id_; }
|
|
|
|
#if BUILDFLAG(ENABLE_OOP_PRINTING)
|
|
@@ -224,9 +227,6 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
|
|
Delegate* delegate,
|
|
ProcessBehavior process_behavior);
|
|
|
|
- // Reinitializes the settings for object reuse.
|
|
- void ResetSettings();
|
|
-
|
|
// Does bookkeeping when an error occurs.
|
|
virtual mojom::ResultCode OnError();
|
|
|
|
diff --git a/sandbox/policy/mac/sandbox_mac.mm b/sandbox/policy/mac/sandbox_mac.mm
|
|
index 9f4e6a633cdba2f23f46405ca5118edf06796668..5f541dece15713507fc2f02af94f3e8921cb50d6 100644
|
|
--- a/sandbox/policy/mac/sandbox_mac.mm
|
|
+++ b/sandbox/policy/mac/sandbox_mac.mm
|
|
@@ -38,6 +38,10 @@
|
|
#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::policy {
|
|
|
|
base::FilePath GetCanonicalPath(const base::FilePath& path) {
|