Revert of Replace SkTypeface::Style with SkFontStyle.

src/ports/SkFontMgr_win_dw.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkDWrite.h"
 #include "SkDWriteFontFileStream.h"
 #include "SkFontMgr.h"
@@ skipping 313 matching lines @@
     same = (iunkA.get() == iunkB.get());
     return S_OK;
 }
 
 struct ProtoDWriteTypeface {
     IDWriteFontFace* fDWriteFontFace;
     IDWriteFont* fDWriteFont;
     IDWriteFontFamily* fDWriteFontFamily;
 };
 
-static bool FindByDWriteFont(SkTypeface* cached, const SkFontStyle&, void* ctx) {
+static bool FindByDWriteFont(SkTypeface* cached, SkTypeface::Style, void* ctx) {
     DWriteFontTypeface* cshFace = reinterpret_cast<DWriteFontTypeface*>(cached);
     ProtoDWriteTypeface* ctxFace = reinterpret_cast<ProtoDWriteTypeface*>(ctx);
     bool same;
 
     //Check to see if the two fonts are identical.
     HRB(are_same(cshFace->fDWriteFont.get(), ctxFace->fDWriteFont, same));
     if (same) {
         return true;
     }
 
@@ skipping 410 matching lines @@
 }
 
 #include "SkFontMgr_indirect.h"
 SK_API SkFontMgr* SkFontMgr_New_DirectWriteRenderer(SkRemotableFontMgr* proxy) {
     SkAutoTUnref<SkFontMgr> impl(SkFontMgr_New_DirectWrite());
     if (impl.get() == NULL) {
         return NULL;
     }
     return SkNEW_ARGS(SkFontMgr_Indirect, (impl.get(), proxy));
 }