diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-15 15:40:41 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-15 15:40:41 +0000 |
| commit | bd0be25074e53a6d1abc284562568c9745191984 (patch) | |
| tree | 4dc2bc53568d17b05110475a4f55b17fe6d4475b /include/effects/SkMorphologyImageFilter.h | |
| parent | 3f0451772109959fcb79bacf2c9a03e0eb39ff27 (diff) | |
Remove SK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS flag.
Neither Chrome nor Android uses this flag anymore.
Make sure all constructors touched that only have one parameter are marked as 'explicit'.
BUG=2187
R=scroggo@google.com, reed@google.com
Author: dominikg@chromium.org
Review URL: https://codereview.chromium.org/282203004
git-svn-id: http://skia.googlecode.com/svn/trunk@14749 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/effects/SkMorphologyImageFilter.h')
| -rw-r--r-- | include/effects/SkMorphologyImageFilter.h | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/include/effects/SkMorphologyImageFilter.h b/include/effects/SkMorphologyImageFilter.h index 0c1cc85601..a464da3d3b 100644 --- a/include/effects/SkMorphologyImageFilter.h +++ b/include/effects/SkMorphologyImageFilter.h @@ -68,15 +68,11 @@ public: SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDilateImageFilter) protected: - SkDilateImageFilter(SkReadBuffer& buffer) : INHERITED(buffer) {} - -#ifdef SK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS -public: -#endif SkDilateImageFilter(int radiusX, int radiusY, SkImageFilter* input = NULL, const CropRect* cropRect = NULL) - : INHERITED(radiusX, radiusY, input, cropRect) {} + : INHERITED(radiusX, radiusY, input, cropRect) {} + explicit SkDilateImageFilter(SkReadBuffer& buffer) : INHERITED(buffer) {} private: typedef SkMorphologyImageFilter INHERITED; @@ -100,15 +96,11 @@ public: SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkErodeImageFilter) protected: - SkErodeImageFilter(SkReadBuffer& buffer) : INHERITED(buffer) {} - -#ifdef SK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS -public: -#endif SkErodeImageFilter(int radiusX, int radiusY, SkImageFilter* input = NULL, const CropRect* cropRect = NULL) - : INHERITED(radiusX, radiusY, input, cropRect) {} + : INHERITED(radiusX, radiusY, input, cropRect) {} + explicit SkErodeImageFilter(SkReadBuffer& buffer) : INHERITED(buffer) {} private: typedef SkMorphologyImageFilter INHERITED; |