Update Morphology image filter to store its type

include/effects/SkMorphologyImageFilter.h

 /*
  * 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.
  */
 
 #ifndef SkMorphologyImageFilter_DEFINED
 #define SkMorphologyImageFilter_DEFINED
 
@@ skipping 11 matching lines @@
      * All morphology procs have the same signature: src is the source buffer, dst the
      * destination buffer, radius is the morphology radius, width and height are the bounds
      * of the destination buffer (in pixels), and srcStride and dstStride are the
      * number of pixels per row in each buffer. All buffers are 8888.
      */
 
     typedef void (*Proc)(const SkPMColor* src, SkPMColor* dst, int radius,
                          int width, int height, int srcStride, int dstStride);
 
 protected:
-    SkMorphologyImageFilter(int radiusX, int radiusY, SkImageFilter* input,
+    enum Op {
+        kErode_Op,
+        kDilate_Op,
+    };
+
+    SkMorphologyImageFilter(Op op, int radiusX, int radiusY, SkImageFilter* input,
                             const CropRect* cropRect);
-    sk_sp<SkSpecialImage> filterImageGeneric(bool dilate, 
-                                             SkSpecialImage* source,
-                                             const Context&,
-                                             SkIPoint* offset) const;
+    sk_sp<SkSpecialImage> onFilterImage(SkSpecialImage* source,
+                                        const Context&,
+                                        SkIPoint* offset) const override;
     void flatten(SkWriteBuffer&) const override;
 
     SkISize radius() const { return fRadius; }
 
 private:
-    SkISize fRadius;
+    const Op fOp;

[Stephen White, 2016/03/29 14:42:04]

Could we just provide a virtual op() function, overridden by each class? (We
already have a vtable; no need to make the object bigger.)

[robertphillips, 2016/03/29 20:27:45]

Done.

+    SkISize  fRadius;
+
     typedef SkImageFilter INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 class SK_API SkDilateImageFilter : public SkMorphologyImageFilter {
 public:
     static SkImageFilter* Create(int radiusX, int radiusY,
                                  SkImageFilter* input = nullptr,
                                  const CropRect* cropRect = nullptr) {
         if (radiusX < 0 || radiusY < 0) {
             return nullptr;
         }
         return new SkDilateImageFilter(radiusX, radiusY, input, cropRect);
     }
 
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDilateImageFilter)
 
-protected:
-    sk_sp<SkSpecialImage> onFilterImage(SkSpecialImage* source, const Context&,
-                                        SkIPoint* offset) const override;
-
 private:
     SkDilateImageFilter(int radiusX, int radiusY, SkImageFilter* input, const CropRect* cropRect)
-        : INHERITED(radiusX, radiusY, input, cropRect) {}
+        : INHERITED(kDilate_Op, radiusX, radiusY, input, cropRect) {}
 
     typedef SkMorphologyImageFilter INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 class SK_API SkErodeImageFilter : public SkMorphologyImageFilter {
 public:
     static SkImageFilter* Create(int radiusX, int radiusY,
                                  SkImageFilter* input = nullptr,
                                  const CropRect* cropRect = nullptr) {
         if (radiusX < 0 || radiusY < 0) {
             return nullptr;
         }
         return new SkErodeImageFilter(radiusX, radiusY, input, cropRect);
     }
 
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkErodeImageFilter)
 
-protected:
-    sk_sp<SkSpecialImage> onFilterImage(SkSpecialImage* source, const Context&,
-                                        SkIPoint* offset) const override;
-
 private:
     SkErodeImageFilter(int radiusX, int radiusY, SkImageFilter* input, const CropRect* cropRect)
-        : INHERITED(radiusX, radiusY, input, cropRect) {}
+        : INHERITED(kErode_Op, radiusX, radiusY, input, cropRect) {}
 
     typedef SkMorphologyImageFilter INHERITED;
 };
 
 #endif