diff options
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.cc | 16 |
1 files changed, 8 insertions, 8 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 4aa74afbac6e..cd5442a9e5c8 100644 --- a/www/chromium/files/patch-ui_base_resource_resource__bundle.cc +++ b/www/chromium/files/patch-ui_base_resource_resource__bundle.cc @@ -1,20 +1,20 @@ ---- ui/base/resource/resource_bundle.cc.orig 2020-09-08 19:14:28 UTC +--- ui/base/resource/resource_bundle.cc.orig 2020-11-13 06:37:05 UTC +++ ui/base/resource/resource_bundle.cc -@@ -841,7 +841,7 @@ void ResourceBundle::ReloadFonts() { +@@ -844,7 +844,7 @@ void ResourceBundle::ReloadFonts() { } ScaleFactor ResourceBundle::GetMaxScaleFactor() const { --#if defined(OS_WIN) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) return max_scale_factor_; #else return GetSupportedScaleFactors().back(); -@@ -894,7 +894,7 @@ void ResourceBundle::InitSharedInstance(Delegate* dele +@@ -897,7 +897,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_MACOSX) || defined(OS_LINUX) || defined(OS_WIN) -+#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) +-#if defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ ++#if defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ + defined(OS_WIN) supported_scale_factors.push_back(SCALE_FACTOR_200P); #endif - #endif |