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 "SkDataTable.h" | 8 #include "SkDataTable.h" |
9 #include "SkDWrite.h" | 9 #include "SkDWrite.h" |
10 #include "SkDWriteFontFileStream.h" | 10 #include "SkDWriteFontFileStream.h" |
(...skipping 392 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
403 | 403 |
404 protected: | 404 protected: |
405 ULONG fRefCount; | 405 ULONG fRefCount; |
406 SkAutoTUnref<const SkRemotableFontMgr_DirectWrite> fOuter; | 406 SkAutoTUnref<const SkRemotableFontMgr_DirectWrite> fOuter; |
407 UINT32 fCharacter; | 407 UINT32 fCharacter; |
408 SkFontIdentity fIdentity; | 408 SkFontIdentity fIdentity; |
409 }; | 409 }; |
410 | 410 |
411 #ifdef SK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER | 411 #ifdef SK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER |
412 virtual SkFontIdentity matchNameStyleCharacter(const char familyName[], | 412 virtual SkFontIdentity matchNameStyleCharacter(const char familyName[], |
413 const SkFontStyle&, pattern | 413 const SkFontStyle& pattern, |
414 const char* bcp47[], int bcp4
7Count, | 414 const char* bcp47[], int bcp4
7Count, |
415 SkUnichar character) const SK
_OVERRIDE | 415 SkUnichar character) const SK
_OVERRIDE |
416 { | 416 { |
417 #else | 417 #else |
418 virtual SkFontIdentity matchNameStyleCharacter(const char familyName[], | 418 virtual SkFontIdentity matchNameStyleCharacter(const char familyName[], |
419 const SkFontStyle& pattern, | 419 const SkFontStyle& pattern, |
420 const char bcp47_val[], | 420 const char bcp47_val[], |
421 SkUnichar character) const SK
_OVERRIDE | 421 SkUnichar character) const SK
_OVERRIDE |
422 { | 422 { |
423 const char** bcp47 = &bcp47_val; | 423 const char** bcp47 = &bcp47_val; |
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
529 } else { | 529 } else { |
530 localeNameLen = getUserDefaultLocaleNameProc(localeNameStorage, LOCALE_N
AME_MAX_LENGTH); | 530 localeNameLen = getUserDefaultLocaleNameProc(localeNameStorage, LOCALE_N
AME_MAX_LENGTH); |
531 if (localeNameLen) { | 531 if (localeNameLen) { |
532 localeName = localeNameStorage; | 532 localeName = localeNameStorage; |
533 }; | 533 }; |
534 } | 534 } |
535 | 535 |
536 return SkNEW_ARGS(SkRemotableFontMgr_DirectWrite, (sysFontCollection.get(), | 536 return SkNEW_ARGS(SkRemotableFontMgr_DirectWrite, (sysFontCollection.get(), |
537 localeName, localeNameLen
)); | 537 localeName, localeNameLen
)); |
538 } | 538 } |
OLD | NEW |