aboutsummaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-07-22 17:18:18 +0000
committerGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-07-22 17:18:18 +0000
commit9cfc83cc8ac2ee50a7ce889e65a707941f48bdea (patch)
tree879cd1f934857a2f296d5fe9c5dbf190af1f40af /include
parent35f02fb9c9f548656e1cb2cc66d3ed20006384f8 (diff)
stop using bitmap-filter flags outside of paint itself, as a step towards really changing them into an enum
BUG= Review URL: https://codereview.chromium.org/19825002 git-svn-id: http://skia.googlecode.com/svn/trunk@10240 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include')
-rw-r--r--include/core/SkPaint.h18
1 files changed, 8 insertions, 10 deletions
diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h
index 421a35b4a7..fa0c61e4ea 100644
--- a/include/core/SkPaint.h
+++ b/include/core/SkPaint.h
@@ -52,6 +52,14 @@ typedef const SkGlyph& (*SkMeasureCacheProc)(SkGlyphCache*, const char**);
*/
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);
@@ -98,10 +106,6 @@ public:
*/
enum Flags {
kAntiAlias_Flag = 0x01, //!< mask to enable antialiasing
-
- // DEPRECATED -- use setFilterLevel instead
- kFilterBitmap_Flag = 0x02, // temporary flag
-
kDither_Flag = 0x04, //!< mask to enable dithering
kUnderlineText_Flag = 0x08, //!< mask to enable underline text
kStrikeThruText_Flag = 0x10, //!< mask to enable strike-thru text
@@ -114,12 +118,6 @@ public:
kAutoHinting_Flag = 0x800, //!< mask to force Freetype's autohinter
kVerticalText_Flag = 0x1000,
kGenA8FromLCD_Flag = 0x2000, // hack for GDI -- do not use if you can help it
-
- // DEPRECATED -- use setFilterLevel instead
- kHighQualityFilterBitmap_Flag = 0x4000, // temporary flag
- // DEPRECATED -- use setFilterLevel instead
- kHighQualityDownsampleBitmap_Flag = 0x8000, // temporary flag
-
// when adding extra flags, note that the fFlags member is specified
// with a bit-width and you'll have to expand it.