Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright 2011 Google Inc. | 2 * Copyright 2011 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 SkTypeface_win_DEFINED | 8 #ifndef SkTypeface_win_DEFINED |
| 9 #define SkTypeface_win_DEFINED | 9 #define SkTypeface_win_DEFINED |
| 10 | 10 |
| (...skipping 23 matching lines...) Expand all Loading... | |
| 34 * remotely (re)loaded. | 34 * remotely (re)loaded. |
| 35 */ | 35 */ |
| 36 SK_API void SkTypeface_SetEnsureLOGFONTAccessibleProc(void (*)(const LOGFONT&)); | 36 SK_API void SkTypeface_SetEnsureLOGFONTAccessibleProc(void (*)(const LOGFONT&)); |
| 37 | 37 |
| 38 // Experimental! | 38 // Experimental! |
| 39 // | 39 // |
| 40 class SkFontMgr; | 40 class SkFontMgr; |
| 41 class SkRemotableFontMgr; | 41 class SkRemotableFontMgr; |
| 42 struct IDWriteFactory; | 42 struct IDWriteFactory; |
| 43 struct IDWriteFontCollection; | 43 struct IDWriteFontCollection; |
| 44 struct IDWriteFontFallback; | |
| 44 | 45 |
| 45 SK_API SkFontMgr* SkFontMgr_New_GDI(); | 46 SK_API SkFontMgr* SkFontMgr_New_GDI(); |
| 46 SK_API SkFontMgr* SkFontMgr_New_DirectWrite(IDWriteFactory* factory = NULL, | 47 SK_API SkFontMgr* SkFontMgr_New_DirectWrite(IDWriteFactory* factory = NULL, |
|
reed1
2016/03/01 14:05:42
Nit: this function is getting too many default arg
Ilya Kulshin
2016/03/07 23:42:04
Reworked this patch so that the extra arg is no lo
| |
| 47 IDWriteFontCollection* collection = NULL); | 48 IDWriteFontCollection* collection = NULL, |
| 49 IDWriteFontFallback* fallback = NULL ); | |
| 48 | 50 |
| 49 /** | 51 /** |
| 50 * Creates an SkFontMgr which renders using DirectWrite and obtains its data | 52 * Creates an SkFontMgr which renders using DirectWrite and obtains its data |
| 51 * from the SkRemotableFontMgr. | 53 * from the SkRemotableFontMgr. |
| 52 * | 54 * |
| 53 * If DirectWrite could not be initialized, will return NULL. | 55 * If DirectWrite could not be initialized, will return NULL. |
| 54 */ | 56 */ |
| 55 SK_API SkFontMgr* SkFontMgr_New_DirectWriteRenderer(SkRemotableFontMgr*); | 57 SK_API SkFontMgr* SkFontMgr_New_DirectWriteRenderer(SkRemotableFontMgr*); |
| 56 | 58 |
| 57 /** | 59 /** |
| 58 * Creates an SkRemotableFontMgr backed by DirectWrite using the default | 60 * Creates an SkRemotableFontMgr backed by DirectWrite using the default |
| 59 * system font collection in the current locale. | 61 * system font collection in the current locale. |
| 60 * | 62 * |
| 61 * If DirectWrite could not be initialized, will return NULL. | 63 * If DirectWrite could not be initialized, will return NULL. |
| 62 */ | 64 */ |
| 63 SK_API SkRemotableFontMgr* SkRemotableFontMgr_New_DirectWrite(); | 65 SK_API SkRemotableFontMgr* SkRemotableFontMgr_New_DirectWrite(); |
| 64 | 66 |
| 65 #endif // SK_BUILD_FOR_WIN | 67 #endif // SK_BUILD_FOR_WIN |
| 66 #endif // SkTypeface_win_DEFINED | 68 #endif // SkTypeface_win_DEFINED |
| OLD | NEW |