Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1028)

Unified Diff: Source/core/frame/UseCounter.cpp

Issue 1150313002: *** NOT FOR LANDING *** Unprefix multicol behind a flag (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/css/resolver/StyleBuilderCustom.cpp ('k') | Source/core/layout/LayoutMultiColumnSet.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/frame/UseCounter.cpp
diff --git a/Source/core/frame/UseCounter.cpp b/Source/core/frame/UseCounter.cpp
index c870b002a983314c39ca3b81f51236891aa39459..b025ef36eb9277ea2fd05d6d9163ab58870db1c4 100644
--- a/Source/core/frame/UseCounter.cpp
+++ b/Source/core/frame/UseCounter.cpp
@@ -257,16 +257,16 @@ int UseCounter::mapCSSPropertyIdToCSSSampleIdForHistogram(int id)
case CSSPropertyWebkitColumnBreakAfter: return 215;
case CSSPropertyWebkitColumnBreakBefore: return 216;
case CSSPropertyWebkitColumnBreakInside: return 217;
- case CSSPropertyWebkitColumnCount: return 218;
- case CSSPropertyWebkitColumnGap: return 219;
+ case CSSPropertyAliasWebkitColumnCount: return 218;
+ case CSSPropertyAliasWebkitColumnGap: return 219;
// CSSPropertyWebkitColumnProgression was 220
- case CSSPropertyWebkitColumnRule: return 221;
- case CSSPropertyWebkitColumnRuleColor: return 222;
- case CSSPropertyWebkitColumnRuleStyle: return 223;
- case CSSPropertyWebkitColumnRuleWidth: return 224;
- case CSSPropertyWebkitColumnSpan: return 225;
- case CSSPropertyWebkitColumnWidth: return 226;
- case CSSPropertyWebkitColumns: return 227;
+ case CSSPropertyAliasWebkitColumnRule: return 221;
+ case CSSPropertyAliasWebkitColumnRuleColor: return 222;
+ case CSSPropertyAliasWebkitColumnRuleStyle: return 223;
+ case CSSPropertyAliasWebkitColumnRuleWidth: return 224;
+ case CSSPropertyAliasWebkitColumnSpan: return 225;
+ case CSSPropertyAliasWebkitColumnWidth: return 226;
+ case CSSPropertyAliasWebkitColumns: return 227;
// 228 was CSSPropertyWebkitBoxDecorationBreak (duplicated due to #ifdef).
// 229 was CSSPropertyWebkitFilter (duplicated due to #ifdef).
case CSSPropertyAlignContent: return 230;
@@ -532,6 +532,15 @@ int UseCounter::mapCSSPropertyIdToCSSSampleIdForHistogram(int id)
case CSSPropertyAliasWebkitShapeImageThreshold: return 496;
case CSSPropertyAliasWebkitShapeMargin: return 497;
case CSSPropertyAliasWebkitShapeOutside: return 498;
+ case CSSPropertyColumnCount: return 499;
+ case CSSPropertyColumnGap: return 500;
+ case CSSPropertyColumnRule: return 501;
+ case CSSPropertyColumnRuleColor: return 502;
+ case CSSPropertyColumnRuleStyle: return 503;
+ case CSSPropertyColumnRuleWidth: return 504;
+ case CSSPropertyColumnSpan: return 505;
+ case CSSPropertyColumnWidth: return 506;
+ case CSSPropertyColumns: return 507;
// 1. Add new features above this line (don't change the assigned numbers of the existing
// items).
@@ -548,7 +557,7 @@ int UseCounter::mapCSSPropertyIdToCSSSampleIdForHistogram(int id)
return 0;
}
-static int maximumCSSSampleId() { return 498; }
+static int maximumCSSSampleId() { return 507; }
void UseCounter::muteForInspector()
{
« no previous file with comments | « Source/core/css/resolver/StyleBuilderCustom.cpp ('k') | Source/core/layout/LayoutMultiColumnSet.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698