Remove the use of OwnedPtrDeleter in HarfBuzzFace.

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

 /*
  * 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 35 matching lines @@
 
 #include <SkPaint.h>
 #include <SkPath.h>
 #include <SkPoint.h>
 #include <SkRect.h>
 #include <SkTypeface.h>
 
 
 namespace blink {
 
+struct HbFontDeleter {
+    void operator()(hb_font_t* font)
+    {
+        if (font)
+            hb_font_destroy(font);
+    }
+};
+
+using HbFontUniquePtr = std::unique_ptr<hb_font_t, HbFontDeleter>;
+
+struct HbFaceDeleter {
+    void operator()(hb_face_t* face)
+    {
+        if (face)
+            hb_face_destroy(face);
+    }
+};
+
+using HbFaceUniquePtr = std::unique_ptr<hb_face_t, HbFaceDeleter>;
+
 // struct to carry user-pointer data for hb_font_t callback functions.
 struct HarfBuzzFontData {
     USING_FAST_MALLOC(HarfBuzzFontData);
     WTF_MAKE_NONCOPYABLE(HarfBuzzFontData);
 public:
 
     HarfBuzzFontData()
         : m_paint()
         , m_simpleFontData(nullptr)
         , m_rangeSet(nullptr)
@@ skipping 18 matching lines @@
     {
         ASSERT(hbFont);
         return adoptRef(new HbFontCacheEntry(hbFont));
     }
 
     hb_font_t* hbFont() { return m_hbFont.get(); }
     HarfBuzzFontData* hbFontData() { return m_hbFontData.get(); }
 
 private:
     explicit HbFontCacheEntry(hb_font_t* font)
-        : m_hbFont(adoptPtr(font))
+        : m_hbFont(HbFontUniquePtr(font))
         , m_hbFontData(adoptPtr(new HarfBuzzFontData()))
     { };
 
-    OwnPtr<hb_font_t> m_hbFont;
+    HbFontUniquePtr m_hbFont;
     OwnPtr<HarfBuzzFontData> m_hbFontData;
 };
 
 typedef HashMap<uint64_t, RefPtr<HbFontCacheEntry>, WTF::IntHash<uint64_t>, WTF::UnsignedWithZeroKeyHashTraits<uint64_t>> HarfBuzzFontCache;
 
 static HarfBuzzFontCache* harfBuzzFontCache()
 {
     DEFINE_STATIC_LOCAL(HarfBuzzFontCache, s_harfBuzzFontCache, ());
     return &s_harfBuzzFontCache;
 }
 
 static PassRefPtr<HbFontCacheEntry> createHbFontCacheEntry(hb_face_t*);
 
 HarfBuzzFace::HarfBuzzFace(FontPlatformData* platformData, uint64_t uniqueID)
     : m_platformData(platformData)
     , m_uniqueID(uniqueID)
 {
     HarfBuzzFontCache::AddResult result = harfBuzzFontCache()->add(m_uniqueID, nullptr);
     if (result.isNewEntry) {
-        OwnPtr<hb_face_t> face = adoptPtr(createFace());
+        HbFaceUniquePtr face(createFace());
         result.storedValue->value = createHbFontCacheEntry(face.get());
     }
     result.storedValue->value->ref();
     m_unscaledFont = result.storedValue->value->hbFont();
     m_harfBuzzFontData = result.storedValue->value->hbFontData();
 }
 
 HarfBuzzFace::~HarfBuzzFace()
 {
     HarfBuzzFontCache::iterator result = harfBuzzFontCache()->find(m_uniqueID);
@@ skipping 166 matching lines @@
     hb_face_t* face = hb_coretext_face_create(m_platformData->cgFont());
 #else
     hb_face_t* face = hb_face_create_for_tables(harfBuzzSkiaGetTable, m_platformData->typeface(), 0);
 #endif
     ASSERT(face);
     return face;
 }
 
 PassRefPtr<HbFontCacheEntry> createHbFontCacheEntry(hb_face_t* face)
 {
-    OwnPtr<hb_font_t> otFont = adoptPtr(hb_font_create(face));
+    HbFontUniquePtr otFont(hb_font_create(face));
     hb_ot_font_set_funcs(otFont.get());
     // Creating a sub font means that non-available functions
     // are found from the parent.
     hb_font_t* unscaledFont = hb_font_create_sub_font(otFont.get());
     RefPtr<HbFontCacheEntry> cacheEntry = HbFontCacheEntry::create(unscaledFont);
     hb_font_set_funcs(unscaledFont, harfBuzzSkiaGetFontFuncs(), cacheEntry->hbFontData(), nullptr);
     return cacheEntry;
 }
 
 hb_font_t* HarfBuzzFace::getScaledFont(PassRefPtr<UnicodeRangeSet> rangeSet) const
 {
     m_platformData->setupPaint(&m_harfBuzzFontData->m_paint);
     m_harfBuzzFontData->m_rangeSet = rangeSet;
     m_harfBuzzFontData->m_simpleFontData = FontCache::fontCache()->fontDataFromFontPlatformData(m_platformData);
     ASSERT(m_harfBuzzFontData->m_simpleFontData);
     int scale = SkiaScalarToHarfBuzzPosition(m_platformData->size());
     hb_font_set_scale(m_unscaledFont, scale, scale);
     return m_unscaledFont;
 }
 
 } // namespace blink