Refine FontLoadHistograms::recordRemoteFont() logic

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

Index: third_party/WebKit/Source/core/css/RemoteFontFaceSource.cpp
diff --git a/third_party/WebKit/Source/core/css/RemoteFontFaceSource.cpp b/third_party/WebKit/Source/core/css/RemoteFontFaceSource.cpp
index b90978fb69e96151c5bbbafa07d3eae875576297..540430901f82395b540e30e7174d03f4e137efb0 100644
--- a/third_party/WebKit/Source/core/css/RemoteFontFaceSource.cpp
+++ b/third_party/WebKit/Source/core/css/RemoteFontFaceSource.cpp
@@ -265,10 +265,10 @@ void RemoteFontFaceSource::FontLoadHistograms::recordFallbackTime(const FontReso
 
 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.