| 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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 51 } | 51 } |
| 52 | 52 |
| 53 int Font::GetBaseline() const { | 53 int Font::GetBaseline() const { |
| 54 return platform_font_->GetBaseline(); | 54 return platform_font_->GetBaseline(); |
| 55 } | 55 } |
| 56 | 56 |
| 57 int Font::GetCapHeight() const { | 57 int Font::GetCapHeight() const { |
| 58 return platform_font_->GetCapHeight(); | 58 return platform_font_->GetCapHeight(); |
| 59 } | 59 } |
| 60 | 60 |
| 61 int Font::GetAverageCharacterWidth() const { | 61 float Font::GetAverageCharacterWidth() const { |
| 62 return platform_font_->GetAverageCharacterWidth(); | 62 return platform_font_->GetAverageCharacterWidth(); |
| 63 } | 63 } |
| 64 | 64 |
| 65 int Font::GetStringWidth(const base::string16& text) const { | 65 float Font::GetStringWidth(const base::string16& text) const { |
| 66 return platform_font_->GetStringWidth(text); | 66 return platform_font_->GetStringWidth(text); |
| 67 } | 67 } |
| 68 | 68 |
| 69 int Font::GetExpectedTextWidth(int length) const { | 69 float Font::GetExpectedTextWidth(int length) const { |
| 70 return platform_font_->GetExpectedTextWidth(length); | 70 return platform_font_->GetExpectedTextWidth(length); |
| 71 } | 71 } |
| 72 | 72 |
| 73 int Font::GetStyle() const { | 73 int Font::GetStyle() const { |
| 74 return platform_font_->GetStyle(); | 74 return platform_font_->GetStyle(); |
| 75 } | 75 } |
| 76 | 76 |
| 77 std::string Font::GetFontName() const { | 77 std::string Font::GetFontName() const { |
| 78 return platform_font_->GetFontName(); | 78 return platform_font_->GetFontName(); |
| 79 } | 79 } |
| 80 | 80 |
| 81 int Font::GetFontSize() const { | 81 int Font::GetFontSize() const { |
| 82 return platform_font_->GetFontSize(); | 82 return platform_font_->GetFontSize(); |
| 83 } | 83 } |
| 84 | 84 |
| 85 NativeFont Font::GetNativeFont() const { | 85 NativeFont Font::GetNativeFont() const { |
| 86 return platform_font_->GetNativeFont(); | 86 return platform_font_->GetNativeFont(); |
| 87 } | 87 } |
| 88 | 88 |
| 89 } // namespace gfx | 89 } // namespace gfx |
| OLD | NEW |