Replace SkTypeface::Style with SkFontStyle.

gyp/public_headers.gypi

 # Include this gypi to include all public header files that exist in the
 # include directory.
 #
 # The list is computed by running 'find include -name *.h' in the root dir of
 # the project.
 #
 {
   'variables': {
     'header_filenames': [
       'animator/SkAnimator.h',
@@ skipping 26 matching lines @@
       'core/SkError.h',
       'core/SkFixed.h',
       'core/SkFlate.h',
       'core/SkFlattenable.h',
       'core/SkFlattenableBuffers.h',
       'core/SkFlattenableSerialization.h',
       'core/SkFloatBits.h',
       'core/SkFloatingPoint.h',
       'core/SkFontHost.h',
       'core/SkFontLCDConfig.h',
+      'core/SkFontStyle.h',
       'core/SkGeometry.h',
       'core/SkGraphics.h',
       'core/SkImage.h',
       'core/SkImageDecoder.h',
       'core/SkImageEncoder.h',
       'core/SkImageFilter.h',
       'core/SkInstCnt.h',
       'core/SkLineClipper.h',
       'core/SkMallocPixelRef.h',
       'core/SkMask.h',
@@ skipping 131 matching lines @@
       'gpu/gl/SkNullGLContext.h',
       'images/SkForceLinking.h',
       'images/SkMovie.h',
       'images/SkPageFlipper.h',
       'pathops/SkPathOps.h',
       'pdf/SkPDFDevice.h',
       'pdf/SkPDFDocument.h',
       'pipe/SkGPipe.h',
       'ports/SkFontConfigInterface.h',
       'ports/SkFontMgr.h',
-      'ports/SkFontStyle.h',
       'ports/SkTypeface_android.h',
       'ports/SkTypeface_mac.h',
       'ports/SkTypeface_win.h',
       'svg/SkSVGAttribute.h',
       'svg/SkSVGBase.h',
       'svg/SkSVGPaintState.h',
       'svg/SkSVGParser.h',
       'svg/SkSVGTypes.h',
       'utils/SkBoundaryPatch.h',
       'utils/SkCamera.h',
@@ skipping 57 matching lines @@
       'views/unix/keysym2ucs.h',
       'xml/SkBML_WXMLParser.h',
       'xml/SkBML_XMLParser.h',
       'xml/SkDOM.h',
       'xml/SkJS.h',
       'xml/SkXMLParser.h',
       'xml/SkXMLWriter.h',
     ],
   },
 }