Rename

Author: dkwingsmt

ci/licenses_golden/licenses_flutter

@@ -1118,7 +1118,6 @@ FILE: ../../../flutter/lib/web_ui/lib/src/engine/initialization.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/js_interop/js_loader.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/js_interop/js_promise.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/key_map.g.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/keyboard.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/keyboard_binding.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/mouse_cursor.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/navigation.dart
@@ -1136,6 +1135,7 @@ FILE: ../../../flutter/lib/web_ui/lib/src/engine/plugins.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/pointer_binding.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/pointer_converter.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/profiler.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/raw_keyboard.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/rrect_renderer.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/safe_browser_api.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/semantics.dart

lib/web_ui/lib/src/engine.dart

@@ -104,7 +104,6 @@ export 'engine/initialization.dart';
 export 'engine/js_interop/js_loader.dart';
 export 'engine/js_interop/js_promise.dart';
 export 'engine/key_map.g.dart';
-export 'engine/keyboard.dart';
 export 'engine/keyboard_binding.dart';
 export 'engine/mouse_cursor.dart';
 export 'engine/navigation/history.dart';
@@ -121,6 +120,7 @@ export 'engine/plugins.dart';
 export 'engine/pointer_binding.dart';
 export 'engine/pointer_converter.dart';
 export 'engine/profiler.dart';
+export 'engine/raw_keyboard.dart';
 export 'engine/rrect_renderer.dart';
 export 'engine/safe_browser_api.dart';
 export 'engine/semantics/accessibility.dart';

lib/web_ui/lib/src/engine/keyboard_binding.dart

@@ -8,8 +8,8 @@ import '../engine.dart'  show registerHotRestartListener;
 import 'browser_detection.dart';
 import 'dom.dart';
 import 'key_map.g.dart';
-import 'keyboard.dart';
 import 'platform_dispatcher.dart';
+import 'raw_keyboard.dart';
 import 'safe_browser_api.dart';
 import 'semantics.dart';
 
