Use a FontPlatformData pointer for FontDataCache's key

third_party/WebKit/Source/platform/fonts/FontDataCache.cpp

 /*
  * Copyright (C) 2013 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 39 matching lines @@
         return nullptr;
 
     // TODO: crbug.com/446376 - This should not happen, but we currently
     // do not have a reproduction for the crash that an empty typeface()
     // causes downstream from here.
     if (!platformData->typeface()) {
         DLOG(ERROR) << "Empty typeface() in FontPlatformData when accessing FontDataCache.";
         return nullptr;
     }
 
-    Cache::iterator result = m_cache.find(*platformData);
+    Cache::iterator result = m_cache.find(platformData);
     if (result == m_cache.end()) {
         std::pair<RefPtr<SimpleFontData>, unsigned> newValue(SimpleFontData::create(*platformData), shouldRetain == Retain ? 1 : 0);
-        m_cache.set(*platformData, newValue);
+        // The new SimpleFontData takes a copy of the incoming FontPlatformData object. The incoming key may be
+        // temporary. So, for cache storage, take the address of the newly created FontPlatformData that is copied an
+        // owned by SimpleFontData.
+        m_cache.set(&newValue.first->platformData(), newValue);
         if (shouldRetain == DoNotRetain)
             m_inactiveFontData.add(newValue.first);
         return newValue.first.release();
     }
 
     if (!result.get()->value.second) {
         ASSERT(m_inactiveFontData.contains(result.get()->value.first));
         m_inactiveFontData.remove(result.get()->value.first);
     }
 
     if (shouldRetain == Retain) {
         result.get()->value.second++;
     } else if (!result.get()->value.second) {
         // If shouldRetain is DoNotRetain and count is 0, we want to remove the fontData from
         // m_inactiveFontData (above) and re-add here to update LRU position.
         m_inactiveFontData.add(result.get()->value.first);
     }
 
     return result.get()->value.first;
 }
 
 bool FontDataCache::contains(const FontPlatformData* fontPlatformData) const
 {
-    return m_cache.contains(*fontPlatformData);
+    return m_cache.contains(fontPlatformData);
 }
 
 void FontDataCache::release(const SimpleFontData* fontData)
 {
     ASSERT(!fontData->isCustomFont());
 
-    Cache::iterator it = m_cache.find(fontData->platformData());
+    Cache::iterator it = m_cache.find(&(fontData->platformData()));
     ASSERT(it != m_cache.end());
     if (it == m_cache.end())
         return;
 
     ASSERT(it->value.second);
     if (!--it->value.second)
         m_inactiveFontData.add(it->value.first);
 }
 
 void FontDataCache::markAllVerticalData()
@@ skipping 23 matching lines @@
     if (isPurging)
         return false;
 
     isPurging = true;
 
     Vector<RefPtr<SimpleFontData>, 20> fontDataToDelete;
     ListHashSet<RefPtr<SimpleFontData>>::iterator end = m_inactiveFontData.end();
     ListHashSet<RefPtr<SimpleFontData>>::iterator it = m_inactiveFontData.begin();
     for (int i = 0; i < count && it != end; ++it, ++i) {
         RefPtr<SimpleFontData>& fontData = *it.get();
-        m_cache.remove(fontData->platformData());
+        m_cache.remove(&(fontData->platformData()));
         // We should not delete SimpleFontData here because deletion can modify m_inactiveFontData. See http://trac.webkit.org/changeset/44011
         fontDataToDelete.append(fontData);
     }
 
     if (it == end) {
         // Removed everything
         m_inactiveFontData.clear();
     } else {
         for (int i = 0; i < count; ++i)
             m_inactiveFontData.remove(m_inactiveFontData.begin());
     }
 
     bool didWork = fontDataToDelete.size();
 
     fontDataToDelete.clear();
 
     isPurging = false;
 
     return didWork;
 }
 
 } // namespace blink