| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "ui/gfx/platform_font_mac.h" | 5 #include "ui/gfx/platform_font_mac.h" |
| 6 | 6 |
| 7 #include <cmath> | 7 #include <cmath> |
| 8 | 8 |
| 9 #include <Cocoa/Cocoa.h> | 9 #include <Cocoa/Cocoa.h> |
| 10 | 10 |
| 11 #include "base/basictypes.h" | |
| 12 #include "base/mac/scoped_nsobject.h" | 11 #include "base/mac/scoped_nsobject.h" |
| 13 #include "base/strings/sys_string_conversions.h" | 12 #include "base/strings/sys_string_conversions.h" |
| 14 #include "base/strings/utf_string_conversions.h" | 13 #include "base/strings/utf_string_conversions.h" |
| 15 #include "ui/gfx/canvas.h" | 14 #include "ui/gfx/canvas.h" |
| 16 #include "ui/gfx/font.h" | 15 #include "ui/gfx/font.h" |
| 17 #include "ui/gfx/font_render_params.h" | 16 #include "ui/gfx/font_render_params.h" |
| 18 | 17 |
| 19 namespace gfx { | 18 namespace gfx { |
| 20 | 19 |
| 21 namespace { | 20 namespace { |
| (...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 203 return new PlatformFontMac(native_font); | 202 return new PlatformFontMac(native_font); |
| 204 } | 203 } |
| 205 | 204 |
| 206 // static | 205 // static |
| 207 PlatformFont* PlatformFont::CreateFromNameAndSize(const std::string& font_name, | 206 PlatformFont* PlatformFont::CreateFromNameAndSize(const std::string& font_name, |
| 208 int font_size) { | 207 int font_size) { |
| 209 return new PlatformFontMac(font_name, font_size); | 208 return new PlatformFontMac(font_name, font_size); |
| 210 } | 209 } |
| 211 | 210 |
| 212 } // namespace gfx | 211 } // namespace gfx |
| OLD | NEW |