| OLD | NEW |
| 1 | 1 |
| 2 /* | 2 /* |
| 3 * Copyright 2006 The Android Open Source Project | 3 * Copyright 2006 The Android Open Source Project |
| 4 * | 4 * |
| 5 * Use of this source code is governed by a BSD-style license that can be | 5 * Use of this source code is governed by a BSD-style license that can be |
| 6 * found in the LICENSE file. | 6 * found in the LICENSE file. |
| 7 */ | 7 */ |
| 8 | 8 |
| 9 | 9 |
| 10 #ifndef SkAnimate_DEFINED | 10 #ifndef SkAnimate_DEFINED |
| 11 #define SkAnimate_DEFINED | 11 #define SkAnimate_DEFINED |
| 12 | 12 |
| 13 #include "SkAnimateBase.h" | 13 #include "SkAnimateBase.h" |
| 14 #include "SkDisplayType.h" | 14 #include "SkDisplayType.h" |
| 15 #include "SkIntArray.h" | 15 #include "SkIntArray.h" |
| 16 #include "SkUtils.h" | 16 #include "SkUtils.h" |
| 17 | 17 |
| 18 class SkAnimate : public SkAnimateBase { | 18 class SkAnimate : public SkAnimateBase { |
| 19 DECLARE_MEMBER_INFO(Animate); | 19 DECLARE_MEMBER_INFO(Animate); |
| 20 SkAnimate(); | 20 SkAnimate(); |
| 21 virtual ~SkAnimate(); | 21 virtual ~SkAnimate(); |
| 22 int components() SK_OVERRIDE; | 22 int components() override; |
| 23 #ifdef SK_DUMP_ENABLED | 23 #ifdef SK_DUMP_ENABLED |
| 24 void dump(SkAnimateMaker* ) SK_OVERRIDE; | 24 void dump(SkAnimateMaker* ) override; |
| 25 #endif | 25 #endif |
| 26 void onEndElement(SkAnimateMaker& maker) SK_OVERRIDE; | 26 void onEndElement(SkAnimateMaker& maker) override; |
| 27 protected: | 27 protected: |
| 28 bool resolveCommon(SkAnimateMaker& ); | 28 bool resolveCommon(SkAnimateMaker& ); |
| 29 int fComponents; | 29 int fComponents; |
| 30 private: | 30 private: |
| 31 typedef SkAnimateBase INHERITED; | 31 typedef SkAnimateBase INHERITED; |
| 32 }; | 32 }; |
| 33 | 33 |
| 34 #endif // SkAnimateField_DEFINED | 34 #endif // SkAnimateField_DEFINED |
| OLD | NEW |