| 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 SkDrawText_DEFINED | 10 #ifndef SkDrawText_DEFINED | 
| 11 #define SkDrawText_DEFINED | 11 #define SkDrawText_DEFINED | 
| 12 | 12 | 
| 13 #include "SkBoundable.h" | 13 #include "SkBoundable.h" | 
| 14 #include "SkMemberInfo.h" | 14 #include "SkMemberInfo.h" | 
| 15 | 15 | 
| 16 class SkText : public SkBoundable { | 16 class SkText : public SkBoundable { | 
| 17     DECLARE_MEMBER_INFO(Text); | 17     DECLARE_MEMBER_INFO(Text); | 
| 18     SkText(); | 18     SkText(); | 
| 19     virtual ~SkText(); | 19     virtual ~SkText(); | 
| 20     virtual bool draw(SkAnimateMaker& ); | 20     virtual bool draw(SkAnimateMaker& ) SK_OVERRIDE; | 
| 21 #ifdef SK_DUMP_ENABLED | 21 #ifdef SK_DUMP_ENABLED | 
| 22     virtual void dump(SkAnimateMaker* ); | 22     virtual void dump(SkAnimateMaker* ) SK_OVERRIDE; | 
| 23 #endif | 23 #endif | 
| 24     virtual bool getProperty(int index, SkScriptValue* value) const ; | 24     virtual bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE; | 
| 25     const char* getText() { return text.c_str(); } | 25     const char* getText() { return text.c_str(); } | 
| 26     size_t getSize() { return text.size(); } | 26     size_t getSize() { return text.size(); } | 
| 27 protected: | 27 protected: | 
| 28     SkString text; | 28     SkString text; | 
| 29     SkScalar x; | 29     SkScalar x; | 
| 30     SkScalar y; | 30     SkScalar y; | 
| 31 private: | 31 private: | 
| 32     friend class SkTextToPath; | 32     friend class SkTextToPath; | 
| 33     typedef SkBoundable INHERITED; | 33     typedef SkBoundable INHERITED; | 
| 34 }; | 34 }; | 
| 35 | 35 | 
| 36 #endif // SkDrawText_DEFINED | 36 #endif // SkDrawText_DEFINED | 
| OLD | NEW | 
|---|