summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-ui_base_resource_resource__bundle.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-ui_base_resource_resource__bundle.cc')
-rw-r--r--www/chromium/files/patch-ui_base_resource_resource__bundle.cc20
1 files changed, 10 insertions, 10 deletions
diff --git a/www/chromium/files/patch-ui_base_resource_resource__bundle.cc b/www/chromium/files/patch-ui_base_resource_resource__bundle.cc
index 251276eb0e9c..e36c823b4353 100644
--- a/www/chromium/files/patch-ui_base_resource_resource__bundle.cc
+++ b/www/chromium/files/patch-ui_base_resource_resource__bundle.cc
@@ -1,6 +1,6 @@
---- ui/base/resource/resource_bundle.cc.orig 2017-12-15 02:04:51.000000000 +0100
-+++ ui/base/resource/resource_bundle.cc 2017-12-24 20:04:48.415881000 +0100
-@@ -707,7 +707,7 @@
+--- ui/base/resource/resource_bundle.cc.orig 2018-06-13 00:11:10.000000000 +0200
++++ ui/base/resource/resource_bundle.cc 2018-07-19 21:58:34.994550000 +0200
+@@ -708,7 +708,7 @@
}
ScaleFactor ResourceBundle::GetMaxScaleFactor() const {
@@ -9,12 +9,12 @@
return max_scale_factor_;
#else
return GetSupportedScaleFactors().back();
-@@ -762,7 +762,7 @@
- } else {
- supported_scale_factors.push_back(SCALE_FACTOR_100P);
- }
--#elif defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_WIN)
-+#elif defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
+@@ -754,7 +754,7 @@
+ // On platforms other than iOS, 100P is always a supported scale factor.
+ // For Windows we have a separate case in this function.
+ supported_scale_factors.push_back(SCALE_FACTOR_100P);
+-#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_WIN)
++#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
supported_scale_factors.push_back(SCALE_FACTOR_200P);
#endif
- ui::SetSupportedScaleFactors(supported_scale_factors);
+ #endif