Move CSS animations use counters to UseCounter

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

 // Copyright 2015 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/frame/Deprecation.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/UseCounter.h"
 #include "core/testing/DummyPageHolder.h"
 #include "platform/testing/HistogramTester.h"
 #include "platform/testing/URLTestHelpers.h"
 #include "platform/weborigin/KURL.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
-// Note that the new histogram names will change once the semantics stabilize;

[alancutter (OOO until 2018), 2017/02/20 23:49:38]

I don't know the context around this comment, why does this patch make it go
away?

 const char* const kFeaturesHistogramName = "Blink.UseCounter.Features";
 const char* const kCSSHistogramName = "Blink.UseCounter.CSSProperties";
+const char* const kAnimatedCSSHistogramName =
+    "Blink.UseCounter.AnimatedCSSProperties";
+
 const char* const kSVGFeaturesHistogramName =
     "Blink.UseCounter.SVGImage.Features";
 const char* const kSVGCSSHistogramName =
     "Blink.UseCounter.SVGImage.CSSProperties";
+const char* const kSVGAnimatedCSSHistogramName =
+    "Blink.UseCounter.SVGImage.AnimatedCSSProperties";
+
 const char* const kLegacyFeaturesHistogramName = "WebCore.FeatureObserver";
 const char* const kLegacyCSSHistogramName =
     "WebCore.FeatureObserver.CSSProperties";
 }
 
 namespace blink {
 
 template <typename T>
 void histogramBasicTest(const std::string& histogram,
                         const std::string& legacyHistogram,
                         const std::vector<std::string>& unaffectedHistograms,
                         T item,
                         T secondItem,
                         std::function<bool(T)> counted,
                         std::function<void(T)> count,
                         std::function<int(T)> histogramMap,
                         std::function<void(KURL)> didCommitLoad,
                         const std::string& url,
                         int pageVisitBucket) {
   HistogramTester histogramTester;
 
   // Test recording a single (arbitrary) counter
   EXPECT_FALSE(counted(item));
   count(item);
   EXPECT_TRUE(counted(item));
   histogramTester.expectUniqueSample(histogram, histogramMap(item), 1);
-  histogramTester.expectTotalCount(legacyHistogram, 0);
+  if (!legacyHistogram.empty()) {
+    histogramTester.expectTotalCount(legacyHistogram, 0);
+  }
 
   // Test that repeated measurements have no effect
   count(item);
   histogramTester.expectUniqueSample(histogram, histogramMap(item), 1);
-  histogramTester.expectTotalCount(legacyHistogram, 0);
+  if (!legacyHistogram.empty()) {
+    histogramTester.expectTotalCount(legacyHistogram, 0);
+  }
 
   // Test recording a different sample
   EXPECT_FALSE(counted(secondItem));
   count(secondItem);
   EXPECT_TRUE(counted(secondItem));
   histogramTester.expectBucketCount(histogram, histogramMap(item), 1);
   histogramTester.expectBucketCount(histogram, histogramMap(secondItem), 1);
   histogramTester.expectTotalCount(histogram, 2);
-  histogramTester.expectTotalCount(legacyHistogram, 0);
+  if (!legacyHistogram.empty()) {
+    histogramTester.expectTotalCount(legacyHistogram, 0);
+  }
 
   // After a page load, the histograms will be updated, even when the URL
   // scheme is internal
   didCommitLoad(URLTestHelpers::toKURL(url));
   histogramTester.expectBucketCount(histogram, histogramMap(item), 1);
   histogramTester.expectBucketCount(histogram, histogramMap(secondItem), 1);
   histogramTester.expectBucketCount(histogram, pageVisitBucket, 1);
   histogramTester.expectTotalCount(histogram, 3);
 
   // And verify the legacy histogram now looks the same
-  histogramTester.expectBucketCount(legacyHistogram, histogramMap(item), 1);
-  histogramTester.expectBucketCount(legacyHistogram, histogramMap(secondItem),
-                                    1);
-  histogramTester.expectBucketCount(legacyHistogram, pageVisitBucket, 1);
-  histogramTester.expectTotalCount(legacyHistogram, 3);
+  if (!legacyHistogram.empty()) {
+    histogramTester.expectBucketCount(legacyHistogram, histogramMap(item), 1);
+    histogramTester.expectBucketCount(legacyHistogram, histogramMap(secondItem),
+                                      1);
+    histogramTester.expectBucketCount(legacyHistogram, pageVisitBucket, 1);
+    histogramTester.expectTotalCount(legacyHistogram, 3);
+  }
 
   // Now a repeat measurement should get recorded again, exactly once
   EXPECT_FALSE(counted(item));
   count(item);
   count(item);
   EXPECT_TRUE(counted(item));
   histogramTester.expectBucketCount(histogram, histogramMap(item), 2);
   histogramTester.expectTotalCount(histogram, 4);
 
   // And on the next page load, the legacy histogram will again be updated
   didCommitLoad(URLTestHelpers::toKURL(url));
-  histogramTester.expectBucketCount(legacyHistogram, histogramMap(item), 2);
-  histogramTester.expectBucketCount(legacyHistogram, histogramMap(secondItem),
-                                    1);
-  histogramTester.expectBucketCount(legacyHistogram, pageVisitBucket, 2);
-  histogramTester.expectTotalCount(legacyHistogram, 5);
+  if (!legacyHistogram.empty()) {
+    histogramTester.expectBucketCount(legacyHistogram, histogramMap(item), 2);
+    histogramTester.expectBucketCount(legacyHistogram, histogramMap(secondItem),
+                                      1);
+    histogramTester.expectBucketCount(legacyHistogram, pageVisitBucket, 2);
+    histogramTester.expectTotalCount(legacyHistogram, 5);
+  }
 
   for (size_t i = 0; i < unaffectedHistograms.size(); ++i) {
     histogramTester.expectTotalCount(unaffectedHistograms[i], 0);
   }
 }
 
 // Failing on Android: crbug.com/667913
 #if OS(ANDROID)
 #define MAYBE_RecordingFeatures DISABLED_RecordingFeatures
 #else
@@ skipping 28 matching lines @@
       [&](CSSPropertyID property) {
         useCounter.count(HTMLStandardMode, property);
       },
       [](CSSPropertyID property) -> int {
         return UseCounter::mapCSSPropertyIdToCSSSampleIdForHistogram(property);
       },
       [&](KURL kurl) { useCounter.didCommitLoad(kurl); },
       "https://dummysite.com/", 1 /* page visit bucket */);
 }
 
