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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « include/core/SkColorTable.h ('k') | include/core/SkData.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/core/SkComposeShader.h
diff --git a/include/core/SkComposeShader.h b/include/core/SkComposeShader.h
index 524161b785b1f5b2e03bfc1b861be82cca7c2d6e..4f6570ba9ca3b936f7de3f9d7d1dc851870013ee 100644
--- a/include/core/SkComposeShader.h
+++ b/include/core/SkComposeShader.h
@@ -21,6 +21,8 @@ class SkXfermode;
a xfermode.
*/
class SK_API SkComposeShader : public SkShader {
+ typedef SkShader INHERITED;
+
public:
/** Create a new compose shader, given shaders A, B, and a combining xfermode mode.
When the xfermode is called, it will be given the result from shader A as its
@@ -51,8 +53,6 @@ private:
SkShader* fShaderA;
SkShader* fShaderB;
SkXfermode* fMode;
-
- typedef SkShader INHERITED;
};
#endif
« 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