diff options
author | Mike Reed <reed@google.com> | 2019-01-15 02:21:00 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2019-01-15 02:21:06 +0000 |
commit | e922a9c0f674a9633ed1c6e2975a783b76ab374b (patch) | |
tree | 503d36c3002d83a6cf440a3c8b0ee1b851e4d559 /include | |
parent | 330b08511df02e8e8aace9e4279f1be07f21af41 (diff) | |
download | skqp-e922a9c0f674a9633ed1c6e2975a783b76ab374b.tar.gz |
Reland "remove SK_SUPPORT_LEGACY_PAINT_FONT_FIELDS"
This reverts commit 3e91b123543823f9e7fb844756273a4fc9f3a760.
Reason for revert: should be able to support older skps now
Original change's description:
> Revert "remove SK_SUPPORT_LEGACY_PAINT_FONT_FIELDS"
>
> This reverts commit e0e41efcfb3afa1ed1faef7d93014508391c2f44.
>
> Reason for revert: did this break loading old skps?
>
> Original change's description:
> > remove SK_SUPPORT_LEGACY_PAINT_FONT_FIELDS
> >
> > Bug: skia:
> > Change-Id: I756bf2e3e37d6f2bb1d4a786ce8f41a25f83ba67
> > Reviewed-on: https://skia-review.googlesource.com/c/183320
> > 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: Iefec7a1fa52fcff4f937532de41f3828cdeaf186
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:
> Reviewed-on: https://skia-review.googlesource.com/c/183802
> Reviewed-by: Mike Reed <reed@google.com>
> Commit-Queue: Mike Reed <reed@google.com>
TBR=reed@google.com
Change-Id: I0a8e4f8787b812ff09d76354e295e3b296fa73cf
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/c/184021
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/core/SkFontTypes.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/core/SkFontTypes.h b/include/core/SkFontTypes.h index c7c8abd257..bb1b03f227 100644 --- a/include/core/SkFontTypes.h +++ b/include/core/SkFontTypes.h @@ -12,10 +12,6 @@ // remove me once google3 uses IWYU #include "SkTypeface.h" -#ifndef SK_SUPPORT_LEGACY_PAINT_FONT_FIELDS -#define SK_SUPPORT_LEGACY_PAINT_FONT_FIELDS -#endif - enum class SkTextEncoding { kUTF8, //!< uses bytes to represent UTF-8 or ASCII kUTF16, //!< uses two byte words to represent most of Unicode |