FontLoadHistograms: classify as memory cache hit if FontResource loading not triggered

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

 // 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.
 
 #include "core/css/RemoteFontFaceSource.h"
 
 #include "core/css/CSSCustomFontData.h"
 #include "core/css/CSSFontFace.h"
 #include "core/css/CSSFontSelector.h"
 #include "core/dom/Document.h"
@@ skipping 236 matching lines @@
 
 void RemoteFontFaceSource::FontLoadHistograms::fontLoaded(bool isInterventionTriggered)
 {
     if (!m_isLongLimitExceeded)
         recordInterventionResult(isInterventionTriggered);
 }
 
 void RemoteFontFaceSource::FontLoadHistograms::longLimitExceeded(bool isInterventionTriggered)
 {
     m_isLongLimitExceeded = true;
-    if (m_dataSource == FromUnknown)
-        m_dataSource = FromNetwork;
+    maySetDataSource(FromNetwork);
     recordInterventionResult(isInterventionTriggered);
 }
 
 void RemoteFontFaceSource::FontLoadHistograms::recordFallbackTime(const FontResource* font)
 {
     if (m_blankPaintTime <= 0)
         return;
     int duration = static_cast<int>(currentTimeMS() - m_blankPaintTime);
     DEFINE_STATIC_LOCAL(CustomCountHistogram, blankTextShownTimeHistogram, ("WebFont.BlankTextShownTime", 0, 10000, 50));
     blankTextShownTimeHistogram.count(duration);
     m_blankPaintTime = -1;
 }
 
 void RemoteFontFaceSource::FontLoadHistograms::recordRemoteFont(const FontResource* font)
 {
     DEFINE_STATIC_LOCAL(EnumerationHistogram, cacheHitHistogram, ("WebFont.CacheHit", CacheHitEnumMax));
     cacheHitHistogram.count(dataSourceMetricsValue());
 
     if (m_dataSource == FromDiskCache || m_dataSource == FromNetwork) {
+        DCHECK_NE(m_loadStartTime, 0);
         int duration = static_cast<int>(currentTimeMS() - m_loadStartTime);
         recordLoadTimeHistogram(font, duration);
 
         enum { CORSFail, CORSSuccess, CORSEnumMax };
         int corsValue = font->isCORSFailed() ? CORSFail : CORSSuccess;
         DEFINE_STATIC_LOCAL(EnumerationHistogram, corsHistogram, ("WebFont.CORSSuccess", CORSEnumMax));
         corsHistogram.count(corsValue);
     }
 }
 
@@ skipping 82 matching lines @@
         return Miss;
     case FromUnknown:
         // Fall through.
     default:
         NOTREACHED();
     }
     return Miss;
 }
 
 } // namespace blink