diff options
| author |  reed <reed@chromium.org> | 2015-12-20 20:08:42 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-12-20 20:08:43 -0800 |
| commit | 2d6ba6690f8951e152d8e793191b14afd52f5506 (patch) | |
| tree | ff71833d1327c08c9e31451d2a18286fc95f7bb0 /src/effects | |
| parent | d63f60a36327e9580861205ebb35cade8c49bd34 (diff) | |
Revert of change all factories to return their base-class (patchset #1 id:1 of https://codereview.chromium.org/1535353002/ )
Reason for revert:
need to update some chrome/blink call-sites
Original issue's description:
> 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=
>
> Committed: https://skia.googlesource.com/skia/+/d63f60a36327e9580861205ebb35cade8c49bd34
TBR=
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1540203002
Diffstat (limited to 'src/effects')
| -rw-r--r-- | src/effects/SkDisplacementMapEffect.cpp | 12 | ||||
| -rw-r--r-- | src/effects/SkEmbossMaskFilter.cpp | 2 | ||||
| -rw-r--r-- | src/effects/SkMatrixConvolutionImageFilter.cpp | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/effects/SkDisplacementMapEffect.cpp b/src/effects/SkDisplacementMapEffect.cpp index 2b35036bc5..a3fff39b46 100644 --- a/src/effects/SkDisplacementMapEffect.cpp +++ b/src/effects/SkDisplacementMapEffect.cpp @@ -164,12 +164,12 @@ bool channel_selector_type_is_valid(SkDisplacementMapEffect::ChannelSelectorType /////////////////////////////////////////////////////////////////////////////// -SkImageFilter* SkDisplacementMapEffect::Create(ChannelSelectorType xChannelSelector, - ChannelSelectorType yChannelSelector, - SkScalar scale, - SkImageFilter* displacement, - SkImageFilter* color, - const CropRect* cropRect) { +SkDisplacementMapEffect* 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 64afa49447..2607e255d9 100644 --- a/src/effects/SkEmbossMaskFilter.cpp +++ b/src/effects/SkEmbossMaskFilter.cpp @@ -13,7 +13,7 @@ #include "SkWriteBuffer.h" #include "SkString.h" -SkMaskFilter* SkEmbossMaskFilter::Create(SkScalar blurSigma, const Light& light) { +SkEmbossMaskFilter* 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 a80ba45fdb..a1f23f7a29 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); } -SkImageFilter* SkMatrixConvolutionImageFilter::Create( +SkMatrixConvolutionImageFilter* SkMatrixConvolutionImageFilter::Create( const SkISize& kernelSize, const SkScalar* kernel, SkScalar gain, |