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

Side by Side Diff: gm/variedtext.cpp

Issue 1306443004: Use static_assert instead of SK_COMPILE_ASSERT. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 4 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/pixelsnap.cpp ('k') | include/core/SkImageInfo.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 * 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 "SkPath.h" 10 #include "SkPath.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 } 51 }
52 52
53 void onOnceBeforeDraw() override { 53 void onOnceBeforeDraw() override {
54 fPaint.setAntiAlias(true); 54 fPaint.setAntiAlias(true);
55 fPaint.setLCDRenderText(fLCD); 55 fPaint.setLCDRenderText(fLCD);
56 56
57 SkISize size = this->getISize(); 57 SkISize size = this->getISize();
58 SkScalar w = SkIntToScalar(size.fWidth); 58 SkScalar w = SkIntToScalar(size.fWidth);
59 SkScalar h = SkIntToScalar(size.fHeight); 59 SkScalar h = SkIntToScalar(size.fHeight);
60 60
61 SK_COMPILE_ASSERT(4 == SK_ARRAY_COUNT(fTypefacesToUnref), typeface_cnt); 61 static_assert(4 == SK_ARRAY_COUNT(fTypefacesToUnref), "typeface_cnt");
62 fTypefacesToUnref[0] = sk_tool_utils::create_portable_typeface("sans-ser if", SkTypeface::kNormal); 62 fTypefacesToUnref[0] = sk_tool_utils::create_portable_typeface("sans-ser if", SkTypeface::kNormal);
63 fTypefacesToUnref[1] = sk_tool_utils::create_portable_typeface("sans-ser if", SkTypeface::kBold); 63 fTypefacesToUnref[1] = sk_tool_utils::create_portable_typeface("sans-ser if", SkTypeface::kBold);
64 fTypefacesToUnref[2] = sk_tool_utils::create_portable_typeface("serif", SkTypeface::kNormal); 64 fTypefacesToUnref[2] = sk_tool_utils::create_portable_typeface("serif", SkTypeface::kNormal);
65 fTypefacesToUnref[3] = sk_tool_utils::create_portable_typeface("serif", SkTypeface::kBold); 65 fTypefacesToUnref[3] = sk_tool_utils::create_portable_typeface("serif", SkTypeface::kBold);
66 66
67 SkRandom random; 67 SkRandom random;
68 for (int i = 0; i < kCnt; ++i) { 68 for (int i = 0; i < kCnt; ++i) {
69 int length = random.nextRangeU(kMinLength, kMaxLength); 69 int length = random.nextRangeU(kMinLength, kMaxLength);
70 char text[kMaxLength]; 70 char text[kMaxLength];
71 for (int j = 0; j < length; ++j) { 71 for (int j = 0; j < length; ++j) {
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 SkPoint fPositions[kCnt]; 157 SkPoint fPositions[kCnt];
158 SkRect fClipRects[kCnt]; 158 SkRect fClipRects[kCnt];
159 159
160 typedef skiagm::GM INHERITED; 160 typedef skiagm::GM INHERITED;
161 }; 161 };
162 162
163 DEF_GM( return SkNEW(VariedTextGM(false, false)); ) 163 DEF_GM( return SkNEW(VariedTextGM(false, false)); )
164 DEF_GM( return SkNEW(VariedTextGM(true, false)); ) 164 DEF_GM( return SkNEW(VariedTextGM(true, false)); )
165 DEF_GM( return SkNEW(VariedTextGM(false, true)); ) 165 DEF_GM( return SkNEW(VariedTextGM(false, true)); )
166 DEF_GM( return SkNEW(VariedTextGM(true, true)); ) 166 DEF_GM( return SkNEW(VariedTextGM(true, true)); )
OLDNEW
« no previous file with comments | « gm/pixelsnap.cpp ('k') | include/core/SkImageInfo.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698