Merge branch 'main' into engine-tidy-aiks

matanlurey · web-flow · commit bf85a58c8062 · 2023-11-16T16:04:17.000-08:00
diff --git a/DEPS b/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': '4c099aaa259faa4d89215d94b452eeaa201c206a',
+  'skia_revision': '762d95ed65e0d1ea42eb6564c0d6bea627cd326d',
 
   # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
   # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
diff --git a/ci/licenses_golden/excluded_files b/ci/licenses_golden/excluded_files
@@ -140,6 +140,7 @@
 ../../../flutter/impeller/docs
 ../../../flutter/impeller/entity/contents/checkerboard_contents_unittests.cc
 ../../../flutter/impeller/entity/contents/filters/directional_gaussian_blur_filter_contents_unittests.cc
+../../../flutter/impeller/entity/contents/filters/gaussian_blur_filter_contents_unittests.cc
 ../../../flutter/impeller/entity/contents/filters/inputs/filter_input_unittests.cc
 ../../../flutter/impeller/entity/contents/test
 ../../../flutter/impeller/entity/contents/vertices_contents_unittests.cc
diff --git a/ci/licenses_golden/licenses_flutter b/ci/licenses_golden/licenses_flutter
@@ -3062,6 +3062,8 @@ ORIGIN: ../../../flutter/impeller/entity/contents/filters/directional_gaussian_b
 ORIGIN: ../../../flutter/impeller/entity/contents/filters/directional_gaussian_blur_filter_contents.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/entity/contents/filters/filter_contents.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/entity/contents/filters/filter_contents.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/filters/gaussian_blur_filter_contents.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/entity/contents/filters/gaussian_blur_filter_contents.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/entity/contents/filters/inputs/contents_filter_input.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/entity/contents/filters/inputs/contents_filter_input.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/entity/contents/filters/inputs/filter_contents_filter_input.cc + ../../../flutter/LICENSE
@@ -5829,6 +5831,8 @@ FILE: ../../../flutter/impeller/entity/contents/filters/directional_gaussian_blu
 FILE: ../../../flutter/impeller/entity/contents/filters/directional_gaussian_blur_filter_contents.h
 FILE: ../../../flutter/impeller/entity/contents/filters/filter_contents.cc
 FILE: ../../../flutter/impeller/entity/contents/filters/filter_contents.h
+FILE: ../../../flutter/impeller/entity/contents/filters/gaussian_blur_filter_contents.cc
+FILE: ../../../flutter/impeller/entity/contents/filters/gaussian_blur_filter_contents.h
 FILE: ../../../flutter/impeller/entity/contents/filters/inputs/contents_filter_input.cc
 FILE: ../../../flutter/impeller/entity/contents/filters/inputs/contents_filter_input.h
 FILE: ../../../flutter/impeller/entity/contents/filters/inputs/filter_contents_filter_input.cc
diff --git a/impeller/archivist/archive.cc b/impeller/archivist/archive.cc
@@ -4,13 +4,10 @@
 
 #include "impeller/archivist/archive.h"
 
-#include <iterator>
-
 #include "flutter/fml/logging.h"
 #include "impeller/archivist/archive_class_registration.h"
 #include "impeller/archivist/archive_database.h"
 #include "impeller/archivist/archive_location.h"
