Remove deprecated offset filter header
Bug: skia:11230
Change-Id: I509a20b1b1ffa17b125289f9619692638a13a621
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/371964
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 d7df79b..d541aa0 100644
--- a/gn/effects_imagefilters.gni
+++ b/gn/effects_imagefilters.gni
@@ -26,7 +26,6 @@
"$_src/effects/imagefilters/SkMergeImageFilter.cpp",
"$_src/effects/imagefilters/SkMorphologyImageFilter.cpp",
"$_src/effects/imagefilters/SkOffsetImageFilter.cpp",
- "$_src/effects/imagefilters/SkOffsetImageFilter.h",
"$_src/effects/imagefilters/SkPaintImageFilter.cpp",
"$_src/effects/imagefilters/SkPaintImageFilter.h",
"$_src/effects/imagefilters/SkPictureImageFilter.cpp",
diff --git a/src/core/SkImageFilter_Base.h b/src/core/SkImageFilter_Base.h
index 69f9f17..4ad3760 100644
--- a/src/core/SkImageFilter_Base.h
+++ b/src/core/SkImageFilter_Base.h
@@ -497,5 +497,6 @@
void SkRegisterMatrixConvolutionImageFilterFlattenable();
void SkRegisterMergeImageFilterFlattenable();
void SkRegisterMorphologyImageFilterFlattenables();
+void SkRegisterOffsetImageFilterFlattenable();
#endif // SkImageFilter_Base_DEFINED
diff --git a/src/effects/imagefilters/SkImageFilters.cpp b/src/effects/imagefilters/SkImageFilters.cpp
index 4481b1f..6e1c091 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/SkOffsetImageFilter.h"
#include "src/effects/imagefilters/SkPaintImageFilter.h"
#include "src/effects/imagefilters/SkPictureImageFilter.h"
#include "src/effects/imagefilters/SkTileImageFilter.h"
@@ -19,7 +18,6 @@
#include "src/core/SkMatrixImageFilter.h"
void SkImageFilters::RegisterFlattenables() {
- SkOffsetImageFilter::RegisterFlattenables();
SkPaintImageFilter::RegisterFlattenables();
SkPictureImageFilter::RegisterFlattenables();
SkTileImageFilter::RegisterFlattenables();
@@ -41,10 +39,6 @@
}
#endif
-sk_sp<SkImageFilter> SkImageFilters::Offset(
- SkScalar dx, SkScalar dy, sk_sp<SkImageFilter> input, const CropRect& cropRect) {
- return SkOffsetImageFilter::Make(dx, dy, std::move(input), cropRect);
-}
sk_sp<SkImageFilter> SkImageFilters::Paint(const SkPaint& paint, const CropRect& cropRect) {
return SkPaintImageFilter::Make(paint, cropRect);
diff --git a/src/effects/imagefilters/SkOffsetImageFilter.cpp b/src/effects/imagefilters/SkOffsetImageFilter.cpp
index 4c85de6..570f97b 100644
--- a/src/effects/imagefilters/SkOffsetImageFilter.cpp
+++ b/src/effects/imagefilters/SkOffsetImageFilter.cpp
@@ -5,11 +5,10 @@
* found in the LICENSE file.
*/
-#include "src/effects/imagefilters/SkOffsetImageFilter.h"
-
#include "include/core/SkCanvas.h"
#include "include/core/SkMatrix.h"
#include "include/core/SkPaint.h"
+#include "include/effects/SkImageFilters.h"
#include "src/core/SkImageFilter_Base.h"
#include "src/core/SkPointPriv.h"
#include "src/core/SkReadBuffer.h"
@@ -19,10 +18,10 @@
namespace {
-class SkOffsetImageFilterImpl final : public SkImageFilter_Base {
+class SkOffsetImageFilter final : public SkImageFilter_Base {
public:
- SkOffsetImageFilterImpl(SkScalar dx, SkScalar dy, sk_sp<SkImageFilter> input,
- const SkRect* cropRect)
+ SkOffsetImageFilter(SkScalar dx, SkScalar dy, sk_sp<SkImageFilter> input,
+ const SkRect* cropRect)
: INHERITED(&input, 1, cropRect) {
fOffset.set(dx, dy);
}
@@ -36,8 +35,8 @@
MapDirection, const SkIRect* inputRect) const override;
private:
- friend void SkOffsetImageFilter::RegisterFlattenables();
- SK_FLATTENABLE_HOOKS(SkOffsetImageFilterImpl)
+ friend void ::SkRegisterOffsetImageFilterFlattenable();
+ SK_FLATTENABLE_HOOKS(SkOffsetImageFilter)
SkVector fOffset;
@@ -46,44 +45,43 @@
} // end namespace
-sk_sp<SkImageFilter> SkOffsetImageFilter::Make(SkScalar dx, SkScalar dy,
- sk_sp<SkImageFilter> input,
- const SkRect* cropRect) {
+sk_sp<SkImageFilter> SkImageFilters::Offset(SkScalar dx, SkScalar dy,
+ sk_sp<SkImageFilter> input,
+ const CropRect& cropRect) {
if (!SkScalarIsFinite(dx) || !SkScalarIsFinite(dy)) {
return nullptr;
}
- return sk_sp<SkImageFilter>(new SkOffsetImageFilterImpl(dx, dy, std::move(input), cropRect));
+ return sk_sp<SkImageFilter>(new SkOffsetImageFilter(dx, dy, std::move(input), cropRect));
}
-void SkOffsetImageFilter::RegisterFlattenables() {
- SK_REGISTER_FLATTENABLE(SkOffsetImageFilterImpl);
+void SkRegisterOffsetImageFilterFlattenable() {
+ SK_REGISTER_FLATTENABLE(SkOffsetImageFilter);
// TODO (michaelludwig) - Remove after grace period for SKPs to stop using old name
- SkFlattenable::Register("SkOffsetImageFilter", SkOffsetImageFilterImpl::CreateProc);
+ SkFlattenable::Register("SkOffsetImageFilterImpl", SkOffsetImageFilter::CreateProc);
}
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-sk_sp<SkFlattenable> SkOffsetImageFilterImpl::CreateProc(SkReadBuffer& buffer) {
+sk_sp<SkFlattenable> SkOffsetImageFilter::CreateProc(SkReadBuffer& buffer) {
SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 1);
SkPoint offset;
buffer.readPoint(&offset);
- return SkOffsetImageFilter::Make(offset.x(), offset.y(), common.getInput(0),
- common.cropRect());
+ return SkImageFilters::Offset(offset.x(), offset.y(), common.getInput(0), common.cropRect());
}
-void SkOffsetImageFilterImpl::flatten(SkWriteBuffer& buffer) const {
+void SkOffsetImageFilter::flatten(SkWriteBuffer& buffer) const {
this->INHERITED::flatten(buffer);
buffer.writePoint(fOffset);
}
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
static SkIPoint map_offset_vector(const SkMatrix& ctm, const SkVector& offset) {
SkVector vec = ctm.mapVector(offset.fX, offset.fY);
return SkIPoint::Make(SkScalarRoundToInt(vec.fX), SkScalarRoundToInt(vec.fY));
}
-sk_sp<SkSpecialImage> SkOffsetImageFilterImpl::onFilterImage(const Context& ctx,
- SkIPoint* offset) const {
+sk_sp<SkSpecialImage> SkOffsetImageFilter::onFilterImage(const Context& ctx,
+ SkIPoint* offset) const {
SkIPoint srcOffset = SkIPoint::Make(0, 0);
sk_sp<SkSpecialImage> input(this->filterInput(0, ctx, &srcOffset));
if (!input) {
@@ -128,13 +126,13 @@
}
}
-SkRect SkOffsetImageFilterImpl::computeFastBounds(const SkRect& src) const {
+SkRect SkOffsetImageFilter::computeFastBounds(const SkRect& src) const {
SkRect bounds = this->getInput(0) ? this->getInput(0)->computeFastBounds(src) : src;
bounds.offset(fOffset.fX, fOffset.fY);
return bounds;
}
-SkIRect SkOffsetImageFilterImpl::onFilterNodeBounds(
+SkIRect SkOffsetImageFilter::onFilterNodeBounds(
const SkIRect& src, const SkMatrix& ctm, MapDirection dir, const SkIRect* inputRect) const {
SkIPoint vec = map_offset_vector(ctm, fOffset);
if (kReverse_MapDirection == dir) {
diff --git a/src/effects/imagefilters/SkOffsetImageFilter.h b/src/effects/imagefilters/SkOffsetImageFilter.h
deleted file mode 100644
index b959779..0000000
--- a/src/effects/imagefilters/SkOffsetImageFilter.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright 2012 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkOffsetImageFilter_DEFINED
-#define SkOffsetImageFilter_DEFINED
-
-#include "include/core/SkImageFilter.h"
-
-// DEPRECATED: Use include/effects/SkImageFilters::Offset
-class SK_API SkOffsetImageFilter {
-public:
- static sk_sp<SkImageFilter> Make(SkScalar dx, SkScalar dy,
- sk_sp<SkImageFilter> input,
- const SkRect* cropRect = nullptr);
-
- static void RegisterFlattenables();
-
-private:
- SkOffsetImageFilter() = delete;
-};
-
-#endif
diff --git a/src/effects/imagefilters/SkTileImageFilter.cpp b/src/effects/imagefilters/SkTileImageFilter.cpp
index 44abc13..0c2dea2 100644
--- a/src/effects/imagefilters/SkTileImageFilter.cpp
+++ b/src/effects/imagefilters/SkTileImageFilter.cpp
@@ -13,13 +13,13 @@
#include "include/core/SkPaint.h"
#include "include/core/SkShader.h"
#include "include/core/SkSurface.h"
+#include "include/effects/SkImageFilters.h"
#include "src/core/SkImageFilter_Base.h"
#include "src/core/SkReadBuffer.h"
#include "src/core/SkSpecialImage.h"
#include "src/core/SkSpecialSurface.h"
#include "src/core/SkValidationUtils.h"
#include "src/core/SkWriteBuffer.h"
-#include "src/effects/imagefilters/SkOffsetImageFilter.h"
namespace {
@@ -63,8 +63,8 @@
if (!ir.intersect(srcRect)) {
return input;
}
- return SkOffsetImageFilter::Make(dstRect.x() - srcRect.x(), dstRect.y() - srcRect.y(),
- std::move(input), &ir);
+ return SkImageFilters::Offset(dstRect.x() - srcRect.x(), dstRect.y() - srcRect.y(),
+ std::move(input), &ir);
}
return sk_sp<SkImageFilter>(new SkTileImageFilterImpl(srcRect, dstRect, std::move(input)));
}
diff --git a/src/ports/SkGlobalInitialization_default.cpp b/src/ports/SkGlobalInitialization_default.cpp
index e399000..5856c0c5 100644
--- a/src/ports/SkGlobalInitialization_default.cpp
+++ b/src/ports/SkGlobalInitialization_default.cpp
@@ -130,6 +130,7 @@
SkRegisterMatrixConvolutionImageFilterFlattenable();
SkRegisterMergeImageFilterFlattenable();
SkRegisterMorphologyImageFilterFlattenables();
+ SkRegisterOffsetImageFilterFlattenable();
SK_REGISTER_FLATTENABLE(SkLocalMatrixImageFilter);
SK_REGISTER_FLATTENABLE(SkMatrixImageFilter);
}
