SkTypeface::MakeFromName to take SkFontStyle.

gm/verttext2.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 /* Tests text vertical text rendering with different fonts and centering.
  */
 
 #include "gm.h"
 #include "SkCanvas.h"
 #include "SkTypeface.h"
 
 namespace skiagm {
 
 class VertText2GM : public GM {
 public:
     VertText2GM() {}
 
 protected:
     void onOnceBeforeDraw() override {
         const int pointSize = 24;
         textHeight = SkIntToScalar(pointSize);
         fProp = SkTypeface::MakeFromName(sk_tool_utils::platform_font_name("sans-serif"),
-                SkTypeface::kNormal);
+                SkFontStyle());
         fMono = SkTypeface::MakeFromName(sk_tool_utils::platform_font_name("monospace"),
-                SkTypeface::kNormal);
+                SkFontStyle());
     }
 
     SkString onShortName() override {
         SkString name("verttext2");
         name.append(sk_tool_utils::major_platform_os_name());
         return name;
     }
 
     SkISize onISize() override { return SkISize::Make(640, 480); }
 
@@ skipping 47 matching lines @@
     sk_sp<SkTypeface> fProp;
     sk_sp<SkTypeface> fMono;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 static GM* MyFactory(void*) { return new VertText2GM; }
 static GMRegistry reg(MyFactory);
 
 }