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.cc13
1 files changed, 2 insertions, 11 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 2cf54bb5571f..ece5e49482b8 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-09-24 04:26:38 UTC
+--- ui/base/resource/resource_bundle.cc.orig 2021-12-31 00:58:32 UTC
+++ ui/base/resource/resource_bundle.cc
-@@ -814,7 +814,7 @@ void ResourceBundle::ReloadFonts() {
+@@ -867,7 +867,7 @@ void ResourceBundle::ReloadFonts() {
}
ResourceScaleFactor ResourceBundle::GetMaxResourceScaleFactor() const {
@@ -9,12 +9,3 @@
return max_scale_factor_;
#else
return GetSupportedResourceScaleFactors().back();
-@@ -867,7 +867,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_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