diff options
| author |  Ben Wagner <bungeman@google.com> | 2018-05-09 16:00:41 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-09 21:27:11 +0000 |
| commit | d813f9cdc75879639b990b2068deb5a755954e58 (patch) | |
| tree | f4ca8292d4adf82eb96c5fcafa276d73825656dc | |
| parent | 30a067cbe6bede24a1b0fd0b4400004926ef2802 (diff) | |
Remove SkPaint::Flags::kDevKernFlag.
It isn't used any more.
Change-Id: I79fbbac13bb2595da0ae0cea7e42bca8fcccd8e8
Reviewed-on: https://skia-review.googlesource.com/127127
Commit-Queue: Ben Wagner <bungeman@google.com>
Reviewed-by: Herb Derby <herb@google.com>
| -rw-r--r-- | docs/SkPaint_Reference.bmh | 4 | ||||
| -rw-r--r-- | include/core/SkFont.h | 8 | ||||
| -rw-r--r-- | include/core/SkPaint.h | 1 |
3 files changed, 0 insertions, 13 deletions
diff --git a/docs/SkPaint_Reference.bmh b/docs/SkPaint_Reference.bmh index 677d5c1da5..e07999a434 100644 --- a/docs/SkPaint_Reference.bmh +++ b/docs/SkPaint_Reference.bmh @@ -531,7 +531,6 @@ Set SkPaintDefaults_Hinting at compile time to change the default setting. kFakeBoldText_Flag = 0x20, kLinearText_Flag = 0x40, kSubpixelText_Flag = 0x80, - kDevKernText_Flag = 0x100, kLCDRenderText_Flag = 0x200, kEmbeddedBitmapText_Flag = 0x400, kAutoHinting_Flag = 0x800, @@ -564,9 +563,6 @@ multiple settings at once. #Const kSubpixelText_Flag 0x0080 mask for setting Subpixel_Text ## - #Const kDevKernText_Flag 0x0100 - #Deprecated - ## #Const kLCDRenderText_Flag 0x0200 mask for setting LCD_Text ## diff --git a/include/core/SkFont.h b/include/core/SkFont.h index 48a3d99507..6aba230854 100644 --- a/include/core/SkFont.h +++ b/include/core/SkFont.h @@ -29,12 +29,9 @@ enum SkTextEncoding { enum Flags { kAntiAlias_Flag = 0x01, //!< mask to enable antialiasing kDither_Flag = 0x04, //!< mask to enable dithering - kUnderlineText_Flag = 0x08, //!< mask to enable underline text - kStrikeThruText_Flag = 0x10, //!< mask to enable strike-thru text kFakeBoldText_Flag = 0x20, //!< mask to enable fake-bold text kLinearText_Flag = 0x40, //!< mask to enable linear-text kSubpixelText_Flag = 0x80, //!< mask to enable subpixel text positioning - kDevKernText_Flag = 0x100, //!< mask to enable device kerning text kLCDRenderText_Flag = 0x200, //!< mask to enable subpixel glyph renderering kEmbeddedBitmapText_Flag = 0x400, //!< mask to enable embedded bitmap strikes kAutoHinting_Flag = 0x800, //!< mask to force Freetype's autohinter @@ -46,7 +43,6 @@ enum SkTextEncoding { kFakeBoldText_Flag = 0x20, //!< mask to enable fake-bold text kLinearText_Flag = 0x40, //!< mask to enable linear-text kSubpixelText_Flag = 0x80, //!< mask to enable subpixel text positioning - kDevKernText_Flag = 0x100, //!< mask to enable device kerning text kLCDRenderText_Flag = 0x200, //!< mask to enable subpixel glyph renderering kEmbeddedBitmapText_Flag = 0x400, //!< mask to enable embedded bitmap strikes kAutoHinting_Flag = 0x800, //!< mask to force Freetype's autohinter @@ -56,8 +52,6 @@ enum SkTextEncoding { kAntiAlias_Flag = 0x01, //!< mask to enable antialiasing kDither_Flag = 0x04, //!< mask to enable dithering - kUnderlineText_Flag = 0x08, //!< mask to enable underline text - kStrikeThruText_Flag = 0x10, //!< mask to enable strike-thru text 3. Antialiasing @@ -106,7 +100,6 @@ public: kVertical_Flag = 1 << 4, kEmbolden_Flag = 1 << 6, - kDevKern_Flag = 1 << 7, // ifdef ANDROID ? }; enum MaskType { @@ -141,7 +134,6 @@ public: bool isEnableAutoHints() const { return SkToBool(fFlags & kEnableAutoHints_Flag); } bool isEnableByteCodeHints() const { return SkToBool(fFlags & kEnableByteCodeHints_Flag); } bool isUseNonLinearMetrics() const { return SkToBool(fFlags & kUseNonlinearMetrics_Flag); } - bool isDevKern() const { return SkToBool(fFlags & kDevKern_Flag); } int textToGlyphs(const void* text, size_t byteLength, SkTextEncoding, SkGlyphID glyphs[], int maxGlyphCount) const; diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h index 8cc8733c27..3cc63b8fe8 100644 --- a/include/core/SkPaint.h +++ b/include/core/SkPaint.h @@ -232,7 +232,6 @@ public: kFakeBoldText_Flag = 0x20, //!< mask for setting fake bold kLinearText_Flag = 0x40, //!< mask for setting linear text kSubpixelText_Flag = 0x80, //!< mask for setting subpixel text - kDevKernText_Flag = 0x100, //!< mask for setting full hinting spacing kLCDRenderText_Flag = 0x200, //!< mask for setting LCD text kEmbeddedBitmapText_Flag = 0x400, //!< mask for setting font embedded bitmaps kAutoHinting_Flag = 0x800, //!< mask for setting auto-hinting |