summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-printing_print__settings.cc
diff options
context:
space:
mode:
authorRobert Nagy <robert@openbsd.org>2022-05-19 16:34:10 +0200
committerRene Ladan <rene@FreeBSD.org>2022-05-24 21:51:52 +0200
commit6dc209ad0a874c8fbc80859c217ecea69f6b0ade (patch)
tree5cc4e048c366844c7bc17e9a6bdebeab1e212521 /www/chromium/files/patch-printing_print__settings.cc
parenttextproc/jql: Update 4.0.3 -> 4.0.4 (diff)
www/chromium: update to 102.0.5005.61
Security: 40e2c35e-db99-11ec-b0cf-3065ec8fd3ec
Diffstat (limited to 'www/chromium/files/patch-printing_print__settings.cc')
-rw-r--r--www/chromium/files/patch-printing_print__settings.cc15
1 files changed, 3 insertions, 12 deletions
diff --git a/www/chromium/files/patch-printing_print__settings.cc b/www/chromium/files/patch-printing_print__settings.cc
index 38b6c7a5bc9a..c79bd7ac21e6 100644
--- a/www/chromium/files/patch-printing_print__settings.cc
+++ b/www/chromium/files/patch-printing_print__settings.cc
@@ -1,6 +1,6 @@
---- printing/print_settings.cc.orig 2022-02-28 16:54:41 UTC
+--- printing/print_settings.cc.orig 2022-05-19 14:06:27 UTC
+++ printing/print_settings.cc
-@@ -265,7 +265,7 @@ PrintSettings::PrintSettings(const PrintSettings& sett
+@@ -272,7 +272,7 @@ PrintSettings& PrintSettings::operator=(const PrintSet
#endif
is_modifiable_ = settings.is_modifiable_;
pages_per_sheet_ = settings.pages_per_sheet_;
@@ -9,16 +9,7 @@
for (const auto& item : settings.advanced_settings_)
advanced_settings_.emplace(item.first, item.second.Clone());
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -305,7 +305,7 @@ PrintSettings& PrintSettings::operator=(const PrintSet
- #endif
- is_modifiable_ = settings.is_modifiable_;
- pages_per_sheet_ = settings.pages_per_sheet_;
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- for (const auto& item : settings.advanced_settings_)
- advanced_settings_.emplace(item.first, item.second.Clone());
- #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -345,7 +345,7 @@ void PrintSettings::Clear() {
+@@ -312,7 +312,7 @@ void PrintSettings::Clear() {
#endif
is_modifiable_ = true;
pages_per_sheet_ = 1;