Make UseCounters work on aliased properties

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 32 matching lines @@
 
 int UseCounter::m_muteCount = 0;
 
 // FIXME : This mapping should be autogenerated. This function should
 //         be moved to a separate file and a script run at build time
 //         to detect new values in CSSPropertyID and add them to the
 //         end of this function. This file would be checked in.
 //         https://code.google.com/p/chromium/issues/detail?id=234940
 int UseCounter::mapCSSPropertyIdToCSSSampleIdForHistogram(int id)
 {
-    CSSPropertyID cssPropertyID = convertToCSSPropertyID(id);
+    CSSPropertyID cssPropertyID = static_cast<CSSPropertyID>(id);
 
     switch (cssPropertyID) {
     // Begin at 2, because 1 is reserved for totalPagesMeasuredCSSSampleId.
     case CSSPropertyColor: return 2;
     case CSSPropertyDirection: return 3;
     case CSSPropertyDisplay: return 4;
     case CSSPropertyFont: return 5;
     case CSSPropertyFontFamily: return 6;
     case CSSPropertyFontSize: return 7;
     case CSSPropertyFontStyle: return 8;
@@ skipping 431 matching lines @@
     case CSSPropertyMotionRotation: return 459;
     case CSSPropertyMotion: return 460;
     case CSSPropertyX: return 461;
     case CSSPropertyY: return 462;
     case CSSPropertyRx: return 463;
     case CSSPropertyRy: return 464;
     case CSSPropertyFontSizeAdjust: return 465;
     case CSSPropertyCx: return 466;
     case CSSPropertyCy: return 467;
     case CSSPropertyR: return 468;
+    case CSSPropertyAliasEpubCaptionSide: return 469;
+    case CSSPropertyAliasEpubTextCombine: return 470;
+    case CSSPropertyAliasEpubTextEmphasis: return 471;
+    case CSSPropertyAliasEpubTextEmphasisColor: return 472;
+    case CSSPropertyAliasEpubTextEmphasisStyle: return 473;
+    case CSSPropertyAliasEpubTextOrientation: return 474;
+    case CSSPropertyAliasEpubTextTransform: return 475;
+    case CSSPropertyAliasEpubWordBreak: return 476;
+    case CSSPropertyAliasEpubWritingMode: return 477;
+    case CSSPropertyAliasWebkitAlignContent: return 478;
+    case CSSPropertyAliasWebkitAlignItems: return 479;
+    case CSSPropertyAliasWebkitAlignSelf: return 480;
+    case CSSPropertyAliasWebkitBorderBottomLeftRadius: return 481;
+    case CSSPropertyAliasWebkitBorderBottomRightRadius: return 482;
+    case CSSPropertyAliasWebkitBorderTopLeftRadius: return 483;
+    case CSSPropertyAliasWebkitBorderTopRightRadius: return 484;
+    case CSSPropertyAliasWebkitBoxSizing: return 485;
+    case CSSPropertyAliasWebkitFlex: return 486;
+    case CSSPropertyAliasWebkitFlexBasis: return 487;
+    case CSSPropertyAliasWebkitFlexDirection: return 488;
+    case CSSPropertyAliasWebkitFlexFlow: return 489;
+    case CSSPropertyAliasWebkitFlexGrow: return 490;
+    case CSSPropertyAliasWebkitFlexShrink: return 491;
+    case CSSPropertyAliasWebkitFlexWrap: return 492;
+    case CSSPropertyAliasWebkitJustifyContent: return 493;
+    case CSSPropertyAliasWebkitOpacity: return 494;
+    case CSSPropertyAliasWebkitOrder: return 495;
+    case CSSPropertyAliasWebkitShapeImageThreshold: return 496;
+    case CSSPropertyAliasWebkitShapeMargin: return 497;
+    case CSSPropertyAliasWebkitShapeOutside: return 498;
 
     // 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.
     // 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;
 }
 
-static int maximumCSSSampleId() { return 468; }
+static int maximumCSSSampleId() { return 498; }
 
 void UseCounter::muteForInspector()
 {
     UseCounter::m_muteCount++;
 }
 
 void UseCounter::unmuteForInspector()
 {
     UseCounter::m_muteCount--;
 }
 
 UseCounter::UseCounter()
 {
-    m_CSSFeatureBits.ensureSize(lastCSSProperty + 1);
+    m_CSSFeatureBits.ensureSize(lastUnresolvedCSSProperty + 1);
     m_CSSFeatureBits.clearAll();
 }
 
 UseCounter::~UseCounter()
 {
     // We always log PageDestruction so that we have a scale for the rest of the features.
     blink::Platform::current()->histogramEnumeration("WebCore.FeatureObserver", PageDestruction, NumberOfFeatures);
 
     updateMeasurements();
 }
@@ skipping 10 matching lines @@
 
 void UseCounter::updateMeasurements()
 {
     blink::Platform::current()->histogramEnumeration("WebCore.FeatureObserver", PageVisits, NumberOfFeatures);
     m_countBits.updateMeasurements();
 
     // 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. http://crbug.com/236262.
     bool needsPagesMeasuredUpdate = false;
-    for (int i = firstCSSProperty; i <= lastCSSProperty; ++i) {
+    for (int i = firstCSSProperty; i <= lastUnresolvedCSSProperty; ++i) {
         if (m_CSSFeatureBits.quickGet(i)) {
             int cssSampleId = mapCSSPropertyIdToCSSSampleIdForHistogram(i);
             blink::Platform::current()->histogramEnumeration("WebCore.FeatureObserver.CSSProperties", cssSampleId, maximumCSSSampleId());
             needsPagesMeasuredUpdate = true;
         }
     }
 
     if (needsPagesMeasuredUpdate)
         blink::Platform::current()->histogramEnumeration("WebCore.FeatureObserver.CSSProperties", totalPagesMeasuredCSSSampleId(), maximumCSSSampleId());
 
@@ skipping 294 matching lines @@
 
     // Features that aren't deprecated don't have a deprecation message.
     default:
         return String();
     }
 }
 
 void UseCounter::count(CSSParserContext context, CSSPropertyID feature)
 {
     ASSERT(feature >= firstCSSProperty);
-    ASSERT(feature <= lastCSSProperty);
+    ASSERT(feature <= lastUnresolvedCSSProperty);
 
     if (!isUseCounterEnabledForMode(context.mode()))
         return;
 
     m_CSSFeatureBits.quickSet(feature);
 }
 
 void UseCounter::count(Feature feature)
 {
     ASSERT(deprecationMessage(feature).isEmpty());
@@ skipping 17 matching lines @@
 UseCounter* UseCounter::getFrom(const StyleSheetContents* sheetContents)
 {
     // FIXME: We may want to handle stylesheets that have multiple owners
     //        http://crbug.com/242125
     if (sheetContents && sheetContents->hasSingleOwnerNode())
         return getFrom(sheetContents->singleOwnerDocument());
     return 0;
 }
 
 } // namespace blink