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

Side by Side Diff: include/effects/SkMorphologyImageFilter.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/SkMergeImageFilter.h ('k') | include/effects/SkPerlinNoiseShader.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 The Android Open Source Project 2 * Copyright 2012 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 8
9 #ifndef SkMorphologyImageFilter_DEFINED 9 #ifndef SkMorphologyImageFilter_DEFINED
10 #define SkMorphologyImageFilter_DEFINED 10 #define SkMorphologyImageFilter_DEFINED
11 11
12 #include "SkImageFilter.h" 12 #include "SkImageFilter.h"
13 #include "SkSize.h" 13 #include "SkSize.h"
14 14
15 class SK_API SkMorphologyImageFilter : public SkImageFilter { 15 class SK_API SkMorphologyImageFilter : public SkImageFilter {
16 typedef SkImageFilter INHERITED;
17
16 public: 18 public:
17 SkMorphologyImageFilter(int radiusX, int radiusY, SkImageFilter* input, cons t SkIRect* cropRect); 19 SkMorphologyImageFilter(int radiusX, int radiusY, SkImageFilter* input, cons t SkIRect* cropRect);
18 20
19 protected: 21 protected:
20 SkMorphologyImageFilter(SkFlattenableReadBuffer& buffer); 22 SkMorphologyImageFilter(SkFlattenableReadBuffer& buffer);
21 virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE; 23 virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
22 #if SK_SUPPORT_GPU 24 #if SK_SUPPORT_GPU
23 virtual bool canFilterImageGPU() const SK_OVERRIDE { return true; } 25 virtual bool canFilterImageGPU() const SK_OVERRIDE { return true; }
24 #endif 26 #endif
25 27
26 SkISize radius() const { return fRadius; } 28 SkISize radius() const { return fRadius; }
27 29
28 private: 30 private:
29 SkISize fRadius; 31 SkISize fRadius;
30 typedef SkImageFilter INHERITED;
31 }; 32 };
32 33
33 class SK_API SkDilateImageFilter : public SkMorphologyImageFilter { 34 class SK_API SkDilateImageFilter : public SkMorphologyImageFilter {
35 typedef SkMorphologyImageFilter INHERITED;
36
34 public: 37 public:
35 SkDilateImageFilter(int radiusX, int radiusY, 38 SkDilateImageFilter(int radiusX, int radiusY,
36 SkImageFilter* input = NULL, 39 SkImageFilter* input = NULL,
37 const SkIRect* cropRect = NULL) 40 const SkIRect* cropRect = NULL)
38 : INHERITED(radiusX, radiusY, input, cropRect) {} 41 : INHERITED(radiusX, radiusY, input, cropRect) {}
39 42
40 virtual bool onFilterImage(Proxy*, const SkBitmap& src, const SkMatrix&, 43 virtual bool onFilterImage(Proxy*, const SkBitmap& src, const SkMatrix&,
41 SkBitmap* result, SkIPoint* offset) SK_OVERRIDE; 44 SkBitmap* result, SkIPoint* offset) SK_OVERRIDE;
42 #if SK_SUPPORT_GPU 45 #if SK_SUPPORT_GPU
43 virtual bool filterImageGPU(Proxy* proxy, const SkBitmap& src, const SkMatri x& ctm, 46 virtual bool filterImageGPU(Proxy* proxy, const SkBitmap& src, const SkMatri x& ctm,
44 SkBitmap* result, SkIPoint* offset) SK_OVERRIDE; 47 SkBitmap* result, SkIPoint* offset) SK_OVERRIDE;
45 #endif 48 #endif
46 49
47 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDilateImageFilter) 50 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDilateImageFilter)
48 51
49 protected: 52 protected:
50 SkDilateImageFilter(SkFlattenableReadBuffer& buffer) : INHERITED(buffer) {} 53 SkDilateImageFilter(SkFlattenableReadBuffer& buffer) : INHERITED(buffer) {}
51
52 private:
53 typedef SkMorphologyImageFilter INHERITED;
54 }; 54 };
55 55
56 class SK_API SkErodeImageFilter : public SkMorphologyImageFilter { 56 class SK_API SkErodeImageFilter : public SkMorphologyImageFilter {
57 typedef SkMorphologyImageFilter INHERITED;
58
57 public: 59 public:
58 SkErodeImageFilter(int radiusX, int radiusY, 60 SkErodeImageFilter(int radiusX, int radiusY,
59 SkImageFilter* input = NULL, 61 SkImageFilter* input = NULL,
60 const SkIRect* cropRect = NULL) 62 const SkIRect* cropRect = NULL)
61 : INHERITED(radiusX, radiusY, input, cropRect) {} 63 : INHERITED(radiusX, radiusY, input, cropRect) {}
62 64
63 virtual bool onFilterImage(Proxy*, const SkBitmap& src, const SkMatrix&, 65 virtual bool onFilterImage(Proxy*, const SkBitmap& src, const SkMatrix&,
64 SkBitmap* result, SkIPoint* offset) SK_OVERRIDE; 66 SkBitmap* result, SkIPoint* offset) SK_OVERRIDE;
65 #if SK_SUPPORT_GPU 67 #if SK_SUPPORT_GPU
66 virtual bool filterImageGPU(Proxy* proxy, const SkBitmap& src, const SkMatri x& ctm, 68 virtual bool filterImageGPU(Proxy* proxy, const SkBitmap& src, const SkMatri x& ctm,
67 SkBitmap* result, SkIPoint* offset) SK_OVERRIDE; 69 SkBitmap* result, SkIPoint* offset) SK_OVERRIDE;
68 #endif 70 #endif
69 71
70 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkErodeImageFilter) 72 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkErodeImageFilter)
71 73
72 protected: 74 protected:
73 SkErodeImageFilter(SkFlattenableReadBuffer& buffer) : INHERITED(buffer) {} 75 SkErodeImageFilter(SkFlattenableReadBuffer& buffer) : INHERITED(buffer) {}
74
75 private:
76 typedef SkMorphologyImageFilter INHERITED;
77 }; 76 };
78 77
79 #endif 78 #endif
OLDNEW
« no previous file with comments | « include/effects/SkMergeImageFilter.h ('k') | include/effects/SkPerlinNoiseShader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698