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 236 matching lines @@
   if (font_size_ == -1)
     CacheFontStyleAndSize();
   return font_size_;
 }
 
 const std::vector<Font>& FontList::GetFonts() const {
   if (fonts_.empty()) {
     DCHECK(!font_description_string_.empty());
 
     std::vector<std::string> font_names;
+    // It's possible that gfx::Font::UNDERLINE is specified and it's already
+    // stored in |font_style_| but |font_description_string_| doesn't have the
+    // underline info.  So we should respect |font_style_| as long as it's
+    // valid.
+    int style = 0;
     ParseFontDescriptionString(font_description_string_, &font_names,
-                               &font_style_, &font_size_);
+                               &style, &font_size_);
+    if (font_style_ == -1)
+      font_style_ = style;
     for (size_t i = 0; i < font_names.size(); ++i) {
       DCHECK(!font_names[i].empty());
 
       Font font(font_names[i], font_size_);
       if (font_style_ == Font::NORMAL)
         fonts_.push_back(font);
       else
         fonts_.push_back(font.DeriveFont(0, font_style_));
     }
   }
@@ skipping 22 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