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 48 matching lines @@
   return base::ScopedCFTypeRef<CTFontRef>(
       CTFontCreateWithFontDescriptor(desc, 0.0, nullptr));
 }
 
 }  // namespace
 
 namespace gfx {
 
 namespace internal {
 
-// Note: this is only used by RenderTextHarfbuzz.

[tapted, 2016/06/02 01:02:23]

looks like this comment got lost while resolving merge conflicts - please keep
it (if it changes, then that's bad since this function is computationally
expensive)

[Mikus, 2016/06/02 10:35:20]

Done.

-sk_sp<SkTypeface> CreateSkiaTypeface(const gfx::Font& font, int style) {
-  gfx::Font font_with_style = font.Derive(0, style);
+sk_sp<SkTypeface> CreateSkiaTypeface(const Font& font,
+                                     bool italic,
+                                     Font::Weight weight) {
+  const Font::FontStyle style = italic ? Font::ITALIC : Font::NORMAL;
+  Font font_with_style = font.Derive(0, style, weight);
   if (!font_with_style.GetNativeFont())
     return nullptr;
 
   return sk_sp<SkTypeface>(SkCreateTypefaceFromCTFont(
       base::mac::NSToCFCast(font_with_style.GetNativeFont())));
 }
 
 }  // namespace internal
 
 RenderTextMac::RenderTextMac() : common_baseline_(0), runs_valid_(false) {}
@@ skipping 30 matching lines @@
 std::vector<RenderText::FontSpan> RenderTextMac::GetFontSpansForTesting() {
   EnsureLayout();
   if (!runs_valid_)
     ComputeRuns();
 
   std::vector<RenderText::FontSpan> spans;
   for (size_t i = 0; i < runs_.size(); ++i) {
     const CFRange cf_range = CTRunGetStringRange(runs_[i].ct_run);
     const Range range(cf_range.location, cf_range.location + cf_range.length);
     spans.push_back(RenderText::FontSpan(
-        gfx::Font(base::mac::CFToNSCast(runs_[i].ct_font.get())), range));
+        Font(base::mac::CFToNSCast(runs_[i].ct_font.get())), range));
   }
 
   return spans;
 }
 
 int RenderTextMac::GetDisplayTextBaseline() {
   EnsureLayout();
   return common_baseline_;
 }
 
@@ skipping 110 matching lines @@
 RenderTextMac::TextRun::~TextRun() {}
 
 float RenderTextMac::GetLayoutTextWidth() {
   base::ScopedCFTypeRef<CFMutableArrayRef> attributes_owner;
   base::ScopedCFTypeRef<CTLineRef> line(
       EnsureLayoutInternal(layout_text(), &attributes_owner));
   SkScalar baseline;
   return GetCTLineSize(line.get(), &baseline).width();
 }
 
-gfx::SizeF RenderTextMac::GetCTLineSize(CTLineRef line, SkScalar* baseline) {
+SizeF RenderTextMac::GetCTLineSize(CTLineRef line, SkScalar* baseline) {
   CGFloat ascent = 0;
   CGFloat descent = 0;
   CGFloat leading = 0;
   // TODO(asvitkine): Consider using CTLineGetBoundsWithOptions() on 10.8+.
   double width = CTLineGetTypographicBounds(line, &ascent, &descent, &leading);
   // Ensure ascent and descent are not smaller than ones of the font list.
   // Keep them tall enough to draw often-used characters.
   // For example, if a text field contains a Japanese character, which is
   // smaller than Latin ones, and then later a Latin one is inserted, this
   // ensures that the text baseline does not shift.
@@ skipping 40 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 91 matching lines @@
 }
 
 void RenderTextMac::InvalidateStyle() {
   line_.reset();
   attributes_.reset();
   runs_.clear();
   runs_valid_ = false;
 }
 
 }  // namespace gfx