Move glyph lookup to hb-ot-font and remove glyph cache in HarfBuzzFace

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

 /*
  * Copyright (c) 2012 Google Inc. 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.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 25 matching lines @@
 #include "wtf/Noncopyable.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefCounted.h"
 #include "wtf/RefPtr.h"
 #include "wtf/text/CharacterNames.h"
 
 #include <hb.h>
 
 namespace blink {
 
+template<typename T>
+class HarfBuzzScopedPtr {
+    STACK_ALLOCATED();
+    WTF_MAKE_NONCOPYABLE(HarfBuzzScopedPtr);
+public:
+    typedef void (*DestroyFunction)(T*);
+
+    HarfBuzzScopedPtr(T* ptr, DestroyFunction destroy)
+        : m_ptr(ptr)
+        , m_destroy(destroy)
+    {
+        ASSERT(m_destroy);
+    }
+    ~HarfBuzzScopedPtr()
+    {
+        if (m_ptr)
+            (*m_destroy)(m_ptr);
+    }
+
+    T* get() { return m_ptr; }
+    void set(T* ptr) { m_ptr = ptr; }
+private:
+    T* m_ptr;
+    DestroyFunction m_destroy;
+};
+
 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)
     {
         return adoptRef(new HarfBuzzFace(platformData, uniqueID));
     }
     ~HarfBuzzFace();
 
     // 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* createFont(unsigned rangeFrom = 0, unsigned rangeTo = kMaxCodepoint) 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;
-    WTF::HashMap<uint32_t, uint16_t>* m_glyphCacheForFaceCacheEntry;
+    hb_font_t* m_unscaledFont;
+    OwnPtr<HarfBuzzFontData> m_harfBuzzFontData;
 };
 
 } // namespace blink
 
 namespace WTF {
 
 template<typename T> struct OwnedPtrDeleter;
 template<> struct OwnedPtrDeleter<hb_font_t> {
     STATIC_ONLY(OwnedPtrDeleter);
     static void deletePtr(hb_font_t* font)
     {
         if (font)
             hb_font_destroy(font);
     }
 };
 
 } // namespace WTF
 
 #endif // HarfBuzzFace_h