[Impeller] Add explicit color filter types to Aiks.

ci/licenses_golden/licenses_flutter

@@ -1019,6 +1019,8 @@ ORIGIN: ../../../flutter/impeller/aiks/aiks_playground.cc + ../../../flutter/LIC
 ORIGIN: ../../../flutter/impeller/aiks/aiks_playground.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/aiks/canvas.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/aiks/canvas.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/aiks/color_filter.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/aiks/color_filter.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/aiks/color_source.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/aiks/color_source.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/aiks/image.cc + ../../../flutter/LICENSE
@@ -3701,6 +3703,8 @@ FILE: ../../../flutter/impeller/aiks/aiks_playground.cc
 FILE: ../../../flutter/impeller/aiks/aiks_playground.h
 FILE: ../../../flutter/impeller/aiks/canvas.cc
 FILE: ../../../flutter/impeller/aiks/canvas.h
+FILE: ../../../flutter/impeller/aiks/color_filter.cc
+FILE: ../../../flutter/impeller/aiks/color_filter.h
 FILE: ../../../flutter/impeller/aiks/color_source.cc
 FILE: ../../../flutter/impeller/aiks/color_source.h
 FILE: ../../../flutter/impeller/aiks/image.cc

impeller/aiks/BUILD.gn

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

impeller/aiks/aiks_unittests.cc

@@ -65,10 +65,7 @@ TEST_P(AiksTest, RotateColorFilteredPath) {
       .stroke_join = Join::kRound,
       .style = Paint::Style::kStroke,
       .color_filter =
-          [](FilterInput::Ref input) {
-            return ColorFilterContents::MakeBlend(
-                BlendMode::kSourceIn, {std::move(input)}, Color::AliceBlue());
-          },
+          ColorFilter::MakeBlend(BlendMode::kSourceIn, Color::AliceBlue()),
   };
 
   canvas.DrawPath(arrow_stem, paint);
