| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "gfx/platform_font_mac.h" | 5 #include "gfx/platform_font_mac.h" |
| 6 | 6 |
| 7 #include <Cocoa/Cocoa.h> | 7 #include <Cocoa/Cocoa.h> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/basictypes.h" |
| 10 #include "base/scoped_nsobject.h" | 10 #include "base/scoped_nsobject.h" |
| 11 #include "base/sys_string_conversions.h" | 11 #include "base/sys_string_conversions.h" |
| 12 #include "gfx/canvas_skia.h" | 12 #include "gfx/canvas_skia.h" |
| 13 #include "gfx/font.h" | 13 #include "gfx/font.h" |
| 14 | 14 |
| 15 namespace gfx { | 15 namespace gfx { |
| 16 | 16 |
| 17 //////////////////////////////////////////////////////////////////////////////// | 17 //////////////////////////////////////////////////////////////////////////////// |
| 18 // PlatformFontMac, public: | 18 // PlatformFontMac, public: |
| 19 | 19 |
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 133 } | 133 } |
| 134 | 134 |
| 135 // static | 135 // static |
| 136 PlatformFont* PlatformFont::CreateFromNameAndSize(const std::wstring& font_name, | 136 PlatformFont* PlatformFont::CreateFromNameAndSize(const std::wstring& font_name, |
| 137 int font_size) { | 137 int font_size) { |
| 138 return new PlatformFontMac(font_name, font_size); | 138 return new PlatformFontMac(font_name, font_size); |
| 139 } | 139 } |
| 140 | 140 |
| 141 } // namespace gfx | 141 } // namespace gfx |
| 142 | 142 |
| OLD | NEW |