Delete deprecated SkDropShadowImageFilter header
Bug: skia:11230
Change-Id: I9da638b5e1de50aee9a805547f51e013e55747b4
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/368598
Commit-Queue: Michael Ludwig <michaelludwig@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
diff --git a/gn/effects_imagefilters.gni b/gn/effects_imagefilters.gni
index f4c08cf..0077f7e 100644
--- a/gn/effects_imagefilters.gni
+++ b/gn/effects_imagefilters.gni
@@ -18,7 +18,6 @@
"$_src/effects/imagefilters/SkComposeImageFilter.cpp",
"$_src/effects/imagefilters/SkDisplacementMapImageFilter.cpp",
"$_src/effects/imagefilters/SkDropShadowImageFilter.cpp",
- "$_src/effects/imagefilters/SkDropShadowImageFilter.h",
"$_src/effects/imagefilters/SkImageFilters.cpp",
"$_src/effects/imagefilters/SkImageSource.cpp",
"$_src/effects/imagefilters/SkImageSource.h",
diff --git a/src/core/SkImageFilter_Base.h b/src/core/SkImageFilter_Base.h
index a2a740c..55b003b 100644
--- a/src/core/SkImageFilter_Base.h
+++ b/src/core/SkImageFilter_Base.h
@@ -490,5 +490,6 @@
void SkRegisterColorFilterImageFilterFlattenable();
void SkRegisterComposeImageFilterFlattenable();
void SkRegisterDisplacementMapImageFilterFlattenable();
+void SkRegisterDropShadowImageFilterFlattenable();
#endif // SkImageFilter_Base_DEFINED
diff --git a/src/effects/imagefilters/SkDropShadowImageFilter.cpp b/src/effects/imagefilters/SkDropShadowImageFilter.cpp
index 92b3e5f..47f42c9 100644
--- a/src/effects/imagefilters/SkDropShadowImageFilter.cpp
+++ b/src/effects/imagefilters/SkDropShadowImageFilter.cpp
@@ -5,8 +5,6 @@
* found in the LICENSE file.
*/
-#include "src/effects/imagefilters/SkDropShadowImageFilter.h"
-
#include "include/core/SkCanvas.h"
#include "include/effects/SkImageFilters.h"
#include "src/core/SkImageFilter_Base.h"
@@ -17,11 +15,11 @@
namespace {
-class SkDropShadowImageFilterImpl final : public SkImageFilter_Base {
+class SkDropShadowImageFilter final : public SkImageFilter_Base {
public:
- SkDropShadowImageFilterImpl(SkScalar dx, SkScalar dy, SkScalar sigmaX, SkScalar sigmaY,
- SkColor color, bool shadowOnly, sk_sp<SkImageFilter> input,
- const SkRect* cropRect)
+ SkDropShadowImageFilter(SkScalar dx, SkScalar dy, SkScalar sigmaX, SkScalar sigmaY,
+ SkColor color, bool shadowOnly, sk_sp<SkImageFilter> input,
+ const SkRect* cropRect)
: INHERITED(&input, 1, cropRect)
, fDx(dx)
, fDy(dy)
@@ -30,6 +28,13 @@
, fColor(color)
, fShadowOnly(shadowOnly) {}
+ static sk_sp<SkImageFilter> Make(SkScalar dx, SkScalar dy, SkScalar sigmaX, SkScalar sigmaY,
+ SkColor color, bool shadowOnly, sk_sp<SkImageFilter> input,
+ const SkRect* cropRect) {
+ return sk_sp<SkImageFilter>(new SkDropShadowImageFilter(
+ dx, dy, sigmaX, sigmaY, color, shadowOnly, std::move(input), cropRect));
+ }
+
SkRect computeFastBounds(const SkRect&) const override;
protected:
@@ -39,8 +44,8 @@
MapDirection, const SkIRect* inputRect) const override;
private:
- friend void SkDropShadowImageFilter::RegisterFlattenables();
- SK_FLATTENABLE_HOOKS(SkDropShadowImageFilterImpl)
+ friend void ::SkRegisterDropShadowImageFilterFlattenable();
+ SK_FLATTENABLE_HOOKS(SkDropShadowImageFilter)
SkScalar fDx, fDy, fSigmaX, fSigmaY;
SkColor fColor;
@@ -51,25 +56,27 @@
} // end namespace
-sk_sp<SkImageFilter> SkDropShadowImageFilter::Make(SkScalar dx, SkScalar dy,
- SkScalar sigmaX, SkScalar sigmaY,
- SkColor color, ShadowMode shadowMode,
- sk_sp<SkImageFilter> input,
- const SkRect* cropRect) {
- bool shadowOnly = shadowMode == SkDropShadowImageFilter::kDrawShadowOnly_ShadowMode;
- return sk_sp<SkImageFilter>(new SkDropShadowImageFilterImpl(
- dx, dy, sigmaX, sigmaY, color, shadowOnly, std::move(input), cropRect));
+sk_sp<SkImageFilter> SkImageFilters::DropShadow(
+ SkScalar dx, SkScalar dy, SkScalar sigmaX, SkScalar sigmaY, SkColor color,
+ sk_sp<SkImageFilter> input, const CropRect& cropRect) {
+ return SkDropShadowImageFilter::Make(dx, dy, sigmaX, sigmaY, color, /* shadowOnly */ false,
+ std::move(input), cropRect);
}
-void SkDropShadowImageFilter::RegisterFlattenables() {
- SK_REGISTER_FLATTENABLE(SkDropShadowImageFilterImpl);
+sk_sp<SkImageFilter> SkImageFilters::DropShadowOnly(
+ SkScalar dx, SkScalar dy, SkScalar sigmaX, SkScalar sigmaY, SkColor color,
+ sk_sp<SkImageFilter> input, const CropRect& cropRect) {
+ return SkDropShadowImageFilter::Make(dx, dy, sigmaX, sigmaY, color, /* shadowOnly */ true,
+ std::move(input), cropRect);
+}
+
+void SkRegisterDropShadowImageFilterFlattenable() {
+ SK_REGISTER_FLATTENABLE(SkDropShadowImageFilter);
// TODO (michaelludwig) - Remove after grace period for SKPs to stop using old name
- SkFlattenable::Register("SkDropShadowImageFilter", SkDropShadowImageFilterImpl::CreateProc);
+ SkFlattenable::Register("SkDropShadowImageFilterImpl", SkDropShadowImageFilter::CreateProc);
}
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-sk_sp<SkFlattenable> SkDropShadowImageFilterImpl::CreateProc(SkReadBuffer& buffer) {
+sk_sp<SkFlattenable> SkDropShadowImageFilter::CreateProc(SkReadBuffer& buffer) {
SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 1);
SkScalar dx = buffer.readScalar();
SkScalar dy = buffer.readScalar();
@@ -79,15 +86,13 @@
// For backwards compatibility, the shadow mode had been saved as an enum cast to a 32LE int,
// where shadow-and-foreground was 0 and shadow-only was 1. Other than the number of bits, this
- // is equivalent to the bool that SkDropShadowImageFilterImpl now uses.
+ // is equivalent to the bool that SkDropShadowImageFilter now uses.
bool shadowOnly = SkToBool(buffer.read32LE(1));
- // TODO (michaelludwig) - TODO: Call factory function once SkDropShadowImageFilter::Make no
- // longer takes the old enum as its argument
- return sk_sp<SkImageFilter>(new SkDropShadowImageFilterImpl(
- dx, dy, sigmaX, sigmaY, color, shadowOnly, common.getInput(0), common.cropRect()));
+ return SkDropShadowImageFilter::Make(dx, dy, sigmaX, sigmaY, color, shadowOnly,
+ common.getInput(0), common.cropRect());
}
-void SkDropShadowImageFilterImpl::flatten(SkWriteBuffer& buffer) const {
+void SkDropShadowImageFilter::flatten(SkWriteBuffer& buffer) const {
this->INHERITED::flatten(buffer);
buffer.writeScalar(fDx);
buffer.writeScalar(fDy);
@@ -98,8 +103,10 @@
buffer.writeInt(fShadowOnly);
}
-sk_sp<SkSpecialImage> SkDropShadowImageFilterImpl::onFilterImage(const Context& ctx,
- SkIPoint* offset) const {
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+sk_sp<SkSpecialImage> SkDropShadowImageFilter::onFilterImage(const Context& ctx,
+ SkIPoint* offset) const {
SkIPoint inputOffset = SkIPoint::Make(0, 0);
sk_sp<SkSpecialImage> input(this->filterInput(0, ctx, &inputOffset));
if (!input) {
@@ -148,7 +155,7 @@
return surf->makeImageSnapshot();
}
-SkRect SkDropShadowImageFilterImpl::computeFastBounds(const SkRect& src) const {
+SkRect SkDropShadowImageFilter::computeFastBounds(const SkRect& src) const {
SkRect bounds = this->getInput(0) ? this->getInput(0)->computeFastBounds(src) : src;
SkRect shadowBounds = bounds;
shadowBounds.offset(fDx, fDy);
@@ -161,7 +168,7 @@
return bounds;
}
-SkIRect SkDropShadowImageFilterImpl::onFilterNodeBounds(
+SkIRect SkDropShadowImageFilter::onFilterNodeBounds(
const SkIRect& src, const SkMatrix& ctm, MapDirection dir, const SkIRect* inputRect) const {
SkVector offsetVec = SkVector::Make(fDx, fDy);
if (kReverse_MapDirection == dir) {
diff --git a/src/effects/imagefilters/SkDropShadowImageFilter.h b/src/effects/imagefilters/SkDropShadowImageFilter.h
deleted file mode 100644
index d376753..0000000
--- a/src/effects/imagefilters/SkDropShadowImageFilter.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2013 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkDropShadowImageFilter_DEFINED
-#define SkDropShadowImageFilter_DEFINED
-
-#include "include/core/SkColor.h"
-#include "include/core/SkImageFilter.h"
-#include "include/core/SkScalar.h"
-
-// DEPRECATED: Use include/effects/SkImageFilters::DropShadow and DropShadowOnly
-class SK_API SkDropShadowImageFilter {
-public:
- enum ShadowMode {
- kDrawShadowAndForeground_ShadowMode,
- kDrawShadowOnly_ShadowMode,
-
- kLast_ShadowMode = kDrawShadowOnly_ShadowMode
- };
-
- static const int kShadowModeCount = kLast_ShadowMode+1;
-
- static sk_sp<SkImageFilter> Make(SkScalar dx, SkScalar dy, SkScalar sigmaX, SkScalar sigmaY,
- SkColor color, ShadowMode shadowMode,
- sk_sp<SkImageFilter> input,
- const SkRect* cropRect = nullptr);
-
- static void RegisterFlattenables();
-
-private:
- SkDropShadowImageFilter() = delete;
-};
-
-#endif
diff --git a/src/effects/imagefilters/SkImageFilters.cpp b/src/effects/imagefilters/SkImageFilters.cpp
index c314c21..c215745 100644
--- a/src/effects/imagefilters/SkImageFilters.cpp
+++ b/src/effects/imagefilters/SkImageFilters.cpp
@@ -9,7 +9,6 @@
#include "include/core/SkPaint.h"
-#include "src/effects/imagefilters/SkDropShadowImageFilter.h"
#include "src/effects/imagefilters/SkImageSource.h"
#include "src/effects/imagefilters/SkLightingImageFilter.h"
#include "src/effects/imagefilters/SkMagnifierImageFilter.h"
@@ -27,7 +26,6 @@
void SkImageFilters::RegisterFlattenables() {
SkDilateImageFilter::RegisterFlattenables();
- SkDropShadowImageFilter::RegisterFlattenables();
SkImageSource::RegisterFlattenables();
SkLightingImageFilter::RegisterFlattenables();
SkMagnifierImageFilter::RegisterFlattenables();
@@ -41,27 +39,6 @@
///////////////////////////////////////////////////////////////////////////////////////////////////
-sk_sp<SkImageFilter> SkImageFilters::DropShadow(
- SkScalar dx, SkScalar dy, SkScalar sigmaX, SkScalar sigmaY, SkColor color,
- sk_sp<SkImageFilter> input, const CropRect& cropRect) {
- // TODO (michaelludwig) - Once SkDropShadowImageFilter is fully hidden, this can be updated to
- // pass a constant bool into the internal factory.
- return SkDropShadowImageFilter::Make(
- dx, dy, sigmaX, sigmaY, color,
- SkDropShadowImageFilter::kDrawShadowAndForeground_ShadowMode,
- std::move(input), cropRect);
-}
-
-sk_sp<SkImageFilter> SkImageFilters::DropShadowOnly(
- SkScalar dx, SkScalar dy, SkScalar sigmaX, SkScalar sigmaY, SkColor color,
- sk_sp<SkImageFilter> input, const CropRect& cropRect) {
- // TODO (michaelludwig) - Once SkDropShadowImageFilter is fully hidden, this can be updated to
- // pass a constant bool into the internal factory.
- return SkDropShadowImageFilter::Make(dx, dy, sigmaX, sigmaY, color,
- SkDropShadowImageFilter::kDrawShadowOnly_ShadowMode,
- std::move(input), cropRect);
-}
-
sk_sp<SkImageFilter> SkImageFilters::Image(
sk_sp<SkImage> image, const SkRect& srcRect, const SkRect& dstRect,
const SkSamplingOptions& sampling) {
diff --git a/src/ports/SkGlobalInitialization_default.cpp b/src/ports/SkGlobalInitialization_default.cpp
index 7e0bd07..3049b10 100644
--- a/src/ports/SkGlobalInitialization_default.cpp
+++ b/src/ports/SkGlobalInitialization_default.cpp
@@ -123,6 +123,7 @@
SkRegisterColorFilterImageFilterFlattenable();
SkRegisterComposeImageFilterFlattenable();
SkRegisterDisplacementMapImageFilterFlattenable();
+ SkRegisterDropShadowImageFilterFlattenable();
SK_REGISTER_FLATTENABLE(SkLocalMatrixImageFilter);
SK_REGISTER_FLATTENABLE(SkMatrixImageFilter);
}
