include/effects/SkComposeImageFilter.h - Issue 376953003: Clean up SkImageFilter constructors.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: include/effects/SkComposeImageFilter.h

Issue 376953003: Clean up SkImageFilter constructors. (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Fix deserializing constructor for SkRectShaderImageFilter Created 6 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: include/effects/SkComposeImageFilter.h

diff --git a/include/effects/SkComposeImageFilter.h b/include/effects/SkComposeImageFilter.h

index 32304b964636c6e6a250de96203490d6ea5b8121..068bcab7b86e16b06ebd348c3c88ec675f6130a2 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&,