Revert "SkAdvancedTypefaceMetrics: factor out GlyphToUnicode"

This reverts commit 1c2bcd8b14e029a70e88b1e81acd29553cab0d1c.

Reason for revert: breaking chrome roll

Original change's description:
> SkAdvancedTypefaceMetrics: factor out GlyphToUnicode
> 
> Change-Id: Iedce8c1ea2c405d5ab64ccac353970d5cd2b9d63
> Reviewed-on: https://skia-review.googlesource.com/126507
> Commit-Queue: Hal Canary <halcanary@google.com>
> Reviewed-by: Ben Wagner <bungeman@google.com>

TBR=halcanary@google.com,bungeman@google.com,reed@google.com

Change-Id: Ib1ff8484ffd09cdb88d461ac00745aa32c191124
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/127000
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>

1 files changed, 10 insertions, 0 deletions

diff --git a/src/core/SkAdvancedTypefaceMetrics.h b/src/core/SkAdvancedTypefaceMetrics.h
index e9af831422..6be3d443bf 100644
--- a/src/core/SkAdvancedTypefaceMetrics.h
+++ b/src/core/SkAdvancedTypefaceMetrics.h
@@ -10,7 +10,9 @@
 
 #include "SkBitmaskEnum.h"
 #include "SkRect.h"
+#include "SkRefCnt.h"
 #include "SkString.h"
+#include "SkTDArray.h"
 
 /** \class SkAdvancedTypefaceMetrics
 
@@ -19,6 +21,11 @@
     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;
@@ -63,6 +70,9 @@ 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 {