diff options
| author | Hal Canary <halcanary@google.com> | 2019-01-21 18:51:32 +0000 |
|---|---|---|
| committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2019-01-21 18:51:39 +0000 |
| commit | 02738a86e5fd44f0a2c91882a9fba727e803530a (patch) | |
| tree | d7c626b6e88fea830c87026859d32dddb02571a4 /include | |
| parent | 9c6ee015c352e0172d1707f260e02d3d19739cd4 (diff) | |
| download | skqp-02738a86e5fd44f0a2c91882a9fba727e803530a.tar.gz | |
Revert "hide hinting and flag enums with PAINT_FLAGS"
This reverts commit 5d052dac3ac19e6ddff8b004541310241a4e70e5.
Reason for revert: BREAKS CHROMIUM ROLL.
https://cs.chromium.org/chromium/src/third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc?l=49
| FAILED: obj/third_party/blink/renderer/platform/platform/font_platform_data_win.obj
| ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(49,29):
| error: no member named 'kLCDRenderText_Flag' in 'SkPaint'
| if (text_flags & SkPaint::kLCDRenderText_Flag) {
| ~~~~~~~~~^
| ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(51,36):
| error: no member named 'kAntiAlias_Flag' in 'SkPaint'
| } else if (text_flags & SkPaint::kAntiAlias_Flag) {
| ~~~~~~~~~^
| ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(56,52):
| error: no member named 'kSubpixelText_Flag' in 'SkPaint'
| font->setSubpixel(SkToBool(text_flags & SkPaint::kSubpixelText_Flag));
| ~~~~~~~~~^
| ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(64,29):
| error: no member named 'kAntiAlias_Flag' in 'SkPaint'
| if (text_flags & SkPaint::kAntiAlias_Flag)
| ~~~~~~~~~^
| ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(85,27):
| error: no member named 'kAntiAlias_Flag' in 'SkPaint'
| ? SkPaint::kAntiAlias_Flag
| ~~~~~~~~~^
| ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(91,35):
| error: no member named 'kLCDRenderText_Flag' in 'SkPaint'
| ? SkPaint::kLCDRenderText_Flag
| ~~~~~~~~~^
| ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(93,27):
| error: no member named 'kAntiAlias_Flag' in 'SkPaint'
| text_flags = SkPaint::kAntiAlias_Flag | lcd_flag;
| ~~~~~~~~~^
| ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(101,28):
| error: no member named 'kAntiAlias_Flag' in 'SkPaint'
| text_flags |= SkPaint::kAntiAlias_Flag;
| ~~~~~~~~~^
| 8 errors generated.
Original change's description:
> hide hinting and flag enums with PAINT_FLAGS
>
> A preflight for https://skia-review.googlesource.com/c/skia/+/185460
>
> Bug: skia:2664
> Change-Id: I83f7f9cd500e8507b559462835477ba8ae7c11ab
> Reviewed-on: https://skia-review.googlesource.com/c/185540
> Reviewed-by: Mike Reed <reed@google.com>
> Commit-Queue: Mike Reed <reed@google.com>
> Auto-Submit: Mike Reed <reed@google.com>
TBR=reed@google.com
Change-Id: I4d1581a7e29267ad459ed31d4885b823fa00066f
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:2664
Reviewed-on: https://skia-review.googlesource.com/c/185680
Reviewed-by: Hal Canary <halcanary@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/core/SkPaint.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h index 10725eaa09..057f145b1c 100644 --- a/include/core/SkPaint.h +++ b/include/core/SkPaint.h @@ -183,7 +183,6 @@ public: */ void reset(); -#ifdef SK_SUPPORT_LEGACY_PAINT_FLAGS /** Sets level of glyph outline adjustment. Does not check for valid values of hintingLevel. @@ -228,6 +227,7 @@ public: }; #endif +#ifdef SK_SUPPORT_LEGACY_PAINT_FLAGS /** Returns paint settings described by SkPaint::Flags. Each setting uses one bit, and can be tested with SkPaint::Flags members. @@ -250,7 +250,7 @@ public: @return kAntiAlias_Flag state */ bool isAntiAlias() const { - return SkToBool(this->internal_getFlags() & 1); + return SkToBool(this->internal_getFlags() & kAntiAlias_Flag); } /** Requests, but does not require, that edge pixels draw opaque or with @@ -270,7 +270,7 @@ public: @return kDither_Flag state */ bool isDither() const { - return SkToBool(this->internal_getFlags() & 4); + return SkToBool(this->internal_getFlags() & kDither_Flag); } /** Requests, but does not require, to distribute color error. |