Merge branch 'main' into bdero/reland-embedder-macos-desktop

Author: bdero

.github/workflows/scorecards-analysis.yml

@@ -49,6 +49,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@0225834cc549ee0ca93cb085b92954821a145866
+        uses: github/codeql-action/upload-sarif@83f0fe6c4988d98a455712a27f0255212bba9bd4
         with:
           sarif_file: results.sarif

.github/workflows/third_party_scan.yml

@@ -45,6 +45,6 @@ jobs:
           retention-days: 5
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to security tab"
-        uses: github/codeql-action/upload-sarif@0225834cc549ee0ca93cb085b92954821a145866
+        uses: github/codeql-action/upload-sarif@83f0fe6c4988d98a455712a27f0255212bba9bd4
         with:
           sarif_file: osvReport.sarif

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': '611132d6ab8c0f19f2ddff7870917b9009c4698b',
+  'skia_revision': 'a226cfbd6cc7179e9ed165125d6861b99550a001',
 
   # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
   # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -53,7 +53,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': 'd00a370c1fd3ecac9c7bbb6c1dd13325cfa2b805',
+  'dart_revision': '3d4d29d8f16b7d81c03b701f29039fb216d15a56',
 
   # WARNING: DO NOT EDIT MANUALLY
   # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -67,11 +67,11 @@ vars = {
   'dart_libprotobuf_rev': '24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb',
   'dart_perfetto_rev': 'b8da07095979310818f0efde2ef3c69ea70d62c5',
   'dart_protobuf_gn_rev': 'ca669f79945418f6229e4fef89b666b2a88cbb10',
-  'dart_protobuf_rev': 'da6953c65a93f02908f79d7d8402af843a60dcff',
+  'dart_protobuf_rev': '346a72dd04602f004a5b2c06ee4196b6112492b7',
   'dart_pub_rev': '078c7fea0be2656debc675646806da14fa94f853',
   'dart_root_certificates_rev': '692f6d6488af68e0121317a9c2c9eb393eb0ee50',
   'dart_watcher_rev': '3f17faa2d09dca3e23bc07a01f2045ec0cd2837d',
-  'dart_webdev_rev': 'f565d7f1f8ac6e38613beb3be3b370d3dae23d4b',
+  'dart_webdev_rev': 'd442fa89bfe8a81ec0679f2d927765e182f7baf9',
   'dart_webkit_inspection_protocol_rev': '39a3c297ff573635e7936b015ce4f3466e4739d6',
   'dart_yaml_edit_rev': '87dcf31fcaada207ae7c3527f9885982534badce',
   'dart_zlib_rev': '14dd4c4455602c9b71a1a89b5cafd1f4030d2e3f',
