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

Side by Side Diff: gm/stroketext.cpp

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 | « gm/strokes.cpp ('k') | gm/surface.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 2014 Google Inc. 2 * Copyright 2014 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 #include "gm.h" 8 #include "gm.h"
9 #include "SkCanvas.h" 9 #include "SkCanvas.h"
10 #include "SkDashPathEffect.h" 10 #include "SkDashPathEffect.h"
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 // sides of this threshold. 65 // sides of this threshold.
66 enum { 66 enum {
67 kBelowThreshold_TextSize = 255, 67 kBelowThreshold_TextSize = 255,
68 kAboveThreshold_TextSize = 257 68 kAboveThreshold_TextSize = 257
69 }; 69 };
70 public: 70 public:
71 StrokeTextGM() {} 71 StrokeTextGM() {}
72 72
73 protected: 73 protected:
74 74
75 SkString onShortName() SK_OVERRIDE { 75 SkString onShortName() override {
76 return SkString("stroketext"); 76 return SkString("stroketext");
77 } 77 }
78 78
79 SkISize onISize() SK_OVERRIDE { 79 SkISize onISize() override {
80 return SkISize::Make(1200, 480); 80 return SkISize::Make(1200, 480);
81 } 81 }
82 82
83 void onDraw(SkCanvas* canvas) SK_OVERRIDE { 83 void onDraw(SkCanvas* canvas) override {
84 if (true) { test_nulldev(canvas); } 84 if (true) { test_nulldev(canvas); }
85 SkPaint paint; 85 SkPaint paint;
86 paint.setAntiAlias(true); 86 paint.setAntiAlias(true);
87 sk_tool_utils::set_portable_typeface(&paint); 87 sk_tool_utils::set_portable_typeface(&paint);
88 88
89 paint.setTextSize(kBelowThreshold_TextSize); 89 paint.setTextSize(kBelowThreshold_TextSize);
90 draw_text_set(canvas, paint); 90 draw_text_set(canvas, paint);
91 91
92 canvas->translate(600, 0); 92 canvas->translate(600, 0);
93 paint.setTextSize(kAboveThreshold_TextSize); 93 paint.setTextSize(kAboveThreshold_TextSize);
94 draw_text_set(canvas, paint); 94 draw_text_set(canvas, paint);
95 } 95 }
96 96
97 private: 97 private:
98 typedef skiagm::GM INHERITED; 98 typedef skiagm::GM INHERITED;
99 }; 99 };
100 100
101 DEF_GM( return SkNEW(StrokeTextGM); ) 101 DEF_GM( return SkNEW(StrokeTextGM); )
OLDNEW
« no previous file with comments | « gm/strokes.cpp ('k') | gm/surface.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698