[web] Move ui files to lib/

ci/licenses_golden/licenses_flutter

@@ -493,6 +493,22 @@ FILE: ../../../flutter/lib/ui/window/viewport_metrics.cc
 FILE: ../../../flutter/lib/ui/window/viewport_metrics.h
 FILE: ../../../flutter/lib/ui/window/window.cc
 FILE: ../../../flutter/lib/ui/window/window.h
+FILE: ../../../flutter/lib/web_ui/lib/annotations.dart
+FILE: ../../../flutter/lib/web_ui/lib/canvas.dart
+FILE: ../../../flutter/lib/web_ui/lib/channel_buffers.dart
+FILE: ../../../flutter/lib/web_ui/lib/compositing.dart
+FILE: ../../../flutter/lib/web_ui/lib/geometry.dart
+FILE: ../../../flutter/lib/web_ui/lib/hash_codes.dart
+FILE: ../../../flutter/lib/web_ui/lib/initialization.dart
+FILE: ../../../flutter/lib/web_ui/lib/key.dart
+FILE: ../../../flutter/lib/web_ui/lib/lerp.dart
+FILE: ../../../flutter/lib/web_ui/lib/natives.dart
+FILE: ../../../flutter/lib/web_ui/lib/painting.dart
+FILE: ../../../flutter/lib/web_ui/lib/path.dart
+FILE: ../../../flutter/lib/web_ui/lib/path_metrics.dart
+FILE: ../../../flutter/lib/web_ui/lib/platform_dispatcher.dart
+FILE: ../../../flutter/lib/web_ui/lib/pointer.dart
+FILE: ../../../flutter/lib/web_ui/lib/semantics.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/alarm_clock.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/assets.dart
@@ -641,26 +657,10 @@ FILE: ../../../flutter/lib/web_ui/lib/src/engine/util.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/validators.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/vector_math.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/window.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/ui/annotations.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/ui/canvas.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/ui/channel_buffers.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/ui/compositing.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/ui/geometry.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/ui/hash_codes.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/ui/initialization.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/ui/key.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/ui/lerp.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/ui/natives.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/ui/painting.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/ui/path.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/ui/path_metrics.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/ui/platform_dispatcher.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/ui/pointer.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/ui/semantics.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/ui/text.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/ui/tile_mode.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/ui/window.dart
+FILE: ../../../flutter/lib/web_ui/lib/text.dart
+FILE: ../../../flutter/lib/web_ui/lib/tile_mode.dart
 FILE: ../../../flutter/lib/web_ui/lib/ui.dart
+FILE: ../../../flutter/lib/web_ui/lib/window.dart
 FILE: ../../../flutter/lib/web_ui/tool/unicode_sync_script.dart
 FILE: ../../../flutter/runtime/dart_isolate.cc
 FILE: ../../../flutter/runtime/dart_isolate.h

lib/ui/channel_buffers.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 
-// KEEP THIS SYNCHRONIZED WITH ../web_ui/lib/src/ui/channel_buffers.dart
+// KEEP THIS SYNCHRONIZED WITH ../web_ui/lib/channel_buffers.dart
 
 // @dart = 2.12
 part of dart.ui;

lib/ui/semantics.dart

