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

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

Issue 282203004: Remove SK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS flag. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Remove default parameters in constructors. Created 6 years, 7 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/SkColorMatrixFilter.h ('k') | include/effects/SkCornerPathEffect.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 return SkNEW_ARGS(SkComposeImageFilter, (outer, inner));
19 } 19 }
20 20
21 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkComposeImageFilter) 21 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkComposeImageFilter)
22 22
23 protected: 23 protected:
24 SkComposeImageFilter(SkImageFilter* outer, SkImageFilter* inner) : INHERITED (outer, inner) {}
24 explicit SkComposeImageFilter(SkReadBuffer& buffer); 25 explicit SkComposeImageFilter(SkReadBuffer& buffer);
25 26
26 virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, 27 virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
27 SkBitmap* result, SkIPoint* loc) const SK_OVERRID E; 28 SkBitmap* result, SkIPoint* loc) const SK_OVERRID E;
28 virtual bool onFilterBounds(const SkIRect&, const SkMatrix&, SkIRect*) const SK_OVERRIDE; 29 virtual bool onFilterBounds(const SkIRect&, const SkMatrix&, SkIRect*) const SK_OVERRIDE;
29 30
30 #ifdef SK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS
31 public:
32 #endif
33 SkComposeImageFilter(SkImageFilter* outer, SkImageFilter* inner) : INHERITED (outer, inner) {}
34
35 private: 31 private:
36 typedef SkImageFilter INHERITED; 32 typedef SkImageFilter INHERITED;
37 }; 33 };
38 34
39 #endif 35 #endif
OLDNEW
« no previous file with comments | « include/effects/SkColorMatrixFilter.h ('k') | include/effects/SkCornerPathEffect.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698