rename some flattenable routines
Initialize felt a little too nebulous, and I think
the verb for "define registrar entry" is "register".
Change-Id: I52f2eb5df5acd46a8b38bb9ea9bb07f4ac8f3789
Reviewed-on: https://skia-review.googlesource.com/c/163990
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
diff --git a/gm/imagefiltersbase.cpp b/gm/imagefiltersbase.cpp
index e2f033f..d0573ef 100644
--- a/gm/imagefiltersbase.cpp
+++ b/gm/imagefiltersbase.cpp
@@ -74,8 +74,8 @@
namespace {
static struct Initializer {
Initializer() {
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(IdentityImageFilter);
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(FailImageFilter);
+ SK_REGISTER_FLATTENABLE(IdentityImageFilter);
+ SK_REGISTER_FLATTENABLE(FailImageFilter);
}
} initializer;
}
diff --git a/include/core/SkColorFilter.h b/include/core/SkColorFilter.h
index 8bd3481..4fbacf3 100644
--- a/include/core/SkColorFilter.h
+++ b/include/core/SkColorFilter.h
@@ -138,7 +138,7 @@
return this->filterColor(SK_ColorTRANSPARENT) != SK_ColorTRANSPARENT;
}
- static void InitializeFlattenables();
+ static void RegisterFlattenables();
static SkFlattenable::Type GetFlattenableType() {
return kSkColorFilter_Type;
diff --git a/include/core/SkFlattenable.h b/include/core/SkFlattenable.h
index e713659..3b01845 100644
--- a/include/core/SkFlattenable.h
+++ b/include/core/SkFlattenable.h
@@ -87,7 +87,7 @@
};
private:
- static void InitializeFlattenablesIfNeeded();
+ static void RegisterFlattenablesIfNeeded();
static void Finalize();
friend class SkGraphics;
@@ -95,7 +95,7 @@
typedef SkRefCnt INHERITED;
};
-#define SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(type) \
+#define SK_REGISTER_FLATTENABLE(type) \
SkFlattenable::Register(#type, type::CreateProc);
#define SK_FLATTENABLE_HOOKS(type) \
diff --git a/include/core/SkImageFilter.h b/include/core/SkImageFilter.h
index beccc80..428455b 100644
--- a/include/core/SkImageFilter.h
+++ b/include/core/SkImageFilter.h
@@ -252,7 +252,7 @@
SkFilterQuality quality,
sk_sp<SkImageFilter> input);
- static void InitializeFlattenables();
+ static void RegisterFlattenables();
static SkFlattenable::Type GetFlattenableType() {
return kSkImageFilter_Type;
diff --git a/include/core/SkMaskFilter.h b/include/core/SkMaskFilter.h
index 982a846..02961be 100644
--- a/include/core/SkMaskFilter.h
+++ b/include/core/SkMaskFilter.h
@@ -70,7 +70,7 @@
}
private:
- static void InitializeFlattenables();
+ static void RegisterFlattenables();
friend class SkFlattenable;
};
diff --git a/include/core/SkPathEffect.h b/include/core/SkPathEffect.h
index c99aa8e..9825a6f 100644
--- a/include/core/SkPathEffect.h
+++ b/include/core/SkPathEffect.h
@@ -144,7 +144,7 @@
DashType asADash(DashInfo* info) const;
- static void InitializeFlattenables();
+ static void RegisterFlattenables();
static SkFlattenable::Type GetFlattenableType() {
return kSkPathEffect_Type;
diff --git a/include/effects/SkAlphaThresholdFilter.h b/include/effects/SkAlphaThresholdFilter.h
index 884efff..4a9dc5c 100644
--- a/include/effects/SkAlphaThresholdFilter.h
+++ b/include/effects/SkAlphaThresholdFilter.h
@@ -26,7 +26,7 @@
const SkImageFilter::CropRect* cropRect = nullptr);
- static void InitializeFlattenables();
+ static void RegisterFlattenables();
};
#endif
diff --git a/include/effects/SkArithmeticImageFilter.h b/include/effects/SkArithmeticImageFilter.h
index b0d0193..a258774 100644
--- a/include/effects/SkArithmeticImageFilter.h
+++ b/include/effects/SkArithmeticImageFilter.h
@@ -26,7 +26,7 @@
sk_sp<SkImageFilter> foreground,
const SkImageFilter::CropRect* cropRect);
- static void InitializeFlattenables();
+ static void RegisterFlattenables();
private:
SkArithmeticImageFilter(); // can't instantiate
diff --git a/include/effects/SkGradientShader.h b/include/effects/SkGradientShader.h
index 278fc25..2919261 100644
--- a/include/effects/SkGradientShader.h
+++ b/include/effects/SkGradientShader.h
@@ -224,7 +224,7 @@
return MakeSweep(cx, cy, colors, std::move(colorSpace), pos, count, 0, nullptr);
}
- static void InitializeFlattenables();
+ static void RegisterFlattenables();
};
#endif
diff --git a/include/effects/SkHighContrastFilter.h b/include/effects/SkHighContrastFilter.h
index ed33576..8d7dd18 100644
--- a/include/effects/SkHighContrastFilter.h
+++ b/include/effects/SkHighContrastFilter.h
@@ -78,7 +78,7 @@
// Returns the filter, or nullptr if the config is invalid.
static sk_sp<SkColorFilter> Make(const SkHighContrastConfig& config);
- static void InitializeFlattenables();
+ static void RegisterFlattenables();
};
#endif
diff --git a/include/effects/SkLightingImageFilter.h b/include/effects/SkLightingImageFilter.h
index 5c25020..ed1341a 100644
--- a/include/effects/SkLightingImageFilter.h
+++ b/include/effects/SkLightingImageFilter.h
@@ -39,7 +39,7 @@
SkScalar shininess, sk_sp<SkImageFilter> input, const CropRect* cropRect = nullptr);
~SkLightingImageFilter() override;
- static void InitializeFlattenables();
+ static void RegisterFlattenables();
protected:
SkLightingImageFilter(sk_sp<SkImageFilterLight> light,
diff --git a/include/effects/SkOverdrawColorFilter.h b/include/effects/SkOverdrawColorFilter.h
index d678f26..cd2c100 100644
--- a/include/effects/SkOverdrawColorFilter.h
+++ b/include/effects/SkOverdrawColorFilter.h
@@ -32,7 +32,7 @@
GrContext*, const GrColorSpaceInfo&) const override;
#endif
- static void InitializeFlattenables();
+ static void RegisterFlattenables();
protected:
void flatten(SkWriteBuffer& buffer) const override;
diff --git a/include/effects/SkPerlinNoiseShader.h b/include/effects/SkPerlinNoiseShader.h
index 1623520..dba8c33 100644
--- a/include/effects/SkPerlinNoiseShader.h
+++ b/include/effects/SkPerlinNoiseShader.h
@@ -51,7 +51,7 @@
static sk_sp<SkShader> MakeImprovedNoise(SkScalar baseFrequencyX, SkScalar baseFrequencyY,
int numOctaves, SkScalar z);
- static void InitializeFlattenables();
+ static void RegisterFlattenables();
private:
SkPerlinNoiseShader() = delete;
diff --git a/include/effects/SkShaderMaskFilter.h b/include/effects/SkShaderMaskFilter.h
index 4ebc4fc..03ec5b8 100644
--- a/include/effects/SkShaderMaskFilter.h
+++ b/include/effects/SkShaderMaskFilter.h
@@ -17,7 +17,7 @@
static sk_sp<SkMaskFilter> Make(sk_sp<SkShader> shader);
private:
- static void InitializeFlattenables();
+ static void RegisterFlattenables();
friend class SkFlattenable;
};
diff --git a/include/effects/SkTableColorFilter.h b/include/effects/SkTableColorFilter.h
index 3989b5a..69f525a 100644
--- a/include/effects/SkTableColorFilter.h
+++ b/include/effects/SkTableColorFilter.h
@@ -36,7 +36,7 @@
const uint8_t tableG[256],
const uint8_t tableB[256]);
- static void InitializeFlattenables();
+ static void RegisterFlattenables();
};
#endif
diff --git a/include/effects/SkXfermodeImageFilter.h b/include/effects/SkXfermodeImageFilter.h
index c403d2f..8ccceb2 100644
--- a/include/effects/SkXfermodeImageFilter.h
+++ b/include/effects/SkXfermodeImageFilter.h
@@ -25,7 +25,7 @@
return Make(mode, std::move(background), nullptr, nullptr);
}
- static void InitializeFlattenables();
+ static void RegisterFlattenables();
private:
SkXfermodeImageFilter(); // can't instantiate
diff --git a/samplecode/SampleTextEffects.cpp b/samplecode/SampleTextEffects.cpp
index d779f66..003d020 100644
--- a/samplecode/SampleTextEffects.cpp
+++ b/samplecode/SampleTextEffects.cpp
@@ -63,7 +63,7 @@
namespace {
static struct Initializer {
Initializer() {
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(Dot2DPathEffect);
+ SK_REGISTER_FLATTENABLE(Dot2DPathEffect);
}
} initializer;
}
diff --git a/site/dev/contrib/flatten.md b/site/dev/contrib/flatten.md
index 8ea8eed..ad68b79 100644
--- a/site/dev/contrib/flatten.md
+++ b/site/dev/contrib/flatten.md
@@ -49,17 +49,17 @@
~~~~
public:
-static void InitializeFlattenables();
+static void RegisterFlattenables();
~~~~
Then in the cpp file you define all the members of the group together:
<!--?prettify?-->
~~~~
-void SkGroupClass::InitializeFlattenables() {
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkMemberClass1)
+void SkGroupClass::RegisterFlattenables() {
+ SK_REGISTER_FLATTENABLE(SkMemberClass1)
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkMemberClass2)
+ SK_REGISTER_FLATTENABLE(SkMemberClass2)
// etc
}
@@ -74,13 +74,13 @@
<!--?prettify?-->
~~~~
-SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkNewClass)
+SK_REGISTER_FLATTENABLE(SkNewClass)
~~~~
For a group, add
<!--?prettify?-->
~~~~
-SkGroupClass::InitializeFlattenables();
+SkGroupClass::RegisterFlattenables();
~~~~
diff --git a/src/core/SkBlurMF.cpp b/src/core/SkBlurMF.cpp
index 61fe3f5..731ad2a 100644
--- a/src/core/SkBlurMF.cpp
+++ b/src/core/SkBlurMF.cpp
@@ -930,7 +930,7 @@
#endif // SK_SUPPORT_GPU
void sk_register_blur_maskfilter_createproc() {
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBlurMaskFilterImpl)
+ SK_REGISTER_FLATTENABLE(SkBlurMaskFilterImpl)
}
sk_sp<SkMaskFilter> SkMaskFilter::MakeBlur(SkBlurStyle style, SkScalar sigma, bool respectCTM) {
diff --git a/src/core/SkColorFilter.cpp b/src/core/SkColorFilter.cpp
index ffa2a00..aa579a5 100644
--- a/src/core/SkColorFilter.cpp
+++ b/src/core/SkColorFilter.cpp
@@ -274,8 +274,8 @@
#include "SkModeColorFilter.h"
-void SkColorFilter::InitializeFlattenables() {
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkComposeColorFilter)
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkModeColorFilter)
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkSRGBGammaColorFilter)
+void SkColorFilter::RegisterFlattenables() {
+ SK_REGISTER_FLATTENABLE(SkComposeColorFilter)
+ SK_REGISTER_FLATTENABLE(SkModeColorFilter)
+ SK_REGISTER_FLATTENABLE(SkSRGBGammaColorFilter)
}
diff --git a/src/core/SkFlattenable.cpp b/src/core/SkFlattenable.cpp
index 208c690..5980bda 100644
--- a/src/core/SkFlattenable.cpp
+++ b/src/core/SkFlattenable.cpp
@@ -89,7 +89,7 @@
}
SkFlattenable::Factory SkFlattenable::NameToFactory(const char name[]) {
- InitializeFlattenablesIfNeeded();
+ RegisterFlattenablesIfNeeded();
SkASSERT(std::is_sorted(gEntries, gEntries + gCount, EntryComparator()));
auto pair = std::equal_range(gEntries, gEntries + gCount, name, EntryComparator());
@@ -100,7 +100,7 @@
}
const char* SkFlattenable::FactoryToName(Factory fact) {
- InitializeFlattenablesIfNeeded();
+ RegisterFlattenablesIfNeeded();
const Entry* entries = gEntries;
for (int i = gCount - 1; i >= 0; --i) {
diff --git a/src/core/SkGlobalInitialization_core.cpp b/src/core/SkGlobalInitialization_core.cpp
index 6210e72..7145796 100644
--- a/src/core/SkGlobalInitialization_core.cpp
+++ b/src/core/SkGlobalInitialization_core.cpp
@@ -8,7 +8,7 @@
#include "SkFlattenable.h"
#include "SkOnce.h"
-void SkFlattenable::InitializeFlattenablesIfNeeded() {
+void SkFlattenable::RegisterFlattenablesIfNeeded() {
static SkOnce once;
once([]{
SkFlattenable::PrivateInitializer::InitEffects();
diff --git a/src/core/SkMaskFilter.cpp b/src/core/SkMaskFilter.cpp
index 3d49dfa..f374af9 100644
--- a/src/core/SkMaskFilter.cpp
+++ b/src/core/SkMaskFilter.cpp
@@ -706,10 +706,10 @@
return sk_sp<SkMaskFilter>(new SkMatrixMF(std::move(me), lm));
}
-void SkMaskFilter::InitializeFlattenables() {
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkMatrixMF)
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkComposeMF)
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkCombineMF)
+void SkMaskFilter::RegisterFlattenables() {
+ SK_REGISTER_FLATTENABLE(SkMatrixMF)
+ SK_REGISTER_FLATTENABLE(SkComposeMF)
+ SK_REGISTER_FLATTENABLE(SkCombineMF)
sk_register_blur_maskfilter_createproc();
#if SK_SUPPORT_GPU
gr_register_sdf_maskfilter_createproc();
diff --git a/src/core/SkNormalSource.cpp b/src/core/SkNormalSource.cpp
index 54f77f4..71c7fb3 100644
--- a/src/core/SkNormalSource.cpp
+++ b/src/core/SkNormalSource.cpp
@@ -12,8 +12,8 @@
// Generating vtable
SkNormalSource::~SkNormalSource() {}
-void SkNormalSource::InitializeFlattenables() {
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkNormalMapSourceImpl)
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkNormalFlatSourceImpl)
+void SkNormalSource::RegisterFlattenables() {
+ SK_REGISTER_FLATTENABLE(SkNormalMapSourceImpl)
+ SK_REGISTER_FLATTENABLE(SkNormalFlatSourceImpl)
}
diff --git a/src/core/SkNormalSource.h b/src/core/SkNormalSource.h
index 639c4c1..ed49553 100644
--- a/src/core/SkNormalSource.h
+++ b/src/core/SkNormalSource.h
@@ -76,7 +76,7 @@
return sk_sp<SkNormalSource>(static_cast<SkNormalSource*>(
SkFlattenable::Deserialize(GetFlattenableType(), data, size, procs).release()));
}
- static void InitializeFlattenables();
+ static void RegisterFlattenables();
};
#endif
diff --git a/src/core/SkPathEffect.cpp b/src/core/SkPathEffect.cpp
index 34ea247..cc8a3f4 100644
--- a/src/core/SkPathEffect.cpp
+++ b/src/core/SkPathEffect.cpp
@@ -197,7 +197,7 @@
return SkComposePathEffect::Make(std::move(outer), std::move(inner));
}
-void SkPathEffect::InitializeFlattenables() {
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkComposePathEffect)
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkSumPathEffect)
+void SkPathEffect::RegisterFlattenables() {
+ SK_REGISTER_FLATTENABLE(SkComposePathEffect)
+ SK_REGISTER_FLATTENABLE(SkSumPathEffect)
}
diff --git a/src/effects/SkHighContrastFilter.cpp b/src/effects/SkHighContrastFilter.cpp
index 9c02429..ed5ba19 100644
--- a/src/effects/SkHighContrastFilter.cpp
+++ b/src/effects/SkHighContrastFilter.cpp
@@ -151,8 +151,8 @@
return sk_make_sp<SkHighContrast_Filter>(config);
}
-void SkHighContrastFilter::InitializeFlattenables() {
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkHighContrast_Filter)
+void SkHighContrastFilter::RegisterFlattenables() {
+ SK_REGISTER_FLATTENABLE(SkHighContrast_Filter)
}
#if SK_SUPPORT_GPU
diff --git a/src/effects/SkOverdrawColorFilter.cpp b/src/effects/SkOverdrawColorFilter.cpp
index 8f1b333..230f274 100644
--- a/src/effects/SkOverdrawColorFilter.cpp
+++ b/src/effects/SkOverdrawColorFilter.cpp
@@ -83,8 +83,8 @@
return SkOverdrawColorFilter::Make(colors);
}
-void SkOverdrawColorFilter::InitializeFlattenables() {
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkOverdrawColorFilter)
+void SkOverdrawColorFilter::RegisterFlattenables() {
+ SK_REGISTER_FLATTENABLE(SkOverdrawColorFilter)
}
#if SK_SUPPORT_GPU
diff --git a/src/effects/SkShaderMaskFilter.cpp b/src/effects/SkShaderMaskFilter.cpp
index 48e9d2e..f294d35 100644
--- a/src/effects/SkShaderMaskFilter.cpp
+++ b/src/effects/SkShaderMaskFilter.cpp
@@ -128,6 +128,6 @@
return shader ? sk_sp<SkMaskFilter>(new SkShaderMF(std::move(shader))) : nullptr;
}
-void SkShaderMaskFilter::InitializeFlattenables() {
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkShaderMF)
+void SkShaderMaskFilter::RegisterFlattenables() {
+ SK_REGISTER_FLATTENABLE(SkShaderMF)
}
diff --git a/src/effects/SkTableColorFilter.cpp b/src/effects/SkTableColorFilter.cpp
index 619d738..a97c9bf 100644
--- a/src/effects/SkTableColorFilter.cpp
+++ b/src/effects/SkTableColorFilter.cpp
@@ -473,6 +473,6 @@
return sk_make_sp<SkTable_ColorFilter>(tableA, tableR, tableG, tableB);
}
-void SkTableColorFilter::InitializeFlattenables() {
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkTable_ColorFilter)
+void SkTableColorFilter::RegisterFlattenables() {
+ SK_REGISTER_FLATTENABLE(SkTable_ColorFilter)
}
diff --git a/src/effects/imagefilters/SkAlphaThresholdFilter.cpp b/src/effects/imagefilters/SkAlphaThresholdFilter.cpp
index b9bd42a..589c105 100644
--- a/src/effects/imagefilters/SkAlphaThresholdFilter.cpp
+++ b/src/effects/imagefilters/SkAlphaThresholdFilter.cpp
@@ -31,7 +31,7 @@
SkScalar outerThreshold, sk_sp<SkImageFilter> input,
const CropRect* cropRect = nullptr);
- friend void SkAlphaThresholdFilter::InitializeFlattenables();
+ friend void SkAlphaThresholdFilter::RegisterFlattenables();
protected:
void flatten(SkWriteBuffer&) const override;
@@ -56,8 +56,8 @@
typedef SkImageFilter INHERITED;
};
-void SkAlphaThresholdFilter::InitializeFlattenables() {
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkAlphaThresholdFilterImpl)
+void SkAlphaThresholdFilter::RegisterFlattenables() {
+ SK_REGISTER_FLATTENABLE(SkAlphaThresholdFilterImpl)
}
static SkScalar pin_0_1(SkScalar x) {
diff --git a/src/effects/imagefilters/SkArithmeticImageFilter.cpp b/src/effects/imagefilters/SkArithmeticImageFilter.cpp
index c58ff77..14fd17d 100644
--- a/src/effects/imagefilters/SkArithmeticImageFilter.cpp
+++ b/src/effects/imagefilters/SkArithmeticImageFilter.cpp
@@ -471,6 +471,6 @@
///////////////////////////////////////////////////////////////////////////////////////////////////
-void SkArithmeticImageFilter::InitializeFlattenables() {
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(ArithmeticImageFilterImpl)
+void SkArithmeticImageFilter::RegisterFlattenables() {
+ SK_REGISTER_FLATTENABLE(ArithmeticImageFilterImpl)
}
diff --git a/src/effects/imagefilters/SkBlurImageFilter.cpp b/src/effects/imagefilters/SkBlurImageFilter.cpp
index 15c7aa6..1037bdf 100644
--- a/src/effects/imagefilters/SkBlurImageFilter.cpp
+++ b/src/effects/imagefilters/SkBlurImageFilter.cpp
@@ -66,8 +66,8 @@
SkBlurImageFilter::TileMode fTileMode;
};
-void SkImageFilter::InitializeFlattenables() {
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBlurImageFilterImpl)
+void SkImageFilter::RegisterFlattenables() {
+ SK_REGISTER_FLATTENABLE(SkBlurImageFilterImpl)
}
///////////////////////////////////////////////////////////////////////////////
diff --git a/src/effects/imagefilters/SkLightingImageFilter.cpp b/src/effects/imagefilters/SkLightingImageFilter.cpp
index e105c58..dbe30c6 100644
--- a/src/effects/imagefilters/SkLightingImageFilter.cpp
+++ b/src/effects/imagefilters/SkLightingImageFilter.cpp
@@ -2189,7 +2189,7 @@
#endif
-void SkLightingImageFilter::InitializeFlattenables() {
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDiffuseLightingImageFilter)
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkSpecularLightingImageFilter)
+void SkLightingImageFilter::RegisterFlattenables() {
+ SK_REGISTER_FLATTENABLE(SkDiffuseLightingImageFilter)
+ SK_REGISTER_FLATTENABLE(SkSpecularLightingImageFilter)
}
diff --git a/src/effects/imagefilters/SkXfermodeImageFilter.cpp b/src/effects/imagefilters/SkXfermodeImageFilter.cpp
index 4be1d1c..9dad6c2 100644
--- a/src/effects/imagefilters/SkXfermodeImageFilter.cpp
+++ b/src/effects/imagefilters/SkXfermodeImageFilter.cpp
@@ -345,6 +345,6 @@
#endif
///////////////////////////////////////////////////////////////////////////////////////////////////
-void SkXfermodeImageFilter::InitializeFlattenables() {
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkXfermodeImageFilter_Base)
+void SkXfermodeImageFilter::RegisterFlattenables() {
+ SK_REGISTER_FLATTENABLE(SkXfermodeImageFilter_Base)
}
diff --git a/src/gpu/text/GrSDFMaskFilter.cpp b/src/gpu/text/GrSDFMaskFilter.cpp
index 78fd99e..e0425d4 100644
--- a/src/gpu/text/GrSDFMaskFilter.cpp
+++ b/src/gpu/text/GrSDFMaskFilter.cpp
@@ -87,7 +87,7 @@
}
void gr_register_sdf_maskfilter_createproc() {
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(GrSDFMaskFilterImpl)
+ SK_REGISTER_FLATTENABLE(GrSDFMaskFilterImpl)
}
///////////////////////////////////////////////////////////////////////////////
diff --git a/src/ports/SkGlobalInitialization_default.cpp b/src/ports/SkGlobalInitialization_default.cpp
index f5b5370..6cdc988 100644
--- a/src/ports/SkGlobalInitialization_default.cpp
+++ b/src/ports/SkGlobalInitialization_default.cpp
@@ -48,47 +48,47 @@
*/
void SkFlattenable::PrivateInitializer::InitEffects() {
// Shaders.
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkColor4Shader)
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkColorFilterShader)
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkColorShader)
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkComposeShader)
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkEmptyShader)
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLocalMatrixShader)
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkPictureShader)
- SkGradientShader::InitializeFlattenables();
- SkLightingShader::InitializeFlattenables();
- SkPerlinNoiseShader::InitializeFlattenables();
- SkShaderBase::InitializeFlattenables();
+ SK_REGISTER_FLATTENABLE(SkColor4Shader)
+ SK_REGISTER_FLATTENABLE(SkColorFilterShader)
+ SK_REGISTER_FLATTENABLE(SkColorShader)
+ SK_REGISTER_FLATTENABLE(SkComposeShader)
+ SK_REGISTER_FLATTENABLE(SkEmptyShader)
+ SK_REGISTER_FLATTENABLE(SkLocalMatrixShader)
+ SK_REGISTER_FLATTENABLE(SkPictureShader)
+ SkGradientShader::RegisterFlattenables();
+ SkLightingShader::RegisterFlattenables();
+ SkPerlinNoiseShader::RegisterFlattenables();
+ SkShaderBase::RegisterFlattenables();
// Color filters.
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkColorMatrixFilterRowMajor255)
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLumaColorFilter)
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkToSRGBColorFilter)
- SkColorFilter::InitializeFlattenables();
- SkHighContrastFilter::InitializeFlattenables();
- SkOverdrawColorFilter::InitializeFlattenables();
- SkTableColorFilter::InitializeFlattenables();
+ SK_REGISTER_FLATTENABLE(SkColorMatrixFilterRowMajor255)
+ SK_REGISTER_FLATTENABLE(SkLumaColorFilter)
+ SK_REGISTER_FLATTENABLE(SkToSRGBColorFilter)
+ SkColorFilter::RegisterFlattenables();
+ SkHighContrastFilter::RegisterFlattenables();
+ SkOverdrawColorFilter::RegisterFlattenables();
+ SkTableColorFilter::RegisterFlattenables();
// Mask filters.
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkEmbossMaskFilter)
- SkMaskFilter::InitializeFlattenables();
- SkShaderMaskFilter::InitializeFlattenables();
+ SK_REGISTER_FLATTENABLE(SkEmbossMaskFilter)
+ SkMaskFilter::RegisterFlattenables();
+ SkShaderMaskFilter::RegisterFlattenables();
// Path effects.
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkCornerPathEffect)
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDashImpl)
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDiscretePathEffect)
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLine2DPathEffect)
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkMatrixPE)
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkOpPE)
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkPath1DPathEffect)
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkPath2DPathEffect)
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkStrokePE)
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkTrimPE)
- SkPathEffect::InitializeFlattenables();
+ SK_REGISTER_FLATTENABLE(SkCornerPathEffect)
+ SK_REGISTER_FLATTENABLE(SkDashImpl)
+ SK_REGISTER_FLATTENABLE(SkDiscretePathEffect)
+ SK_REGISTER_FLATTENABLE(SkLine2DPathEffect)
+ SK_REGISTER_FLATTENABLE(SkMatrixPE)
+ SK_REGISTER_FLATTENABLE(SkOpPE)
+ SK_REGISTER_FLATTENABLE(SkPath1DPathEffect)
+ SK_REGISTER_FLATTENABLE(SkPath2DPathEffect)
+ SK_REGISTER_FLATTENABLE(SkStrokePE)
+ SK_REGISTER_FLATTENABLE(SkTrimPE)
+ SkPathEffect::RegisterFlattenables();
// Misc.
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLayerDrawLooper)
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkRecordedDrawable)
- SkNormalSource::InitializeFlattenables();
+ SK_REGISTER_FLATTENABLE(SkLayerDrawLooper)
+ SK_REGISTER_FLATTENABLE(SkRecordedDrawable)
+ SkNormalSource::RegisterFlattenables();
}
diff --git a/src/ports/SkGlobalInitialization_default_imagefilters.cpp b/src/ports/SkGlobalInitialization_default_imagefilters.cpp
index fd5f98e..df55414 100644
--- a/src/ports/SkGlobalInitialization_default_imagefilters.cpp
+++ b/src/ports/SkGlobalInitialization_default_imagefilters.cpp
@@ -34,25 +34,25 @@
* or modify/replace this file as needed.
*/
void SkFlattenable::PrivateInitializer::InitImageFilters() {
- SkAlphaThresholdFilter::InitializeFlattenables();
- SkImageFilter::InitializeFlattenables();
- SkArithmeticImageFilter::InitializeFlattenables();
- SkXfermodeImageFilter::InitializeFlattenables();
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDilateImageFilter)
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDisplacementMapEffect)
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDropShadowImageFilter)
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkErodeImageFilter)
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkImageSource)
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLocalMatrixImageFilter)
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkPaintImageFilter)
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkPictureImageFilter)
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkTileImageFilter)
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkMagnifierImageFilter)
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkMatrixConvolutionImageFilter)
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkMatrixImageFilter)
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkOffsetImageFilter)
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkComposeImageFilter)
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkMergeImageFilter)
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkColorFilterImageFilter)
- SkLightingImageFilter::InitializeFlattenables();
+ SkAlphaThresholdFilter::RegisterFlattenables();
+ SkImageFilter::RegisterFlattenables();
+ SkArithmeticImageFilter::RegisterFlattenables();
+ SkXfermodeImageFilter::RegisterFlattenables();
+ SK_REGISTER_FLATTENABLE(SkDilateImageFilter)
+ SK_REGISTER_FLATTENABLE(SkDisplacementMapEffect)
+ SK_REGISTER_FLATTENABLE(SkDropShadowImageFilter)
+ SK_REGISTER_FLATTENABLE(SkErodeImageFilter)
+ SK_REGISTER_FLATTENABLE(SkImageSource)
+ SK_REGISTER_FLATTENABLE(SkLocalMatrixImageFilter)
+ SK_REGISTER_FLATTENABLE(SkPaintImageFilter)
+ SK_REGISTER_FLATTENABLE(SkPictureImageFilter)
+ SK_REGISTER_FLATTENABLE(SkTileImageFilter)
+ SK_REGISTER_FLATTENABLE(SkMagnifierImageFilter)
+ SK_REGISTER_FLATTENABLE(SkMatrixConvolutionImageFilter)
+ SK_REGISTER_FLATTENABLE(SkMatrixImageFilter)
+ SK_REGISTER_FLATTENABLE(SkOffsetImageFilter)
+ SK_REGISTER_FLATTENABLE(SkComposeImageFilter)
+ SK_REGISTER_FLATTENABLE(SkMergeImageFilter)
+ SK_REGISTER_FLATTENABLE(SkColorFilterImageFilter)
+ SkLightingImageFilter::RegisterFlattenables();
}
diff --git a/src/shaders/SkImageShader.cpp b/src/shaders/SkImageShader.cpp
index 83aea26..07b837e 100644
--- a/src/shaders/SkImageShader.cpp
+++ b/src/shaders/SkImageShader.cpp
@@ -239,8 +239,8 @@
tmx, tmy, localMatrix);
}
-void SkShaderBase::InitializeFlattenables() {
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkImageShader)
+void SkShaderBase::RegisterFlattenables() {
+ SK_REGISTER_FLATTENABLE(SkImageShader)
}
bool SkImageShader::onAppendStages(const StageRec& rec) const {
diff --git a/src/shaders/SkLightingShader.cpp b/src/shaders/SkLightingShader.cpp
index ee09dc9..d6ddb20 100644
--- a/src/shaders/SkLightingShader.cpp
+++ b/src/shaders/SkLightingShader.cpp
@@ -496,6 +496,6 @@
///////////////////////////////////////////////////////////////////////////////
-void SkLightingShader::InitializeFlattenables() {
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLightingShaderImpl)
+void SkLightingShader::RegisterFlattenables() {
+ SK_REGISTER_FLATTENABLE(SkLightingShaderImpl)
}
diff --git a/src/shaders/SkLightingShader.h b/src/shaders/SkLightingShader.h
index 3350bc1..7a68fac 100644
--- a/src/shaders/SkLightingShader.h
+++ b/src/shaders/SkLightingShader.h
@@ -33,7 +33,7 @@
static sk_sp<SkShader> Make(sk_sp<SkShader> diffuseShader, sk_sp<SkNormalSource> normalSource,
sk_sp<SkLights> lights);
- static void InitializeFlattenables();
+ static void RegisterFlattenables();
};
#endif
diff --git a/src/shaders/SkPerlinNoiseShader.cpp b/src/shaders/SkPerlinNoiseShader.cpp
index 86879f3..6143669 100644
--- a/src/shaders/SkPerlinNoiseShader.cpp
+++ b/src/shaders/SkPerlinNoiseShader.cpp
@@ -1537,6 +1537,6 @@
nullptr));
}
-void SkPerlinNoiseShader::InitializeFlattenables() {
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkPerlinNoiseShaderImpl)
+void SkPerlinNoiseShader::RegisterFlattenables() {
+ SK_REGISTER_FLATTENABLE(SkPerlinNoiseShaderImpl)
}
diff --git a/src/shaders/SkShaderBase.h b/src/shaders/SkShaderBase.h
index 03e3b55..c53f87b 100644
--- a/src/shaders/SkShaderBase.h
+++ b/src/shaders/SkShaderBase.h
@@ -207,7 +207,7 @@
return sk_sp<SkShaderBase>(static_cast<SkShaderBase*>(
SkFlattenable::Deserialize(GetFlattenableType(), data, size, procs).release()));
}
- static void InitializeFlattenables();
+ static void RegisterFlattenables();
protected:
SkShaderBase(const SkMatrix* localMatrix = nullptr);
diff --git a/src/shaders/gradients/SkGradientShader.cpp b/src/shaders/gradients/SkGradientShader.cpp
index a549fcd..4debbf6 100644
--- a/src/shaders/gradients/SkGradientShader.cpp
+++ b/src/shaders/gradients/SkGradientShader.cpp
@@ -775,9 +775,9 @@
return sk_make_sp<SkSweepGradient>(SkPoint::Make(cx, cy), t0, t1, desc);
}
-void SkGradientShader::InitializeFlattenables() {
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLinearGradient)
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkRadialGradient)
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkSweepGradient)
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkTwoPointConicalGradient)
+void SkGradientShader::RegisterFlattenables() {
+ SK_REGISTER_FLATTENABLE(SkLinearGradient)
+ SK_REGISTER_FLATTENABLE(SkRadialGradient)
+ SK_REGISTER_FLATTENABLE(SkSweepGradient)
+ SK_REGISTER_FLATTENABLE(SkTwoPointConicalGradient)
}
diff --git a/tests/FlattenDrawableTest.cpp b/tests/FlattenDrawableTest.cpp
index 3745637..5054313 100644
--- a/tests/FlattenDrawableTest.cpp
+++ b/tests/FlattenDrawableTest.cpp
@@ -199,10 +199,10 @@
// Register these drawables for deserialization some time before main().
static struct Initializer {
Initializer() {
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(IntDrawable)
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(PaintDrawable)
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(CompoundDrawable)
- SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(RootDrawable)
+ SK_REGISTER_FLATTENABLE(IntDrawable)
+ SK_REGISTER_FLATTENABLE(PaintDrawable)
+ SK_REGISTER_FLATTENABLE(CompoundDrawable)
+ SK_REGISTER_FLATTENABLE(RootDrawable)
}
} initializer;