Move webfont usage metrics reporting to FontResource

Source/core/css/CSSFontFaceSource.cpp

 /*
  * Copyright (C) 2007, 2008, 2010, 2011 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 232 matching lines @@
 
 bool CSSFontFaceSource::isLocalFontAvailable(const FontDescription& fontDescription)
 {
     if (!isLocal())
         return false;
     return fontCache()->isPlatformFontAvailable(fontDescription, m_string, true);
 }
 
 void CSSFontFaceSource::willUseFontData()
 {
-    if (!isLoaded())
-        m_histograms.willUseFontData();
-}
-
-CSSFontFaceSource::FontLoadHistograms::~FontLoadHistograms()
-{
-    if (m_styledTime > 0)
-        HistogramSupport::histogramEnumeration("WebFont.UsageType", StyledButNotUsed, UsageTypeMax);
-}
-
-void CSSFontFaceSource::FontLoadHistograms::willUseFontData()
-{
-    if (!m_styledTime)
-        m_styledTime = currentTimeMS();
+    if (m_font)
+        m_font->willUseFontData();
 }
 
 void CSSFontFaceSource::FontLoadHistograms::loadStarted()
 {
     if (!m_loadStartTime)
         m_loadStartTime = currentTimeMS();
-
-    if (m_styledTime < 0)
-        return;
-    if (!m_styledTime) {
-        HistogramSupport::histogramEnumeration("WebFont.UsageType", NotStyledButUsed, UsageTypeMax);
-    } else {
-        int duration = static_cast<int>(currentTimeMS() - m_styledTime);
-        HistogramSupport::histogramCustomCounts("WebFont.StyleRecalcToDownloadLatency", duration, 0, 10000, 50);
-        HistogramSupport::histogramEnumeration("WebFont.UsageType", StyledAndUsed, UsageTypeMax);
-    }
-    m_styledTime = -1;
 }
 
 void CSSFontFaceSource::FontLoadHistograms::recordLocalFont(bool loadSuccess)
 {
     if (!m_loadStartTime) {
         HistogramSupport::histogramEnumeration("WebFont.LocalFontUsed", loadSuccess ? 1 : 0, 2);
         m_loadStartTime = -1; // Do not count this font again.
     }
 }
 
@@ skipping 17 matching lines @@
     if (size < 50 * 1024)
         return "WebFont.DownloadTime.1.10KBTo50KB";
     if (size < 100 * 1024)
         return "WebFont.DownloadTime.2.50KBTo100KB";
     if (size < 1024 * 1024)
         return "WebFont.DownloadTime.3.100KBTo1MB";
     return "WebFont.DownloadTime.4.Over1MB";
 }
 
 }