@@ -1924,10 +1921,8 @@ TEST_P(AiksTest, PaintWithFilters) {
 
   ASSERT_FALSE(paint.HasColorFilter());
 
-  paint.color_filter = [](FilterInput::Ref input) {
-    return ColorFilterContents::MakeBlend(BlendMode::kSourceOver,
-                                          {std::move(input)}, Color::Blue());
-  };
+  paint.color_filter =
+      ColorFilter::MakeBlend(BlendMode::kSourceOver, Color::Blue());
 
   ASSERT_TRUE(paint.HasColorFilter());
 
@@ -1954,10 +1949,8 @@ TEST_P(AiksTest, OpacityPeepHoleApplicationTest) {
   auto rect = Rect::MakeLTRB(0, 0, 100, 100);
   Paint paint;
   paint.color = Color::White().WithAlpha(0.5);
-  paint.color_filter = [](FilterInput::Ref input) {
-    return ColorFilterContents::MakeBlend(BlendMode::kSourceOver,
-                                          {std::move(input)}, Color::Blue());
-  };
+  paint.color_filter =
+      ColorFilter::MakeBlend(BlendMode::kSourceOver, Color::Blue());
 
   // Paint has color filter, can't elide.
   auto delegate = std::make_shared<OpacityPeepholePassDelegate>(paint, rect);
@@ -2106,10 +2099,7 @@ TEST_P(AiksTest, ForegroundBlendSubpassCollapseOptimization) {
 
   canvas.SaveLayer({
       .color_filter =
-          [](FilterInput::Ref input) {
-            return ColorFilterContents::MakeBlend(
-                BlendMode::kColorDodge, {std::move(input)}, Color::Red());
-          },
+          ColorFilter::MakeBlend(BlendMode::kColorDodge, Color::Red()),
   });
 
   canvas.Translate({500, 300, 0});
@@ -2124,15 +2114,13 @@ TEST_P(AiksTest, ColorMatrixFilterSubpassCollapseOptimization) {
 
   canvas.SaveLayer({
       .color_filter =
-          [](FilterInput::Ref input) {
-            return ColorFilterContents::MakeColorMatrix(
-                std::move(input), {.array = {
-                                       -1.0, 0,    0,    1.0, 0,  //
-                                       0,    -1.0, 0,    1.0, 0,  //
-                                       0,    0,    -1.0, 1.0, 0,  //
-                                       1.0,  1.0,  1.0,  1.0, 0   //
-                                   }});
-          },
+          ColorFilter::MakeMatrix({.array =
+                                       {
+                                           -1.0, 0,    0,    1.0, 0,  //
+                                           0,    -1.0, 0,    1.0, 0,  //
+                                           0,    0,    -1.0, 1.0, 0,  //
+                                           1.0,  1.0,  1.0,  1.0, 0   //
+                                       }}),
   });
 
   canvas.Translate({500, 300, 0});
@@ -2146,11 +2134,7 @@ TEST_P(AiksTest, LinearToSrgbFilterSubpassCollapseOptimization) {
   Canvas canvas;
 
   canvas.SaveLayer({
-      .color_filter =
-          [](FilterInput::Ref input) {
-            return ColorFilterContents::MakeLinearToSrgbFilter(
-                std::move(input));
-          },
+      .color_filter = ColorFilter::MakeLinearToSrgb(),
   });
 
   canvas.Translate({500, 300, 0});
@@ -2164,11 +2148,7 @@ TEST_P(AiksTest, SrgbToLinearFilterSubpassCollapseOptimization) {
   Canvas canvas;
 
   canvas.SaveLayer({
-      .color_filter =
-          [](FilterInput::Ref input) {
-            return ColorFilterContents::MakeSrgbToLinearFilter(
-                std::move(input));
-          },
+      .color_filter = ColorFilter::MakeSrgbToLinear(),
   });
 
   canvas.Translate({500, 300, 0});
@@ -2290,10 +2270,7 @@ TEST_P(AiksTest, TranslucentSaveLayerWithBlendColorFilterDrawsCorrectly) {
   canvas.SaveLayer({
       .color = Color::Black().WithAlpha(0.5),
       .color_filter =
-          [](FilterInput::Ref input) {
-            return ColorFilterContents::MakeBlend(
-                BlendMode::kDestinationOver, {std::move(input)}, Color::Red());
-          },
+          ColorFilter::MakeBlend(BlendMode::kDestinationOver, Color::Red()),
   });
   canvas.DrawRect(Rect::MakeXYWH(100, 500, 300, 300), {.color = Color::Blue()});
   canvas.Restore();
@@ -2330,10 +2307,7 @@ TEST_P(AiksTest, TranslucentSaveLayerWithColorAndImageFilterDrawsCorrectly) {
   canvas.SaveLayer({
       .color = Color::Black().WithAlpha(0.5),
       .color_filter =
-          [](FilterInput::Ref input) {
-            return ColorFilterContents::MakeBlend(
-                BlendMode::kDestinationOver, {std::move(input)}, Color::Red());
-          },
+          ColorFilter::MakeBlend(BlendMode::kDestinationOver, Color::Red()),
   });
 
   canvas.DrawRect(Rect::MakeXYWH(100, 500, 300, 300), {.color = Color::Blue()});
@@ -2363,16 +2337,13 @@ TEST_P(AiksTest, TranslucentSaveLayerWithColorMatrixColorFilterDrawsCorrectly) {
 
   canvas.SaveLayer({
       .color = Color::Black().WithAlpha(0.5),
-      .color_filter =
-          [](FilterInput::Ref input) {
-            return ColorFilterContents::MakeColorMatrix({std::move(input)},
-                                                        {.array = {
-                                                             1, 0, 0, 0, 0,  //
-                                                             0, 1, 0, 0, 0,  //
-                                                             0, 0, 1, 0, 0,  //
-                                                             0, 0, 0, 2, 0   //
-                                                         }});
-          },
+      .color_filter = ColorFilter::MakeMatrix({.array =
+                                                   {
+                                                       1, 0, 0, 0, 0,  //
+                                                       0, 1, 0, 0, 0,  //
+                                                       0, 0, 1, 0, 0,  //
+                                                       0, 0, 0, 2, 0   //
+                                                   }}),
   });
   canvas.DrawImage(image, {100, 500}, {});
   canvas.Restore();
@@ -2427,10 +2398,7 @@ TEST_P(AiksTest,
                                      }});
           },
       .color_filter =
-          [](FilterInput::Ref input) {
-            return ColorFilterContents::MakeBlend(
-                BlendMode::kModulate, {std::move(input)}, Color::Green());
-          },
+          ColorFilter::MakeBlend(BlendMode::kModulate, Color::Green()),
   });
   canvas.DrawImage(image, {100, 500}, {});
   canvas.Restore();
@@ -2640,11 +2608,8 @@ TEST_P(AiksTest, CanRenderForegroundBlendWithMaskBlur) {
   canvas.DrawCircle({400, 400}, 200,
                     {
                         .color = Color::White(),
-                        .color_filter =
-                            [](const FilterInput::Ref& input) {
-                              return ColorFilterContents::MakeBlend(
-                                  BlendMode::kSource, {input}, Color::Green());
-                            },
+                        .color_filter = ColorFilter::MakeBlend(
+                            BlendMode::kSource, Color::Green()),
                         .mask_blur_descriptor =
                             Paint::MaskBlurDescriptor{
                                 .style = FilterContents::BlurStyle::kNormal,
@@ -2664,11 +2629,8 @@ TEST_P(AiksTest, CanRenderForegroundAdvancedBlendWithMaskBlur) {
   canvas.DrawCircle({400, 400}, 200,
                     {
                         .color = Color::White(),
-                        .color_filter =
-                            [](const FilterInput::Ref& input) {
-                              return ColorFilterContents::MakeBlend(
-                                  BlendMode::kColor, {input}, Color::Green());
-                            },
+                        .color_filter = ColorFilter::MakeBlend(
+                            BlendMode::kColor, Color::Green()),
                         .mask_blur_descriptor =
                             Paint::MaskBlurDescriptor{
                                 .style = FilterContents::BlurStyle::kNormal,

impeller/aiks/color_filter.cc

@@ -0,0 +1,127 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "impeller/aiks/color_filter.h"
+#include "impeller/entity/contents/filters/color_filter_contents.h"
+#include "impeller/entity/contents/filters/inputs/filter_input.h"
+#include "impeller/geometry/color.h"
+
+namespace impeller {
+
+/*******************************************************************************
+ ******* ColorFilter
+ ******************************************************************************/
+
+ColorFilter::ColorFilter() = default;
+
+ColorFilter::~ColorFilter() = default;
+
+std::shared_ptr<ColorFilter> ColorFilter::MakeBlend(BlendMode blend_mode,
+                                                    Color color) {
+  return std::make_shared<BlendColorFilter>(blend_mode, color);
+}
+
+std::shared_ptr<ColorFilter> ColorFilter::MakeMatrix(ColorMatrix color_matrix) {
+  return std::make_shared<MatrixColorFilter>(color_matrix);
+}
+
+std::shared_ptr<ColorFilter> ColorFilter::MakeSrgbToLinear() {
+  return std::make_shared<SrgbToLinearColorFilter>();
+}
+
+std::shared_ptr<ColorFilter> ColorFilter::MakeLinearToSrgb() {
+  return std::make_shared<LinearToSrgbColorFilter>();
+}
+
+/*******************************************************************************
+ ******* BlendColorFilter
+ ******************************************************************************/
+
+BlendColorFilter::BlendColorFilter(BlendMode blend_mode, Color color)
+    : blend_mode_(blend_mode), color_(color) {}
+
+BlendColorFilter::~BlendColorFilter() = default;
+
+std::shared_ptr<ColorFilterContents> BlendColorFilter::GetColorFilter(
+    std::shared_ptr<FilterInput> input,
+    bool absorb_opacity) const {
+  auto filter =
+      ColorFilterContents::MakeBlend(blend_mode_, {std::move(input)}, color_);
+  filter->SetAbsorbOpacity(absorb_opacity);
+  return filter;
+}
+
+ColorFilter::ColorFilterProc BlendColorFilter::GetCPUColorFilterProc() const {
+  return [filter_blend_mode = blend_mode_, filter_color = color_](Color color) {
+    return color.Blend(filter_color, filter_blend_mode);
+  };
+}
+
+/*******************************************************************************
+ ******* MatrixColorFilter
+ ******************************************************************************/
+
+MatrixColorFilter::MatrixColorFilter(ColorMatrix color_matrix)
+    : color_matrix_(color_matrix) {}
+
+MatrixColorFilter::~MatrixColorFilter() = default;
+
+std::shared_ptr<ColorFilterContents> MatrixColorFilter::GetColorFilter(
+    std::shared_ptr<FilterInput> input,
+    bool absorb_opacity) const {
+  auto filter =
+      ColorFilterContents::MakeColorMatrix({std::move(input)}, color_matrix_);
+  filter->SetAbsorbOpacity(absorb_opacity);
+  return filter;
+}
+
+ColorFilter::ColorFilterProc MatrixColorFilter::GetCPUColorFilterProc() const {
+  return [color_matrix = color_matrix_](Color color) {
+    return color.ApplyColorMatrix(color_matrix);
+  };
+}
+
+/*******************************************************************************
+ ******* SrgbToLinearColorFilter
+ ******************************************************************************/
+
+SrgbToLinearColorFilter::SrgbToLinearColorFilter() = default;
+
+SrgbToLinearColorFilter::~SrgbToLinearColorFilter() = default;
+
+std::shared_ptr<ColorFilterContents> SrgbToLinearColorFilter::GetColorFilter(
+    std::shared_ptr<FilterInput> input,
+    bool absorb_opacity) const {
+  auto filter = ColorFilterContents::MakeSrgbToLinearFilter({std::move(input)});
+  filter->SetAbsorbOpacity(absorb_opacity);
+  return filter;
+}
+
+ColorFilter::ColorFilterProc SrgbToLinearColorFilter::GetCPUColorFilterProc()
+    const {
+  return [](Color color) { return color.SRGBToLinear(); };
+}
+
+/*******************************************************************************
+ ******* LinearToSrgbColorFilter
+ ******************************************************************************/
+
+LinearToSrgbColorFilter::LinearToSrgbColorFilter() = default;
+
+LinearToSrgbColorFilter::~LinearToSrgbColorFilter() = default;
+
+std::shared_ptr<ColorFilterContents> LinearToSrgbColorFilter::GetColorFilter(
+    std::shared_ptr<FilterInput> input,
+    bool absorb_opacity) const {
+  auto filter = ColorFilterContents::MakeSrgbToLinearFilter({std::move(input)});
+  filter->SetAbsorbOpacity(absorb_opacity);
+  return filter;
+}
+
+ColorFilter::ColorFilterProc LinearToSrgbColorFilter::GetCPUColorFilterProc()
+    const {
+  return [](Color color) { return color.LinearToSRGB(); };
+}
+
+}  // namespace impeller