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>2019-04-05 12:01:25 +0000
committerCarlos J. Puga Medina <cpm@FreeBSD.org>2019-04-05 12:01:25 +0000
commitd90bf58cf83c548d4ed98f8c6ee55a6b84af0834 (patch)
treee364221b071fc7af079027aa7e6ac3d25435767a /www/chromium/files/patch-ui_base_resource_resource__bundle.cc
parentUpdate CMake to latest release, 3.14.1 (diff)
www/chromium: Update to 73.0.3683.86
- Make existing patches apply cleanly Changelog: https://chromium.googlesource.com/chromium/src/+log/72.0.3626.121..73.0.3683.86?pretty=fuller&n=10000 Submitted by: Matthias Wolf MFH: 2019Q2
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.cc8
1 files changed, 4 insertions, 4 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 e36c823b4353..c7c978f465e1 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 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 @@
+--- ui/base/resource/resource_bundle.cc.orig 2019-03-11 22:01:19 UTC
++++ ui/base/resource/resource_bundle.cc
+@@ -692,7 +692,7 @@ void ResourceBundle::ReloadFonts() {
}
ScaleFactor ResourceBundle::GetMaxScaleFactor() const {
@@ -9,7 +9,7 @@
return max_scale_factor_;
#else
return GetSupportedScaleFactors().back();
-@@ -754,7 +754,7 @@
+@@ -745,7 +745,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);