Makes gfx::FontList carry UNDERLINE flag.

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>
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 // Helper function for comparing fonts for equality.
 std::string FontToString(const gfx::Font& font) {
   std::string font_string = font.GetFontName();
   font_string += "|";
   font_string += base::IntToString(font.GetFontSize());
   int style = font.GetStyle();
   if (style & gfx::Font::BOLD)
     font_string += "|bold";
   if (style & gfx::Font::ITALIC)
     font_string += "|italic";
+  if (style & gfx::Font::UNDERLINE)
+    font_string += "|underline";
   return font_string;
 }
 
 }  // namespace
 
 namespace gfx {
 
 TEST(FontListTest, FontDescString_FromDescString) {
   // Test init from font name style size string.
   FontList font_list = FontList("Droid Sans serif, Sans serif, 10px");
   EXPECT_EQ("Droid Sans serif, Sans serif, 10px",
             font_list.GetFontDescriptionString());
 }
 
 TEST(FontListTest, FontDescString_FromFontNamesStyleAndSize) {
   // Test init from font names, style and size.
   std::vector<std::string> font_names;
   font_names.push_back("Arial");
   font_names.push_back("Droid Sans serif");
-  int font_style = Font::BOLD | Font::ITALIC;
+  int font_style = Font::BOLD | Font::ITALIC | Font::UNDERLINE;
   int font_size = 11;
   FontList font_list = FontList(font_names, font_style, font_size);
+  // "Underline" doesn't appear in the font description string.
   EXPECT_EQ("Arial,Droid Sans serif,Bold Italic 11px",
             font_list.GetFontDescriptionString());
 }
 
 TEST(FontListTest, FontDescString_FromFont) {
   // Test init from Font.
   Font font("Arial", 8);
   FontList font_list = FontList(font);
   EXPECT_EQ("Arial,8px", font_list.GetFontDescriptionString());
 }
 
 TEST(FontListTest, FontDescString_FromFontWithNonNormalStyle) {
   // Test init from Font with non-normal style.
   Font font("Arial", 8);
   FontList font_list = FontList(font.DeriveFont(2, Font::BOLD));
   EXPECT_EQ("Arial,Bold 10px", font_list.GetFontDescriptionString());
 
   font_list = FontList(font.DeriveFont(-2, Font::ITALIC));
   EXPECT_EQ("Arial,Italic 6px", font_list.GetFontDescriptionString());
+
+  // "Underline" doesn't appear in the font description string.
+  font_list = FontList(font.DeriveFont(-4, Font::UNDERLINE));
+  EXPECT_EQ("Arial,4px", font_list.GetFontDescriptionString());
 }
 
 TEST(FontListTest, FontDescString_FromFontVector) {
   // Test init from Font vector.
   Font font("Arial", 8);
   Font font_1("Sans serif", 10);
   std::vector<Font> fonts;
   fonts.push_back(font.DeriveFont(0, Font::BOLD));
   fonts.push_back(font_1.DeriveFont(-2, Font::BOLD));
   FontList font_list = FontList(fonts);
@@ skipping 184 matching lines @@
   const std::vector<Font>& derived_fonts = derived.GetFonts();
 
   EXPECT_EQ(2U, derived_fonts.size());
   EXPECT_EQ("Arial|13|italic", FontToString(derived_fonts[0]));
   EXPECT_EQ("Sans serif|13|italic", FontToString(derived_fonts[1]));
 }
 
 TEST(FontListTest, FontDescString_DeriveFontListWithSizeDeltaAndStyle) {
   FontList font_list = FontList("Arial,Sans serif,Bold Italic  8px");
 
-  FontList derived =
-      font_list.DeriveFontListWithSizeDeltaAndStyle(10, Font::ITALIC);
+  FontList derived = font_list.DeriveFontListWithSizeDeltaAndStyle(
+      10, Font::ITALIC | Font::UNDERLINE);
   EXPECT_EQ("Arial,Sans serif,Italic 18px",
             derived.GetFontDescriptionString());
+  EXPECT_EQ(Font::ITALIC | Font::UNDERLINE,
+            derived.GetFontStyle());
+
+  // FontList has a special care for Font::UNDERLINE.  See if the handling of
+  // Font::UNDERLINE in GetFonts() is okay or not.
+  derived.GetFonts();
+  EXPECT_EQ(Font::ITALIC | Font::UNDERLINE,
+            derived.GetFontStyle());
 }
 
 TEST(FontListTest, Fonts_DeriveFontListWithSizeDeltaAndStyle) {
   std::vector<Font> fonts;
   fonts.push_back(gfx::Font("Arial", 8));
   fonts.push_back(gfx::Font("Sans serif", 8));
   FontList font_list = FontList(fonts);
 
-  FontList derived =
-      font_list.DeriveFontListWithSizeDeltaAndStyle(5, Font::BOLD);
+  FontList derived = font_list.DeriveFontListWithSizeDeltaAndStyle(
+      5, Font::BOLD | Font::UNDERLINE);
   const std::vector<Font>& derived_fonts = derived.GetFonts();
 
   EXPECT_EQ(2U, derived_fonts.size());
-  EXPECT_EQ("Arial|13|bold", FontToString(derived_fonts[0]));
-  EXPECT_EQ("Sans serif|13|bold", FontToString(derived_fonts[1]));
+  EXPECT_EQ("Arial|13|bold|underline", FontToString(derived_fonts[0]));
+  EXPECT_EQ("Sans serif|13|bold|underline", 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);
   ASSERT_EQ("arial", StringToLowerASCII(font1.GetActualFontNameForTesting()));
   FontList font_list1("Arial, 16px");
   EXPECT_EQ(font1.GetHeight(), font_list1.GetHeight());
   EXPECT_EQ(font1.GetBaseline(), font_list1.GetBaseline());
 
@@ skipping 11 matching lines @@
   // 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());
 }
 
 }  // namespace gfx