SkTypeface::MakeFromName to take SkFontStyle.

samplecode/SampleFontScalerTest.cpp

Index: samplecode/SampleFontScalerTest.cpp
diff --git a/samplecode/SampleFontScalerTest.cpp b/samplecode/SampleFontScalerTest.cpp
index 72371ed8073004f8f10a38f8e0e4d6d0b8621098..bd9309790e3be851a8c62d63439c6dcc470f2c1e 100644
--- a/samplecode/SampleFontScalerTest.cpp
+++ b/samplecode/SampleFontScalerTest.cpp
@@ -41,7 +41,8 @@ class FontScalerTestView : public SampleView {
 public:
     FontScalerTestView() {
         for (int i = 0; i < gFaceCount; i++) {
-            fFaces[i] = SkTypeface::MakeFromName(gFaces[i].fName, gFaces[i].fStyle);
+            fFaces[i] = SkTypeface::MakeFromName(
+                gFaces[i].fName, SkFontStyle::FromOldStyle(gFaces[i].fStyle));
         }
 //        this->setBGColor(0xFFDDDDDD);
     }
@@ -85,7 +86,7 @@ protected:
 //        paint.setSubpixelText(true);
         paint.setAntiAlias(true);
         paint.setLCDRenderText(true);
-        paint.setTypeface(SkTypeface::MakeFromName("Times Roman", SkTypeface::kNormal));
+        paint.setTypeface(SkTypeface::MakeFromName("Times Roman", SkFontStyle()));
 
 //        const char* text = "abcdefghijklmnopqrstuvwxyz";
         const char* text = "Hamburgefons ooo mmm";