Log web fonts intervention result more accurately

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/fetch/FontResource.h"
 #include "wtf/Allocator.h"
@@ skipping 58 matching lines @@
     // metrics values.
     enum CacheHitMetrics { Miss, DiskHit, DataUrl, MemoryHit, CacheHitEnumMax };
     enum DataSource {
       FromUnknown,
       FromDataURL,
       FromMemoryCache,
       FromDiskCache,
       FromNetwork
     };
 
-    FontLoadHistograms(DataSource dataSource)
+    FontLoadHistograms(DataSource dataSource, FontDisplay fontDisplay)
         : m_loadStartTime(0),
           m_blankPaintTime(0),
           m_isLongLimitExceeded(false),
-          m_dataSource(dataSource) {}
+          m_dataSource(dataSource),
+          m_fontDisplay(fontDisplay) {}
     void loadStarted();
     void fallbackFontPainted(DisplayPeriod);
-    void fontLoaded(bool isInterventionTriggered);
-    void longLimitExceeded(bool isInterventionTriggered);
+    void fontLoaded(bool isCorsFailed,
+                    bool loadError,
+                    bool isInterventionTriggered);
+    void longLimitExceeded(bool isCorsFailed,
+                           bool loadError,
+                           bool isInterventionTriggered);
     void recordFallbackTime(const FontResource*);
     void recordRemoteFont(const FontResource*);
     bool hadBlankText() { return m_blankPaintTime; }
     DataSource dataSource() { return m_dataSource; }
     void maySetDataSource(DataSource);
 
    private:
     void recordLoadTimeHistogram(const FontResource*, int duration);
-    void recordInterventionResult(bool isTriggered);
+    void recordInterventionResult(bool isCorsFailed,
+                                  bool loadError,
+                                  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();
 
   Member<FontResource> m_font;
   Member<CSSFontSelector> m_fontSelector;
   const FontDisplay m_display;
   DisplayPeriod m_period;
   FontLoadHistograms m_histograms;
   bool m_isInterventionTriggered;
 };
 
 }  // namespace blink
 
 #endif