diff options
| author | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2017-02-06 19:29:36 +0000 |
|---|---|---|
| committer | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2017-02-06 19:29:36 +0000 |
| commit | 8d28aa8db0c717bef863b7a7630f48cf3870ffb1 (patch) | |
| tree | ae8b6c930932585d45e586480457898519baa1ce /www/chromium/files/patch-ui_base_resource_resource__bundle.cc | |
| parent | Upgrade to 0.11.0 (diff) | |
www/chromium: update to 56.0.2924.87
- Use system FFmpeg instead of embedded code copy [1]
- Disable PULSEAUDIO option [2]
- Sort _DEPENDS variables
- Regenerate patches with make makepatch
PR: 215271 [1], 216327 [2]
Reported by: jbeich [1]
Approved by: rene
MFH: 2017Q1
Security: https://vuxml.freebsd.org/freebsd/4b9ca994-e3d9-11e6-813d-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.cc | 8 |
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 e5c803678063..f5c6d5d704c7 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 2016-07-20 22:03:45.000000000 +0300 -+++ ui/base/resource/resource_bundle.cc 2016-08-01 22:13:38.986790000 +0300 -@@ -626,7 +626,7 @@ +--- ui/base/resource/resource_bundle.cc.orig 2017-01-26 00:49:31 UTC ++++ ui/base/resource/resource_bundle.cc +@@ -651,7 +651,7 @@ void ResourceBundle::ReloadFonts() { } ScaleFactor ResourceBundle::GetMaxScaleFactor() const { @@ -9,7 +9,7 @@ return max_scale_factor_; #else return GetSupportedScaleFactors().back(); -@@ -686,7 +686,7 @@ +@@ -711,7 +711,7 @@ void ResourceBundle::InitSharedInstance( supported_scale_factors.push_back(SCALE_FACTOR_100P); } #elif defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_LINUX) || \ |