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

Side by Side Diff: gm/verttext.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/vertices.cpp ('k') | gm/verttext2.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 * Copyright 2011 Google Inc. 2 * Copyright 2011 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 8
9 #include "gm.h" 9 #include "gm.h"
10 #include "SkCanvas.h" 10 #include "SkCanvas.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 // : fFace(SkTypeface::CreateFromName("STIXGeneral", SkTypeface::kNormal )) 42 // : fFace(SkTypeface::CreateFromName("STIXGeneral", SkTypeface::kNormal ))
43 // : fFace(SkTypeface::CreateFromName("Yuppy SC", SkTypeface::kNormal)) 43 // : fFace(SkTypeface::CreateFromName("Yuppy SC", SkTypeface::kNormal))
44 // : fFace(SkTypeface::CreateFromName("Yuppy TC", SkTypeface::kNormal)) 44 // : fFace(SkTypeface::CreateFromName("Yuppy TC", SkTypeface::kNormal))
45 45
46 { 46 {
47 } 47 }
48 48
49 //SkAutoTUnref<SkTypeface> fFace; 49 //SkAutoTUnref<SkTypeface> fFace;
50 50
51 protected: 51 protected:
52 virtual uint32_t onGetFlags() const SK_OVERRIDE { 52 uint32_t onGetFlags() const SK_OVERRIDE {
53 return kSkipTiled_Flag; 53 return kSkipTiled_Flag;
54 } 54 }
55 55
56 SkString onShortName() SK_OVERRIDE { 56 SkString onShortName() SK_OVERRIDE {
57 return SkString("verttext"); 57 return SkString("verttext");
58 } 58 }
59 59
60 SkISize onISize() SK_OVERRIDE { return SkISize::Make(640, 480); } 60 SkISize onISize() SK_OVERRIDE { return SkISize::Make(640, 480); }
61 61
62 static void drawBaseline(SkCanvas* canvas, const SkPaint& paint, 62 static void drawBaseline(SkCanvas* canvas, const SkPaint& paint,
(...skipping 15 matching lines...) Expand all
78 canvas->drawCircle(x, y, SK_Scalar1 * 3 / 2, p); 78 canvas->drawCircle(x, y, SK_Scalar1 * 3 / 2, p);
79 if (paint.isVerticalText()) { 79 if (paint.isVerticalText()) {
80 y += adv[i]; 80 y += adv[i];
81 } else { 81 } else {
82 x += adv[i]; 82 x += adv[i];
83 } 83 }
84 } 84 }
85 canvas->drawCircle(x, y, SK_Scalar1 * 3 / 2, p); 85 canvas->drawCircle(x, y, SK_Scalar1 * 3 / 2, p);
86 } 86 }
87 87
88 virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { 88 void onDraw(SkCanvas* canvas) SK_OVERRIDE {
89 SkScalar x = SkIntToScalar(100); 89 SkScalar x = SkIntToScalar(100);
90 SkScalar y = SkIntToScalar(50); 90 SkScalar y = SkIntToScalar(50);
91 91
92 for (int i = 0; i < 4; ++i) { 92 for (int i = 0; i < 4; ++i) {
93 SkPaint paint; 93 SkPaint paint;
94 paint.setAntiAlias(true); 94 paint.setAntiAlias(true);
95 paint.setTextSize(SkIntToScalar(TEXT_SIZE)); 95 paint.setTextSize(SkIntToScalar(TEXT_SIZE));
96 //paint.setTypeface(fFace); 96 //paint.setTypeface(fFace);
97 //paint.setFakeBoldText(true); 97 //paint.setFakeBoldText(true);
98 98
(...skipping 15 matching lines...) Expand all
114 private: 114 private:
115 typedef GM INHERITED; 115 typedef GM INHERITED;
116 }; 116 };
117 117
118 /////////////////////////////////////////////////////////////////////////////// 118 ///////////////////////////////////////////////////////////////////////////////
119 119
120 static GM* MyFactory(void*) { return new VertTextGM; } 120 static GM* MyFactory(void*) { return new VertTextGM; }
121 static GMRegistry reg(MyFactory); 121 static GMRegistry reg(MyFactory);
122 122
123 } 123 }
OLDNEW
« no previous file with comments | « gm/vertices.cpp ('k') | gm/verttext2.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698