Revert "[Impeller] reduce advanced blend subpass count for single input with foreground color (#40886)"

This reverts commit 5335c87.

Author: jonahwilliams

ci/licenses_golden/licenses_flutter

@@ -1200,8 +1200,6 @@ ORIGIN: ../../../flutter/impeller/entity/contents/filters/srgb_to_linear_filter_
 ORIGIN: ../../../flutter/impeller/entity/contents/filters/srgb_to_linear_filter_contents.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/entity/contents/filters/yuv_to_rgb_filter_contents.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/entity/contents/filters/yuv_to_rgb_filter_contents.h + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/impeller/entity/contents/foreground_blend_contents.cc + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/impeller/entity/contents/foreground_blend_contents.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/entity/contents/framebuffer_blend_contents.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/entity/contents/framebuffer_blend_contents.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/entity/contents/gradient_generator.cc + ../../../flutter/LICENSE
@@ -3784,8 +3782,6 @@ FILE: ../../../flutter/impeller/entity/contents/filters/srgb_to_linear_filter_co
 FILE: ../../../flutter/impeller/entity/contents/filters/srgb_to_linear_filter_contents.h
 FILE: ../../../flutter/impeller/entity/contents/filters/yuv_to_rgb_filter_contents.cc
 FILE: ../../../flutter/impeller/entity/contents/filters/yuv_to_rgb_filter_contents.h
-FILE: ../../../flutter/impeller/entity/contents/foreground_blend_contents.cc
-FILE: ../../../flutter/impeller/entity/contents/foreground_blend_contents.h
 FILE: ../../../flutter/impeller/entity/contents/framebuffer_blend_contents.cc
 FILE: ../../../flutter/impeller/entity/contents/framebuffer_blend_contents.h
 FILE: ../../../flutter/impeller/entity/contents/gradient_generator.cc

impeller/entity/BUILD.gn

@@ -180,8 +180,6 @@ impeller_component("entity") {
     "contents/filters/srgb_to_linear_filter_contents.h",
     "contents/filters/yuv_to_rgb_filter_contents.cc",
     "contents/filters/yuv_to_rgb_filter_contents.h",
-    "contents/foreground_blend_contents.cc",
-    "contents/foreground_blend_contents.h",
     "contents/framebuffer_blend_contents.cc",
     "contents/framebuffer_blend_contents.h",
     "contents/gradient_generator.cc",

impeller/entity/contents/filters/blend_filter_contents.cc

@@ -12,7 +12,6 @@
 #include "impeller/entity/contents/content_context.h"
 #include "impeller/entity/contents/contents.h"
 #include "impeller/entity/contents/filters/inputs/filter_input.h"
-#include "impeller/entity/contents/foreground_blend_contents.h"
 #include "impeller/entity/contents/solid_color_contents.h"
 #include "impeller/entity/entity.h"
 #include "impeller/geometry/path_builder.h"
@@ -374,20 +373,6 @@ std::optional<Entity> BlendFilterContents::RenderFilter(
   }
 
   if (blend_mode_ <= Entity::kLastAdvancedBlendMode) {
-    auto potential_alpha = GetAlpha().value_or(1.0);
-    if (inputs.size() == 1 && foreground_color_.has_value() &&
-        potential_alpha >= 1.0 - kEhCloseEnough) {
-      auto contents = std::make_shared<AdvancedForegroundBlendContents>();
-      contents->SetBlendMode(blend_mode_);
-      contents->SetCoverage(coverage);
-      contents->SetSrcInput(inputs[0]);
-      contents->SetForegroundColor(foreground_color_.value());
-      Entity entity;
-      entity.SetTransformation(Matrix::MakeTranslation(coverage.origin));
-      entity.SetContents(std::move(contents));
-      return entity;
-    }
-
     return advanced_blend_proc_(inputs, renderer, entity, coverage,
                                 foreground_color_, GetAbsorbOpacity(),
                                 GetAlpha());

impeller/entity/contents/foreground_blend_contents.cc

@@ -2451,21 +2451,5 @@ TEST_P(EntityTest, InheritOpacityTest) {
   ASSERT_FALSE(runtime_effect->CanInheritOpacity(entity));
 }
 
-TEST_P(EntityTest, ColorFilterWithForegroundColorAdvancedBlend) {
-  auto image = CreateTextureForFixture("boston.jpg");
-  auto filter = ColorFilterContents::MakeBlend(
-      BlendMode::kColorBurn, FilterInput::Make({image}), Color::Red());
-
-  auto callback = [&](ContentContext& context, RenderPass& pass) -> bool {
-    Entity entity;
-    entity.SetTransformation(Matrix::MakeScale(GetContentScale()) *
-                             Matrix::MakeTranslation({500, 300}) *
-                             Matrix::MakeScale(Vector2{0.5, 0.5}));
-    entity.SetContents(filter);
-    return entity.Render(context, pass);
-  };
-  ASSERT_TRUE(OpenPlaygroundHere(callback));
-}
-
 }  // namespace testing
 }  // namespace impeller