diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2021-04-06 08:40:01 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2021-04-06 08:46:52 +0000 |
| commit | 1227b53ed1c53ea13efeac2bfe3fae5532c529ec (patch) | |
| tree | 551daaabc2287f94c3b2d7b59c0cc2a235156540 /www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc | |
| parent | a8416100c4e9b0dd5090c78d09ef6a94293b3c02 (diff) | |
| download | ports-1227b53ed1c53ea13efeac2bfe3fae5532c529ec.tar.gz ports-1227b53ed1c53ea13efeac2bfe3fae5532c529ec.zip | |
www/chromium: update to 89.0.4389.114
Submitted by: Matthias Wolf via github
Security: https://www.vuxml.org/freebsd/bddadaa4-9227-11eb-99c5-e09467587c17.html
Diffstat (limited to 'www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc')
| -rw-r--r-- | www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc b/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc index 8cddfe54d24e..1a3da51a3967 100644 --- a/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc +++ b/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc @@ -1,20 +1,20 @@ ---- content/shell/browser/shell_browser_main_parts.cc.orig 2021-01-18 21:28:58 UTC +--- content/shell/browser/shell_browser_main_parts.cc.orig 2021-03-12 23:57:24 UTC +++ content/shell/browser/shell_browser_main_parts.cc -@@ -54,7 +54,7 @@ +@@ -55,7 +55,7 @@ #if defined(USE_AURA) && defined(USE_X11) #include "ui/events/devices/x11/touch_factory_x11.h" // nogncheck #endif --#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX) -+#if !defined(OS_CHROMEOS) && defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD)) +-#if defined(USE_AURA) && (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++#if defined(USE_AURA) && (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) #include "ui/base/ime/init/input_method_initializer.h" #endif - #if defined(OS_CHROMEOS) -@@ -136,7 +136,7 @@ void ShellBrowserMainParts::PostMainMessageLoopStart() + #if BUILDFLAG(IS_CHROMEOS_ASH) +@@ -137,7 +137,7 @@ void ShellBrowserMainParts::PostMainMessageLoopStart() } int ShellBrowserMainParts::PreEarlyInitialization() { --#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX) -+#if (!defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX)) || defined(OS_BSD) +-#if defined(USE_AURA) && (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++#if defined(USE_AURA) && (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) ui::InitializeInputMethodForTesting(); #endif #if defined(OS_ANDROID) |