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

Unified Diff: include/core/SkColorShader.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « include/core/SkColorFilter.h ('k') | include/core/SkColorTable.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/core/SkColorShader.h
diff --git a/include/core/SkColorShader.h b/include/core/SkColorShader.h
index c3790682e4b06c527ff0d4f9dc489ec2e72394d4..8560880141f6d5c4439b53f3c3278e13e12d202a 100644
--- a/include/core/SkColorShader.h
+++ b/include/core/SkColorShader.h
@@ -18,6 +18,8 @@
actual shader object is needed, this provides that feature.
*/
class SK_API SkColorShader : public SkShader {
+ typedef SkShader INHERITED;
+
public:
/** Create a ColorShader that will inherit its color from the Paint
at draw time.
@@ -62,8 +64,6 @@ private:
uint32_t fFlags; // cached after setContext()
uint16_t fColor16; // cached after setContext()
SkBool8 fInheritColor;
-
- typedef SkShader INHERITED;
};
#endif
« no previous file with comments | « include/core/SkColorFilter.h ('k') | include/core/SkColorTable.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698