mirror of
https://github.com/electron/electron.git
synced 2026-02-19 03:14:51 -05:00
* chore: bump chromium in DEPS to 146.0.7652.0 * fix(patch-conflict): update mas_avoid_private_macos_api_usage context for constrainFrameRect method The upstream CL added a new constrainFrameRect:toScreen: method override to NativeWidgetMacNSWindow as part of headless mode window zoom implementation. The MAS patch's #endif for frameViewClassForStyleMask now correctly appears after that method, since constrainFrameRect is a public API override that doesn't need to be guarded. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7487666 * fix(patch-conflict): update printing.patch for base::DictValue rename Updated printing.patch to use the new base::DictValue type name instead of base::Value::Dict following Chromium's type renaming change. This affects CompleteUpdatePrintSettings() signature and related code. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7509820 * fix(patch-conflict): update accessibility_ui patch for base::DictValue/ListValue rename Updated adjust_accessibility_ui_for_electron.patch to use the new base::DictValue and base::ListValue type names instead of base::Value::Dict and base::Value::List following Chromium's type renaming change. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7509820 * chore: update patches * 6625736: Rename DURABLE_STORAGE to PERSISTENT_STORAGE for consistency | https://chromium-review.googlesource.com/c/chromium/src/+/6625736 * chore: bump chromium in DEPS to 146.0.7653.0 * chore: update patches * 7000847: add type tag to v8::External for gin_helper function templates The upstream gin function templates now use v8::ExternalPointerTypeTag for type safety when using v8::External. Updated Electron's forked gin_helper function template to use the same kGinInternalCallbackHolderBaseTag that Chromium's gin uses. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7000847 * fix(patch-update): extend V8 Object API deprecation patch for Node.js Extended the existing patch to cover additional files that use GetAlignedPointerFromInternalField and SetAlignedPointerInInternalField: - src/stream_base-inl.h - src/udp_wrap.cc - src/js_udp_wrap.cc - src/node_process_methods.cc - src/node_snapshotable.cc - src/base_object.cc These APIs now require an EmbedderDataTypeTag parameter. Ref: https://chromium-review.googlesource.com/c/v8/v8/+/7087956 * 7000847: add type tag to v8::External calls in shared_texture Updated v8::External::New and v8::External::Value calls to use the kExternalPointerTypeTagDefault tag as required by the V8 API change that deprecates the tagless versions. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7000847 * 7508687: use ChildProcessId for file permission APIs The ChildProcessSecurityPolicy::CanReadFile and GrantReadFile APIs now require ChildProcessId instead of int. Updated to use GetID() instead of GetDeprecatedID() for these specific calls. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7508687 * 7000847: add type tag to v8::External calls in callback and osr_converter The v8::External API now requires an EmbedderPointerTypeTag parameter for both New() and Value() methods to improve V8 sandbox type safety. Updated calls in: - callback.cc: TranslatorHolder constructor and CallTranslator - osr_converter.cc: OffscreenSharedTextureValue converter Ref: https://chromium-review.googlesource.com/c/v8/v8/+/7000847 * fixup! 7087956: [api] Promote deprecation of v8::Context and v8::Object API methods Extended the Node.js patch to cover histogram.cc which also uses SetAlignedPointerInInternalField and GetAlignedPointerFromInternalField APIs that now require the EmbedderDataTypeTag parameter. Ref: https://chromium-review.googlesource.com/c/v8/v8/+/7087956 * chore: bump chromium in DEPS to 146.0.7655.0 * chore: update patches * 7509043: update WebSpellingMarker type for API change The upstream Chromium API changed - WebSpellingMarker was moved from a nested type within WebTextCheckClient to a standalone type in the blink namespace. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7509043 * 7498491: update process_id to use OriginatingProcess type The upstream Chromium API changed - URLLoaderFactoryParams::process_id was changed from an integer to a union type network::OriginatingProcess that distinguishes between browser and renderer processes. - For browser process requests, use OriginatingProcess::browser() - For renderer process lookups, check !is_browser() and use renderer_process().value() to get the child_id Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7498491 * 5710330: Add crash keys to debug NativeWidgetMacNSWindowBorderlessFrame exception | https://chromium-review.googlesource.com/c/chromium/src/+/5710330 5710330 added a new NSNextStepFrame interface extension and implementations for NativeWidgetMacNSWindowTitledFrame and NativeWidgetMacNSWindowBorderlessFrame. These use private macOS APIs that are not available in Mac App Store builds. * chore: update patches * chore: bump chromium in DEPS to 146.0.7661.0 * chore: bump chromium in DEPS to 146.0.7663.0 * fix(patch-conflict): update accessibility_ui for string_view API change Upstream removed redundant std::string(default_api_type) conversion as part of a string_view optimization cleanup. Updated patch context to match. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7514107 * fix(patch-conflict): update service process launch options for sandbox API refactor Upstream removed content/common/sandbox_init_win.cc and content/public/common/sandbox_init_win.h, moving the functionality directly into ChildProcessLauncherHelper. Updated patch to call sandbox::policy::SandboxWin::StartSandboxedProcess directly with the LaunchOptions pointer instead of going through the removed helper. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7528253 * fix(patch-conflict): update MAS safestorage for keychain API refactor Upstream refactored KeychainPassword::GetPassword() to use a new GetPasswordImpl() helper function with improved error tracking via base::expected<std::string, OSStatus>. Adapted patch to use the new GetPasswordImpl with the suffixed account name and handle migration from legacy accounts through the new API. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7516438 * chore: update patches * chore: bump chromium in DEPS to 146.0.7663.0 * fix: base::Value::Dict -> base::DictValue https://chromium-review.googlesource.com/c/chromium/src/+/7513889 * fix: include new cookie exclusion reason https://chromium-review.googlesource.com/c/chromium/src/+/7486527 * fix: enable libc++ ABI flag for trivially copyable std::vector<bool> Required for changes introduced in the following CL https://chromium-review.googlesource.com/c/chromium/src/+/7513653 * fixup! fix: base::Value::Dict -> base::DictValue https://chromium-review.googlesource.com/c/chromium/src/+/7513889 * fix: spellcheck not working in tests https://chromium-review.googlesource.com/c/chromium/src/+/7452579 * fix: cookie test failing due to multiple rejection reasons https://chromium-review.googlesource.com/c/chromium/src/+/7506629 * fix: macos sizing unmaximized window incorrectly https://chromium-review.googlesource.com/c/chromium/src/+/7487666 Changes to headless mode caused the unmaximized window to subtract the height of the menubar. * fix: skip tests for incompatible BoringSSL ML-DSA crypto https://boringssl-review.googlesource.com/c/boringssl/+/84929 * test: fix pseudonymization registration in utility process on Linux Ref: 7486913: Pass pseudonymization salt via shared memory at process launch | https://chromium-review.googlesource.com/c/chromium/src/+/7486913 * fix: restore MAS patch-outs Restores some `#if !IS_MAS_BUILD()` gates dropped in773054ad59* fixup! 7508687: use ChildProcessId for file permission APIs * fixup! fix(patch-conflict): update MAS safestorage for keychain API refactor * chore: add note about parallel upstream change * fixup! Merge remote-tracking branch 'origin/main' into roller/chromium/main * Revert "fixup! 7508687: use ChildProcessId for file permission APIs" This reverts commit05c43e4e5d. The _impl version has the signature, but not the public interface. :oof: * fixup! fix(patch-conflict): update MAS safestorage for keychain API refactor --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: Samuel Maddock <samuelmaddock@electronjs.org> Co-authored-by: clavin <clavin@electronjs.org>
941 lines
39 KiB
Diff
941 lines
39 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/chrome/browser/printing/print_job.cc b/chrome/browser/printing/print_job.cc
|
|
index f91857eb0b6ad385721b8224100de26dfdd7dd8d..45e8766fcb8d46d8edc3bf8d21d3f826a8ae24be 100644
|
|
--- a/chrome/browser/printing/print_job.cc
|
|
+++ b/chrome/browser/printing/print_job.cc
|
|
@@ -97,6 +97,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
|
|
@@ -111,6 +112,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)
|
|
|
|
@@ -204,10 +206,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),
|
|
@@ -407,8 +407,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
|
|
@@ -500,8 +502,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 aa79c324af2cec50019bca3bccff5d420fb30ffd..eb76ee91743236d05c3a70a54d5345a705b5d994 100644
|
|
--- a/chrome/browser/printing/print_view_manager_base.cc
|
|
+++ b/chrome/browser/printing/print_view_manager_base.cc
|
|
@@ -80,6 +80,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,
|
|
@@ -88,9 +102,9 @@ void OnDidGetDefaultPrintSettings(
|
|
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
|
|
|
if (printer_query->last_status() != mojom::ResultCode::kSuccess) {
|
|
- if (!want_pdf_settings) {
|
|
+#if 0 // Electron does not use Chromium error dialogs
|
|
ShowPrintErrorDialogForInvalidPrinterError();
|
|
- }
|
|
+#endif
|
|
std::move(callback).Run(nullptr);
|
|
return;
|
|
}
|
|
@@ -100,9 +114,9 @@ void OnDidGetDefaultPrintSettings(
|
|
params->document_cookie = printer_query->cookie();
|
|
|
|
if (!PrintMsgPrintParamsIsValid(*params)) {
|
|
- if (!want_pdf_settings) {
|
|
+#if 0 // Electron does not use Chromium error dialogs
|
|
ShowPrintErrorDialogForInvalidPrinterError();
|
|
- }
|
|
+#endif
|
|
std::move(callback).Run(nullptr);
|
|
return;
|
|
}
|
|
@@ -114,14 +128,14 @@ 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()) {
|
|
- // Notify user of the error, unless it was explicitly canceled.
|
|
- if (printer_query->last_status() != mojom::ResultCode::kCanceled) {
|
|
- ShowPrintErrorDialogForGenericError();
|
|
+ if (printer_query->last_status() == mojom::ResultCode::kCanceled) {
|
|
+ std::move(cancel_job).Run();
|
|
}
|
|
std::move(callback).Run(nullptr);
|
|
return;
|
|
@@ -175,9 +189,11 @@ PrintViewManagerBase::PrintViewManagerBase(content::WebContents* web_contents)
|
|
: PrintManager(web_contents),
|
|
queue_(g_browser_process->print_job_manager()->queue()) {
|
|
DCHECK(queue_);
|
|
+#if 0
|
|
Profile* profile =
|
|
Profile::FromBrowserContext(web_contents->GetBrowserContext());
|
|
printing_enabled_.Init(prefs::kPrintingEnabled, profile->GetPrefs());
|
|
+#endif
|
|
}
|
|
|
|
PrintViewManagerBase::~PrintViewManagerBase() {
|
|
@@ -185,12 +201,16 @@ PrintViewManagerBase::~PrintViewManagerBase() {
|
|
DisconnectFromCurrentPrintJob();
|
|
}
|
|
|
|
-bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh) {
|
|
+bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh,
|
|
+ base::DictValue settings,
|
|
+ CompletionCallback callback) {
|
|
if (!StartPrintCommon(rfh)) {
|
|
return false;
|
|
}
|
|
|
|
- GetPrintRenderFrame(rfh)->PrintRequestedPages();
|
|
+ callback_ = std::move(callback);
|
|
+
|
|
+ GetPrintRenderFrame(rfh)->PrintRequestedPages(std::move(settings));
|
|
|
|
for (auto& observer : GetTestObservers()) {
|
|
observer.OnPrintNow(rfh);
|
|
@@ -272,7 +292,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);
|
|
@@ -319,12 +339,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::DictValue job_settings,
|
|
std::unique_ptr<PrintSettings> print_settings,
|
|
UpdatePrintSettingsCallback callback) {
|
|
@@ -332,7 +353,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));
|
|
@@ -344,6 +366,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));
|
|
}
|
|
@@ -385,7 +411,9 @@ void PrintViewManagerBase::OnPrintSettingsDone(
|
|
UnregisterSystemPrintClient();
|
|
}
|
|
#endif
|
|
+#if 0 // Electron does not use Chromium error dialogs
|
|
ShowPrintErrorDialogForGenericError();
|
|
+#endif
|
|
std::move(callback).Run(base::Value("Update settings failed"));
|
|
return;
|
|
}
|
|
@@ -414,7 +442,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
|
|
@@ -640,7 +668,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()) {
|
|
@@ -668,7 +696,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;
|
|
@@ -712,10 +740,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
|
|
// `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);
|
|
if (value > 0)
|
|
@@ -740,8 +765,22 @@ void PrintViewManagerBase::UpdatePrintSettings(
|
|
}
|
|
}
|
|
|
|
-#if BUILDFLAG(IS_WIN)
|
|
- // TODO(crbug.com/40260379): Remove this if the printable areas can be made
|
|
+ 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.
|
|
if (printer_type == mojom::PrinterType::kLocal) {
|
|
@@ -762,8 +801,6 @@ void PrintViewManagerBase::UpdatePrintSettings(
|
|
}
|
|
#endif
|
|
|
|
- CompleteUpdatePrintSettings(std::move(job_settings),
|
|
- std::move(print_settings), std::move(callback));
|
|
}
|
|
|
|
void PrintViewManagerBase::SetAccessibilityTree(
|
|
@@ -779,7 +816,7 @@ void PrintViewManagerBase::SetAccessibilityTree(
|
|
void PrintViewManagerBase::IsPrintingEnabled(
|
|
IsPrintingEnabledCallback callback) {
|
|
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
|
- std::move(callback).Run(GetPrintingEnabledBooleanPref());
|
|
+ std::move(callback).Run(true);
|
|
}
|
|
|
|
void PrintViewManagerBase::ScriptedPrint(mojom::ScriptedPrintParamsPtr params,
|
|
@@ -805,7 +842,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::
|
|
@@ -835,11 +872,9 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie,
|
|
// destroyed. In such cases the error notification to the user will
|
|
// 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
|
|
ShowPrintErrorDialogForGenericError();
|
|
- }
|
|
-
|
|
+#endif
|
|
ReleasePrinterQuery();
|
|
}
|
|
|
|
@@ -851,15 +886,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(
|
|
@@ -901,13 +945,14 @@ void PrintViewManagerBase::SystemDialogCancelled() {
|
|
// System dialog was cancelled. Clean up the print job and notify the
|
|
// BackgroundPrintingManager.
|
|
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
|
+ printing_status_ = PrintStatus::kCanceled;
|
|
ReleasePrinterQuery();
|
|
TerminatePrintJob(true);
|
|
}
|
|
#endif
|
|
|
|
bool PrintViewManagerBase::GetPrintingEnabledBooleanPref() const {
|
|
- return printing_enabled_.GetValue();
|
|
+ return true;
|
|
}
|
|
|
|
void PrintViewManagerBase::OnDocDone(int job_id, PrintedDocument* document) {
|
|
@@ -921,18 +966,26 @@ 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();
|
|
}
|
|
|
|
void PrintViewManagerBase::OnCanceling() {
|
|
+ printing_status_ = PrintStatus::kCanceled;
|
|
canceling_job_ = true;
|
|
}
|
|
|
|
void PrintViewManagerBase::OnFailed() {
|
|
if (!canceling_job_)
|
|
+ printing_status_ = PrintStatus::kFailed;
|
|
+#if 0 // Electron does not use Chromium error dialogs
|
|
ShowPrintErrorDialogForGenericError();
|
|
-
|
|
+#endif
|
|
TerminatePrintJob(true);
|
|
}
|
|
|
|
@@ -942,7 +995,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;
|
|
}
|
|
|
|
@@ -995,7 +1048,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;
|
|
|
|
@@ -1015,7 +1071,7 @@ bool PrintViewManagerBase::SetupNewPrintJob(
|
|
#endif
|
|
print_job_->AddObserver(*this);
|
|
|
|
- printing_succeeded_ = false;
|
|
+ printing_status_ = PrintStatus::kUnknown;
|
|
return true;
|
|
}
|
|
|
|
@@ -1073,7 +1129,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();
|
|
}
|
|
@@ -1083,6 +1139,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;
|
|
|
|
@@ -1090,7 +1151,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);
|
|
@@ -1132,7 +1193,7 @@ bool PrintViewManagerBase::RunInnerMessageLoop() {
|
|
}
|
|
|
|
bool PrintViewManagerBase::OpportunisticallyCreatePrintJob(int cookie) {
|
|
- if (print_job_)
|
|
+ if (print_job_ && print_job_->document())
|
|
return true;
|
|
|
|
if (!cookie) {
|
|
@@ -1155,7 +1216,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_`.
|
|
@@ -1286,6 +1347,8 @@ void PrintViewManagerBase::CompleteScriptedPrint(
|
|
auto callback_wrapper = base::BindOnce(
|
|
&PrintViewManagerBase::ScriptedPrintReply, weak_ptr_factory_.GetWeakPtr(),
|
|
std::move(callback), render_process_host->GetDeprecatedID());
|
|
+ auto cancel_job_wrapper = base::BindOnce(
|
|
+ &PrintViewManagerBase::UserInitCanceled, weak_ptr_factory_.GetWeakPtr());
|
|
std::unique_ptr<PrinterQuery> printer_query =
|
|
queue()->PopPrinterQuery(params->cookie);
|
|
if (!printer_query)
|
|
@@ -1296,10 +1359,10 @@ 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(ENTERPRISE_CONTENT_ANALYSIS)
|
|
+#if 0
|
|
void PrintViewManagerBase::CompletePrintDocumentAfterContentAnalysis(
|
|
scoped_refptr<base::RefCountedMemory> print_data,
|
|
const gfx::Size& page_size,
|
|
diff --git a/chrome/browser/printing/print_view_manager_base.h b/chrome/browser/printing/print_view_manager_base.h
|
|
index cdd25ff24507cc49684454820c7d385b8c67259e..d4dc7e8e0cd604a6418f76e2e387985d847ce0be 100644
|
|
--- a/chrome/browser/printing/print_view_manager_base.h
|
|
+++ b/chrome/browser/printing/print_view_manager_base.h
|
|
@@ -46,6 +46,8 @@ namespace printing {
|
|
class PrintQueriesQueue;
|
|
class PrinterQuery;
|
|
|
|
+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:
|
|
@@ -76,7 +78,9 @@ 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,
|
|
+ base::DictValue settings = {},
|
|
+ CompletionCallback callback = {});
|
|
|
|
// Like PrintNow(), but for the node under the context menu, instead of the
|
|
// entire frame.
|
|
@@ -130,8 +134,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
|
|
@@ -139,6 +145,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:
|
|
#if BUILDFLAG(ENTERPRISE_CONTENT_ANALYSIS)
|
|
using PrintDocumentCallback =
|
|
@@ -218,7 +232,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.
|
|
@@ -282,6 +296,7 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
|
|
bool success);
|
|
#endif
|
|
void CompleteUpdatePrintSettings(
|
|
+ std::unique_ptr<PrinterQuery> printer_query,
|
|
base::DictValue job_settings,
|
|
std::unique_ptr<PrintSettings> print_settings,
|
|
UpdatePrintSettingsCallback callback);
|
|
@@ -376,8 +391,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 15bd25f0d99b38c2d3a01b5bab78173ea9fef23c..27de3e2b4de7052af5d60a0c60b8ceec79869a49 100644
|
|
--- a/chrome/browser/printing/printer_query.cc
|
|
+++ b/chrome/browser/printing/printer_query.cc
|
|
@@ -356,17 +356,19 @@ void PrinterQuery::UpdatePrintSettings(base::DictValue 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/printing/printer_query_oop.cc b/chrome/browser/printing/printer_query_oop.cc
|
|
index 0dd564edd45425c75830f5e078f6fb375d10460b..61e0af99682502056f77426f6d17ee33463df6ae 100644
|
|
--- a/chrome/browser/printing/printer_query_oop.cc
|
|
+++ b/chrome/browser/printing/printer_query_oop.cc
|
|
@@ -126,7 +126,7 @@ void PrinterQueryOop::OnDidAskUserForSettings(
|
|
std::unique_ptr<PrintSettings> new_settings,
|
|
mojom::ResultCode result) {
|
|
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
|
- if (result == mojom::ResultCode::kSuccess) {
|
|
+ if (result == mojom::ResultCode::kSuccess && query_with_ui_client_id_) {
|
|
// Want the same PrintBackend service as the query so that we use the same
|
|
// device context.
|
|
print_document_client_id_ =
|
|
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 ac2f719be566020d9f41364560c12e6d6d0fe3d8..16d758a6936f66148a196761cfb875f68c1818d7 100644
|
|
--- a/components/printing/common/print.mojom
|
|
+++ b/components/printing/common/print.mojom
|
|
@@ -299,7 +299,7 @@ enum PrintFailureReason {
|
|
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(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
|
|
@@ -388,6 +388,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 60b5e83a8bc1ed07970be4cdfdc19962698bd754..1320f3b10b07b2cee90f39f406604176c7575796 100644
|
|
--- a/components/printing/renderer/print_render_frame_helper.cc
|
|
+++ b/components/printing/renderer/print_render_frame_helper.cc
|
|
@@ -54,6 +54,7 @@
|
|
#include "printing/page_number.h"
|
|
#include "printing/print_job_constants.h"
|
|
#include "printing/printing_features.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"
|
|
@@ -1255,14 +1256,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,
|
|
+ base::DictValue());
|
|
if (!weak_this) {
|
|
return;
|
|
}
|
|
@@ -1293,12 +1294,14 @@ void PrintRenderFrameHelper::BindPrintRenderFrameReceiver(
|
|
receivers_.Add(this, std::move(receiver));
|
|
}
|
|
|
|
-void PrintRenderFrameHelper::PrintRequestedPages() {
|
|
- PrintRequestedPagesInternal(/*already_notified_frame=*/false);
|
|
+void PrintRenderFrameHelper::PrintRequestedPages(base::DictValue settings) {
|
|
+ PrintRequestedPagesInternal(/*already_notified_frame=*/false,
|
|
+ std::move(settings));
|
|
}
|
|
|
|
void PrintRenderFrameHelper::PrintRequestedPagesInternal(
|
|
- bool already_notified_frame) {
|
|
+ bool already_notified_frame,
|
|
+ base::DictValue settings) {
|
|
ScopedIPC scoped_ipc(weak_ptr_factory_.GetWeakPtr());
|
|
if (ipc_nesting_level_ > kAllowedIpcDepthForPrint) {
|
|
return;
|
|
@@ -1315,9 +1318,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;
|
|
}
|
|
@@ -1327,7 +1331,7 @@ void PrintRenderFrameHelper::PrintRequestedPagesInternal(
|
|
// plugin node and print that instead.
|
|
auto plugin = delegate_->GetPdfElement(frame);
|
|
|
|
- Print(frame, plugin, PrintRequestType::kRegular);
|
|
+ Print(frame, plugin, PrintRequestType::kRegular, std::move(settings));
|
|
|
|
if (render_frame_gone_) {
|
|
return;
|
|
@@ -1483,6 +1487,8 @@ void PrintRenderFrameHelper::PrintPreview(base::DictValue 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)
|
|
@@ -2095,17 +2101,25 @@ 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,
|
|
+ base::DictValue settings) {
|
|
// If still not finished with earlier print request simply ignore.
|
|
if (prep_frame_view_)
|
|
return;
|
|
|
|
+ bool silent = settings.FindBool("silent").value_or(false);
|
|
FrameReference frame_ref(frame);
|
|
|
|
- if (!InitPrintSettings(frame, node)) {
|
|
+ // If we're silently printing a PDF, we bypass settings logic
|
|
+ // that sets modifiability to false so ensure it's set here.
|
|
+ if (silent && IsPrintingPdfFrame(frame, node)) {
|
|
+ settings.Set(kSettingPreviewModifiable, false);
|
|
+ }
|
|
+
|
|
+ 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;
|
|
}
|
|
@@ -2126,8 +2140,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;
|
|
@@ -2394,29 +2415,43 @@ void PrintRenderFrameHelper::IPCProcessed() {
|
|
}
|
|
|
|
bool PrintRenderFrameHelper::InitPrintSettings(blink::WebLocalFrame* frame,
|
|
- const blink::WebNode& node) {
|
|
+ const blink::WebNode& node,
|
|
+ base::DictValue 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 center_on_paper = !IsPrintingPdfFrame(frame, node);
|
|
- settings.params->print_scaling_option =
|
|
- center_on_paper ? mojom::PrintScalingOption::kCenterShrinkToFitPaper
|
|
- : mojom::PrintScalingOption::kSourceSize;
|
|
- RecordDebugEvent(settings.params->printed_doc_type ==
|
|
+ bool silent = new_settings.FindBool("silent").value_or(false);
|
|
+ if (silent) {
|
|
+ settings->params->print_scaling_option = mojom::PrintScalingOption::kFitToPrintableArea;
|
|
+ } else {
|
|
+ settings->params->print_scaling_option =
|
|
+ center_on_paper ? mojom::PrintScalingOption::kCenterShrinkToFitPaper
|
|
+ : mojom::PrintScalingOption::kSourceSize;
|
|
+ }
|
|
+
|
|
+ RecordDebugEvent(settings->params->printed_doc_type ==
|
|
mojom::SkiaDocumentType::kMSKP
|
|
? DebugEvent::kSetPrintSettings5
|
|
: DebugEvent::kSetPrintSettings6);
|
|
- 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 8b4cea7d43fe16d7414e017b11ee1cda722e1a8d..116939ffd857354ab1bfab472b292cfedd99dcba 100644
|
|
--- a/components/printing/renderer/print_render_frame_helper.h
|
|
+++ b/components/printing/renderer/print_render_frame_helper.h
|
|
@@ -258,7 +258,7 @@ class PrintRenderFrameHelper
|
|
mojo::PendingAssociatedReceiver<mojom::PrintRenderFrame> receiver);
|
|
|
|
// printing::mojom::PrintRenderFrame:
|
|
- void PrintRequestedPages() override;
|
|
+ void PrintRequestedPages(base::DictValue settings) override;
|
|
void PrintWithParams(mojom::PrintPagesParamsPtr params,
|
|
PrintWithParamsCallback callback) override;
|
|
#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
|
|
@@ -325,7 +325,8 @@ 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,
|
|
+ base::DictValue settings = {});
|
|
|
|
// Notification when printing is done - signal tear-down/free resources.
|
|
void DidFinishPrinting(PrintingResult result);
|
|
@@ -335,7 +336,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::DictValue new_settings);
|
|
|
|
// Calculate number of pages in source document.
|
|
uint32_t CalculateNumberOfPages(blink::WebLocalFrame* frame,
|
|
@@ -637,7 +639,8 @@ class PrintRenderFrameHelper
|
|
};
|
|
|
|
void SetupOnStopLoadingTimeout();
|
|
- void PrintRequestedPagesInternal(bool already_notified_frame);
|
|
+ void PrintRequestedPagesInternal(bool already_notified_frame,
|
|
+ base::DictValue settings);
|
|
|
|
ScriptingThrottler scripting_throttler_;
|
|
|
|
diff --git a/printing/printing_context.cc b/printing/printing_context.cc
|
|
index 4b004cf94b93137a4a64b79eab49b8d216891846..45c14773307612708c487e29e2cced8429f12850 100644
|
|
--- a/printing/printing_context.cc
|
|
+++ b/printing/printing_context.cc
|
|
@@ -157,7 +157,6 @@ void PrintingContext::UsePdfSettings() {
|
|
|
|
mojom::ResultCode PrintingContext::UpdatePrintSettings(
|
|
base::DictValue job_settings) {
|
|
- ResetSettings();
|
|
{
|
|
std::unique_ptr<PrintSettings> settings =
|
|
PrintSettingsFromJobSettings(job_settings);
|
|
diff --git a/printing/printing_context.h b/printing/printing_context.h
|
|
index 01970ac4c5c38182774353762ee138dbd9af184c..fa261eec18ee102d9b3ab152ce5540ffa5d6512f 100644
|
|
--- a/printing/printing_context.h
|
|
+++ b/printing/printing_context.h
|
|
@@ -208,6 +208,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)
|
|
@@ -227,9 +230,6 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
|
|
Delegate* delegate,
|
|
OutOfProcessBehavior out_of_process_behavior);
|
|
|
|
- // Reinitializes the settings for object reuse.
|
|
- void ResetSettings();
|
|
-
|
|
// Does bookkeeping when an error occurs.
|
|
virtual mojom::ResultCode OnError();
|
|
|
|
diff --git a/printing/printing_context_linux.cc b/printing/printing_context_linux.cc
|
|
index 5c555d8768e2a1d9e6ac86fc9392420a42f5193d..f547f7e6008635ff03c3b96911772c18790e89aa 100644
|
|
--- a/printing/printing_context_linux.cc
|
|
+++ b/printing/printing_context_linux.cc
|
|
@@ -66,9 +66,8 @@ void PrintingContextLinux::AskUserForSettings(int max_pages,
|
|
bool is_scripted,
|
|
PrintSettingsCallback callback) {
|
|
if (!print_dialog_) {
|
|
- // Can only get here if the renderer is sending bad messages. Ignore.
|
|
- // https://crbug.com/41088489
|
|
- return;
|
|
+ print_dialog_ = ui::LinuxUi::instance()->CreatePrintDialog(this);
|
|
+ print_dialog_->UseDefaultSettings();
|
|
}
|
|
|
|
print_dialog_->ShowDialog(delegate_->GetParentView(), has_selection,
|