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

Side by Side Diff: include/core/SkComposeShader.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/core/SkColorTable.h ('k') | include/core/SkData.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 /* 2 /*
3 * Copyright 2006 The Android Open Source Project 3 * Copyright 2006 The Android Open Source Project
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 8
9 9
10 #ifndef SkComposeShader_DEFINED 10 #ifndef SkComposeShader_DEFINED
11 #define SkComposeShader_DEFINED 11 #define SkComposeShader_DEFINED
12 12
13 #include "SkShader.h" 13 #include "SkShader.h"
14 14
15 class SkXfermode; 15 class SkXfermode;
16 16
17 //////////////////////////////////////////////////////////////////////////////// /////////// 17 //////////////////////////////////////////////////////////////////////////////// ///////////
18 18
19 /** \class SkComposeShader 19 /** \class SkComposeShader
20 This subclass of shader returns the coposition of two other shaders, combine d by 20 This subclass of shader returns the coposition of two other shaders, combine d by
21 a xfermode. 21 a xfermode.
22 */ 22 */
23 class SK_API SkComposeShader : public SkShader { 23 class SK_API SkComposeShader : public SkShader {
24 typedef SkShader INHERITED;
25
24 public: 26 public:
25 /** Create a new compose shader, given shaders A, B, and a combining xfermod e mode. 27 /** Create a new compose shader, given shaders A, B, and a combining xfermod e mode.
26 When the xfermode is called, it will be given the result from shader A a s its 28 When the xfermode is called, it will be given the result from shader A a s its
27 "dst", and the result of from shader B as its "src". 29 "dst", and the result of from shader B as its "src".
28 mode->xfer32(sA_result, sB_result, ...) 30 mode->xfer32(sA_result, sB_result, ...)
29 @param shaderA The colors from this shader are seen as the "dst" by the xfermode 31 @param shaderA The colors from this shader are seen as the "dst" by the xfermode
30 @param shaderB The colors from this shader are seen as the "src" by the xfermode 32 @param shaderB The colors from this shader are seen as the "src" by the xfermode
31 @param mode The xfermode that combines the colors from the two shade rs. If mode 33 @param mode The xfermode that combines the colors from the two shade rs. If mode
32 is null, then SRC_OVER is assumed. 34 is null, then SRC_OVER is assumed.
33 */ 35 */
(...skipping 10 matching lines...) Expand all
44 46
45 protected: 47 protected:
46 SkComposeShader(SkFlattenableReadBuffer& ); 48 SkComposeShader(SkFlattenableReadBuffer& );
47 virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE; 49 virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
48 50
49 private: 51 private:
50 52
51 SkShader* fShaderA; 53 SkShader* fShaderA;
52 SkShader* fShaderB; 54 SkShader* fShaderB;
53 SkXfermode* fMode; 55 SkXfermode* fMode;
54
55 typedef SkShader INHERITED;
56 }; 56 };
57 57
58 #endif 58 #endif
OLDNEW
« no previous file with comments | « include/core/SkColorTable.h ('k') | include/core/SkData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698