| Index: include/core/SkShader.h
|
| diff --git a/include/core/SkShader.h b/include/core/SkShader.h
|
| index 74f611d3e53b2eabd84eb566ddd0059c71104020..93fd71a4f6ee845830f192f97e1efcbc1b3436cc 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)
|
|
|
| @@ -344,6 +346,8 @@ public:
|
|
|
| SkDEVCODE(virtual void toString(SkString* str) const;)
|
|
|
| + SK_DEFINE_FLATTENABLE_TYPE(SkShader)
|
| +
|
| protected:
|
| enum MatrixClass {
|
| kLinear_MatrixClass, // no perspective
|
| @@ -372,7 +376,6 @@ private:
|
| TileMode, TileMode,
|
| void* storage, size_t storageSize);
|
| friend class SkAutoBitmapShaderInstall;
|
| - typedef SkFlattenable INHERITED;
|
| };
|
|
|
| #endif
|
|
|