+TEST(UseCounterTest, RecordingAnimatedCSSProperties) {
+  UseCounter useCounter;
+  histogramBasicTest<CSSPropertyID>(
+      kAnimatedCSSHistogramName, "",
+      {kSVGCSSHistogramName, kSVGAnimatedCSSHistogramName}, CSSPropertyOpacity,
+      CSSPropertyVariable,
+      [&](CSSPropertyID property) -> bool {
+        return useCounter.isCountedAnimatedCSS(property);
+      },
+      [&](CSSPropertyID property) { useCounter.countAnimatedCSS(property); },
+      [](CSSPropertyID property) -> int {
+        return UseCounter::mapCSSPropertyIdToCSSSampleIdForHistogram(property);
+      },
+      [&](KURL kurl) { useCounter.didCommitLoad(kurl); },
+      "https://dummysite.com/", 1 /* page visit bucket */);
+}
+
 // Failing on Android: crbug.com/667913
 #if OS(ANDROID)
 #define MAYBE_SVGImageContextFeatures DISABLED_SVGImageContextFeatures
 #else
 #define MAYBE_SVGImageContextFeatures SVGImageContextFeatures
 #endif
 TEST(UseCounterTest, MAYBE_SVGImageContextFeatures) {
   UseCounter useCounter(UseCounter::SVGImageContext);
   histogramBasicTest<UseCounter::Feature>(
       kSVGFeaturesHistogramName, kLegacyFeaturesHistogramName,
@@ skipping 25 matching lines @@
         useCounter.count(HTMLStandardMode, property);
       },
       [](CSSPropertyID property) -> int {
         return UseCounter::mapCSSPropertyIdToCSSSampleIdForHistogram(property);
       },
       [&](KURL kurl) { useCounter.didCommitLoad(kurl); }, "about:blank",
       // In practice SVGs always appear to be loaded with an about:blank URL
       1 /* page visit bucket */);
 }
 
+TEST(UseCounterTest, SVGImageContextAnimatedCSSProperties) {
+  UseCounter useCounter(UseCounter::SVGImageContext);
+  histogramBasicTest<CSSPropertyID>(
+      kSVGAnimatedCSSHistogramName, "",
+      {kCSSHistogramName, kAnimatedCSSHistogramName}, CSSPropertyOpacity,
+      CSSPropertyVariable,
+      [&](CSSPropertyID property) -> bool {
+        return useCounter.isCountedAnimatedCSS(property);
+      },
+      [&](CSSPropertyID property) { useCounter.countAnimatedCSS(property); },
+      [](CSSPropertyID property) -> int {
+        return UseCounter::mapCSSPropertyIdToCSSSampleIdForHistogram(property);
+      },
+      [&](KURL kurl) { useCounter.didCommitLoad(kurl); }, "about:blank",
+      // In practice SVGs always appear to be loaded with an about:blank URL
+      1 /* page visit bucket */);
+}
+
 // Failing on Android: crbug.com/667913
 #if OS(ANDROID)
 #define MAYBE_InspectorDisablesMeasurement DISABLED_InspectorDisablesMeasurement
 #else
 #define MAYBE_InspectorDisablesMeasurement InspectorDisablesMeasurement
 #endif
 TEST(UseCounterTest, MAYBE_InspectorDisablesMeasurement) {
   UseCounter useCounter;
   HistogramTester histogramTester;
 
@@ skipping 193 matching lines @@
 
   m_deprecation.unmuteForInspector();
   Deprecation::warnOnDeprecatedProperties(frame(), property);
   // TODO: use the actually deprecated property to get a deprecation message.
   EXPECT_FALSE(m_deprecation.isSuppressed(property));
   Deprecation::countDeprecation(frame(), feature);
   EXPECT_TRUE(m_useCounter.hasRecordedMeasurement(feature));
 }
 
 }  // namespace blink