diff options
author | Conrad Meyer <cem@FreeBSD.org> | 2020-03-08 19:44:41 +0000 |
---|---|---|
committer | Conrad Meyer <cem@FreeBSD.org> | 2020-03-08 19:44:41 +0000 |
commit | 01b2b9b6d686bc18bef1de49a5bf1bc05ebdb09d (patch) | |
tree | fddb8430ac8db17b2895d797431b5dd7b48af59b /www/chromium/files/patch-ui_views_views__delegate.h | |
parent | graphics/mesa-libs: Change default to use DRI3 (diff) |
www/chromium: update to 80.0.3987.132
This addresses some security issues, including at least one Google admits was
being exploited in the wild. For more, see:
https://chromereleases.googleblog.com/2020/02/stable-channel-update-for-desktop_24.html
PR: 244625
Approved by: jrm, rene
Security: CVE-2020-6407, CVE-2020-6418 (in the wild), CVE-2020-6420
Differential Revision: https://reviews.freebsd.org/D23984
Diffstat (limited to 'www/chromium/files/patch-ui_views_views__delegate.h')
-rw-r--r-- | www/chromium/files/patch-ui_views_views__delegate.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/www/chromium/files/patch-ui_views_views__delegate.h b/www/chromium/files/patch-ui_views_views__delegate.h index 96b31d1cba7f..0f212e23ce6a 100644 --- a/www/chromium/files/patch-ui_views_views__delegate.h +++ b/www/chromium/files/patch-ui_views_views__delegate.h @@ -1,11 +1,11 @@ ---- ui/views/views_delegate.h.orig 2019-07-24 18:59:23 UTC +--- ui/views/views_delegate.h.orig 2020-03-03 18:54:07 UTC +++ ui/views/views_delegate.h -@@ -130,7 +130,7 @@ class VIEWS_EXPORT ViewsDelegate { +@@ -131,7 +131,7 @@ class VIEWS_EXPORT ViewsDelegate { // Returns true if the window passed in is in the Windows 8 metro // environment. virtual bool IsWindowInMetro(gfx::NativeWindow window) const; --#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_FREEBSD) +-#elif defined(OS_LINUX) && BUILDFLAG(ENABLE_DESKTOP_AURA) ++#elif (defined(OS_LINUX) || defined(OS_BSD)) && BUILDFLAG(ENABLE_DESKTOP_AURA) virtual gfx::ImageSkia* GetDefaultWindowIcon() const; #endif |