Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(783)

Side by Side Diff: include/effects/SkComposeImageFilter.h

Issue 376953003: Clean up SkImageFilter constructors. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Fixed 100-col issues 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:
View unified diff | Download patch
« no previous file with comments | « include/effects/SkColorFilterImageFilter.h ('k') | include/effects/SkDisplacementMapEffect.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2013 Google Inc. 2 * Copyright 2013 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #ifndef SkComposeImageFilter_DEFINED 8 #ifndef SkComposeImageFilter_DEFINED
9 #define SkComposeImageFilter_DEFINED 9 #define SkComposeImageFilter_DEFINED
10 10
11 #include "SkImageFilter.h" 11 #include "SkImageFilter.h"
12 12
13 class SK_API SkComposeImageFilter : public SkImageFilter { 13 class SK_API SkComposeImageFilter : public SkImageFilter {
14 public: 14 public:
15 virtual ~SkComposeImageFilter(); 15 virtual ~SkComposeImageFilter();
16 16
17 static SkComposeImageFilter* Create(SkImageFilter* outer, SkImageFilter* inn er) { 17 static SkComposeImageFilter* Create(SkImageFilter* outer, SkImageFilter* inn er) {
18 return SkNEW_ARGS(SkComposeImageFilter, (outer, inner)); 18 SkImageFilter* inputs[2] = { outer, inner };
19 return SkNEW_ARGS(SkComposeImageFilter, (inputs));
19 } 20 }
20 21
21 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkComposeImageFilter) 22 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkComposeImageFilter)
22 23
23 protected: 24 protected:
24 SkComposeImageFilter(SkImageFilter* outer, SkImageFilter* inner) : INHERITED (outer, inner) {} 25 explicit SkComposeImageFilter(SkImageFilter* inputs[2]) : INHERITED(2, input s) {}
25 explicit SkComposeImageFilter(SkReadBuffer& buffer); 26 explicit SkComposeImageFilter(SkReadBuffer& buffer);
26 27
27 virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, 28 virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
28 SkBitmap* result, SkIPoint* loc) const SK_OVERRID E; 29 SkBitmap* result, SkIPoint* loc) const SK_OVERRID E;
29 virtual bool onFilterBounds(const SkIRect&, const SkMatrix&, SkIRect*) const SK_OVERRIDE; 30 virtual bool onFilterBounds(const SkIRect&, const SkMatrix&, SkIRect*) const SK_OVERRIDE;
30 31
31 private: 32 private:
32 typedef SkImageFilter INHERITED; 33 typedef SkImageFilter INHERITED;
33 }; 34 };
34 35
35 #endif 36 #endif
OLDNEW
« no previous file with comments | « include/effects/SkColorFilterImageFilter.h ('k') | include/effects/SkDisplacementMapEffect.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698