Makes gfx::FontList carry UNDERLINE flag.

ui/gfx/font_list.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 "base/lazy_instance.h"
 #include "base/logging.h"
@@ skipping 16 matching lines @@
   DCHECK_GT(font_names->size(), 1U);
 
   // The last item is [STYLE_OPTIONS] SIZE.
   std::vector<std::string> styles_size;
   base::SplitString(font_names->back(), ' ', &styles_size);
   DCHECK(!styles_size.empty());
   base::StringToInt(styles_size.back(), font_size);
   DCHECK_GT(*font_size, 0);
   font_names->pop_back();
 
-  // Font supports BOLD and ITALIC; underline is supported via RenderText.
   *font_style = 0;
   for (size_t i = 0; i < styles_size.size() - 1; ++i) {
     // Styles are separated by white spaces. base::SplitString splits styles
     // by space, and it inserts empty string for continuous spaces.
     if (styles_size[i].empty())
       continue;
     if (!styles_size[i].compare("Bold"))
       *font_style |= gfx::Font::BOLD;
     else if (!styles_size[i].compare("Italic"))
       *font_style |= gfx::Font::ITALIC;
+    else if (!styles_size[i].compare("Underline"))

[Alexei Svitkine (slow), 2013/12/20 16:28:09]

So the description string comes from a format used by Pango, etc..

Does that format support "Underline"? If it doesn't, we shouldn't be adding it
to the string or parsing it out of the string.

[Yuki, 2013/12/20 17:34:52]

You're right.  Since underline is NOT considered as part of font in Pango, we
shouldn't add "Underline".  I've reverted this part.

Instead I found an issue in GetFonts() method, and fixed it.

+      *font_style |= gfx::Font::UNDERLINE;
     else
       NOTREACHED();
   }
 }
 
 // Returns the font style and size as a string.
 std::string FontStyleAndSizeToString(int font_style, int font_size) {
   std::string result;
   if (font_style & gfx::Font::BOLD)
     result += "Bold ";
   if (font_style & gfx::Font::ITALIC)
     result += "Italic ";
+  if (font_style & gfx::Font::UNDERLINE)
+    result += "Underline ";
   result += base::IntToString(font_size);
   result += "px";
   return result;
 }
 
 // Returns font description from |font_names|, |font_style|, and |font_size|.
 std::string BuildFontDescription(const std::vector<std::string>& font_names,
                                  int font_style,
                                  int font_size) {
   std::string description = JoinString(font_names, ',');
@@ skipping 221 matching lines @@
     font_style_ = fonts_[0].GetStyle();
     font_size_ = fonts_[0].GetFontSize();
   } else {
     std::vector<std::string> font_names;
     ParseFontDescriptionString(font_description_string_, &font_names,
                                &font_style_, &font_size_);
   }
 }
 
 }  // namespace gfx