From d63f60a36327e9580861205ebb35cade8c49bd34 Mon Sep 17 00:00:00 2001 From: reed Date: Sun, 20 Dec 2015 19:38:20 -0800 Subject: change all factories to return their base-class will watch DEPS roll to see if there are chrome sites needing updates BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1535353002 TBR= Review URL: https://codereview.chromium.org/1535353002 --- include/effects/Sk1DPathEffect.h | 3 +-- include/effects/Sk2DPathEffect.h | 4 ++-- include/effects/SkBlurDrawLooper.h | 4 ++-- include/effects/SkColorMatrixFilter.h | 4 ++-- include/effects/SkCornerPathEffect.h | 5 +++-- include/effects/SkDashPathEffect.h | 3 +-- include/effects/SkDiscretePathEffect.h | 4 +--- include/effects/SkDisplacementMapEffect.h | 10 +++++----- include/effects/SkEmbossMaskFilter.h | 2 +- include/effects/SkMatrixConvolutionImageFilter.h | 18 +++++++++--------- include/effects/SkXfermodeImageFilter.h | 6 +++--- 11 files changed, 30 insertions(+), 33 deletions(-) (limited to 'include') diff --git a/include/effects/Sk1DPathEffect.h b/include/effects/Sk1DPathEffect.h index 6a7804f111..3419dc23b7 100644 --- a/include/effects/Sk1DPathEffect.h +++ b/include/effects/Sk1DPathEffect.h @@ -56,8 +56,7 @@ public: @param style how to transform path at each point (based on the current position and tangent) */ - static SkPath1DPathEffect* Create(const SkPath& path, SkScalar advance, SkScalar phase, - Style style) { + static SkPathEffect* Create(const SkPath& path, SkScalar advance, SkScalar phase, Style style) { return new SkPath1DPathEffect(path, advance, phase, style); } diff --git a/include/effects/Sk2DPathEffect.h b/include/effects/Sk2DPathEffect.h index fa12dcf095..73da83c4b9 100644 --- a/include/effects/Sk2DPathEffect.h +++ b/include/effects/Sk2DPathEffect.h @@ -55,7 +55,7 @@ private: class SK_API SkLine2DPathEffect : public Sk2DPathEffect { public: - static SkLine2DPathEffect* Create(SkScalar width, const SkMatrix& matrix) { + static SkPathEffect* Create(SkScalar width, const SkMatrix& matrix) { return new SkLine2DPathEffect(width, matrix); } @@ -84,7 +84,7 @@ public: * Stamp the specified path to fill the shape, using the matrix to define * the latice. */ - static SkPath2DPathEffect* Create(const SkMatrix& matrix, const SkPath& path) { + static SkPathEffect* Create(const SkMatrix& matrix, const SkPath& path) { return new SkPath2DPathEffect(matrix, path); } diff --git a/include/effects/SkBlurDrawLooper.h b/include/effects/SkBlurDrawLooper.h index 808557b9da..930af15ff8 100644 --- a/include/effects/SkBlurDrawLooper.h +++ b/include/effects/SkBlurDrawLooper.h @@ -35,8 +35,8 @@ public: kAll_BlurFlag = 0x07 }; - static SkBlurDrawLooper* Create(SkColor color, SkScalar sigma, SkScalar dx, SkScalar dy, - uint32_t flags = kNone_BlurFlag) { + static SkDrawLooper* Create(SkColor color, SkScalar sigma, SkScalar dx, SkScalar dy, + uint32_t flags = kNone_BlurFlag) { return new SkBlurDrawLooper(color, sigma, dx, dy, flags); } diff --git a/include/effects/SkColorMatrixFilter.h b/include/effects/SkColorMatrixFilter.h index bd2b939a43..057e5cc325 100644 --- a/include/effects/SkColorMatrixFilter.h +++ b/include/effects/SkColorMatrixFilter.h @@ -13,10 +13,10 @@ class SK_API SkColorMatrixFilter : public SkColorFilter { public: - static SkColorMatrixFilter* Create(const SkColorMatrix& cm) { + static SkColorFilter* Create(const SkColorMatrix& cm) { return new SkColorMatrixFilter(cm); } - static SkColorMatrixFilter* Create(const SkScalar array[20]) { + static SkColorFilter* Create(const SkScalar array[20]) { return new SkColorMatrixFilter(array); } diff --git a/include/effects/SkCornerPathEffect.h b/include/effects/SkCornerPathEffect.h index 4c8908575d..13095f0e6c 100644 --- a/include/effects/SkCornerPathEffect.h +++ b/include/effects/SkCornerPathEffect.h @@ -20,8 +20,7 @@ public: /** radius must be > 0 to have an effect. It specifies the distance from each corner that should be "rounded". */ - static SkCornerPathEffect* Create(SkScalar radius) { return new SkCornerPathEffect(radius); } - virtual ~SkCornerPathEffect(); + static SkPathEffect* Create(SkScalar radius) { return new SkCornerPathEffect(radius); } virtual bool filterPath(SkPath* dst, const SkPath& src, SkStrokeRec*, const SkRect*) const override; @@ -34,6 +33,8 @@ public: #endif protected: + virtual ~SkCornerPathEffect(); + explicit SkCornerPathEffect(SkScalar radius); void flatten(SkWriteBuffer&) const override; diff --git a/include/effects/SkDashPathEffect.h b/include/effects/SkDashPathEffect.h index d3adeed99a..3c1407b725 100644 --- a/include/effects/SkDashPathEffect.h +++ b/include/effects/SkDashPathEffect.h @@ -36,8 +36,7 @@ public: Note: only affects stroked paths. */ - static SkDashPathEffect* Create(const SkScalar intervals[], int count, - SkScalar phase) { + static SkPathEffect* Create(const SkScalar intervals[], int count, SkScalar phase) { return new SkDashPathEffect(intervals, count, phase); } virtual ~SkDashPathEffect(); diff --git a/include/effects/SkDiscretePathEffect.h b/include/effects/SkDiscretePathEffect.h index b55dca8644..a49e2d89a7 100644 --- a/include/effects/SkDiscretePathEffect.h +++ b/include/effects/SkDiscretePathEffect.h @@ -29,9 +29,7 @@ public: they can pass in a different seedAssist to get a different set of path segments. */ - static SkDiscretePathEffect* Create(SkScalar segLength, - SkScalar deviation, - uint32_t seedAssist=0) { + static SkPathEffect* Create(SkScalar segLength, SkScalar deviation, uint32_t seedAssist = 0) { return new SkDiscretePathEffect(segLength, deviation, seedAssist); } diff --git a/include/effects/SkDisplacementMapEffect.h b/include/effects/SkDisplacementMapEffect.h index 253dabe0bd..e94461795b 100644 --- a/include/effects/SkDisplacementMapEffect.h +++ b/include/effects/SkDisplacementMapEffect.h @@ -23,11 +23,11 @@ public: ~SkDisplacementMapEffect(); - static SkDisplacementMapEffect* Create(ChannelSelectorType xChannelSelector, - ChannelSelectorType yChannelSelector, - SkScalar scale, SkImageFilter* displacement, - SkImageFilter* color = NULL, - const CropRect* cropRect = NULL); + static SkImageFilter* Create(ChannelSelectorType xChannelSelector, + ChannelSelectorType yChannelSelector, + SkScalar scale, SkImageFilter* displacement, + SkImageFilter* color = NULL, + const CropRect* cropRect = NULL); SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDisplacementMapEffect) diff --git a/include/effects/SkEmbossMaskFilter.h b/include/effects/SkEmbossMaskFilter.h index b6bd1a1642..72020bf3ce 100644 --- a/include/effects/SkEmbossMaskFilter.h +++ b/include/effects/SkEmbossMaskFilter.h @@ -23,7 +23,7 @@ public: uint8_t fSpecular; // exponent, 4.4 right now }; - static SkEmbossMaskFilter* Create(SkScalar blurSigma, const Light& light); + static SkMaskFilter* Create(SkScalar blurSigma, const Light& light); // overrides from SkMaskFilter // This method is not exported to java. diff --git a/include/effects/SkMatrixConvolutionImageFilter.h b/include/effects/SkMatrixConvolutionImageFilter.h index 09a3acf31a..7a2026c86b 100644 --- a/include/effects/SkMatrixConvolutionImageFilter.h +++ b/include/effects/SkMatrixConvolutionImageFilter.h @@ -52,15 +52,15 @@ public: passed to filterImage() is used instead. @param cropRect The rectangle to which the output processing will be limited. */ - static SkMatrixConvolutionImageFilter* Create(const SkISize& kernelSize, - const SkScalar* kernel, - SkScalar gain, - SkScalar bias, - const SkIPoint& kernelOffset, - TileMode tileMode, - bool convolveAlpha, - SkImageFilter* input = NULL, - const CropRect* cropRect = NULL); + static SkImageFilter* Create(const SkISize& kernelSize, + const SkScalar* kernel, + SkScalar gain, + SkScalar bias, + const SkIPoint& kernelOffset, + TileMode tileMode, + bool convolveAlpha, + SkImageFilter* input = NULL, + const CropRect* cropRect = NULL); SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkMatrixConvolutionImageFilter) diff --git a/include/effects/SkXfermodeImageFilter.h b/include/effects/SkXfermodeImageFilter.h index 57fd288f24..d59b7a2b25 100644 --- a/include/effects/SkXfermodeImageFilter.h +++ b/include/effects/SkXfermodeImageFilter.h @@ -23,9 +23,9 @@ class SK_API SkXfermodeImageFilter : public SkImageFilter { public: virtual ~SkXfermodeImageFilter(); - static SkXfermodeImageFilter* Create(SkXfermode* mode, SkImageFilter* background, - SkImageFilter* foreground = NULL, - const CropRect* cropRect = NULL) { + static SkImageFilter* Create(SkXfermode* mode, SkImageFilter* background, + SkImageFilter* foreground = NULL, + const CropRect* cropRect = NULL) { SkImageFilter* inputs[2] = { background, foreground }; return new SkXfermodeImageFilter(mode, inputs, cropRect); } -- cgit v1.2.3