Allow various font weights in gfx.

ui/gfx/render_text_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/render_text_mac.h"
 
 #import <AppKit/AppKit.h>
 #include <ApplicationServices/ApplicationServices.h>
 #include <CoreText/CoreText.h>
 
@@ skipping 47 matching lines @@
   return base::ScopedCFTypeRef<CTFontRef>(
       CTFontCreateWithFontDescriptor(desc, 0.0, nullptr));
 }
 
 }  // namespace
 
 namespace gfx {
 
 namespace internal {
 
-skia::RefPtr<SkTypeface> CreateSkiaTypeface(const gfx::Font& font, int style) {
-  gfx::Font font_with_style = font.Derive(0, style);
+skia::RefPtr<SkTypeface> CreateSkiaTypeface(const gfx::Font& font,

[Alexei Svitkine (slow), 2016/04/05 16:38:53]

Remove gfx::

+                                            bool italic,
+                                            gfx::Font::Weight weight) {

[Alexei Svitkine (slow), 2016/04/05 16:38:53]

Remove gfx::

+  const Font::FontStyle style = italic ? Font::ITALIC : Font::NORMAL;
+  gfx::Font font_with_style = font.Derive(0, style, weight);
   if (!font_with_style.GetNativeFont())
     return nullptr;
   return skia::AdoptRef(SkCreateTypefaceFromCTFont(
       static_cast<CTFontRef>(font_with_style.GetNativeFont())));
 }
 
 }  // namespace internal
 
 RenderTextMac::RenderTextMac() : common_baseline_(0), runs_valid_(false) {}
 
@@ skipping 124 matching lines @@
   ApplyFadeEffects(renderer);
   ApplyTextShadows(renderer);
 
   for (size_t i = 0; i < runs_.size(); ++i) {
     const TextRun& run = runs_[i];
     renderer->SetForegroundColor(run.foreground);
 
     CTFontRef ct_font = static_cast<CTFontRef>(run.font.GetNativeFont());
     renderer->SetTextSize(CTFontGetSize(ct_font));
 
-    int font_style = Font::NORMAL;
+    // TODO(mboc): Apply font weights.
+    Font::Weight font_weight = Font::Weight::NORMAL;
     CTFontSymbolicTraits traits = CTFontGetSymbolicTraits(ct_font);
     if (traits & kCTFontBoldTrait)
-      font_style |= Font::BOLD;
-    if (traits & kCTFontItalicTrait)
-      font_style |= Font::ITALIC;
-    renderer->SetFontWithStyle(run.font, font_style);
+      font_weight = Font::Weight::BOLD;
+    renderer->SetFont(run.font, traits & kCTFontItalicTrait, font_weight);
 
     renderer->DrawPosText(&run.glyph_positions[0], &run.glyphs[0],
                           run.glyphs.size());
     renderer->DrawDecorations(run.origin.x(), run.origin.y(), run.width,
                               run.underline, run.strike, run.diagonal_strike);
   }
 
   renderer->EndDiagonalStrike();
 }
 
@@ skipping 70 matching lines @@
   ApplyCompositionAndSelectionStyles();
 
   // Note: CFAttributedStringSetAttribute() does not appear to retain the values
   // passed in, as can be verified via CFGetRetainCount(). To ensure the
   // attribute objects do not leak, they are saved to |attributes_|.
   // Clear the attributes storage.
   base::ScopedCFTypeRef<CFMutableArrayRef> attributes(
       CFArrayCreateMutable(NULL, 0, &kCFTypeArrayCallBacks));
 
   // https://developer.apple.com/library/mac/#documentation/Carbon/Reference/CoreText_StringAttributes_Ref/Reference/reference.html
-  internal::StyleIterator style(colors(), baselines(), styles());
+  internal::StyleIterator style(colors(), baselines(), weights(), styles());
   const size_t layout_text_length = CFAttributedStringGetLength(attr_string);
   for (size_t i = 0, end = 0; i < layout_text_length; i = end) {
     end = TextIndexToGivenTextIndex(text, style.GetRange().end());
     const CFRange range = CFRangeMake(i, end - i);
     base::ScopedCFTypeRef<CGColorRef> foreground(
         skia::CGColorCreateFromSkColor(style.color()));
     CFAttributedStringSetAttribute(attr_string, range,
                                    kCTForegroundColorAttributeName, foreground);
     CFArrayAppendValue(attributes, foreground);
 
     if (style.style(UNDERLINE)) {
       CTUnderlineStyle value = kCTUnderlineStyleSingle;
       base::ScopedCFTypeRef<CFNumberRef> underline_value(
           CFNumberCreate(NULL, kCFNumberSInt32Type, &value));
       CFAttributedStringSetAttribute(
           attr_string, range, kCTUnderlineStyleAttributeName, underline_value);
       CFArrayAppendValue(attributes, underline_value);
     }
 
-    const int traits = (style.style(BOLD) ? kCTFontBoldTrait : 0) |
-                       (style.style(ITALIC) ? kCTFontItalicTrait : 0);
+    // TODO(mboc): Apply font weights other than bold below.
+    const int traits =
+        (style.style(ITALIC) ? kCTFontItalicTrait : 0) |
+        (style.weight() >= Font::Weight::BOLD ? kCTFontBoldTrait : 0);
     if (traits != 0) {
       base::ScopedCFTypeRef<CTFontRef> styled_font =
           CopyFontWithSymbolicTraits(font, traits);
       // TODO(asvitkine): Handle |styled_font| == NULL case better.
       if (styled_font) {
         CFAttributedStringSetAttribute(attr_string, range, kCTFontAttributeName,
                                        styled_font);
         CFArrayAppendValue(attributes, styled_font);
       }
     }
@@ skipping 90 matching lines @@
 }
 
 void RenderTextMac::InvalidateStyle() {
   line_.reset();
   attributes_.reset();
   runs_.clear();
   runs_valid_ = false;
 }
 
 }  // namespace gfx