Refine FontLoadHistograms::recordRemoteFont() logic

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 247 matching lines @@
     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)
 {
-    if (m_loadStartTime > 0 && font && !font->isLoading()) {
-        DEFINE_STATIC_LOCAL(EnumerationHistogram, cacheHitHistogram, ("WebFont.CacheHit", CacheHitEnumMax));
-        cacheHitHistogram.count(dataSourceMetricsValue());
+    DEFINE_STATIC_LOCAL(EnumerationHistogram, cacheHitHistogram, ("WebFont.CacheHit", CacheHitEnumMax));
+    cacheHitHistogram.count(dataSourceMetricsValue());
 
+    if (m_dataSource == FromDiskCache || m_dataSource == FromNetwork) {
         int duration = static_cast<int>(currentTimeMS() - m_loadStartTime);
         recordLoadTimeHistogram(font, duration);
         m_loadStartTime = -1;

[Kunihiko Sakamoto, 2016/09/16 09:03:15]

We can remove this line, as this function is called only once now.

[Shao-Chuan Lee, 2016/09/16 09:23:16]

Done.

 
         enum { CORSFail, CORSSuccess, CORSEnumMax };
         int corsValue = font->isCORSFailed() ? CORSFail : CORSSuccess;
         DEFINE_STATIC_LOCAL(EnumerationHistogram, corsHistogram, ("WebFont.CORSSuccess", CORSEnumMax));
         corsHistogram.count(corsValue);
     }
 }
 
 void RemoteFontFaceSource::FontLoadHistograms::recordLoadTimeHistogram(const FontResource* font, int duration)
 {
@@ skipping 80 matching lines @@
         return Miss;
     case FromUnknown:
         // Fall through.
     default:
         NOTREACHED();
     }
     return Miss;
 }
 
 } // namespace blink