@@ -334,13 +334,13 @@ deps = {
    {'packages': [{'version': 'git_revision:0c0c65dbaf53f8c508bfd6acbeb7f1986c1ca1f8', 'package': 'dart/third_party/flutter/devtools'}], 'dep_type': 'cipd'},
 
   'src/third_party/dart/third_party/pkg/args':
-   Var('dart_git') + '/args.git@a9543c021f9409832b1668f9256f247585362389',
+   Var('dart_git') + '/args.git@f0f6cd22d29f15f86b3d2caab053bae029d30c9a',
 
   'src/third_party/dart/third_party/pkg/async':
    Var('dart_git') + '/async.git@96c29d0af81436443a3a24683915d39202172cde',
 
   'src/third_party/dart/third_party/pkg/bazel_worker':
-   Var('dart_git') + '/bazel_worker.git@c14a2687728081adc14c12fa50165e785326275c',
+   Var('dart_git') + '/bazel_worker.git@d9b389f30848253d3310f931a9b8d39ca07102b1',
 
   'src/third_party/dart/third_party/pkg/boolean_selector':
    Var('dart_git') + '/boolean_selector.git@3a1c982002f580b835b4380f44d9f8e5bc37fc4f',
@@ -370,7 +370,7 @@ deps = {
    Var('dart_git') + '/dart_style.git@2956b1a705953f880a5dae9d3a0969df0fc45e99',
 
   'src/third_party/dart/third_party/pkg/dartdoc':
-   Var('dart_git') + '/dartdoc.git@39fe1a8acdfa01d3671223dbbb4e98d360bd1083',
+   Var('dart_git') + '/dartdoc.git@950898f5ffea617bc572687c15cf51b2d6f05dad',
 
   'src/third_party/dart/third_party/pkg/ffi':
    Var('dart_git') + '/ffi.git@7f4acbd7532d94a793452030ff96bfef8cd96b68',
@@ -388,7 +388,7 @@ deps = {
    Var('dart_git') + '/html.git@92eacabadf40aa24c8f4289682ef2822c5d7e414',
 
   'src/third_party/dart/third_party/pkg/http':
-   Var('dart_git') + '/http.git@8834aecd973446263a23e1d2ea17932721c87281',
+   Var('dart_git') + '/http.git@18a43a2b3cc1af2f1e3a90aa848b7645bc400e0f',
 
   'src/third_party/dart/third_party/pkg/http_multi_server':
    Var('dart_git') + '/http_multi_server.git@a209cd59d99b52ff08b32ba37bdc9fc1a79bc9f2',
@@ -403,7 +403,7 @@ deps = {
    Var('dart_git') + '/json_rpc_2.git@73467f3651669af4870260fea4e99d7ba6ccb7ec',
 
   'src/third_party/dart/third_party/pkg/leak_tracker':
-   Var('dart_git') + '/leak_tracker.git@cbbdecae245c954686f871f04353f66b703c3332',
+   Var('dart_git') + '/leak_tracker.git@7f2cab3e0ce296f29ce0e45c5967707b95268eef',
 
   'src/third_party/dart/third_party/pkg/linter':
    Var('dart_git') + '/linter.git@27b46ce246204a2c0170a4bd5b23b94095e89a22',
@@ -421,10 +421,10 @@ deps = {
    Var('dart_git') + '/mime.git@24448401f621b9e154d165c900a3c8decd8a23f4',
 
   'src/third_party/dart/third_party/pkg/mockito':
-   Var('dart_git') + '/mockito.git@924f65cfe3510384fb780c5bd082c49cdb9dd6f2',
+   Var('dart_git') + '/mockito.git@40fe2ca00a10ae0fb73efb848920383be996d753',
 
   'src/third_party/dart/third_party/pkg/native':
-   Var('dart_git') + '/native.git@c851e69448594b1942e62e0d9f92e47d99575b99',
+   Var('dart_git') + '/native.git@76bc55e6c978d1793471ccfd7b0c883b3ba01dca',
 
   'src/third_party/dart/third_party/pkg/package_config':
    Var('dart_git') + '/package_config.git@203de2022af26b3ab2bcec18cc49614d9e502897',
@@ -442,10 +442,10 @@ deps = {
    Var('dart_git') + '/pub.git' + '@' + Var('dart_pub_rev'),
 
   'src/third_party/dart/third_party/pkg/pub_semver':
-   Var('dart_git') + '/pub_semver.git@3930557ee0b20ef528713952c318139409edadb4',
+   Var('dart_git') + '/pub_semver.git@c03435229a57d7b158df9feafdb5a2ccaef28d39',
 
   'src/third_party/dart/third_party/pkg/shelf':
-   Var('dart_git') + '/shelf.git@ce379aa3c22024edb2df3657fd564f1f463406e6',
+   Var('dart_git') + '/shelf.git@a404b6a3f3a3bde1a5f62b051b8852652ed677da',
 
   'src/third_party/dart/third_party/pkg/source_map_stack_trace':
    Var('dart_git') + '/source_map_stack_trace.git@b83af01938225c1706bbc6c1f86bd4a394f91380',
@@ -460,7 +460,7 @@ deps = {
    Var('dart_git') + '/sse.git@bfcbcd7a7320c74dfee154152419381c508a1fad',
 
   'src/third_party/dart/third_party/pkg/stack_trace':
-   Var('dart_git') + '/stack_trace.git@8b2046ecac56f5bb9196033ed187da0cf73eac67',
+   Var('dart_git') + '/stack_trace.git@86f7e30912d3cac447a751dc0bf2bafd473492dd',
 
   'src/third_party/dart/third_party/pkg/stream_channel':
    Var('dart_git') + '/stream_channel.git@b1d3384638064a4f25beacef3be770e2c4534408',
@@ -478,7 +478,7 @@ deps = {
    Var('dart_git') + '/test_reflective_loader.git@40d61b16647cd61b02d806fea46362ef07e7c502',
 
   'src/third_party/dart/third_party/pkg/tools':
-   Var('dart_git') + '/tools.git@389925fcfe79edd682e7547ce6f8d05bd0d786a8',
+   Var('dart_git') + '/tools.git@d723a55062959713f715ca3f10190a72c79634ef',
 
   'src/third_party/dart/third_party/pkg/typed_data':
    Var('dart_git') + '/typed_data.git@693f48e3d1d528f6f26d7069a2ad29b460650455',
@@ -505,7 +505,7 @@ deps = {
    Var('dart_git') + '/yaml_edit.git' + '@' + Var('dart_yaml_edit_rev'),
 
   'src/third_party/dart/tools/sdks/dart-sdk':
-   {'packages': [{'version': 'version:3.1.0-155.0.dev', 'package': 'dart/dart-sdk/${{platform}}'}], 'dep_type': 'cipd'},
+   {'packages': [{'version': 'git_revision:7a6514d1377175decd3a886fe4190fbbebddac3a', '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.
 
@@ -888,7 +888,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/mac-amd64',
-        'version': '5pFMQIRHNENhekRDO9H5EkK516sUM6RY8ja7gO29DuMC'
+        'version': 'fgfgAhpxFpse7Xi4ixmOI64x9KaHc0MVl77Ezx_5KMQC'
        }
      ],
      'condition': 'host_os == "mac" and not download_fuchsia_sdk',
@@ -898,7 +898,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/linux-amd64',
-        'version': 'Bb9z8SjSCzRN6SVeejkHk4KqDV8PspbyLyfB_cuQ8ZsC'
+        'version': 'vAwdggqMrL1yoH_ZneUmvbWLwC--mU9X4Uk4lddoxm0C'
        }
      ],
      'condition': 'host_os == "linux" and not download_fuchsia_sdk',

ci/licenses_golden/licenses_fuchsia

@@ -1,4 +1,4 @@
-Signature: 9ca584455f0be9be21dfffa2a02c8961
+Signature: 15a39ae639a64a262966273c993019f8
 
 ====================================================================================================
 LIBRARY: fuchsia_sdk

ci/licenses_golden/licenses_skia

@@ -1,4 +1,4 @@
-Signature: bf160be6f34b72380eb33c98f782b3ca
+Signature: 3b36fd88c606e949dd1b43a46b81debe
 
 ====================================================================================================
 LIBRARY: etc1

ci/licenses_golden/licenses_third_party

@@ -1,4 +1,5 @@
-Signature: 36d908473ff84048e26233ee191464ca
+Signature: fb9c41989bbf2d81046c5b4fbdb807ed
+
 
 ====================================================================================================
 LIBRARY: angle

flow/layers/layer_raster_cache_item.cc

@@ -7,9 +7,6 @@
 #include "flutter/flow/raster_cache_item.h"
 #include "flutter/flow/raster_cache_util.h"
 
-// TODO(zanderso): https://github.com/flutter/flutter/issues/127701
-// NOLINTBEGIN(bugprone-unchecked-optional-access)
-
 namespace flutter {
 
 LayerRasterCacheItem::LayerRasterCacheItem(Layer* layer,
@@ -143,7 +140,8 @@ static const auto* flow_type = "RasterCacheFlow::Layer";
 
 bool LayerRasterCacheItem::TryToPrepareRasterCache(const PaintContext& context,
                                                    bool parent_cached) const {
-  if (!context.raster_cache || parent_cached) {
+  auto maybe_id = GetId();
+  if (!maybe_id.has_value() || !context.raster_cache || parent_cached) {
     return false;
   }
   if (cache_state_ != kNone) {
@@ -157,8 +155,9 @@ bool LayerRasterCacheItem::TryToPrepareRasterCache(const PaintContext& context,
           .flow_type          = flow_type,
           // clang-format on
       };
+      auto id = maybe_id.value();
       return context.raster_cache->UpdateCacheEntry(
-          GetId().value(), r_context,
+          id, r_context,
           [ctx = context, cache_state = cache_state_,
            layer = layer_](DlCanvas* canvas) {
             Rasterize(cache_state, layer, ctx, canvas);
@@ -176,7 +175,7 @@ bool LayerRasterCacheItem::Draw(const PaintContext& context,
 bool LayerRasterCacheItem::Draw(const PaintContext& context,
                                 DlCanvas* canvas,
                                 const DlPaint* paint) const {
-  if (!context.raster_cache || !canvas) {
+  if (!layer_children_id_.has_value() || !context.raster_cache || !canvas) {
     return false;
   }
   switch (cache_state_) {
@@ -193,5 +192,3 @@ bool LayerRasterCacheItem::Draw(const PaintContext& context,
 }
 
 }  // namespace flutter
-
-// NOLINTEND(bugprone-unchecked-optional-access)

impeller/display_list/skia_conversions.cc

@@ -4,9 +4,6 @@
 
 #include "impeller/display_list/skia_conversions.h"
 
-// TODO(zanderso): https://github.com/flutter/flutter/issues/127701
-// NOLINTBEGIN(bugprone-unchecked-optional-access)
-
 namespace impeller {
 namespace skia_conversions {
 
@@ -24,7 +21,7 @@ std::optional<Rect> ToRect(const SkRect* rect) {
 std::vector<Rect> ToRects(const SkRect tex[], int count) {
   auto result = std::vector<Rect>();
   for (int i = 0; i < count; i++) {
-    result.push_back(ToRect(&tex[i]).value());
+    result.push_back(ToRect(tex[i]));
   }
   return result;
 }
@@ -180,5 +177,3 @@ std::optional<impeller::PixelFormat> ToPixelFormat(SkColorType type) {
 
 }  // namespace skia_conversions
 }  // namespace impeller
-
-// NOLINTEND(bugprone-unchecked-optional-access)

impeller/entity/contents/content_context.cc

@@ -16,9 +16,6 @@
 #include "impeller/renderer/render_target.h"
 #include "impeller/tessellator/tessellator.h"
 
-// TODO(zanderso): https://github.com/flutter/flutter/issues/127701
-// NOLINTBEGIN(bugprone-unchecked-optional-access)
-
 namespace impeller {
 
 void ContentContextOptions::ApplyToPipelineDescriptor(
@@ -33,13 +30,7 @@ void ContentContextOptions::ApplyToPipelineDescriptor(
   desc.SetSampleCount(sample_count);
 
   ColorAttachmentDescriptor color0 = *desc.GetColorAttachmentDescriptor(0u);
-  if (!color_attachment_pixel_format.has_value()) {
-    VALIDATION_LOG << "Color attachment pixel format must be set.";
-    color0.format = PixelFormat::kB8G8R8A8UNormInt;
-  } else {
-    color0.format = *color_attachment_pixel_format;
-  }
-  color0.format = *color_attachment_pixel_format;
+  color0.format = color_attachment_pixel_format.value_or(PixelFormat::kUnknown);
   color0.alpha_blend_op = BlendOperation::kAdd;
   color0.color_blend_op = BlendOperation::kAdd;
 
@@ -137,9 +128,9 @@ void ContentContextOptions::ApplyToPipelineDescriptor(
     desc.ClearStencilAttachments();
   }
 
-  if (desc.GetFrontStencilAttachmentDescriptor().has_value()) {
-    StencilAttachmentDescriptor stencil =
-        desc.GetFrontStencilAttachmentDescriptor().value();
+  auto maybe_stencil = desc.GetFrontStencilAttachmentDescriptor();
+  if (maybe_stencil.has_value()) {
+    StencilAttachmentDescriptor stencil = maybe_stencil.value();
     stencil.stencil_compare = stencil_compare;
     stencil.depth_stencil_pass = stencil_operation;
     desc.SetStencilAttachmentDescriptors(stencil);
@@ -312,9 +303,9 @@ ContentContext::ContentContext(std::shared_ptr<Context> context)
         context_->GetPipelineLibrary()->GetPipeline(uv_pipeline_desc).Get();
   }
 
-  if (solid_fill_pipelines_[{}]->GetDescriptor().has_value()) {
-    auto clip_pipeline_descriptor =
-        solid_fill_pipelines_[{}]->GetDescriptor().value();
+  auto maybe_pipeline_desc = solid_fill_pipelines_[{}]->GetDescriptor();
+  if (maybe_pipeline_desc.has_value()) {
+    auto clip_pipeline_descriptor = maybe_pipeline_desc.value();
     clip_pipeline_descriptor.SetLabel("Clip Pipeline");
     // Disable write to all color attachments.
     auto color_attachments =
@@ -412,5 +403,3 @@ void ContentContext::SetWireframe(bool wireframe) {
 }
 
 }  // namespace impeller
-
-// NOLINTEND(bugprone-unchecked-optional-access)

impeller/entity/contents/filters/filter_contents.cc

@@ -28,9 +28,6 @@
 #include "impeller/renderer/command_buffer.h"
 #include "impeller/renderer/render_pass.h"
 
-// TODO(zanderso): https://github.com/flutter/flutter/issues/127701
-// NOLINTBEGIN(bugprone-unchecked-optional-access)
-
 namespace impeller {
 
 std::shared_ptr<FilterContents> FilterContents::MakeDirectionalGaussianBlur(
@@ -180,8 +177,9 @@ bool FilterContents::Render(const ContentContext& renderer,
 std::optional<Rect> FilterContents::GetLocalCoverage(
     const Entity& local_entity) const {
   auto coverage = GetFilterCoverage(inputs_, local_entity, effect_transform_);
-  if (GetCoverageHint().has_value() && coverage.has_value()) {
-    coverage = coverage->Intersection(*GetCoverageHint());
+  auto coverage_hint = GetCoverageHint();
+  if (coverage_hint.has_value() && coverage.has_value()) {
+    coverage = coverage->Intersection(coverage_hint.value());
   }
 
   return coverage;
@@ -272,5 +270,3 @@ Matrix FilterContents::GetTransform(const Matrix& parent_transform) const {
 }
 
 }  // namespace impeller
-
-// NOLINTEND(bugprone-unchecked-optional-access)