aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar senorblanco <senorblanco@chromium.org>2014-07-22 12:49:25 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2014-07-22 12:49:25 -0700
commitbc9845bb60cd883e7ddabb21f04997602145a1ad (patch)
tree9814d70dd0fc39d7cf6e3a6647b83bcfc478b186
parent24519371cb541db6f59d903d21878ed9c45eb549 (diff)
Remove the single-sigma version of SkDropShadowImageFilter::Create().
It's no longer used in Chrome. BUG=skia: R=bsalomon@google.com Author: senorblanco@chromium.org Review URL: https://codereview.chromium.org/407203002
-rw-r--r--gm/imagefiltersbase.cpp2
-rw-r--r--gm/imagefiltersclipped.cpp3
-rw-r--r--gm/imagefiltersscaled.cpp3
-rw-r--r--include/effects/SkDropShadowImageFilter.h6
-rw-r--r--samplecode/SampleFilterFuzz.cpp2
-rw-r--r--src/effects/SkDropShadowImageFilter.cpp11
6 files changed, 6 insertions, 21 deletions
diff --git a/gm/imagefiltersbase.cpp b/gm/imagefiltersbase.cpp
index 0760fcda76..c270e67ee3 100644
--- a/gm/imagefiltersbase.cpp
+++ b/gm/imagefiltersbase.cpp
@@ -198,7 +198,7 @@ protected:
FailImageFilter::Create(),
SkColorFilterImageFilter::Create(cf),
SkBlurImageFilter::Create(12.0f, 0.0f),
- SkDropShadowImageFilter::Create(10.0f, 5.0f, 3.0f, SK_ColorBLUE),
+ SkDropShadowImageFilter::Create(10.0f, 5.0f, 3.0f, 3.0f, SK_ColorBLUE),
};
cf->unref();
diff --git a/gm/imagefiltersclipped.cpp b/gm/imagefiltersclipped.cpp
index ec031c9515..e836e40543 100644
--- a/gm/imagefiltersclipped.cpp
+++ b/gm/imagefiltersclipped.cpp
@@ -100,7 +100,8 @@ protected:
SkImageFilter* filters[] = {
SkBlurImageFilter::Create(SkIntToScalar(12), SkIntToScalar(12)),
- SkDropShadowImageFilter::Create(SkIntToScalar(10), SkIntToScalar(10), SkIntToScalar(3),
+ SkDropShadowImageFilter::Create(SkIntToScalar(10), SkIntToScalar(10),
+ SkIntToScalar(3), SkIntToScalar(3),
SK_ColorGREEN),
SkDisplacementMapEffect::Create(SkDisplacementMapEffect::kR_ChannelSelectorType,
SkDisplacementMapEffect::kR_ChannelSelectorType,
diff --git a/gm/imagefiltersscaled.cpp b/gm/imagefiltersscaled.cpp
index 57552dfddb..cf4dc4e8e7 100644
--- a/gm/imagefiltersscaled.cpp
+++ b/gm/imagefiltersscaled.cpp
@@ -109,7 +109,8 @@ protected:
SkImageFilter* filters[] = {
SkBlurImageFilter::Create(SkIntToScalar(4), SkIntToScalar(4)),
- SkDropShadowImageFilter::Create(SkIntToScalar(5), SkIntToScalar(10), SkIntToScalar(3),
+ SkDropShadowImageFilter::Create(SkIntToScalar(5), SkIntToScalar(10),
+ SkIntToScalar(3), SkIntToScalar(3),
SK_ColorYELLOW),
SkDisplacementMapEffect::Create(SkDisplacementMapEffect::kR_ChannelSelectorType,
SkDisplacementMapEffect::kR_ChannelSelectorType,
diff --git a/include/effects/SkDropShadowImageFilter.h b/include/effects/SkDropShadowImageFilter.h
index 59d3145a00..efd9032e48 100644
--- a/include/effects/SkDropShadowImageFilter.h
+++ b/include/effects/SkDropShadowImageFilter.h
@@ -11,10 +11,6 @@
class SK_API SkDropShadowImageFilter : public SkImageFilter {
public:
- static SkDropShadowImageFilter* Create(SkScalar dx, SkScalar dy, SkScalar sigma,
- SkColor color, SkImageFilter* input = NULL) {
- return SkNEW_ARGS(SkDropShadowImageFilter, (dx, dy, sigma, color, input));
- }
static SkDropShadowImageFilter* Create(SkScalar dx, SkScalar dy,
SkScalar sigmaX, SkScalar sigmaY, SkColor color,
SkImageFilter* input = NULL,
@@ -26,8 +22,6 @@ public:
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDropShadowImageFilter)
protected:
- SkDropShadowImageFilter(SkScalar dx, SkScalar dy, SkScalar sigma, SkColor,
- SkImageFilter* input);
SkDropShadowImageFilter(SkScalar dx, SkScalar dy, SkScalar sigmaX, SkScalar sigmaY, SkColor,
SkImageFilter* input, const CropRect* cropRect);
explicit SkDropShadowImageFilter(SkReadBuffer&);
diff --git a/samplecode/SampleFilterFuzz.cpp b/samplecode/SampleFilterFuzz.cpp
index 9e3d762f9e..298219dbc0 100644
--- a/samplecode/SampleFilterFuzz.cpp
+++ b/samplecode/SampleFilterFuzz.cpp
@@ -341,7 +341,7 @@ static SkImageFilter* make_image_filter(bool canBeNull = true) {
break;
case DROP_SHADOW:
filter = SkDropShadowImageFilter::Create(make_scalar(), make_scalar(),
- make_scalar(true), make_color(), make_image_filter());
+ make_scalar(true), make_scalar(true), make_color(), make_image_filter());
break;
case MORPHOLOGY:
if (R(2) == 1) {
diff --git a/src/effects/SkDropShadowImageFilter.cpp b/src/effects/SkDropShadowImageFilter.cpp
index c79cf0bcd3..1d22bbdb2e 100644
--- a/src/effects/SkDropShadowImageFilter.cpp
+++ b/src/effects/SkDropShadowImageFilter.cpp
@@ -15,17 +15,6 @@
#include "SkReadBuffer.h"
#include "SkWriteBuffer.h"
-SkDropShadowImageFilter::SkDropShadowImageFilter(SkScalar dx, SkScalar dy, SkScalar sigma,
- SkColor color, SkImageFilter* input)
- : INHERITED(1, &input)
- , fDx(dx)
- , fDy(dy)
- , fSigmaX(sigma)
- , fSigmaY(sigma)
- , fColor(color)
-{
-}
-
SkDropShadowImageFilter::SkDropShadowImageFilter(SkScalar dx, SkScalar dy,
SkScalar sigmaX, SkScalar sigmaY, SkColor color,
SkImageFilter* input, const CropRect* cropRect)