aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/effects/SkComposeImageFilter.h
diff options
context:
space:
mode:
authorGravatar senorblanco <senorblanco@chromium.org>2014-07-08 09:16:22 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2014-07-08 09:16:22 -0700
commit9ea3d57fde28a5fe4487a111dc3dd49418235e5e (patch)
tree652f666af14a4f916c46c2b4894973010d337f42 /include/effects/SkComposeImageFilter.h
parent6daadc7481b11655c77569eb0720fe037027cb30 (diff)
Clean up SkImageFilter constructors.
Now that all creation of SkImageFilters goes through factory Create() methods, there's no real reason for the convenience constructors. Some SkImageFilter subclasses which actually have zero DAG-able inputs were passing NULL to the superclass constructor. This actually means 1 input, with a NULL value, not zero inputs. This becomes more relevant for the upcoming cache infrastructure, where this indicates that the filter will use its src input, where in fact some of these filters do not (they are image generators only). Limiting SkImageFilter to a single constructor resolves this ambiguity. Along the way, I removed all of the default parameters to the constructors, since the Create methods always call them with the full argument list. BUG=skia: R=reed@google.com Author: senorblanco@chromium.org Review URL: https://codereview.chromium.org/376953003
Diffstat (limited to 'include/effects/SkComposeImageFilter.h')
-rw-r--r--include/effects/SkComposeImageFilter.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/effects/SkComposeImageFilter.h b/include/effects/SkComposeImageFilter.h
index 32304b9646..068bcab7b8 100644
--- a/include/effects/SkComposeImageFilter.h
+++ b/include/effects/SkComposeImageFilter.h
@@ -15,13 +15,14 @@ public:
virtual ~SkComposeImageFilter();
static SkComposeImageFilter* Create(SkImageFilter* outer, SkImageFilter* inner) {
- return SkNEW_ARGS(SkComposeImageFilter, (outer, inner));
+ SkImageFilter* inputs[2] = { outer, inner };
+ return SkNEW_ARGS(SkComposeImageFilter, (inputs));
}
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkComposeImageFilter)
protected:
- SkComposeImageFilter(SkImageFilter* outer, SkImageFilter* inner) : INHERITED(outer, inner) {}
+ explicit SkComposeImageFilter(SkImageFilter* inputs[2]) : INHERITED(2, inputs) {}
explicit SkComposeImageFilter(SkReadBuffer& buffer);
virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,