aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/effects
diff options
context:
space:
mode:
authorGravatar reed <reed@chromium.org>2015-12-20 19:38:20 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2015-12-20 19:38:20 -0800
commitd63f60a36327e9580861205ebb35cade8c49bd34 (patch)
treee7510eca058bf2c40c95ebd422e24e7194043200 /src/effects
parent77991de60c30211a29a946d321abd3b4d42b3d75 (diff)
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
Diffstat (limited to 'src/effects')
-rw-r--r--src/effects/SkDisplacementMapEffect.cpp12
-rw-r--r--src/effects/SkEmbossMaskFilter.cpp2
-rw-r--r--src/effects/SkMatrixConvolutionImageFilter.cpp2
3 files changed, 8 insertions, 8 deletions
diff --git a/src/effects/SkDisplacementMapEffect.cpp b/src/effects/SkDisplacementMapEffect.cpp
index a3fff39b46..2b35036bc5 100644
--- a/src/effects/SkDisplacementMapEffect.cpp
+++ b/src/effects/SkDisplacementMapEffect.cpp
@@ -164,12 +164,12 @@ bool channel_selector_type_is_valid(SkDisplacementMapEffect::ChannelSelectorType
///////////////////////////////////////////////////////////////////////////////
-SkDisplacementMapEffect* SkDisplacementMapEffect::Create(ChannelSelectorType xChannelSelector,
- ChannelSelectorType yChannelSelector,
- SkScalar scale,
- SkImageFilter* displacement,
- SkImageFilter* color,
- const CropRect* cropRect) {
+SkImageFilter* SkDisplacementMapEffect::Create(ChannelSelectorType xChannelSelector,
+ ChannelSelectorType yChannelSelector,
+ SkScalar scale,
+ SkImageFilter* displacement,
+ SkImageFilter* color,
+ const CropRect* cropRect) {
if (!channel_selector_type_is_valid(xChannelSelector) ||
!channel_selector_type_is_valid(yChannelSelector)) {
return nullptr;
diff --git a/src/effects/SkEmbossMaskFilter.cpp b/src/effects/SkEmbossMaskFilter.cpp
index 2607e255d9..64afa49447 100644
--- a/src/effects/SkEmbossMaskFilter.cpp
+++ b/src/effects/SkEmbossMaskFilter.cpp
@@ -13,7 +13,7 @@
#include "SkWriteBuffer.h"
#include "SkString.h"
-SkEmbossMaskFilter* SkEmbossMaskFilter::Create(SkScalar blurSigma, const Light& light) {
+SkMaskFilter* SkEmbossMaskFilter::Create(SkScalar blurSigma, const Light& light) {
return new SkEmbossMaskFilter(blurSigma, light);
}
diff --git a/src/effects/SkMatrixConvolutionImageFilter.cpp b/src/effects/SkMatrixConvolutionImageFilter.cpp
index a1f23f7a29..a80ba45fdb 100644
--- a/src/effects/SkMatrixConvolutionImageFilter.cpp
+++ b/src/effects/SkMatrixConvolutionImageFilter.cpp
@@ -47,7 +47,7 @@ SkMatrixConvolutionImageFilter::SkMatrixConvolutionImageFilter(
SkASSERT(kernelOffset.fY >= 0 && kernelOffset.fY < kernelSize.fHeight);
}
-SkMatrixConvolutionImageFilter* SkMatrixConvolutionImageFilter::Create(
+SkImageFilter* SkMatrixConvolutionImageFilter::Create(
const SkISize& kernelSize,
const SkScalar* kernel,
SkScalar gain,