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

Side by Side Diff: gm/verttext2.cpp

Issue 806653007: Fix up all the easy virtual ... SK_OVERRIDE cases. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: rebase Created 5 years, 11 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 | « gm/verttext.cpp ('k') | gm/verylargebitmap.cpp » ('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 2011 Google Inc. 3 * Copyright 2011 Google Inc.
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 /* Tests text vertical text rendering with different fonts and centering. 10 /* Tests text vertical text rendering with different fonts and centering.
(...skipping 13 matching lines...) Expand all
24 fProp = sk_tool_utils::create_portable_typeface("Helvetica", SkTypeface: :kNormal); 24 fProp = sk_tool_utils::create_portable_typeface("Helvetica", SkTypeface: :kNormal);
25 fMono = sk_tool_utils::create_portable_typeface("Courier New", SkTypefac e::kNormal); 25 fMono = sk_tool_utils::create_portable_typeface("Courier New", SkTypefac e::kNormal);
26 } 26 }
27 27
28 virtual ~VertText2GM() { 28 virtual ~VertText2GM() {
29 SkSafeUnref(fProp); 29 SkSafeUnref(fProp);
30 SkSafeUnref(fMono); 30 SkSafeUnref(fMono);
31 } 31 }
32 32
33 protected: 33 protected:
34 virtual uint32_t onGetFlags() const SK_OVERRIDE { 34 uint32_t onGetFlags() const SK_OVERRIDE {
35 return kSkipTiled_Flag; 35 return kSkipTiled_Flag;
36 } 36 }
37 37
38 38
39 SkString onShortName() SK_OVERRIDE { 39 SkString onShortName() SK_OVERRIDE {
40 return SkString("verttext2"); 40 return SkString("verttext2");
41 } 41 }
42 42
43 SkISize onISize() SK_OVERRIDE { return SkISize::Make(640, 480); } 43 SkISize onISize() SK_OVERRIDE { return SkISize::Make(640, 480); }
44 44
45 virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { 45 void onDraw(SkCanvas* canvas) SK_OVERRIDE {
46 for (int i = 0; i < 3; ++i) { 46 for (int i = 0; i < 3; ++i) {
47 SkPaint paint; 47 SkPaint paint;
48 paint.setColor(SK_ColorRED); 48 paint.setColor(SK_ColorRED);
49 paint.setAntiAlias(true); 49 paint.setAntiAlias(true);
50 y = textHeight; 50 y = textHeight;
51 canvas->drawLine(0, SkIntToScalar(10), 51 canvas->drawLine(0, SkIntToScalar(10),
52 SkIntToScalar(110), SkIntToScalar(10), paint); 52 SkIntToScalar(110), SkIntToScalar(10), paint);
53 canvas->drawLine(0, SkIntToScalar(240), 53 canvas->drawLine(0, SkIntToScalar(240),
54 SkIntToScalar(110), SkIntToScalar(240), paint); 54 SkIntToScalar(110), SkIntToScalar(240), paint);
55 canvas->drawLine(0, SkIntToScalar(470), 55 canvas->drawLine(0, SkIntToScalar(470),
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 SkTypeface* fProp; 92 SkTypeface* fProp;
93 SkTypeface* fMono; 93 SkTypeface* fMono;
94 }; 94 };
95 95
96 /////////////////////////////////////////////////////////////////////////////// 96 ///////////////////////////////////////////////////////////////////////////////
97 97
98 static GM* MyFactory(void*) { return new VertText2GM; } 98 static GM* MyFactory(void*) { return new VertText2GM; }
99 static GMRegistry reg(MyFactory); 99 static GMRegistry reg(MyFactory);
100 100
101 } 101 }
OLDNEW
« no previous file with comments | « gm/verttext.cpp ('k') | gm/verylargebitmap.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698