Revert of Replace SkTypeface::Style with SkFontStyle.

src/core/SkTypefaceCache.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.
  */
 
 
 
@@ skipping 11 matching lines @@
         if (curr->fStrong) {
             curr->fFace->unref();
         } else {
             curr->fFace->weak_unref();
         }
         curr += 1;
     }
 }
 
 void SkTypefaceCache::add(SkTypeface* face,
-                          const SkFontStyle& requestedStyle,
+                          SkTypeface::Style requestedStyle,
                           bool strong) {
     if (fArray.count() >= TYPEFACE_CACHE_LIMIT) {
         this->purge(TYPEFACE_CACHE_LIMIT >> 2);
     }
 
     Rec* rec = fArray.append();
     rec->fFace = face;
     rec->fRequestedStyle = requestedStyle;
     rec->fStrong = strong;
     if (strong) {
@@ skipping 70 matching lines @@
 }
 
 SkFontID SkTypefaceCache::NewFontID() {
     static int32_t gFontID;
     return sk_atomic_inc(&gFontID) + 1;
 }
 
 SK_DECLARE_STATIC_MUTEX(gMutex);
 
 void SkTypefaceCache::Add(SkTypeface* face,
-                          const SkFontStyle& requestedStyle,
+                          SkTypeface::Style requestedStyle,
                           bool strong) {
     SkAutoMutexAcquire ama(gMutex);
     Get().add(face, requestedStyle, strong);
 }
 
 SkTypeface* SkTypefaceCache::FindByID(SkFontID fontID) {
     SkAutoMutexAcquire ama(gMutex);
     return Get().findByID(fontID);
 }
 
 SkTypeface* SkTypefaceCache::FindByProcAndRef(FindProc proc, void* ctx) {
     SkAutoMutexAcquire ama(gMutex);
     SkTypeface* typeface = Get().findByProcAndRef(proc, ctx);
     return typeface;
 }
 
 void SkTypefaceCache::PurgeAll() {
     SkAutoMutexAcquire ama(gMutex);
     Get().purgeAll();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifdef SK_DEBUG
-static bool DumpProc(SkTypeface* face, const SkFontStyle& s, void* ctx) {
-    SkDebugf("SkTypefaceCache: face %p fontID %d weight %d width %d style %d refcnt %d\n",
-             face, face->uniqueID(), s.weight(), s.width(), s.slant(), face->getRefCnt());
+static bool DumpProc(SkTypeface* face, SkTypeface::Style style, void* ctx) {
+    SkDebugf("SkTypefaceCache: face %p fontID %d style %d refcnt %d\n",
+             face, face->uniqueID(), style, face->getRefCnt());
     return false;
 }
 #endif
 
 void SkTypefaceCache::Dump() {
 #ifdef SK_DEBUG
     SkAutoMutexAcquire ama(gMutex);
     (void)Get().findByProcAndRef(DumpProc, NULL);
 #endif
 }