remove legacy filter-flags, and store FilterLevel directly

include/core/SkPaint.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.
  */
 
 
@@ skipping 34 matching lines @@
 
 #define kBicubicFilterBitmap_Flag kHighQualityFilterBitmap_Flag
 
 /** \class SkPaint
 
     The SkPaint class holds the style and color information about how to draw
     geometries, text and bitmaps.
 */
 
 class SK_API SkPaint {
-    enum {
-        // DEPRECATED -- use setFilterLevel instead
-        kFilterBitmap_Flag    = 0x02, // temporary flag
-        // DEPRECATED -- use setFilterLevel instead
-        kHighQualityFilterBitmap_Flag = 0x4000, // temporary flag
-        // DEPRECATED -- use setFilterLevel instead
-        kHighQualityDownsampleBitmap_Flag = 0x8000, // temporary flag
-    };
 public:
     SkPaint();
     SkPaint(const SkPaint& paint);
     ~SkPaint();
 
     SkPaint& operator=(const SkPaint&);
 
     SK_API friend bool operator==(const SkPaint& a, const SkPaint& b);
     friend bool operator!=(const SkPaint& a, const SkPaint& b) {
         return !(a == b);
@@ skipping 230 matching lines @@
         kNone_FilterLevel,
         kLow_FilterLevel,
         kMedium_FilterLevel,
         kHigh_FilterLevel
     };
 
     /**
      *  Return the filter level. This affects the quality (and performance) of
      *  drawing scaled images.
      */
-    FilterLevel getFilterLevel() const;
+    FilterLevel getFilterLevel() const { return (FilterLevel)fFilterLevel; }
 
     /**
      *  Set the filter level. This affects the quality (and performance) of
      *  drawing scaled images.
      */
     void setFilterLevel(FilterLevel);
 
     /**
      *  If the predicate is true, set the filterLevel to Low, else set it to
      *  None.
@@ skipping 741 matching lines @@
     union {
         struct {
             // all of these bitfields should add up to 32
             unsigned        fFlags : 16;
             unsigned        fTextAlign : 2;
             unsigned        fCapType : 2;
             unsigned        fJoinType : 2;
             unsigned        fStyle : 2;
             unsigned        fTextEncoding : 2;  // 3 values
             unsigned        fHinting : 2;
-            //unsigned      fFreeBits : 4;
+            unsigned        fFilterLevel : 2;
+            //unsigned      fFreeBits : 2;
         };
         uint32_t fBitfields;
     };
     uint32_t fDirtyBits;
 
     uint32_t getBitfields() const { return fBitfields; }
     void setBitfields(uint32_t bitfields);
 
     SkDrawCacheProc    getDrawCacheProc() const;
     SkMeasureCacheProc getMeasureCacheProc(TextBufferDirection dir,
@@ skipping 64 matching lines @@
 #ifdef SK_BUILD_FOR_ANDROID
     SkPaintOptionsAndroid fPaintOptionsAndroid;
 
     // In order for the == operator to work properly this must be the last field
     // in the struct so that we can do a memcmp to this field's offset.
     uint32_t        fGenerationID;
 #endif
 };
 
 #endif