-#include "impeller/base/validation.h"
 
 namespace impeller {
 
diff --git a/impeller/archivist/archive.h b/impeller/archivist/archive.h
@@ -9,9 +9,7 @@
 #include <optional>
 #include <string>
 #include <type_traits>
-#include <vector>
 
-#include "flutter/fml/macros.h"
 #include "impeller/archivist/archivable.h"
 
 namespace impeller {
@@ -21,7 +19,7 @@ class ArchiveDatabase;
 
 class Archive {
  public:
-  Archive(const std::string& path);
+  explicit Archive(const std::string& path);
 
   ~Archive();
 
@@ -45,7 +43,7 @@ class Archive {
 
   template <class T,
             class = std::enable_if_t<std::is_base_of<Archivable, T>::value>>
-  [[nodiscard]] size_t Read(UnarchiveStep stepper) {
+  [[nodiscard]] size_t Read(const UnarchiveStep& stepper) {
     const ArchiveDef& def = T::kArchiveDefinition;
     return UnarchiveInstances(def, stepper);
   }
diff --git a/impeller/archivist/archive_database.h b/impeller/archivist/archive_database.h
@@ -8,7 +8,6 @@
 #include <memory>
 #include <string>
 
-#include "flutter/fml/macros.h"
 #include "impeller/archivist/archive_transaction.h"
 
 namespace impeller {
@@ -22,7 +21,7 @@ struct ArchiveDef;
 ///
 class ArchiveDatabase {
  public:
-  ArchiveDatabase(const std::string& filename);
+  explicit ArchiveDatabase(const std::string& filename);
 
   ~ArchiveDatabase();
 
diff --git a/impeller/archivist/archive_location.h b/impeller/archivist/archive_location.h
@@ -7,7 +7,6 @@
 #include <optional>
 #include <type_traits>
 
-#include "flutter/fml/macros.h"
 #include "impeller/archivist/archivable.h"
 #include "impeller/archivist/archive.h"
 #include "impeller/base/allocation.h"
diff --git a/impeller/archivist/archive_statement.h b/impeller/archivist/archive_statement.h
@@ -7,7 +7,6 @@
 #include <memory>
 #include <type_traits>
 
-#include "flutter/fml/macros.h"
 #include "impeller/base/allocation.h"
 
 namespace impeller {
diff --git a/impeller/archivist/archive_transaction.h b/impeller/archivist/archive_transaction.h
@@ -5,8 +5,6 @@
 
 #include <cstdint>
 
-#include "flutter/fml/macros.h"
-
 namespace impeller {
 
 class ArchiveStatement;
diff --git a/impeller/archivist/archive_vector.h b/impeller/archivist/archive_vector.h
@@ -4,7 +4,6 @@
 
 #pragma once
 
-#include "flutter/fml/macros.h"
 #include "impeller/archivist/archive.h"
 
 namespace impeller {
@@ -28,7 +27,7 @@ class ArchiveVector : public Archivable {
 
   ArchiveVector();
 
-  ArchiveVector(std::vector<int64_t> keys);
+  explicit ArchiveVector(std::vector<int64_t> keys);
 
   ArchiveVector(const ArchiveVector&) = delete;
 
diff --git a/impeller/base/validation.h b/impeller/base/validation.h
@@ -12,8 +12,6 @@
 
 #include <sstream>
 
-#include "flutter/fml/macros.h"
-
 namespace impeller {
 
 class ValidationLog {
diff --git a/impeller/compiler/compiler_backend.h b/impeller/compiler/compiler_backend.h
@@ -47,7 +47,7 @@ struct CompilerBackend {
 
   spirv_cross::Compiler* GetCompiler();
 
-  operator bool() const;
+  explicit operator bool() const;
 
   enum class ExtendedResourceIndex {
     kPrimary,
diff --git a/impeller/compiler/includer.h b/impeller/compiler/includer.h
@@ -6,7 +6,6 @@
 
 #include <string>
 
-#include "flutter/fml/macros.h"
 #include "flutter/fml/mapping.h"
 #include "impeller/compiler/include_dir.h"
 #include "shaderc/shaderc.hpp"
diff --git a/impeller/compiler/logger.h b/impeller/compiler/logger.h
@@ -8,14 +8,13 @@
 #include <string>
 
 #include "flutter/fml/logging.h"
-#include "flutter/fml/macros.h"
 
 namespace impeller {
 namespace compiler {
 
 class AutoLogger {
  public:
-  AutoLogger(std::stringstream& logger) : logger_(logger) {}
+  explicit AutoLogger(std::stringstream& logger) : logger_(logger) {}
 
   ~AutoLogger() {
     logger_ << std::endl;
diff --git a/impeller/compiler/source_options.h b/impeller/compiler/source_options.h
@@ -9,7 +9,6 @@
 #include <string>
 #include <vector>
 
-#include "flutter/fml/macros.h"
 #include "flutter/fml/unique_fd.h"
 #include "impeller/compiler/include_dir.h"
 #include "impeller/compiler/types.h"
diff --git a/impeller/compiler/spirv_compiler.h b/impeller/compiler/spirv_compiler.h
@@ -7,7 +7,6 @@
 #include <cstdint>
 #include <vector>
 
-#include "flutter/fml/macros.h"
 #include "flutter/fml/mapping.h"
 #include "impeller/compiler/includer.h"
 #include "impeller/compiler/source_options.h"
diff --git a/impeller/compiler/spirv_sksl.h b/impeller/compiler/spirv_sksl.h
@@ -10,7 +10,6 @@
 #include <variant>
 
 #include "flutter/fml/logging.h"
-#include "flutter/fml/macros.h"
 #include "spirv_glsl.hpp"
 
 namespace impeller {
diff --git a/impeller/compiler/switches.h b/impeller/compiler/switches.h
@@ -9,9 +9,7 @@
 #include <memory>
 
 #include "flutter/fml/command_line.h"
-#include "flutter/fml/macros.h"
 #include "flutter/fml/unique_fd.h"
-#include "impeller/compiler/compiler.h"
 #include "impeller/compiler/include_dir.h"
 #include "impeller/compiler/types.h"
 
diff --git a/impeller/compiler/utilities.h b/impeller/compiler/utilities.h
@@ -8,8 +8,6 @@
 #include <string>
 #include <string_view>
 
-#include "flutter/fml/macros.h"
-
 namespace impeller {
 namespace compiler {
 
diff --git a/impeller/core/allocator.h b/impeller/core/allocator.h
@@ -4,9 +4,6 @@
 
 #pragma once
 
-#include <string>
-
-#include "flutter/fml/macros.h"
 #include "flutter/fml/mapping.h"
 #include "impeller/core/device_buffer_descriptor.h"
 #include "impeller/core/texture.h"
diff --git a/impeller/core/buffer_view.h b/impeller/core/buffer_view.h
@@ -4,7 +4,6 @@
 
 #pragma once
 
-#include "flutter/fml/macros.h"
 #include "impeller/core/buffer.h"
 #include "impeller/core/range.h"
 
diff --git a/impeller/core/device_buffer.h b/impeller/core/device_buffer.h
@@ -7,7 +7,6 @@
 #include <memory>
 #include <string>
 
-#include "flutter/fml/macros.h"
 #include "impeller/core/allocator.h"
 #include "impeller/core/buffer.h"
 #include "impeller/core/buffer_view.h"
diff --git a/impeller/core/formats.h b/impeller/core/formats.h
@@ -12,7 +12,6 @@
 
 #include "flutter/fml/hash_combine.h"
 #include "flutter/fml/logging.h"
-#include "flutter/fml/macros.h"
 #include "impeller/geometry/color.h"
 #include "impeller/geometry/rect.h"
 #include "impeller/geometry/scalar.h"
diff --git a/impeller/core/host_buffer.h b/impeller/core/host_buffer.h
@@ -9,7 +9,6 @@
 #include <string>
 #include <type_traits>
 
-#include "flutter/fml/macros.h"
 #include "impeller/base/allocation.h"
 #include "impeller/core/buffer.h"
 #include "impeller/core/buffer_view.h"
diff --git a/impeller/core/resource_binder.h b/impeller/core/resource_binder.h
@@ -10,7 +10,6 @@
 #include <string>
 
 #include "flutter/fml/logging.h"
-#include "flutter/fml/macros.h"
 #include "impeller/core/buffer_view.h"
 #include "impeller/core/formats.h"
 #include "impeller/core/sampler.h"
diff --git a/impeller/core/sampler.h b/impeller/core/sampler.h
@@ -4,7 +4,6 @@
 
 #pragma once
 
-#include "flutter/fml/macros.h"
 #include "impeller/core/sampler_descriptor.h"
 
 namespace impeller {
diff --git a/impeller/core/sampler_descriptor.h b/impeller/core/sampler_descriptor.h
@@ -6,7 +6,6 @@
 
 #include <unordered_map>
 
-#include "flutter/fml/macros.h"
 #include "impeller/base/comparable.h"
 #include "impeller/core/formats.h"
 
diff --git a/impeller/core/texture_descriptor.h b/impeller/core/texture_descriptor.h
@@ -4,11 +4,8 @@
 
 #pragma once
 
-#include <optional>
-
 #include "impeller/core/formats.h"
 #include "impeller/geometry/size.h"
-#include "impeller/image/decompressed_image.h"
 
 namespace impeller {
 
diff --git a/impeller/core/vertex_buffer.h b/impeller/core/vertex_buffer.h
@@ -17,7 +17,7 @@ struct VertexBuffer {
   size_t vertex_count = 0u;
   IndexType index_type = IndexType::kUnknown;
 
-  constexpr operator bool() const {
+  constexpr explicit operator bool() const {
     return static_cast<bool>(vertex_buffer) &&
            (index_type == IndexType::kNone || static_cast<bool>(index_buffer));
   }
diff --git a/impeller/display_list/dl_dispatcher.h b/impeller/display_list/dl_dispatcher.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include "flutter/display_list/dl_op_receiver.h"
-#include "flutter/fml/macros.h"
 #include "impeller/aiks/canvas_type.h"
 #include "impeller/aiks/paint.h"
 
diff --git a/impeller/display_list/dl_image_impeller.h b/impeller/display_list/dl_image_impeller.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include "flutter/display_list/image/dl_image.h"
-#include "flutter/fml/macros.h"
 #include "impeller/core/texture.h"
 
 namespace impeller {
diff --git a/impeller/display_list/dl_playground.h b/impeller/display_list/dl_playground.h
@@ -6,7 +6,6 @@
 
 #include "flutter/display_list/display_list.h"
 #include "flutter/display_list/dl_builder.h"
-#include "flutter/fml/macros.h"
 #include "impeller/playground/playground_test.h"
 #include "third_party/skia/include/core/SkFont.h"
 
diff --git a/impeller/display_list/nine_patch_converter.h b/impeller/display_list/nine_patch_converter.h
@@ -6,12 +6,10 @@
 
 #include <memory>
 
-#include "flutter/fml/macros.h"
 #include "impeller/aiks/canvas_type.h"
 #include "impeller/aiks/image.h"
 #include "impeller/aiks/paint.h"
 #include "impeller/core/sampler_descriptor.h"
-#include "impeller/geometry/path.h"
 
 namespace impeller {
 
diff --git a/impeller/entity/BUILD.gn b/impeller/entity/BUILD.gn
@@ -134,6 +134,8 @@ impeller_component("entity") {
     "contents/filters/directional_gaussian_blur_filter_contents.h",
     "contents/filters/filter_contents.cc",
     "contents/filters/filter_contents.h",
+    "contents/filters/gaussian_blur_filter_contents.cc",
+    "contents/filters/gaussian_blur_filter_contents.h",
     "contents/filters/inputs/contents_filter_input.cc",
     "contents/filters/inputs/contents_filter_input.h",
     "contents/filters/inputs/filter_contents_filter_input.cc",
@@ -255,6 +257,7 @@ impeller_component("entity_unittests") {
   sources = [
     "contents/checkerboard_contents_unittests.cc",
     "contents/filters/directional_gaussian_blur_filter_contents_unittests.cc",
+    "contents/filters/gaussian_blur_filter_contents_unittests.cc",
     "contents/filters/inputs/filter_input_unittests.cc",
     "contents/vertices_contents_unittests.cc",
     "entity_pass_target_unittests.cc",
diff --git a/impeller/entity/contents/filters/directional_gaussian_blur_filter_contents.cc b/impeller/entity/contents/filters/directional_gaussian_blur_filter_contents.cc
@@ -185,6 +185,7 @@ std::optional<Entity> DirectionalGaussianBlurFilterContents::RenderFilter(
     auto r = Radius{transformed_blur_radius_length};
     frag_info.blur_sigma = Sigma{r}.sigma;
     frag_info.blur_radius = std::round(r.radius);
+    frag_info.step_size = 2.0;
 
     // The blur direction is in input UV space.
     frag_info.blur_uv_offset =
diff --git a/impeller/entity/contents/filters/filter_contents.cc b/impeller/entity/contents/filters/filter_contents.cc
@@ -17,6 +17,7 @@
 #include "impeller/entity/contents/content_context.h"
 #include "impeller/entity/contents/filters/border_mask_blur_filter_contents.h"
 #include "impeller/entity/contents/filters/directional_gaussian_blur_filter_contents.h"
+#include "impeller/entity/contents/filters/gaussian_blur_filter_contents.h"
 #include "impeller/entity/contents/filters/inputs/filter_input.h"
 #include "impeller/entity/contents/filters/local_matrix_filter_contents.h"
 #include "impeller/entity/contents/filters/matrix_filter_contents.h"
@@ -55,6 +56,20 @@ std::shared_ptr<FilterContents> FilterContents::MakeGaussianBlur(
     Sigma sigma_y,
     BlurStyle blur_style,
     Entity::TileMode tile_mode) {
+  constexpr bool use_new_filter =
+#ifdef IMPELLER_ENABLE_NEW_GAUSSIAN_FILTER
+      true;
+#else
+      false;
+#endif
+
+  // TODO(https://github.com/flutter/flutter/issues/131580): Remove once the new
+  // blur handles all cases.
+  if (use_new_filter) {
+    auto blur = std::make_shared<GaussianBlurFilterContents>(sigma_x.sigma);
+    blur->SetInputs({input});
+    return blur;
+  }
   std::shared_ptr<FilterContents> x_blur = MakeDirectionalGaussianBlur(
       /*input=*/input,
       /*sigma=*/sigma_x,
diff --git a/impeller/entity/contents/filters/gaussian_blur_filter_contents.cc b/impeller/entity/contents/filters/gaussian_blur_filter_contents.cc
diff --git a/impeller/entity/contents/filters/gaussian_blur_filter_contents.h b/impeller/entity/contents/filters/gaussian_blur_filter_contents.h
diff --git a/impeller/entity/contents/filters/gaussian_blur_filter_contents_unittests.cc b/impeller/entity/contents/filters/gaussian_blur_filter_contents_unittests.cc
diff --git a/impeller/entity/entity_unittests.cc b/impeller/entity/entity_unittests.cc
diff --git a/impeller/entity/shaders/gaussian_blur/gaussian_blur.glsl b/impeller/entity/shaders/gaussian_blur/gaussian_blur.glsl
diff --git a/impeller/geometry/geometry_asserts.h b/impeller/geometry/geometry_asserts.h
diff --git a/impeller/geometry/matrix.h b/impeller/geometry/matrix.h
diff --git a/impeller/geometry/point.h b/impeller/geometry/point.h
diff --git a/impeller/geometry/rect.h b/impeller/geometry/rect.h
diff --git a/impeller/geometry/rect_unittests.cc b/impeller/geometry/rect_unittests.cc
diff --git a/impeller/renderer/backend/metal/formats_mtl.h b/impeller/renderer/backend/metal/formats_mtl.h
diff --git a/impeller/scene/node.cc b/impeller/scene/node.cc
diff --git a/impeller/tools/malioc.json b/impeller/tools/malioc.json
diff --git a/lib/web_ui/lib/src/engine/canvaskit/layer_scene_builder.dart b/lib/web_ui/lib/src/engine/canvaskit/layer_scene_builder.dart
diff --git a/lib/web_ui/lib/src/engine/canvaskit/layer_tree.dart b/lib/web_ui/lib/src/engine/canvaskit/layer_tree.dart
diff --git a/lib/web_ui/test/canvaskit/layer_test.dart b/lib/web_ui/test/canvaskit/layer_test.dart
