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/SkMatrixConvolutionImageFilter.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/SkMatrixConvolutionImageFilter.h')
| -rw-r--r-- | include/effects/SkMatrixConvolutionImageFilter.h | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/include/effects/SkMatrixConvolutionImageFilter.h b/include/effects/SkMatrixConvolutionImageFilter.h index ee1bfcf3d9..606de570bd 100644 --- a/include/effects/SkMatrixConvolutionImageFilter.h +++ b/include/effects/SkMatrixConvolutionImageFilter.h @@ -68,7 +68,16 @@ public: SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkMatrixConvolutionImageFilter) protected: - SkMatrixConvolutionImageFilter(SkReadBuffer& buffer); + SkMatrixConvolutionImageFilter(const SkISize& kernelSize, + const SkScalar* kernel, + SkScalar gain, + SkScalar bias, + const SkIPoint& kernelOffset, + TileMode tileMode, + bool convolveAlpha, + SkImageFilter* input, + const CropRect* cropRect); + explicit SkMatrixConvolutionImageFilter(SkReadBuffer& buffer); virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, @@ -83,19 +92,6 @@ protected: const SkIRect& bounds) const SK_OVERRIDE; #endif -#ifdef SK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS -public: -#endif - SkMatrixConvolutionImageFilter(const SkISize& kernelSize, - const SkScalar* kernel, - SkScalar gain, - SkScalar bias, - const SkIPoint& kernelOffset, - TileMode tileMode, - bool convolveAlpha, - SkImageFilter* input = NULL, - const CropRect* cropRect = NULL); - private: SkISize fKernelSize; SkScalar* fKernel; |