Move the grid-gap shorthand into CSSPropertyParser

third_party/WebKit/Source/core/css/parser/LegacyCSSPropertyParser.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 286 matching lines @@
     if (parsedValue) {
         if (!m_valueList->current() || inShorthand())
             return parsedValue.release();
     }
     return nullptr;
 }
 
 bool CSSPropertyParser::legacyParseShorthand(CSSPropertyID propertyID, bool important)
 {
     switch (propertyID) {
-    case CSSPropertyGridGap:
-        ASSERT(RuntimeEnabledFeatures::cssGridLayoutEnabled());
-        return parseGridGapShorthand(important);
-
     case CSSPropertyGridColumn:
     case CSSPropertyGridRow:
         ASSERT(RuntimeEnabledFeatures::cssGridLayoutEnabled());
         return parseGridItemPositionShorthand(propertyID, important);
 
     case CSSPropertyGridArea:
         ASSERT(RuntimeEnabledFeatures::cssGridLayoutEnabled());
         return parseGridAreaShorthand(important);
 
     case CSSPropertyGridTemplate:
@@ skipping 135 matching lines @@
             return false;
     } else {
         endValue = gridMissingGridPositionValue(startValue.get());
     }
 
     addProperty(shorthand.properties()[0], startValue, important);
     addProperty(shorthand.properties()[1], endValue, important);
     return true;
 }
 
-bool CSSPropertyParser::parseGridGapShorthand(bool important)
-{
-    ShorthandScope scope(this, CSSPropertyGridGap);
-    ASSERT(shorthandForProperty(CSSPropertyGridGap).length() == 2);
-
-    CSSParserValue* value = m_valueList->current();
-    if (!value)
-        return false;
-
-    if (!validUnit(value, FLength | FNonNeg))
-        return false;
-
-    RefPtrWillBeRawPtr<CSSPrimitiveValue> rowGap = createPrimitiveNumericValue(value);
-    RefPtrWillBeRawPtr<CSSPrimitiveValue> columnGap = nullptr;
-
-    value = m_valueList->next();
-    if (value) {
-        if (!validUnit(value, FLength | FNonNeg))
-            return false;
-
-        columnGap = createPrimitiveNumericValue(value);
-        if (m_valueList->next())
-            return false;
-    } else {
-        columnGap = rowGap;
-    }
-
-    addProperty(CSSPropertyGridRowGap, rowGap, important);
-    addProperty(CSSPropertyGridColumnGap, columnGap, important);
-
-    return true;
-}
-
 PassRefPtrWillBeRawPtr<CSSValue> CSSPropertyParser::parseGridTemplateColumns(bool important)
 {
     if (!(m_valueList->current() && isForwardSlashOperator(m_valueList->current()) && m_valueList->next()))
         return nullptr;
     if (RefPtrWillBeRawPtr<CSSValue> columnsValue = parseGridTrackList()) {
         if (m_valueList->current())
             return nullptr;
         return columnsValue;
     }
 
@@ skipping 616 matching lines @@
     ASSERT(!m_parsedCalculation);
     m_parsedCalculation = CSSCalcValue::create(args, range);
 
     if (!m_parsedCalculation)
         return false;
 
     return true;
 }
 
 } // namespace blink