flutter · dkwingsmt · May 26, 2021 · Apr 1, 2021 · Apr 1, 2021 · Apr 1, 2021
diff --git a/ci/licenses_golden/licenses_flutter b/ci/licenses_golden/licenses_flutter
@@ -1465,10 +1465,20 @@ FILE: ../../../flutter/shell/platform/linux/fl_json_message_codec.cc
 FILE: ../../../flutter/shell/platform/linux/fl_json_message_codec_test.cc
 FILE: ../../../flutter/shell/platform/linux/fl_json_method_codec.cc
 FILE: ../../../flutter/shell/platform/linux/fl_json_method_codec_test.cc
-FILE: ../../../flutter/shell/platform/linux/fl_key_event_plugin.cc
-FILE: ../../../flutter/shell/platform/linux/fl_key_event_plugin.h
-FILE: ../../../flutter/shell/platform/linux/fl_key_event_plugin_private.h
-FILE: ../../../flutter/shell/platform/linux/fl_key_event_plugin_test.cc
+FILE: ../../../flutter/shell/platform/linux/fl_key_channel_responder.cc
+FILE: ../../../flutter/shell/platform/linux/fl_key_channel_responder.h
+FILE: ../../../flutter/shell/platform/linux/fl_key_channel_responder_test.cc
+FILE: ../../../flutter/shell/platform/linux/fl_key_embedder_responder.cc
+FILE: ../../../flutter/shell/platform/linux/fl_key_embedder_responder.h
+FILE: ../../../flutter/shell/platform/linux/fl_key_embedder_responder_private.h
+FILE: ../../../flutter/shell/platform/linux/fl_key_embedder_responder_test.cc
+FILE: ../../../flutter/shell/platform/linux/fl_key_event.cc
+FILE: ../../../flutter/shell/platform/linux/fl_key_event.h
+FILE: ../../../flutter/shell/platform/linux/fl_key_responder.cc
+FILE: ../../../flutter/shell/platform/linux/fl_key_responder.h
+FILE: ../../../flutter/shell/platform/linux/fl_keyboard_manager.cc
+FILE: ../../../flutter/shell/platform/linux/fl_keyboard_manager.h
+FILE: ../../../flutter/shell/platform/linux/fl_keyboard_manager_test.cc
 FILE: ../../../flutter/shell/platform/linux/fl_message_codec.cc
 FILE: ../../../flutter/shell/platform/linux/fl_message_codec_test.cc
 FILE: ../../../flutter/shell/platform/linux/fl_method_call.cc
@@ -1513,6 +1523,8 @@ FILE: ../../../flutter/shell/platform/linux/fl_view.cc
 FILE: ../../../flutter/shell/platform/linux/fl_view_accessible.cc
 FILE: ../../../flutter/shell/platform/linux/fl_view_accessible.h
 FILE: ../../../flutter/shell/platform/linux/fl_view_private.h
+FILE: ../../../flutter/shell/platform/linux/key_mapping.cc
+FILE: ../../../flutter/shell/platform/linux/key_mapping.h
 FILE: ../../../flutter/shell/platform/linux/public/flutter_linux/fl_basic_message_channel.h
 FILE: ../../../flutter/shell/platform/linux/public/flutter_linux/fl_binary_codec.h
 FILE: ../../../flutter/shell/platform/linux/public/flutter_linux/fl_binary_messenger.h

diff --git a/shell/platform/darwin/macos/framework/Source/FlutterChannelKeyResponder.h b/shell/platform/darwin/macos/framework/Source/FlutterChannelKeyResponder.h
@@ -12,7 +12,7 @@
  * A primary responder of |FlutterKeyboardManager| that handles events by
  * sending the raw information through the method channel.
  *
- * This class corresponds to the RawKeyboard API in the framework.
+ * This class communicates with the RawKeyboard API in the framework.
  */
 @interface FlutterChannelKeyResponder : NSObject <FlutterKeyPrimaryResponder>
 

