aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMike Reed <reed@google.com>2018-11-16 19:41:48 +0000
committerSkia Commit-Bot <skia-commit-bot@chromium.org>2018-11-16 19:41:55 +0000
commit55bdb7c5666270702031e92ef4fbac24ac324634 (patch)
tree1e303cf65c8b19d09fd704fde9feaac15de045eb /include
parent19ec80fb37ceea46b7c010ef729d1824b18482f0 (diff)
downloadskqp-55bdb7c5666270702031e92ef4fbac24ac324634.tar.gz
Reland "remove dead code around SK_SUPPORT_LEGACY_FONT_FLAGS"
This reverts commit c41a41d67e585ce3beee3934864a56a2d841386c. Reason for revert: hmmm, this might still work in Fuchsia... Original change's description: > Revert "remove dead code around SK_SUPPORT_LEGACY_FONT_FLAGS" > > This reverts commit 3b155a77c3704c3f3c5b741d60990e5ee959b261. > > Reason for revert: breaks fuchsia (needs to roll newer flutter) > > Original change's description: > > remove dead code around SK_SUPPORT_LEGACY_FONT_FLAGS > > > > Bug: skia: > > Change-Id: I5a36e6827610c2a429e2f8b36adf432b95993c54 > > Reviewed-on: https://skia-review.googlesource.com/c/171529 > > Reviewed-by: Mike Reed <reed@google.com> > > Commit-Queue: Mike Reed <reed@google.com> > > TBR=reed@google.com > > Change-Id: I37bfab86e4a4243ddd94255aa0b126414bd9e835 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: skia: > Reviewed-on: https://skia-review.googlesource.com/c/171536 > Reviewed-by: Mike Reed <reed@google.com> > Commit-Queue: Mike Reed <reed@google.com> TBR=reed@google.com Change-Id: I12183ecfb5e17b8919afbce7b42dad2064ee93b3 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia: Reviewed-on: https://skia-review.googlesource.com/c/171538 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'include')
-rw-r--r--include/core/SkFont.h42
1 files changed, 0 insertions, 42 deletions
diff --git a/include/core/SkFont.h b/include/core/SkFont.h
index a93c42c412..58fb6d9c01 100644
--- a/include/core/SkFont.h
+++ b/include/core/SkFont.h
@@ -18,29 +18,6 @@ struct SkFontMetrics;
class SK_API SkFont {
public:
-#ifdef SK_SUPPORT_LEGACY_FONT_FLAGS
- enum Flags {
- /**
- * Use the system's automatic hinting mechanism to hint the typeface.
- */
- kForceAutoHinting_Flag = 1 << 0,
-
- /**
- * If the typeface contains explicit bitmaps for hinting, use them.
- * If both bytecode and auto hints are also specified, attempt to use the bitmaps first;
- * if that fails (e.g. there are no bitmaps), then attempt to bytecode or autohint.
- */
- kEmbeddedBitmaps_Flag = 1 << 1,
-
- kSubpixel_Flag = 1 << 2,
- kLinearMetrics_Flag = 1 << 3,
- kEmbolden_Flag = 1 << 4,
-
- kDEPRECATED_Antialias_Flag = 1 << 5,
- kDEPRECATED_LCDRender_Flag = 1 << 6,
- };
-#endif
-
enum class Edging {
kAlias,
kAntiAlias,
@@ -57,10 +34,6 @@ public:
SkFont();
SkFont(sk_sp<SkTypeface>, SkScalar size);
SkFont(sk_sp<SkTypeface>, SkScalar size, SkScalar scaleX, SkScalar skewX);
-#ifdef SK_SUPPORT_LEGACY_FONT_FLAGS
- SkFont(sk_sp<SkTypeface>, SkScalar size, uint32_t flags);
- SkFont(sk_sp<SkTypeface>, SkScalar size, SkScalar scaleX, SkScalar skewX, uint32_t flags);
-#endif
bool isForceAutoHinting() const { return SkToBool(fFlags & kForceAutoHinting_PrivFlag); }
bool isEmbeddedBitmaps() const { return SkToBool(fFlags & kEmbeddedBitmaps_PrivFlag); }
@@ -94,21 +67,6 @@ public:
*/
SkFont makeWithSize(SkScalar size) const;
-#ifdef SK_SUPPORT_LEGACY_FONT_FLAGS
- bool DEPRECATED_isAntiAlias() const { return SkToBool(fFlags & kDEPRECATED_Antialias_Flag); }
- bool DEPRECATED_isLCDRender() const { return SkToBool(fFlags & kDEPRECATED_LCDRender_Flag); }
-
- void DEPRECATED_setAntiAlias(bool);
- void DEPRECATED_setLCDRender(bool);
-
- /**
- * Return a font with the same attributes of this font, but with the flags.
- */
- SkFont makeWithFlags(uint32_t newFlags) const;
- uint32_t getFlags() const { return fFlags; }
- void setFlags(uint32_t);
-#endif
-
SkTypeface* getTypeface() const { return fTypeface.get(); }
SkScalar getSize() const { return fSize; }
SkScalar getScaleX() const { return fScaleX; }