Make parseColumnsShorthand not mark 'auto' initial value as implicit

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 1887 matching lines @@
         m_valueList->next();
         return parsedValue;
     }
     return nullptr;
 }
 
 bool CSSPropertyParser::parseColumnsShorthand(bool important)
 {
     RefPtrWillBeRawPtr<CSSValue> columnWidth = nullptr;
     RefPtrWillBeRawPtr<CSSValue> columnCount = nullptr;
-    bool hasPendingExplicitAuto = false;
 
     for (unsigned propertiesParsed = 0; CSSParserValue* value = m_valueList->current(); propertiesParsed++) {
         if (propertiesParsed >= 2)
             return false; // Too many values for this shorthand. Invalid declaration.
-        if (!propertiesParsed && value->id == CSSValueAuto) {
-            // 'auto' is a valid value for any of the two longhands, and at this point we
-            // don't know which one(s) it is meant for. We need to see if there are other
-            // values first.
+        if (value->id == CSSValueAuto) {
+            // Skip 'auto' as we will use it for initial value if no width/count was parsed.
             m_valueList->next();
-            hasPendingExplicitAuto = true;
         } else {
             if (!columnWidth) {
                 if ((columnWidth = parseColumnWidth()))
                     continue;
             }
             if (!columnCount) {
                 if ((columnCount = parseColumnCount()))
                     continue;
             }
             // If we didn't find at least one match, this is an
             // invalid shorthand and we have to ignore it.
             return false;
         }
     }
-    if (hasPendingExplicitAuto) {
-        // Time to assign the previously skipped 'auto' value to a property. If both properties are
-        // unassigned at this point (i.e. 'columns:auto'), it doesn't matter that much which one we
-        // set (although it does make a slight difference to web-inspector). The one we don't set
-        // here will get an implicit 'auto' value further down.
-        if (!columnWidth) {
-            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);
-    else
-        addProperty(CSSPropertyWebkitColumnWidth, cssValuePool().createIdentifierValue(CSSValueAuto), important, true /* implicit */);
-    if (columnCount)
-        addProperty(CSSPropertyWebkitColumnCount, columnCount, important);
-    else
-        addProperty(CSSPropertyWebkitColumnCount, cssValuePool().createIdentifierValue(CSSValueAuto), important, true /* implicit */);
+    if (!columnWidth)
+        columnWidth = cssValuePool().createIdentifierValue(CSSValueAuto);
+    addProperty(CSSPropertyWebkitColumnWidth, columnWidth, important);
+    if (!columnCount)
+        columnCount = cssValuePool().createIdentifierValue(CSSValueAuto);
+    addProperty(CSSPropertyWebkitColumnCount, columnCount, important);
     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 6126 matching lines @@
         }
     }
 
     if (!list->length())
         return nullptr;
 
     return list.release();
 }
 
 } // namespace blink