| 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 SkDisplayAdd_DEFINED | 10 #ifndef SkDisplayAdd_DEFINED |
| (...skipping 28 matching lines...) Expand all Loading... |
| 39 SkADrawable* where; // if NULL, offset becomes index | 39 SkADrawable* where; // if NULL, offset becomes index |
| 40 // } A; | 40 // } A; |
| 41 private: | 41 private: |
| 42 typedef SkADrawable INHERITED; | 42 typedef SkADrawable INHERITED; |
| 43 }; | 43 }; |
| 44 | 44 |
| 45 class SkClear : public SkDisplayable { | 45 class SkClear : public SkDisplayable { |
| 46 virtual bool enable(SkAnimateMaker& ); | 46 virtual bool enable(SkAnimateMaker& ); |
| 47 }; | 47 }; |
| 48 | 48 |
| 49 class SkMove : public SkAdd { | 49 class SkRelocate : public SkAdd { |
| 50 DECLARE_MEMBER_INFO(Move); | 50 DECLARE_MEMBER_INFO(Relocate); |
| 51 private: | 51 private: |
| 52 typedef SkAdd INHERITED; | 52 typedef SkAdd INHERITED; |
| 53 }; | 53 }; |
| 54 | 54 |
| 55 class SkRemove : public SkAdd { | 55 class SkRemove : public SkAdd { |
| 56 DECLARE_MEMBER_INFO(Remove); | 56 DECLARE_MEMBER_INFO(Remove); |
| 57 SkRemove(); | 57 SkRemove(); |
| 58 protected: | 58 protected: |
| 59 SkBool fDelete; | 59 SkBool fDelete; |
| 60 private: | 60 private: |
| 61 friend class SkAdd; | 61 friend class SkAdd; |
| 62 typedef SkAdd INHERITED; | 62 typedef SkAdd INHERITED; |
| 63 }; | 63 }; |
| 64 | 64 |
| 65 class SkReplace : public SkAdd { | 65 class SkReplace : public SkAdd { |
| 66 DECLARE_MEMBER_INFO(Replace); | 66 DECLARE_MEMBER_INFO(Replace); |
| 67 private: | 67 private: |
| 68 typedef SkAdd INHERITED; | 68 typedef SkAdd INHERITED; |
| 69 }; | 69 }; |
| 70 | 70 |
| 71 #endif // SkDisplayAdd_DEFINED | 71 #endif // SkDisplayAdd_DEFINED |
| OLD | NEW |