Revert "Reland: Move glyph lookup to hb-ot-font and remove glyph cache in HarfBuzzFace"

third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzFace.h

Index: third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzFace.h
diff --git a/third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzFace.h b/third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzFace.h
index cdc3233a1f1b1ab6bf220a4f2740cabf2a868579..9f7c15a140927f7ae5b8e064eab60929d47d32b4 100644
--- a/third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzFace.h
+++ b/third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzFace.h
@@ -45,11 +45,12 @@
 namespace blink {
 
 class FontPlatformData;
-struct HarfBuzzFontData;
 
 class HarfBuzzFace : public RefCounted<HarfBuzzFace> {
     WTF_MAKE_NONCOPYABLE(HarfBuzzFace);
 public:
+    static const hb_tag_t vertTag;
+    static const hb_tag_t vrt2Tag;
 
     static PassRefPtr<HarfBuzzFace> create(FontPlatformData* platformData, uint64_t uniqueID)
     {
@@ -60,20 +61,18 @@ public:
     // In order to support the restricting effect of unicode-range optionally a
     // range restriction can be passed in, which will restrict which glyphs we
     // return in the harfBuzzGetGlyph function.
-    hb_font_t* getScaledFont(PassRefPtr<UnicodeRangeSet> = nullptr);
+    hb_font_t* createFont(PassRefPtr<UnicodeRangeSet> = nullptr) const;
     hb_face_t* face() const { return m_face; }
 
 private:
     HarfBuzzFace(FontPlatformData*, uint64_t);
 
     hb_face_t* createFace();
-    void prepareHarfBuzzFontData();
 
     FontPlatformData* m_platformData;
     uint64_t m_uniqueID;
     hb_face_t* m_face;
-    OwnPtr<hb_font_t> m_unscaledFont;
-    OwnPtr<HarfBuzzFontData> m_harfBuzzFontData;
+    WTF::HashMap<uint32_t, uint16_t>* m_glyphCacheForFaceCacheEntry;
 };
 
 } // namespace blink