RemoteFontFaceSource should keep FontCustomPlatformData over FontResource revalidation

third_party/WebKit/Source/core/loader/resource/FontResource.cpp

 /*
  * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Torch Mobile, Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 113 matching lines @@
 void FontResource::startLoadLimitTimers() {
   DCHECK(isLoading());
   DCHECK_EQ(m_loadLimitState, LoadNotStarted);
   m_loadLimitState = UnderLimit;
   m_fontLoadShortLimitTimer.startOneShot(fontLoadWaitShortLimitSec,
                                          BLINK_FROM_HERE);
   m_fontLoadLongLimitTimer.startOneShot(fontLoadWaitLongLimitSec,
                                         BLINK_FROM_HERE);
 }
 
-bool FontResource::ensureCustomFontData() {
+PassRefPtr<FontCustomPlatformData> FontResource::getCustomFontData() {
   if (!m_fontData && !errorOccurred() && !isLoading()) {
     if (data())
       m_fontData = FontCustomPlatformData::create(data(), m_otsParsingMessage);
 
     if (m_fontData) {
       recordPackageFormatHistogram(packageFormatOf(data()));
     } else {
       setStatus(ResourceStatus::DecodeError);
       recordPackageFormatHistogram(PackageFormatUnknown);
     }
   }
-  return m_fontData.get();
-}
-
-FontPlatformData FontResource::platformDataFromCustomData(
-    float size,
-    bool bold,
-    bool italic,
-    FontOrientation orientation,
-    FontVariationSettings* fontVariationSettings) {
-  DCHECK(m_fontData);
-  return m_fontData->fontPlatformData(size, bold, italic, orientation,
-                                      fontVariationSettings);
+  return m_fontData;
 }
 
 void FontResource::willReloadAfterDiskCacheMiss() {
   DCHECK(isLoading());
   DCHECK(loader()->isCacheAwareLoadingActivated());
   if (m_loadLimitState == ShortLimitExceeded ||
       m_loadLimitState == LongLimitExceeded) {
     notifyClientsShortLimitExceeded();
   }
   if (m_loadLimitState == LongLimitExceeded)
@@ skipping 35 matching lines @@
 }
 
 void FontResource::notifyClientsLongLimitExceeded() {
   ProhibitAddRemoveClientInScope prohibitAddRemoveClient(this);
   ResourceClientWalker<FontResourceClient> walker(clients());
   while (FontResourceClient* client = walker.next())
     client->fontLoadLongLimitExceeded(this);
 }
 
 void FontResource::allClientsAndObserversRemoved() {
-  m_fontData.reset();
+  m_fontData.clear();
   Resource::allClientsAndObserversRemoved();
 }
 
 void FontResource::checkNotify() {
   m_fontLoadShortLimitTimer.stop();
   m_fontLoadLongLimitTimer.stop();
 
   Resource::checkNotify();
 }
 
@@ skipping 14 matching lines @@
   Resource::onMemoryDump(level, memoryDump);
   if (!m_fontData)
     return;
   const String name = getMemoryDumpName() + "/decoded_webfont";
   WebMemoryAllocatorDump* dump = memoryDump->createMemoryAllocatorDump(name);
   dump->addScalar("size", "bytes", m_fontData->dataSize());
   memoryDump->addSuballocation(dump->guid(), "malloc");
 }
 
 }  // namespace blink