| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2013 Google Inc. | 2 * Copyright 2013 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 "SkFontMgr.h" | 10 #include "SkFontMgr.h" |
| (...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 293 | 293 |
| 294 private: | 294 private: |
| 295 SkAutoTUnref<SkFontMgr> fFM; | 295 SkAutoTUnref<SkFontMgr> fFM; |
| 296 SkString fName; | 296 SkString fName; |
| 297 SkScalar fScaleX, fSkewX; | 297 SkScalar fScaleX, fSkewX; |
| 298 typedef GM INHERITED; | 298 typedef GM INHERITED; |
| 299 }; | 299 }; |
| 300 | 300 |
| 301 ////////////////////////////////////////////////////////////////////////////// | 301 ////////////////////////////////////////////////////////////////////////////// |
| 302 | 302 |
| 303 DEF_GM( return SkNEW(FontMgrGM); ) | 303 DEF_GM(return new FontMgrGM;) |
| 304 DEF_GM( return SkNEW(FontMgrMatchGM); ) | 304 DEF_GM(return new FontMgrMatchGM;) |
| 305 DEF_GM( return SkNEW(FontMgrBoundsGM(1.0, 0)); ) | 305 DEF_GM(return new FontMgrBoundsGM(1.0, 0);) |
| 306 DEF_GM( return SkNEW(FontMgrBoundsGM(0.75, 0)); ) | 306 DEF_GM(return new FontMgrBoundsGM(0.75, 0);) |
| 307 DEF_GM( return SkNEW(FontMgrBoundsGM(1.0, -0.25)); ) | 307 DEF_GM(return new FontMgrBoundsGM(1.0, -0.25);) |
| 308 | 308 |
| 309 #ifdef SK_BUILD_FOR_WIN | 309 #ifdef SK_BUILD_FOR_WIN |
| 310 DEF_GM( return SkNEW_ARGS(FontMgrGM, (SkFontMgr_New_DirectWrite())); ) | 310 DEF_GM(return new FontMgrGM(SkFontMgr_New_DirectWrite());) |
| 311 #endif | 311 #endif |
| OLD | NEW |