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

third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzShaper.cpp

 /*
  * Copyright (c) 2012 Google Inc. All rights reserved.
  * Copyright (C) 2013 BlackBerry Limited. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 277 matching lines @@
 
     hb_buffer_set_language(harfBuzzBuffer, language);
     hb_buffer_set_script(harfBuzzBuffer, ICUScriptToHBScript(currentRunScript));
     hb_buffer_set_direction(harfBuzzBuffer, TextDirectionToHBDirection(m_textRun.direction(),
         m_font->getFontDescription().orientation(), currentFont));
 
     addToHarfBuzzBufferInternal(harfBuzzBuffer,
         m_font->getFontDescription(), m_normalizedBuffer.get(), m_normalizedBufferLength,
         startIndex, numCharacters);
 
-    hb_font_t* hbFont = face->getScaledFont(currentFontRangeSet);
-    hb_shape(hbFont, harfBuzzBuffer, m_features.isEmpty() ? 0 : m_features.data(), m_features.size());
+    HarfBuzzScopedPtr<hb_font_t> harfBuzzFont(face->createFont(currentFontRangeSet), hb_font_destroy);
+    hb_shape(harfBuzzFont.get(), harfBuzzBuffer, m_features.isEmpty() ? 0 : m_features.data(), m_features.size());
 
     return true;
 }
 
 bool HarfBuzzShaper::extractShapeResults(hb_buffer_t* harfBuzzBuffer,
     ShapeResult* shapeResult,
     bool& fontCycleQueued, const HolesQueueItem& currentQueueItem,
     const SimpleFontData* currentFont,
     UScriptCode currentRunScript,
     bool isLastResort)
@@ skipping 369 matching lines @@
     result->m_width = run->m_width;
     result->m_numGlyphs = count;
     ASSERT(result->m_numGlyphs == count); // no overflow
     result->m_hasVerticalOffsets = fontData->platformData().isVerticalAnyUpright();
     result->m_runs.append(run.release());
     return result.release();
 }
 
 
 } // namespace blink