AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Delete compose image filter header

Browse Source 
Bug: skia:11230
Change-Id: Ifa677319a04379dc36ff155590ba85d45790567e
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/368596
Commit-Queue: Michael Ludwig <michaelludwig@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
This commit is contained in:
Michael Ludwig 2021-02-09 18:39:12 -05:00 committed by Skia Commit-Bot
parent b66214e0be
commit bf43df6478
6 changed files with 23 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gn/effects_imagefilters.gni
View File

@ -16,7 +16,6 @@ skia_effects_imagefilter_sources = [
"$_src/effects/imagefilters/SkBlurImageFilter.cpp", "$_src/effects/imagefilters/SkBlurImageFilter.cpp",
"$_src/effects/imagefilters/SkColorFilterImageFilter.cpp", "$_src/effects/imagefilters/SkColorFilterImageFilter.cpp",
"$_src/effects/imagefilters/SkComposeImageFilter.cpp", "$_src/effects/imagefilters/SkComposeImageFilter.cpp",
"$_src/effects/imagefilters/SkComposeImageFilter.h",
"$_src/effects/imagefilters/SkDisplacementMapEffect.cpp", "$_src/effects/imagefilters/SkDisplacementMapEffect.cpp",
"$_src/effects/imagefilters/SkDisplacementMapEffect.h", "$_src/effects/imagefilters/SkDisplacementMapEffect.h",
"$_src/effects/imagefilters/SkDropShadowImageFilter.cpp", "$_src/effects/imagefilters/SkDropShadowImageFilter.cpp",

1
src/core/SkImageFilter_Base.h
View File

@ -488,5 +488,6 @@ void SkRegisterArithmeticImageFilterFlattenable();
void SkRegisterBlendImageFilterFlattenable(); void SkRegisterBlendImageFilterFlattenable();
void SkRegisterBlurImageFilterFlattenable(); void SkRegisterBlurImageFilterFlattenable();
void SkRegisterColorFilterImageFilterFlattenable(); void SkRegisterColorFilterImageFilterFlattenable();
void SkRegisterComposeImageFilterFlattenable();
#endif // SkImageFilter_Base_DEFINED #endif // SkImageFilter_Base_DEFINED

43
src/effects/imagefilters/SkComposeImageFilter.cpp
View File

@ -5,8 +5,7 @@
* found in the LICENSE file. * found in the LICENSE file.
*/ */
#include "src/effects/imagefilters/SkComposeImageFilter.h" #include "include/effects/SkImageFilters.h"
#include "src/core/SkImageFilter_Base.h" #include "src/core/SkImageFilter_Base.h"
#include "src/core/SkReadBuffer.h" #include "src/core/SkReadBuffer.h"
#include "src/core/SkSpecialImage.h" #include "src/core/SkSpecialImage.h"
@ -14,9 +13,9 @@
namespace { namespace {
class SkComposeImageFilterImpl final : public SkImageFilter_Base { class SkComposeImageFilter final : public SkImageFilter_Base {
public: public:
explicit SkComposeImageFilterImpl(sk_sp<SkImageFilter> inputs[2]) explicit SkComposeImageFilter(sk_sp<SkImageFilter> inputs[2])
: INHERITED(inputs, 2, nullptr) { : INHERITED(inputs, 2, nullptr) {
SkASSERT(inputs[0].get()); SkASSERT(inputs[0].get());
SkASSERT(inputs[1].get()); SkASSERT(inputs[1].get());
@ -31,16 +30,16 @@ protected:
bool onCanHandleComplexCTM() const override { return true; } bool onCanHandleComplexCTM() const override { return true; }
private: private:
friend void SkComposeImageFilter::RegisterFlattenables(); friend void ::SkRegisterComposeImageFilterFlattenable();
SK_FLATTENABLE_HOOKS(SkComposeImageFilterImpl) SK_FLATTENABLE_HOOKS(SkComposeImageFilter)
using INHERITED = SkImageFilter_Base; using INHERITED = SkImageFilter_Base;
}; };
} // end namespace } // end namespace
sk_sp<SkImageFilter> SkComposeImageFilter::Make(sk_sp<SkImageFilter> outer, sk_sp<SkImageFilter> SkImageFilters::Compose(sk_sp<SkImageFilter> outer,
sk_sp<SkImageFilter> inner) { sk_sp<SkImageFilter> inner) {
if (!outer) { if (!outer) {
return inner; return inner;
} }
@ -48,31 +47,31 @@ sk_sp<SkImageFilter> SkComposeImageFilter::Make(sk_sp<SkImageFilter> outer,
return outer; return outer;
} }
sk_sp<SkImageFilter> inputs[2] = { std::move(outer), std::move(inner) }; sk_sp<SkImageFilter> inputs[2] = { std::move(outer), std::move(inner) };
return sk_sp<SkImageFilter>(new SkComposeImageFilterImpl(inputs)); return sk_sp<SkImageFilter>(new SkComposeImageFilter(inputs));
} }
void SkComposeImageFilter::RegisterFlattenables() { void SkRegisterComposeImageFilterFlattenable() {
SK_REGISTER_FLATTENABLE(SkComposeImageFilterImpl); SK_REGISTER_FLATTENABLE(SkComposeImageFilter);
// TODO (michaelludwig) - Remove after grace period for SKPs to stop using old name // TODO (michaelludwig) - Remove after grace period for SKPs to stop using old name
SkFlattenable::Register("SkComposeImageFilter", SkComposeImageFilterImpl::CreateProc); SkFlattenable::Register("SkComposeImageFilterImpl", SkComposeImageFilter::CreateProc);
}
sk_sp<SkFlattenable> SkComposeImageFilter::CreateProc(SkReadBuffer& buffer) {
SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 2);
return SkImageFilters::Compose(common.getInput(0), common.getInput(1));
} }
/////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////
sk_sp<SkFlattenable> SkComposeImageFilterImpl::CreateProc(SkReadBuffer& buffer) { SkRect SkComposeImageFilter::computeFastBounds(const SkRect& src) const {
SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 2);
return SkComposeImageFilter::Make(common.getInput(0), common.getInput(1));
}
SkRect SkComposeImageFilterImpl::computeFastBounds(const SkRect& src) const {
const SkImageFilter* outer = this->getInput(0); const SkImageFilter* outer = this->getInput(0);
const SkImageFilter* inner = this->getInput(1); const SkImageFilter* inner = this->getInput(1);
return outer->computeFastBounds(inner->computeFastBounds(src)); return outer->computeFastBounds(inner->computeFastBounds(src));
} }
sk_sp<SkSpecialImage> SkComposeImageFilterImpl::onFilterImage(const Context& ctx, sk_sp<SkSpecialImage> SkComposeImageFilter::onFilterImage(const Context& ctx,
SkIPoint* offset) const { SkIPoint* offset) const {
// The bounds passed to the inner filter must be filtered by the outer // The bounds passed to the inner filter must be filtered by the outer
// filter, so that the inner filter produces the pixels that the outer // filter, so that the inner filter produces the pixels that the outer
// filter requires as input. This matters if the outer filter moves pixels. // filter requires as input. This matters if the outer filter moves pixels.
@ -111,8 +110,8 @@ sk_sp<SkSpecialImage> SkComposeImageFilterImpl::onFilterImage(const Context& ctx
return outer; return outer;
} }
SkIRect SkComposeImageFilterImpl::onFilterBounds(const SkIRect& src, const SkMatrix& ctm, SkIRect SkComposeImageFilter::onFilterBounds(const SkIRect& src, const SkMatrix& ctm,
MapDirection dir, const SkIRect* inputRect) const { MapDirection dir, const SkIRect* inputRect) const {
const SkImageFilter* outer = this->getInput(0); const SkImageFilter* outer = this->getInput(0);
const SkImageFilter* inner = this->getInput(1); const SkImageFilter* inner = this->getInput(1);

24
src/effects/imagefilters/SkComposeImageFilter.h
View File

@ -1,24 +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 SkComposeImageFilter_DEFINED
#define SkComposeImageFilter_DEFINED
#include "include/core/SkImageFilter.h"
// DEPRECATED: Use include/effects/SkImageFilters::Compose
class SK_API SkComposeImageFilter {
public:
static sk_sp<SkImageFilter> Make(sk_sp<SkImageFilter> outer, sk_sp<SkImageFilter> inner);
static void RegisterFlattenables();
private:
SkComposeImageFilter() = delete;
};
#endif

7
src/effects/imagefilters/SkImageFilters.cpp
View File

@ -9,7 +9,6 @@
#include "include/core/SkPaint.h" #include "include/core/SkPaint.h"
#include "src/effects/imagefilters/SkComposeImageFilter.h"
#include "src/effects/imagefilters/SkDisplacementMapEffect.h" #include "src/effects/imagefilters/SkDisplacementMapEffect.h"
#include "src/effects/imagefilters/SkDropShadowImageFilter.h" #include "src/effects/imagefilters/SkDropShadowImageFilter.h"
#include "src/effects/imagefilters/SkImageSource.h" #include "src/effects/imagefilters/SkImageSource.h"
@ -28,7 +27,6 @@
#include "src/core/SkMatrixImageFilter.h" #include "src/core/SkMatrixImageFilter.h"
void SkImageFilters::RegisterFlattenables() { void SkImageFilters::RegisterFlattenables() {
SkComposeImageFilter::RegisterFlattenables();
SkDilateImageFilter::RegisterFlattenables(); SkDilateImageFilter::RegisterFlattenables();
SkDisplacementMapEffect::RegisterFlattenables(); SkDisplacementMapEffect::RegisterFlattenables();
SkDropShadowImageFilter::RegisterFlattenables(); SkDropShadowImageFilter::RegisterFlattenables();
@ -45,11 +43,6 @@ void SkImageFilters::RegisterFlattenables() {
/////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////
sk_sp<SkImageFilter> SkImageFilters::Compose(
sk_sp<SkImageFilter> outer, sk_sp<SkImageFilter> inner) {
return SkComposeImageFilter::Make(std::move(outer), std::move(inner));
}
sk_sp<SkImageFilter> SkImageFilters::DisplacementMap( sk_sp<SkImageFilter> SkImageFilters::DisplacementMap(
SkColorChannel xChannelSelector, SkColorChannel yChannelSelector, SkScalar scale, SkColorChannel xChannelSelector, SkColorChannel yChannelSelector, SkScalar scale,
sk_sp<SkImageFilter> displacement, sk_sp<SkImageFilter> color, const CropRect& cropRect) { sk_sp<SkImageFilter> displacement, sk_sp<SkImageFilter> color, const CropRect& cropRect) {

1
src/ports/SkGlobalInitialization_default.cpp
View File

@ -121,6 +121,7 @@
SkRegisterBlendImageFilterFlattenable(); SkRegisterBlendImageFilterFlattenable();
SkRegisterBlurImageFilterFlattenable(); SkRegisterBlurImageFilterFlattenable();
SkRegisterColorFilterImageFilterFlattenable(); SkRegisterColorFilterImageFilterFlattenable();
SkRegisterComposeImageFilterFlattenable();
SK_REGISTER_FLATTENABLE(SkLocalMatrixImageFilter); SK_REGISTER_FLATTENABLE(SkLocalMatrixImageFilter);
SK_REGISTER_FLATTENABLE(SkMatrixImageFilter); SK_REGISTER_FLATTENABLE(SkMatrixImageFilter);
} }