2018-10-24 18:24:11 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Heilig Benedek <benecene@gmail.com>
|
|
|
|
Date: Thu, 18 Oct 2018 17:08:18 -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
|
|
|
|
|
2018-10-13 01:57:04 +00:00
|
|
|
diff --git a/chrome/browser/printing/print_job_worker.cc b/chrome/browser/printing/print_job_worker.cc
|
2019-02-14 16:34:15 +00:00
|
|
|
index 691c476708b6bcef9f231bc990b81dd06c4c0cc4..d124a4558affaf244ea82ab37f823db6e345d499 100644
|
2018-10-13 01:57:04 +00:00
|
|
|
--- a/chrome/browser/printing/print_job_worker.cc
|
|
|
|
+++ b/chrome/browser/printing/print_job_worker.cc
|
2019-01-12 01:00:43 +00:00
|
|
|
@@ -21,12 +21,12 @@
|
2018-10-13 01:57:04 +00:00
|
|
|
#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"
|
2019-01-12 01:00:43 +00:00
|
|
|
#include "content/public/browser/browser_task_traits.h"
|
2018-10-13 01:57:04 +00:00
|
|
|
#include "content/public/browser/browser_thread.h"
|
|
|
|
#include "content/public/browser/notification_service.h"
|
|
|
|
#include "content/public/browser/render_frame_host.h"
|
2019-01-12 01:00:43 +00:00
|
|
|
#include "content/public/browser/web_contents.h"
|
|
|
|
+#include "electron/grit/electron_resources.h"
|
|
|
|
#include "printing/print_job_constants.h"
|
|
|
|
#include "printing/printed_document.h"
|
|
|
|
#include "printing/printing_utils.h"
|
2018-10-13 01:57:04 +00:00
|
|
|
diff --git a/chrome/browser/printing/print_view_manager_base.cc b/chrome/browser/printing/print_view_manager_base.cc
|
2019-02-04 05:49:22 +00:00
|
|
|
index 007b003dd58d44acd6e1351c237fca6463d90602..4ddbf18e335609623aba42cc39a7c977fe8c5229 100644
|
2018-10-13 01:57:04 +00:00
|
|
|
--- a/chrome/browser/printing/print_view_manager_base.cc
|
|
|
|
+++ b/chrome/browser/printing/print_view_manager_base.cc
|
2018-11-09 03:42:34 +00:00
|
|
|
@@ -27,10 +27,7 @@
|
|
|
|
#include "chrome/browser/printing/print_view_manager_common.h"
|
|
|
|
#include "chrome/browser/printing/printer_query.h"
|
|
|
|
#include "chrome/browser/profiles/profile.h"
|
|
|
|
-#include "chrome/browser/ui/simple_message_box.h"
|
|
|
|
-#include "chrome/browser/ui/webui/print_preview/printer_handler.h"
|
2018-10-13 01:57:04 +00:00
|
|
|
#include "chrome/common/pref_names.h"
|
|
|
|
-#include "chrome/grit/generated_resources.h"
|
|
|
|
#include "components/prefs/pref_service.h"
|
|
|
|
#include "components/printing/browser/print_composite_client.h"
|
|
|
|
#include "components/printing/browser/print_manager_utils.h"
|
2018-11-09 03:42:34 +00:00
|
|
|
@@ -45,6 +42,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"
|
2018-11-09 07:16:43 +00:00
|
|
|
#include "printing/metafile_skia.h"
|
2019-02-04 05:49:22 +00:00
|
|
|
@@ -64,6 +62,8 @@ using PrintSettingsCallback =
|
2018-10-13 01:57:04 +00:00
|
|
|
base::OnceCallback<void(scoped_refptr<PrinterQuery>)>;
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2018-10-13 01:57:04 +00:00
|
|
|
void ShowWarningMessageBox(const base::string16& 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)
|
2019-02-04 05:49:22 +00:00
|
|
|
@@ -72,6 +72,7 @@ void ShowWarningMessageBox(const base::string16& message) {
|
2018-10-13 01:57:04 +00:00
|
|
|
base::AutoReset<bool> auto_reset(&is_dialog_shown, true);
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2018-10-13 01:57:04 +00:00
|
|
|
chrome::ShowWarningMessageBox(nullptr, base::string16(), message);
|
|
|
|
+#endif
|
|
|
|
}
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2018-10-13 01:57:04 +00:00
|
|
|
#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
|
2019-01-24 09:42:21 +00:00
|
|
|
@@ -109,12 +110,14 @@ PrintViewManagerBase::PrintViewManagerBase(content::WebContents* web_contents)
|
2018-10-13 01:57:04 +00:00
|
|
|
queue_(g_browser_process->print_job_manager()->queue()),
|
|
|
|
weak_ptr_factory_(this) {
|
|
|
|
DCHECK(queue_);
|
|
|
|
+#if 0
|
|
|
|
Profile* profile =
|
|
|
|
Profile::FromBrowserContext(web_contents->GetBrowserContext());
|
|
|
|
printing_enabled_.Init(
|
|
|
|
prefs::kPrintingEnabled, profile->GetPrefs(),
|
|
|
|
base::Bind(&PrintViewManagerBase::UpdatePrintingEnabled,
|
|
|
|
weak_ptr_factory_.GetWeakPtr()));
|
|
|
|
+#endif
|
|
|
|
}
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2018-10-13 01:57:04 +00:00
|
|
|
PrintViewManagerBase::~PrintViewManagerBase() {
|
2019-01-24 09:42:21 +00:00
|
|
|
@@ -122,12 +125,14 @@ PrintViewManagerBase::~PrintViewManagerBase() {
|
2018-10-13 01:57:04 +00:00
|
|
|
DisconnectFromCurrentPrintJob();
|
|
|
|
}
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2018-10-13 01:57:04 +00:00
|
|
|
-bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh) {
|
|
|
|
+bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh,
|
2018-11-09 03:42:34 +00:00
|
|
|
+ std::unique_ptr<IPC::Message> message,
|
|
|
|
+ CompletionCallback callback) {
|
2018-10-13 01:57:04 +00:00
|
|
|
DisconnectFromCurrentPrintJob();
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2018-10-13 01:57:04 +00:00
|
|
|
SetPrintingRFH(rfh);
|
2018-11-09 03:42:34 +00:00
|
|
|
- int32_t id = rfh->GetRoutingID();
|
2018-10-13 01:57:04 +00:00
|
|
|
- return PrintNowInternal(rfh, std::make_unique<PrintMsg_PrintPages>(id));
|
2018-11-09 03:42:34 +00:00
|
|
|
+ callback_ = std::move(callback);
|
|
|
|
+ return PrintNowInternal(rfh, std::move(message));
|
2018-10-13 01:57:04 +00:00
|
|
|
}
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2018-10-13 01:57:04 +00:00
|
|
|
#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
|
2019-01-24 09:42:21 +00:00
|
|
|
@@ -242,9 +247,9 @@ void PrintViewManagerBase::StartLocalPrintJob(
|
2018-11-09 03:42:34 +00:00
|
|
|
void PrintViewManagerBase::UpdatePrintingEnabled() {
|
|
|
|
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
2018-10-13 01:57:04 +00:00
|
|
|
// The Unretained() is safe because ForEachFrame() is synchronous.
|
2018-11-09 03:42:34 +00:00
|
|
|
- web_contents()->ForEachFrame(base::BindRepeating(
|
|
|
|
- &PrintViewManagerBase::SendPrintingEnabled, base::Unretained(this),
|
2018-10-13 01:57:04 +00:00
|
|
|
- printing_enabled_.GetValue()));
|
2018-11-09 03:42:34 +00:00
|
|
|
+ web_contents()->ForEachFrame(
|
|
|
|
+ base::BindRepeating(&PrintViewManagerBase::SendPrintingEnabled,
|
|
|
|
+ base::Unretained(this), true));
|
2018-10-13 01:57:04 +00:00
|
|
|
}
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2018-10-13 01:57:04 +00:00
|
|
|
void PrintViewManagerBase::NavigationStopped() {
|
2019-01-24 09:42:21 +00:00
|
|
|
@@ -336,7 +341,7 @@ void PrintViewManagerBase::OnPrintingFailed(int cookie) {
|
2018-10-13 01:57:04 +00:00
|
|
|
PrintManager::OnPrintingFailed(cookie);
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2018-10-13 01:57:04 +00:00
|
|
|
#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
|
2018-11-09 03:42:34 +00:00
|
|
|
- ShowPrintErrorDialog();
|
|
|
|
+ // ShowPrintErrorDialog();
|
2018-10-13 01:57:04 +00:00
|
|
|
#endif
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2018-10-13 01:57:04 +00:00
|
|
|
ReleasePrinterQuery();
|
2019-02-04 05:49:22 +00:00
|
|
|
@@ -594,6 +599,9 @@ void PrintViewManagerBase::ReleasePrintJob() {
|
2018-10-13 01:57:04 +00:00
|
|
|
content::RenderFrameHost* rfh = printing_rfh_;
|
|
|
|
printing_rfh_ = nullptr;
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2018-11-09 03:42:34 +00:00
|
|
|
+ if (!callback_.is_null())
|
|
|
|
+ std::move(callback_).Run(printing_succeeded_);
|
2018-10-13 01:57:04 +00:00
|
|
|
+
|
|
|
|
if (!print_job_)
|
|
|
|
return;
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2018-10-13 01:57:04 +00:00
|
|
|
diff --git a/chrome/browser/printing/print_view_manager_base.h b/chrome/browser/printing/print_view_manager_base.h
|
2019-01-24 09:42:21 +00:00
|
|
|
index a2569836d04ff968e690215f56f6de3b6d884874..6ddec22641b74d5484c2e0d4f62e5d71d8d783e9 100644
|
2018-10-13 01:57:04 +00:00
|
|
|
--- a/chrome/browser/printing/print_view_manager_base.h
|
|
|
|
+++ b/chrome/browser/printing/print_view_manager_base.h
|
2018-11-09 07:16:43 +00:00
|
|
|
@@ -39,6 +39,8 @@ class PrintJob;
|
2018-11-09 03:42:34 +00:00
|
|
|
class PrintQueriesQueue;
|
|
|
|
class PrinterQuery;
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2018-11-09 03:42:34 +00:00
|
|
|
+using CompletionCallback = base::OnceCallback<void(bool)>;
|
|
|
|
+
|
|
|
|
// Base class for managing the print commands for a WebContents.
|
|
|
|
class PrintViewManagerBase : public content::NotificationObserver,
|
|
|
|
public PrintManager {
|
2018-11-09 07:16:43 +00:00
|
|
|
@@ -48,7 +50,9 @@ class PrintViewManagerBase : public content::NotificationObserver,
|
2018-10-13 01:57:04 +00:00
|
|
|
// Prints the current document immediately. Since the rendering is
|
|
|
|
// asynchronous, the actual printing will not be completed on the return of
|
|
|
|
// this function. Returns false if printing is impossible at the moment.
|
|
|
|
- virtual bool PrintNow(content::RenderFrameHost* rfh);
|
|
|
|
+ virtual bool PrintNow(content::RenderFrameHost* rfh,
|
2018-11-09 03:42:34 +00:00
|
|
|
+ std::unique_ptr<IPC::Message> message,
|
|
|
|
+ CompletionCallback callback);
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2018-10-13 01:57:04 +00:00
|
|
|
#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
|
|
|
|
// Prints the document in |print_data| with settings specified in
|
2019-01-24 09:42:21 +00:00
|
|
|
@@ -197,6 +201,9 @@ class PrintViewManagerBase : public content::NotificationObserver,
|
2018-11-09 03:42:34 +00:00
|
|
|
// The current RFH that is printing with a system printing dialog.
|
|
|
|
content::RenderFrameHost* printing_rfh_;
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2018-11-09 03:42:34 +00:00
|
|
|
+ // Responded with success of the print job.
|
|
|
|
+ CompletionCallback callback_;
|
2018-10-13 01:57:04 +00:00
|
|
|
+
|
2018-11-09 03:42:34 +00:00
|
|
|
// Indication of success of the print job.
|
|
|
|
bool printing_succeeded_;
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2018-10-13 01:57:04 +00:00
|
|
|
diff --git a/chrome/browser/printing/printing_message_filter.cc b/chrome/browser/printing/printing_message_filter.cc
|
2019-03-06 17:50:12 +00:00
|
|
|
index 3f6007d5c09ee9fdab534356d38d1e06e4573794..5ebb5e5255fefd2e8e611144a0745e92e069ea62 100644
|
2018-10-13 01:57:04 +00:00
|
|
|
--- a/chrome/browser/printing/printing_message_filter.cc
|
|
|
|
+++ b/chrome/browser/printing/printing_message_filter.cc
|
2019-01-12 01:00:43 +00:00
|
|
|
@@ -22,6 +22,7 @@
|
2019-03-06 17:50:12 +00:00
|
|
|
#include "components/keyed_service/content/browser_context_keyed_service_shutdown_notifier_factory.h"
|
2018-11-09 03:42:34 +00:00
|
|
|
#include "components/printing/browser/print_manager_utils.h"
|
|
|
|
#include "components/printing/common/print_messages.h"
|
|
|
|
+#include "content/public/browser/browser_context.h"
|
2019-03-06 17:50:12 +00:00
|
|
|
#include "content/public/browser/browser_task_traits.h"
|
2018-11-09 03:42:34 +00:00
|
|
|
#include "content/public/browser/render_frame_host.h"
|
|
|
|
#include "content/public/browser/web_contents.h"
|
2019-03-06 17:50:12 +00:00
|
|
|
@@ -95,20 +96,23 @@ void PrintingMessageFilter::SetTestUpdatePrintSettingsReply(
|
|
|
|
test_params = print_params;
|
|
|
|
}
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2018-10-13 01:57:04 +00:00
|
|
|
-PrintingMessageFilter::PrintingMessageFilter(int render_process_id,
|
|
|
|
- Profile* profile)
|
2018-11-09 03:42:34 +00:00
|
|
|
+PrintingMessageFilter::PrintingMessageFilter(
|
|
|
|
+ int render_process_id,
|
|
|
|
+ content::BrowserContext* browser_context)
|
2018-10-13 01:57:04 +00:00
|
|
|
: BrowserMessageFilter(PrintMsgStart),
|
|
|
|
render_process_id_(render_process_id),
|
|
|
|
queue_(g_browser_process->print_job_manager()->queue()) {
|
|
|
|
DCHECK(queue_.get());
|
|
|
|
printing_shutdown_notifier_ =
|
|
|
|
PrintingMessageFilterShutdownNotifierFactory::GetInstance()
|
2018-11-09 03:42:34 +00:00
|
|
|
- ->Get(profile)
|
|
|
|
+ ->Get(browser_context)
|
|
|
|
->Subscribe(base::Bind(&PrintingMessageFilter::ShutdownOnUIThread,
|
|
|
|
base::Unretained(this)));
|
|
|
|
+#if 0
|
2018-10-13 01:57:04 +00:00
|
|
|
is_printing_enabled_.Init(prefs::kPrintingEnabled, profile->GetPrefs());
|
|
|
|
is_printing_enabled_.MoveToThread(
|
2019-01-12 01:00:43 +00:00
|
|
|
base::CreateSingleThreadTaskRunnerWithTraits({BrowserThread::IO}));
|
2018-10-13 01:57:04 +00:00
|
|
|
+#endif
|
|
|
|
}
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2018-10-13 01:57:04 +00:00
|
|
|
PrintingMessageFilter::~PrintingMessageFilter() {
|
2019-03-06 17:50:12 +00:00
|
|
|
@@ -144,11 +148,13 @@ bool PrintingMessageFilter::OnMessageReceived(const IPC::Message& message) {
|
2018-10-13 01:57:04 +00:00
|
|
|
void PrintingMessageFilter::OnGetDefaultPrintSettings(IPC::Message* reply_msg) {
|
|
|
|
DCHECK_CURRENTLY_ON(BrowserThread::IO);
|
|
|
|
scoped_refptr<PrinterQuery> printer_query;
|
2018-11-09 03:42:34 +00:00
|
|
|
+#if 0
|
|
|
|
if (!is_printing_enabled_.GetValue()) {
|
2018-10-13 01:57:04 +00:00
|
|
|
// Reply with NULL query.
|
|
|
|
OnGetDefaultPrintSettingsReply(printer_query, reply_msg);
|
|
|
|
return;
|
2018-11-09 03:42:34 +00:00
|
|
|
}
|
|
|
|
+#endif
|
|
|
|
printer_query = queue_->PopPrinterQuery(0);
|
|
|
|
if (!printer_query.get()) {
|
|
|
|
printer_query =
|
2019-03-06 17:50:12 +00:00
|
|
|
@@ -234,11 +240,13 @@ void PrintingMessageFilter::OnUpdatePrintSettings(int document_cookie,
|
2019-01-24 09:42:21 +00:00
|
|
|
base::Value job_settings,
|
|
|
|
IPC::Message* reply_msg) {
|
2018-10-13 01:57:04 +00:00
|
|
|
scoped_refptr<PrinterQuery> printer_query;
|
2018-11-09 03:42:34 +00:00
|
|
|
+#if 0
|
|
|
|
if (!is_printing_enabled_.GetValue()) {
|
2018-10-13 01:57:04 +00:00
|
|
|
// Reply with NULL query.
|
|
|
|
OnUpdatePrintSettingsReply(printer_query, reply_msg);
|
|
|
|
return;
|
|
|
|
}
|
2018-11-09 03:42:34 +00:00
|
|
|
+#endif
|
|
|
|
printer_query = queue_->PopPrinterQuery(document_cookie);
|
|
|
|
if (!printer_query.get()) {
|
|
|
|
printer_query = queue_->CreatePrinterQuery(
|
2019-03-06 17:50:12 +00:00
|
|
|
@@ -302,7 +310,7 @@ void PrintingMessageFilter::OnUpdatePrintSettingsReply(
|
2018-10-13 01:57:04 +00:00
|
|
|
#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
|
|
|
|
void PrintingMessageFilter::OnCheckForCancel(const PrintHostMsg_PreviewIds& ids,
|
|
|
|
bool* cancel) {
|
2018-11-09 07:16:43 +00:00
|
|
|
- *cancel = PrintPreviewUI::ShouldCancelRequest(ids);
|
|
|
|
+ *cancel = false;
|
2018-10-13 01:57:04 +00:00
|
|
|
}
|
|
|
|
#endif
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2018-10-13 01:57:04 +00:00
|
|
|
diff --git a/chrome/browser/printing/printing_message_filter.h b/chrome/browser/printing/printing_message_filter.h
|
2019-03-06 17:50:12 +00:00
|
|
|
index 4607c9af91bb604bb4753eb54c2013e58698ff30..58cbf62a1bc1e18327e987cd55524848d2eca05e 100644
|
2018-10-13 01:57:04 +00:00
|
|
|
--- a/chrome/browser/printing/printing_message_filter.h
|
|
|
|
+++ b/chrome/browser/printing/printing_message_filter.h
|
2019-03-06 17:50:12 +00:00
|
|
|
@@ -24,6 +24,10 @@ struct PrintHostMsg_ScriptedPrint_Params;
|
|
|
|
struct PrintMsg_Print_Params;
|
2019-02-04 05:49:22 +00:00
|
|
|
class Profile;
|
2018-11-09 03:42:34 +00:00
|
|
|
|
2018-11-09 07:16:43 +00:00
|
|
|
+namespace content {
|
|
|
|
+class BrowserContext;
|
|
|
|
+}
|
|
|
|
+
|
2018-11-09 03:42:34 +00:00
|
|
|
namespace printing {
|
2018-11-09 07:16:43 +00:00
|
|
|
|
|
|
|
class PrintQueriesQueue;
|
2019-03-06 17:50:12 +00:00
|
|
|
@@ -37,7 +41,8 @@ class PrintingMessageFilter : public content::BrowserMessageFilter {
|
|
|
|
static void SetTestUpdatePrintSettingsReply(
|
|
|
|
const PrintMsg_Print_Params& print_params);
|
|
|
|
|
2018-10-13 01:57:04 +00:00
|
|
|
- PrintingMessageFilter(int render_process_id, Profile* profile);
|
2018-11-09 03:42:34 +00:00
|
|
|
+ PrintingMessageFilter(int render_process_id,
|
|
|
|
+ content::BrowserContext* browser_context);
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2019-02-04 05:49:22 +00:00
|
|
|
// content::BrowserMessageFilter:
|
|
|
|
bool OnMessageReceived(const IPC::Message& message) override;
|
2018-10-13 01:57:04 +00:00
|
|
|
diff --git a/components/printing/common/print_messages.h b/components/printing/common/print_messages.h
|
2019-02-04 05:49:22 +00:00
|
|
|
index 1802034a6e15a6ad8b0d9591cfb79ba5873dc982..a827091facdb4f6b1d74ce826c3492ced27c008e 100644
|
2018-10-13 01:57:04 +00:00
|
|
|
--- a/components/printing/common/print_messages.h
|
|
|
|
+++ b/components/printing/common/print_messages.h
|
2019-01-12 01:00:43 +00:00
|
|
|
@@ -368,7 +368,10 @@ IPC_MESSAGE_ROUTED0(PrintMsg_PrintNodeUnderContextMenu)
|
2018-10-13 01:57:04 +00:00
|
|
|
#if BUILDFLAG(ENABLE_PRINTING)
|
|
|
|
// Tells the RenderFrame to switch the CSS to print media type, renders every
|
|
|
|
// requested pages and switch back the CSS to display media type.
|
|
|
|
-IPC_MESSAGE_ROUTED0(PrintMsg_PrintPages)
|
|
|
|
+IPC_MESSAGE_ROUTED3(PrintMsg_PrintPages,
|
|
|
|
+ bool /* silent print */,
|
|
|
|
+ bool /* print page's background */,
|
2018-11-09 03:42:34 +00:00
|
|
|
+ base::DictionaryValue /* settings */)
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2018-10-13 01:57:04 +00:00
|
|
|
// Like PrintMsg_PrintPages, but using the print preview document's frame/node.
|
|
|
|
IPC_MESSAGE_ROUTED0(PrintMsg_PrintForSystemDialog)
|
|
|
|
diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc
|
2019-03-21 22:45:52 +00:00
|
|
|
index 222db5c6b09900001fa835c6dcbd0b200b467a0a..dd85f247d6267aa97fced685991cd2efa617638c 100644
|
2018-10-13 01:57:04 +00:00
|
|
|
--- a/components/printing/renderer/print_render_frame_helper.cc
|
|
|
|
+++ b/components/printing/renderer/print_render_frame_helper.cc
|
2019-03-21 22:45:52 +00:00
|
|
|
@@ -1109,7 +1109,9 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) {
|
2018-11-09 03:42:34 +00:00
|
|
|
web_frame->DispatchBeforePrintEvent();
|
|
|
|
if (!weak_this)
|
|
|
|
return;
|
2019-01-08 23:59:47 +00:00
|
|
|
- Print(web_frame, blink::WebNode(), PrintRequestType::kScripted);
|
|
|
|
+ Print(web_frame, blink::WebNode(), PrintRequestType::kScripted,
|
2018-11-09 03:42:34 +00:00
|
|
|
+ false /* silent */, false /* print_background */,
|
|
|
|
+ base::DictionaryValue() /* new_settings */);
|
|
|
|
if (weak_this)
|
|
|
|
web_frame->DispatchAfterPrintEvent();
|
|
|
|
}
|
2019-03-21 22:45:52 +00:00
|
|
|
@@ -1157,7 +1159,10 @@ void PrintRenderFrameHelper::OnDestruct() {
|
2018-10-13 01:57:04 +00:00
|
|
|
delete this;
|
|
|
|
}
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2018-10-13 01:57:04 +00:00
|
|
|
-void PrintRenderFrameHelper::OnPrintPages() {
|
2018-11-09 03:42:34 +00:00
|
|
|
+void PrintRenderFrameHelper::OnPrintPages(
|
|
|
|
+ bool silent,
|
|
|
|
+ bool print_background,
|
|
|
|
+ const base::DictionaryValue& settings) {
|
2018-10-13 01:57:04 +00:00
|
|
|
if (ipc_nesting_level_ > 1)
|
|
|
|
return;
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2019-03-21 22:45:52 +00:00
|
|
|
@@ -1170,7 +1175,8 @@ void PrintRenderFrameHelper::OnPrintPages() {
|
2018-10-13 01:57:04 +00:00
|
|
|
// If we are printing a PDF extension frame, find the plugin node and print
|
|
|
|
// that instead.
|
|
|
|
auto plugin = delegate_->GetPdfElement(frame);
|
2019-01-08 23:59:47 +00:00
|
|
|
- Print(frame, plugin, PrintRequestType::kRegular);
|
|
|
|
+ Print(frame, plugin, PrintRequestType::kRegular,
|
2018-11-09 07:16:43 +00:00
|
|
|
+ silent, print_background, settings);
|
2018-10-13 01:57:04 +00:00
|
|
|
if (weak_this)
|
|
|
|
frame->DispatchAfterPrintEvent();
|
|
|
|
// WARNING: |this| may be gone at this point. Do not do any more work here and
|
2019-03-21 22:45:52 +00:00
|
|
|
@@ -1187,7 +1193,7 @@ void PrintRenderFrameHelper::OnPrintForSystemDialog() {
|
2018-11-09 03:42:34 +00:00
|
|
|
}
|
|
|
|
auto weak_this = weak_ptr_factory_.GetWeakPtr();
|
2019-01-08 23:59:47 +00:00
|
|
|
Print(frame, print_preview_context_.source_node(),
|
|
|
|
- PrintRequestType::kRegular);
|
|
|
|
+ PrintRequestType::kRegular, false, false, base::DictionaryValue());
|
2018-11-09 03:42:34 +00:00
|
|
|
if (weak_this)
|
|
|
|
frame->DispatchAfterPrintEvent();
|
|
|
|
// WARNING: |this| may be gone at this point. Do not do any more work here and
|
2019-03-21 22:45:52 +00:00
|
|
|
@@ -1223,6 +1229,8 @@ void PrintRenderFrameHelper::OnPrintPreview(
|
2018-10-13 01:57:04 +00:00
|
|
|
if (ipc_nesting_level_ > 1)
|
|
|
|
return;
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2018-10-13 01:57:04 +00:00
|
|
|
+ blink::WebLocalFrame* frame = render_frame()->GetWebFrame();
|
|
|
|
+ print_preview_context_.InitWithFrame(frame);
|
|
|
|
print_preview_context_.OnPrintPreview();
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2018-10-13 01:57:04 +00:00
|
|
|
UMA_HISTOGRAM_ENUMERATION("PrintPreview.PreviewEvent",
|
2019-03-21 22:45:52 +00:00
|
|
|
@@ -1616,7 +1624,10 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
|
2018-11-09 03:42:34 +00:00
|
|
|
|
|
|
|
auto self = weak_ptr_factory_.GetWeakPtr();
|
|
|
|
Print(duplicate_node.GetDocument().GetFrame(), duplicate_node,
|
2019-01-08 23:59:47 +00:00
|
|
|
- PrintRequestType::kRegular);
|
|
|
|
+ PrintRequestType::kRegular,
|
|
|
|
+ false /* silent */,
|
2018-11-09 03:42:34 +00:00
|
|
|
+ false /* print_background */,
|
|
|
|
+ base::DictionaryValue() /* new_settings */);
|
|
|
|
// Check if |this| is still valid.
|
|
|
|
if (!self)
|
|
|
|
return;
|
2019-03-21 22:45:52 +00:00
|
|
|
@@ -1627,7 +1638,10 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2018-10-13 01:57:04 +00:00
|
|
|
void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
|
|
|
|
const blink::WebNode& node,
|
2019-01-08 23:59:47 +00:00
|
|
|
- PrintRequestType print_request_type) {
|
|
|
|
+ PrintRequestType print_request_type,
|
2018-10-13 01:57:04 +00:00
|
|
|
+ bool silent,
|
|
|
|
+ bool print_background,
|
2018-11-09 03:42:34 +00:00
|
|
|
+ const base::DictionaryValue& settings) {
|
2018-10-13 01:57:04 +00:00
|
|
|
// If still not finished with earlier print request simply ignore.
|
|
|
|
if (prep_frame_view_)
|
|
|
|
return;
|
2019-03-21 22:45:52 +00:00
|
|
|
@@ -1635,7 +1649,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
|
2019-02-26 21:35:27 +00:00
|
|
|
FrameReference frame_ref(frame);
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2018-10-13 01:57:04 +00:00
|
|
|
int expected_page_count = 0;
|
|
|
|
- if (!CalculateNumberOfPages(frame, node, &expected_page_count)) {
|
2018-11-09 03:42:34 +00:00
|
|
|
+ if (!CalculateNumberOfPages(frame, node, &expected_page_count, settings)) {
|
2018-10-13 01:57:04 +00:00
|
|
|
DidFinishPrinting(FAIL_PRINT_INIT);
|
|
|
|
return; // Failed to init print page settings.
|
|
|
|
}
|
2019-03-21 22:45:52 +00:00
|
|
|
@@ -1655,8 +1669,9 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2018-10-13 01:57:04 +00:00
|
|
|
PrintMsg_PrintPages_Params print_settings;
|
|
|
|
auto self = weak_ptr_factory_.GetWeakPtr();
|
|
|
|
- GetPrintSettingsFromUser(frame_ref.GetFrame(), node, expected_page_count,
|
2019-01-08 23:59:47 +00:00
|
|
|
- print_request_type, &print_settings);
|
2018-10-13 01:57:04 +00:00
|
|
|
+ if (!silent)
|
|
|
|
+ GetPrintSettingsFromUser(frame_ref.GetFrame(), node, expected_page_count,
|
2019-01-08 23:59:47 +00:00
|
|
|
+ print_request_type, &print_settings);
|
2018-10-13 01:57:04 +00:00
|
|
|
// Check if |this| is still valid.
|
|
|
|
if (!self)
|
|
|
|
return;
|
2019-03-21 22:45:52 +00:00
|
|
|
@@ -1666,6 +1681,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
|
2018-10-13 01:57:04 +00:00
|
|
|
? blink::kWebPrintScalingOptionSourceSize
|
|
|
|
: scaling_option;
|
|
|
|
SetPrintPagesParams(print_settings);
|
|
|
|
+ print_settings.params.should_print_backgrounds = print_background;
|
|
|
|
if (print_settings.params.dpi.IsEmpty() ||
|
|
|
|
!print_settings.params.document_cookie) {
|
|
|
|
DidFinishPrinting(OK); // Release resources and fail silently on failure.
|
2019-03-21 22:45:52 +00:00
|
|
|
@@ -1854,10 +1870,24 @@ std::vector<int> PrintRenderFrameHelper::GetPrintedPages(
|
2018-10-13 01:57:04 +00:00
|
|
|
return printed_pages;
|
|
|
|
}
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2018-10-13 01:57:04 +00:00
|
|
|
-bool PrintRenderFrameHelper::InitPrintSettings(bool fit_to_paper_size) {
|
|
|
|
+bool PrintRenderFrameHelper::InitPrintSettings(
|
|
|
|
+ bool fit_to_paper_size,
|
2018-11-09 03:42:34 +00:00
|
|
|
+ const base::DictionaryValue& new_settings) {
|
2018-10-13 01:57:04 +00:00
|
|
|
PrintMsg_PrintPages_Params settings;
|
2018-11-09 03:42:34 +00:00
|
|
|
- Send(new PrintHostMsg_GetDefaultPrintSettings(routing_id(),
|
|
|
|
- &settings.params));
|
|
|
|
+ if (new_settings.empty()) {
|
|
|
|
+ Send(new PrintHostMsg_GetDefaultPrintSettings(routing_id(),
|
|
|
|
+ &settings.params));
|
2018-10-13 01:57:04 +00:00
|
|
|
+ } else {
|
2018-11-09 03:42:34 +00:00
|
|
|
+ // Send the cookie so that UpdatePrintSettings can reuse PrinterQuery when
|
|
|
|
+ // possible.
|
|
|
|
+ int cookie =
|
|
|
|
+ print_pages_params_ ? print_pages_params_->params.document_cookie : 0;
|
|
|
|
+ bool canceled = false;
|
|
|
|
+ Send(new PrintHostMsg_UpdatePrintSettings(
|
|
|
|
+ routing_id(), cookie, new_settings, &settings, &canceled));
|
|
|
|
+ if (canceled)
|
|
|
|
+ return false;
|
2018-10-13 01:57:04 +00:00
|
|
|
+ }
|
|
|
|
// Check if the printer returned any settings, if the settings is empty, we
|
|
|
|
// can safely assume there are no printer drivers configured. So we safely
|
|
|
|
// terminate.
|
2019-03-21 22:45:52 +00:00
|
|
|
@@ -1877,12 +1907,14 @@ bool PrintRenderFrameHelper::InitPrintSettings(bool fit_to_paper_size) {
|
2018-11-09 03:42:34 +00:00
|
|
|
return result;
|
|
|
|
}
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2018-11-09 03:42:34 +00:00
|
|
|
-bool PrintRenderFrameHelper::CalculateNumberOfPages(blink::WebLocalFrame* frame,
|
|
|
|
- const blink::WebNode& node,
|
2018-10-13 01:57:04 +00:00
|
|
|
- int* number_of_pages) {
|
2018-11-09 03:42:34 +00:00
|
|
|
+bool PrintRenderFrameHelper::CalculateNumberOfPages(
|
|
|
|
+ blink::WebLocalFrame* frame,
|
|
|
|
+ const blink::WebNode& node,
|
|
|
|
+ int* number_of_pages,
|
|
|
|
+ const base::DictionaryValue& settings) {
|
2018-10-13 01:57:04 +00:00
|
|
|
DCHECK(frame);
|
2019-01-16 18:07:52 +00:00
|
|
|
bool fit_to_paper_size = !IsPrintingNodeOrPdfFrame(frame, node);
|
2018-10-13 01:57:04 +00:00
|
|
|
- if (!InitPrintSettings(fit_to_paper_size)) {
|
2018-11-09 03:42:34 +00:00
|
|
|
+ if (!InitPrintSettings(fit_to_paper_size, settings)) {
|
2018-10-13 01:57:04 +00:00
|
|
|
notify_browser_of_print_failure_ = false;
|
|
|
|
Send(new PrintHostMsg_ShowInvalidPrinterSettingsError(routing_id()));
|
|
|
|
return false;
|
|
|
|
diff --git a/components/printing/renderer/print_render_frame_helper.h b/components/printing/renderer/print_render_frame_helper.h
|
2019-02-26 21:31:29 +00:00
|
|
|
index c4effb05d16cd67acf3d8140d25eb33fb4814dc3..0660062708438a2de7132b1a39dcbac85f8b8cbf 100644
|
2018-10-13 01:57:04 +00:00
|
|
|
--- a/components/printing/renderer/print_render_frame_helper.h
|
|
|
|
+++ b/components/printing/renderer/print_render_frame_helper.h
|
2019-02-26 21:31:29 +00:00
|
|
|
@@ -193,7 +193,9 @@ class PrintRenderFrameHelper
|
2018-10-13 01:57:04 +00:00
|
|
|
bool OnMessageReceived(const IPC::Message& message) override;
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2018-10-13 01:57:04 +00:00
|
|
|
// Message handlers ---------------------------------------------------------
|
|
|
|
- void OnPrintPages();
|
|
|
|
+ void OnPrintPages(bool silent,
|
|
|
|
+ bool print_background,
|
2018-11-09 03:42:34 +00:00
|
|
|
+ const base::DictionaryValue& settings);
|
2018-10-13 01:57:04 +00:00
|
|
|
void OnPrintForSystemDialog();
|
|
|
|
#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
|
|
|
|
void OnInitiatePrintPreview(bool has_selection);
|
2019-02-26 21:31:29 +00:00
|
|
|
@@ -244,7 +246,10 @@ class PrintRenderFrameHelper
|
2018-10-13 01:57:04 +00:00
|
|
|
// WARNING: |this| may be gone after this method returns.
|
|
|
|
void Print(blink::WebLocalFrame* frame,
|
|
|
|
const blink::WebNode& node,
|
2019-01-08 23:59:47 +00:00
|
|
|
- PrintRequestType print_request_type);
|
|
|
|
+ PrintRequestType print_request_type,
|
2018-11-09 03:42:34 +00:00
|
|
|
+ bool silent,
|
|
|
|
+ bool print_background,
|
|
|
|
+ const base::DictionaryValue& settings);
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2018-10-13 01:57:04 +00:00
|
|
|
// Notification when printing is done - signal tear-down/free resources.
|
|
|
|
void DidFinishPrinting(PrintingResult result);
|
2019-02-26 21:31:29 +00:00
|
|
|
@@ -253,12 +258,14 @@ class PrintRenderFrameHelper
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2018-10-13 01:57:04 +00:00
|
|
|
// Initialize print page settings with default settings.
|
|
|
|
// Used only for native printing workflow.
|
|
|
|
- bool InitPrintSettings(bool fit_to_paper_size);
|
|
|
|
+ bool InitPrintSettings(bool fit_to_paper_size,
|
2018-11-09 03:42:34 +00:00
|
|
|
+ const base::DictionaryValue& settings);
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2018-10-13 01:57:04 +00:00
|
|
|
// Calculate number of pages in source document.
|
2018-11-09 03:42:34 +00:00
|
|
|
bool CalculateNumberOfPages(blink::WebLocalFrame* frame,
|
|
|
|
const blink::WebNode& node,
|
2018-10-13 01:57:04 +00:00
|
|
|
- int* number_of_pages);
|
2018-11-09 03:42:34 +00:00
|
|
|
+ int* number_of_pages,
|
|
|
|
+ const base::DictionaryValue& settings);
|
2018-10-24 18:24:11 +00:00
|
|
|
|
2018-10-13 01:57:04 +00:00
|
|
|
#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
|
|
|
|
// Set options for print preset from source PDF document.
|