Mac: Fix PlatformFontMac::DeriveFont for underline font style.

ui/gfx/platform_font_mac.mm

 // 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/platform_font_mac.h"
 
 #include <cmath>
 
 #include <Cocoa/Cocoa.h>
 
@@ skipping 45 matching lines @@
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // PlatformFontMac, public:
 
 PlatformFontMac::PlatformFontMac()
     : PlatformFontMac([NSFont systemFontOfSize:[NSFont systemFontSize]]) {
 }
 
-PlatformFontMac::PlatformFontMac(NativeFont native_font)
+PlatformFontMac::PlatformFontMac(NativeFont native_font, bool underline)
     : native_font_([native_font retain]),
       font_name_(base::SysNSStringToUTF8([native_font_ familyName])),
       font_size_([native_font_ pointSize]),
       font_style_(Font::NORMAL),
       font_weight_(Font::Weight::NORMAL) {
   NSFontSymbolicTraits traits = [[native_font fontDescriptor] symbolicTraits];
   if (traits & NSFontItalicTrait)
     font_style_ |= Font::ITALIC;
+  if (underline)
+    font_style_ |= Font::UNDERLINE;
   if (traits & NSFontBoldTrait)
     font_weight_ = Font::Weight::BOLD;
 
   CalculateMetricsAndInitRenderParams();
 }
 
 PlatformFontMac::PlatformFontMac(const std::string& font_name, int font_size)
-    : native_font_([NSFontWithSpec(font_name,
-                                   font_size,
-                                   Font::NORMAL,
-                                   Font::Weight::NORMAL) retain]),
-      font_name_(font_name),
-      font_size_(font_size),
-      font_style_(Font::NORMAL),
-      font_weight_(Font::Weight::NORMAL) {
-  CalculateMetricsAndInitRenderParams();
-}
+    : PlatformFontMac(font_name,

[karandeepb, 2016/08/05 11:03:07]

Just a small cleanup.

[Avi (use Gerrit), 2016/08/05 14:54:59]

Acknowledged.

+                      font_size,
+                      Font::NORMAL,
+                      Font::Weight::NORMAL) {}
 
 ////////////////////////////////////////////////////////////////////////////////
 // PlatformFontMac, PlatformFont implementation:
 
 Font PlatformFontMac::DeriveFont(int size_delta,
                                  int style,
                                  Font::Weight weight) const {
   if (native_font_ && style == font_style_ && weight == font_weight_) {
     // System fonts have special attributes starting with 10.11. They should be
-    // requested using the same descriptor to preserve these attributes.
-    return Font(new PlatformFontMac([NSFont
-        fontWithDescriptor:[native_font_ fontDescriptor]
-                      size:font_size_ + size_delta]));
+    // requested using the same descriptor to preserve these attributes. Since
+    // NSFont does not support underline as a descriptor, pass it explicitly.
+    return Font(new PlatformFontMac(
+        [NSFont fontWithDescriptor:[native_font_ fontDescriptor]
+                              size:font_size_ + size_delta],
+        style & Font::UNDERLINE));
   }
 
   return Font(
       new PlatformFontMac(font_name_, font_size_ + size_delta, style, weight));
 }
 
 int PlatformFontMac::GetHeight() {
   return height_;
 }
 
@@ skipping 105 matching lines @@
   return new PlatformFontMac(native_font);
 }
 
 // static
 PlatformFont* PlatformFont::CreateFromNameAndSize(const std::string& font_name,
                                                   int font_size) {
   return new PlatformFontMac(font_name, font_size);
 }
 
 }  // namespace gfx