Merge branch 'main' into rotate_color

Author: dnfield

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': '827013b3dbef2cf91399d3516e36c050719040bb',
+  'skia_revision': 'c162dae2b29713736750af2e39f1acf5d458478f',
 
   # 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': '73127306ac6bd0db1ce3ca6c6a0b77dc26241b5e',
+  'dart_revision': 'f97b9d9b2f6454c258042ada26309a9126d0da73',
 
   # 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/licenses_golden/licenses_skia

@@ -1,4 +1,4 @@
-Signature: db14afda8d4df5d196cdf2ad2abef14d
+Signature: 8ee8750ec91435fbd8334baa10ee0e35
 
 ====================================================================================================
 LIBRARY: etc1

ci/licenses_golden/licenses_third_party

@@ -1,4 +1,4 @@
-Signature: 7ea770e2e44fb8185050261387151d17
+Signature: 7c30a2e45672e44f4d80f62471a5e1b0
 
 ====================================================================================================
 LIBRARY: angle

impeller/base/validation.h

@@ -38,4 +38,17 @@ struct ScopedValidationDisable {
 
 }  // namespace impeller
 
+//------------------------------------------------------------------------------
+/// Get a stream to the log Impeller uses for all validation errors. The
+/// behavior of these logs is as follows:
+///
+/// * Validation error are completely ignored in the Flutter release
+///   runtime-mode.
+/// * In non-release runtime-modes, validation logs are redirected to the
+///   Flutter `INFO` log. These logs typically show up when verbose logging is
+///   enabled.
+/// * If `ImpellerValidationErrorsSetFatal` is set to `true`, validation logs
+///   are fatal. The runtime-mode restriction still applies. This usually
+///   happens in test environments.
+///
 #define VALIDATION_LOG ::impeller::ValidationLog{}.GetStream()

impeller/renderer/pipeline_builder.h

@@ -93,15 +93,15 @@ struct PipelineBuilder {
             << VertexShader::kLabel << "'.";
         return false;
       }
-      if (!vertex_descriptor->SetDescriptorSetLayouts(
+      if (!vertex_descriptor->RegisterDescriptorSetLayouts(
               VertexShader::kDescriptorSetLayouts)) {
         VALIDATION_LOG << "Cound not configure vertex descriptor set layout for"
                           " pipeline named '"
                        << VertexShader::kLabel << "'.";
         return false;
       }
 
-      if (!vertex_descriptor->SetDescriptorSetLayouts(
+      if (!vertex_descriptor->RegisterDescriptorSetLayouts(
               FragmentShader::kDescriptorSetLayouts)) {
         VALIDATION_LOG << "Cound not configure vertex descriptor set layout for"
                           " pipeline named '"

impeller/renderer/vertex_descriptor.cc

@@ -20,7 +20,7 @@ bool VertexDescriptor::SetStageInputs(
   return true;
 }
 
-bool VertexDescriptor::SetDescriptorSetLayouts(
+bool VertexDescriptor::RegisterDescriptorSetLayouts(
     const DescriptorSetLayout desc_set_layout[],
     size_t count) {
   desc_set_layouts_.reserve(desc_set_layouts_.size() + count);

impeller/renderer/vertex_descriptor.h

@@ -37,16 +37,16 @@ class VertexDescriptor final : public Comparable<VertexDescriptor> {
   }
 
   template <size_t Size>
-  bool SetDescriptorSetLayouts(
+  bool RegisterDescriptorSetLayouts(
       const std::array<DescriptorSetLayout, Size>& inputs) {
-    return SetDescriptorSetLayouts(inputs.data(), inputs.size());
+    return RegisterDescriptorSetLayouts(inputs.data(), inputs.size());
   }
 
   bool SetStageInputs(const ShaderStageIOSlot* const stage_inputs[],
                       size_t count);
 
-  bool SetDescriptorSetLayouts(const DescriptorSetLayout desc_set_layout[],
-                               size_t count);
+  bool RegisterDescriptorSetLayouts(const DescriptorSetLayout desc_set_layout[],
+                                    size_t count);
 
   const std::vector<ShaderStageIOSlot>& GetStageInputs() const;
 

sky/packages/sky_engine/BUILD.gn

@@ -25,7 +25,6 @@ import("//third_party/dart/sdk/lib/js_interop/js_interop_sources.gni")
 import("//third_party/dart/sdk/lib/js_util/js_util_sources.gni")
 import("//third_party/dart/sdk/lib/math/math_sources.gni")
 import("//third_party/dart/sdk/lib/typed_data/typed_data_sources.gni")
-import("//third_party/dart/sdk/lib/wasm/wasm_sources.gni")
 
 if (!is_fuchsia) {
   copy("copy_sky_engine_authors") {
@@ -170,13 +169,6 @@ copy("typed_data") {
   ]
 }
 
-copy("wasm") {
-  lib_path = rebase_path("wasm", "", dart_sdk_lib_path)
-  sources = rebase_path(wasm_sdk_sources, "", lib_path)
-  outputs =
-      [ "$root_gen_dir/dart-pkg/sky_engine/lib/wasm/{{source_file_part}}" ]
-}
-
 copy("copy_dart_ui") {
   sources = dart_ui_files
 
@@ -213,7 +205,6 @@ group("copy_dart_sdk") {
     ":js_util",
     ":math",
     ":typed_data",
-    ":wasm",
   ]
 }
 
@@ -239,7 +230,6 @@ generated_file("_embedder_yaml") {
     "  \"dart:math\": \"math/math.dart\"",
     "  \"dart:typed_data\": \"typed_data/typed_data.dart\"",
     "  \"dart:ui\": \"ui/ui.dart\"",
-    "  \"dart:wasm\": \"wasm/wasm_types.dart\"",
     "",
     "  \"dart:_http\": \"_http/http.dart\"",
     "  \"dart:_interceptors\": \"_interceptors/interceptors.dart\"",

sky/packages/sky_engine/lib/_embedder.yaml

@@ -17,7 +17,6 @@ embedded_libs:
   "dart:math": "../../../../../third_party/dart/sdk/lib/math/math.dart"
   "dart:typed_data": "../../../../../third_party/dart/sdk/lib/typed_data/typed_data.dart"
   "dart:ui": "../../../../lib/ui/ui.dart"
-  "dart:wasm": "../../../../../third_party/dart/sdk/lib/wasm/wasm_types.dart"
 
   "dart:_http": "../../../../../third_party/dart/sdk/lib/_http/http.dart"
   "dart:_interceptors": "../../../../../third_party/dart/sdk/lib/_interceptors/interceptors.dart"