Allow various font weights in gfx.

cc/layers/heads_up_display_layer.cc

 // Copyright 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 "cc/layers/heads_up_display_layer.h"
 
 #include <algorithm>
 
 #include "base/trace_event/trace_event.h"
 #include "cc/layers/heads_up_display_layer_impl.h"
 #include "cc/proto/layer.pb.h"
 #include "cc/trees/layer_tree_host.h"
 
 namespace cc {
 
 scoped_refptr<HeadsUpDisplayLayer> HeadsUpDisplayLayer::Create() {
   return make_scoped_refptr(new HeadsUpDisplayLayer());
 }
 
 HeadsUpDisplayLayer::HeadsUpDisplayLayer()
     : typeface_(skia::AdoptRef(
-          SkTypeface::CreateFromName("times new roman", SkTypeface::kNormal))) {
+          SkTypeface::CreateFromName("times new roman", SkFontStyle()))) {
   if (!typeface_) {
-    typeface_ = skia::AdoptRef(
-        SkTypeface::CreateFromName("monospace", SkTypeface::kBold));
+    const SkFontStyle style(SkFontStyle::kBold_Weight,
+                            SkFontStyle::kNormal_Width,
+                            SkFontStyle::kUpright_Slant);

[danakj, 2016/05/19 21:54:59]

why the upright?

[Mikus, 2016/05/20 07:11:33]

This code has been changed on rebase. Now there are no changes to this file.

+    typeface_ = skia::AdoptRef(SkTypeface::CreateFromName("monospace", style));
   }
   DCHECK(typeface_.get());
   SetIsDrawable(true);
   UpdateDrawsContent(HasDrawableContent());
 }
 
 HeadsUpDisplayLayer::~HeadsUpDisplayLayer() {}
 
 void HeadsUpDisplayLayer::PrepareForCalculateDrawProperties(
     const gfx::Size& device_viewport, float device_scale_factor) {
@@ skipping 39 matching lines @@
 void HeadsUpDisplayLayer::PushPropertiesTo(LayerImpl* layer) {
   Layer::PushPropertiesTo(layer);
   TRACE_EVENT0("cc", "HeadsUpDisplayLayer::PushPropertiesTo");
   HeadsUpDisplayLayerImpl* layer_impl =
       static_cast<HeadsUpDisplayLayerImpl*>(layer);
 
   layer_impl->SetHUDTypeface(typeface_);
 }
 
 }  // namespace cc