*** NOT FOR LANDING *** Unprefix multicol behind a flag

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 239 matching lines @@
     case CSSPropertyWebkitBoxLines: return 207;
     case CSSPropertyWebkitBoxOrdinalGroup: return 208;
     case CSSPropertyWebkitBoxOrient: return 209;
     case CSSPropertyWebkitBoxPack: return 210;
     case CSSPropertyWebkitBoxReflect: return 211;
     case CSSPropertyAliasWebkitBoxShadow: return 212;
     // CSSPropertyWebkitColumnAxis was 214
     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;
     case CSSPropertyAlignItems: return 231;
     case CSSPropertyAlignSelf: return 232;
     case CSSPropertyFlex: return 233;
     case CSSPropertyFlexBasis: return 234;
     case CSSPropertyFlexDirection: return 235;
     case CSSPropertyFlexFlow: return 236;
     case CSSPropertyFlexGrow: return 237;
@@ skipping 245 matching lines @@
     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;
+    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).
     // 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 498; }
+static int maximumCSSSampleId() { return 507; }
 
 void UseCounter::muteForInspector()
 {
     UseCounter::m_muteCount++;
 }
 
 void UseCounter::unmuteForInspector()
 {
     UseCounter::m_muteCount--;
 }
@@ skipping 390 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