Fixes vertical alignment of RenderText.

ui/gfx/font_list_unittest.cc

Index: ui/gfx/font_list_unittest.cc
diff --git a/ui/gfx/font_list_unittest.cc b/ui/gfx/font_list_unittest.cc
index ed34a0d4dc8cfea7b2464d68e0397e09bdd6b439..a2a4eed025f1a6a44e2341bfbba612fdde87566b 100644
--- a/ui/gfx/font_list_unittest.cc
+++ b/ui/gfx/font_list_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "ui/gfx/font_list.h"
 
+#include <algorithm>
 #include <string>
 #include <vector>
 
@@ -232,4 +233,27 @@ TEST(FontListTest, Fonts_DeriveFontListWithSize) {
   EXPECT_EQ("Sans serif|5", FontToString(derived_fonts[1]));
 }
 
+TEST(FontListTest, Fonts_GetHeight_GetBaseline) {
+  // If a font list has only one font, the height and baseline must be the same.
+  Font font1("Arial", 16);
+  FontList font_list1("Arial, 16px");
+  EXPECT_EQ(font1.GetHeight(), font_list1.GetHeight());
+  EXPECT_EQ(font1.GetBaseline(), font_list1.GetBaseline());
+
+  // If there are two different fonts, the font list returns the max value
+  // for ascent and descent.
+  Font font2("Symbol", 16);
+  EXPECT_NE(font1.GetBaseline(), font2.GetBaseline());
+  EXPECT_NE(font1.GetHeight() - font1.GetBaseline(),

[msw, 2013/07/17 17:30:32]

Should this also EXPECT_NE(font1.GetHeight(), font2.GetHeight()); ?

[Yuki, 2013/07/19 14:40:59]

Since we specified the same font size, it's possible that they have the same
font height, having different ascent and descent, e.g. 12 ascent + 4 descent and
11 ascent + 5 descent.
So I don't want to require your EXPECT_NE.

I've changed the test's check condition, so we now guarantee
1. ascent of font1 != ascent of font2, as well as descent.
2. ascent of FontList == max(ascent of Fonts), as well as descent.

With the above test condition, I think it's okay that two fonts have
(accidentally) the same font height.  Even in that case, we're testing what we'd
like to guarantee.

+            font2.GetHeight() - font2.GetBaseline());
+  std::vector<Font> fonts;
+  fonts.push_back(font1);
+  fonts.push_back(font2);
+  FontList font_list_mix(fonts);
+  EXPECT_LE(std::max(font1.GetHeight(), font2.GetHeight()),

[msw, 2013/07/17 17:30:32]

Should the height be calculated the same here as in FontList? (add the max
ascent and descent, instead of finding the max height directly). That's a subtle
but important piece of logic worth devising a separate test case for (that would
fail using a simple max of the heights), but its not critical if it's too much
work to find suitable fonts/sizes.

[Yuki, 2013/07/19 14:40:59]

Done.

[msw, 2013/07/19 17:30:33]

nit: it'd be okay to keep this EXPECT_LE too, perhaps with a comment like:
"The combined height may be greater than the max height, since it's calculated
as the combined maximum ascent and descent."

+            font_list_mix.GetHeight());
+  EXPECT_EQ(std::max(font1.GetBaseline(), font2.GetBaseline()),
+            font_list_mix.GetBaseline());
+}
+
 }  // namespace gfx