| 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 #ifndef SkDWrite_DEFINED | 8 #ifndef SkDWrite_DEFINED |
| 9 #define SkDWrite_DEFINED | 9 #define SkDWrite_DEFINED |
| 10 | 10 |
| 11 #include "SkFontStyle.h" |
| 11 #include "SkTemplates.h" | 12 #include "SkTemplates.h" |
| 12 #include "SkFontStyle.h" | |
| 13 | 13 |
| 14 #include <dwrite.h> | 14 #include <dwrite.h> |
| 15 #include <winsdkver.h> | 15 #include <winsdkver.h> |
| 16 | 16 |
| 17 class SkString; | 17 class SkString; |
| 18 | 18 |
| 19 //////////////////////////////////////////////////////////////////////////////// | 19 //////////////////////////////////////////////////////////////////////////////// |
| 20 // Factory | 20 // Factory |
| 21 | 21 |
| 22 #ifndef SK_HAS_DWRITE_1_H | 22 #ifndef SK_HAS_DWRITE_1_H |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 | 103 |
| 104 fWeight = (DWRITE_FONT_WEIGHT)pattern.weight(); | 104 fWeight = (DWRITE_FONT_WEIGHT)pattern.weight(); |
| 105 fWidth = (DWRITE_FONT_STRETCH)pattern.width(); | 105 fWidth = (DWRITE_FONT_STRETCH)pattern.width(); |
| 106 } | 106 } |
| 107 DWRITE_FONT_STYLE fSlant; | 107 DWRITE_FONT_STYLE fSlant; |
| 108 DWRITE_FONT_WEIGHT fWeight; | 108 DWRITE_FONT_WEIGHT fWeight; |
| 109 DWRITE_FONT_STRETCH fWidth; | 109 DWRITE_FONT_STRETCH fWidth; |
| 110 }; | 110 }; |
| 111 | 111 |
| 112 #endif | 112 #endif |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1272293004:
Move SkTemplates.h to private. (Closed)
Base URL: https://skia.googlesource.com/skia.git@master