1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
|
From f40f0f994d6fbabf75f6acf796fa4b62809851c0 Mon Sep 17 00:00:00 2001
From: Tom Anderson <thomasanderson@chromium.org>
Date: Thu, 18 Aug 2022 23:00:41 +0000
Subject: [PATCH] Fix debug crash and log spam with
GTK3+Wayland+text-input-unstable-v3
This fixes a regression after [1]. The GTK IME doesn't work on
Wayland+GTK3, so this change skips GTK IME creation for that case.
This effectively restores the behavior to before [1].
[1] https://chromium-review.googlesource.com/c/chromium/src/+/3759236
Change-Id: I4019e8da6929489e302ba7f8699ad62ca604b4aa
Fixed: 1347979
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3836775
Auto-Submit: Thomas Anderson <thomasanderson@chromium.org>
Reviewed-by: Nick Yamane <nickdiego@igalia.com>
Commit-Queue: Nick Yamane <nickdiego@igalia.com>
Cr-Commit-Position: refs/heads/main@{#1036838}
---
ui/gtk/gtk_ui.cc | 2 +-
ui/gtk/gtk_ui_platform.h | 10 +++++++++-
ui/gtk/gtk_ui_platform_stub.cc | 6 ++++++
ui/gtk/gtk_ui_platform_stub.h | 2 ++
ui/gtk/wayland/gtk_ui_platform_wayland.cc | 12 ++++++++++++
ui/gtk/wayland/gtk_ui_platform_wayland.h | 2 ++
ui/gtk/x/gtk_ui_platform_x11.cc | 7 +++++++
ui/gtk/x/gtk_ui_platform_x11.h | 2 ++
8 files changed, 41 insertions(+), 2 deletions(-)
diff --git a/ui/gtk/gtk_ui.cc b/ui/gtk/gtk_ui.cc
index 1fbb58152c..dd42b1e87c 100644
--- a/ui/gtk/gtk_ui.cc
+++ b/ui/gtk/gtk_ui.cc
@@ -447,7 +447,7 @@ void GtkUi::SetWindowFrameAction(WindowFrameActionSource source,
std::unique_ptr<ui::LinuxInputMethodContext> GtkUi::CreateInputMethodContext(
ui::LinuxInputMethodContextDelegate* delegate) const {
- return std::make_unique<InputMethodContextImplGtk>(delegate);
+ return GetPlatform()->CreateInputMethodContext(delegate);
}
gfx::FontRenderParams GtkUi::GetDefaultFontRenderParams() const {
diff --git a/ui/gtk/gtk_ui_platform.h b/ui/gtk/gtk_ui_platform.h
index 390d90af83..633efbcf16 100644
--- a/ui/gtk/gtk_ui_platform.h
+++ b/ui/gtk/gtk_ui_platform.h
@@ -10,11 +10,15 @@
#include "ui/gfx/native_widget_types.h"
#include "ui/gtk/gtk_compat.h"
-using GdkKeymap = struct _GdkKeymap;
using GtkWindow = struct _GtkWindow;
using GtkWidget = struct _GtkWidget;
using GdkWindow = struct _GdkWindow;
+namespace ui {
+class LinuxInputMethodContext;
+class LinuxInputMethodContextDelegate;
+} // namespace ui
+
namespace gtk {
// GtkUiPlatform encapsulates platform-specific functionalities required by
@@ -52,6 +56,10 @@ class GtkUiPlatform {
// Presents |window|, doing all the necessary platform-specific operations
// needed, if any.
virtual void ShowGtkWindow(GtkWindow* window) = 0;
+
+ // Creates a new IME context or may return nullptr.
+ virtual std::unique_ptr<ui::LinuxInputMethodContext> CreateInputMethodContext(
+ ui::LinuxInputMethodContextDelegate* delegate) const = 0;
};
} // namespace gtk
diff --git a/ui/gtk/gtk_ui_platform_stub.cc b/ui/gtk/gtk_ui_platform_stub.cc
index 76746254ef..5f01c8bd8f 100644
--- a/ui/gtk/gtk_ui_platform_stub.cc
+++ b/ui/gtk/gtk_ui_platform_stub.cc
@@ -43,4 +43,10 @@ void GtkUiPlatformStub::ShowGtkWindow(GtkWindow* window) {
gtk_window_present(window);
}
+std::unique_ptr<ui::LinuxInputMethodContext>
+GtkUiPlatformStub::CreateInputMethodContext(
+ ui::LinuxInputMethodContextDelegate* delegate) const {
+ return nullptr;
+}
+
} // namespace gtk
diff --git a/ui/gtk/gtk_ui_platform_stub.h b/ui/gtk/gtk_ui_platform_stub.h
index ae186455bd..708e05ab04 100644
--- a/ui/gtk/gtk_ui_platform_stub.h
+++ b/ui/gtk/gtk_ui_platform_stub.h
@@ -26,6 +26,8 @@ class GtkUiPlatformStub : public GtkUiPlatform {
gfx::AcceleratedWidget parent) override;
void ClearTransientFor(gfx::AcceleratedWidget parent) override;
void ShowGtkWindow(GtkWindow* window) override;
+ std::unique_ptr<ui::LinuxInputMethodContext> CreateInputMethodContext(
+ ui::LinuxInputMethodContextDelegate* delegate) const override;
};
} // namespace gtk
diff --git a/ui/gtk/wayland/gtk_ui_platform_wayland.cc b/ui/gtk/wayland/gtk_ui_platform_wayland.cc
index 13fb58a84a..cae3475b14 100644
--- a/ui/gtk/wayland/gtk_ui_platform_wayland.cc
+++ b/ui/gtk/wayland/gtk_ui_platform_wayland.cc
@@ -11,7 +11,9 @@
#include "base/logging.h"
#include "ui/base/glib/glib_cast.h"
#include "ui/events/event_utils.h"
+#include "ui/gtk/gtk_compat.h"
#include "ui/gtk/gtk_util.h"
+#include "ui/gtk/input_method_context_impl_gtk.h"
#include "ui/linux/linux_ui_delegate.h"
namespace gtk {
@@ -145,4 +147,14 @@ void GtkUiPlatformWayland::OnHandleSetTransient(GtkWidget* widget,
}
}
+std::unique_ptr<ui::LinuxInputMethodContext>
+GtkUiPlatformWayland::CreateInputMethodContext(
+ ui::LinuxInputMethodContextDelegate* delegate) const {
+ // GDK3 doesn't have a way to create foreign wayland windows, so we can't
+ // translate from ui::KeyEvent to GdkEventKey for InputMethodContextImplGtk.
+ if (!GtkCheckVersion(4))
+ return nullptr;
+ return std::make_unique<InputMethodContextImplGtk>(delegate);
+}
+
} // namespace gtk
diff --git a/ui/gtk/wayland/gtk_ui_platform_wayland.h b/ui/gtk/wayland/gtk_ui_platform_wayland.h
index 2c444793db..315d6ced31 100644
--- a/ui/gtk/wayland/gtk_ui_platform_wayland.h
+++ b/ui/gtk/wayland/gtk_ui_platform_wayland.h
@@ -31,6 +31,8 @@ class GtkUiPlatformWayland : public GtkUiPlatform {
gfx::AcceleratedWidget parent) override;
void ClearTransientFor(gfx::AcceleratedWidget parent) override;
void ShowGtkWindow(GtkWindow* window) override;
+ std::unique_ptr<ui::LinuxInputMethodContext> CreateInputMethodContext(
+ ui::LinuxInputMethodContextDelegate* delegate) const override;
private:
GdkDisplay* GetDefaultGdkDisplay();
diff --git a/ui/gtk/x/gtk_ui_platform_x11.cc b/ui/gtk/x/gtk_ui_platform_x11.cc
index 5fa9d040c6..f7ba25c30c 100644
--- a/ui/gtk/x/gtk_ui_platform_x11.cc
+++ b/ui/gtk/x/gtk_ui_platform_x11.cc
@@ -19,6 +19,7 @@
#include "ui/gfx/x/xproto_util.h"
#include "ui/gtk/gtk_compat.h"
#include "ui/gtk/gtk_util.h"
+#include "ui/gtk/input_method_context_impl_gtk.h"
#include "ui/gtk/x/gtk_event_loop_x11.h"
#include "ui/linux/linux_ui_delegate.h"
@@ -114,4 +115,10 @@ void GtkUiPlatformX11::ShowGtkWindow(GtkWindow* window) {
static_cast<uint32_t>(ui::X11EventSource::GetInstance()->GetTimestamp()));
}
+std::unique_ptr<ui::LinuxInputMethodContext>
+GtkUiPlatformX11::CreateInputMethodContext(
+ ui::LinuxInputMethodContextDelegate* delegate) const {
+ return std::make_unique<InputMethodContextImplGtk>(delegate);
+}
+
} // namespace gtk
diff --git a/ui/gtk/x/gtk_ui_platform_x11.h b/ui/gtk/x/gtk_ui_platform_x11.h
index 3055b7d7ff..74011a8a1c 100644
--- a/ui/gtk/x/gtk_ui_platform_x11.h
+++ b/ui/gtk/x/gtk_ui_platform_x11.h
@@ -34,6 +34,8 @@ class GtkUiPlatformX11 : public GtkUiPlatform {
gfx::AcceleratedWidget parent) override;
void ClearTransientFor(gfx::AcceleratedWidget parent) override;
void ShowGtkWindow(GtkWindow* window) override;
+ std::unique_ptr<ui::LinuxInputMethodContext> CreateInputMethodContext(
+ ui::LinuxInputMethodContextDelegate* delegate) const override;
private:
GdkDisplay* GetGdkDisplay();
|