Simplify flattening to just write enough to call the factory/public-constructor for the class. We want to *not* rely on private constructors, and not rely on calling through the inheritance hierarchy for either flattening or unflattening(CreateProc).
Refactoring pattern:
1. guard the existing constructor(readbuffer) with the legacy build-flag
2. If you are a instancable subclass, implement CreateProc(readbuffer) to create a new instances from the buffer params (or return NULL).
If you're a shader subclass
1. You must read/write the local matrix if your class accepts that in its factory/constructor, else ignore it.
R=robertphillips@google.com, mtklein@google.com, senorblanco@google.com, senorblanco@chromium.org, sugoi@chromium.org
Author: reed@google.com
Review URL: https://codereview.chromium.org/395603002
diff --git a/gm/imagefiltersbase.cpp b/gm/imagefiltersbase.cpp
index bbcb7ce..5472f2d 100644
--- a/gm/imagefiltersbase.cpp
+++ b/gm/imagefiltersbase.cpp
@@ -23,24 +23,34 @@
}
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(FailImageFilter)
+
protected:
- FailImageFilter() : INHERITED(0, NULL) {}
+ FailImageFilter() : INHERITED(0, NULL) {
+ static bool gOnce;
+ if (!gOnce) {
+ gOnce = true;
+ SkFlattenable::Register("FailImageFilter", this->getFactory(),
+ this->GetFlattenableType());
+ }
+ }
+
virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE {
return false;
}
- FailImageFilter(SkReadBuffer& buffer)
- : INHERITED(0, buffer) {}
+#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
+ FailImageFilter(SkReadBuffer& buffer) : INHERITED(0, buffer) {}
+#endif
private:
typedef SkImageFilter INHERITED;
};
-// register the filter with the flattenable registry
-static SkFlattenable::Registrar gFailImageFilterReg("FailImageFilter",
- FailImageFilter::CreateProc,
- FailImageFilter::GetFlattenableType());
+SkFlattenable* FailImageFilter::CreateProc(SkReadBuffer& buffer) {
+ SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 0);
+ return FailImageFilter::Create();
+}
class IdentityImageFilter : public SkImageFilter {
public:
@@ -50,7 +60,15 @@
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(IdentityImageFilter)
protected:
- IdentityImageFilter(SkImageFilter* input) : INHERITED(1, &input) {}
+ IdentityImageFilter(SkImageFilter* input) : INHERITED(1, &input) {
+ static bool gOnce;
+ if (!gOnce) {
+ gOnce = true;
+ SkFlattenable::Register("IdentityImageFilter", this->getFactory(),
+ this->GetFlattenableType());
+ }
+ }
+
virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE {
*result = src;
@@ -58,18 +76,18 @@
return true;
}
- IdentityImageFilter(SkReadBuffer& buffer)
- : INHERITED(1, buffer) {}
+#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
+ IdentityImageFilter(SkReadBuffer& buffer) : INHERITED(1, buffer) {}
+#endif
private:
typedef SkImageFilter INHERITED;
};
-// register the filter with the flattenable registry
-static SkFlattenable::Registrar gIdentityImageFilterReg("IdentityImageFilter",
- IdentityImageFilter::CreateProc,
- IdentityImageFilter::GetFlattenableType());
-
+SkFlattenable* IdentityImageFilter::CreateProc(SkReadBuffer& buffer) {
+ SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 1);
+ return IdentityImageFilter::Create(common.getInput(0));
+}
///////////////////////////////////////////////////////////////////////////////