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

Side by Side Diff: src/animator/SkDrawTextBox.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/SkDrawText.h ('k') | src/animator/SkDrawTo.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 SkDrawTextBox_DEFINED 10 #ifndef SkDrawTextBox_DEFINED
11 #define SkDrawTextBox_DEFINED 11 #define SkDrawTextBox_DEFINED
12 12
13 #include "SkDrawRectangle.h" 13 #include "SkDrawRectangle.h"
14 #include "SkTextBox.h" 14 #include "SkTextBox.h"
15 15
16 class SkDrawTextBox : public SkDrawRect { 16 class SkDrawTextBox : public SkDrawRect {
17 DECLARE_DRAW_MEMBER_INFO(TextBox); 17 DECLARE_DRAW_MEMBER_INFO(TextBox);
18 SkDrawTextBox(); 18 SkDrawTextBox();
19 19
20 // overrides 20 // overrides
21 bool draw(SkAnimateMaker& ) SK_OVERRIDE; 21 bool draw(SkAnimateMaker& ) override;
22 #ifdef SK_DUMP_ENABLED 22 #ifdef SK_DUMP_ENABLED
23 void dump(SkAnimateMaker* ) SK_OVERRIDE; 23 void dump(SkAnimateMaker* ) override;
24 #endif 24 #endif
25 bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE; 25 bool getProperty(int index, SkScriptValue* value) const override;
26 bool setProperty(int index, SkScriptValue& ) SK_OVERRIDE; 26 bool setProperty(int index, SkScriptValue& ) override;
27 27
28 private: 28 private:
29 SkString fText; 29 SkString fText;
30 SkScalar fSpacingMul; 30 SkScalar fSpacingMul;
31 SkScalar fSpacingAdd; 31 SkScalar fSpacingAdd;
32 int /*SkTextBox::Mode*/ mode; 32 int /*SkTextBox::Mode*/ mode;
33 int /*SkTextBox::SpacingAlign*/ spacingAlign; 33 int /*SkTextBox::SpacingAlign*/ spacingAlign;
34 34
35 typedef SkDrawRect INHERITED; 35 typedef SkDrawRect INHERITED;
36 }; 36 };
37 37
38 #endif // SkDrawTextBox_DEFINED 38 #endif // SkDrawTextBox_DEFINED
OLDNEW
« no previous file with comments | « src/animator/SkDrawText.h ('k') | src/animator/SkDrawTo.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698