Revert of Replace SkTypeface::Style with SkFontStyle.

include/core/SkTypeface.h

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkTypeface_DEFINED
 #define SkTypeface_DEFINED
 
 #include "SkAdvancedTypefaceMetrics.h"
-#include "SkFontStyle.h"
 #include "SkWeakRefCnt.h"
 
 class SkDescriptor;
 class SkFontDescriptor;
 class SkScalerContext;
 struct SkScalerContextRec;
 class SkStream;
 class SkAdvancedTypefaceMetrics;
 class SkWStream;
 
@@ skipping 18 matching lines @@
     */
     enum Style {
         kNormal = 0,
         kBold   = 0x01,
         kItalic = 0x02,
 
         // helpers
         kBoldItalic = 0x03
     };
 
-    /** Returns the typeface's intrinsic style attributes. */
-    SkFontStyle fontStyle() const {
-        return fStyle;
-    }
+    /** Returns the typeface's intrinsic style attributes
+    */
+    Style style() const { return fStyle; }
 
-    /** Returns the typeface's intrinsic style attributes. 
-     *  @deprecated use fontStyle() instead.
-     */
-    Style style() const {
-        return static_cast<Style>(
-            (fStyle.weight() >= SkFontStyle::kSemiBold_Weight ? kBold : kNormal) |
-            (fStyle.slant()  != SkFontStyle::kUpright_Slant ? kItalic : kNormal));
-    }
+    /** Returns true if getStyle() has the kBold bit set.
+    */
+    bool isBold() const { return (fStyle & kBold) != 0; }
 
-    /** Returns true if style() has the kBold bit set. */
-    bool isBold() const { return fStyle.weight() >= SkFontStyle::kSemiBold_Weight; }
-
-    /** Returns true if style() has the kItalic bit set. */
-    bool isItalic() const { return fStyle.slant() != SkFontStyle::kUpright_Slant; }
+    /** Returns true if getStyle() has the kItalic bit set.
+    */
+    bool isItalic() const { return (fStyle & kItalic) != 0; }
 
     /** Returns true if the typeface claims to be fixed-pitch.
      *  This is a style bit, advance widths may vary even if this returns true.
      */
     bool isFixedPitch() const { return fIsFixedPitch; }
 
     /** Return a 32bit value for this typeface, unique for the underlying font
         data. Will never return 0.
      */
     SkFontID uniqueID() const { return fUniqueID; }
@@ skipping 205 matching lines @@
         this->onFilterRec(rec);
     }
     // PRIVATE / EXPERIMENTAL -- do not call
     void getFontDescriptor(SkFontDescriptor* desc, bool* isLocal) const {
         this->onGetFontDescriptor(desc, isLocal);
     }
 
 protected:
     /** uniqueID must be unique and non-zero
     */
-    SkTypeface(const SkFontStyle& style, SkFontID uniqueID, bool isFixedPitch = false);
+    SkTypeface(Style style, SkFontID uniqueID, bool isFixedPitch = false);
     virtual ~SkTypeface();
 
     /** Sets the fixedPitch bit. If used, must be called in the constructor. */
     void setIsFixedPitch(bool isFixedPitch) { fIsFixedPitch = isFixedPitch; }
 
     friend class SkScalerContext;
     static SkTypeface* GetDefaultTypeface(Style style = SkTypeface::kNormal);
 
     virtual SkScalerContext* onCreateScalerContext(const SkDescriptor*) const = 0;
     virtual void onFilterRec(SkScalerContextRec*) const = 0;
@@ skipping 45 matching lines @@
     SkAdvancedTypefaceMetrics* getAdvancedTypefaceMetrics(
                           SkAdvancedTypefaceMetrics::PerGlyphInfo perGlyphInfo,
                           const uint32_t* glyphIDs = NULL,
                           uint32_t glyphIDsCount = 0) const;
 
 private:
     static SkTypeface* CreateDefault(int style);  // SkLazyPtr requires an int, not a Style.
     static void        DeleteDefault(SkTypeface*);
 
     SkFontID    fUniqueID;
-    SkFontStyle fStyle;
+    Style       fStyle;
     bool        fIsFixedPitch;
 
     friend class SkPaint;
     friend class SkGlyphCache;  // GetDefaultTypeface
     // just so deprecated fonthost can call protected methods
     friend class SkFontHost;
 
     typedef SkWeakRefCnt INHERITED;
 };
 
 #endif