diff --git a/shell/platform/darwin/macos/framework/Source/FlutterEmbedderKeyResponder.h b/shell/platform/darwin/macos/framework/Source/FlutterEmbedderKeyResponder.h
@@ -19,7 +19,7 @@ typedef void (^FlutterSendEmbedderKeyEvent)(const FlutterKeyEvent& /* event */,
  * A primary responder of |FlutterKeyboardManager| that handles events by
  * sending the converted events through the embedder API.
  *
- * This class corresponds to the HardwareKeyboard API in the framework.
+ * This class communicates with the HardwareKeyboard API in the framework.
  */
 @interface FlutterEmbedderKeyResponder : NSObject <FlutterKeyPrimaryResponder>
 

diff --git a/shell/platform/darwin/macos/framework/Source/FlutterKeyboardManager.h b/shell/platform/darwin/macos/framework/Source/FlutterKeyboardManager.h
@@ -17,7 +17,7 @@
  * secondary responders.
  *
  * An event that is received by |handleEvent| is first dispatched to *all*
- * primary resopnders. Each primary responder responds *ascynchronously* with a
+ * primary responders. Each primary responder responds *ascynchronously* with a
  * boolean, indicating whether it handles the event.
  *
  * An event that is not handled by any primary responders is then passed to to
@@ -35,7 +35,7 @@
  * because in reality this class will only support 2 hardcoded ones (channel
  * and embedder), where the only purpose of supporting two is to support the
  * legacy API (channel) during the deprecation window, after which the channel
- * resopnder should be removed.
+ * responder should be removed.
  */
 @interface FlutterKeyboardManager : NSObject
 
@@ -50,7 +50,7 @@
 - (nonnull instancetype)initWithOwner:(nonnull NSResponder*)weakOwner;
 
 /**
- * Add a primary resopnder, which asynchronously decides whether to handle an
+ * Add a primary responder, which asynchronously decides whether to handle an
  * event.
  */
 - (void)addPrimaryResponder:(nonnull id<FlutterKeyPrimaryResponder>)responder;

diff --git a/shell/platform/embedder/test_utils/proc_table_replacement.h b/shell/platform/embedder/test_utils/proc_table_replacement.h
@@ -13,7 +13,7 @@
 // to run multiple times (e.g., using gtest_repeat).
 //
 // |proc| should be the name of an entry in FlutterEngineProcTable, such as
-// "initialize". |mock_impl| should be a lamba that replaces its implementation,
+// "Initialize". |mock_impl| should be a lamba that replaces its implementation,
 // taking the same arguments and returning the same type.
 #define MOCK_ENGINE_PROC(proc, mock_impl)                                      \
   ([&]() {                                                                     \

diff --git a/shell/platform/linux/BUILD.gn b/shell/platform/linux/BUILD.gn
@@ -74,12 +74,18 @@ source_set("flutter_linux_sources") {
              "fl_binary_messenger_private.h",
              "fl_dart_project_private.h",
              "fl_engine_private.h",
-             "fl_key_event_plugin_private.h",
+             "fl_keyboard_manager.h",
+             "fl_key_event.h",
+             "fl_key_responder.h",
+             "fl_key_channel_responder.h",
+             "fl_key_embedder_responder.h",
+             "fl_key_embedder_responder_private.h",
              "fl_method_call_private.h",
              "fl_method_channel_private.h",
              "fl_method_codec_private.h",
              "fl_plugin_registrar_private.h",
              "fl_standard_message_codec_private.h",
+             "key_mapping.h",
            ]
 
   configs += [ "//flutter/shell/platform/linux/config:gtk" ]
@@ -97,7 +103,11 @@ source_set("flutter_linux_sources") {
     "fl_gl_area.cc",
     "fl_json_message_codec.cc",
     "fl_json_method_codec.cc",
-    "fl_key_event_plugin.cc",
+    "fl_key_channel_responder.cc",
+    "fl_key_embedder_responder.cc",
+    "fl_key_event.cc",
+    "fl_key_responder.cc",
+    "fl_keyboard_manager.cc",
     "fl_message_codec.cc",
     "fl_method_call.cc",
     "fl_method_channel.cc",
@@ -120,6 +130,7 @@ source_set("flutter_linux_sources") {
     "fl_value.cc",
     "fl_view.cc",
     "fl_view_accessible.cc",
+    "key_mapping.cc",
   ]
 
   # Set flag to stop headers being directly included (library users should not do this)
@@ -166,7 +177,9 @@ executable("flutter_linux_unittests") {
     "fl_event_channel_test.cc",
     "fl_json_message_codec_test.cc",
     "fl_json_method_codec_test.cc",
-    "fl_key_event_plugin_test.cc",
+    "fl_key_channel_responder_test.cc",
+    "fl_key_embedder_responder_test.cc",
+    "fl_keyboard_manager_test.cc",
     "fl_message_codec_test.cc",
     "fl_method_channel_test.cc",
     "fl_method_codec_test.cc",

diff --git a/shell/platform/linux/fl_engine.cc b/shell/platform/linux/fl_engine.cc
@@ -639,6 +639,19 @@ void fl_engine_send_mouse_pointer_event(FlEngine* self,
   self->embedder_api.SendPointerEvent(self->engine, &fl_event, 1);
 }
 
+void fl_engine_send_key_event(FlEngine* self,
+                              const FlutterKeyEvent* event,
+                              FlutterKeyEventCallback callback,
+                              void* user_data) {
+  g_return_if_fail(FL_IS_ENGINE(self));
+
+  if (self->engine == nullptr) {
+    return;
+  }
+
+  self->embedder_api.SendKeyEvent(self->engine, event, callback, user_data);
+}
+
 void fl_engine_dispatch_semantics_action(FlEngine* self,
                                          uint64_t id,
                                          FlutterSemanticsAction action,

diff --git a/shell/platform/linux/fl_engine_private.h b/shell/platform/linux/fl_engine_private.h
@@ -163,6 +163,14 @@ void fl_engine_send_mouse_pointer_event(FlEngine* engine,
                                         double scroll_delta_y,
                                         int64_t buttons);
 
+/**
+ * fl_engine_send_key_event:
+ */
+void fl_engine_send_key_event(FlEngine* engine,
+                              const FlutterKeyEvent* event,
+                              FlutterKeyEventCallback callback,
+                              void* user_data);
+
 /**
  * fl_engine_dispatch_semantics_action:
  * @engine: an #FlEngine.