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

Unified Diff: include/core/SkShader.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/SkRasterizer.h ('k') | include/core/SkUnitMapper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/core/SkShader.h
diff --git a/include/core/SkShader.h b/include/core/SkShader.h
index 74f611d3e53b2eabd84eb566ddd0059c71104020..b9979f258fa6c23f23ebc026456315658a94eeed 100644
--- a/include/core/SkShader.h
+++ b/include/core/SkShader.h
@@ -30,6 +30,8 @@ class GrEffectRef;
* to be modified.
*/
class SK_API SkShader : public SkFlattenable {
+ typedef SkFlattenable INHERITED;
+
public:
SK_DECLARE_INST_COUNT(SkShader)
@@ -372,7 +374,6 @@ private:
TileMode, TileMode,
void* storage, size_t storageSize);
friend class SkAutoBitmapShaderInstall;
- typedef SkFlattenable INHERITED;
};
#endif
« no previous file with comments | « include/core/SkRasterizer.h ('k') | include/core/SkUnitMapper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698