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

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

Issue 25430005: Fix for potential typedef issue Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years, 2 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 | Annotate | Revision Log
« no previous file with comments | « include/effects/SkRectShaderImageFilter.h ('k') | include/effects/SkTableMaskFilter.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 2012 Google Inc. 2 * Copyright 2012 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 SkStippleMaskFilter_DEFINED 8 #ifndef SkStippleMaskFilter_DEFINED
9 #define SkStippleMaskFilter_DEFINED 9 #define SkStippleMaskFilter_DEFINED
10 10
11 #include "SkMaskFilter.h" 11 #include "SkMaskFilter.h"
12 12
13 /** 13 /**
14 * Simple MaskFilter that creates a screen door stipple pattern. 14 * Simple MaskFilter that creates a screen door stipple pattern.
15 */ 15 */
16 class SK_API SkStippleMaskFilter : public SkMaskFilter { 16 class SK_API SkStippleMaskFilter : public SkMaskFilter {
17 typedef SkMaskFilter INHERITED;
18
17 public: 19 public:
18 SkStippleMaskFilter() : INHERITED() { 20 SkStippleMaskFilter() : INHERITED() {
19 } 21 }
20 22
21 virtual bool filterMask(SkMask* dst, const SkMask& src, 23 virtual bool filterMask(SkMask* dst, const SkMask& src,
22 const SkMatrix& matrix, 24 const SkMatrix& matrix,
23 SkIPoint* margin) const SK_OVERRIDE; 25 SkIPoint* margin) const SK_OVERRIDE;
24 26
25 // getFormat is from SkMaskFilter 27 // getFormat is from SkMaskFilter
26 virtual SkMask::Format getFormat() const SK_OVERRIDE { 28 virtual SkMask::Format getFormat() const SK_OVERRIDE {
27 return SkMask::kA8_Format; 29 return SkMask::kA8_Format;
28 } 30 }
29 31
30 SkDEVCODE(virtual void toString(SkString* str) const SK_OVERRIDE;) 32 SkDEVCODE(virtual void toString(SkString* str) const SK_OVERRIDE;)
31 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkStippleMaskFilter); 33 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkStippleMaskFilter);
32 34
33 protected: 35 protected:
34 SkStippleMaskFilter(SkFlattenableReadBuffer& buffer) 36 SkStippleMaskFilter(SkFlattenableReadBuffer& buffer)
35 : SkMaskFilter(buffer) { 37 : SkMaskFilter(buffer) {
36 } 38 }
37
38 private:
39 typedef SkMaskFilter INHERITED;
40 }; 39 };
41 40
42 #endif // SkStippleMaskFilter_DEFINED 41 #endif // SkStippleMaskFilter_DEFINED
OLDNEW
« no previous file with comments | « include/effects/SkRectShaderImageFilter.h ('k') | include/effects/SkTableMaskFilter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698