diff options
Diffstat (limited to 'www/chromium/files/patch-ui_base_ime_init_input__method__initializer.cc')
-rw-r--r-- | www/chromium/files/patch-ui_base_ime_init_input__method__initializer.cc | 31 |
1 files changed, 11 insertions, 20 deletions
diff --git a/www/chromium/files/patch-ui_base_ime_init_input__method__initializer.cc b/www/chromium/files/patch-ui_base_ime_init_input__method__initializer.cc index 2b686551d206..792c782a234f 100644 --- a/www/chromium/files/patch-ui_base_ime_init_input__method__initializer.cc +++ b/www/chromium/files/patch-ui_base_ime_init_input__method__initializer.cc @@ -1,4 +1,4 @@ ---- ui/base/ime/init/input_method_initializer.cc.orig 2022-02-28 16:54:41 UTC +--- ui/base/ime/init/input_method_initializer.cc.orig 2022-08-31 12:19:35 UTC +++ ui/base/ime/init/input_method_initializer.cc @@ -10,7 +10,7 @@ #include "build/chromeos_buildflags.h" @@ -6,33 +6,24 @@ #if !BUILDFLAG(IS_CHROMEOS_ASH) && defined(USE_AURA) && \ - (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) + (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) - #include "base/check.h" - #include "ui/base/ime/linux/fake_input_method_context_factory.h" + #include "ui/base/ime/linux/fake_input_method_context.h" + #include "ui/base/ime/linux/linux_input_method_context_factory.h" #elif BUILDFLAG(IS_WIN) -@@ -20,7 +20,7 @@ - - namespace { - --#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) - const ui::LinuxInputMethodContextFactory* - g_linux_input_method_context_factory_for_testing; - #endif -@@ -43,7 +43,7 @@ void ShutdownInputMethod() { +@@ -34,7 +34,7 @@ void ShutdownInputMethod() { void InitializeInputMethodForTesting() { #if !BUILDFLAG(IS_CHROMEOS_ASH) && defined(USE_AURA) && \ - (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) + (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) - if (!g_linux_input_method_context_factory_for_testing) - g_linux_input_method_context_factory_for_testing = - new FakeInputMethodContextFactory(); -@@ -61,7 +61,7 @@ void InitializeInputMethodForTesting() { + GetInputMethodContextFactoryForTest() = + base::BindRepeating([](LinuxInputMethodContextDelegate* delegate) + -> std::unique_ptr<LinuxInputMethodContext> { +@@ -47,7 +47,7 @@ void InitializeInputMethodForTesting() { void ShutdownInputMethodForTesting() { #if !BUILDFLAG(IS_CHROMEOS_ASH) && defined(USE_AURA) && \ - (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) + (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) - const LinuxInputMethodContextFactory* factory = - LinuxInputMethodContextFactory::instance(); - CHECK(!factory || factory == g_linux_input_method_context_factory_for_testing) + // The function owns the factory (as a static variable that's returned by + // reference), so setting this to an empty factory will free the old one. + GetInputMethodContextFactoryForTest() = LinuxInputMethodContextFactory(); |