diff options
| author | Robert Nagy <rnagy@FreeBSD.org> | 2023-10-12 13:15:31 +0200 |
|---|---|---|
| committer | Robert Nagy <rnagy@FreeBSD.org> | 2023-10-12 13:38:44 +0200 |
| commit | d948a7220610aa9275272322cdb079f59ebab6ed (patch) | |
| tree | 9ec3f6ec0ab12875e841baa35e6fe8317de7f061 /www/chromium/files/patch-printing_print__settings.h | |
| parent | lang/erlang-runtime26: update to version 26.1.2 (diff) | |
www/chromium: update to 118.0.5993.70
Security: https://vuxml.freebsd.org/freebsd/07ee8c14-68f1-11ee-8290-a8a1599412c6.html
Diffstat (limited to 'www/chromium/files/patch-printing_print__settings.h')
| -rw-r--r-- | www/chromium/files/patch-printing_print__settings.h | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/www/chromium/files/patch-printing_print__settings.h b/www/chromium/files/patch-printing_print__settings.h index a0551d11eeed..f584a3f20ad4 100644 --- a/www/chromium/files/patch-printing_print__settings.h +++ b/www/chromium/files/patch-printing_print__settings.h @@ -1,15 +1,24 @@ ---- printing/print_settings.h.orig 2023-09-13 12:11:42 UTC +--- printing/print_settings.h.orig 2023-10-11 18:22:24 UTC +++ printing/print_settings.h -@@ -21,7 +21,7 @@ - #include "ui/gfx/geometry/rect.h" - #include "ui/gfx/geometry/size.h" +@@ -25,7 +25,7 @@ + #include "base/values.h" + #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include <map> #include "base/values.h" -@@ -74,7 +74,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings { +@@ -51,7 +51,7 @@ inline constexpr char kMacSystemPrintDialogDataPrintSe + "print_settings"; + #endif // BUILDFLAG(IS_MAC) + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + inline constexpr char kLinuxSystemPrintDialogDataPrinter[] = "printer_name"; + inline constexpr char kLinuxSystemPrintDialogDataPrintSettings[] = + "print_settings"; +@@ -101,7 +101,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings { std::string vendor_id; }; @@ -18,7 +27,7 @@ using AdvancedSettings = std::map<std::string, base::Value>; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -246,7 +246,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings { +@@ -276,7 +276,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings { pages_per_sheet_ = pages_per_sheet; } @@ -27,7 +36,7 @@ AdvancedSettings& advanced_settings() { return advanced_settings_; } const AdvancedSettings& advanced_settings() const { return advanced_settings_; -@@ -381,7 +381,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings { +@@ -429,7 +429,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings { // Number of pages per sheet. int pages_per_sheet_; |