RemoteFontFaceSource should keep FontCustomPlatformData over FontResource revalidation

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

 /*
  * Copyright (C) 2007, 2008 Apple 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:
  * 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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 11 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef FontResource_h
 #define FontResource_h
 
 #include "base/gtest_prod_util.h"
 #include "core/CoreExport.h"
 #include "platform/Timer.h"
-#include "platform/fonts/FontOrientation.h"
 #include "platform/heap/Handle.h"
 #include "platform/loader/fetch/Resource.h"
 #include "platform/loader/fetch/ResourceClient.h"
-#include <memory>
+#include "wtf/RefPtr.h"
 
 namespace blink {
 
 class FetchRequest;
 class ResourceFetcher;
-class FontPlatformData;
 class FontCustomPlatformData;
 class FontResourceClient;
-class FontVariationSettings;
 
 class CORE_EXPORT FontResource final : public Resource {
  public:
   using ClientType = FontResourceClient;
 
   static FontResource* fetch(FetchRequest&, ResourceFetcher*);
   ~FontResource() override;
 
   void didAddClient(ResourceClient*) override;
 
   void setRevalidatingRequest(const ResourceRequest&) override;
 
   void allClientsAndObserversRemoved() override;
   void startLoadLimitTimers();
 
   void setCORSFailed() override { m_corsFailed = true; }
   bool isCORSFailed() const { return m_corsFailed; }
   String otsParsingMessage() const { return m_otsParsingMessage; }
 
-  bool ensureCustomFontData();
-  FontPlatformData platformDataFromCustomData(
-      float size,
-      bool bold,
-      bool italic,
-      FontOrientation = FontOrientation::Horizontal,
-      FontVariationSettings* = nullptr);
+  PassRefPtr<FontCustomPlatformData> getCustomFontData();
 
   // Returns true if the loading priority of the remote font resource can be
   // lowered. The loading priority of the font can be lowered only if the
   // font is not needed for painting the text.
   bool isLowPriorityLoadingAllowedForRemoteFont() const;
 
   void willReloadAfterDiskCacheMiss() override;
 
   void onMemoryDump(WebMemoryDumpLevelOfDetail,
                     WebProcessMemoryDump*) const override;
@@ skipping 19 matching lines @@
 
   // This is used in UMA histograms, should not change order.
   enum LoadLimitState {
     LoadNotStarted,
     UnderLimit,
     ShortLimitExceeded,
     LongLimitExceeded,
     LoadLimitStateEnumMax
   };
 
-  std::unique_ptr<FontCustomPlatformData> m_fontData;
+  RefPtr<FontCustomPlatformData> m_fontData;
   String m_otsParsingMessage;
   LoadLimitState m_loadLimitState;
   bool m_corsFailed;
   Timer<FontResource> m_fontLoadShortLimitTimer;
   Timer<FontResource> m_fontLoadLongLimitTimer;
 
   friend class MemoryCache;
   FRIEND_TEST_ALL_PREFIXES(FontResourceTest, CacheAwareFontLoading);
 };
 
@@ skipping 18 matching lines @@
     // Only the RemoteFontFaceSources clients can prevent lowering of loading
     // priority of the remote fonts.  Set the default to true to prevent
     // other clients from incorrectly returning false.
     return true;
   }
 };
 
 }  // namespace blink
 
 #endif