Split SVGImage-related cases into separate UseCounter histograms

third_party/WebKit/Source/core/frame/UseCounter.cpp

 /*
  * Copyright (C) 2012 Google, 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 27 matching lines @@
 #include "platform/Histogram.h"
 #include "platform/TraceEvent.h"
 
 namespace {
 
 int totalPagesMeasuredCSSSampleId() { return 1; }
 
 // Make sure update_use_counter_css.py was run which updates histograms.xml.
 int maximumCSSSampleId() { return 539; }
 
-blink::EnumerationHistogram& useCounterHistogram()
-{
-    DEFINE_STATIC_LOCAL(blink::EnumerationHistogram, histogram, ("WebCore.UseCounter_TEST.Features", blink::UseCounter::NumberOfFeatures));
-    return histogram;
-}
-
-blink::EnumerationHistogram& CSSUseCounterHistogram()
-{
-    DEFINE_STATIC_LOCAL(blink::EnumerationHistogram, histogram, ("WebCore.UseCounter_TEST.CSSProperties", maximumCSSSampleId()));
-    return histogram;
-}
-
 } // namespace
 
 namespace blink {
 
 int UseCounter::mapCSSPropertyIdToCSSSampleIdForHistogram(CSSPropertyID cssPropertyID)
 {
     switch (cssPropertyID) {
     // Begin at 2, because 1 is reserved for totalPagesMeasuredCSSSampleId.
     case CSSPropertyColor: return 2;
     case CSSPropertyDirection: return 3;
@@ skipping 521 matching lines @@
 
     case CSSPropertyInvalid:
         ASSERT_NOT_REACHED();
         return 0;
     }
 
     ASSERT_NOT_REACHED();
     return 0;
 }
 
-UseCounter::UseCounter()
+UseCounter::UseCounter(Context context)
     : m_muteCount(0)
+    , m_context(context)
     , m_featuresRecorded(NumberOfFeatures)
     , m_CSSRecorded(lastUnresolvedCSSProperty + 1)
 {
 }
 
 void UseCounter::muteForInspector()
 {
     m_muteCount++;
 }
 
 void UseCounter::unmuteForInspector()
 {
     m_muteCount--;
 }
 
 void UseCounter::recordMeasurement(Feature feature)
 {
     if (m_muteCount)
         return;
 
     DCHECK(feature != OBSOLETE_PageDestruction && feature != PageVisits); // PageDestruction is reserved as a scaling factor.
     DCHECK(feature < NumberOfFeatures);
 
     if (!m_featuresRecorded.quickGet(feature)) {
         // Note that HTTPArchive tooling looks specifically for this event - see https://github.com/HTTPArchive/httparchive/issues/59
         TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("blink.feature_usage"), "FeatureFirstUsed", "feature", feature);
-        useCounterHistogram().count(feature);
+        featuresHistogram().count(feature);
         m_featuresRecorded.quickSet(feature);
     }
     m_legacyCounter.countFeature(feature);
 }
 
 bool UseCounter::hasRecordedMeasurement(Feature feature) const
 {
     if (m_muteCount)
         return false;
 
     DCHECK(feature != OBSOLETE_PageDestruction && feature != PageVisits); // PageDestruction is reserved as a scaling factor.
     DCHECK(feature < NumberOfFeatures);
 
     return m_featuresRecorded.quickGet(feature);
 }
 
 void UseCounter::didCommitLoad()
 {
-    // TODO(rbyers): This gets invoked more than expected.  crbug.com/236262
-    // Eg. every SVGImage has it's own Page instance, they should probably all be delegating
-    // their UseCounter to the containing Page.
     m_legacyCounter.updateMeasurements();
 
     // TODO: Is didCommitLoad really the right time to do this?  crbug.com/608040
     m_featuresRecorded.clearAll();
-    useCounterHistogram().count(PageVisits);
+    featuresHistogram().count(PageVisits);
     m_CSSRecorded.clearAll();
-    CSSUseCounterHistogram().count(totalPagesMeasuredCSSSampleId());
+    cssHistogram().count(totalPagesMeasuredCSSSampleId());
 }
 
 void UseCounter::count(const Frame* frame, Feature feature)
 {
     if (!frame)
         return;
     FrameHost* host = frame->host();
     if (!host)
         return;
 
@@ skipping 80 matching lines @@
 {
     DCHECK(property >= firstCSSProperty);
     DCHECK(property <= lastUnresolvedCSSProperty);
 
     if (!isUseCounterEnabledForMode(cssParserMode) || m_muteCount)
         return;
 
     if (!m_CSSRecorded.quickGet(property)) {
         // Note that HTTPArchive tooling looks specifically for this event - see https://github.com/HTTPArchive/httparchive/issues/59
         TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("blink.feature_usage"), "CSSFeatureFirstUsed", "feature", property);
-        CSSUseCounterHistogram().count(mapCSSPropertyIdToCSSSampleIdForHistogram(property));
+        cssHistogram().count(mapCSSPropertyIdToCSSSampleIdForHistogram(property));
         m_CSSRecorded.quickSet(property);
     }
     m_legacyCounter.countCSS(property);
 }
 
 void UseCounter::count(Feature feature)
 {
     DCHECK(Deprecation::deprecationMessage(feature).isEmpty());
     recordMeasurement(feature);
 }
@@ skipping 14 matching lines @@
 
 UseCounter* UseCounter::getFrom(const StyleSheetContents* sheetContents)
 {
     // FIXME: We may want to handle stylesheets that have multiple owners
     //        https://crbug.com/242125
     if (sheetContents && sheetContents->hasSingleOwnerNode())
         return getFrom(sheetContents->singleOwnerDocument());
     return 0;
 }
 
+EnumerationHistogram& UseCounter::featuresHistogram() const
+{
+    // TODO(rbyers): Fix the SVG case.  crbug.com/236262
+    // Eg. every SVGImage has it's own Page instance, they should probably all be delegating
+    // their UseCounter to the containing Page.  For now just use a separate histogram.
+    DEFINE_STATIC_LOCAL(blink::EnumerationHistogram, histogram, ("WebCore.UseCounter_TEST.Features", blink::UseCounter::NumberOfFeatures));
+    DEFINE_STATIC_LOCAL(blink::EnumerationHistogram, svgHistogram, ("WebCore.UseCounter_TEST.SVGImage.Features", blink::UseCounter::NumberOfFeatures));
+
+    return m_context == SVGImageContext ? svgHistogram : histogram;
+}
+
+EnumerationHistogram& UseCounter::cssHistogram() const
+{
+    DEFINE_STATIC_LOCAL(blink::EnumerationHistogram, histogram, ("WebCore.UseCounter_TEST.CSSProperties", maximumCSSSampleId()));
+    DEFINE_STATIC_LOCAL(blink::EnumerationHistogram, svgHistogram, ("WebCore.UseCounter_TEST.SVGImage.CSSProperties", maximumCSSSampleId()));
+
+    return m_context == SVGImageContext ? svgHistogram : histogram;
+}
+
 /*
  *
  * LEGACY metrics support - WebCore.FeatureObserver is to be superceded by WebCore.UseCounter
  *
  */
 
 static EnumerationHistogram& featureObserverHistogram()
 {
     DEFINE_STATIC_LOCAL(EnumerationHistogram, histogram, ("WebCore.FeatureObserver", UseCounter::NumberOfFeatures));
     return histogram;
@@ skipping 47 matching lines @@
         }
     }
 
     if (needsPagesMeasuredUpdate)
         cssPropertiesHistogram.count(totalPagesMeasuredCSSSampleId());
 
     m_CSSBits.clearAll();
 }
 
 } // namespace blink