hide virtual and rename to onMakeComposed
Bug: skia:
Change-Id: Ic18ee2af3273f81ebec9c9031162e808186c0acd
Reviewed-on: https://skia-review.googlesource.com/108300
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
diff --git a/fuzz/FuzzCanvas.cpp b/fuzz/FuzzCanvas.cpp
index ffc8781..a14468f 100644
--- a/fuzz/FuzzCanvas.cpp
+++ b/fuzz/FuzzCanvas.cpp
@@ -184,7 +184,7 @@
case 2: {
sk_sp<SkColorFilter> outer = make_fuzz_colorfilter(fuzz, depth - 1);
sk_sp<SkColorFilter> inner = make_fuzz_colorfilter(fuzz, depth - 1);
- return SkColorFilter::MakeComposeFilter(std::move(outer), std::move(inner));
+ return outer->makeComposed(std::move(inner));
}
case 3: {
SkScalar array[20];
diff --git a/gm/color4f.cpp b/gm/color4f.cpp
index b1ec0bf..792f7d5 100644
--- a/gm/color4f.cpp
+++ b/gm/color4f.cpp
@@ -35,14 +35,13 @@
static sk_sp<SkColorFilter> make_cf1() {
SkColorMatrix cm;
cm.setSaturation(0.75f);
- auto a(SkColorFilter::MakeMatrixFilterRowMajor255(cm.fMat));
+ auto a = SkColorFilter::MakeMatrixFilterRowMajor255(cm.fMat);
// CreateComposedFilter will try to concat these two matrices, resulting in a single
// filter (which is good for speed). For this test, we want to force a real compose of
// these two, so our inner filter has a scale-up, which disables the optimization of
// combining the two matrices.
cm.setScale(1.1f, 0.9f, 1);
- auto b(SkColorFilter::MakeMatrixFilterRowMajor255(cm.fMat));
- return SkColorFilter::MakeComposeFilter(a, b);
+ return a->makeComposed(SkColorFilter::MakeMatrixFilterRowMajor255(cm.fMat));
}
static sk_sp<SkColorFilter> make_cf2() {
diff --git a/gm/srgb.cpp b/gm/srgb.cpp
index f0bff69..21571c5 100644
--- a/gm/srgb.cpp
+++ b/gm/srgb.cpp
@@ -32,11 +32,11 @@
p.setColorFilter(cf1);
canvas->drawImage(img, 0, 256, &p);
- p.setColorFilter(SkColorFilter::MakeComposeFilter(cf1, cf0));
+ p.setColorFilter(cf1->makeComposed(cf0));
canvas->drawImage(img, 256, 256, &p);
p.setColorFilter(cf2);
canvas->drawImage(img, 0, 512, &p);
- p.setColorFilter(SkColorFilter::MakeComposeFilter(cf2, cf0));
+ p.setColorFilter(cf2->makeComposed(cf0));
canvas->drawImage(img, 256, 512, &p);
}
diff --git a/gm/tablecolorfilter.cpp b/gm/tablecolorfilter.cpp
index df6f7d6..8902d59 100644
--- a/gm/tablecolorfilter.cpp
+++ b/gm/tablecolorfilter.cpp
@@ -263,7 +263,7 @@
for (int y = 0; y < MODES; ++y) {
canvas->save();
for (int x = 0; x < MODES; ++x) {
- paint.setColorFilter(SkColorFilter::MakeComposeFilter(filters[y], filters[x]));
+ paint.setColorFilter(filters[y]->makeComposed(filters[x]));
canvas->drawRect(r, paint);
canvas->translate(r.width() + spacer, 0);
}
diff --git a/include/core/SkColorFilter.h b/include/core/SkColorFilter.h
index fde3d26..1bf1842 100644
--- a/include/core/SkColorFilter.h
+++ b/include/core/SkColorFilter.h
@@ -76,15 +76,6 @@
*/
virtual uint32_t getFlags() const { return 0; }
- /**
- * If this subclass can optimally createa composition with the inner filter, return it as
- * a new filter (which the caller must unref() when it is done). If no such optimization
- * is known, return NULL.
- *
- * e.g. result(color) == this_filter(inner(color))
- */
- virtual sk_sp<SkColorFilter> makeComposed(sk_sp<SkColorFilter>) const { return nullptr; }
-
SkColor filterColor(SkColor) const;
SkColor4f filterColor4f(const SkColor4f&) const;
@@ -100,14 +91,20 @@
static sk_sp<SkColorFilter> MakeModeFilter(SkColor c, SkBlendMode mode);
/** Construct a colorfilter whose effect is to first apply the inner filter and then apply
- * the outer filter to the result of the inner's.
- * The reference counts for outer and inner are incremented.
+ * this filter, applied to the output of the inner filter.
+ *
+ * result = this(inner(...))
*
* Due to internal limits, it is possible that this will return NULL, so the caller must
* always check.
*/
+ sk_sp<SkColorFilter> makeComposed(sk_sp<SkColorFilter> inner) const;
+
+ // DEPRECATED, call makeComposed instead
static sk_sp<SkColorFilter> MakeComposeFilter(sk_sp<SkColorFilter> outer,
- sk_sp<SkColorFilter> inner);
+ sk_sp<SkColorFilter> inner) {
+ return outer ? outer->makeComposed(inner) : inner;
+ }
/** Construct a color filter that transforms a color by a 4x5 matrix. The matrix is in row-
* major order and the translation column is specified in unnormalized, 0...255, space.
@@ -155,6 +152,15 @@
return sk_ref_sp(const_cast<SkColorFilter*>(this));
}
+ /**
+ * If this subclass can optimally createa composition with the inner filter, return it as
+ * a new filter (which the caller must unref() when it is done). If no such optimization
+ * is known, return NULL.
+ *
+ * e.g. result(color) == this_filter(inner(color))
+ */
+ virtual sk_sp<SkColorFilter> onMakeComposed(sk_sp<SkColorFilter>) const { return nullptr; }
+
private:
/*
* Returns 1 if this is a single filter (not a composition of other filters), otherwise it
diff --git a/include/core/SkRefCnt.h b/include/core/SkRefCnt.h
index 01580ab..5d070a2 100644
--- a/include/core/SkRefCnt.h
+++ b/include/core/SkRefCnt.h
@@ -445,4 +445,8 @@
return sk_sp<T>(SkSafeRef(obj));
}
+template <typename T> sk_sp<T> sk_ref_sp(const T* obj) {
+ return sk_sp<T>(const_cast<T*>(SkSafeRef(obj)));
+}
+
#endif
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index 2667f8f..5795c0a 100644
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -400,7 +400,7 @@
// The paint has both a colorfilter(paintCF) and an imagefilter-which-is-a-colorfilter(imgCF)
// and we need to combine them into a single colorfilter.
- return SkColorFilter::MakeComposeFilter(std::move(imgCF), sk_ref_sp(paintCF));
+ return imgCF->makeComposed(sk_ref_sp(paintCF));
}
/**
diff --git a/src/core/SkColorFilter.cpp b/src/core/SkColorFilter.cpp
index 3c6beea..31e8b32 100644
--- a/src/core/SkColorFilter.cpp
+++ b/src/core/SkColorFilter.cpp
@@ -159,7 +159,7 @@
auto outer = xformer->apply(fOuter.get());
auto inner = xformer->apply(fInner.get());
if (outer != fOuter || inner != fInner) {
- return SkColorFilter::MakeComposeFilter(outer, inner);
+ return outer->makeComposed(inner);
}
return this->INHERITED::onMakeColorSpace(xformer);
}
@@ -176,29 +176,26 @@
sk_sp<SkFlattenable> SkComposeColorFilter::CreateProc(SkReadBuffer& buffer) {
sk_sp<SkColorFilter> outer(buffer.readColorFilter());
sk_sp<SkColorFilter> inner(buffer.readColorFilter());
- return MakeComposeFilter(std::move(outer), std::move(inner));
+ return outer->makeComposed(std::move(inner));
}
-sk_sp<SkColorFilter> SkColorFilter::MakeComposeFilter(sk_sp<SkColorFilter> outer,
- sk_sp<SkColorFilter> inner) {
- if (!outer) {
- return inner;
- }
+
+sk_sp<SkColorFilter> SkColorFilter::makeComposed(sk_sp<SkColorFilter> inner) const {
if (!inner) {
- return outer;
+ return sk_ref_sp(this);
}
// Give the subclass a shot at a more optimal composition...
- auto composition = outer->makeComposed(inner);
+ auto composition = this->onMakeComposed(inner);
if (composition) {
return composition;
}
- int count = inner->privateComposedFilterCount() + outer->privateComposedFilterCount();
+ int count = inner->privateComposedFilterCount() + this->privateComposedFilterCount();
if (count > SK_MAX_COMPOSE_COLORFILTER_COUNT) {
return nullptr;
}
- return sk_sp<SkColorFilter>(new SkComposeColorFilter(std::move(outer), std::move(inner),count));
+ return sk_sp<SkColorFilter>(new SkComposeColorFilter(sk_ref_sp(this), std::move(inner), count));
}
///////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/core/SkColorMatrixFilterRowMajor255.cpp b/src/core/SkColorMatrixFilterRowMajor255.cpp
index f7d0425..c85ea3d 100644
--- a/src/core/SkColorMatrixFilterRowMajor255.cpp
+++ b/src/core/SkColorMatrixFilterRowMajor255.cpp
@@ -164,7 +164,7 @@
}
sk_sp<SkColorFilter>
-SkColorMatrixFilterRowMajor255::makeComposed(sk_sp<SkColorFilter> innerFilter) const {
+SkColorMatrixFilterRowMajor255::onMakeComposed(sk_sp<SkColorFilter> innerFilter) const {
SkScalar innerMatrix[20];
if (innerFilter->asColorMatrix(innerMatrix) && !needs_clamping(innerMatrix)) {
SkScalar concat[20];
diff --git a/src/core/SkColorMatrixFilterRowMajor255.h b/src/core/SkColorMatrixFilterRowMajor255.h
index 6e63b14..41aec87 100644
--- a/src/core/SkColorMatrixFilterRowMajor255.h
+++ b/src/core/SkColorMatrixFilterRowMajor255.h
@@ -20,7 +20,7 @@
uint32_t getFlags() const override;
bool asColorMatrix(SkScalar matrix[20]) const override;
- sk_sp<SkColorFilter> makeComposed(sk_sp<SkColorFilter>) const override;
+ sk_sp<SkColorFilter> onMakeComposed(sk_sp<SkColorFilter>) const override;
#if SK_SUPPORT_GPU
std::unique_ptr<GrFragmentProcessor> asFragmentProcessor(
diff --git a/src/effects/SkColorFilterImageFilter.cpp b/src/effects/SkColorFilterImageFilter.cpp
index 50861fe..a36cf5f 100644
--- a/src/effects/SkColorFilterImageFilter.cpp
+++ b/src/effects/SkColorFilterImageFilter.cpp
@@ -27,8 +27,7 @@
if (input && input->isColorFilterNode(&inputCF)) {
// This is an optimization, as it collapses the hierarchy by just combining the two
// colorfilters into a single one, which the new imagefilter will wrap.
- sk_sp<SkColorFilter> newCF(SkColorFilter::MakeComposeFilter(cf,// can't move bc of fallthru
- sk_sp<SkColorFilter>(inputCF)));
+ sk_sp<SkColorFilter> newCF = cf->makeComposed(sk_sp<SkColorFilter>(inputCF));
if (newCF) {
return sk_sp<SkImageFilter>(new SkColorFilterImageFilter(std::move(newCF),
sk_ref_sp(input->getInput(0)),
diff --git a/src/effects/SkTableColorFilter.cpp b/src/effects/SkTableColorFilter.cpp
index 45c70d6..124e98f 100644
--- a/src/effects/SkTableColorFilter.cpp
+++ b/src/effects/SkTableColorFilter.cpp
@@ -83,7 +83,7 @@
~SkTable_ColorFilter() override { delete fBitmap; }
bool asComponentTable(SkBitmap* table) const override;
- sk_sp<SkColorFilter> makeComposed(sk_sp<SkColorFilter> inner) const override;
+ sk_sp<SkColorFilter> onMakeComposed(sk_sp<SkColorFilter> inner) const override;
#if SK_SUPPORT_GPU
std::unique_ptr<GrFragmentProcessor> asFragmentProcessor(
@@ -270,7 +270,7 @@
}
}
-sk_sp<SkColorFilter> SkTable_ColorFilter::makeComposed(sk_sp<SkColorFilter> innerFilter) const {
+sk_sp<SkColorFilter> SkTable_ColorFilter::onMakeComposed(sk_sp<SkColorFilter> innerFilter) const {
SkBitmap innerBM;
if (!innerFilter->asComponentTable(&innerBM)) {
return nullptr;
diff --git a/src/utils/SkShadowUtils.cpp b/src/utils/SkShadowUtils.cpp
index 12f95ee..fcb3432 100644
--- a/src/utils/SkShadowUtils.cpp
+++ b/src/utils/SkShadowUtils.cpp
@@ -438,9 +438,9 @@
SkPaint paint;
// Run the vertex color through a GaussianColorFilter and then modulate the grayscale result of
// that against our 'color' param.
- paint.setColorFilter(SkColorFilter::MakeComposeFilter(
- SkColorFilter::MakeModeFilter(color, SkBlendMode::kModulate),
- SkGaussianColorFilter::Make()));
+ paint.setColorFilter(
+ SkColorFilter::MakeModeFilter(color, SkBlendMode::kModulate)->makeComposed(
+ SkGaussianColorFilter::Make()));
drawProc(vertices.get(), SkBlendMode::kModulate, paint,
context.fTranslate.fX, context.fTranslate.fY);
@@ -565,9 +565,10 @@
SkPaint paint;
// Run the vertex color through a GaussianColorFilter and then modulate the
// grayscale result of that against our 'color' param.
- paint.setColorFilter(SkColorFilter::MakeComposeFilter(
- SkColorFilter::MakeModeFilter(rec.fAmbientColor, SkBlendMode::kModulate),
- SkGaussianColorFilter::Make()));
+ paint.setColorFilter(
+ SkColorFilter::MakeModeFilter(rec.fAmbientColor,
+ SkBlendMode::kModulate)->makeComposed(
+ SkGaussianColorFilter::Make()));
this->drawVertices(vertices.get(), SkBlendMode::kModulate, paint);
}
} else {
@@ -595,9 +596,10 @@
SkPaint paint;
// Run the vertex color through a GaussianColorFilter and then modulate the
// grayscale result of that against our 'color' param.
- paint.setColorFilter(SkColorFilter::MakeComposeFilter(
- SkColorFilter::MakeModeFilter(rec.fSpotColor, SkBlendMode::kModulate),
- SkGaussianColorFilter::Make()));
+ paint.setColorFilter(
+ SkColorFilter::MakeModeFilter(rec.fSpotColor,
+ SkBlendMode::kModulate)->makeComposed(
+ SkGaussianColorFilter::Make()));
this->drawVertices(vertices.get(), SkBlendMode::kModulate, paint);
}
} else {
diff --git a/tests/ColorFilterTest.cpp b/tests/ColorFilterTest.cpp
index c502a70..dc4a3a0 100644
--- a/tests/ColorFilterTest.cpp
+++ b/tests/ColorFilterTest.cpp
@@ -42,7 +42,7 @@
auto parent(make_filter());
for (int i = 2; i < way_too_many; ++i) {
auto filter(make_filter());
- parent = SkColorFilter::MakeComposeFilter(parent, filter);
+ parent = parent->makeComposed(filter);
if (nullptr == parent) {
REPORTER_ASSERT(reporter, i > 2); // we need to have succeeded at least once!
return;
diff --git a/tests/TableColorFilterTest.cpp b/tests/TableColorFilterTest.cpp
index baf6a47..857aa7e 100644
--- a/tests/TableColorFilterTest.cpp
+++ b/tests/TableColorFilterTest.cpp
@@ -30,7 +30,7 @@
// The rec2020 primaries are not representable in sRGB, but will clamp to the sRGB primaries.
SkColor colors[] = { SK_ColorRED, SK_ColorGREEN, SK_ColorBLUE };
- sk_sp<SkColorFilter> composed = SkColorFilter::MakeComposeFilter(table, to_srgb);
+ sk_sp<SkColorFilter> composed = table->makeComposed(to_srgb);
for (auto color : colors) {
REPORTER_ASSERT(r, composed->filterColor(color) == color);
}
