Index: src/core/SkXfermode.cpp |
diff --git a/src/core/SkXfermode.cpp b/src/core/SkXfermode.cpp |
index ac5cee4e3592954ba4b8c34e558652fba054934d..cdc6204e2fd8689dead6b3d7d8bf354b6096e511 100644 |
--- a/src/core/SkXfermode.cpp |
+++ b/src/core/SkXfermode.cpp |
@@ -1375,6 +1375,8 @@ GrEffectRef* XferEffect::TestCreate(SkRandom* rand, |
/////////////////////////////////////////////////////////////////////////////// |
class SkProcCoeffXfermode : public SkProcXfermode { |
+ typedef SkProcXfermode INHERITED; |
+ |
public: |
SkProcCoeffXfermode(const ProcCoeff& rec, Mode mode) |
: INHERITED(rec.fProc) { |
@@ -1448,8 +1450,6 @@ protected: |
private: |
Mode fMode; |
Coeff fSrcCoeff, fDstCoeff; |
- |
- typedef SkProcXfermode INHERITED; |
}; |
const char* SkXfermode::ModeName(Mode mode) { |
@@ -1495,6 +1495,8 @@ void SkProcCoeffXfermode::toString(SkString* str) const { |
/////////////////////////////////////////////////////////////////////////////// |
class SkClearXfermode : public SkProcCoeffXfermode { |
+ typedef SkProcCoeffXfermode INHERITED; |
+ |
public: |
SkClearXfermode(const ProcCoeff& rec) : SkProcCoeffXfermode(rec, kClear_Mode) {} |
@@ -1507,8 +1509,6 @@ public: |
private: |
SkClearXfermode(SkFlattenableReadBuffer& buffer) |
: SkProcCoeffXfermode(buffer) {} |
- |
- typedef SkProcCoeffXfermode INHERITED; |
}; |
void SkClearXfermode::xfer32(SkPMColor* SK_RESTRICT dst, |
@@ -1557,6 +1557,8 @@ void SkClearXfermode::toString(SkString* str) const { |
/////////////////////////////////////////////////////////////////////////////// |
class SkSrcXfermode : public SkProcCoeffXfermode { |
+ typedef SkProcCoeffXfermode INHERITED; |
+ |
public: |
SkSrcXfermode(const ProcCoeff& rec) : SkProcCoeffXfermode(rec, kSrc_Mode) {} |
@@ -1569,8 +1571,6 @@ public: |
private: |
SkSrcXfermode(SkFlattenableReadBuffer& buffer) |
: SkProcCoeffXfermode(buffer) {} |
- |
- typedef SkProcCoeffXfermode INHERITED; |
}; |
void SkSrcXfermode::xfer32(SkPMColor* SK_RESTRICT dst, |
@@ -1624,6 +1624,8 @@ void SkSrcXfermode::toString(SkString* str) const { |
/////////////////////////////////////////////////////////////////////////////// |
class SkDstInXfermode : public SkProcCoeffXfermode { |
+ typedef SkProcCoeffXfermode INHERITED; |
+ |
public: |
SkDstInXfermode(const ProcCoeff& rec) : SkProcCoeffXfermode(rec, kDstIn_Mode) {} |
@@ -1634,8 +1636,6 @@ public: |
private: |
SkDstInXfermode(SkFlattenableReadBuffer& buffer) : INHERITED(buffer) {} |
- |
- typedef SkProcCoeffXfermode INHERITED; |
}; |
void SkDstInXfermode::xfer32(SkPMColor* SK_RESTRICT dst, |
@@ -1667,6 +1667,8 @@ void SkDstInXfermode::toString(SkString* str) const { |
/////////////////////////////////////////////////////////////////////////////// |
class SkDstOutXfermode : public SkProcCoeffXfermode { |
+ typedef SkProcCoeffXfermode INHERITED; |
+ |
public: |
SkDstOutXfermode(const ProcCoeff& rec) : SkProcCoeffXfermode(rec, kDstOut_Mode) {} |
@@ -1678,8 +1680,6 @@ public: |
private: |
SkDstOutXfermode(SkFlattenableReadBuffer& buffer) |
: INHERITED(buffer) {} |
- |
- typedef SkProcCoeffXfermode INHERITED; |
}; |
void SkDstOutXfermode::xfer32(SkPMColor* SK_RESTRICT dst, |