diff options
| author | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2018-08-18 14:21:02 +0000 |
|---|---|---|
| committer | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2018-08-18 14:21:02 +0000 |
| commit | 13ee5b072d4e3ee1e06f308014d7f298da681f62 (patch) | |
| tree | 2c29f123993acaded9899f4ff728f288f25bdbc3 /www/iridium/files/patch-ui_base_resource_resource__bundle.cc | |
| parent | security/n2n: Cleanup Makefile (diff) | |
www/iridium: Update to 2018.5.67
Diffstat (limited to 'www/iridium/files/patch-ui_base_resource_resource__bundle.cc')
| -rw-r--r-- | www/iridium/files/patch-ui_base_resource_resource__bundle.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/www/iridium/files/patch-ui_base_resource_resource__bundle.cc b/www/iridium/files/patch-ui_base_resource_resource__bundle.cc index 003e7f84f944..e36c823b4353 100644 --- a/www/iridium/files/patch-ui_base_resource_resource__bundle.cc +++ b/www/iridium/files/patch-ui_base_resource_resource__bundle.cc @@ -1,20 +1,20 @@ ---- ui/base/resource/resource_bundle.cc.orig 2017-04-19 19:06:54 UTC -+++ ui/base/resource/resource_bundle.cc -@@ -661,7 +661,7 @@ void ResourceBundle::ReloadFonts() { +--- 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 { --#if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX) -+#if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) return max_scale_factor_; #else return GetSupportedScaleFactors().back(); -@@ -719,7 +719,7 @@ void ResourceBundle::InitSharedInstance( - supported_scale_factors.push_back(SCALE_FACTOR_100P); - } - #elif defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_LINUX) || \ -- defined(OS_WIN) -+ 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 |