summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-ui_base_resource_resource__bundle.cc
diff options
context:
space:
mode:
authorCarlos J. Puga Medina <cpm@FreeBSD.org>2017-03-17 23:42:52 +0000
committerCarlos J. Puga Medina <cpm@FreeBSD.org>2017-03-17 23:42:52 +0000
commite292ba0099ecff2e3e31fcb6cac28ac8e243c43d (patch)
tree1b74950e1b5750f688522886a8b73c01e56a18c5 /www/chromium/files/patch-ui_base_resource_resource__bundle.cc
parentgames/openra: update GeoLite2 to March snapshot (diff)
www/chromium: update to 57.0.2987.110
MFH: 2017Q1 Security: https://vuxml.freebsd.org/freebsd/a505d397-0758-11e7-8d8b-e8e0b747a45a.html
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.cc6
1 files changed, 3 insertions, 3 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 f5c6d5d704c7..6a846b08ddb9 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-01-26 00:49:31 UTC
+--- ui/base/resource/resource_bundle.cc.orig 2017-03-09 20:04:49 UTC
+++ ui/base/resource/resource_bundle.cc
-@@ -651,7 +651,7 @@ void ResourceBundle::ReloadFonts() {
+@@ -650,7 +650,7 @@ void ResourceBundle::ReloadFonts() {
}
ScaleFactor ResourceBundle::GetMaxScaleFactor() const {
@@ -9,7 +9,7 @@
return max_scale_factor_;
#else
return GetSupportedScaleFactors().back();
-@@ -711,7 +711,7 @@ void ResourceBundle::InitSharedInstance(
+@@ -709,7 +709,7 @@ void ResourceBundle::InitSharedInstance(
supported_scale_factors.push_back(SCALE_FACTOR_100P);
}
#elif defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_LINUX) || \