commit 160422338c1074956ba808b430a1d20b3c51cd84
author Mike Reed <reed@google.com> Sat Jan 12 14:26:27 2019 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Sat Jan 12 19:58:53 2019 +0000
tree 29da1b3858f450b7e13ef07786bf38c7df26b6a9
parent 9a97c96c9c3a04374af1726d698ddc35e0d728c4

allow flag defines for paint

Bug: skia:
Change-Id: I2c422ac2fe86d9205189119be3f0d51df994596b
Reviewed-on: https://skia-review.googlesource.com/c/183394
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Auto-Submit: Mike Reed <reed@google.com>

include/core/SkPaint.h

diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h
index 81da896..550845f 100644
--- a/include/core/SkPaint.h
+++ b/include/core/SkPaint.h
@@ -208,7 +208,6 @@
     enum Flags {
         kAntiAlias_Flag          = 0x01,   //!< mask for setting anti-alias
         kDither_Flag             = 0x04,   //!< mask for setting dither
-#ifdef SK_SUPPORT_LEGACY_PAINT_FONT_FIELDS
         kFakeBoldText_Flag       = 0x20,   //!< mask for setting fake bold
         kLinearText_Flag         = 0x40,   //!< mask for setting linear text
         kSubpixelText_Flag       = 0x80,   //!< mask for setting subpixel text
@@ -217,9 +216,6 @@
         kAutoHinting_Flag        = 0x800,  //!< mask for setting force hinting
                                            // 0x1000 used to be kVertical
         kAllFlags                = 0xFFFF, //!< mask of all Flags
-#else
-        kAllFlags                = 0x05,
-#endif
     };
 
     #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK