Cache hb_font_t and the user data container instead of hb_face_t

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 42 matching lines @@
 
     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* getScaledFont(PassRefPtr<UnicodeRangeSet> = nullptr);
-    hb_face_t* face() const { return m_face; }
+    hb_font_t* getScaledFont(PassRefPtr<UnicodeRangeSet> = nullptr) const;
 
 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;
+    hb_font_t* m_unscaledFont;
+    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);
     }
 };
 
+template<typename T> struct OwnedPtrDeleter;
+template<> struct OwnedPtrDeleter<hb_face_t> {
+    STATIC_ONLY(OwnedPtrDeleter);
+    static void deletePtr(hb_face_t* face)
+    {
+        if (face)
+            hb_face_destroy(face);
+    }
+};
+
 } // namespace WTF
 
 #endif // HarfBuzzFace_h