commit b374d6a62c0259387d90cad74753d8bad9ee1bea
author bungeman <bungeman@google.com> Wed Sep 17 07:48:59 2014 -0700
committer Commit bot <commit-bot@chromium.org> Wed Sep 17 07:48:59 2014 -0700
tree fd558326c3254d6be22818cab97f18e3223669c2
parent 3850971d54b2e07cbf69e282d1455ea1dc3333b6

Add onGetFamilyName to SkTypeface.

This speeds up and documents this particular feature of SkTypeface
and also frees up SkFontDescriptor to be used only in serialization.

R=reed@google.com

Author: bungeman@google.com

Review URL: https://codereview.chromium.org/574873002

src/ports/SkTypeface_win_dw.cpp

diff --git a/src/ports/SkTypeface_win_dw.cpp b/src/ports/SkTypeface_win_dw.cpp
index 9c727e7..9c2b41d 100644
--- a/src/ports/SkTypeface_win_dw.cpp
+++ b/src/ports/SkTypeface_win_dw.cpp
@@ -12,6 +12,7 @@
 // not use GDI, undefing GetGlyphIndices makes things less confusing.
 #undef GetGlyphIndices
 
+#include "SkDWrite.h"
 #include "SkDWriteFontFileStream.h"
 #include "SkFontDescriptor.h"
 #include "SkFontStream.h"
@@ -24,20 +25,21 @@
 #include "SkTypeface_win_dw.h"
 #include "SkUtils.h"
 
+void DWriteFontTypeface::onGetFamilyName(SkString* familyName) const {
+    SkTScopedComPtr<IDWriteLocalizedStrings> familyNames;
+    HRV(fDWriteFontFamily->GetFamilyNames(&familyNames));
+
+    sk_get_locale_string(familyNames.get(), NULL/*fMgr->fLocaleName.get()*/, familyName);
+}
+
 void DWriteFontTypeface::onGetFontDescriptor(SkFontDescriptor* desc,
                                              bool* isLocalStream) const {
     // Get the family name.
     SkTScopedComPtr<IDWriteLocalizedStrings> familyNames;
     HRV(fDWriteFontFamily->GetFamilyNames(&familyNames));
 
-    UINT32 familyNamesLen;
-    HRV(familyNames->GetStringLength(0, &familyNamesLen));
-
-    SkSMallocWCHAR familyName(familyNamesLen+1);
-    HRV(familyNames->GetString(0, familyName.get(), familyNamesLen+1));
-
     SkString utf8FamilyName;
-    HRV(sk_wchar_to_skstring(familyName.get(), familyNamesLen, &utf8FamilyName));
+    sk_get_locale_string(familyNames.get(), NULL/*fMgr->fLocaleName.get()*/, &utf8FamilyName);
 
     desc->setFamilyName(utf8FamilyName.c_str());
     *isLocalStream = SkToBool(fDWriteFontFileLoader.get());