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

Side by Side Diff: include/effects/SkXfermodeImageFilter.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/SkTransparentShader.h ('k') | include/images/SkImageRef_GlobalPool.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 The Android Open Source Project 2 * Copyright 2013 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 SkXfermodeImageFilter_DEFINED 8 #ifndef SkXfermodeImageFilter_DEFINED
9 #define SkXfermodeImageFilter_DEFINED 9 #define SkXfermodeImageFilter_DEFINED
10 10
11 #include "SkImageFilter.h" 11 #include "SkImageFilter.h"
12 12
13 class SkBitmap; 13 class SkBitmap;
14 class SkXfermode; 14 class SkXfermode;
15 15
16 class SK_API SkXfermodeImageFilter : public SkImageFilter { 16 class SK_API SkXfermodeImageFilter : public SkImageFilter {
17 /** 17 /**
18 * This filter takes an xfermode, and uses it to composite the foreground 18 * This filter takes an xfermode, and uses it to composite the foreground
19 * over the background. If foreground or background is NULL, the input 19 * over the background. If foreground or background is NULL, the input
20 * bitmap (src) is used instead. 20 * bitmap (src) is used instead.
21 */ 21 */
22 typedef SkImageFilter INHERITED;
22 23
23 public: 24 public:
24 SkXfermodeImageFilter(SkXfermode* mode, SkImageFilter* background, 25 SkXfermodeImageFilter(SkXfermode* mode, SkImageFilter* background,
25 SkImageFilter* foreground = NULL, const SkIRect* cropR ect = NULL); 26 SkImageFilter* foreground = NULL, const SkIRect* cropR ect = NULL);
26 27
27 virtual ~SkXfermodeImageFilter(); 28 virtual ~SkXfermodeImageFilter();
28 29
29 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkXfermodeImageFilter) 30 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkXfermodeImageFilter)
30 31
31 virtual bool onFilterImage(Proxy* proxy, 32 virtual bool onFilterImage(Proxy* proxy,
32 const SkBitmap& src, 33 const SkBitmap& src,
33 const SkMatrix& ctm, 34 const SkMatrix& ctm,
34 SkBitmap* dst, 35 SkBitmap* dst,
35 SkIPoint* offset) SK_OVERRIDE; 36 SkIPoint* offset) SK_OVERRIDE;
36 #if SK_SUPPORT_GPU 37 #if SK_SUPPORT_GPU
37 virtual bool canFilterImageGPU() const SK_OVERRIDE { return cropRect().isLar gest(); } 38 virtual bool canFilterImageGPU() const SK_OVERRIDE { return cropRect().isLar gest(); }
38 virtual bool filterImageGPU(Proxy* proxy, const SkBitmap& src, const SkMatri x& ctm, 39 virtual bool filterImageGPU(Proxy* proxy, const SkBitmap& src, const SkMatri x& ctm,
39 SkBitmap* result, SkIPoint* offset) SK_OVERRIDE; 40 SkBitmap* result, SkIPoint* offset) SK_OVERRIDE;
40 #endif 41 #endif
41 42
42 protected: 43 protected:
43 explicit SkXfermodeImageFilter(SkFlattenableReadBuffer& buffer); 44 explicit SkXfermodeImageFilter(SkFlattenableReadBuffer& buffer);
44 virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE; 45 virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
45 46
46 private: 47 private:
47 SkXfermode* fMode; 48 SkXfermode* fMode;
48 typedef SkImageFilter INHERITED;
49 }; 49 };
50 50
51 #endif 51 #endif
OLDNEW
« no previous file with comments | « include/effects/SkTransparentShader.h ('k') | include/images/SkImageRef_GlobalPool.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698