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

third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp

Index: third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp
diff --git a/third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp b/third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp
index 110945c43751eea9a514f674e475a2abcfd751fd..f6b17fdf86dba1841eb3c1f430580216b4812b53 100644
--- a/third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp
+++ b/third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp
@@ -286,20 +286,20 @@ static inline bool tableHasSpace(hb_face_t* face, hb_set_t* glyphs,
 bool FontPlatformData::hasSpaceInLigaturesOrKerning(
     TypesettingFeatures features) const
 {
-    HarfBuzzFace* hbFace = harfBuzzFace();
+    const HarfBuzzFace* hbFace = harfBuzzFace();
     if (!hbFace)
         return false;
 
     hb_face_t* face = hbFace->face();
     ASSERT(face);
-    hb_font_t* font = hbFace->getScaledFont();
+    OwnPtr<hb_font_t> font = adoptPtr(hbFace->createFont());
     ASSERT(font);
 
     hb_codepoint_t space;
     // If the space glyph isn't present in the font then each space character
     // will be rendering using a fallback font, which grantees that it cannot
     // affect the shape of the preceding word.
-    if (!hb_font_get_glyph(font, spaceCharacter, 0, &space))
+    if (!hb_font_get_glyph(font.get(), spaceCharacter, 0, &space))
         return false;
 
     if (!hb_ot_layout_has_substitution(face)