@@ -325,7 +325,7 @@ class SemanticsFlag {
   // value in testing/dart/semantics_test.dart, or tests will fail. Also,
   // please update the Flag enum in
   // flutter/shell/platform/android/io/flutter/view/AccessibilityBridge.java,
-  // and the SemanticsFlag class in lib/web_ui/lib/src/ui/semantics.dart.
+  // and the SemanticsFlag class in lib/web_ui/lib/semantics.dart.
 
   /// The semantics node has the quality of either being "checked" or "unchecked".
   ///
@@ -643,7 +643,7 @@ class SemanticsFlag {
 
 // When adding a new StringAttribute, the classes in these files must be
 // updated as well.
-//  * engine/src/flutter/lib/web_ui/lib/src/ui/semantics.dart
+//  * engine/src/flutter/lib/web_ui/lib/semantics.dart
 //  * engine/src/flutter/lib/ui/semantics/string_attribute.h
 //  * engine/src/flutter/shell/platform/android/io/flutter/view/AccessibilityBridge.java
 //  * engine/src/flutter/lib/web_ui/test/engine/semantics/semantics_api_test.dart

lib/ui/semantics/string_attribute.h

@@ -18,7 +18,7 @@ using StringAttributes = std::vector<StringAttributePtr>;
 // When adding a new StringAttributeType, the classes in these file must be
 // updated as well.
 //  * engine/src/flutter/lib/ui/semantics.dart
-//  * engine/src/flutter/lib/web_ui/lib/src/ui/semantics.dart
+//  * engine/src/flutter/lib/web_ui/lib/semantics.dart
 //  * engine/src/flutter/shell/platform/android/io/flutter/view/AccessibilityBridge.java
 //  * engine/src/flutter/lib/web_ui/test/engine/semantics/semantics_api_test.dart
 //  * engine/src/flutter/testing/dart/semantics_test.dart

lib/web_ui/lib/src/engine/platform_dispatcher.dart

@@ -984,7 +984,7 @@ class EnginePlatformDispatcher extends ui.PlatformDispatcher {
   /// Lazily initialized when the `defaultRouteName` getter is invoked.
   ///
   /// The reason for the lazy initialization is to give enough time for the app
-  /// to set [locationStrategy] in `lib/src/ui/initialization.dart`.
+  /// to set [locationStrategy] in `lib/initialization.dart`.
   String? _defaultRouteName;
 
   @visibleForTesting

lib/web_ui/lib/ui.dart

@@ -16,25 +16,25 @@ import 'dart:typed_data';
 
 import 'src/engine.dart' as engine;
 
-part 'src/ui/annotations.dart';
-part 'src/ui/canvas.dart';
-part 'src/ui/channel_buffers.dart';
-part 'src/ui/compositing.dart';
-part 'src/ui/geometry.dart';
-part 'src/ui/hash_codes.dart';
-part 'src/ui/initialization.dart';
-part 'src/ui/key.dart';
-part 'src/ui/lerp.dart';
-part 'src/ui/natives.dart';
-part 'src/ui/painting.dart';
-part 'src/ui/path.dart';
-part 'src/ui/path_metrics.dart';
-part 'src/ui/platform_dispatcher.dart';
-part 'src/ui/pointer.dart';
-part 'src/ui/semantics.dart';
-part 'src/ui/text.dart';
-part 'src/ui/tile_mode.dart';
-part 'src/ui/window.dart';
+part 'annotations.dart';
+part 'canvas.dart';
+part 'channel_buffers.dart';
+part 'compositing.dart';
+part 'geometry.dart';
+part 'hash_codes.dart';
+part 'initialization.dart';
+part 'key.dart';
+part 'lerp.dart';
+part 'natives.dart';
+part 'painting.dart';
+part 'path.dart';
+part 'path_metrics.dart';
+part 'platform_dispatcher.dart';
+part 'pointer.dart';
+part 'semantics.dart';
+part 'text.dart';
+part 'tile_mode.dart';
+part 'window.dart';
 
 /// Provides a compile time constant to customize flutter framework and other
 /// users of ui engine for web runtime.

shell/platform/android/io/flutter/view/AccessibilityBridge.java

@@ -2161,7 +2161,7 @@ private static class CustomAccessibilityAction {
   // When adding a new StringAttributeType, the classes in these file must be
   // updated as well.
   //  * engine/src/flutter/lib/ui/semantics.dart
-  //  * engine/src/flutter/lib/web_ui/lib/src/ui/semantics.dart
+  //  * engine/src/flutter/lib/web_ui/lib/semantics.dart
   //  * engine/src/flutter/lib/ui/semantics/string_attribute.h
 
   private enum StringAttributeType {

web_sdk/BUILD.gn

@@ -14,12 +14,10 @@ dart_sdk_package_config = "//third_party/dart/.dart_tool/package_config.json"
 web_ui_sources = exec_script("//third_party/dart/tools/list_dart_files.py",
                              [
                                "absolute",
-                               rebase_path("//flutter/lib/web_ui/lib/src/ui"),
+                               rebase_path("//flutter/lib/web_ui/lib"),
                              ],
                              "list lines")
 
-web_ui_sources += [ "//flutter/lib/web_ui/lib/ui.dart" ]
-
 web_engine_sources =
     exec_script("//third_party/dart/tools/list_dart_files.py",
                 [