Update Morphology image filter to store its type

src/effects/SkMorphologyImageFilter.cpp

 /*
  * Copyright 2012 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkMorphologyImageFilter.h"
 
 #include "SkBitmap.h"
@@ skipping 10 matching lines @@
 #include "GrInvariantOutput.h"
 #include "GrTexture.h"
 #include "SkGr.h"
 #include "effects/Gr1DKernelEffect.h"
 #include "glsl/GrGLSLFragmentProcessor.h"
 #include "glsl/GrGLSLFragmentShaderBuilder.h"
 #include "glsl/GrGLSLProgramDataManager.h"
 #include "glsl/GrGLSLUniformHandler.h"
 #endif
 
-SkMorphologyImageFilter::SkMorphologyImageFilter(int radiusX,
+SkMorphologyImageFilter::SkMorphologyImageFilter(Op op,
+                                                 int radiusX,
                                                  int radiusY,
                                                  SkImageFilter* input,
                                                  const CropRect* cropRect)
     : INHERITED(1, &input, cropRect)
+    , fOp(op)
     , fRadius(SkISize::Make(radiusX, radiusY)) {
 }
 
 void SkMorphologyImageFilter::flatten(SkWriteBuffer& buffer) const {
     this->INHERITED::flatten(buffer);
     buffer.writeInt(fRadius.fWidth);
     buffer.writeInt(fRadius.fHeight);
 }
 
 static void call_proc_X(SkMorphologyImageFilter::Proc procX,
@@ skipping 462 matching lines @@
         srcTexture.reset(scratch);
     }
 
     return SkSpecialImage::MakeFromGpu(input->internal_getProxy(),
                                        SkIRect::MakeWH(rect.width(), rect.height()),
                                        kNeedNewImageUniqueID_SpecialImage,
                                        srcTexture);
 }
 #endif
 
-sk_sp<SkSpecialImage> SkMorphologyImageFilter::filterImageGeneric(bool dilate,
-                                                                  SkSpecialImage* source,
-                                                                  const Context& ctx,
-                                                                  SkIPoint* offset) const {
+sk_sp<SkSpecialImage> SkMorphologyImageFilter::onFilterImage(SkSpecialImage* source,
+                                                             const Context& ctx,
+                                                             SkIPoint* offset) const {
     SkIPoint inputOffset = SkIPoint::Make(0, 0);
     sk_sp<SkSpecialImage> input(this->filterInput(0, source, ctx, &inputOffset));
     if (!input) {
         return nullptr;
     }
 
     SkIRect bounds;
     input = this->applyCropRect(this->mapContext(ctx), input.get(), &inputOffset, &bounds);
     if (!input) {
         return nullptr;
@@ skipping 13 matching lines @@
     srcBounds.offset(-inputOffset);
 
     if (0 == width && 0 == height) {
         offset->fX = bounds.left();
         offset->fY = bounds.top();
         return input->makeSubset(srcBounds);
     }
 
 #if SK_SUPPORT_GPU
     if (input->peekTexture()) {
-        auto type = dilate ? GrMorphologyEffect::kDilate_MorphologyType
-                           : GrMorphologyEffect::kErode_MorphologyType;
+        auto type = (kDilate_Op == fOp) ? GrMorphologyEffect::kDilate_MorphologyType
+                                        : GrMorphologyEffect::kErode_MorphologyType;
         sk_sp<SkSpecialImage> result(apply_morphology(input.get(), srcBounds, type,
                                                       SkISize::Make(width, height)));
         if (result) {
             offset->fX = bounds.left();
             offset->fY = bounds.top();
         }
         return result;
     }
 #endif
 
@@ skipping 12 matching lines @@
 
     SkBitmap dst;
     if (!dst.tryAllocPixels(info)) {
         return nullptr;
     }
 
     SkAutoLockPixels dstLock(dst);
 
     SkMorphologyImageFilter::Proc procX, procY;
 
-    if (dilate) {
+    if (kDilate_Op == fOp) {
         procX = SkOpts::dilate_x;
         procY = SkOpts::dilate_y;
     } else {
         procX = SkOpts::erode_x;
         procY = SkOpts::erode_y;
     }
 
     if (width > 0 && height > 0) {
         SkBitmap tmp;
         if (!tmp.tryAllocPixels(info)) {
@@ skipping 15 matching lines @@
                     inputPixmap.rowBytesAsPixels(),
                     &dst, height, srcBounds);
     }
     offset->fX = bounds.left();
     offset->fY = bounds.top();
 
     return SkSpecialImage::MakeFromRaster(source->internal_getProxy(),
                                           SkIRect::MakeWH(bounds.width(), bounds.height()),
                                           dst);
 }
-
-sk_sp<SkSpecialImage> SkDilateImageFilter::onFilterImage(SkSpecialImage* source, const Context& ctx,
-                                                         SkIPoint* offset) const {
-    return this->filterImageGeneric(true, source, ctx, offset);
-}
-
-sk_sp<SkSpecialImage> SkErodeImageFilter::onFilterImage(SkSpecialImage* source, const Context& ctx,
-                                                        SkIPoint* offset) const {
-    return this->filterImageGeneric(false, source, ctx, offset);
-}
-