Revert "[Impeller] Refactor color source resolution to use explicit factory types (#37656)"

This reverts commit 0241f18.

Author: zanderso

ci/licenses_golden/licenses_flutter

@@ -1030,8 +1030,6 @@ FILE: ../../../flutter/impeller/aiks/aiks_playground.h
 FILE: ../../../flutter/impeller/aiks/aiks_unittests.cc
 FILE: ../../../flutter/impeller/aiks/canvas.cc
 FILE: ../../../flutter/impeller/aiks/canvas.h
-FILE: ../../../flutter/impeller/aiks/color_source_factory.cc
-FILE: ../../../flutter/impeller/aiks/color_source_factory.h
 FILE: ../../../flutter/impeller/aiks/image.cc
 FILE: ../../../flutter/impeller/aiks/image.h
 FILE: ../../../flutter/impeller/aiks/paint.cc
@@ -1131,10 +1129,6 @@ FILE: ../../../flutter/impeller/compiler/types.cc
 FILE: ../../../flutter/impeller/compiler/types.h
 FILE: ../../../flutter/impeller/compiler/utilities.cc
 FILE: ../../../flutter/impeller/compiler/utilities.h
-FILE: ../../../flutter/impeller/display_list/conversion_utilities.cc
-FILE: ../../../flutter/impeller/display_list/conversion_utilities.h
-FILE: ../../../flutter/impeller/display_list/display_list_color_source_factory.cc
-FILE: ../../../flutter/impeller/display_list/display_list_color_source_factory.h
 FILE: ../../../flutter/impeller/display_list/display_list_dispatcher.cc
 FILE: ../../../flutter/impeller/display_list/display_list_dispatcher.h
 FILE: ../../../flutter/impeller/display_list/display_list_image_impeller.cc

impeller/aiks/BUILD.gn

@@ -10,8 +10,6 @@ impeller_component("aiks") {
     "aiks_context.h",
     "canvas.cc",
     "canvas.h",
-    "color_source_factory.cc",
-    "color_source_factory.h",
     "image.cc",
     "image.h",
     "paint.cc",

impeller/aiks/aiks_unittests.cc

@@ -160,7 +160,9 @@ void Canvas::DrawPaint(const Paint& paint) {
 bool Canvas::AttemptDrawBlurredRRect(const Rect& rect,
                                      Scalar corner_radius,
                                      const Paint& paint) {
-  if (!paint.color_source || paint.style != Paint::Style::kFill) {
+  if (paint.color_source == nullptr ||
+      paint.color_source_type != Paint::ColorSourceType::kColor ||
+      paint.style != Paint::Style::kFill) {
     return false;
   }
 
@@ -373,16 +375,17 @@ void Canvas::DrawTextFrame(const TextFrame& text_frame,
 
 void Canvas::DrawVertices(const Vertices& vertices,
                           BlendMode blend_mode,
-                          const Paint& paint) {
+                          Paint paint) {
   auto geometry = Geometry::MakeVertices(vertices);
 
   Entity entity;
   entity.SetTransformation(GetCurrentTransformation());
   entity.SetStencilDepth(GetStencilDepth());
   entity.SetBlendMode(paint.blend_mode);
 
-  if (paint.color_source) {
-    auto contents = paint.color_source->MakeContents();
+  if (paint.color_source.has_value()) {
+    auto& source = paint.color_source.value();
+    auto contents = source();
     contents->SetGeometry(std::move(geometry));
     contents->SetAlpha(paint.color.alpha);
     entity.SetContents(paint.WithFilters(std::move(contents), true));

impeller/aiks/canvas.cc

@@ -99,7 +99,7 @@ class Canvas {
 
   void DrawVertices(const Vertices& vertices,
                     BlendMode blend_mode,
-                    const Paint& paint);
+                    Paint paint);
 
   void DrawAtlas(const std::shared_ptr<Image>& atlas,
                  std::vector<Matrix> transforms,

impeller/aiks/canvas.h

@@ -27,8 +27,9 @@ std::shared_ptr<Contents> Paint::CreateContentsForEntity(const Path& path,
 
 std::shared_ptr<Contents> Paint::CreateContentsForGeometry(
     std::unique_ptr<Geometry> geometry) const {
-  if (color_source) {
-    auto contents = color_source->MakeContents();
+  if (color_source.has_value()) {
+    auto& source = color_source.value();
+    auto contents = source();
     contents->SetGeometry(std::move(geometry));
     contents->SetAlpha(color.alpha);
     return contents;

impeller/aiks/color_source_factory.cc

@@ -7,7 +7,6 @@
 #include <memory>
 
 #include "flutter/fml/macros.h"
-#include "impeller/aiks/color_source_factory.h"
 #include "impeller/entity/contents/contents.h"
 #include "impeller/entity/contents/filters/color_filter_contents.h"
 #include "impeller/entity/contents/filters/filter_contents.h"
@@ -30,12 +29,23 @@ struct Paint {
       FilterInput::Ref,
       bool is_solid_color,
       const Matrix& effect_transform)>;
+  using ColorSourceProc = std::function<std::shared_ptr<ColorSourceContents>()>;
 
   enum class Style {
     kFill,
     kStroke,
   };
 
+  enum class ColorSourceType {
+    kColor,
+    kImage,
+    kLinearGradient,
+    kRadialGradient,
+    kConicalGradient,
+    kSweepGradient,
+    kRuntimeEffect,
+  };
+
   struct MaskBlurDescriptor {
     FilterContents::BlurStyle style;
     Sigma sigma;
@@ -46,9 +56,10 @@ struct Paint {
         const Matrix& effect_matrix) const;
   };
 
-  std::shared_ptr<ColorSourceFactory> color_source;
-
   Color color = Color::Black();
+  std::optional<ColorSourceProc> color_source;
+  ColorSourceType color_source_type = ColorSourceType::kColor;
+
   Scalar stroke_width = 0.0;
   Cap stroke_cap = Cap::kButt;
   Join stroke_join = Join::kMiter;

impeller/aiks/color_source_factory.h

@@ -6,10 +6,6 @@ import("//flutter/impeller/tools/impeller.gni")
 
 impeller_component("display_list") {
   sources = [
-    "conversion_utilities.cc",
-    "conversion_utilities.h",
-    "display_list_color_source_factory.cc",
-    "display_list_color_source_factory.h",
     "display_list_dispatcher.cc",
     "display_list_dispatcher.h",
     "display_list_image_impeller.cc",