Allow various font weights in gfx.

chrome/browser/ui/extensions/icon_with_badge_image_source.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 "chrome/browser/ui/extensions/icon_with_badge_image_source.h"
 
 #include <algorithm>
 #include <cmath>
 #include <utility>
 
@@ skipping 51 matching lines @@
   const char kPreferredTypeface[] = "Arial";
 #endif
 
   static SkPaint* text_paint = NULL;
   if (!text_paint) {
     text_paint = new SkPaint;
     text_paint->setAntiAlias(true);
     text_paint->setTextAlign(SkPaint::kLeft_Align);
 
     sk_sp<SkTypeface> typeface(
-        SkTypeface::CreateFromName(kPreferredTypeface, SkTypeface::kBold));
+        SkTypeface::MakeFromName(kPreferredTypeface,
+                                 SkFontStyle::FromOldStyle(SkTypeface::kBold)));
     // Skia doesn't do any font fallback---if the user is missing the font then
     // typeface will be NULL. If we don't do manual fallback then we'll crash.
     if (typeface) {
       text_paint->setFakeBoldText(true);
     } else {
       // Fall back to the system font. We don't bold it because we aren't sure
       // how it will look.
       // For the most part this code path will only be hit on Linux systems
       // that don't have Arial.
       ResourceBundle& rb = ResourceBundle::GetSharedInstance();
       const gfx::Font& base_font = rb.GetFont(ResourceBundle::BaseFont);
-      typeface = sk_sp<SkTypeface>(SkTypeface::CreateFromName(
-          base_font.GetFontName().c_str(), SkTypeface::kNormal));
+      typeface = sk_sp<SkTypeface>(SkTypeface::MakeFromName(
+          base_font.GetFontName().c_str(), SkFontStyle()));
       DCHECK(typeface);
     }
 
     text_paint->setTypeface(typeface.get());
     // |text_paint| adds its own ref. Release the ref from CreateFontName.
   }
   return text_paint;
 }
 
 gfx::ImageSkiaRep ScaleImageSkiaRep(const gfx::ImageSkiaRep& rep,
@@ skipping 84 matching lines @@
   gfx::FontList base_font = rb->GetFontList(ResourceBundle::BaseFont)
                                 .DeriveWithHeightUpperBound(kBadgeHeight);
   base::string16 utf16_text = base::UTF8ToUTF16(badge_->text);
 
   // See if we can squeeze a slightly larger font into the badge given the
   // actual string that is to be displayed.
   const int kMaxIncrementAttempts = 5;
   for (size_t i = 0; i < kMaxIncrementAttempts; ++i) {
     int w = 0;
     int h = 0;
-    gfx::FontList bigger_font = base_font.Derive(1, 0);
+    gfx::FontList bigger_font =
+        base_font.Derive(1, 0, gfx::Font::Weight::NORMAL);
     gfx::Canvas::SizeStringInt(utf16_text, bigger_font, &w, &h, 0,
                                gfx::Canvas::NO_ELLIPSIS);
     if (h > kBadgeHeight)
       break;
     base_font = bigger_font;
   }
 
   if (ui::MaterialDesignController::IsModeMaterial()) {
     text_width =
         std::min(kMaxTextWidth, canvas->GetStringWidth(utf16_text, base_font));
@@ skipping 104 matching lines @@
 }
 
 void IconWithBadgeImageSource::PaintBlockedActionDecoration(
     gfx::Canvas* canvas) {
   canvas->Save();
   gfx::ImageSkia img = *ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
       IDR_BLOCKED_EXTENSION_SCRIPT);
   canvas->DrawImageInt(img, size().width() - img.width(), 0);
   canvas->Restore();
 }