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

Source/core/css/parser/CSSPropertyParser.cpp

 /*
  * Copyright (C) 2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
  * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved.
  * Copyright (C) 2012 Intel Corporation. All rights reserved.
  *
@@ skipping 543 matching lines @@
         validPrimitive = validUnit(value, unitless);
         break;
     case CSSPropertyOutlineColor:        // <color> | invert | inherit
         // Outline color has "invert" as additional keyword.
         // Also, we want to allow the special focus color even in HTML Standard parsing mode.
         if (id == CSSValueInvert || id == CSSValueWebkitFocusRingColor) {
             validPrimitive = true;
             break;
         }
         /* nobreak */
+    case CSSPropertyColumnRuleColor:
+        if (propId == CSSPropertyColumnRuleColor && unresolvedProperty != CSSPropertyAliasWebkitColumnRuleColor && !inShorthand() && !RuntimeEnabledFeatures::unprefixMulticolEnabled())
+            return false;
+        /* nobreak */
     case CSSPropertyBackgroundColor: // <color> | inherit
     case CSSPropertyBorderTopColor: // <color> | inherit
     case CSSPropertyBorderRightColor:
     case CSSPropertyBorderBottomColor:
     case CSSPropertyBorderLeftColor:
     case CSSPropertyWebkitBorderStartColor:
     case CSSPropertyWebkitBorderEndColor:
     case CSSPropertyWebkitBorderBeforeColor:
     case CSSPropertyWebkitBorderAfterColor:
     case CSSPropertyColor: // <color> | inherit
     case CSSPropertyTextDecorationColor: // CSS3 text decoration colors
-    case CSSPropertyWebkitColumnRuleColor:
     case CSSPropertyWebkitTextEmphasisColor:
     case CSSPropertyWebkitTextFillColor:
     case CSSPropertyWebkitTextStrokeColor:
         ASSERT(propId != CSSPropertyTextDecorationColor || RuntimeEnabledFeatures::css3TextDecorationsEnabled());
 
         if ((id >= CSSValueAqua && id <= CSSValueWebkitText) || id == CSSValueMenu) {
             validPrimitive = isValueAllowedInMode(id, m_context.mode());
         } else {
             if (!inQuirksMode()) {
                 parsedValue = parseColor();
@@ skipping 176 matching lines @@
         }
         break;
 
     case CSSPropertyBorderTopWidth:     //// <border-width> | inherit
     case CSSPropertyBorderRightWidth:   //   Which is defined as
     case CSSPropertyBorderBottomWidth:  //   thin | medium | thick | <length>
     case CSSPropertyBorderLeftWidth:
         if (!inShorthand() || m_currentShorthand == CSSPropertyBorderWidth)
             unitless = FUnitlessQuirk;
         // fall through
+    case CSSPropertyColumnRuleWidth:
+        if (propId == CSSPropertyColumnRuleWidth && unresolvedProperty != CSSPropertyAliasWebkitColumnRuleWidth && !inShorthand() && !RuntimeEnabledFeatures::unprefixMulticolEnabled())
+            return false;
+        // fall through
     case CSSPropertyWebkitTextStrokeWidth:
     case CSSPropertyOutlineWidth: // <border-width> | inherit
     case CSSPropertyWebkitBorderStartWidth:
     case CSSPropertyWebkitBorderEndWidth:
     case CSSPropertyWebkitBorderBeforeWidth:
     case CSSPropertyWebkitBorderAfterWidth:
-    case CSSPropertyWebkitColumnRuleWidth:
         if (id == CSSValueThin || id == CSSValueMedium || id == CSSValueThick)
             validPrimitive = true;
         else
             validPrimitive = validUnit(value, FLength | FNonNeg | unitless);
         break;
 
     case CSSPropertyLetterSpacing:       // normal | <length> | inherit
     case CSSPropertyWordSpacing:         // normal | <length> | inherit
         if (id == CSSValueNormal)
             validPrimitive = true;
@@ skipping 460 matching lines @@
             return true;
         }
         else if (num == 2) {
             ShorthandScope scope(this, CSSPropertyWebkitMarginCollapse);
             if (!parseValue(webkitMarginCollapseShorthand().properties()[0], important) || !parseValue(webkitMarginCollapseShorthand().properties()[1], important))
                 return false;
             return true;
         }
         return false;
     }
-    case CSSPropertyWebkitColumnCount:
+    case CSSPropertyColumnCount:
+        if (unresolvedProperty != CSSPropertyAliasWebkitColumnCount && !inShorthand() && !RuntimeEnabledFeatures::unprefixMulticolEnabled())
+            return false;
         parsedValue = parseColumnCount();
         break;
-    case CSSPropertyWebkitColumnGap:         // normal | <length>
+    case CSSPropertyColumnGap: // normal | <length>
+        if (unresolvedProperty != CSSPropertyAliasWebkitColumnGap && !RuntimeEnabledFeatures::unprefixMulticolEnabled())
+            return false;
         if (id == CSSValueNormal)
             validPrimitive = true;
         else
             validPrimitive = validUnit(value, FLength | FNonNeg);
         break;
