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

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

Issue 1037793002: C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla} (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: git cl web Created 5 years, 9 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 SkImageFilter* Create(SkImageFilter* outer, SkImageFilter* inner) { 17 static SkImageFilter* Create(SkImageFilter* outer, SkImageFilter* inner) {
18 if (NULL == outer) { 18 if (NULL == outer) {
19 return SkSafeRef(inner); 19 return SkSafeRef(inner);
20 } 20 }
21 if (NULL == inner) { 21 if (NULL == inner) {
22 return SkRef(outer); 22 return SkRef(outer);
23 } 23 }
24 SkImageFilter* inputs[2] = { outer, inner }; 24 SkImageFilter* inputs[2] = { outer, inner };
25 return SkNEW_ARGS(SkComposeImageFilter, (inputs)); 25 return SkNEW_ARGS(SkComposeImageFilter, (inputs));
26 } 26 }
27 void computeFastBounds(const SkRect& src, SkRect* dst) const SK_OVERRIDE; 27 void computeFastBounds(const SkRect& src, SkRect* dst) const override;
28 28
29 SK_TO_STRING_OVERRIDE() 29 SK_TO_STRING_OVERRIDE()
30 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkComposeImageFilter) 30 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkComposeImageFilter)
31 31
32 protected: 32 protected:
33 explicit SkComposeImageFilter(SkImageFilter* inputs[2]) : INHERITED(2, input s) { 33 explicit SkComposeImageFilter(SkImageFilter* inputs[2]) : INHERITED(2, input s) {
34 SkASSERT(inputs[0]); 34 SkASSERT(inputs[0]);
35 SkASSERT(inputs[1]); 35 SkASSERT(inputs[1]);
36 } 36 }
37 virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&, 37 virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
38 SkBitmap* result, SkIPoint* loc) const SK_OVERRID E; 38 SkBitmap* result, SkIPoint* loc) const override;
39 bool onFilterBounds(const SkIRect&, const SkMatrix&, SkIRect*) const SK_OVER RIDE; 39 bool onFilterBounds(const SkIRect&, const SkMatrix&, SkIRect*) const overrid e;
40 40
41 private: 41 private:
42 typedef SkImageFilter INHERITED; 42 typedef SkImageFilter INHERITED;
43 }; 43 };
44 44
45 #endif 45 #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