aboutsummaryrefslogtreecommitdiff
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.cc10
1 files changed, 5 insertions, 5 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 60986274920f..2d11a32224c0 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 2021-04-14 18:41:37 UTC
+--- ui/base/resource/resource_bundle.cc.orig 2021-07-19 18:45:43 UTC
+++ ui/base/resource/resource_bundle.cc
-@@ -808,7 +808,7 @@ void ResourceBundle::ReloadFonts() {
+@@ -817,7 +817,7 @@ void ResourceBundle::ReloadFonts() {
}
ScaleFactor ResourceBundle::GetMaxScaleFactor() const {
@@ -9,12 +9,12 @@
return max_scale_factor_;
#else
return GetSupportedScaleFactors().back();
-@@ -861,7 +861,7 @@ void ResourceBundle::InitSharedInstance(Delegate* dele
+@@ -870,7 +870,7 @@ void ResourceBundle::InitSharedInstance(Delegate* dele
// 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_APPLE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
-+#if defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \
+-#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
++#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \
defined(OS_WIN)
supported_scale_factors.push_back(SCALE_FACTOR_200P);
#endif