From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Shelley Vohr Date: Fri, 7 Jun 2019 13:59:37 -0700 Subject: fix: printing 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_worker.cc b/chrome/browser/printing/print_job_worker.cc index 63f432b58371cfa0f8079fa78a51c8865a00c183..d20d803f55ca67fb6993facc69c3431767786053 100644 --- a/chrome/browser/printing/print_job_worker.cc +++ b/chrome/browser/printing/print_job_worker.cc @@ -21,12 +21,12 @@ #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 "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/print_job_constants.h" #include "printing/printed_document.h" #include "printing/printing_utils.h" @@ -206,9 +206,14 @@ void PrintJobWorker::SetSettingsFromPOD( void PrintJobWorker::UpdatePrintSettings(base::Value new_settings, SettingsCallback callback) { DCHECK_CURRENTLY_ON(BrowserThread::UI); - PrintingContext::Result result = - printing_context_->UpdatePrintSettings(std::move(new_settings)); - GetSettingsDone(std::move(callback), result); + // 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); + } } #if defined(OS_CHROMEOS) @@ -224,6 +229,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_->settings(), result); } diff --git a/chrome/browser/printing/print_view_manager_base.cc b/chrome/browser/printing/print_view_manager_base.cc index c4e0992f6265b34659514ef5f15eb8d78645161c..1aca2f88da5d8e96a0f16a667a8a86a7873dfdf9 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" @@ -64,6 +62,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) @@ -72,6 +72,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) @@ -110,12 +111,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() { @@ -123,12 +126,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) @@ -244,9 +249,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() { @@ -338,7 +343,7 @@ void PrintViewManagerBase::OnPrintingFailed(int cookie) { PrintManager::OnPrintingFailed(cookie); #if BUILDFLAG(ENABLE_PRINT_PREVIEW) - ShowPrintErrorDialog(); + // ShowPrintErrorDialog(); #endif ReleasePrinterQuery(); @@ -438,9 +443,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; } @@ -535,8 +544,6 @@ bool PrintViewManagerBase::CreateNewPrintJob( DCHECK(!quit_inner_loop_); DCHECK(query); - // Disconnect the current |print_job_|. - DisconnectFromCurrentPrintJob(); // We can't print if there is no renderer. if (!web_contents()->GetRenderViewHost() || @@ -547,8 +554,6 @@ bool PrintViewManagerBase::CreateNewPrintJob( DCHECK(!print_job_); print_job_ = base::MakeRefCounted(); print_job_->Initialize(std::move(query), RenderSourceName(), number_pages_); - registrar_.Add(this, chrome::NOTIFICATION_PRINT_JOB_EVENT, - content::Source(print_job_.get())); printing_succeeded_ = false; return true; } @@ -597,6 +602,13 @@ 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; @@ -606,8 +618,9 @@ void PrintViewManagerBase::ReleasePrintJob() { rfh->Send(msg.release()); } - registrar_.Remove(this, chrome::NOTIFICATION_PRINT_JOB_EVENT, - content::Source(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; } @@ -677,6 +690,9 @@ bool PrintViewManagerBase::PrintNowInternal( // Don't print / print preview interstitials or crashed tabs. if (web_contents()->ShowingInterstitialPage() || web_contents()->IsCrashed()) return false; + + registrar_.Add(this, chrome::NOTIFICATION_PRINT_JOB_EVENT, + content::NotificationService::AllSources()); return rfh->Send(message.release()); } diff --git a/chrome/browser/printing/print_view_manager_base.h b/chrome/browser/printing/print_view_manager_base.h index 925736d379c34ac7ddc07032305d24e1ae65e4b3..a8b2b31ec8bcb04d83df368b12d124dcdbb8b55d 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 @@ -195,9 +199,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 706617b7924cfbf25e4f3a04a40d9ee977e6fd69..92b46562ef36bbfe874d39d706ab589d98f37cda 100644 --- a/chrome/browser/printing/printing_message_filter.cc +++ b/chrome/browser/printing/printing_message_filter.cc @@ -21,6 +21,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" @@ -89,20 +90,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::CreateSingleThreadTaskRunnerWithTraits({BrowserThread::IO})); + #endif } PrintingMessageFilter::~PrintingMessageFilter() { @@ -137,11 +141,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 printer_query = queue_->PopPrinterQuery(0); if (!printer_query) { printer_query = @@ -227,11 +233,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 std::unique_ptr printer_query = queue_->PopPrinterQuery(document_cookie); if (!printer_query) { @@ -257,7 +265,9 @@ void PrintingMessageFilter::OnUpdatePrintSettingsReply( std::unique_ptr 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); @@ -295,7 +305,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 9fbea6d0a2dbe55b1d600fbc217dee5aa8ae8cd5..de9bd267e408c02fd4da7d903523c0e6305088d5 100644 --- a/chrome/browser/printing/printing_message_filter.h +++ b/chrome/browser/printing/printing_message_filter.h @@ -24,6 +24,10 @@ struct PrintHostMsg_ScriptedPrint_Params; struct PrintMsg_Print_Params; class Profile; +namespace content { +class BrowserContext; +} + namespace printing { class PrintQueriesQueue; @@ -44,7 +48,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_messages.h b/components/printing/common/print_messages.h index 1802034a6e15a6ad8b0d9591cfb79ba5873dc982..331ac71d925c056d3b7577123251514c35f30fde 100644 --- a/components/printing/common/print_messages.h +++ b/components/printing/common/print_messages.h @@ -368,7 +368,9 @@ 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_ROUTED2(PrintMsg_PrintPages, + bool /* silent print */, + 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 ef580254bd8feba84ac02924b77b9b4feaf14d96..3cdaf40b6e5aeee7193a49a31f824c914d07648e 100644 --- a/components/printing/renderer/print_render_frame_helper.cc +++ b/components/printing/renderer/print_render_frame_helper.cc @@ -37,6 +37,7 @@ #include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "printing/buildflags/buildflags.h" #include "printing/metafile_skia.h" +#include "printing/print_settings.h" #include "printing/units.h" #include "third_party/blink/public/common/frame/frame_owner_element_type.h" #include "third_party/blink/public/common/frame/sandbox_flags.h" @@ -1116,7 +1117,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(); } @@ -1164,7 +1166,9 @@ void PrintRenderFrameHelper::OnDestruct() { delete this; } -void PrintRenderFrameHelper::OnPrintPages() { +void PrintRenderFrameHelper::OnPrintPages( + bool silent, + const base::DictionaryValue& settings) { if (ipc_nesting_level_ > 1) return; @@ -1177,7 +1181,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, PrintRequestType::kRegular); + Print(frame, plugin, PrintRequestType::kRegular, + silent, settings); if (weak_this) frame->DispatchAfterPrintEvent(); // WARNING: |this| may be gone at this point. Do not do any more work here and @@ -1194,7 +1199,7 @@ void PrintRenderFrameHelper::OnPrintForSystemDialog() { } auto weak_this = weak_ptr_factory_.GetWeakPtr(); Print(frame, print_preview_context_.source_node(), - PrintRequestType::kRegular); + PrintRequestType::kRegular, false, base::DictionaryValue()); if (weak_this) frame->DispatchAfterPrintEvent(); // WARNING: |this| may be gone at this point. Do not do any more work here and @@ -1230,6 +1235,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", @@ -1622,7 +1629,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; @@ -1633,7 +1642,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, + const base::DictionaryValue& settings) { // If still not finished with earlier print request simply ignore. if (prep_frame_view_) return; @@ -1641,7 +1652,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. } @@ -1661,8 +1672,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; @@ -1867,10 +1881,23 @@ 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 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. @@ -1890,12 +1917,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 71c0c15217b62cd7a6087c6d9ae50481f9041d5f..18d853d7f808aaf816de86e8c5b8231738d16f55 100644 --- a/components/printing/renderer/print_render_frame_helper.h +++ b/components/printing/renderer/print_render_frame_helper.h @@ -193,7 +193,8 @@ class PrintRenderFrameHelper bool OnMessageReceived(const IPC::Message& message) override; // Message handlers --------------------------------------------------------- - void OnPrintPages(); + void OnPrintPages(bool silent, + const base::DictionaryValue& settings); void OnPrintForSystemDialog(); #if BUILDFLAG(ENABLE_PRINT_PREVIEW) void OnInitiatePrintPreview(bool has_selection); @@ -243,7 +244,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, + const base::DictionaryValue& settings); // Notification when printing is done - signal tear-down/free resources. void DidFinishPrinting(PrintingResult result); @@ -252,12 +255,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/print_settings_conversion.cc b/printing/print_settings_conversion.cc index 2563ae6a87b2354ff2f2b45c17f61d2f44910efa..a7c61e5286659c51579c6b50cf5cc52c10433062 100644 --- a/printing/print_settings_conversion.cc +++ b/printing/print_settings_conversion.cc @@ -190,11 +190,12 @@ bool PrintSettingsFromJobSettings(const base::Value& job_settings, settings->set_dpi_xy(dpi_horizontal.value(), dpi_vertical.value()); #endif + if (!device_name->empty()) + settings->set_device_name(base::UTF8ToUTF16(*device_name)); settings->set_collate(collate.value()); settings->set_copies(copies.value()); settings->SetOrientation(landscape.value()); - settings->set_device_name(base::UTF8ToUTF16(*device_name)); settings->set_duplex_mode(static_cast(duplex_mode.value())); settings->set_color(static_cast(color.value())); settings->set_scale_factor(static_cast(scale_factor.value()) / 100.0); diff --git a/printing/printing_context.cc b/printing/printing_context.cc index 78e3c3b2e1bea0f3626838eab14267847a556470..b1c16e6eb1d0d9c0a8b700d9faf408d602f962ea 100644 --- a/printing/printing_context.cc +++ b/printing/printing_context.cc @@ -77,8 +77,6 @@ PrintingContext::Result PrintingContext::UsePdfSettings() { PrintingContext::Result PrintingContext::UpdatePrintSettings( base::Value job_settings) { - ResetSettings(); - if (!PrintSettingsFromJobSettings(job_settings, &settings_)) { NOTREACHED(); return OnError(); diff --git a/printing/printing_context.h b/printing/printing_context.h index 9ccc1a6680bcedd452cade7f7531924ace7876cf..4e1c330c01a1d6d1ba702337f16d8f8a70cd76f5 100644 --- a/printing/printing_context.h +++ b/printing/printing_context.h @@ -129,12 +129,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();