From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Heilig Benedek 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 diff --git a/chrome/browser/printing/print_job_worker.cc b/chrome/browser/printing/print_job_worker.cc index 1065e808e621c087bde9320abe019f05292f977c..6cf33877d21a6bf06532f7f9d79804c744f1ad83 100644 --- a/chrome/browser/printing/print_job_worker.cc +++ b/chrome/browser/printing/print_job_worker.cc @@ -20,7 +20,7 @@ #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 "electron/grit/electron_resources.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/render_frame_host.h" diff --git a/chrome/browser/printing/print_view_manager_base.cc b/chrome/browser/printing/print_view_manager_base.cc index 169bfefa0e442ddc0aa51ac4e98b48fc24d8a805..12cede4509e88c12daf3a53ae40204f945b9172f 100644 --- a/chrome/browser/printing/print_view_manager_base.cc +++ b/chrome/browser/printing/print_view_manager_base.cc @@ -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" #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" @@ -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" #include "printing/metafile_skia.h" @@ -67,6 +65,8 @@ using PrintSettingsCallback = base::OnceCallback)>; 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) @@ -75,6 +75,7 @@ void ShowWarningMessageBox(const base::string16& message) { base::AutoReset auto_reset(&is_dialog_shown, true); chrome::ShowWarningMessageBox(nullptr, base::string16(), message); +#endif } #if BUILDFLAG(ENABLE_PRINT_PREVIEW) @@ -111,12 +112,14 @@ PrintViewManagerBase::PrintViewManagerBase(content::WebContents* web_contents) 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 } PrintViewManagerBase::~PrintViewManagerBase() { @@ -124,12 +127,14 @@ PrintViewManagerBase::~PrintViewManagerBase() { DisconnectFromCurrentPrintJob(); } -bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh) { +bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh, + std::unique_ptr message, + CompletionCallback callback) { DisconnectFromCurrentPrintJob(); SetPrintingRFH(rfh); - int32_t id = rfh->GetRoutingID(); - return PrintNowInternal(rfh, std::make_unique(id)); + callback_ = std::move(callback); + return PrintNowInternal(rfh, std::move(message)); } #if BUILDFLAG(ENABLE_PRINT_PREVIEW) @@ -245,9 +250,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() { @@ -339,7 +344,7 @@ void PrintViewManagerBase::OnPrintingFailed(int cookie) { PrintManager::OnPrintingFailed(cookie); #if BUILDFLAG(ENABLE_PRINT_PREVIEW) - ShowPrintErrorDialog(); + // ShowPrintErrorDialog(); #endif ReleasePrinterQuery(); @@ -587,6 +592,9 @@ void PrintViewManagerBase::ReleasePrintJob() { content::RenderFrameHost* rfh = printing_rfh_; printing_rfh_ = nullptr; + if (!callback_.is_null()) + std::move(callback_).Run(printing_succeeded_); + if (!print_job_) return; diff --git a/chrome/browser/printing/print_view_manager_base.h b/chrome/browser/printing/print_view_manager_base.h index 542d061efc80b536867ff51cb5f211d15a6ea199..be27c20f2fe8d1e666e9a35b3835a62b8234a2c5 100644 --- a/chrome/browser/printing/print_view_manager_base.h +++ b/chrome/browser/printing/print_view_manager_base.h @@ -39,6 +39,8 @@ class PrintJob; class PrintQueriesQueue; class PrinterQuery; +using CompletionCallback = base::OnceCallback; + // Base class for managing the print commands for a WebContents. class PrintViewManagerBase : public content::NotificationObserver, public PrintManager { @@ -48,7 +50,9 @@ 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, + std::unique_ptr message, + CompletionCallback callback); #if BUILDFLAG(ENABLE_PRINT_PREVIEW) // Prints the document in |print_data| with settings specified in @@ -196,6 +200,9 @@ class PrintViewManagerBase : public content::NotificationObserver, // The current RFH that is printing with a system printing dialog. content::RenderFrameHost* printing_rfh_; + // Responded with success of the print job. + CompletionCallback callback_; + // Indication of success of the print job. bool printing_succeeded_; diff --git a/chrome/browser/printing/printing_message_filter.cc b/chrome/browser/printing/printing_message_filter.cc index 67079421bf44c832fdc98c8d2c75875e95e0a81c..1896a57f3228e724d9817b25bfd3bd3b94bc10c0 100644 --- a/chrome/browser/printing/printing_message_filter.cc +++ b/chrome/browser/printing/printing_message_filter.cc @@ -20,6 +20,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/render_frame_host.h" #include "content/public/browser/web_contents.h" #include "content/public/common/child_process_host.h" @@ -94,20 +95,23 @@ PrintViewManager* GetPrintViewManager(int render_process_id, } // namespace -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_.MoveToThread( BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)); +#endif } PrintingMessageFilter::~PrintingMessageFilter() { @@ -188,11 +192,13 @@ void PrintingMessageFilter::OnTempFileForPrintingWritten(int render_frame_id, void PrintingMessageFilter::OnGetDefaultPrintSettings(IPC::Message* reply_msg) { DCHECK_CURRENTLY_ON(BrowserThread::IO); scoped_refptr printer_query; +#if 0 if (!is_printing_enabled_.GetValue()) { // Reply with NULL query. OnGetDefaultPrintSettingsReply(printer_query, reply_msg); return; } +#endif printer_query = queue_->PopPrinterQuery(0); if (!printer_query.get()) { printer_query = @@ -301,11 +307,13 @@ void PrintingMessageFilter::OnUpdatePrintSettings( std::unique_ptr new_settings(job_settings.DeepCopy()); scoped_refptr printer_query; +#if 0 if (!is_printing_enabled_.GetValue()) { // Reply with NULL query. OnUpdatePrintSettingsReply(printer_query, reply_msg); return; } +#endif printer_query = queue_->PopPrinterQuery(document_cookie); if (!printer_query.get()) { printer_query = queue_->CreatePrinterQuery( @@ -364,7 +372,7 @@ void PrintingMessageFilter::OnUpdatePrintSettingsReply( #if BUILDFLAG(ENABLE_PRINT_PREVIEW) void PrintingMessageFilter::OnCheckForCancel(const PrintHostMsg_PreviewIds& ids, bool* cancel) { - *cancel = PrintPreviewUI::ShouldCancelRequest(ids); + *cancel = false; } #endif diff --git a/chrome/browser/printing/printing_message_filter.h b/chrome/browser/printing/printing_message_filter.h index a881a853bfb0b46d0e074b7e86121429a5a761a3..0b41890bb9b5f10765c12158f6e8b7d373b335b9 100644 --- a/chrome/browser/printing/printing_message_filter.h +++ b/chrome/browser/printing/printing_message_filter.h @@ -29,6 +29,10 @@ struct FileDescriptor; #endif } +namespace content { +class BrowserContext; +} + namespace printing { class PrintQueriesQueue; @@ -38,7 +42,8 @@ class PrinterQuery; // renderer process on the IPC thread. class PrintingMessageFilter : public content::BrowserMessageFilter { public: - PrintingMessageFilter(int render_process_id, Profile* profile); + PrintingMessageFilter(int render_process_id, + content::BrowserContext* browser_context); // content::BrowserMessageFilter methods. void OverrideThreadForMessage(const IPC::Message& message, diff --git a/components/printing/common/print_messages.h b/components/printing/common/print_messages.h index e3c11e1302ff0d1a9cca4cb575a6c8bccfde243d..97dcb7f84ccc8bf367c1a5ee4eb59d945d1c03ba 100644 --- a/components/printing/common/print_messages.h +++ b/components/printing/common/print_messages.h @@ -363,7 +363,10 @@ IPC_MESSAGE_ROUTED0(PrintMsg_PrintNodeUnderContextMenu) #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 */, + base::DictionaryValue /* settings */) // 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 index 86a68c361f06bf26d980ee8730f7d759982dfffa..b67affdf12f45d190777b1ad16d33cef2d6da400 100644 --- a/components/printing/renderer/print_render_frame_helper.cc +++ b/components/printing/renderer/print_render_frame_helper.cc @@ -1030,7 +1030,9 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) { web_frame->DispatchBeforePrintEvent(); if (!weak_this) return; - Print(web_frame, blink::WebNode(), true /* is_scripted? */); + Print(web_frame, blink::WebNode(), true /* is_scripted? */, + false /* silent */, false /* print_background */, + base::DictionaryValue() /* new_settings */); if (weak_this) web_frame->DispatchAfterPrintEvent(); } @@ -1078,7 +1080,10 @@ void PrintRenderFrameHelper::OnDestruct() { delete this; } -void PrintRenderFrameHelper::OnPrintPages() { +void PrintRenderFrameHelper::OnPrintPages( + bool silent, + bool print_background, + const base::DictionaryValue& settings) { if (ipc_nesting_level_ > 1) return; @@ -1091,7 +1096,8 @@ void PrintRenderFrameHelper::OnPrintPages() { // If we are printing a PDF extension frame, find the plugin node and print // that instead. auto plugin = delegate_->GetPdfElement(frame); - Print(frame, plugin, false /* is_scripted? */); + Print(frame, plugin, false /* is_scripted? */, + silent, print_background, settings); if (weak_this) frame->DispatchAfterPrintEvent(); // WARNING: |this| may be gone at this point. Do not do any more work here and @@ -1107,7 +1113,8 @@ void PrintRenderFrameHelper::OnPrintForSystemDialog() { return; } auto weak_this = weak_ptr_factory_.GetWeakPtr(); - Print(frame, print_preview_context_.source_node(), false); + Print(frame, print_preview_context_.source_node(), false, + false, false, base::DictionaryValue()); if (weak_this) frame->DispatchAfterPrintEvent(); // WARNING: |this| may be gone at this point. Do not do any more work here and @@ -1143,6 +1150,8 @@ void PrintRenderFrameHelper::OnPrintPreview( if (ipc_nesting_level_ > 1) return; + blink::WebLocalFrame* frame = render_frame()->GetWebFrame(); + print_preview_context_.InitWithFrame(frame); print_preview_context_.OnPrintPreview(); UMA_HISTOGRAM_ENUMERATION("PrintPreview.PreviewEvent", @@ -1525,7 +1534,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) { auto self = weak_ptr_factory_.GetWeakPtr(); Print(duplicate_node.GetDocument().GetFrame(), duplicate_node, - false /* is_scripted? */); + false /* is_scripted? */, false /* silent */, + false /* print_background */, + base::DictionaryValue() /* new_settings */); // Check if |this| is still valid. if (!self) return; @@ -1536,7 +1547,10 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) { void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame, const blink::WebNode& node, - bool is_scripted) { + bool is_scripted, + bool silent, + bool print_background, + const base::DictionaryValue& settings) { // If still not finished with earlier print request simply ignore. if (prep_frame_view_) return; @@ -1544,7 +1558,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, settings)) { DidFinishPrinting(FAIL_PRINT_INIT); return; // Failed to init print page settings. } @@ -1564,8 +1578,9 @@ 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, - is_scripted, &print_settings); + if (!silent) + GetPrintSettingsFromUser(frame_ref.GetFrame(), node, expected_page_count, + is_scripted, &print_settings); // Check if |this| is still valid. if (!self) return; @@ -1575,6 +1590,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame, ? 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. @@ -1762,10 +1778,24 @@ std::vector PrintRenderFrameHelper::GetPrintedPages( return printed_pages; } -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(new PrintHostMsg_GetDefaultPrintSettings(routing_id(), + &settings.params)); + } else { + // 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; + } // 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. @@ -1785,12 +1815,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 = !(PrintingNodeOrPdfFrame(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 d09db4d500ca3cfa9716114e679bcf428c76c085..a0436373990dafa38c226160d967687b21c021e7 100644 --- a/components/printing/renderer/print_render_frame_helper.h +++ b/components/printing/renderer/print_render_frame_helper.h @@ -187,7 +187,9 @@ class PrintRenderFrameHelper bool OnMessageReceived(const IPC::Message& message) override; // Message handlers --------------------------------------------------------- - void OnPrintPages(); + void OnPrintPages(bool silent, + bool print_background, + const base::DictionaryValue& settings); void OnPrintForSystemDialog(); #if BUILDFLAG(ENABLE_PRINT_PREVIEW) void OnInitiatePrintPreview(bool has_selection); @@ -239,7 +241,10 @@ class PrintRenderFrameHelper // WARNING: |this| may be gone after this method returns. void Print(blink::WebLocalFrame* frame, const blink::WebNode& node, - bool is_scripted); + bool is_scripted, + bool silent, + bool print_background, + const base::DictionaryValue& settings); // Notification when printing is done - signal tear-down/free resources. void DidFinishPrinting(PrintingResult result); @@ -248,12 +253,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.