SkTypeface::MakeFromName to take SkFontStyle.

samplecode/SampleSlides.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.
  */
 #include "SampleCode.h"
 #include "SkBlurMask.h"
 #include "SkBlurMaskFilter.h"
 #include "SkCanvas.h"
@@ skipping 607 matching lines @@
 }
 
 #include "SkTypeface.h"
 
 static void texteffect_slide(SkCanvas* canvas) {
     const char* str = "Google";
     size_t len = strlen(str);
     SkScalar x = 20;
     SkScalar y = 80;
     SkPaint paint;
-    paint.setTypeface(SkTypeface::MakeFromName("Georgia", SkTypeface::kItalic));
+    paint.setTypeface(SkTypeface::MakeFromName("Georgia",
+                                               SkFontStyle::FromOldStyle(SkTypeface::kItalic)));
     paint.setTextSize(75);
     paint.setAntiAlias(true);
     paint.setColor(SK_ColorBLUE);
     for (size_t i = 0; i < SK_ARRAY_COUNT(gRastProcs); i++) {
         apply_shader(&paint, (int)i);
         canvas->drawText(str, len, x, y, paint);
         y += 80;
         if (i == 4) {
             x += 320;
             y = 80;
@@ skipping 69 matching lines @@
     }
 
 private:
     typedef SampleView INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static SkView* MyFactory() { return new SlideView; }
 static SkViewRegister reg(MyFactory);