From 3f0f86b0caed75241fa71c95a5d73bc0164348c5 Mon Sep 17 00:00:00 2001
From: Andras Becsi <andras.becsi@digia.com>
Date: Tue, 18 Mar 2014 13:16:26 +0100
Subject: 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>
---
 chromium/ui/gfx/font.cc | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'chromium/ui/gfx/font.cc')

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();
 }
-- 
cgit v1.2.1