Replace SkTypeface::Style with SkFontStyle.

src/core/SkTypefaceCache.h

 
 /*
  * 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 13 matching lines @@
 class SkTypefaceCache {
 public:
     SkTypefaceCache();
     ~SkTypefaceCache();
 
     /**
      * Callback for FindByProc. Returns true if the given typeface is a match
      * for the given context. The passed typeface is owned by the cache and is
      * not additionally ref()ed. The typeface may be in the disposed state.
      */
-    typedef bool (*FindProc)(SkTypeface*, SkTypeface::Style, void* context);
+    typedef bool(*FindProc)(SkTypeface*, const SkFontStyle&, void* context);
 
     /**
      *  Add a typeface to the cache. This ref()s the typeface, so that the
      *  cache is also an owner. Later, if we need to purge the cache, typefaces
      *  whose refcnt is 1 (meaning only the cache is an owner) will be
      *  unref()ed.
      */
-    void add(SkTypeface*, SkTypeface::Style requested, bool strong = true);
+    void add(SkTypeface*, const SkFontStyle& requested, bool strong = true);
 
     /**
      *  Search the cache for a typeface with the specified fontID (uniqueID).
      *  If one is found, return it (its reference count is unmodified). If none
      *  is found, return NULL. The reference count is unmodified as it is
      *  assumed that the stack will contain a ref to the typeface.
      */
     SkTypeface* findByID(SkFontID findID) const;
 
     /**
@@ skipping 13 matching lines @@
 
     /**
      *  Helper: returns a unique fontID to pass to the constructor of
      *  your subclass of SkTypeface
      */
     static SkFontID NewFontID();
 
     // These are static wrappers around a global instance of a cache.
 
     static void Add(SkTypeface*,
-                    SkTypeface::Style requested,
+                    const SkFontStyle& requested,
                     bool strong = true);
     static SkTypeface* FindByID(SkFontID fontID);
     static SkTypeface* FindByProcAndRef(FindProc proc, void* ctx);
     static void PurgeAll();
 
     /**
      *  Debugging only: dumps the status of the typefaces in the cache
      */
     static void Dump();
 
 private:
     static SkTypefaceCache& Get();
 
     void purge(int count);
 
     struct Rec {
-        SkTypeface*         fFace;
-        bool                fStrong;
-        SkTypeface::Style   fRequestedStyle;
+        SkTypeface* fFace;
+        bool fStrong;
+        SkFontStyle fRequestedStyle;
     };
     SkTDArray<Rec> fArray;
 };
 
 #endif