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

Unified Diff: include/core/SkXfermode.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/SkUnitMapper.h ('k') | include/effects/Sk1DPathEffect.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/core/SkXfermode.h
diff --git a/include/core/SkXfermode.h b/include/core/SkXfermode.h
index ef00f71b75ecb95bf4a900718efb79356e0a1b35..fb5d2cdfd83fae12e6d2d121d900902e2512314b 100644
--- a/include/core/SkXfermode.h
+++ b/include/core/SkXfermode.h
@@ -27,6 +27,8 @@ class SkString;
then objects drawn with that paint have the xfermode applied.
*/
class SK_API SkXfermode : public SkFlattenable {
+ typedef SkFlattenable INHERITED;
+
public:
SK_DECLARE_INST_COUNT(SkXfermode)
@@ -237,7 +239,6 @@ private:
enum {
kModeCount = kLastMode + 1
};
- typedef SkFlattenable INHERITED;
};
///////////////////////////////////////////////////////////////////////////////
@@ -248,6 +249,8 @@ private:
This class is not exported to java.
*/
class SkProcXfermode : public SkXfermode {
+ typedef SkXfermode INHERITED;
+
public:
SkProcXfermode(SkXfermodeProc proc) : fProc(proc) {}
@@ -273,8 +276,6 @@ protected:
private:
SkXfermodeProc fProc;
-
- typedef SkXfermode INHERITED;
};
#endif
« no previous file with comments | « include/core/SkUnitMapper.h ('k') | include/effects/Sk1DPathEffect.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698