Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/common/font_list.h" | 5 #include "content/common/font_list.h" |
| 6 | 6 |
| 7 #import <Cocoa/Cocoa.h> | 7 #import <Cocoa/Cocoa.h> |
| 8 | 8 |
| 9 #include "base/mac/scoped_nsautorelease_pool.h" | 9 #include "base/mac/scoped_nsautorelease_pool.h" |
| 10 #include "base/strings/sys_string_conversions.h" | 10 #include "base/strings/sys_string_conversions.h" |
| 11 #include "base/values.h" | 11 #include "base/values.h" |
| 12 | 12 |
| 13 namespace content { | 13 namespace content { |
| 14 | 14 |
| 15 std::unique_ptr<base::ListValue> GetFontList_SlowBlocking() { | 15 std::unique_ptr<base::ListValue> GetFontList_SlowBlocking() { |
| 16 base::mac::ScopedNSAutoreleasePool autorelease_pool; | 16 base::mac::ScopedNSAutoreleasePool autorelease_pool; |
| 17 std::unique_ptr<base::ListValue> font_list(new base::ListValue); | 17 std::unique_ptr<base::ListValue> font_list(new base::ListValue); |
| 18 NSFontManager* fontManager = [[[NSFontManager alloc] init] autorelease]; | 18 NSFontManager* fontManager = [[[NSFontManager alloc] init] autorelease]; |
| 19 NSMutableDictionary* fonts_dict = | |
| 20 [[[NSMutableDictionary alloc] init] autorelease]; | |
| 19 NSArray* fonts = [fontManager availableFontFamilies]; | 21 NSArray* fonts = [fontManager availableFontFamilies]; |
| 22 | |
| 20 for (NSString* family_name in fonts) { | 23 for (NSString* family_name in fonts) { |
| 21 NSString* localized_family_name = | 24 NSString* localized_family_name = |
| 22 [fontManager localizedNameForFamily:family_name face:nil]; | 25 [fontManager localizedNameForFamily:family_name face:nil]; |
| 26 fonts_dict[family_name] = localized_family_name; | |
| 27 } | |
| 28 | |
| 29 // Sort family names based on localized names. | |
| 30 NSArray* sortedFonts = | |
| 31 [fonts_dict keysSortedByValueUsingComparator:^(NSString* localized1, | |
| 32 NSString* localized2) { | |
| 33 return [localized1 compare:localized2 options:NSCaseInsensitiveSearch]; | |
|
Avi (use Gerrit)
2016/11/04 16:33:40
This isn't a localized sort, but rather a sort on
| |
| 34 }]; | |
| 35 | |
| 36 for (NSString* family_name in sortedFonts) { | |
| 37 NSString* localized_family_name = fonts_dict[family_name]; | |
| 23 base::ListValue* font_item = new base::ListValue(); | 38 base::ListValue* font_item = new base::ListValue(); |
| 24 base::string16 family = base::SysNSStringToUTF16(family_name); | 39 base::string16 family = base::SysNSStringToUTF16(family_name); |
| 40 base::string16 loc_family = base::SysNSStringToUTF16(localized_family_name); | |
| 25 font_item->Append(new base::StringValue(family)); | 41 font_item->Append(new base::StringValue(family)); |
| 26 base::string16 loc_family = base::SysNSStringToUTF16(localized_family_name); | |
| 27 font_item->Append(new base::StringValue(loc_family)); | 42 font_item->Append(new base::StringValue(loc_family)); |
| 28 font_list->Append(font_item); | 43 font_list->Append(font_item); |
| 29 } | 44 } |
| 45 | |
| 30 return font_list; | 46 return font_list; |
| 31 } | 47 } |
| 32 | 48 |
| 33 } // namespace content | 49 } // namespace content |
| OLD | NEW |