Merge branch 'main' into scenario_app_args

matanlurey · web-flow · commit d2f54f056315 · 2024-02-26T15:30:19.000-08:00
diff --git a/DEPS b/DEPS
@@ -62,7 +62,7 @@ vars = {
   # Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS
   # You can use //tools/dart/create_updated_flutter_deps.py to produce
   # updated revision list of existing dependencies.
-  'dart_revision': 'c479735adcf91684b66e94747199e3c1b17516b9',
+  'dart_revision': '2876f5684ceddf924aa0e2ab7d34a6baf4717496',
 
   # WARNING: DO NOT EDIT MANUALLY
   # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
diff --git a/ci/builders/mac_unopt.json b/ci/builders/mac_unopt.json
@@ -142,7 +142,21 @@
                 "$flutter/osx_sdk": {
                     "sdk_version": "15a240d"
                 }
-            }
+            },
+            "tests": [
+                {
+                    "language": "python3",
+                    "name": "Host Tests for host_debug_unopt_arm64",
+                    "script": "flutter/testing/run_tests.py",
+                    "parameters": [
+                        "--variant",
+                        "host_debug_unopt_arm64",
+                        "--type",
+                        "dart,dart-host,engine",
+                        "--engine-capture-core-dump"
+                    ]
+                }
+            ]
         },
         {
             "properties": {
diff --git a/ci/licenses_golden/licenses_dart b/ci/licenses_golden/licenses_dart
@@ -1,4 +1,4 @@
-Signature: aee8d76d23570c7efd9439c5f991502a
+Signature: 7fd3eb25284e36712433374678f727d7
 
 ====================================================================================================
 LIBRARY: dart
@@ -3728,7 +3728,6 @@ ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/class_id.dart + ../
 ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/convert_patch.dart + ../../../third_party/dart/LICENSE
 ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/core_patch.dart + ../../../third_party/dart/LICENSE
 ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/deferred.dart + ../../../third_party/dart/LICENSE
-ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/developer.dart + ../../../third_party/dart/LICENSE
 ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/double_patch.dart + ../../../third_party/dart/LICENSE
 ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/errors_patch.dart + ../../../third_party/dart/LICENSE
 ORIGIN: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/growable_list.dart + ../../../third_party/dart/LICENSE
@@ -3804,7 +3803,6 @@ FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/class_id.dart
 FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/convert_patch.dart
 FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/core_patch.dart
 FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/deferred.dart
-FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/developer.dart
 FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/double_patch.dart
 FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/errors_patch.dart
 FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/growable_list.dart
@@ -4753,7 +4751,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
   This Source Code Form is "Incompatible With Secondary Licenses", as
   defined by the Mozilla Public License, v. 2.0.
 
-You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/e5e4aaceaf23200d0cf92ebed1506f915f364b4d
+You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/2876f5684ceddf924aa0e2ab7d34a6baf4717496
 /third_party/fallback_root_certificates/
 
 ====================================================================================================
diff --git a/impeller/fixtures/box_fade.frag b/impeller/fixtures/box_fade.frag
@@ -9,16 +9,16 @@ uniform FrameInfo {
 }
 frame_info;
 
-in vec2 interporlated_texture_coordinates;
+in vec2 interpolated_texture_coordinates;
 
 out vec4 frag_color;
 
 uniform sampler2D contents1;
 uniform sampler2D contents2;
 
 void main() {
-  vec4 tex1 = texture(contents1, interporlated_texture_coordinates);
-  vec4 tex2 = texture(contents2, interporlated_texture_coordinates);
+  vec4 tex1 = texture(contents1, interpolated_texture_coordinates);
+  vec4 tex2 = texture(contents2, interpolated_texture_coordinates);
   frag_color = mix(
       tex1, tex2,
       clamp(frame_info.cursor_position.x / frame_info.window_size.x, 0.0, 1.0));
diff --git a/impeller/fixtures/box_fade.vert b/impeller/fixtures/box_fade.vert
@@ -10,9 +10,9 @@ uniform_buffer;
 in vec3 vertex_position;
 in vec2 texture_coordinates;
 
-out vec2 interporlated_texture_coordinates;
+out vec2 interpolated_texture_coordinates;
 
 void main() {
   gl_Position = uniform_buffer.mvp * vec4(vertex_position, 1.0);
-  interporlated_texture_coordinates = texture_coordinates;
+  interpolated_texture_coordinates = texture_coordinates;
 }
diff --git a/impeller/fixtures/texture.frag b/impeller/fixtures/texture.frag
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-in vec2 interporlated_texture_coordinates;
+in vec2 interpolated_texture_coordinates;
 
 out vec4 frag_color;
 
 uniform sampler2D texture_contents;
 
 void main() {
-  frag_color = texture(texture_contents, interporlated_texture_coordinates);
+  frag_color = texture(texture_contents, interpolated_texture_coordinates);
 }
diff --git a/impeller/renderer/backend/vulkan/render_pass_cache_unittests.cc b/impeller/renderer/backend/vulkan/render_pass_cache_unittests.cc
@@ -11,41 +11,7 @@
 namespace impeller {
 namespace testing {
 
-using RendererTest = PlaygroundTest;
-
-TEST_P(RendererTest, CachesRenderPassAndFramebuffer) {
-  if (GetBackend() != PlaygroundBackend::kVulkan) {
-    GTEST_SKIP() << "Test only applies to Vulkan";
-  }
-
-  auto allocator = std::make_shared<RenderTargetAllocator>(
-      GetContext()->GetResourceAllocator());
-
-  auto render_target = RenderTarget::CreateOffscreenMSAA(
-      *GetContext(), *allocator, {100, 100}, 1);
-  auto resolve_texture =
-      render_target.GetColorAttachments().find(0u)->second.resolve_texture;
-  auto& texture_vk = TextureVK::Cast(*resolve_texture);
-
-  EXPECT_EQ(texture_vk.GetFramebuffer(), nullptr);
-  EXPECT_EQ(texture_vk.GetRenderPass(), nullptr);
-
-  auto buffer = GetContext()->CreateCommandBuffer();
-  auto render_pass = buffer->CreateRenderPass(render_target);
-
-  EXPECT_NE(texture_vk.GetFramebuffer(), nullptr);
-  EXPECT_NE(texture_vk.GetRenderPass(), nullptr);
-
-  render_pass->EncodeCommands();
-  GetContext()->GetCommandQueue()->Submit({buffer});
-
-  // Can be reused without error.
-  auto buffer_2 = GetContext()->CreateCommandBuffer();
-  auto render_pass_2 = buffer_2->CreateRenderPass(render_target);
-
-  EXPECT_TRUE(render_pass_2->EncodeCommands());
-  EXPECT_TRUE(GetContext()->GetCommandQueue()->Submit({buffer_2}).ok());
-}
+//
 
 }  // namespace testing
 }  // namespace impeller
diff --git a/impeller/renderer/backend/vulkan/render_pass_vk.cc b/impeller/renderer/backend/vulkan/render_pass_vk.cc
@@ -170,26 +170,16 @@ RenderPassVK::RenderPassVK(const std::shared_ptr<const Context>& context,
         return true;
       });
 
-  SharedHandleVK<vk::RenderPass> recycled_render_pass;
-  SharedHandleVK<vk::Framebuffer> recycled_framebuffer;
-  if (resolve_image_vk_) {
-    recycled_render_pass = TextureVK::Cast(*resolve_image_vk_).GetRenderPass();
-    recycled_framebuffer = TextureVK::Cast(*resolve_image_vk_).GetFramebuffer();
-  }
-
   const auto& target_size = render_target_.GetRenderTargetSize();
 
-  render_pass_ =
-      CreateVKRenderPass(vk_context, recycled_render_pass, command_buffer_);
+  render_pass_ = CreateVKRenderPass(vk_context, nullptr, command_buffer_);
   if (!render_pass_) {
     VALIDATION_LOG << "Could not create renderpass.";
     is_valid_ = false;
     return;
   }
 
-  auto framebuffer = (recycled_framebuffer == nullptr)
-                         ? CreateVKFramebuffer(vk_context, *render_pass_)
-                         : recycled_framebuffer;
+  auto framebuffer = CreateVKFramebuffer(vk_context, *render_pass_);
   if (!framebuffer) {
     VALIDATION_LOG << "Could not create framebuffer.";
     is_valid_ = false;
@@ -200,10 +190,6 @@ RenderPassVK::RenderPassVK(const std::shared_ptr<const Context>& context,
     is_valid_ = false;
     return;
   }
-  if (resolve_image_vk_) {
-    TextureVK::Cast(*resolve_image_vk_).SetFramebuffer(framebuffer);
-    TextureVK::Cast(*resolve_image_vk_).SetRenderPass(render_pass_);
-  }
 
   auto clear_values = GetVKClearValues(render_target_);
 
diff --git a/impeller/renderer/blit_pass_unittests.cc b/impeller/renderer/blit_pass_unittests.cc
@@ -24,11 +24,13 @@ TEST_P(BlitPassTest, BlitAcrossDifferentPixelFormatsFails) {
   TextureDescriptor src_desc;
   src_desc.format = PixelFormat::kA8UNormInt;
   src_desc.size = {100, 100};
+  src_desc.storage_mode = StorageMode::kHostVisible;
   auto src = context->GetResourceAllocator()->CreateTexture(src_desc);
 
   TextureDescriptor dst_format;
   dst_format.format = PixelFormat::kR8G8B8A8UNormInt;
   dst_format.size = {100, 100};
+  dst_format.storage_mode = StorageMode::kHostVisible;
   auto dst = context->GetResourceAllocator()->CreateTexture(dst_format);
 
   EXPECT_FALSE(blit_pass->AddCopy(src, dst));
diff --git a/shell/platform/android/io/flutter/plugin/platform/VirtualDisplayController.java b/shell/platform/android/io/flutter/plugin/platform/VirtualDisplayController.java
@@ -19,10 +19,19 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
 
-@TargetApi(20)
+@TargetApi(21)
 class VirtualDisplayController {
   private static String TAG = "VirtualDisplayController";
 
+  private static VirtualDisplay.Callback callback =
+      new VirtualDisplay.Callback() {
+        @Override
+        public void onPaused() {}
+
+        @Override
+        public void onResumed() {}
+      };
+
   public static VirtualDisplayController create(
       Context context,
       AccessibilityEventsDelegate accessibilityEventsDelegate,
@@ -40,6 +49,7 @@ public static VirtualDisplayController create(
     DisplayManager displayManager =
         (DisplayManager) context.getSystemService(Context.DISPLAY_SERVICE);
     final DisplayMetrics metrics = context.getResources().getDisplayMetrics();
+
     // Virtual Display crashes for some PlatformViews if the width or height is bigger
     // than the physical screen size. We have tried to clamp or scale down the size to prevent
     // the crash, but both solutions lead to unwanted behavior because the
@@ -51,14 +61,17 @@ public static VirtualDisplayController create(
     // virtual display and AndroidPlatformView widget.
     // https://github.com/flutter/flutter/issues/93115
     renderTarget.resize(width, height);
+    int flags = 0;
     VirtualDisplay virtualDisplay =
         displayManager.createVirtualDisplay(
             "flutter-vd#" + viewId,
             width,
             height,
             metrics.densityDpi,
             renderTarget.getSurface(),
-            0);
+            flags,
+            callback,
+            null /* handler */);
 
     if (virtualDisplay == null) {
       return null;
@@ -148,9 +161,17 @@ public void resize(final int width, final int height, final Runnable onNewSizeFr
     final DisplayManager displayManager =
         (DisplayManager) context.getSystemService(Context.DISPLAY_SERVICE);
     renderTarget.resize(width, height);
+    int flags = 0;
     virtualDisplay =
         displayManager.createVirtualDisplay(
-            "flutter-vd#" + viewId, width, height, densityDpi, renderTarget.getSurface(), 0);
+            "flutter-vd#" + viewId,
+            width,
+            height,
+            densityDpi,
+            renderTarget.getSurface(),
+            flags,
+            callback,
+            null /* handler */);
 
     final View embeddedView = getView();
     // There's a bug in Android version older than O where view tree observer onDrawListeners don't
@@ -210,12 +231,14 @@ public void dispose() {
     renderTarget.release();
   }
 
+  // On Android versions 31+ resizing of a Virtual Display's Presentation is natively supported.
   @TargetApi(31)
   private void resize31(
       View embeddedView, int width, int height, final Runnable onNewSizeFrameAvailable) {
     renderTarget.resize(width, height);
-    // On Android versions 31+ resizing of a Virtual Display's Presentation is natively supported.
     virtualDisplay.resize(width, height, densityDpi);
+    // Must update the surface to match the renderTarget's current surface.
+    virtualDisplay.setSurface(renderTarget.getSurface());
     embeddedView.postDelayed(onNewSizeFrameAvailable, 0);
   }
 
diff --git a/shell/platform/embedder/tests/embedder_unittests.cc b/shell/platform/embedder/tests/embedder_unittests.cc
@@ -644,8 +644,15 @@ TEST_F(EmbedderTest, VMAndIsolateSnapshotSizesAreRedundantInAOTMode) {
 /// Test the layer structure and pixels rendered when using a custom software
 /// compositor.
 ///
+// TODO(143940): Convert this test to use SkiaGold.
+#if FML_OS_MACOSX && FML_ARCH_CPU_ARM64
+TEST_F(EmbedderTest,
+       DISABLED_CompositorMustBeAbleToRenderKnownSceneWithSoftwareCompositor) {
+#else
 TEST_F(EmbedderTest,
        CompositorMustBeAbleToRenderKnownSceneWithSoftwareCompositor) {
+#endif  // FML_OS_MACOSX && FML_ARCH_CPU_ARM64
+
   auto& context = GetEmbedderContext(EmbedderTestContextType::kSoftwareContext);
 
   EmbedderConfigBuilder builder(context);
diff --git a/sky/packages/sky_engine/LICENSE b/sky/packages/sky_engine/LICENSE
@@ -31704,7 +31704,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
   This Source Code Form is "Incompatible With Secondary Licenses", as
   defined by the Mozilla Public License, v. 2.0.
 
-You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/8a2ca37c39e2fec472edce1e39c5ea0f677bf7b0
+You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/2876f5684ceddf924aa0e2ab7d34a6baf4717496
 /third_party/fallback_root_certificates/
 
 --------------------------------------------------------------------------------
diff --git a/testing/run_tests.py b/testing/run_tests.py
@@ -1260,7 +1260,10 @@ def main():
 
   variants_to_skip = ['host_release', 'host_profile']
   if ('engine' in types or 'font-subset' in types) and args.variant not in variants_to_skip:
-    run_cmd(['python3', 'test.py'], cwd=FONT_SUBSET_DIR)
+    cmd = ['python3', 'test.py', '--variant', args.variant]
+    if 'arm64' in args.variant:
+      cmd += ['--target-cpu', 'arm64']
+    run_cmd(cmd, cwd=FONT_SUBSET_DIR)
 
   if 'impeller-golden' in types:
     run_impeller_golden_tests(build_dir)
diff --git a/testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/ExternalTextureFlutterActivity.java b/testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/ExternalTextureFlutterActivity.java
@@ -418,7 +418,6 @@ private void onImageAvailable(ImageReader reader) {
         // Simply log and return.
         Log.i(TAG, "Surface disconnected from ImageWriter", e);
         image.close();
-        return;
       }
 
       Log.v(TAG, "Output image");
diff --git a/testing/scenario_app/bin/README.md b/testing/scenario_app/bin/README.md
@@ -24,23 +24,40 @@ dart bin/android_integration_tests.dart --smoke-test dev.flutter.scenarios.Engin
 
 ## Additional arguments
 
-- `--verbose`: Print additional information about the test run.
-
-- `--adb`: The path to the `adb` tool. Defaults to
-  `third_party/android_tools/sdk/platform-tools/adb`.
-
-- `--out-dir`: The directory containing the build artifacts. Defaults to the
-  last updated build directory in `out/` that starts with `android_`.
-
-- `--logs-dir`: The directory to store logs and screenshots. Defaults to
-  `FLUTTER_LOGS_DIR` if set, or `out/.../scenario_app/logs` otherwise.
-
-- `--use-skia-gold`: Use Skia Gold to compare screenshots. Defaults to true
-  when running on CI, and false otherwise (i.e. when running locally). If
-  set to true, `isSkiaGoldClientAvailable` must be true.
-
-- `--enable-impeller`: Enable Impeller for the Android app. Defaults to
-  false, which means that the app will use Skia as the graphics backend.
+```txt
+-v, --verbose                                        Enable verbose logging
+-h, --help                                           Print usage information
+    --[no-]enable-impeller                           Whether to enable Impeller as the graphics backend. If true, the
+                                                     test runner will use --impeller-backend if set, otherwise the
+                                                     default backend will be used. To explicitly run with the Skia
+                                                     backend, set this to false (--no-enable-impeller).
+    --impeller-backend                               The graphics backend to use when --enable-impeller is true. Unlike
+                                                     the similar option when launching an app, there is no fallback;
+                                                     that is, either Vulkan or OpenGLES must be specified.
+                                                     [vulkan (default), opengles]
+    --logs-dir                                       Path to a directory where logs and screenshots are stored.
+    --out-dir=<path/to/out/android_variant>          Path to a out/{variant} directory where the APKs are built.
+                                                     Defaults to the latest updated out/ directory that starts with
+                                                     "android_" if the current working directory is within the engine
+                                                     repository.
+    --smoke-test=<package.ClassName>                 Fully qualified class name of a single test to run. For example try
+                                                     "dev.flutter.scenarios.EngineLaunchE2ETest" or
+                                                     "dev.flutter.scenariosui.ExternalTextureTests".
+    --output-contents-golden=<path/to/golden.txt>    Path to a file that contains the expected filenames of golden
+                                                     files. If the current working directory is within the engine
+                                                     repository, defaults to
+                                                     ./testing/scenario_app/android/expected_golden_output.txt.
+```
 
-- `--impeller-backend`: The Impeller backend to use for the Android app.
-  Defaults to 'vulkan'. Only used when `--enable-impeller` is set to true.
+## Advanced usage
+
+```txt
+    --[no-]use-skia-gold                             Whether to use Skia Gold to compare screenshots. Defaults to true
+                                                     on CI and false otherwise.
+    --adb=<path/to/adb>                              Path to the Android Debug Bridge (adb) executable. If the current
+                                                     working directory is within the engine repository, defaults to
+                                                     ./third_party/android_tools/sdk/platform-tools/adb.
+    --ndk-stack=<path/to/ndk-stack>                  Path to the NDK stack tool. Defaults to the checked-in version in
+                                                     third_party/android_tools if the current working directory is
+                                                     within the engine repository on a supported platform.
+```
diff --git a/testing/scenario_app/bin/run_android_tests.dart b/testing/scenario_app/bin/run_android_tests.dart
diff --git a/testing/scenario_app/bin/utils/environment.dart b/testing/scenario_app/bin/utils/environment.dart
diff --git a/testing/scenario_app/bin/utils/options.dart b/testing/scenario_app/bin/utils/options.dart
diff --git a/testing/scenario_app/pubspec.yaml b/testing/scenario_app/pubspec.yaml
diff --git a/tools/font_subset/test.py b/tools/font_subset/test.py
