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

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

 /*
  * Copyright (C) 2011 Brent Fulgham
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 268 matching lines @@
             0);
         if (hb_set_has(glyphs, space))
             return true;
     }
     return false;
 }
 
 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)
         && !hb_ot_layout_has_positioning(face)) {
         return false;
     }
 
     bool foundSpaceInTable = false;
     hb_set_t* glyphs = hb_set_create();
     if (features & Kerning)
@@ skipping 48 matching lines @@
     const size_t tableSize = m_typeface->getTableSize(tag);
     if (tableSize) {
         Vector<char> tableBuffer(tableSize);
         m_typeface->getTableData(tag, 0, tableSize, &tableBuffer[0]);
         buffer = SharedBuffer::adoptVector(tableBuffer);
     }
     return buffer.release();
 }
 
 } // namespace blink