Chromium Code Reviews| Index: include/core/SkColorFilter.h |
| diff --git a/include/core/SkColorFilter.h b/include/core/SkColorFilter.h |
| index 6359563d5180b6b35b0540fde43770fd79eb0779..f4faa23f591013f657c862e25db0c3de9b6cc5d8 100644 |
| --- a/include/core/SkColorFilter.h |
| +++ b/include/core/SkColorFilter.h |
| @@ -19,6 +19,7 @@ class GrEffectRef; |
| class GrContext; |
| class SK_API SkColorFilter : public SkFlattenable { |
| + typedef SkFlattenable INHERITED; |
| public: |
| SK_DECLARE_INST_COUNT(SkColorFilter) |
| @@ -123,12 +124,11 @@ public: |
| SkDEVCODE(virtual void toString(SkString* str) const = 0;) |
| SK_DECLARE_FLATTENABLE_REGISTRAR_GROUP() |
|
mtklein
2013/09/24 22:52:18
I think we're going to have to work on some of the
sugoi1
2013/09/25 21:15:27
You're right.
SK_DEFINE_FLATTENABLE_TYPE defines
|
| + SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_UTILS() |
| + SK_DEFINE_FLATTENABLE_TYPE(SkColorFilter) |
| protected: |
| SkColorFilter() {} |
| SkColorFilter(SkFlattenableReadBuffer& rb) : INHERITED(rb) {} |
| - |
| -private: |
| - typedef SkFlattenable INHERITED; |
| }; |
| #endif |