| 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 "ui/gfx/platform_font.h" | 8 #include "ui/gfx/platform_font.h" |
| 9 | 9 |
| 10 namespace gfx { | 10 namespace gfx { |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 67 } | 67 } |
| 68 | 68 |
| 69 std::string Font::GetActualFontNameForTesting() const { | 69 std::string Font::GetActualFontNameForTesting() const { |
| 70 return platform_font_->GetActualFontNameForTesting(); | 70 return platform_font_->GetActualFontNameForTesting(); |
| 71 } | 71 } |
| 72 | 72 |
| 73 int Font::GetFontSize() const { | 73 int Font::GetFontSize() const { |
| 74 return platform_font_->GetFontSize(); | 74 return platform_font_->GetFontSize(); |
| 75 } | 75 } |
| 76 | 76 |
| 77 const FontRenderParams& Font::GetFontRenderParams() const { |
| 78 return platform_font_->GetFontRenderParams(); |
| 79 } |
| 80 |
| 77 NativeFont Font::GetNativeFont() const { | 81 NativeFont Font::GetNativeFont() const { |
| 78 return platform_font_->GetNativeFont(); | 82 return platform_font_->GetNativeFont(); |
| 79 } | 83 } |
| 80 | 84 |
| 81 } // namespace gfx | 85 } // namespace gfx |
| OLD | NEW |