-    case CSSPropertyWebkitColumnSpan: // none | all | 1 (will be dropped in the unprefixed property)
+    case CSSPropertyColumnSpan: // none | all | 1 (will be dropped in the unprefixed property)
+        if (unresolvedProperty != CSSPropertyAliasWebkitColumnSpan && !RuntimeEnabledFeatures::unprefixMulticolEnabled())
+            return false;
         validPrimitive = id == CSSValueAll || id == CSSValueNone || (value->unit == CSSPrimitiveValue::CSS_NUMBER && value->fValue == 1);
         break;
-    case CSSPropertyWebkitColumnWidth:         // auto | <length>
+    case CSSPropertyColumnRuleStyle:
+        // TODO(mstensho): move this back into CSSParserFastPaths once we have shipped unprefixed multicol.
+        if (unresolvedProperty != CSSPropertyAliasWebkitColumnRuleStyle && !inShorthand() && !RuntimeEnabledFeatures::unprefixMulticolEnabled())
+            return false;
+        validPrimitive = id >= CSSValueNone && id <= CSSValueDouble;
+        break;
+    case CSSPropertyColumnWidth: // auto | <length>
+        if (unresolvedProperty != CSSPropertyAliasWebkitColumnWidth && !inShorthand() && !RuntimeEnabledFeatures::unprefixMulticolEnabled())
+            return false;
         parsedValue = parseColumnWidth();
         break;
     case CSSPropertyWillChange:
         parsedValue = parseWillChange();
         break;
     // End of CSS3 properties
 
     // Apple specific properties.  These will never be standardized and are purely to
     // support custom WebKit-based Apple applications.
     case CSSPropertyWebkitLineClamp:
@@ skipping 111 matching lines @@
     case CSSPropertyFont:
         // [ [ 'font-style' || 'font-variant' || 'font-weight' ]? 'font-size' [ / 'line-height' ]?
         // 'font-family' ] | caption | icon | menu | message-box | small-caption | status-bar | inherit
         if (num == 1 && id >= CSSValueCaption && id <= CSSValueStatusBar) {
             parseSystemFont(important);
             return true;
         }
         return parseFont(important);
     case CSSPropertyListStyle:
         return parseShorthand(propId, listStyleShorthand(), important);
-    case CSSPropertyWebkitColumns:
+    case CSSPropertyColumns:
+        if (unresolvedProperty != CSSPropertyAliasWebkitColumns && !RuntimeEnabledFeatures::unprefixMulticolEnabled())
+            return false;
         return parseColumnsShorthand(important);
-    case CSSPropertyWebkitColumnRule:
-        return parseShorthand(propId, webkitColumnRuleShorthand(), important);
+    case CSSPropertyColumnRule:
+        if (unresolvedProperty != CSSPropertyAliasWebkitColumnRule && !RuntimeEnabledFeatures::unprefixMulticolEnabled())
+            return false;
+        return parseShorthand(propId, columnRuleShorthand(), important);
     case CSSPropertyWebkitTextStroke:
         return parseShorthand(propId, webkitTextStrokeShorthand(), important);
     case CSSPropertyAnimation:
         return parseAnimationShorthand(unresolvedProperty == CSSPropertyAliasWebkitAnimation, important);
     case CSSPropertyTransition:
         return parseTransitionShorthand(important);
     case CSSPropertyInvalid:
         return false;
     case CSSPropertyPage:
         return parsePage(propId, important);
@@ skipping 478 matching lines @@
             columnWidth = cssValuePool().createIdentifierValue(CSSValueAuto);
         } else {
             ASSERT(!columnCount);
             columnCount = cssValuePool().createIdentifierValue(CSSValueAuto);
         }
     }
     ASSERT(columnCount || columnWidth);
 
     // Any unassigned property at this point will become implicit 'auto'.
     if (columnWidth)
-        addProperty(CSSPropertyWebkitColumnWidth, columnWidth, important);
+        addProperty(CSSPropertyColumnWidth, columnWidth, important);
     else
-        addProperty(CSSPropertyWebkitColumnWidth, cssValuePool().createIdentifierValue(CSSValueAuto), important, true /* implicit */);
+        addProperty(CSSPropertyColumnWidth, cssValuePool().createIdentifierValue(CSSValueAuto), important, true /* implicit */);
     if (columnCount)
-        addProperty(CSSPropertyWebkitColumnCount, columnCount, important);
+        addProperty(CSSPropertyColumnCount, columnCount, important);
     else
-        addProperty(CSSPropertyWebkitColumnCount, cssValuePool().createIdentifierValue(CSSValueAuto), important, true /* implicit */);
+        addProperty(CSSPropertyColumnCount, cssValuePool().createIdentifierValue(CSSValueAuto), important, true /* implicit */);
     return true;
 }
 
 bool CSSPropertyParser::parseShorthand(CSSPropertyID propId, const StylePropertyShorthand& shorthand, bool important)
 {
     // We try to match as many properties as possible
     // We set up an array of booleans to mark which property has been found,
     // and we try to search for properties until it makes no longer any sense.
     ShorthandScope scope(this, propId);
 
@@ skipping 6544 matching lines @@
         }
     }
 
     if (!list->length())
         return nullptr;
 
     return list.release();
 }
 
 } // namespace blink