| OLD | NEW |
| 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 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 153 SkString fStrings[kCnt]; | 153 SkString fStrings[kCnt]; |
| 154 SkColor fColors[kCnt]; | 154 SkColor fColors[kCnt]; |
| 155 SkScalar fPtSizes[kCnt]; | 155 SkScalar fPtSizes[kCnt]; |
| 156 SkTypeface* fTypefaces[kCnt]; | 156 SkTypeface* fTypefaces[kCnt]; |
| 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 new VariedTextGM(false, false);) |
| 164 DEF_GM( return SkNEW(VariedTextGM(true, false)); ) | 164 DEF_GM(return new VariedTextGM(true, false);) |
| 165 DEF_GM( return SkNEW(VariedTextGM(false, true)); ) | 165 DEF_GM(return new VariedTextGM(false, true);) |
| 166 DEF_GM( return SkNEW(VariedTextGM(true, true)); ) | 166 DEF_GM(return new VariedTextGM(true, true);) |
| OLD | NEW |