commit 4b6e2f0d8818be9ec03608ef49ca3993b170b3f1
author Brian Salomon <bsalomon@google.com> Thu Jul 08 14:04:21 2021 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Jul 09 20:31:30 2021 +0000
tree 2dc1d52d307749820ed54f894fc73c92da87bc70
parent 9191e813a0501f66270de0ace55c5c13aa177643

Remove GrBlendFragmentProcessor::BlendBehavior.

There is only one value for the enum.

Bug: skia:10457
Change-Id: I46edd905c3a65ab5b398964ccd4f978b9b9737f9
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/425461
Reviewed-by: John Stiles <johnstiles@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

gm/gpu_blur_utils.cpp

diff --git a/gm/gpu_blur_utils.cpp b/gm/gpu_blur_utils.cpp
index 2f97b28..8b137d6 100644
--- a/gm/gpu_blur_utils.cpp
+++ b/gm/gpu_blur_utils.cpp
@@ -281,19 +281,15 @@
                                                     sampler,
                                                     caps);
                     // Compose against white (default paint color)
-                    fp = GrBlendFragmentProcessor::Make(
-                            std::move(fp),
-                            /*dst=*/nullptr,
-                            SkBlendMode::kSrcOver,
-                            GrBlendFragmentProcessor::BlendBehavior::kComposeOneBehavior);
+                    fp = GrBlendFragmentProcessor::Make(std::move(fp),
+                                                        /*dst=*/nullptr,
+                                                        SkBlendMode::kSrcOver);
                     GrPaint paint;
                     // Compose against white (default paint color) and then replace the dst
                     // (SkBlendMode::kSrc).
-                    fp = GrBlendFragmentProcessor::Make(
-                            std::move(fp),
-                            /*dst=*/nullptr,
-                            SkBlendMode::kSrcOver,
-                            GrBlendFragmentProcessor::BlendBehavior::kComposeOneBehavior);
+                    fp = GrBlendFragmentProcessor::Make(std::move(fp),
+                                                        /*dst=*/nullptr,
+                                                        SkBlendMode::kSrcOver);
                     paint.setColorFragmentProcessor(std::move(fp));
                     paint.setPorterDuffXPFactory(SkBlendMode::kSrc);
                     sdc->fillRectToRect(nullptr,
@@ -390,11 +386,9 @@
                     if (result) {
                         std::unique_ptr<GrFragmentProcessor> fp =
                                 GrTextureEffect::Make(std::move(result), kPremul_SkAlphaType);
-                        fp = GrBlendFragmentProcessor::Make(
-                                std::move(fp),
-                                /*dst=*/nullptr,
-                                SkBlendMode::kSrcOver,
-                                GrBlendFragmentProcessor::BlendBehavior::kComposeOneBehavior);
+                        fp = GrBlendFragmentProcessor::Make(std::move(fp),
+                                                            /*dst=*/nullptr,
+                                                            SkBlendMode::kSrcOver);
                         sdc->fillRectToRectWithFP(SkIRect::MakeSize(dstB.size()),
                                                   dstRect,
                                                   std::move(fp));