@@ -105,13 +105,13 @@ class KeyboardBinding {
 
   KeyboardBinding._() {
     _converter = KeyboardConverter(_onKeyData, onMacOs: operatingSystem == OperatingSystem.macOs);
-    _rawKeyboard = Keyboard(onMacOs: operatingSystem == OperatingSystem.macOs);
+    _rawKeyboard = RawKeyboard(onMacOs: operatingSystem == OperatingSystem.macOs);
     _addEventListener('keydown', allowInterop(_handleDomEvent));
     _addEventListener('keyup', allowInterop(_handleDomEvent));
   }
 
   late final KeyboardConverter _converter;
-  late final Keyboard _rawKeyboard;
+  late final RawKeyboard _rawKeyboard;
   final Map<String, DomEventListener> _listeners = <String, DomEventListener>{};
 
   void _handleDomEvent(DomEvent event) {

lib/web_ui/lib/src/engine/keyboard.dart renamed to lib/web_ui/lib/src/engine/raw_keyboard.dart

@@ -10,16 +10,16 @@ import 'platform_dispatcher.dart';
 import 'services.dart';
 
 /// Provides keyboard bindings, such as the `flutter/keyevent` channel.
-class Keyboard {
-  Keyboard({this.onMacOs = false});
+class RawKeyboard {
+  RawKeyboard({this.onMacOs = false});
 
   /// A mapping of [KeyboardEvent.code] to [Timer].
   ///
   /// The timer is for when to synthesize a keyup for the [KeyboardEvent.code]
   /// if no repeat events were received.
   final Map<String, Timer> _keydownTimers = <String, Timer>{};
 
-  /// Uninitializes the [Keyboard] singleton.
+  /// Uninitializes the [RawKeyboard] singleton.
   ///
   /// After calling this method this object becomes unusable and [instance]
   /// becomes `null`. Call [initialize] again to initialize a new singleton.

lib/web_ui/test/canvaskit/initialization_services_vs_ui_test.dart

@@ -16,7 +16,6 @@ void testMain() {
     expect(windowFlutterCanvasKit, isNull);
 
     expect(findGlassPane(), isNull);
-    expect(Keyboard.instance, isNull);
     expect(MouseCursor.instance, isNull);
     expect(KeyboardBinding.instance, isNull);
     expect(PointerBinding.instance, isNull);
@@ -27,15 +26,13 @@ void testMain() {
     expect(windowFlutterCanvasKit, isNotNull);
 
     expect(findGlassPane(), isNull);
-    expect(Keyboard.instance, isNull);
     expect(MouseCursor.instance, isNull);
     expect(KeyboardBinding.instance, isNull);
     expect(PointerBinding.instance, isNull);
 
     // Now UI should be taken over by Flutter.
     await initializeEngineUi();
     expect(findGlassPane(), isNotNull);
-    expect(Keyboard.instance, isNotNull);
     expect(MouseCursor.instance, isNotNull);
     expect(KeyboardBinding.instance, isNotNull);
     expect(PointerBinding.instance, isNotNull);

lib/web_ui/test/keyboard_test.dart renamed to lib/web_ui/test/raw_keyboard_test.dart

@@ -10,7 +10,7 @@ import 'package:test/bootstrap/browser.dart';
 import 'package:test/test.dart';
 import 'package:ui/src/engine/browser_detection.dart';
 import 'package:ui/src/engine/dom.dart';
-import 'package:ui/src/engine/keyboard.dart';
+import 'package:ui/src/engine/raw_keyboard.dart';
 import 'package:ui/src/engine/services.dart';
 import 'package:ui/ui.dart' as ui;
 
@@ -19,7 +19,7 @@ void main() {
 }
 
 void testMain() {
-  group('Keyboard', () {
+  group('RawKeyboard', () {
     /// Used to save and restore [ui.window.onPlatformMessage] after each test.
     ui.PlatformMessageCallback? savedCallback;
 
@@ -32,7 +32,7 @@ void testMain() {
     });
 
     test('dispatches keyup to flutter/keyevent channel', () {
-      final Keyboard keyboard = Keyboard();
+      final RawKeyboard keyboard = RawKeyboard();
 
       String? channelReceived;
       Map<String, dynamic>? dataReceived;
@@ -64,7 +64,7 @@ void testMain() {
         skip: browserEngine == BrowserEngine.edge);
 
     test('dispatches keydown to flutter/keyevent channel', () {
-      final Keyboard keyboard = Keyboard();
+      final RawKeyboard keyboard = RawKeyboard();
 
       String? channelReceived;
       Map<String, dynamic>? dataReceived;
@@ -97,7 +97,7 @@ void testMain() {
         skip: browserEngine == BrowserEngine.edge);
 
     test('dispatches correct meta state', () {
-      final Keyboard keyboard = Keyboard();
+      final RawKeyboard keyboard = RawKeyboard();
 
       Map<String, dynamic>? dataReceived;
       ui.window.onPlatformMessage = (String channel, ByteData? data,
@@ -153,7 +153,7 @@ void testMain() {
         skip: browserEngine == BrowserEngine.edge);
 
     test('dispatches repeat events', () {
-      final Keyboard keyboard = Keyboard();
+      final RawKeyboard keyboard = RawKeyboard();
 
       final List<Map<String, dynamic>> messages = <Map<String, dynamic>>[];
       ui.window.onPlatformMessage = (String channel, ByteData? data,
@@ -211,7 +211,7 @@ void testMain() {
         skip: browserEngine == BrowserEngine.edge);
 
     test('prevents default when key is handled by the framework', () {
-      final Keyboard keyboard = Keyboard();
+      final RawKeyboard keyboard = RawKeyboard();
 
       int count = 0;
       ui.window.onPlatformMessage = (String channel, ByteData? data,
@@ -235,7 +235,7 @@ void testMain() {
     });
 
     test("Doesn't prevent default when key is not handled by the framework", () {
-      final Keyboard keyboard = Keyboard();
+      final RawKeyboard keyboard = RawKeyboard();
 
       int count = 0;
       ui.window.onPlatformMessage = (String channel, ByteData? data,
@@ -268,7 +268,7 @@ void testMain() {
         //
         // There's no `keyup(i)`. The web engine is expected to synthesize a
         // `keyup(i)` event.
-        final Keyboard keyboard = Keyboard(onMacOs: true);
+        final RawKeyboard keyboard = RawKeyboard(onMacOs: true);
 
         final List<Map<String, dynamic>> messages = <Map<String, dynamic>>[];
         ui.window.onPlatformMessage = (String channel, ByteData? data,
@@ -396,7 +396,7 @@ void testMain() {
     testFakeAsync(
       'On macOS, do not synthesize keyup when we receive repeat events',
       (FakeAsync async) {
-        final Keyboard keyboard = Keyboard(onMacOs: true);
+        final RawKeyboard keyboard = RawKeyboard(onMacOs: true);
 
         final List<Map<String, dynamic>> messages = <Map<String, dynamic>>[];
         ui.window.onPlatformMessage = (String channel, ByteData? data,
@@ -484,7 +484,7 @@ void testMain() {
     testFakeAsync(
       'On macOS, do not synthesize keyup when keys are not affected by meta modifiers',
       (FakeAsync async) {
-        final Keyboard keyboard = Keyboard();
+        final RawKeyboard keyboard = RawKeyboard();
 
         final List<Map<String, dynamic>> messages = <Map<String, dynamic>>[];
         ui.window.onPlatformMessage = (String channel, ByteData? data,
@@ -516,7 +516,7 @@ void testMain() {
     );
 
     testFakeAsync('On macOS, do not synthesize keyup for meta keys', (FakeAsync async) {
-      final Keyboard keyboard = Keyboard(onMacOs: true);
+      final RawKeyboard keyboard = RawKeyboard(onMacOs: true);
 
       final List<Map<String, dynamic>> messages = <Map<String, dynamic>>[];
       ui.window.onPlatformMessage = (String channel, ByteData? data,
@@ -584,7 +584,7 @@ void testMain() {
     testFakeAsync(
       'On non-macOS, do not synthesize keyup for shortcuts',
       (FakeAsync async) {
-        final Keyboard keyboard = Keyboard(onMacOs: false);
+        final RawKeyboard keyboard = RawKeyboard(onMacOs: false);
 
         final List<Map<String, dynamic>> messages = <Map<String, dynamic>>[];
         ui.window.onPlatformMessage = (String channel, ByteData? data,
@@ -650,7 +650,7 @@ void testMain() {
 }
 
 DomKeyboardEvent dispatchKeyboardEvent(
-  Keyboard keyboard,
+  RawKeyboard keyboard,
   String type, {
   String? key,
   String? code,