Merge branch 'main' into do_everything_plus_barrier

Author: jonahwilliams

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

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": {

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/
 
 ====================================================================================================

flow/frame_timings.cc

@@ -13,31 +13,6 @@
 
 namespace flutter {
 
-namespace {
-
-const char* StateToString(FrameTimingsRecorder::State state) {
-#ifndef NDEBUG
-  switch (state) {
-    case FrameTimingsRecorder::State::kUninitialized:
-      return "kUninitialized";
-    case FrameTimingsRecorder::State::kVsync:
-      return "kVsync";
-    case FrameTimingsRecorder::State::kBuildStart:
-      return "kBuildStart";
-    case FrameTimingsRecorder::State::kBuildEnd:
-      return "kBuildEnd";
-    case FrameTimingsRecorder::State::kRasterStart:
-      return "kRasterStart";
-    case FrameTimingsRecorder::State::kRasterEnd:
-      return "kRasterEnd";
-  };
-  FML_UNREACHABLE();
-#endif
-  return "";
-}
-
-}  // namespace
-
 std::atomic<uint64_t> FrameTimingsRecorder::frame_number_gen_ = {1};
 
 FrameTimingsRecorder::FrameTimingsRecorder()
@@ -280,8 +255,7 @@ const char* FrameTimingsRecorder::GetFrameNumberTraceArg() const {
 }
 
 void FrameTimingsRecorder::AssertInState(State state) const {
-  FML_DCHECK(state_ == state) << "Expected state " << StateToString(state)
-                              << ", actual state " << StateToString(state_);
+  FML_DCHECK(state_ == state);
 }
 
 }  // namespace flutter

flow/frame_timings.h

@@ -31,7 +31,6 @@ class FrameTimingsRecorder {
  public:
   /// Various states that the recorder can be in. When created the recorder is
   /// in an unitialized state and transtions in sequential order of the states.
-  // After adding an item to this enum, modify StateToString accordingly.
   enum class State : uint32_t {
     kUninitialized,
     kVsync,
@@ -122,8 +121,6 @@ class FrameTimingsRecorder {
   ///
   /// Instead of adding a `GetState` method and asserting on the result, this
   /// method prevents other logic from relying on the state.
-  ///
-  /// In release builds, this call is a no-op.
   void AssertInState(State state) const;
 
  private:

impeller/base/base_unittests.cc

@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "flutter/testing/testing.h"
+#include "impeller/base/promise.h"
 #include "impeller/base/strings.h"
 #include "impeller/base/thread.h"
 
@@ -233,5 +234,21 @@ TEST(ConditionVariableTest, TestsCriticalSectionAfterWait) {
   ASSERT_EQ(sum, kThreadCount);
 }
 
+TEST(BaseTest, NoExceptionPromiseValue) {
+  NoExceptionPromise<int> wrapper;
+  std::future future = wrapper.get_future();
+  wrapper.set_value(123);
+  ASSERT_EQ(future.get(), 123);
+}
+
+TEST(BaseTest, NoExceptionPromiseEmpty) {
+  auto wrapper = std::make_shared<NoExceptionPromise<int>>();
+  std::future future = wrapper->get_future();
+
+  // Destroy the empty promise with the future still pending. Verify that the
+  // process does not abort while destructing the promise.
+  wrapper.reset();
+}
+
 }  // namespace testing
 }  // namespace impeller

impeller/base/promise.h

@@ -17,6 +17,34 @@ std::future<T> RealizedFuture(T t) {
   return future;
 }
 
+// Wraps a std::promise and completes the promise with a value during
+// destruction if the promise does not already have a value.
+//
+// By default the std::promise destructor will complete an empty promise with an
+// exception. This will fail because Flutter is built without exception support.
+template <typename T>
+class NoExceptionPromise {
+ public:
+  NoExceptionPromise() = default;
+
+  ~NoExceptionPromise() {
+    if (!value_set_) {
+      promise_.set_value({});
+    }
+  }
+
+  std::future<T> get_future() { return promise_.get_future(); }
+
+  void set_value(const T& value) {
+    promise_.set_value(value);
+    value_set_ = true;
+  }
+
+ private:
+  std::promise<T> promise_;
+  bool value_set_ = false;
+};
+
 }  // namespace impeller
 
 #endif  // FLUTTER_IMPELLER_BASE_PROMISE_H_

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));

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;
 }

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);
 }

impeller/renderer/backend/vulkan/pipeline_library_vk.cc

@@ -170,7 +170,7 @@ PipelineFuture<PipelineDescriptor> PipelineLibraryVK::GetPipeline(
   }
 
   auto promise = std::make_shared<
-      std::promise<std::shared_ptr<Pipeline<PipelineDescriptor>>>>();
+      NoExceptionPromise<std::shared_ptr<Pipeline<PipelineDescriptor>>>>();
   auto pipeline_future =
       PipelineFuture<PipelineDescriptor>{descriptor, promise->get_future()};
   pipelines_[descriptor] = pipeline_future;

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

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_);
 

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));

lib/ui/painting/image_dispose_unittests.cc

@@ -5,7 +5,6 @@
 #define FML_USED_ON_EMBEDDER
 
 #include "flutter/common/task_runners.h"
-#include "flutter/fml/synchronization/count_down_latch.h"
 #include "flutter/fml/synchronization/waitable_event.h"
 #include "flutter/lib/ui/painting/canvas.h"
 #include "flutter/lib/ui/painting/image.h"
@@ -58,10 +57,6 @@ TEST_F(ImageDisposeTest, ImageReleasedAfterFrameAndDisposePictureAndLayer) {
   };
 
   Settings settings = CreateSettingsForFixture();
-  fml::CountDownLatch frame_latch{2};
-  settings.frame_rasterized_callback = [&frame_latch](const FrameTiming& t) {
-    frame_latch.CountDown();
-  };
   auto task_runner = CreateNewThread();
   TaskRunners task_runners("test",                  // label
                            GetCurrentTaskRunner(),  // platform
@@ -88,15 +83,12 @@ TEST_F(ImageDisposeTest, ImageReleasedAfterFrameAndDisposePictureAndLayer) {
   shell->RunEngine(std::move(configuration), [&](auto result) {
     ASSERT_EQ(result, Engine::RunStatus::Success);
   });
+
   message_latch_.Wait();
 
   ASSERT_TRUE(current_display_list_);
   ASSERT_TRUE(current_image_);
 
-  // Wait for 2 frames to be rasterized. The 2nd frame releases resources of the
-  // 1st frame.
-  frame_latch.Wait();
-
   // Force a drain the SkiaUnrefQueue. The engine does this normally as frames
   // pump, but we force it here to make the test more deterministic.
   message_latch_.Reset();

lib/ui/window/platform_configuration.cc

@@ -453,9 +453,12 @@ void PlatformConfigurationNativeApi::Render(int64_t view_id,
                                             Scene* scene,
                                             double width,
                                             double height) {
+  // TODO(dkwingsmt): Currently only supports a single window.
+  // See https://github.com/flutter/flutter/issues/135530, item 2.
+  FML_DCHECK(view_id == kFlutterImplicitViewId);
   UIDartState::ThrowIfUIOperationsProhibited();
   UIDartState::Current()->platform_configuration()->client()->Render(
-      view_id, scene, width, height);
+      scene, width, height);
 }
 
 void PlatformConfigurationNativeApi::SetNeedsReportTimings(bool value) {