RemoteFontFaceSource should keep FontCustomPlatformData over FontResource revalidation

third_party/WebKit/Source/core/css/RemoteFontFaceSource.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef RemoteFontFaceSource_h
 #define RemoteFontFaceSource_h
 
 #include "core/css/CSSFontFaceSource.h"
 #include "core/loader/resource/FontResource.h"
 #include "wtf/Allocator.h"
 
 namespace blink {
 
 class CSSFontSelector;
+class FontCustomPlatformData;
 
 enum FontDisplay {
   FontDisplayAuto,
   FontDisplayBlock,
   FontDisplaySwap,
   FontDisplayFallback,
   FontDisplayOptional,
   FontDisplayEnumMax
 };
 
@@ skipping 56 matching lines @@
           m_blankPaintTime(0),
           m_isLongLimitExceeded(false),
           m_dataSource(dataSource),
           m_fontDisplay(fontDisplay) {}
     void loadStarted();
     void fallbackFontPainted(DisplayPeriod);
     void fontLoaded(bool isCorsFailed,
                     bool loadError,
                     bool isInterventionTriggered);
     void longLimitExceeded(bool isInterventionTriggered);
-    void recordFallbackTime(const FontResource*);
+    void recordFallbackTime();
     void recordRemoteFont(const FontResource*, bool isInterventionTriggered);
     bool hadBlankText() { return m_blankPaintTime; }
     DataSource dataSource() { return m_dataSource; }
     void maySetDataSource(DataSource);
 
    private:
     void recordLoadTimeHistogram(const FontResource*,
                                  int duration,
                                  bool isInterventionTriggered);
     void recordInterventionResult(bool isTriggered);
     CacheHitMetrics dataSourceMetricsValue();
     double m_loadStartTime;
     double m_blankPaintTime;
     bool m_isLongLimitExceeded;
     DataSource m_dataSource;
     FontDisplay m_fontDisplay;
   };
 
   void switchToSwapPeriod();
   void switchToFailurePeriod();
   bool shouldTriggerWebFontsIntervention();
   bool isLowPriorityLoadingAllowedForRemoteFont() const override;
 
+  // Cleared once load is finished.
   Member<FontResource> m_font;
+
   Member<CSSFontSelector> m_fontSelector;
+
+  // |nullptr| if font is not loaded or failed to decode.
+  RefPtr<FontCustomPlatformData> m_customFontData;
+
   const FontDisplay m_display;
   DisplayPeriod m_period;
   FontLoadHistograms m_histograms;
   bool m_isInterventionTriggered;
 };
 
 }  // namespace blink
 
 #endif