diff options
| author | Mike Reed <reed@google.com> | 2018-11-21 15:10:08 -0500 |
|---|---|---|
| committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-11-21 20:44:03 +0000 |
| commit | 2ed78209704418aebfb99e858866af249da594c7 (patch) | |
| tree | 46541338da544799cbbb27c4c0be5fbd379eb65b /include | |
| parent | 3065b5223dc44050753d973d77fbc8e6429f0649 (diff) | |
| download | skqp-2ed78209704418aebfb99e858866af249da594c7.tar.gz | |
use SkFont in a lot of places
Bug: skia:
Change-Id: I86df3f650eb5bb0219b3251ef5f8e95403838bba
Reviewed-on: https://skia-review.googlesource.com/c/172482
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/core/SkFont.h | 5 | ||||
| -rw-r--r-- | include/core/SkPaint.h | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/include/core/SkFont.h b/include/core/SkFont.h index baca98c985..ade29f3242 100644 --- a/include/core/SkFont.h +++ b/include/core/SkFont.h @@ -65,6 +65,8 @@ public: */ SkFont(sk_sp<SkTypeface> typeface, SkScalar size, SkScalar scaleX, SkScalar skewX); + bool operator==(const SkFont&); + /** If true, instructs the font manager to always hint glyphs. Returned value is only meaningful if platform uses FreeType as the font manager. @@ -366,6 +368,9 @@ public: */ void LEGACY_applyToPaint(SkPaint* paint) const; /** Deprecated. + */ + void LEGACY_applyPaintFlags(uint32_t paintFlags); + /** Deprecated. */ static SkFont LEGACY_ExtractFromPaint(const SkPaint& paint); diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h index aae66a0515..71492d370c 100644 --- a/include/core/SkPaint.h +++ b/include/core/SkPaint.h @@ -948,6 +948,10 @@ public: kGlyphID_TextEncoding */ void setTextEncoding(TextEncoding encoding); + // Experimental + void setTextEncoding(SkTextEncoding encoding) { + this->setTextEncoding((TextEncoding)encoding); + } #ifdef SK_SUPPORT_LEGACY_FONTMETRICS_IN_PAINT /** |