Get all font unittests running with DirectWrite on Windows 7+

ui/gfx/font_list_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/gfx/font_list.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 248 matching lines @@
 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);
   ASSERT_EQ("arial",
             base::StringToLowerASCII(font1.GetActualFontNameForTesting()));
   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.
+  // for the baseline (ascent) and height.
   Font font2("Symbol", 16);
   ASSERT_EQ("symbol",
             base::StringToLowerASCII(font2.GetActualFontNameForTesting()));
   EXPECT_NE(font1.GetBaseline(), font2.GetBaseline());
-  EXPECT_NE(font1.GetHeight() - font1.GetBaseline(),
-            font2.GetHeight() - font2.GetBaseline());
+  EXPECT_NE(font1.GetHeight(), font2.GetHeight());
   std::vector<Font> fonts;
   fonts.push_back(font1);
   fonts.push_back(font2);
   FontList font_list_mix(fonts);
+  // descent of FontList == max(descent of Fonts)

[msw, 2015/01/10 01:50:15]

The baseline is actually the ascent, not descent.

[ananta, 2015/01/10 02:05:49]

Done.

+  EXPECT_EQ(std::max(font1.GetBaseline(), font2.GetBaseline()),
+            font_list_mix.GetBaseline());
+  // FIXME
+  // The height of the font list should be the max height of the fonts in it.

[msw, 2015/01/10 01:50:15]

Oh darn, my earlier advice was wrong. I remember why this isn't true! Because
FontList applies baseline centering, the ascent and decent will be the max of
the constituent values. The height will not necessarily be the max of its
constituent values. Revert the checks here and make sure they pass.

[ananta, 2015/01/10 02:05:49]

Done.

+  // This is not the case for Mac and should be fixed.
+#if defined(OS_MACOSX)
   // ascent of FontList == max(ascent of Fonts)
   EXPECT_EQ(std::max(font1.GetHeight() - font1.GetBaseline(),
                      font2.GetHeight() - font2.GetBaseline()),
             font_list_mix.GetHeight() - font_list_mix.GetBaseline());
-  // descent of FontList == max(descent of Fonts)
-  EXPECT_EQ(std::max(font1.GetBaseline(), font2.GetBaseline()),
-            font_list_mix.GetBaseline());
+#else
+  // Height of FontList == max(Height of Fonts)
+  EXPECT_EQ(std::max(font1.GetHeight(), font2.GetHeight()),
+            font_list_mix.GetHeight());
+#endif
 }
 
 TEST(FontListTest, Fonts_DeriveWithHeightUpperBound) {
   std::vector<Font> fonts;
 
   fonts.push_back(gfx::Font("Arial", 18));
   fonts.push_back(gfx::Font("Sans serif", 18));
   fonts.push_back(gfx::Font("Symbol", 18));
   FontList font_list = FontList(fonts);
 
   // A smaller upper bound should derive a font list with a smaller height.
   const int height_1 = font_list.GetHeight() - 5;
   FontList derived_1 = font_list.DeriveWithHeightUpperBound(height_1);
   EXPECT_LE(derived_1.GetHeight(), height_1);
   EXPECT_LT(derived_1.GetHeight(), font_list.GetHeight());
   EXPECT_LT(derived_1.GetFontSize(), font_list.GetFontSize());
 
   // A larger upper bound should not change the height of the font list.
   const int height_2 = font_list.GetHeight() + 5;
   FontList derived_2 = font_list.DeriveWithHeightUpperBound(height_2);
   EXPECT_LE(derived_2.GetHeight(), height_2);
   EXPECT_EQ(font_list.GetHeight(), derived_2.GetHeight());
   EXPECT_EQ(font_list.GetFontSize(), derived_2.GetFontSize());
 }
 
 }  // namespace gfx