remove legacy filter-flags, and store FilterLevel directly
BUG=skia:
R=robertphillips@google.com, humper@google.com, jvanverth@google.com, mtklein@google.com
Author: reed@google.com
Review URL: https://codereview.chromium.org/239393002
git-svn-id: http://skia.googlecode.com/svn/trunk@14217 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h
index 7a647f0..95fc0b8 100644
--- a/include/core/SkPaint.h
+++ b/include/core/SkPaint.h
@@ -52,14 +52,6 @@
*/
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);
@@ -310,7 +302,7 @@
* 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
@@ -1072,7 +1064,8 @@
unsigned fStyle : 2;
unsigned fTextEncoding : 2; // 3 values
unsigned fHinting : 2;
- //unsigned fFreeBits : 4;
+ unsigned fFilterLevel : 2;
+ //unsigned fFreeBits : 2;
};
uint32_t fBitfields;
};