BlankText UMAs should be reported only for webfonts in block period

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/FontLoader.h"
 #include "core/page/NetworkStateNotifier.h"
@@ skipping 181 matching lines @@
     visitor->trace(m_fontLoader);
     CSSFontFaceSource::trace(visitor);
 }
 
 void RemoteFontFaceSource::FontLoadHistograms::loadStarted()
 {
     if (!m_loadStartTime)
         m_loadStartTime = currentTimeMS();
 }
 
-void RemoteFontFaceSource::FontLoadHistograms::fallbackFontPainted()
+void RemoteFontFaceSource::FontLoadHistograms::fallbackFontPainted(DisplayPeriod period)
 {
-    if (!m_fallbackPaintTime)
-        m_fallbackPaintTime = currentTimeMS();
+    if (period == BlockPeriod && !m_blankPaintTime)
+        m_blankPaintTime = currentTimeMS();
 }
 
 void RemoteFontFaceSource::FontLoadHistograms::fontLoaded(bool isInterventionTriggered)
 {
     if (!m_isLongLimitExceeded)
         recordInterventionResult(isInterventionTriggered);
 }
 
 void RemoteFontFaceSource::FontLoadHistograms::longLimitExceeded(bool isInterventionTriggered)
 {
     m_isLongLimitExceeded = true;
     recordInterventionResult(isInterventionTriggered);
 }
 
 void RemoteFontFaceSource::FontLoadHistograms::recordFallbackTime(const FontResource* font)
 {
-    if (m_fallbackPaintTime <= 0)
+    if (m_blankPaintTime <= 0)
         return;
-    int duration = static_cast<int>(currentTimeMS() - m_fallbackPaintTime);
+    int duration = static_cast<int>(currentTimeMS() - m_blankPaintTime);
     DEFINE_STATIC_LOCAL(CustomCountHistogram, blankTextShownTimeHistogram, ("WebFont.BlankTextShownTime", 0, 10000, 50));
     blankTextShownTimeHistogram.count(duration);
-    m_fallbackPaintTime = -1;
+    m_blankPaintTime = -1;
 }
 
 void RemoteFontFaceSource::FontLoadHistograms::recordRemoteFont(const FontResource* font)
 {
     if (m_loadStartTime > 0 && font && !font->isLoading()) {
         int duration = static_cast<int>(currentTimeMS() - m_loadStartTime);
         recordLoadTimeHistogram(font, duration);
         m_loadStartTime = -1;
 
         enum { Miss, Hit, DataUrl, CacheHitEnumMax };
@@ skipping 53 matching lines @@
         interventionResult |= 1 << 0;
     if (triggered)
         interventionResult |= 1 << 1;
     const int boundary = 1 << 2;
 
     DEFINE_STATIC_LOCAL(EnumerationHistogram, interventionHistogram, ("WebFont.InterventionResult", boundary));
     interventionHistogram.count(interventionResult);
 }
 
 } // namespace blink