| 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/font.h" | 5 #include "ui/gfx/font.h" |
| 6 | 6 |
| 7 #include "base/strings/utf_string_conversions.h" | 7 #include "base/strings/utf_string_conversions.h" |
| 8 #include "build/build_config.h" |
| 8 #include "ui/gfx/platform_font.h" | 9 #include "ui/gfx/platform_font.h" |
| 9 | 10 |
| 10 namespace gfx { | 11 namespace gfx { |
| 11 | 12 |
| 12 //////////////////////////////////////////////////////////////////////////////// | 13 //////////////////////////////////////////////////////////////////////////////// |
| 13 // Font, public: | 14 // Font, public: |
| 14 | 15 |
| 15 Font::Font() : platform_font_(PlatformFont::CreateDefault()) { | 16 Font::Font() : platform_font_(PlatformFont::CreateDefault()) { |
| 16 } | 17 } |
| 17 | 18 |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 80 return platform_font_->GetFontRenderParams(); | 81 return platform_font_->GetFontRenderParams(); |
| 81 } | 82 } |
| 82 | 83 |
| 83 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_IOS) | 84 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_IOS) |
| 84 NativeFont Font::GetNativeFont() const { | 85 NativeFont Font::GetNativeFont() const { |
| 85 return platform_font_->GetNativeFont(); | 86 return platform_font_->GetNativeFont(); |
| 86 } | 87 } |
| 87 #endif | 88 #endif |
| 88 | 89 |
| 89 } // namespace gfx | 90 } // namespace gfx |
| OLD | NEW |