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_descriptor_mac.h" | 5 #include "content/common/font_descriptor_mac.h" |
6 | 6 |
7 #include <Cocoa/Cocoa.h> | 7 #include <Cocoa/Cocoa.h> |
8 | 8 |
9 #include "base/sys_string_conversions.h" | 9 #include "base/sys_string_conversions.h" |
10 | 10 |
11 FontDescriptor::FontDescriptor(NSFont* font) { | 11 FontDescriptor::FontDescriptor(NSFont* font) { |
12 font_name = base::SysNSStringToUTF16([font fontName]); | 12 font_name = base::SysNSStringToUTF16([font fontName]); |
13 font_point_size = [font pointSize]; | 13 font_point_size = [font pointSize]; |
14 } | 14 } |
15 | 15 |
16 NSFont* FontDescriptor::nsFont() const { | 16 FontDescriptor::FontDescriptor(string16 name, float size) { |
| 17 font_name = name; |
| 18 font_point_size = size; |
| 19 } |
| 20 |
| 21 NSFont* FontDescriptor::ToNSFont() const { |
17 NSString* font_name_ns = base::SysUTF16ToNSString(font_name); | 22 NSString* font_name_ns = base::SysUTF16ToNSString(font_name); |
18 NSFont* font = [NSFont fontWithName:font_name_ns size:font_point_size]; | 23 NSFont* font = [NSFont fontWithName:font_name_ns size:font_point_size]; |
19 return font; | 24 return font; |
20 } | 25 } |
OLD | NEW |