Make HarfBuzzFace release SimpleFontData.

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

Index: third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzFace.cpp
diff --git a/third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzFace.cpp b/third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzFace.cpp
index cb2aae1b0a5bd47394d9f53dd3c010bf7bde6006..7f7445f535b1023a6bd6a4a27efd86bc4bf8f1a2 100644
--- a/third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzFace.cpp
+++ b/third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzFace.cpp
@@ -129,7 +129,9 @@ static HarfBuzzFontCache* harfBuzzFontCache() {
 static PassRefPtr<HbFontCacheEntry> createHbFontCacheEntry(hb_face_t*);
 
 HarfBuzzFace::HarfBuzzFace(FontPlatformData* platformData, uint64_t uniqueID)
-    : m_platformData(platformData), m_uniqueID(uniqueID) {
+    : m_platformData(platformData),
+      m_uniqueID(uniqueID),
+      m_simpleFontData(nullptr) {
   HarfBuzzFontCache::AddResult result =
       harfBuzzFontCache()->add(m_uniqueID, nullptr);
   if (result.isNewEntry) {
@@ -148,6 +150,8 @@ HarfBuzzFace::~HarfBuzzFace() {
   result.get()->value->deref();
   if (result.get()->value->refCount() == 1)
     harfBuzzFontCache()->remove(m_uniqueID);
+  if (m_simpleFontData)
+    FontCache::fontCache()->releaseFontData(m_simpleFontData);

[drott, 2016/10/11 11:40:44]

Yes, this definitely seems needed.

 }
 
 static hb_position_t SkiaScalarToHarfBuzzPosition(SkScalar value) {
@@ -370,10 +374,16 @@ hb_font_t* HarfBuzzFace::getScaledFont(
   m_platformData->setupPaint(&m_harfBuzzFontData->m_paint);
   m_harfBuzzFontData->m_paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
   m_harfBuzzFontData->m_rangeSet = rangeSet;
-  m_harfBuzzFontData->m_simpleFontData =
-      FontCache::fontCache()
-          ->fontDataFromFontPlatformData(m_platformData)
-          .get();
+  if (!m_simpleFontData) {
+    m_simpleFontData = FontCache::fontCache()
+                           ->fontDataFromFontPlatformData(m_platformData)
+                           .get();
+  }
+  DCHECK_EQ(m_simpleFontData,
+            FontCache::fontCache()
+                ->fontDataFromFontPlatformData(m_platformData, DoNotRetain)
+                .get());
+  m_harfBuzzFontData->m_simpleFontData = m_simpleFontData;
   ASSERT(m_harfBuzzFontData->m_simpleFontData);
   int scale = SkiaScalarToHarfBuzzPosition(m_platformData->size());
   hb_font_set_scale(m_unscaledFont, scale, scale);