81c143318b
* chore: bump chromium in DEPS to 94.0.4587.0 * chore: update patches * 2823155: fix GPU video decoding capabilities enumeration Ref: https://chromium-review.googlesource.com/c/chromium/src/+/2823155 * 3041383: Reduce includes in url_request_mojom_traits.h Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3041383 * chore: bump chromium in DEPS to 94.0.4588.0 * chore: update patches * chore: bump chromium in DEPS to 94.0.4589.0 * chore: update patches * 3050633: Rename ScaleFactor to ResourceScaleFactor Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3050633 * 3048296: Create new mojo target to prevent traits header spreading Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3048296 * 3046186: Rename base::ClampToRange Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3046186 * chore: update picture-in-picture patch Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3056037 * chore: bump chromium in DEPS to 94.0.4590.0 * chore: update patches * 3057495: Fix base::NoDestructor usage in Mac KeychainPassword Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3057495 * 3056134: Remove NetworkIsolationKey unused methods Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3056134 * 3035091: [rab/gsab] Fix gsab maxByteLength after transferring to worker Adds a patch to v8 to disable a DCHECK that is also firing on node streams in child processes. Ref: https://chromium-review.googlesource.com/c/v8/v8/+/3035091 * chore: bump chromium in DEPS to 94.0.4590.2 * chore: fix mas_no_private_api.patch Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3049052 * 3049555: [views] Add CHECK to prevent fallthrough to global NativeTheme Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3049555 * chore: empty commit * chore: fix whitespace for lint * chore: cherry-pick chromium woa fix * Revert "chore: cherry-pick chromium woa fix" This reverts commit 64f3082e2d5f93ef0e2ac5d98246532a105fd4a1. * chore: fix the build on Windows on ARM * chore: remove commented code in printing.patch * fixup! chore: remove commented code in printing.patch do not remove the new weak_ptr check * build: sync disable_use_lld_for_macos.patch Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: VerteDinde <khammond@slack-corp.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: VerteDinde <keeleymhammond@gmail.com> Co-authored-by: Charles Kerr <charles@charleskerr.com>
661 lines
28 KiB
Diff
661 lines
28 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 bca04dcd90921e508fb0e5c8201265532e42e88f..345547f382c8984ea29483b84475c120aa58e19b 100644
|
|
--- a/chrome/browser/printing/print_job.cc
|
|
+++ b/chrome/browser/printing/print_job.cc
|
|
@@ -350,18 +350,25 @@ void PrintJob::StartPdfToEmfConversion(
|
|
// seems to work with the fix for this bug applied.
|
|
const PrintSettings& settings = document()->settings();
|
|
bool print_text_with_gdi =
|
|
- settings.print_text_with_gdi() && !settings.printer_language_is_xps() &&
|
|
+#if defined(OS_WIN)
|
|
+ settings.is_modifiable()
|
|
+#else
|
|
+ settings.print_text_with_gdi()
|
|
+#endif
|
|
+ && !settings.printer_language_is_xps() &&
|
|
base::FeatureList::IsEnabled(::features::kGdiTextPrinting);
|
|
|
|
// 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
|
|
// pointer checks to avoid crashing.
|
|
+#if 0
|
|
content::WebContents* web_contents = worker_->GetWebContents();
|
|
content::BrowserContext* context =
|
|
web_contents ? web_contents->GetBrowserContext() : nullptr;
|
|
PrefService* prefs =
|
|
context ? Profile::FromBrowserContext(context)->GetPrefs() : nullptr;
|
|
- bool print_with_reduced_rasterization = PrintWithReducedRasterization(prefs);
|
|
+#endif
|
|
+ bool print_with_reduced_rasterization = PrintWithReducedRasterization(nullptr);
|
|
|
|
using RenderMode = PdfRenderSettings::Mode;
|
|
RenderMode mode;
|
|
@@ -499,6 +506,10 @@ void PrintJob::OnNotifyPrintJobEvent(const JobEventDetails& event_details) {
|
|
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
|
|
|
switch (event_details.type()) {
|
|
+ case JobEventDetails::USER_INIT_CANCELED: {
|
|
+ DCHECK_EQ(event_details.document(), document_.get());
|
|
+ break;
|
|
+ }
|
|
case JobEventDetails::FAILED:
|
|
// No need to cancel since the worker already canceled itself.
|
|
Stop();
|
|
diff --git a/chrome/browser/printing/print_job.h b/chrome/browser/printing/print_job.h
|
|
index b8b83529be4c7da661032d3b941984c02b978047..98ef6cfad5dc46d9dcb65a0ce506db3729410239 100644
|
|
--- a/chrome/browser/printing/print_job.h
|
|
+++ b/chrome/browser/printing/print_job.h
|
|
@@ -242,6 +242,9 @@ class JobEventDetails : public base::RefCountedThreadSafe<JobEventDetails> {
|
|
public:
|
|
// Event type.
|
|
enum Type {
|
|
+ // Print... dialog box has been closed with CANCEL button.
|
|
+ USER_INIT_CANCELED,
|
|
+
|
|
// A new document started printing.
|
|
NEW_DOC,
|
|
|
|
diff --git a/chrome/browser/printing/print_job_worker.cc b/chrome/browser/printing/print_job_worker.cc
|
|
index 2824b97e715a493082734d40f62860c8cafa5f34..584d4ef2b73a0f89458224eb134a8d8a2b439995 100644
|
|
--- a/chrome/browser/printing/print_job_worker.cc
|
|
+++ b/chrome/browser/printing/print_job_worker.cc
|
|
@@ -21,13 +21,13 @@
|
|
#include "chrome/browser/browser_process.h"
|
|
#include "chrome/browser/chrome_notification_types.h"
|
|
#include "chrome/browser/printing/print_job.h"
|
|
-#include "chrome/grit/generated_resources.h"
|
|
#include "components/crash/core/common/crash_keys.h"
|
|
#include "content/public/browser/browser_task_traits.h"
|
|
#include "content/public/browser/browser_thread.h"
|
|
#include "content/public/browser/notification_service.h"
|
|
#include "content/public/browser/render_frame_host.h"
|
|
#include "content/public/browser/web_contents.h"
|
|
+#include "electron/grit/electron_resources.h"
|
|
#include "printing/backend/print_backend.h"
|
|
#include "printing/mojom/print.mojom.h"
|
|
#include "printing/print_job_constants.h"
|
|
@@ -238,16 +238,21 @@ void PrintJobWorker::UpdatePrintSettings(base::Value new_settings,
|
|
#endif // defined(OS_LINUX) && defined(USE_CUPS)
|
|
}
|
|
|
|
- PrintingContext::Result result;
|
|
{
|
|
#if defined(OS_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();
|
|
+ PrintingContext::Result get_default_result = printing_context_->UseDefaultSettings();
|
|
+ if (get_default_result == PrintingContext::Result::OK) {
|
|
+ PrintingContext::Result update_result =
|
|
+ printing_context_->UpdatePrintSettings(std::move(new_settings));
|
|
+ GetSettingsDone(std::move(callback), update_result);
|
|
+ }
|
|
}
|
|
- GetSettingsDone(std::move(callback), result);
|
|
}
|
|
|
|
#if defined(OS_CHROMEOS)
|
|
@@ -263,6 +268,13 @@ void PrintJobWorker::UpdatePrintSettingsFromPOD(
|
|
|
|
void PrintJobWorker::GetSettingsDone(SettingsCallback callback,
|
|
PrintingContext::Result result) {
|
|
+ if (result == PrintingContext::CANCEL) {
|
|
+ print_job_->PostTask(
|
|
+ FROM_HERE,
|
|
+ base::BindOnce(&NotificationCallback, base::RetainedRef(print_job_),
|
|
+ JobEventDetails::USER_INIT_CANCELED, 0,
|
|
+ base::RetainedRef(document_)));
|
|
+ }
|
|
std::move(callback).Run(printing_context_->TakeAndResetSettings(), result);
|
|
}
|
|
|
|
diff --git a/chrome/browser/printing/print_view_manager_base.cc b/chrome/browser/printing/print_view_manager_base.cc
|
|
index 34e26cabaf8172a6db26c5084260f1fd88967d68..7bad89e6eedba717469feeb6e407c93b94582823 100644
|
|
--- a/chrome/browser/printing/print_view_manager_base.cc
|
|
+++ b/chrome/browser/printing/print_view_manager_base.cc
|
|
@@ -28,10 +28,10 @@
|
|
#include "chrome/browser/printing/print_view_manager_common.h"
|
|
#include "chrome/browser/printing/printer_query.h"
|
|
#include "chrome/browser/profiles/profile.h"
|
|
-#include "chrome/browser/ui/simple_message_box.h"
|
|
-#include "chrome/browser/ui/webui/print_preview/printer_handler.h"
|
|
#include "chrome/common/pref_names.h"
|
|
+#if 0
|
|
#include "chrome/grit/generated_resources.h"
|
|
+#endif
|
|
#include "components/prefs/pref_service.h"
|
|
#include "components/printing/browser/print_composite_client.h"
|
|
#include "components/printing/browser/print_manager_utils.h"
|
|
@@ -46,6 +46,7 @@
|
|
#include "content/public/browser/render_process_host.h"
|
|
#include "content/public/browser/render_view_host.h"
|
|
#include "content/public/browser/web_contents.h"
|
|
+#include "electron/grit/electron_resources.h"
|
|
#include "mojo/public/cpp/system/buffer.h"
|
|
#include "printing/buildflags/buildflags.h"
|
|
#include "printing/metafile_skia.h"
|
|
@@ -110,6 +111,8 @@ crosapi::mojom::PrintJobPtr PrintJobToMojom(
|
|
#endif
|
|
|
|
void ShowWarningMessageBox(const std::u16string& message) {
|
|
+ LOG(ERROR) << "Invalid printer settings " << message;
|
|
+#if 0
|
|
// Runs always on the UI thread.
|
|
static bool is_dialog_shown = false;
|
|
if (is_dialog_shown)
|
|
@@ -118,6 +121,7 @@ void ShowWarningMessageBox(const std::u16string& message) {
|
|
base::AutoReset<bool> auto_reset(&is_dialog_shown, true);
|
|
|
|
chrome::ShowWarningMessageBox(nullptr, std::u16string(), message);
|
|
+#endif
|
|
}
|
|
|
|
#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
|
|
@@ -236,7 +240,9 @@ void UpdatePrintSettingsReplyOnIO(
|
|
DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
|
|
DCHECK(printer_query);
|
|
mojom::PrintPagesParamsPtr params = CreateEmptyPrintPagesParamsPtr();
|
|
- if (printer_query->last_status() == PrintingContext::OK) {
|
|
+ // We call update without first printing from defaults,
|
|
+ // so the last printer status will still be defaulted to PrintingContext::FAILED
|
|
+ if (printer_query) {
|
|
RenderParamsFromPrintSettings(printer_query->settings(),
|
|
params->params.get());
|
|
params->params->document_cookie = printer_query->cookie();
|
|
@@ -339,12 +345,14 @@ 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(),
|
|
base::BindRepeating(&PrintViewManagerBase::UpdatePrintingEnabled,
|
|
weak_ptr_factory_.GetWeakPtr()));
|
|
+#endif
|
|
}
|
|
|
|
PrintViewManagerBase::~PrintViewManagerBase() {
|
|
@@ -352,7 +360,10 @@ PrintViewManagerBase::~PrintViewManagerBase() {
|
|
DisconnectFromCurrentPrintJob();
|
|
}
|
|
|
|
-bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh) {
|
|
+bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh,
|
|
+ bool silent,
|
|
+ base::Value settings,
|
|
+ CompletionCallback callback) {
|
|
auto weak_this = weak_ptr_factory_.GetWeakPtr();
|
|
DisconnectFromCurrentPrintJob();
|
|
if (!weak_this)
|
|
@@ -367,7 +378,14 @@ bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh) {
|
|
// go in `ReleasePrintJob()`.
|
|
|
|
SetPrintingRFH(rfh);
|
|
- GetPrintRenderFrame(rfh)->PrintRequestedPages();
|
|
+ callback_ = std::move(callback);
|
|
+
|
|
+ if (!callback_.is_null()) {
|
|
+ registrar_.Add(this, chrome::NOTIFICATION_PRINT_JOB_EVENT,
|
|
+ content::NotificationService::AllSources());
|
|
+ }
|
|
+
|
|
+ GetPrintRenderFrame(rfh)->PrintRequestedPages(silent, std::move(settings));
|
|
return true;
|
|
}
|
|
|
|
@@ -522,9 +540,9 @@ void PrintViewManagerBase::ScriptedPrintReply(
|
|
void PrintViewManagerBase::UpdatePrintingEnabled() {
|
|
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
|
// The Unretained() is safe because ForEachFrame() is synchronous.
|
|
- web_contents()->ForEachFrame(base::BindRepeating(
|
|
- &PrintViewManagerBase::SendPrintingEnabled, base::Unretained(this),
|
|
- printing_enabled_.GetValue()));
|
|
+ web_contents()->ForEachFrame(
|
|
+ base::BindRepeating(&PrintViewManagerBase::SendPrintingEnabled,
|
|
+ base::Unretained(this), true));
|
|
}
|
|
|
|
void PrintViewManagerBase::NavigationStopped() {
|
|
@@ -638,12 +656,13 @@ 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),
|
|
mojom::PrintParams::New());
|
|
return;
|
|
}
|
|
-
|
|
+#endif
|
|
content::RenderFrameHost* render_frame_host = GetCurrentTargetFrame();
|
|
auto callback_wrapper =
|
|
base::BindOnce(&PrintViewManagerBase::GetDefaultPrintSettingsReply,
|
|
@@ -661,12 +680,13 @@ void PrintViewManagerBase::UpdatePrintSettings(
|
|
base::Value job_settings,
|
|
UpdatePrintSettingsCallback callback) {
|
|
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
|
+#if 0 // Printing is always enabled.
|
|
if (!printing_enabled_.GetValue()) {
|
|
UpdatePrintSettingsReply(std::move(callback),
|
|
CreateEmptyPrintPagesParamsPtr(), false);
|
|
return;
|
|
}
|
|
-
|
|
+#endif
|
|
if (!job_settings.FindIntKey(kSettingPrinterType)) {
|
|
UpdatePrintSettingsReply(std::move(callback),
|
|
CreateEmptyPrintPagesParamsPtr(), false);
|
|
@@ -711,13 +731,17 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie) {
|
|
PrintManager::PrintingFailed(cookie);
|
|
|
|
#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
|
|
- ShowPrintErrorDialog();
|
|
#endif
|
|
|
|
ReleasePrinterQuery();
|
|
}
|
|
|
|
void PrintViewManagerBase::ShowInvalidPrinterSettingsError() {
|
|
+ if (!callback_.is_null()) {
|
|
+ std::string cb_str = "Invalid printer settings";
|
|
+ std::move(callback_).Run(printing_succeeded_, cb_str);
|
|
+ }
|
|
+
|
|
base::ThreadTaskRunnerHandle::Get()->PostTask(
|
|
FROM_HERE, base::BindOnce(&ShowWarningMessageBox,
|
|
l10n_util::GetStringUTF16(
|
|
@@ -796,6 +820,11 @@ void PrintViewManagerBase::OnNotifyPrintJobEvent(
|
|
#endif
|
|
break;
|
|
}
|
|
+ case JobEventDetails::USER_INIT_CANCELED: {
|
|
+ printing_cancelled_ = true;
|
|
+ ReleasePrintJob();
|
|
+ break;
|
|
+ }
|
|
case JobEventDetails::JOB_DONE:
|
|
// Printing is done, we don't need it anymore.
|
|
// print_job_->is_job_pending() may still be true, depending on the order
|
|
@@ -865,7 +894,10 @@ bool PrintViewManagerBase::CreateNewPrintJob(
|
|
|
|
// 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;
|
|
|
|
@@ -888,8 +920,6 @@ bool PrintViewManagerBase::CreateNewPrintJob(
|
|
/*source_id=*/"");
|
|
#endif
|
|
|
|
- registrar_.Add(this, chrome::NOTIFICATION_PRINT_JOB_EVENT,
|
|
- content::Source<PrintJob>(print_job_.get()));
|
|
printing_succeeded_ = false;
|
|
return true;
|
|
}
|
|
@@ -941,14 +971,22 @@ void PrintViewManagerBase::ReleasePrintJob() {
|
|
content::RenderFrameHost* rfh = printing_rfh_;
|
|
printing_rfh_ = nullptr;
|
|
|
|
+ if (!callback_.is_null()) {
|
|
+ registrar_.Remove(this, chrome::NOTIFICATION_PRINT_JOB_EVENT,
|
|
+ content::NotificationService::AllSources());
|
|
+
|
|
+ std::string cb_str = "";
|
|
+ if (!printing_succeeded_)
|
|
+ cb_str = printing_cancelled_ ? "cancelled" : "failed";
|
|
+ std::move(callback_).Run(printing_succeeded_, cb_str);
|
|
+ }
|
|
+
|
|
if (!print_job_)
|
|
return;
|
|
|
|
if (rfh)
|
|
GetPrintRenderFrame(rfh)->PrintingDone(printing_succeeded_);
|
|
|
|
- registrar_.Remove(this, chrome::NOTIFICATION_PRINT_JOB_EVENT,
|
|
- content::Source<PrintJob>(print_job_.get()));
|
|
// Don't close the worker thread.
|
|
print_job_ = nullptr;
|
|
}
|
|
@@ -987,7 +1025,7 @@ bool PrintViewManagerBase::RunInnerMessageLoop() {
|
|
}
|
|
|
|
bool PrintViewManagerBase::OpportunisticallyCreatePrintJob(int cookie) {
|
|
- if (print_job_)
|
|
+ if (print_job_ && print_job_->document())
|
|
return true;
|
|
|
|
if (!cookie) {
|
|
diff --git a/chrome/browser/printing/print_view_manager_base.h b/chrome/browser/printing/print_view_manager_base.h
|
|
index eaa0e162a339ba68d42c920fdd30869d259b4f27..8381f5171970aa89fc5c406d57d2665e16c6678b 100644
|
|
--- a/chrome/browser/printing/print_view_manager_base.h
|
|
+++ b/chrome/browser/printing/print_view_manager_base.h
|
|
@@ -38,6 +38,8 @@ class PrintJob;
|
|
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 content::NotificationObserver,
|
|
public PrintManager {
|
|
@@ -47,7 +49,10 @@ class PrintViewManagerBase : public content::NotificationObserver,
|
|
// 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,
|
|
+ base::Value settings,
|
|
+ CompletionCallback callback);
|
|
|
|
#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
|
|
// Prints the document in |print_data| with settings specified in
|
|
@@ -234,9 +239,15 @@ class PrintViewManagerBase : public content::NotificationObserver,
|
|
// The current RFH that is printing with a system printing dialog.
|
|
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;
|
|
|
|
+ // Indication of whether the print job was manually cancelled
|
|
+ bool printing_cancelled_ = false;
|
|
+
|
|
// Set while running an inner message loop inside RenderAllMissingPagesNow().
|
|
// This means we are _blocking_ until all the necessary pages have been
|
|
// rendered or the print settings are being loaded.
|
|
diff --git a/components/printing/common/print.mojom b/components/printing/common/print.mojom
|
|
index 623659a3c78ce069cbcc83eeccfbc7265437ff01..f02cb6bced9f8382c84f560b5b40c9247db790ce 100644
|
|
--- a/components/printing/common/print.mojom
|
|
+++ b/components/printing/common/print.mojom
|
|
@@ -270,7 +270,7 @@ interface PrintPreviewUI {
|
|
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);
|
|
|
|
// Tells the RenderFrame to switch the CSS to print media type, render every
|
|
// requested page using the print preview document's frame/node, and then
|
|
diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc
|
|
index 868f1706b1b8db28b995cc2dc9fcfefec62b6574..9224b935815f28086ce4df05e3f4c81b6dd92e7f 100644
|
|
--- a/components/printing/renderer/print_render_frame_helper.cc
|
|
+++ b/components/printing/renderer/print_render_frame_helper.cc
|
|
@@ -38,6 +38,7 @@
|
|
#include "printing/metafile_skia.h"
|
|
#include "printing/mojom/print.mojom.h"
|
|
#include "printing/print_job_constants.h"
|
|
+#include "printing/print_settings.h"
|
|
#include "printing/units.h"
|
|
#include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
|
|
#include "third_party/blink/public/common/associated_interfaces/associated_interface_registry.h"
|
|
@@ -1218,7 +1219,8 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) {
|
|
if (!weak_this)
|
|
return;
|
|
|
|
- Print(web_frame, blink::WebNode(), PrintRequestType::kScripted);
|
|
+ Print(web_frame, blink::WebNode(), PrintRequestType::kScripted,
|
|
+ false /* silent */, base::DictionaryValue() /* new_settings */);
|
|
if (!weak_this)
|
|
return;
|
|
|
|
@@ -1249,7 +1251,7 @@ void PrintRenderFrameHelper::BindPrintRenderFrameReceiver(
|
|
receivers_.Add(this, std::move(receiver));
|
|
}
|
|
|
|
-void PrintRenderFrameHelper::PrintRequestedPages() {
|
|
+void PrintRenderFrameHelper::PrintRequestedPages(bool silent, base::Value settings) {
|
|
ScopedIPC scoped_ipc(weak_ptr_factory_.GetWeakPtr());
|
|
if (ipc_nesting_level_ > kAllowedIpcDepthForPrint)
|
|
return;
|
|
@@ -1264,7 +1266,7 @@ void PrintRenderFrameHelper::PrintRequestedPages() {
|
|
// 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_)
|
|
frame->DispatchAfterPrintEvent();
|
|
@@ -1295,7 +1297,8 @@ void PrintRenderFrameHelper::PrintForSystemDialog() {
|
|
}
|
|
|
|
Print(frame, print_preview_context_.source_node(),
|
|
- PrintRequestType::kRegular);
|
|
+ PrintRequestType::kRegular, false,
|
|
+ base::DictionaryValue());
|
|
if (!render_frame_gone_)
|
|
print_preview_context_.DispatchAfterPrintEvent();
|
|
// WARNING: |this| may be gone at this point. Do not do any more work here and
|
|
@@ -1342,6 +1345,8 @@ void PrintRenderFrameHelper::PrintPreview(base::Value settings) {
|
|
if (ipc_nesting_level_ > kAllowedIpcDepthForPrint)
|
|
return;
|
|
|
|
+ blink::WebLocalFrame* frame = render_frame()->GetWebFrame();
|
|
+ print_preview_context_.InitWithFrame(frame);
|
|
print_preview_context_.OnPrintPreview();
|
|
|
|
if (print_preview_context_.IsForArc()) {
|
|
@@ -1878,7 +1883,8 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
|
|
return;
|
|
|
|
Print(duplicate_node.GetDocument().GetFrame(), duplicate_node,
|
|
- PrintRequestType::kRegular);
|
|
+ PrintRequestType::kRegular, false /* silent */,
|
|
+ base::DictionaryValue() /* new_settings */);
|
|
// Check if |this| is still valid.
|
|
if (!weak_this)
|
|
return;
|
|
@@ -1893,7 +1899,9 @@ 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 settings) {
|
|
// If still not finished with earlier print request simply ignore.
|
|
if (prep_frame_view_)
|
|
return;
|
|
@@ -1901,7 +1909,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
|
|
FrameReference frame_ref(frame);
|
|
|
|
uint32_t expected_page_count = 0;
|
|
- if (!CalculateNumberOfPages(frame, node, &expected_page_count)) {
|
|
+ if (!CalculateNumberOfPages(frame, node, &expected_page_count, base::Value::AsDictionaryValue(settings))) {
|
|
DidFinishPrinting(FAIL_PRINT_INIT);
|
|
return; // Failed to init print page settings.
|
|
}
|
|
@@ -1920,8 +1928,41 @@ 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 = mojom::PrintParams::New(
|
|
+ print_pages_params_->params->page_size,
|
|
+ print_pages_params_->params->content_size,
|
|
+ print_pages_params_->params->printable_area,
|
|
+ print_pages_params_->params->margin_top,
|
|
+ print_pages_params_->params->margin_left,
|
|
+ print_pages_params_->params->page_orientation,
|
|
+ print_pages_params_->params->dpi,
|
|
+ print_pages_params_->params->scale_factor,
|
|
+ print_pages_params_->params->document_cookie,
|
|
+ print_pages_params_->params->selection_only,
|
|
+ print_pages_params_->params->supports_alpha_blend,
|
|
+ print_pages_params_->params->preview_ui_id,
|
|
+ print_pages_params_->params->preview_request_id,
|
|
+ print_pages_params_->params->is_first_request,
|
|
+ print_pages_params_->params->print_scaling_option,
|
|
+ print_pages_params_->params->print_to_pdf,
|
|
+ print_pages_params_->params->display_header_footer,
|
|
+ print_pages_params_->params->title,
|
|
+ print_pages_params_->params->url,
|
|
+ print_pages_params_->params->header_template,
|
|
+ print_pages_params_->params->footer_template,
|
|
+ print_pages_params_->params->rasterize_pdf,
|
|
+ print_pages_params_->params->should_print_backgrounds,
|
|
+ print_pages_params_->params->printed_doc_type,
|
|
+ print_pages_params_->params->prefer_css_page_size,
|
|
+ print_pages_params_->params->pages_per_sheet);
|
|
+ } else {
|
|
+ print_settings = GetPrintSettingsFromUser(
|
|
frame_ref.GetFrame(), node, expected_page_count, print_request_type);
|
|
+ }
|
|
// Check if |this| is still valid.
|
|
if (!self)
|
|
return;
|
|
@@ -2169,7 +2210,9 @@ void PrintRenderFrameHelper::IPCProcessed() {
|
|
}
|
|
}
|
|
|
|
-bool PrintRenderFrameHelper::InitPrintSettings(bool fit_to_paper_size) {
|
|
+bool PrintRenderFrameHelper::InitPrintSettings(
|
|
+ bool fit_to_paper_size,
|
|
+ const base::DictionaryValue& new_settings) {
|
|
mojom::PrintPagesParams settings;
|
|
settings.params = mojom::PrintParams::New();
|
|
GetPrintManagerHost()->GetDefaultPrintSettings(&settings.params);
|
|
@@ -2193,12 +2236,14 @@ bool PrintRenderFrameHelper::InitPrintSettings(bool fit_to_paper_size) {
|
|
return result;
|
|
}
|
|
|
|
-bool PrintRenderFrameHelper::CalculateNumberOfPages(blink::WebLocalFrame* frame,
|
|
- const blink::WebNode& node,
|
|
- uint32_t* number_of_pages) {
|
|
+bool PrintRenderFrameHelper::CalculateNumberOfPages(
|
|
+ blink::WebLocalFrame* frame,
|
|
+ const blink::WebNode& node,
|
|
+ uint32_t* number_of_pages,
|
|
+ const base::DictionaryValue& settings) {
|
|
DCHECK(frame);
|
|
bool fit_to_paper_size = !IsPrintingNodeOrPdfFrame(frame, node);
|
|
- if (!InitPrintSettings(fit_to_paper_size)) {
|
|
+ if (!InitPrintSettings(fit_to_paper_size, settings)) {
|
|
notify_browser_of_print_failure_ = false;
|
|
GetPrintManagerHost()->ShowInvalidPrinterSettingsError();
|
|
return false;
|
|
@@ -2569,18 +2614,7 @@ void PrintRenderFrameHelper::RequestPrintPreview(PrintPreviewRequestType type) {
|
|
}
|
|
|
|
bool PrintRenderFrameHelper::CheckForCancel() {
|
|
- const mojom::PrintParams& print_params = *print_pages_params_->params;
|
|
- bool cancel = false;
|
|
-
|
|
- if (!GetPrintManagerHost()->CheckForCancel(print_params.preview_ui_id,
|
|
- print_params.preview_request_id,
|
|
- &cancel)) {
|
|
- cancel = true;
|
|
- }
|
|
-
|
|
- if (cancel)
|
|
- notify_browser_of_print_failure_ = false;
|
|
- return cancel;
|
|
+ return false;
|
|
}
|
|
|
|
bool PrintRenderFrameHelper::PreviewPageRendered(
|
|
diff --git a/components/printing/renderer/print_render_frame_helper.h b/components/printing/renderer/print_render_frame_helper.h
|
|
index 90236920457c931c86426049c6cbc30b592b597f..353178863eba37b9112e784ffa4b3519076e91b9 100644
|
|
--- a/components/printing/renderer/print_render_frame_helper.h
|
|
+++ b/components/printing/renderer/print_render_frame_helper.h
|
|
@@ -256,7 +256,7 @@ class PrintRenderFrameHelper
|
|
mojo::PendingAssociatedReceiver<mojom::PrintRenderFrame> receiver);
|
|
|
|
// printing::mojom::PrintRenderFrame:
|
|
- void PrintRequestedPages() override;
|
|
+ void PrintRequestedPages(bool silent, base::Value settings) override;
|
|
#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
|
|
void PrintForSystemDialog() override;
|
|
void SetPrintPreviewUI(
|
|
@@ -323,7 +323,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 settings);
|
|
|
|
// Notification when printing is done - signal tear-down/free resources.
|
|
void DidFinishPrinting(PrintingResult result);
|
|
@@ -332,12 +334,14 @@ class PrintRenderFrameHelper
|
|
|
|
// Initialize print page settings with default settings.
|
|
// Used only for native printing workflow.
|
|
- bool InitPrintSettings(bool fit_to_paper_size);
|
|
+ bool InitPrintSettings(bool fit_to_paper_size,
|
|
+ const base::DictionaryValue& settings);
|
|
|
|
// Calculate number of pages in source document.
|
|
bool CalculateNumberOfPages(blink::WebLocalFrame* frame,
|
|
const blink::WebNode& node,
|
|
- uint32_t* number_of_pages);
|
|
+ uint32_t* number_of_pages,
|
|
+ const base::DictionaryValue& settings);
|
|
|
|
#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
|
|
// Set options for print preset from source PDF document.
|
|
diff --git a/printing/printing_context.cc b/printing/printing_context.cc
|
|
index 24cf547a45b76705ec4094bec219c53785781059..b81e7bcee4139dbfb4c5211f4164c53b864768bd 100644
|
|
--- a/printing/printing_context.cc
|
|
+++ b/printing/printing_context.cc
|
|
@@ -97,7 +97,6 @@ PrintingContext::Result PrintingContext::UsePdfSettings() {
|
|
|
|
PrintingContext::Result PrintingContext::UpdatePrintSettings(
|
|
base::Value job_settings) {
|
|
- ResetSettings();
|
|
{
|
|
std::unique_ptr<PrintSettings> settings =
|
|
PrintSettingsFromJobSettings(job_settings);
|
|
diff --git a/printing/printing_context.h b/printing/printing_context.h
|
|
index 5c300fa414fbb8688674aed114543e602cdb96db..ba6d0bbce4edcb1a6e05108e4e83fc6ba5894bb4 100644
|
|
--- a/printing/printing_context.h
|
|
+++ b/printing/printing_context.h
|
|
@@ -133,12 +133,12 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
|
|
|
|
int job_id() const { return job_id_; }
|
|
|
|
- protected:
|
|
- explicit PrintingContext(Delegate* delegate);
|
|
-
|
|
// Reinitializes the settings for object reuse.
|
|
void ResetSettings();
|
|
|
|
+ protected:
|
|
+ explicit PrintingContext(Delegate* delegate);
|
|
+
|
|
// Does bookkeeping when an error occurs.
|
|
PrintingContext::Result OnError();
|
|
|