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

Side by Side Diff: include/effects/SkTableMaskFilter.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/SkRectShaderImageFilter.h ('k') | include/effects/SkTestImageFilters.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 2006 The Android Open Source Project 2 * Copyright 2006 The Android Open Source Project
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 SkTableMaskFilter_DEFINED 8 #ifndef SkTableMaskFilter_DEFINED
9 #define SkTableMaskFilter_DEFINED 9 #define SkTableMaskFilter_DEFINED
10 10
(...skipping 27 matching lines...) Expand all
38 MakeGammaTable(table, gamma); 38 MakeGammaTable(table, gamma);
39 return SkNEW_ARGS(SkTableMaskFilter, (table)); 39 return SkNEW_ARGS(SkTableMaskFilter, (table));
40 } 40 }
41 41
42 static SkTableMaskFilter* CreateClip(uint8_t min, uint8_t max) { 42 static SkTableMaskFilter* CreateClip(uint8_t min, uint8_t max) {
43 uint8_t table[256]; 43 uint8_t table[256];
44 MakeClipTable(table, min, max); 44 MakeClipTable(table, min, max);
45 return SkNEW_ARGS(SkTableMaskFilter, (table)); 45 return SkNEW_ARGS(SkTableMaskFilter, (table));
46 } 46 }
47 47
48 SkMask::Format getFormat() const SK_OVERRIDE; 48 SkMask::Format getFormat() const override;
49 virtual bool filterMask(SkMask*, const SkMask&, const SkMatrix&, 49 virtual bool filterMask(SkMask*, const SkMask&, const SkMatrix&,
50 SkIPoint*) const SK_OVERRIDE; 50 SkIPoint*) const override;
51 51
52 SK_TO_STRING_OVERRIDE() 52 SK_TO_STRING_OVERRIDE()
53 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkTableMaskFilter) 53 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkTableMaskFilter)
54 54
55 protected: 55 protected:
56 SkTableMaskFilter(); 56 SkTableMaskFilter();
57 explicit SkTableMaskFilter(const uint8_t table[256]); 57 explicit SkTableMaskFilter(const uint8_t table[256]);
58 void flatten(SkWriteBuffer&) const SK_OVERRIDE; 58 void flatten(SkWriteBuffer&) const override;
59 59
60 private: 60 private:
61 uint8_t fTable[256]; 61 uint8_t fTable[256];
62 62
63 typedef SkMaskFilter INHERITED; 63 typedef SkMaskFilter INHERITED;
64 }; 64 };
65 65
66 #endif 66 #endif
OLDNEW
« no previous file with comments | « include/effects/SkRectShaderImageFilter.h ('k') | include/effects/SkTestImageFilters.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698