Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(472)

Side by Side Diff: src/animator/SkDrawText.h

Issue 1037793002: C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla} (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: git cl web Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « src/animator/SkDrawShader.h ('k') | src/animator/SkDrawTextBox.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 bool draw(SkAnimateMaker& ) SK_OVERRIDE; 20 bool draw(SkAnimateMaker& ) override;
21 #ifdef SK_DUMP_ENABLED 21 #ifdef SK_DUMP_ENABLED
22 void dump(SkAnimateMaker* ) SK_OVERRIDE; 22 void dump(SkAnimateMaker* ) override;
23 #endif 23 #endif
24 bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE; 24 bool getProperty(int index, SkScriptValue* value) const 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
OLDNEW
« no previous file with comments | « src/animator/SkDrawShader.h ('k') | src/animator/SkDrawTextBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698