applied fix

Author: gaaclarke

impeller/entity/contents/filters/blend_filter_contents.cc

@@ -549,7 +549,7 @@ static std::optional<Entity> PipelineBlend(
 
 #define BLEND_CASE(mode)                                                      \
   case BlendMode::k##mode:                                                    \
-    advanced_blend_proc_ =                                                    \
+    return                                                                    \
         [](const FilterInput::Vector& inputs, const ContentContext& renderer, \
            const Entity& entity, const Rect& coverage, BlendMode blend_mode,  \
            std::optional<Color> fg_color,                                     \
@@ -562,36 +562,39 @@ static std::optional<Entity> PipelineBlend(
         };                                                                    \
     break;
 
+namespace {
+BlendFilterContents::AdvancedBlendProc GetAdvancedBlendProc(
+    BlendMode blend_mode) {
+  switch (blend_mode) {
+    BLEND_CASE(Screen)
+    BLEND_CASE(Overlay)
+    BLEND_CASE(Darken)
+    BLEND_CASE(Lighten)
+    BLEND_CASE(ColorDodge)
+    BLEND_CASE(ColorBurn)
+    BLEND_CASE(HardLight)
+    BLEND_CASE(SoftLight)
+    BLEND_CASE(Difference)
+    BLEND_CASE(Exclusion)
+    BLEND_CASE(Multiply)
+    BLEND_CASE(Hue)
+    BLEND_CASE(Saturation)
+    BLEND_CASE(Color)
+    BLEND_CASE(PlusAdvanced)
+    BLEND_CASE(Luminosity)
+    default:
+      FML_UNREACHABLE();
+  }
+}
+}  // namespace
+
 void BlendFilterContents::SetBlendMode(BlendMode blend_mode) {
   if (blend_mode > Entity::kLastAdvancedBlendMode) {
     VALIDATION_LOG << "Invalid blend mode " << static_cast<int>(blend_mode)
                    << " assigned to BlendFilterContents.";
   }
 
   blend_mode_ = blend_mode;
-
-  if (blend_mode > Entity::kLastPipelineBlendMode) {
-    switch (blend_mode) {
-      BLEND_CASE(Screen)
-      BLEND_CASE(Overlay)
-      BLEND_CASE(Darken)
-      BLEND_CASE(Lighten)
-      BLEND_CASE(ColorDodge)
-      BLEND_CASE(ColorBurn)
-      BLEND_CASE(HardLight)
-      BLEND_CASE(SoftLight)
-      BLEND_CASE(Difference)
-      BLEND_CASE(Exclusion)
-      BLEND_CASE(Multiply)
-      BLEND_CASE(Hue)
-      BLEND_CASE(Saturation)
-      BLEND_CASE(Color)
-      BLEND_CASE(PlusAdvanced)
-      BLEND_CASE(Luminosity)
-      default:
-        FML_UNREACHABLE();
-    }
-  }
 }
 
 void BlendFilterContents::SetForegroundColor(std::optional<Color> color) {
@@ -634,9 +637,10 @@ std::optional<Entity> BlendFilterContents::RenderFilter(
           inputs[0], renderer, entity, coverage, foreground_color_.value(),
           blend_mode, GetAlpha(), GetAbsorbOpacity());
     }
-    return advanced_blend_proc_(inputs, renderer, entity, coverage, blend_mode,
-                                foreground_color_, GetAbsorbOpacity(),
-                                GetAlpha());
+    AdvancedBlendProc advanced_blend_proc = GetAdvancedBlendProc(blend_mode);
+    return advanced_blend_proc(inputs, renderer, entity, coverage, blend_mode,
+                               foreground_color_, GetAbsorbOpacity(),
+                               GetAlpha());
   }
 
   FML_UNREACHABLE();

impeller/entity/contents/filters/blend_filter_contents.h

@@ -79,7 +79,6 @@ class BlendFilterContents : public ColorFilterContents {
       ColorFilterContents::AbsorbOpacity absorb_opacity) const;
 
   BlendMode blend_mode_ = BlendMode::kSourceOver;
-  AdvancedBlendProc advanced_blend_proc_;
   std::optional<Color> foreground_color_;
 
   BlendFilterContents(const BlendFilterContents&) = delete;