Merge branch 'main' into validate-impeller-tests

Author: Jonah Williams

.ci.yaml

@@ -264,7 +264,6 @@ targets:
       config_name: linux_host_engine
 
   - name: Linux linux_host_desktop_engine
-    bringup: true
     recipe: engine_v2/engine_v2
     timeout: 60
     properties:
@@ -363,13 +362,14 @@ targets:
         { "sdk_version": "14a5294e" }
 
   - name: Mac mac_unopt
-    bringup: true
     recipe: engine_v2/engine_v2
     properties:
       config_name: mac_unopt
       add_recipes_cq: "true"
+    timeout: 60
 
   - name: Mac Unopt
+    bringup: true
     recipe: engine/engine_unopt
     properties:
       add_recipes_cq: "true"

DEPS

@@ -18,7 +18,7 @@ vars = {
   'llvm_git': 'https://llvm.googlesource.com',
   # OCMock is for testing only so there is no google clone
   'ocmock_git': 'https://github.com/erikdoe/ocmock.git',
-  'skia_revision': 'd0e0b423e3c0dee4492a775563cb95075114e6f1',
+  'skia_revision': '53b61e04004664f70a318a8419637751cb5745ea',
 
   # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
   # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -48,7 +48,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': '4e2f5b068984f7a29ed5cb069fa7d7a0ed339437',
+  'dart_revision': 'e9053a1d88208fb18b99278e8152508f28e35919',
 
   # WARNING: DO NOT EDIT MANUALLY
   # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -66,7 +66,7 @@ vars = {
   'dart_pub_rev': '3e2c92a8bb74935302de52b80b870bf66963756d',
   'dart_root_certificates_rev': '692f6d6488af68e0121317a9c2c9eb393eb0ee50',
   'dart_watcher_rev': '00aa79b0ff5562c9dafb0525891e2e69c51be06d',
-  'dart_webdev_rev': '22b34e35ddf5d9580c34c3ae85ba72d2551914e2',
+  'dart_webdev_rev': '75462913fba9756e9ddae33bfd73fe96f5199c34',
   'dart_webkit_inspection_protocol_rev': '8401098ace995e4dcd9855a2741c2dacccaa780b',
   'dart_yaml_edit_rev': '5f392a1511ab97dde0e4a6bb7225f283f59ea840',
   'dart_zlib_rev': '27c2f474b71d0d20764f86f60ef8b00da1a16cda',
@@ -239,7 +239,7 @@ allowed_hosts = [
 ]
 
 deps = {
-  'src': 'https://github.com/flutter/buildroot.git' + '@' + 'e18c162be6327beb90fc885e81db8fadceafb94f',
+  'src': 'https://github.com/flutter/buildroot.git' + '@' + 'c26173f545880557c36e8fff8b7b6b5c4385c931',
 
    # Fuchsia compatibility
    #
@@ -386,7 +386,7 @@ deps = {
    Var('dart_git') + '/json_rpc_2.git@5da270592006e4d43fd5a6ac736829f955881240',
 
   'src/third_party/dart/third_party/pkg/linter':
-   Var('dart_git') + '/linter.git@c0942721fcc1feeff278f95626cb5d27a654301e',
+   Var('dart_git') + '/linter.git@eb0ca501f48deaa034e07e6dd1ff9ad6ff3519c6',
 
   'src/third_party/dart/third_party/pkg/logging':
    Var('dart_git') + '/logging.git@787030a2b3d0d5d53ce57f1c7dc74f27ecb07b0b',
@@ -455,7 +455,7 @@ deps = {
    Var('dart_git') + '/test_reflective_loader.git@a85a930ad3736f93b96f6cc104d3576c1ae19e0e',
 
   'src/third_party/dart/third_party/pkg/tools':
-   Var('dart_git') + '/tools.git@cd799be6a124b8c8d0490f81a816a6b34d0a0031',
+   Var('dart_git') + '/tools.git@58d914764eab030bf537c2c58089c8ba7b46a313',
 
   'src/third_party/dart/third_party/pkg/typed_data':
    Var('dart_git') + '/typed_data.git@d85363d2efb333afce07ec409a529ec32986e1a2',
@@ -467,7 +467,7 @@ deps = {
    Var('dart_git') + '/watcher.git' + '@' + Var('dart_watcher_rev'),
 
   'src/third_party/dart/third_party/pkg/web_socket_channel':
-   Var('dart_git') + '/web_socket_channel.git@40eb2360e10595c2eab33cf61439c45708eb8d29',
+   Var('dart_git') + '/web_socket_channel.git@b28bae62886edc090d3317edd197c4c3b121cd3a',
 
   'src/third_party/dart/third_party/pkg/webdev':
    Var('dart_git') + '/webdev.git' + '@' + Var('dart_webdev_rev'),
@@ -832,7 +832,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/mac-amd64',
-        'version': 'fYBjzwm0fO7kzBMlyCfH-qIn9nXuswFtsRZM2V1iikAC'
+        'version': 'rHB0F3a_toME3WJgqguRtDcXl8O19zCr-NzC_0WjFTUC'
        }
      ],
      'condition': 'host_os == "mac" and not download_fuchsia_sdk',
@@ -842,7 +842,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/linux-amd64',
-        'version': 'P15HfBhD19GOwL0lzTL9wwfWmEv8KUWOg6Krsav-HeUC'
+        'version': '0e_0_5725_RNxNyTOzueQelqCni6WKAyOAvRrAmkMPYC'
        }
      ],
      'condition': 'host_os == "linux" and not download_fuchsia_sdk',

ci/licenses_golden/licenses_flutter

@@ -1442,8 +1442,6 @@ ORIGIN: ../../../flutter/impeller/renderer/backend/metal/device_buffer_mtl.h + .
 ORIGIN: ../../../flutter/impeller/renderer/backend/metal/device_buffer_mtl.mm + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/renderer/backend/metal/formats_mtl.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/renderer/backend/metal/formats_mtl.mm + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/impeller/renderer/backend/metal/gpu_tracer_mtl.h + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/impeller/renderer/backend/metal/gpu_tracer_mtl.mm + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/renderer/backend/metal/pipeline_library_mtl.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/renderer/backend/metal/pipeline_library_mtl.mm + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/renderer/backend/metal/pipeline_mtl.h + ../../../flutter/LICENSE
@@ -1547,8 +1545,6 @@ ORIGIN: ../../../flutter/impeller/renderer/compute_tessellator.cc + ../../../flu
 ORIGIN: ../../../flutter/impeller/renderer/compute_tessellator.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/renderer/context.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/renderer/context.h + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/impeller/renderer/gpu_tracer.cc + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/impeller/renderer/gpu_tracer.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/renderer/path_polyline.comp + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/renderer/pipeline.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/renderer/pipeline.h + ../../../flutter/LICENSE
@@ -2681,6 +2677,7 @@ ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterTex
 ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterTextInputSemanticsObjectTest.mm + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterTextureRegistrar.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterTextureRegistrar.mm + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterUmbrellaImportTests.m + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterView.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterView.mm + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterViewController.mm + ../../../flutter/LICENSE
@@ -4030,8 +4027,6 @@ FILE: ../../../flutter/impeller/renderer/backend/metal/device_buffer_mtl.h
 FILE: ../../../flutter/impeller/renderer/backend/metal/device_buffer_mtl.mm
 FILE: ../../../flutter/impeller/renderer/backend/metal/formats_mtl.h
 FILE: ../../../flutter/impeller/renderer/backend/metal/formats_mtl.mm
-FILE: ../../../flutter/impeller/renderer/backend/metal/gpu_tracer_mtl.h
-FILE: ../../../flutter/impeller/renderer/backend/metal/gpu_tracer_mtl.mm
 FILE: ../../../flutter/impeller/renderer/backend/metal/pipeline_library_mtl.h
 FILE: ../../../flutter/impeller/renderer/backend/metal/pipeline_library_mtl.mm
 FILE: ../../../flutter/impeller/renderer/backend/metal/pipeline_mtl.h
@@ -4135,8 +4130,6 @@ FILE: ../../../flutter/impeller/renderer/compute_tessellator.cc
 FILE: ../../../flutter/impeller/renderer/compute_tessellator.h
 FILE: ../../../flutter/impeller/renderer/context.cc
 FILE: ../../../flutter/impeller/renderer/context.h
-FILE: ../../../flutter/impeller/renderer/gpu_tracer.cc
-FILE: ../../../flutter/impeller/renderer/gpu_tracer.h
 FILE: ../../../flutter/impeller/renderer/path_polyline.comp
 FILE: ../../../flutter/impeller/renderer/pipeline.cc
 FILE: ../../../flutter/impeller/renderer/pipeline.h
@@ -5284,6 +5277,7 @@ FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterTextu
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterTextureRegistrar.mm
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterThreadSynchronizer.h
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterThreadSynchronizer.mm
+FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterUmbrellaImportTests.m
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterView.h
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterView.mm
 FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterViewController.mm

ci/licenses_golden/licenses_fuchsia

@@ -1,4 +1,4 @@
-Signature: 6223c2269ce52a64e24a9b227c951cd2
+Signature: bc340b86c04c5bbc05b3c11eaf2046bf
 
 ====================================================================================================
 LIBRARY: fuchsia_sdk

ci/licenses_golden/licenses_skia

@@ -1,4 +1,4 @@
-Signature: 8d9e4d350137e50579a9391b28f8f475
+Signature: 63c89b7eda37fc9474183e7f86a23bc2
 
 ====================================================================================================
 LIBRARY: etc1
@@ -8979,6 +8979,9 @@ ORIGIN: ../../../third_party/skia/src/core/SkScan_SAAPath.cpp + ../../../third_p
 ORIGIN: ../../../third_party/skia/src/core/SkWritePixelsRec.cpp + ../../../third_party/skia/LICENSE
 ORIGIN: ../../../third_party/skia/src/core/SkXfermode_Raster.cpp + ../../../third_party/skia/LICENSE
 ORIGIN: ../../../third_party/skia/src/encode/SkEncoder.cpp + ../../../third_party/skia/LICENSE
+ORIGIN: ../../../third_party/skia/src/encode/SkJpegEncoder_none.cpp + ../../../third_party/skia/LICENSE
+ORIGIN: ../../../third_party/skia/src/encode/SkPngEncoder_none.cpp + ../../../third_party/skia/LICENSE
+ORIGIN: ../../../third_party/skia/src/encode/SkWebpEncoder_none.cpp + ../../../third_party/skia/LICENSE
 ORIGIN: ../../../third_party/skia/src/gpu/DitherUtils.cpp + ../../../third_party/skia/LICENSE
 ORIGIN: ../../../third_party/skia/src/gpu/DitherUtils.h + ../../../third_party/skia/LICENSE
 ORIGIN: ../../../third_party/skia/src/gpu/dawn/DawnUtilsPriv.h + ../../../third_party/skia/LICENSE
@@ -9052,6 +9055,9 @@ FILE: ../../../third_party/skia/src/core/SkScan_SAAPath.cpp
 FILE: ../../../third_party/skia/src/core/SkWritePixelsRec.cpp
 FILE: ../../../third_party/skia/src/core/SkXfermode_Raster.cpp
 FILE: ../../../third_party/skia/src/encode/SkEncoder.cpp
+FILE: ../../../third_party/skia/src/encode/SkJpegEncoder_none.cpp
+FILE: ../../../third_party/skia/src/encode/SkPngEncoder_none.cpp
+FILE: ../../../third_party/skia/src/encode/SkWebpEncoder_none.cpp
 FILE: ../../../third_party/skia/src/gpu/DitherUtils.cpp
 FILE: ../../../third_party/skia/src/gpu/DitherUtils.h
 FILE: ../../../third_party/skia/src/gpu/dawn/DawnUtilsPriv.h

ci/licenses_golden/licenses_third_party

@@ -1,4 +1,4 @@
-Signature: ffb3a93c8ce05d861a4a7c7fc7b9e8ed
+Signature: c6c749e1ce060920e375623451f66662
 
 ====================================================================================================
 LIBRARY: angle

common/config.gni

@@ -61,6 +61,10 @@ if (is_ios || is_mac) {
     "-Werror=overriding-method-mismatch",
     "-Werror=undeclared-selector",
   ]
+  if (is_mac) {
+    flutter_cflags_objc += [ "-fapplication-extension" ]
+  }
+
   flutter_cflags_objcc = flutter_cflags_objc
   flutter_cflags_objc_arc = flutter_cflags_objc + [ "-fobjc-arc" ]
   flutter_cflags_objcc_arc = flutter_cflags_objc_arc

flow/skia_gpu_object.h

@@ -26,6 +26,10 @@ class UnrefQueue : public fml::RefCountedThreadSafe<UnrefQueue<T>> {
   using ResourceContext = T;
 
   void Unref(SkRefCnt* object) {
+    if (drain_immediate_) {
+      object->unref();
+      return;
+    }
     std::scoped_lock lock(mutex_);
     objects_.push_back(object);
     if (!drain_pending_) {
@@ -36,6 +40,8 @@ class UnrefQueue : public fml::RefCountedThreadSafe<UnrefQueue<T>> {
   }
 
   void DeleteTexture(GrBackendTexture texture) {
+    // drain_immediate_ should only be used on Impeller.
+    FML_DCHECK(!drain_immediate_);
     std::scoped_lock lock(mutex_);
     textures_.push_back(texture);
     if (!drain_pending_) {
@@ -75,17 +81,22 @@ class UnrefQueue : public fml::RefCountedThreadSafe<UnrefQueue<T>> {
   std::deque<GrBackendTexture> textures_;
   bool drain_pending_;
   sk_sp<ResourceContext> context_;
+  // Enabled when there is an impeller context, which removes the usage of
+  // the queue altogether.
+  bool drain_immediate_;
 
   // The `GrDirectContext* context` is only used for signaling Skia to
   // performDeferredCleanup. It can be nullptr when such signaling is not needed
   // (e.g., in unit tests).
   UnrefQueue(fml::RefPtr<fml::TaskRunner> task_runner,
              fml::TimeDelta delay,
-             sk_sp<ResourceContext> context = nullptr)
+             sk_sp<ResourceContext> context = nullptr,
+             bool drain_immediate = false)
       : task_runner_(std::move(task_runner)),
         drain_delay_(delay),
         drain_pending_(false),
-        context_(context) {}
+        context_(context),
+        drain_immediate_(drain_immediate) {}
 
   ~UnrefQueue() {
     // The ResourceContext must be deleted on the task runner thread.

impeller/entity/contents/content_context.h

@@ -774,7 +774,12 @@ class ContentContext {
     // The prototype must always be initialized in the constructor.
     FML_CHECK(prototype != container.end());
 
-    auto variant_future = prototype->second->WaitAndGet()->CreateVariant(
+    auto pipeline = prototype->second->WaitAndGet();
+    if (!pipeline) {
+      return nullptr;
+    }
+
+    auto variant_future = pipeline->CreateVariant(
         [&opts, variants_count = container.size()](PipelineDescriptor& desc) {
           opts.ApplyToPipelineDescriptor(desc);
           desc.SetLabel(