diff options
| author |  Hal Canary <halcanary@google.com> | 2018-05-09 11:50:34 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-09 18:00:35 +0000 |
| commit | 46cc3dabaff7daa6b57e3c33997153d986219579 (patch) | |
| tree | 809ca0d62fddcbd3b378d0a4d330692ebd58748d /src/core/SkAdvancedTypefaceMetrics.h | |
| parent | 06d374694a515d064a26e6c5391bce9a0c5c8aa0 (diff) | |
Revert "Revert "SkAdvancedTypefaceMetrics: factor out GlyphToUnicode""
This reverts commit 97c1108607584b6050a6880d6ce22846e4913a92.
Change-Id: Ic3c6addc64ced39766bbee3e10b4d88faf61ba2f
Reviewed-on: https://skia-review.googlesource.com/127021
Reviewed-by: Hal Canary <halcanary@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
Diffstat (limited to 'src/core/SkAdvancedTypefaceMetrics.h')
| -rw-r--r-- | src/core/SkAdvancedTypefaceMetrics.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/core/SkAdvancedTypefaceMetrics.h b/src/core/SkAdvancedTypefaceMetrics.h index 6be3d443bf..e9af831422 100644 --- a/src/core/SkAdvancedTypefaceMetrics.h +++ b/src/core/SkAdvancedTypefaceMetrics.h @@ -10,9 +10,7 @@ #include "SkBitmaskEnum.h" #include "SkRect.h" -#include "SkRefCnt.h" #include "SkString.h" -#include "SkTDArray.h" /** \class SkAdvancedTypefaceMetrics @@ -21,11 +19,6 @@ SkTypeface::getAdvancedMetrics. */ struct SkAdvancedTypefaceMetrics { - SkAdvancedTypefaceMetrics() {} - SkAdvancedTypefaceMetrics(const SkAdvancedTypefaceMetrics&) = delete; - SkAdvancedTypefaceMetrics& operator=(const SkAdvancedTypefaceMetrics&) = delete; - ~SkAdvancedTypefaceMetrics() {} - // The PostScript name of the font. See `FontName` and `BaseFont` in PDF standard. SkString fPostScriptName; SkString fFontName; @@ -70,9 +63,6 @@ struct SkAdvancedTypefaceMetrics { int16_t fCapHeight = 0; // Height (from baseline) of top of flat capitals. SkIRect fBBox = {0, 0, 0, 0}; // The bounding box of all glyphs (in font units). - - // The mapping from glyph to Unicode; array indices are glyph ids. - SkTDArray<SkUnichar> fGlyphToUnicode; }; namespace skstd { |