diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-03-18 13:16:26 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-20 15:55:39 +0100 |
| commit | 3f0f86b0caed75241fa71c95a5d73bc0164348c5 (patch) | |
| tree | 92b9fb00f2e9e90b0be2262093876d4f43b6cd13 /chromium/ui/gfx/font.cc | |
| parent | e90d7c4b152c56919d963987e2503f9909a666d2 (diff) | |
| download | qtwebengine-chromium-3f0f86b0caed75241fa71c95a5d73bc0164348c5.tar.gz | |
Update to new stable branch 1750
This also includes an updated ninja and chromium dependencies
needed on Windows.
Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'chromium/ui/gfx/font.cc')
| -rw-r--r-- | chromium/ui/gfx/font.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/chromium/ui/gfx/font.cc b/chromium/ui/gfx/font.cc index aa4638c7efc..9eea73b608a 100644 --- a/chromium/ui/gfx/font.cc +++ b/chromium/ui/gfx/font.cc @@ -54,6 +54,10 @@ int Font::GetBaseline() const { return platform_font_->GetBaseline(); } +int Font::GetCapHeight() const { + return platform_font_->GetCapHeight(); +} + int Font::GetAverageCharacterWidth() const { return platform_font_->GetAverageCharacterWidth(); } @@ -74,6 +78,10 @@ std::string Font::GetFontName() const { return platform_font_->GetFontName(); } +std::string Font::GetActualFontNameForTesting() const { + return platform_font_->GetActualFontNameForTesting(); +} + int Font::GetFontSize() const { return platform_font_->GetFontSize(); } |