dc72f74020
* chore: bump chromium in DEPS to 5ce64b91b4d6a78c97480059f15ff6469fc0918e * chore: bump chromium in DEPS to e74c73d0000f81b3f40a513176c8d024bba57d28 * chore: bump chromium in DEPS to 501640e650d4657ba63db65fa257e4a899168de7 * chore: bump chromium in DEPS to 00db20e1bc3d77706723a87ada3c1c647a1c37b7 * chore: update patches * refactor: AddNewContents now takes a target_url Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2167732 * chore: SetHostCleanupFinalizationGroupCallback has been removed from V8 * refactor: use WebInputEvent::Namespace types directly Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2160523 * refactor: FollowRedirect takes in cors exempt headers now Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2129787 * refactor: printing::DuplexMode moved to mojo Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2162388 * refactor: use MessagePortDescriptor instead of raw mojo::MessagePipeHandles Refs: https://chromium-review.googlesource.com/c/chromium/src/+/1952124 * chore: update patches * chore: bump chromium in DEPS to f1537676d613f3567cfb43adf577b3847fba4bc3 * chore: update patches * refactor: service_manager::BinderMapWithContext merged into mojo::BinderMap Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2174654 * chore: unused argument removed from ReadAvailableTypes in ui::Clipboard Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2173666 * chore: bump chromium in DEPS to 949888433ab935dd6125c107226a4c9d6da9bf48 * chore: update patches * update patches * chore: update sysroots * chore: bump chromium in DEPS to eaac5b5035fe189b6706e1637122e37134206059 * chore: bump chromium in DEPS to 258b54b903d33dab963adf59016691e6537f8b70 * build: update patches * refactor: cursor.mojom and cursor_types.mojom moved to //ui/base/cursor/mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2172874 * chore: DesktopWindowTreeHostLinux becomes DesktopWindowTreeHostPlatform Refs: * refactor: LogErrorEventDescription moved from ui to x11 Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2164245 * chore: update patches * chore: bump chromium in DEPS to bd06abcfe807d4461683479237cdd920dafa52ca * chore: bump chromium in DEPS to 1afb0891e56f1e79d204db43ca053a46d0974511 * chore: bump chromium in DEPS to 5cb0f794bf7f155bf8c0a241b94e01c9d90c2744 * chore: bump chromium in DEPS to 37327ba3303234e1a3cd3310ca11a68e81b95123 * update patches * remove ClientSideDetectionService from browser_process Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2175320 * refactor: shuttle cursor changed event to WebContentsObserver Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2172779 * chore: bump chromium in DEPS to 1d97904bb6936e106df13705208b73e47367c2b9 * avoid IPC crash introduced earlier in the roll Refs:b67334e781 (diff-607f4e8f7c5686aa09af98c783925babR128)
* remove WebContentsView::SizeContents Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2188931 * chore: bump chromium in DEPS to 87066d1db0546a9de33952ba964e1e42f76f1dae * update patches * adapt to //content creating NetworkContexts https://chromium-review.googlesource.com/c/chromium/src/+/2195196 * WIP temporarily ignore mojo-ified PrintHostMsg_PrintPreviewFailed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2195343 * add checkout_pgo_profiles to DEPS * chore: bump chromium in DEPS to a095318bec1dedf580d676f408eaeefdbd9956b1 * add blink's execution_context to electron_lib deps Refs:b67334e781
#, https://chromium-review.googlesource.com/c/chromium/src/+/1952124 * update patches * update patches * refactor: use newly mojo-ified PrintPreviewFailed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2195343 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * chore: update patches * chore: remove NOTIFICATION_EXTENSIONS_READY_DEPRECATED Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2199874 * avoid a call to Profile::FromBrowserContext in printing Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2195757 * chore: bump chromium in DEPS to 8f5c6a46861a991e12ffd80554b6bd41a11b0b65 * chore: bump chromium in DEPS to ab66134739ff3b6bdb8de53bbc58a97d1b7b5d8a * chore: bump chromium in DEPS to dd08df9f6c8d6198f0a7b931ca9e845e27dae033 * chore: update patches * [printing] Mojofy PrintHostMsg_PrintPreviewCancelled https://chromium-review.googlesource.com/c/chromium/src/+/2198331 * [printing] Mojofy PrintHostMsg_PrintPreviewInvalidPrinterSettings https://chromium-review.googlesource.com/c/chromium/src/+/2200556 * [printing] Mojofy PrintHostMsg_DidPrepareDocumentForPreview https://chromium-review.googlesource.com/c/chromium/src/+/2201496 * fix: inherit base network context params * fix: use message handle api specific to embedders * update patches * chore: update v8 headers * fixup! avoid a call to Profile::FromBrowserContext in printing * chore: bump chromium in DEPS to f198bc3276828d992b6202d75a9da6a8363164ea * chore: update patches * Remove cors_exempt_headers.h https://chromium-review.googlesource.com/c/chromium/src/+/2203759 * Supply speech recognition sandbox from service_sandbox_type.h https://chromium-review.googlesource.com/c/chromium/src/+/2206918 * [content] Remove unused methods from WebContents https://chromium-review.googlesource.com/c/chromium/src/+/2199113 * [XProto] Replace XAtom with x11::Atom https://chromium-review.googlesource.com/c/chromium/src/+/2202789 * chore: bump chromium in DEPS to 5df37fabaaed09f3ea511f4ef49203d8ebee7b68 * [UI] Support secondary labels in dropdown menus https://chromium-review.googlesource.com/c/chromium/src/+/2208976 * chore: update patches * refactor: GetSublabelAt => GetSecondaryLabelAt * Revert "[printing] Mojofy PrintHostMsg_DidPrepareDocumentForPreview" This reverts commit 44ed0892a0c81716229638f17253bbb2cf8f037d. https://chromium-review.googlesource.com/c/chromium/src/+/2208778 * Unnest CanonicalCookie::CookieInclusionStatus https://chromium-review.googlesource.com/c/chromium/src/+/2203171 * update print-to-pdf.html with latest html data https://bugs.chromium.org/p/chromium/issues/detail?id=1085667 * chore: bump chromium in DEPS to 5dfa8d5f706580fe983e138952553cd6af11ee8b * fix crash in x server when setting window icon * chore: update patches * Use a normal return value for WebContentsView::GetContainerBounds. https://chromium-review.googlesource.com/c/chromium/src/+/2212481 * fix build on windows * chore: bump chromium in DEPS to 9d15054f4cba060901e43deecf74002f11f47be3 * chore: update patches * [printing] Mojofy PrintHostMsg_CheckForCancel https://chromium-review.googlesource.com/c/chromium/src/+/2212181 Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com> Co-authored-by: Electron Bot <anonymous@electronjs.org> Co-authored-by: Andy Locascio <andy@slack-corp.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: deepak1556 <hop2deep@gmail.com>
656 lines
28 KiB
Diff
656 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 d23770fb402a1989027db54397fba80ceff9a296..61de329e09a08a9253eff554f6759fbef8214520 100644
|
|
--- a/chrome/browser/printing/print_job.cc
|
|
+++ b/chrome/browser/printing/print_job.cc
|
|
@@ -57,7 +57,7 @@ enum class PrintRasterizationMode {
|
|
kMaxValue = kFast,
|
|
};
|
|
|
|
-bool PrintWithReducedRasterization(PrefService* prefs) {
|
|
+ALLOW_UNUSED_TYPE bool PrintWithReducedRasterization(PrefService* prefs) {
|
|
// Managed preference takes precedence over user preference and field trials.
|
|
if (prefs->IsManagedPreference(prefs::kPrintRasterizationMode)) {
|
|
int value = prefs->GetInteger(prefs::kPrintRasterizationMode);
|
|
@@ -350,10 +350,13 @@ void PrintJob::StartPdfToEmfConversion(
|
|
settings.print_text_with_gdi() && !settings.printer_is_xps() &&
|
|
base::FeatureList::IsEnabled(::features::kGdiTextPrinting);
|
|
|
|
+ #if 0
|
|
Profile* profile = Profile::FromBrowserContext(
|
|
worker_->GetWebContents()->GetBrowserContext());
|
|
bool print_with_reduced_rasterization =
|
|
PrintWithReducedRasterization(profile->GetPrefs());
|
|
+ #endif
|
|
+ bool print_with_reduced_rasterization = base::FeatureList::IsEnabled(features::kPrintWithReducedRasterization);
|
|
|
|
using RenderMode = PdfRenderSettings::Mode;
|
|
RenderMode mode;
|
|
diff --git a/chrome/browser/printing/print_job_worker.cc b/chrome/browser/printing/print_job_worker.cc
|
|
index 9122bbf4f15c46eefd5269946659b5886156348a..211ca535d4572f11de7256c108aa84a160169557 100644
|
|
--- a/chrome/browser/printing/print_job_worker.cc
|
|
+++ b/chrome/browser/printing/print_job_worker.cc
|
|
@@ -21,7 +21,6 @@
|
|
#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"
|
|
@@ -29,6 +28,7 @@
|
|
#include "content/public/browser/render_frame_host.h"
|
|
#include "content/public/browser/web_contents.h"
|
|
#include "printing/backend/print_backend.h"
|
|
+#include "electron/grit/electron_resources.h"
|
|
#include "printing/print_job_constants.h"
|
|
#include "printing/printed_document.h"
|
|
#include "printing/printing_utils.h"
|
|
@@ -224,16 +224,21 @@ void PrintJobWorker::UpdatePrintSettings(base::Value new_settings,
|
|
print_backend->GetPrinterDriverInfo(printer_name));
|
|
}
|
|
|
|
- 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)
|
|
@@ -249,6 +254,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 5531a6e8cbc83cff104f70d4da3576f5af03209c..0d70e8132669aae179738086a7989bd60c0c28ee 100644
|
|
--- a/chrome/browser/printing/print_view_manager_base.cc
|
|
+++ b/chrome/browser/printing/print_view_manager_base.cc
|
|
@@ -28,10 +28,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"
|
|
#include "chrome/common/pref_names.h"
|
|
-#include "chrome/grit/generated_resources.h"
|
|
#include "chromeos/constants/chromeos_features.h"
|
|
#include "components/prefs/pref_service.h"
|
|
#include "components/printing/browser/print_composite_client.h"
|
|
@@ -47,6 +44,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"
|
|
@@ -70,6 +68,8 @@ using PrintSettingsCallback =
|
|
base::OnceCallback<void(std::unique_ptr<PrinterQuery>)>;
|
|
|
|
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)
|
|
@@ -78,6 +78,7 @@ void ShowWarningMessageBox(const base::string16& message) {
|
|
base::AutoReset<bool> auto_reset(&is_dialog_shown, true);
|
|
|
|
chrome::ShowWarningMessageBox(nullptr, base::string16(), message);
|
|
+#endif
|
|
}
|
|
|
|
#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
|
|
@@ -116,12 +117,14 @@ PrintViewManagerBase::PrintViewManagerBase(content::WebContents* web_contents)
|
|
printing_succeeded_(false),
|
|
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(),
|
|
base::BindRepeating(&PrintViewManagerBase::UpdatePrintingEnabled,
|
|
weak_ptr_factory_.GetWeakPtr()));
|
|
+#endif
|
|
}
|
|
|
|
PrintViewManagerBase::~PrintViewManagerBase() {
|
|
@@ -129,7 +132,10 @@ PrintViewManagerBase::~PrintViewManagerBase() {
|
|
DisconnectFromCurrentPrintJob();
|
|
}
|
|
|
|
-bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh) {
|
|
+bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh,
|
|
+ bool silent,
|
|
+ base::Value settings,
|
|
+ CompletionCallback callback) {
|
|
DisconnectFromCurrentPrintJob();
|
|
|
|
// Don't print / print preview crashed tabs.
|
|
@@ -137,7 +143,14 @@ bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh) {
|
|
return false;
|
|
|
|
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;
|
|
}
|
|
|
|
@@ -258,9 +271,9 @@ void PrintViewManagerBase::StartLocalPrintJob(
|
|
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() {
|
|
@@ -363,7 +376,7 @@ void PrintViewManagerBase::OnPrintingFailed(int cookie) {
|
|
PrintManager::OnPrintingFailed(cookie);
|
|
|
|
#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
|
|
- ShowPrintErrorDialog();
|
|
+ // ShowPrintErrorDialog();
|
|
#endif
|
|
|
|
ReleasePrinterQuery();
|
|
@@ -463,9 +476,13 @@ void PrintViewManagerBase::OnNotifyPrintJobEvent(
|
|
content::NotificationService::NoDetails());
|
|
break;
|
|
}
|
|
- case JobEventDetails::USER_INIT_DONE:
|
|
- case JobEventDetails::DEFAULT_INIT_DONE:
|
|
case JobEventDetails::USER_INIT_CANCELED: {
|
|
+ printing_cancelled_ = true;
|
|
+ ReleasePrintJob();
|
|
+ break;
|
|
+ }
|
|
+ case JobEventDetails::USER_INIT_DONE:
|
|
+ case JobEventDetails::DEFAULT_INIT_DONE: {
|
|
NOTREACHED();
|
|
break;
|
|
}
|
|
@@ -560,8 +577,10 @@ bool PrintViewManagerBase::CreateNewPrintJob(
|
|
DCHECK(!quit_inner_loop_);
|
|
DCHECK(query);
|
|
|
|
- // Disconnect the current |print_job_|.
|
|
- DisconnectFromCurrentPrintJob();
|
|
+ if (callback_.is_null()) {
|
|
+ // Disconnect the current |print_job_| only when calling window.print()
|
|
+ DisconnectFromCurrentPrintJob();
|
|
+ }
|
|
|
|
// We can't print if there is no renderer.
|
|
if (!web_contents()->GetRenderViewHost() ||
|
|
@@ -582,8 +601,6 @@ bool PrintViewManagerBase::CreateNewPrintJob(
|
|
print_job_->SetSource(source, /*source_id=*/"");
|
|
#endif
|
|
|
|
- registrar_.Add(this, chrome::NOTIFICATION_PRINT_JOB_EVENT,
|
|
- content::Source<PrintJob>(print_job_.get()));
|
|
printing_succeeded_ = false;
|
|
return true;
|
|
}
|
|
@@ -632,14 +649,22 @@ void PrintViewManagerBase::ReleasePrintJob() {
|
|
content::RenderFrameHost* rfh = printing_rfh_;
|
|
printing_rfh_ = nullptr;
|
|
|
|
+ if (!callback_.is_null()) {
|
|
+ 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()));
|
|
+ if (!callback_.is_null())
|
|
+ registrar_.Remove(this, chrome::NOTIFICATION_PRINT_JOB_EVENT,
|
|
+ content::NotificationService::AllSources());
|
|
// Don't close the worker thread.
|
|
print_job_ = nullptr;
|
|
}
|
|
@@ -675,7 +700,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 94b65e85561e1440b60086b668865bda07303d35..7044463d163fd74e55ff1a042c36739fdeff3689 100644
|
|
--- a/chrome/browser/printing/print_view_manager_base.h
|
|
+++ b/chrome/browser/printing/print_view_manager_base.h
|
|
@@ -33,6 +33,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 {
|
|
@@ -42,7 +44,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
|
|
@@ -205,9 +210,15 @@ class PrintViewManagerBase : public content::NotificationObserver,
|
|
// The current RFH that is printing with a system printing dialog.
|
|
content::RenderFrameHost* printing_rfh_;
|
|
|
|
+ // Respond with success of the print job.
|
|
+ CompletionCallback callback_;
|
|
+
|
|
// Indication of success of the print job.
|
|
bool printing_succeeded_;
|
|
|
|
+ // 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/chrome/browser/printing/printing_message_filter.cc b/chrome/browser/printing/printing_message_filter.cc
|
|
index 86ee19d5926df13cea1c8bb9bbe223061b8d7a79..7177042770391880b235a1e25ec75567229d3115 100644
|
|
--- a/chrome/browser/printing/printing_message_filter.cc
|
|
+++ b/chrome/browser/printing/printing_message_filter.cc
|
|
@@ -22,6 +22,7 @@
|
|
#include "components/keyed_service/content/browser_context_keyed_service_shutdown_notifier_factory.h"
|
|
#include "components/printing/browser/print_manager_utils.h"
|
|
#include "components/printing/common/print_messages.h"
|
|
+#include "content/public/browser/browser_context.h"
|
|
#include "content/public/browser/browser_task_traits.h"
|
|
#include "content/public/browser/render_frame_host.h"
|
|
#include "content/public/browser/web_contents.h"
|
|
@@ -90,20 +91,23 @@ void PrintingMessageFilter::SetDelegateForTesting(TestDelegate* delegate) {
|
|
g_test_delegate = delegate;
|
|
}
|
|
|
|
-PrintingMessageFilter::PrintingMessageFilter(int render_process_id,
|
|
- Profile* profile)
|
|
+PrintingMessageFilter::PrintingMessageFilter(
|
|
+ int render_process_id,
|
|
+ content::BrowserContext* browser_context)
|
|
: BrowserMessageFilter(PrintMsgStart),
|
|
render_process_id_(render_process_id),
|
|
queue_(g_browser_process->print_job_manager()->queue()) {
|
|
DCHECK(queue_.get());
|
|
printing_shutdown_notifier_ =
|
|
PrintingMessageFilterShutdownNotifierFactory::GetInstance()
|
|
- ->Get(profile)
|
|
+ ->Get(browser_context)
|
|
->Subscribe(base::Bind(&PrintingMessageFilter::ShutdownOnUIThread,
|
|
base::Unretained(this)));
|
|
+ #if 0
|
|
is_printing_enabled_.Init(prefs::kPrintingEnabled, profile->GetPrefs());
|
|
is_printing_enabled_.MoveToSequence(
|
|
base::CreateSingleThreadTaskRunner({BrowserThread::IO}));
|
|
+ #endif
|
|
}
|
|
|
|
PrintingMessageFilter::~PrintingMessageFilter() {
|
|
@@ -135,11 +139,13 @@ bool PrintingMessageFilter::OnMessageReceived(const IPC::Message& message) {
|
|
|
|
void PrintingMessageFilter::OnGetDefaultPrintSettings(IPC::Message* reply_msg) {
|
|
DCHECK_CURRENTLY_ON(BrowserThread::IO);
|
|
+#if 0
|
|
if (!is_printing_enabled_.GetValue()) {
|
|
// Reply with null query.
|
|
OnGetDefaultPrintSettingsReply(nullptr, reply_msg);
|
|
return;
|
|
}
|
|
+#endif
|
|
std::unique_ptr<PrinterQuery> printer_query = queue_->PopPrinterQuery(0);
|
|
if (!printer_query) {
|
|
printer_query =
|
|
@@ -225,12 +231,13 @@ void PrintingMessageFilter::OnScriptedPrintReply(
|
|
void PrintingMessageFilter::OnUpdatePrintSettings(int document_cookie,
|
|
base::Value job_settings,
|
|
IPC::Message* reply_msg) {
|
|
+#if 0
|
|
if (!is_printing_enabled_.GetValue()) {
|
|
// Reply with null query.
|
|
OnUpdatePrintSettingsReply(nullptr, reply_msg);
|
|
return;
|
|
}
|
|
-
|
|
+#endif
|
|
if (!job_settings.is_dict() ||
|
|
!job_settings.FindIntKey(kSettingPrinterType)) {
|
|
// Reply with null query.
|
|
@@ -263,7 +270,9 @@ void PrintingMessageFilter::OnUpdatePrintSettingsReply(
|
|
std::unique_ptr<PrinterQuery> printer_query,
|
|
IPC::Message* reply_msg) {
|
|
PrintMsg_PrintPages_Params params;
|
|
- if (!printer_query || 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) {
|
|
params.Reset();
|
|
} else {
|
|
RenderParamsFromPrintSettings(printer_query->settings(), ¶ms.params);
|
|
diff --git a/chrome/browser/printing/printing_message_filter.h b/chrome/browser/printing/printing_message_filter.h
|
|
index 49296adb525eeb511d4aad5f25ff1196f9f1333e..2d705bb98f47e79f0922af9675c42800aadc0206 100644
|
|
--- a/chrome/browser/printing/printing_message_filter.h
|
|
+++ b/chrome/browser/printing/printing_message_filter.h
|
|
@@ -23,6 +23,10 @@ struct PrintHostMsg_ScriptedPrint_Params;
|
|
struct PrintMsg_Print_Params;
|
|
class Profile;
|
|
|
|
+namespace content {
|
|
+class BrowserContext;
|
|
+}
|
|
+
|
|
namespace printing {
|
|
|
|
class PrintQueriesQueue;
|
|
@@ -43,7 +47,8 @@ class PrintingMessageFilter : public content::BrowserMessageFilter {
|
|
|
|
static void SetDelegateForTesting(TestDelegate* delegate);
|
|
|
|
- PrintingMessageFilter(int render_process_id, Profile* profile);
|
|
+ PrintingMessageFilter(int render_process_id,
|
|
+ content::BrowserContext* browser_context);
|
|
|
|
// content::BrowserMessageFilter:
|
|
bool OnMessageReceived(const IPC::Message& message) override;
|
|
diff --git a/components/printing/common/print.mojom b/components/printing/common/print.mojom
|
|
index 912652847ab45c811400dbee81bc5161d5865c56..5fb26c8952117c5110707b1c6b45158090b37ded 100644
|
|
--- a/components/printing/common/print.mojom
|
|
+++ b/components/printing/common/print.mojom
|
|
@@ -93,7 +93,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 ccd164ad24e4c401be746c0ac9716d1d259c0a85..1db0c6cad6cc27b3a548b78d701d2ada7023dad1 100644
|
|
--- a/components/printing/renderer/print_render_frame_helper.cc
|
|
+++ b/components/printing/renderer/print_render_frame_helper.cc
|
|
@@ -44,6 +44,7 @@
|
|
#include "printing/metafile_skia.h"
|
|
#include "printing/mojom/print.mojom.h"
|
|
#include "printing/printing_features.h"
|
|
+#include "printing/print_settings.h"
|
|
#include "printing/units.h"
|
|
#include "third_party/blink/public/common/associated_interfaces/associated_interface_registry.h"
|
|
#include "third_party/blink/public/common/css/page_orientation.h"
|
|
@@ -1174,7 +1175,8 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) {
|
|
web_frame->DispatchBeforePrintEvent();
|
|
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)
|
|
web_frame->DispatchAfterPrintEvent();
|
|
}
|
|
@@ -1195,7 +1197,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_ > 1)
|
|
return;
|
|
@@ -1209,7 +1211,7 @@ void PrintRenderFrameHelper::PrintRequestedPages() {
|
|
// If we are printing a PDF extension frame, find the plugin node and print
|
|
// that instead.
|
|
auto plugin = delegate_->GetPdfElement(frame);
|
|
- Print(frame, plugin, PrintRequestType::kRegular);
|
|
+ Print(frame, plugin, PrintRequestType::kRegular, silent, std::move(settings));
|
|
if (!render_frame_gone_)
|
|
frame->DispatchAfterPrintEvent();
|
|
// WARNING: |this| may be gone at this point. Do not do any more work here and
|
|
@@ -1226,7 +1228,7 @@ void PrintRenderFrameHelper::PrintForSystemDialog() {
|
|
return;
|
|
}
|
|
Print(frame, print_preview_context_.source_node(),
|
|
- PrintRequestType::kRegular);
|
|
+ PrintRequestType::kRegular, false, base::DictionaryValue());
|
|
if (!render_frame_gone_)
|
|
frame->DispatchAfterPrintEvent();
|
|
// WARNING: |this| may be gone at this point. Do not do any more work here and
|
|
@@ -1274,6 +1276,8 @@ void PrintRenderFrameHelper::PrintPreview(base::Value settings) {
|
|
if (ipc_nesting_level_ > 1)
|
|
return;
|
|
|
|
+ blink::WebLocalFrame* frame = render_frame()->GetWebFrame();
|
|
+ print_preview_context_.InitWithFrame(frame);
|
|
print_preview_context_.OnPrintPreview();
|
|
|
|
base::UmaHistogramEnumeration(print_preview_context_.IsForArc()
|
|
@@ -1785,7 +1789,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
|
|
|
|
auto self = weak_ptr_factory_.GetWeakPtr();
|
|
Print(duplicate_node.GetDocument().GetFrame(), duplicate_node,
|
|
- PrintRequestType::kRegular);
|
|
+ PrintRequestType::kRegular,
|
|
+ false /* silent */,
|
|
+ base::DictionaryValue() /* new_settings */);
|
|
// Check if |this| is still valid.
|
|
if (!self)
|
|
return;
|
|
@@ -1796,7 +1802,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;
|
|
@@ -1804,7 +1812,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
|
|
FrameReference frame_ref(frame);
|
|
|
|
int 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.
|
|
}
|
|
@@ -1824,8 +1832,11 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
|
|
|
|
PrintMsg_PrintPages_Params print_settings;
|
|
auto self = weak_ptr_factory_.GetWeakPtr();
|
|
- GetPrintSettingsFromUser(frame_ref.GetFrame(), node, expected_page_count,
|
|
- print_request_type, &print_settings);
|
|
+ if (silent)
|
|
+ print_settings = *print_pages_params_.get();
|
|
+ else
|
|
+ GetPrintSettingsFromUser(frame_ref.GetFrame(), node, expected_page_count,
|
|
+ print_request_type, &print_settings);
|
|
// Check if |this| is still valid.
|
|
if (!self)
|
|
return;
|
|
@@ -2061,10 +2072,23 @@ void PrintRenderFrameHelper::IPCProcessed() {
|
|
base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE, this);
|
|
}
|
|
|
|
-bool PrintRenderFrameHelper::InitPrintSettings(bool fit_to_paper_size) {
|
|
+bool PrintRenderFrameHelper::InitPrintSettings(
|
|
+ bool fit_to_paper_size,
|
|
+ const base::DictionaryValue& new_settings) {
|
|
PrintMsg_PrintPages_Params settings;
|
|
- Send(new PrintHostMsg_GetDefaultPrintSettings(routing_id(),
|
|
- &settings.params));
|
|
+ if (new_settings.empty()) {
|
|
+ // Send the default IPC message if caller is window.print()
|
|
+ Send(new PrintHostMsg_GetDefaultPrintSettings(routing_id(),
|
|
+ &settings.params));
|
|
+ } else {
|
|
+ // Send the update IPC message if caller is webContents.print()
|
|
+ bool canceled = false;
|
|
+ Send(new PrintHostMsg_UpdatePrintSettings(
|
|
+ routing_id(), 0, new_settings, &settings, &canceled));
|
|
+ if (canceled)
|
|
+ return false;
|
|
+ }
|
|
+
|
|
// 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.
|
|
@@ -2084,12 +2108,14 @@ bool PrintRenderFrameHelper::InitPrintSettings(bool fit_to_paper_size) {
|
|
return result;
|
|
}
|
|
|
|
-bool PrintRenderFrameHelper::CalculateNumberOfPages(blink::WebLocalFrame* frame,
|
|
- const blink::WebNode& node,
|
|
- int* number_of_pages) {
|
|
+bool PrintRenderFrameHelper::CalculateNumberOfPages(
|
|
+ blink::WebLocalFrame* frame,
|
|
+ const blink::WebNode& node,
|
|
+ int* 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;
|
|
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
|
|
index 85b7989513d014c2dea2b649248c85c912109904..a0d1b786dd21afd5047e84bf323171adef912835 100644
|
|
--- a/components/printing/renderer/print_render_frame_helper.h
|
|
+++ b/components/printing/renderer/print_render_frame_helper.h
|
|
@@ -225,7 +225,7 @@ class PrintRenderFrameHelper
|
|
mojo::PendingAssociatedReceiver<mojom::PrintRenderFrame> receiver);
|
|
|
|
// printing::mojom::PrintRenderFrame:
|
|
- void PrintRequestedPages() override;
|
|
+ void PrintRequestedPages(bool silent, base::Value settings) override;
|
|
void PrintForSystemDialog() override;
|
|
#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
|
|
void SetPrintPreviewUI(
|
|
@@ -291,7 +291,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);
|
|
@@ -300,12 +302,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,
|
|
- int* number_of_pages);
|
|
+ int* 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 ad26397af46f024a81902949e1c7d627922ff492..e23abbac0014eac5fa0042111b920a1dec4723f8 100644
|
|
--- a/printing/printing_context.cc
|
|
+++ b/printing/printing_context.cc
|
|
@@ -94,8 +94,6 @@ PrintingContext::Result PrintingContext::UsePdfSettings() {
|
|
|
|
PrintingContext::Result PrintingContext::UpdatePrintSettings(
|
|
base::Value job_settings) {
|
|
- ResetSettings();
|
|
-
|
|
if (!PrintSettingsFromJobSettings(job_settings, settings_.get())) {
|
|
NOTREACHED();
|
|
return OnError();
|
|
diff --git a/printing/printing_context.h b/printing/printing_context.h
|
|
index 6a5a7c90ef5ba82837095c7bb934881b108797f7..a033c58076ff229ae45ed7c454fc60a57e5707b7 100644
|
|
--- a/printing/printing_context.h
|
|
+++ b/printing/printing_context.h
|
|
@@ -131,12 +131,12 @@ class PRINTING_EXPORT 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();
|
|
|