Adjust CSS property maximum tracking to be more clang-format friendly.

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 25 matching lines @@
 #include "core/inspector/ConsoleMessage.h"
 #include "core/workers/WorkerGlobalScope.h"
 #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 545; }
+constexpr int kMaximumCSSSampleId = 545;
 
 } // namespace
 
 namespace blink {
 
 int UseCounter::mapCSSPropertyIdToCSSSampleIdForHistogram(CSSPropertyID cssPropertyID)
 {
     switch (cssPropertyID) {
     // Begin at 2, because 1 is reserved for totalPagesMeasuredCSSSampleId.
     case CSSPropertyColor: return 2;
@@ skipping 515 matching lines @@
     case CSSPropertyOverflowAnchor: return 538;
     case CSSPropertyUserSelect: return 539;
     case CSSPropertyOffsetDistance: return 540;
     case CSSPropertyOffsetPath: return 541;
     case CSSPropertyOffsetRotation: return 542;
     case CSSPropertyOffset: return 543;
     case CSSPropertyOffsetAnchor: return 544;
     case CSSPropertyOffsetPosition: return 545;
     // 1. Add new features above this line (don't change the assigned numbers of the existing
     // items).
-    // 2. Update maximumCSSSampleId() with the new maximum value.
+    // 2. Update kMaximumCSSSampleId() with the new maximum value.

[Nico, 2016/09/25 21:08:12]

No parens

[dcheng, 2016/09/25 23:52:59]

Done.

     // 3. Run the update_use_counter_css.py script in
     // chromium/src/tools/metrics/histograms to update the UMA histogram names.
 
     case CSSPropertyInvalid:
         ASSERT_NOT_REACHED();
         return 0;
     }
 
     ASSERT_NOT_REACHED();
     return 0;
@@ skipping 195 matching lines @@
     // 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()));
+    DEFINE_STATIC_LOCAL(blink::EnumerationHistogram, histogram, ("WebCore.UseCounter_TEST.CSSProperties", kMaximumCSSSampleId));
+    DEFINE_STATIC_LOCAL(blink::EnumerationHistogram, svgHistogram, ("WebCore.UseCounter_TEST.SVGImage.CSSProperties", kMaximumCSSSampleId));
 
     return m_context == SVGImageContext ? svgHistogram : histogram;
 }
 
 /*
  *
  * LEGACY metrics support - WebCore.FeatureObserver is to be superceded by WebCore.UseCounter
  *
  */
 
@@ skipping 34 matching lines @@
     for (size_t i = 0; i < NumberOfFeatures; ++i) {
         if (m_featureBits.quickGet(i))
             featureHistogram.count(i);
     }
     // Clearing count bits is timing sensitive.
     m_featureBits.clearAll();
 
     // FIXME: Sometimes this function is called more than once per page. The following
     //        bool guards against incrementing the page count when there are no CSS
     //        bits set. https://crbug.com/236262.
-    DEFINE_STATIC_LOCAL(EnumerationHistogram, cssPropertiesHistogram, ("WebCore.FeatureObserver.CSSProperties", maximumCSSSampleId()));
+    DEFINE_STATIC_LOCAL(EnumerationHistogram, cssPropertiesHistogram, ("WebCore.FeatureObserver.CSSProperties", kMaximumCSSSampleId));
     bool needsPagesMeasuredUpdate = false;
     for (size_t i = firstCSSProperty; i <= lastUnresolvedCSSProperty; ++i) {
         if (m_CSSBits.quickGet(i)) {
             int cssSampleId = mapCSSPropertyIdToCSSSampleIdForHistogram(static_cast<CSSPropertyID>(i));
             cssPropertiesHistogram.count(cssSampleId);
             needsPagesMeasuredUpdate = true;
         }
     }
 
     if (needsPagesMeasuredUpdate)
         cssPropertiesHistogram.count(totalPagesMeasuredCSSSampleId());
 
     m_CSSBits.clearAll();
 }
 
 } // namespace blink