Merge remote-tracking branch 'upstream/master' into block-level-text-height-behavior

Author: LongCatIsLooong

BUILD.gn

@@ -135,15 +135,15 @@ group("flutter") {
     # embeddings are being built.
     if (enable_desktop_embeddings) {
       public_deps += [
-        "//flutter/shell/platform/common/cpp:common_cpp_core_unittests",
-        "//flutter/shell/platform/common/cpp/client_wrapper:client_wrapper_unittests",
+        "//flutter/shell/platform/common:common_cpp_core_unittests",
+        "//flutter/shell/platform/common/client_wrapper:client_wrapper_unittests",
       ]
 
       if (!is_fuchsia) {
         # These tests require the embedder and thus cannot run on fuchsia.
         # TODO(): Enable when embedder works on fuchsia.
         public_deps +=
-            [ "//flutter/shell/platform/common/cpp:common_cpp_unittests" ]
+            [ "//flutter/shell/platform/common:common_cpp_unittests" ]
 
         # These tests require GLFW and thus cannot run on fuchsia.
         public_deps += [ "//flutter/shell/platform/glfw/client_wrapper:client_wrapper_glfw_unittests" ]

DEPS

@@ -27,15 +27,15 @@ vars = {
   'skia_git': 'https://skia.googlesource.com',
   # OCMock is for testing only so there is no google clone
   'ocmock_git': 'https://github.com/erikdoe/ocmock.git',
-  'skia_revision': '9ff7b8d675591ad2ca8bdbb9cfbd30cdef0f146c',
+  'skia_revision': '62b039b36d4dc289adde4cfe50b0d8636a4cd4a8',
 
   # When updating the Dart revision, ensure that all entries that are
   # dependencies of Dart are also updated to match the entries in the
   # Dart SDK's DEPS file for that revision of Dart. The DEPS file for
   # Dart is: https://github.com/dart-lang/sdk/blob/master/DEPS.
   # You can use //tools/dart/create_updated_flutter_deps.py to produce
   # updated revision list of existing dependencies.
-  'dart_revision': '75251de89baf49c2b3722abde3fd79fb4a710f50',
+  'dart_revision': '02230d7386c7c645a86a1812161c19b8253cae9d',
 
   # WARNING: DO NOT EDIT MANUALLY
   # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -56,7 +56,7 @@ vars = {
   'dart_shelf_packages_handler_tag': '2.0.0',
   'dart_shelf_proxy_tag': '0.1.0+7',
   'dart_shelf_static_rev': '779a6e99b320ce9ed4ff6b88bd0cdc40ea5c62c4',
-  'dart_sse_tag': '9a486d058a17e880afa9cc1c3c0dd8bad726bcbc',
+  'dart_sse_tag': 'e93a783755b9b048b9156f795461d17a5ece9ce8',
   'dart_stack_trace_tag': '6788afc61875079b71b3d1c3e65aeaa6a25cbc2f',
   'dart_stream_channel_tag': 'd7251e61253ec389ee6e045ee1042311bced8f1d',
   'dart_typed_data_tag': 'f94fc57b8e8c0e4fe4ff6cfd8290b94af52d3719',
@@ -100,7 +100,7 @@ allowed_hosts = [
 ]
 
 deps = {
-  'src': 'https://github.com/flutter/buildroot.git' + '@' + '7565131390a39d9d6c460545d7992d76a0faa262',
+  'src': 'https://github.com/flutter/buildroot.git' + '@' + 'bc399c09daea4df5ef557d274062ec01292ec906',
 
    # Fuchsia compatibility
    #
@@ -296,7 +296,7 @@ deps = {
    Var('dart_git') + '/source_maps.git@53eb92ccfe6e64924054f83038a534b959b12b3e',
 
   'src/third_party/dart/third_party/pkg/source_span':
-   Var('dart_git') + '/source_span.git@49ff31eabebed0da0ae6634124f8ba5c6fbf57f1',
+   Var('dart_git') + '/source_span.git@aecb614eac3caa333658493b31a32b4e904cb0a4',
 
   'src/third_party/dart/third_party/pkg/sse':
    Var('dart_git') + '/sse.git' + '@' + Var('dart_sse_tag'),
@@ -344,7 +344,7 @@ deps = {
    Var('dart_git') + '/package_config.git@0e208cb5a9482d780c47627368d3f5bdc409f37b',
 
   'src/third_party/dart/tools/sdks':
-   {'packages': [{'version': 'version:2.12.0-133.2.beta', 'package': 'dart/dart-sdk/${{platform}}'}], 'dep_type': 'cipd'},
+   {'packages': [{'version': 'version:2.12.0-259.8.beta', 'package': 'dart/dart-sdk/${{platform}}'}], 'dep_type': 'cipd'},
 
   # WARNING: end of dart dependencies list that is cleaned up automatically - see create_updated_flutter_deps.py.
 
@@ -515,7 +515,7 @@ deps = {
     'packages': [
       {
         'package': 'fuchsia/third_party/clang/linux-amd64',
-        'version': '1Wa1KIWqFodI7MyWcK3V1py3mdLwYYWY2KOaeyIR-roC'
+        'version': '6BYbqFtrHE9UvQ1kBdTLr3JsLf86E3tng1Ualm6bzWIC'
       }
     ],
     'condition': 'host_os == "linux"',
@@ -541,7 +541,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/mac-amd64',
-        'version': 'CZUusaxvkfuScuSTU0L5AuxpqOTJ_ijx9pesRK_FNg8C'
+        'version': 'LHRp0kYRiPKBySMXYH0rJv0A01l8yQXHuk6U_FgMeZ8C'
        }
      ],
      'condition': 'host_os == "mac"',
@@ -551,7 +551,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/linux-amd64',
-        'version': 'k80WkJhOLenOf4sEOX6dvr6UVZeQRR35ZGgfogku5_sC'
+        'version': 'QJfCXnklYkM5AWg7-BRXYI0aoDjnYFYFMbwvi01SkVUC'
        }
      ],
      'condition': 'host_os == "linux"',

ci/licenses_golden/licenses_flutter

@@ -880,77 +880,77 @@ FILE: ../../../flutter/shell/platform/android/surface/android_surface_mock.cc
 FILE: ../../../flutter/shell/platform/android/surface/android_surface_mock.h
 FILE: ../../../flutter/shell/platform/android/vsync_waiter_android.cc
 FILE: ../../../flutter/shell/platform/android/vsync_waiter_android.h
-FILE: ../../../flutter/shell/platform/common/cpp/accessibility_bridge.cc
-FILE: ../../../flutter/shell/platform/common/cpp/accessibility_bridge.h
-FILE: ../../../flutter/shell/platform/common/cpp/accessibility_bridge_unittests.cc
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/basic_message_channel_unittests.cc
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/binary_messenger_impl.h
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/byte_buffer_streams.h
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/core_implementations.cc
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/encodable_value_unittests.cc
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/engine_method_result.cc
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/event_channel_unittests.cc
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/basic_message_channel.h
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/binary_messenger.h
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/byte_streams.h
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/encodable_value.h
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/engine_method_result.h
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/event_channel.h
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/event_sink.h
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/event_stream_handler.h
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/event_stream_handler_functions.h
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/message_codec.h
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/method_call.h
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/method_channel.h
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/method_codec.h
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/method_result.h
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/method_result_functions.h
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/plugin_registrar.h
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/plugin_registry.h
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/standard_codec_serializer.h
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/standard_message_codec.h
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/standard_method_codec.h
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/include/flutter/texture_registrar.h
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/method_call_unittests.cc
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/method_channel_unittests.cc
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/method_result_functions_unittests.cc
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/plugin_registrar.cc
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/plugin_registrar_unittests.cc
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/standard_codec.cc
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/standard_message_codec_unittests.cc
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/standard_method_codec_unittests.cc
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/texture_registrar_impl.h
-FILE: ../../../flutter/shell/platform/common/cpp/client_wrapper/texture_registrar_unittests.cc
-FILE: ../../../flutter/shell/platform/common/cpp/engine_switches.cc
-FILE: ../../../flutter/shell/platform/common/cpp/engine_switches.h
-FILE: ../../../flutter/shell/platform/common/cpp/engine_switches_unittests.cc
-FILE: ../../../flutter/shell/platform/common/cpp/flutter_platform_node_delegate.cc
-FILE: ../../../flutter/shell/platform/common/cpp/flutter_platform_node_delegate.h
-FILE: ../../../flutter/shell/platform/common/cpp/flutter_platform_node_delegate_unittests.cc
-FILE: ../../../flutter/shell/platform/common/cpp/geometry.h
-FILE: ../../../flutter/shell/platform/common/cpp/geometry_unittests.cc
-FILE: ../../../flutter/shell/platform/common/cpp/incoming_message_dispatcher.cc
-FILE: ../../../flutter/shell/platform/common/cpp/incoming_message_dispatcher.h
-FILE: ../../../flutter/shell/platform/common/cpp/json_message_codec.cc
-FILE: ../../../flutter/shell/platform/common/cpp/json_message_codec.h
-FILE: ../../../flutter/shell/platform/common/cpp/json_message_codec_unittests.cc
-FILE: ../../../flutter/shell/platform/common/cpp/json_method_codec.cc
-FILE: ../../../flutter/shell/platform/common/cpp/json_method_codec.h
-FILE: ../../../flutter/shell/platform/common/cpp/json_method_codec_unittests.cc
-FILE: ../../../flutter/shell/platform/common/cpp/path_utils.cc
-FILE: ../../../flutter/shell/platform/common/cpp/path_utils.h
-FILE: ../../../flutter/shell/platform/common/cpp/path_utils_unittests.cc
-FILE: ../../../flutter/shell/platform/common/cpp/public/flutter_export.h
-FILE: ../../../flutter/shell/platform/common/cpp/public/flutter_messenger.h
-FILE: ../../../flutter/shell/platform/common/cpp/public/flutter_plugin_registrar.h
-FILE: ../../../flutter/shell/platform/common/cpp/public/flutter_texture_registrar.h
-FILE: ../../../flutter/shell/platform/common/cpp/test_accessibility_bridge.cc
-FILE: ../../../flutter/shell/platform/common/cpp/test_accessibility_bridge.h
-FILE: ../../../flutter/shell/platform/common/cpp/text_input_model.cc
-FILE: ../../../flutter/shell/platform/common/cpp/text_input_model.h
-FILE: ../../../flutter/shell/platform/common/cpp/text_input_model_unittests.cc
-FILE: ../../../flutter/shell/platform/common/cpp/text_range.h
-FILE: ../../../flutter/shell/platform/common/cpp/text_range_unittests.cc
+FILE: ../../../flutter/shell/platform/common/accessibility_bridge.cc
+FILE: ../../../flutter/shell/platform/common/accessibility_bridge.h
+FILE: ../../../flutter/shell/platform/common/accessibility_bridge_unittests.cc
+FILE: ../../../flutter/shell/platform/common/client_wrapper/basic_message_channel_unittests.cc
+FILE: ../../../flutter/shell/platform/common/client_wrapper/binary_messenger_impl.h
+FILE: ../../../flutter/shell/platform/common/client_wrapper/byte_buffer_streams.h
+FILE: ../../../flutter/shell/platform/common/client_wrapper/core_implementations.cc
+FILE: ../../../flutter/shell/platform/common/client_wrapper/encodable_value_unittests.cc
+FILE: ../../../flutter/shell/platform/common/client_wrapper/engine_method_result.cc
+FILE: ../../../flutter/shell/platform/common/client_wrapper/event_channel_unittests.cc
+FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/basic_message_channel.h
+FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/binary_messenger.h
+FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/byte_streams.h
+FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/encodable_value.h
+FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/engine_method_result.h
+FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/event_channel.h
+FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/event_sink.h
+FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/event_stream_handler.h
+FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/event_stream_handler_functions.h
+FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/message_codec.h
+FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/method_call.h
+FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/method_channel.h
+FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/method_codec.h
+FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/method_result.h
+FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/method_result_functions.h
+FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/plugin_registrar.h
+FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/plugin_registry.h
+FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/standard_codec_serializer.h
+FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/standard_message_codec.h
+FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/standard_method_codec.h
+FILE: ../../../flutter/shell/platform/common/client_wrapper/include/flutter/texture_registrar.h
+FILE: ../../../flutter/shell/platform/common/client_wrapper/method_call_unittests.cc
+FILE: ../../../flutter/shell/platform/common/client_wrapper/method_channel_unittests.cc
+FILE: ../../../flutter/shell/platform/common/client_wrapper/method_result_functions_unittests.cc
+FILE: ../../../flutter/shell/platform/common/client_wrapper/plugin_registrar.cc
+FILE: ../../../flutter/shell/platform/common/client_wrapper/plugin_registrar_unittests.cc
+FILE: ../../../flutter/shell/platform/common/client_wrapper/standard_codec.cc
+FILE: ../../../flutter/shell/platform/common/client_wrapper/standard_message_codec_unittests.cc
+FILE: ../../../flutter/shell/platform/common/client_wrapper/standard_method_codec_unittests.cc
+FILE: ../../../flutter/shell/platform/common/client_wrapper/texture_registrar_impl.h
+FILE: ../../../flutter/shell/platform/common/client_wrapper/texture_registrar_unittests.cc
+FILE: ../../../flutter/shell/platform/common/engine_switches.cc
+FILE: ../../../flutter/shell/platform/common/engine_switches.h
+FILE: ../../../flutter/shell/platform/common/engine_switches_unittests.cc
+FILE: ../../../flutter/shell/platform/common/flutter_platform_node_delegate.cc
+FILE: ../../../flutter/shell/platform/common/flutter_platform_node_delegate.h
+FILE: ../../../flutter/shell/platform/common/flutter_platform_node_delegate_unittests.cc
+FILE: ../../../flutter/shell/platform/common/geometry.h
+FILE: ../../../flutter/shell/platform/common/geometry_unittests.cc
+FILE: ../../../flutter/shell/platform/common/incoming_message_dispatcher.cc
+FILE: ../../../flutter/shell/platform/common/incoming_message_dispatcher.h
+FILE: ../../../flutter/shell/platform/common/json_message_codec.cc
+FILE: ../../../flutter/shell/platform/common/json_message_codec.h
+FILE: ../../../flutter/shell/platform/common/json_message_codec_unittests.cc
+FILE: ../../../flutter/shell/platform/common/json_method_codec.cc
+FILE: ../../../flutter/shell/platform/common/json_method_codec.h
+FILE: ../../../flutter/shell/platform/common/json_method_codec_unittests.cc
+FILE: ../../../flutter/shell/platform/common/path_utils.cc
+FILE: ../../../flutter/shell/platform/common/path_utils.h
+FILE: ../../../flutter/shell/platform/common/path_utils_unittests.cc
+FILE: ../../../flutter/shell/platform/common/public/flutter_export.h
+FILE: ../../../flutter/shell/platform/common/public/flutter_messenger.h
+FILE: ../../../flutter/shell/platform/common/public/flutter_plugin_registrar.h
+FILE: ../../../flutter/shell/platform/common/public/flutter_texture_registrar.h
+FILE: ../../../flutter/shell/platform/common/test_accessibility_bridge.cc
+FILE: ../../../flutter/shell/platform/common/test_accessibility_bridge.h
+FILE: ../../../flutter/shell/platform/common/text_input_model.cc
+FILE: ../../../flutter/shell/platform/common/text_input_model.h
+FILE: ../../../flutter/shell/platform/common/text_input_model_unittests.cc
+FILE: ../../../flutter/shell/platform/common/text_range.h
+FILE: ../../../flutter/shell/platform/common/text_range_unittests.cc
 FILE: ../../../flutter/shell/platform/darwin/common/buffer_conversions.h
 FILE: ../../../flutter/shell/platform/darwin/common/buffer_conversions.mm
 FILE: ../../../flutter/shell/platform/darwin/common/command_line.h
@@ -969,6 +969,8 @@ FILE: ../../../flutter/shell/platform/darwin/common/framework/Source/flutter_cod
 FILE: ../../../flutter/shell/platform/darwin/common/framework/Source/flutter_standard_codec_unittest.mm
 FILE: ../../../flutter/shell/platform/darwin/graphics/FlutterDarwinContextMetal.h
 FILE: ../../../flutter/shell/platform/darwin/graphics/FlutterDarwinContextMetal.mm
+FILE: ../../../flutter/shell/platform/darwin/graphics/FlutterDarwinExternalTextureMetal.h
+FILE: ../../../flutter/shell/platform/darwin/graphics/FlutterDarwinExternalTextureMetal.mm
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Flutter.podspec
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Headers/Flutter.h
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Headers/FlutterAppDelegate.h
@@ -1514,6 +1516,7 @@ FILE: ../../../flutter/shell/platform/windows/text_input_manager_win32.h
 FILE: ../../../flutter/shell/platform/windows/text_input_plugin.cc
 FILE: ../../../flutter/shell/platform/windows/text_input_plugin.h
 FILE: ../../../flutter/shell/platform/windows/text_input_plugin_delegate.h
+FILE: ../../../flutter/shell/platform/windows/text_input_plugin_unittest.cc
 FILE: ../../../flutter/shell/platform/windows/win32_dpi_utils.cc
 FILE: ../../../flutter/shell/platform/windows/win32_dpi_utils.h
 FILE: ../../../flutter/shell/platform/windows/win32_dpi_utils_unittests.cc

ci/licenses_golden/licenses_fuchsia

@@ -1,4 +1,4 @@
-Signature: 219a178c35ed02e9c6d9c88e047017e3
+Signature: 83ad0e74ee12ebe386972accc188aa6a
 
 UNUSED LICENSES:
 
@@ -2588,6 +2588,9 @@ FILE: ../../../fuchsia/sdk/linux/pkg/fidl_cpp_base/include/lib/fidl/cpp/types.h
 FILE: ../../../fuchsia/sdk/linux/pkg/fit/include/lib/fit/source_location.h
 FILE: ../../../fuchsia/sdk/linux/pkg/scenic_cpp/commands_sizing.cc
 FILE: ../../../fuchsia/sdk/linux/pkg/scenic_cpp/include/lib/ui/scenic/cpp/commands_sizing.h
+FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/bit.h
+FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/internal/bit.h
+FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/memory.h
 FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/source_location.h
 FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/version.h
 FILE: ../../../fuchsia/sdk/linux/pkg/zx/include/lib/zx/msi.h
@@ -3419,6 +3422,7 @@ FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.feedback/data_provider_controller.
 FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.goldfish/goldfish_sync.fidl
 FILE: ../../../fuchsia/sdk/linux/fidl/fuchsia.io2/inotify.fidl
 FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/internal/exception.h
+FILE: ../../../fuchsia/sdk/linux/pkg/stdcompat/include/lib/stdcompat/iterator.h
 ----------------------------------------------------------------------------------------------------
 Copyright 2021 The Fuchsia Authors. All rights reserved.