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

Side by Side Diff: include/effects/SkComposeImageFilter.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/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 typedef SkImageFilter INHERITED;
15
14 public: 16 public:
15 SkComposeImageFilter(SkImageFilter* outer, SkImageFilter* inner) : INHERITED (outer, inner) {} 17 SkComposeImageFilter(SkImageFilter* outer, SkImageFilter* inner) : INHERITED (outer, inner) {}
16 virtual ~SkComposeImageFilter(); 18 virtual ~SkComposeImageFilter();
17 19
18 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkComposeImageFilter) 20 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkComposeImageFilter)
19 21
20 protected: 22 protected:
21 explicit SkComposeImageFilter(SkFlattenableReadBuffer& buffer); 23 explicit SkComposeImageFilter(SkFlattenableReadBuffer& buffer);
22 24
23 virtual bool onFilterImage(Proxy*, const SkBitmap& src, const SkMatrix&, 25 virtual bool onFilterImage(Proxy*, const SkBitmap& src, const SkMatrix&,
24 SkBitmap* result, SkIPoint* loc) SK_OVERRIDE; 26 SkBitmap* result, SkIPoint* loc) SK_OVERRIDE;
25 virtual bool onFilterBounds(const SkIRect&, const SkMatrix&, SkIRect*) SK_OV ERRIDE; 27 virtual bool onFilterBounds(const SkIRect&, const SkMatrix&, SkIRect*) SK_OV ERRIDE;
26
27 private:
28 typedef SkImageFilter INHERITED;
29 }; 28 };
30 29
31 #endif 30 #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