|
@@ -25,7 +25,7 @@ index f63f7f2674d9562f57dea4f9c9f473aa595a0c5f..78a46dbea7ff31209748ef47d5417253
|
|
|
// Returns true if duplex mode is set.
|
|
|
bool SetDuplexModeInPrintSettings(mojom::DuplexMode mode);
|
|
|
diff --git a/printing/printing_context_mac.mm b/printing/printing_context_mac.mm
|
|
|
-index aa950b59390fdae9a5152affb7a7438cb78eb6f4..3ec9ee0ee464960a48d23f5000137cc44027e9b1 100644
|
|
|
+index aa950b59390fdae9a5152affb7a7438cb78eb6f4..9b5307bda7b73cb502fe185be2a7c02e23a7722c 100644
|
|
|
--- a/printing/printing_context_mac.mm
|
|
|
+++ b/printing/printing_context_mac.mm
|
|
|
@@ -189,7 +189,8 @@ PMPaper MatchPaper(CFArrayRef paper_list,
|
|
@@ -45,7 +45,7 @@ index aa950b59390fdae9a5152affb7a7438cb78eb6f4..3ec9ee0ee464960a48d23f5000137cc4
|
|
|
+bool PrintingContextMac::SetPrintRangeInPrintSettings(const PageRanges& ranges) {
|
|
|
+ // Default is already NSPrintAllPages - we can safely bail.
|
|
|
+ if (ranges.empty())
|
|
|
-+ return true;
|
|
|
++ return true;
|
|
|
+
|
|
|
+ auto* print_settings =
|
|
|
+ static_cast<PMPrintSettings>([print_info_.get() PMPrintSettings]);
|
|
@@ -100,14 +100,14 @@ index d3c8677f30d72efc49b28f293260c74c7b8d8b4e..f6e66aaa58ab1881d64dcbb320ae8b5a
|
|
|
} else {
|
|
|
// No need to bother, we don't know how many pages are available.
|
|
|
diff --git a/ui/gtk/printing/print_dialog_gtk.cc b/ui/gtk/printing/print_dialog_gtk.cc
|
|
|
-index f2ed36e1258f4f3ef1bfce972e215e3d5d7335b6..405839e9f944f70106c1c203652044c3abfade3d 100644
|
|
|
+index f2ed36e1258f4f3ef1bfce972e215e3d5d7335b6..5b38bf1369a68546f0aeea8948abba995c65e7f7 100644
|
|
|
--- a/ui/gtk/printing/print_dialog_gtk.cc
|
|
|
+++ b/ui/gtk/printing/print_dialog_gtk.cc
|
|
|
@@ -239,6 +239,24 @@ void PrintDialogGtk::UpdateSettings(
|
|
|
|
|
|
gtk_print_settings_set_n_copies(gtk_settings_, settings->copies());
|
|
|
gtk_print_settings_set_collate(gtk_settings_, settings->collate());
|
|
|
-+
|
|
|
++
|
|
|
+ auto print_ranges = settings->ranges();
|
|
|
+ if (!print_ranges.empty()) {
|
|
|
+ // Tell the system that we only intend to print a subset of pages.
|