Pass around shorthand info instead of storing it

third_party/WebKit/Source/core/css/parser/CSSPropertyParser.h

 /*
  * Copyright (C) 2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2009 - 2010  Torch Mobile (Beijing) Co. Ltd. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 40 matching lines @@
     static bool isColorKeyword(CSSValueID);
     static bool isValidNumericValue(double);
 
 private:
     CSSPropertyParser(const CSSParserTokenRange&, const CSSParserContext&,
         HeapVector<CSSProperty, 256>*);
 
     // TODO(timloh): Rename once the CSSParserValue-based parseValue is removed
     bool parseValueStart(CSSPropertyID unresolvedProperty, bool important);
     bool consumeCSSWideKeyword(CSSPropertyID unresolvedProperty, bool important);
-    CSSValue* parseSingleValue(CSSPropertyID);
+    CSSValue* parseSingleValue(CSSPropertyID, CSSPropertyID = CSSPropertyInvalid);
 
     bool inQuirksMode() const { return isQuirksModeBehavior(m_context.mode()); }
 
     bool parseViewportDescriptor(CSSPropertyID propId, bool important);
     bool parseFontFaceDescriptor(CSSPropertyID);
 
-    void addProperty(CSSPropertyID, CSSValue*, bool important, bool implicit = false);
+    void addProperty(CSSPropertyID, CSSPropertyID, CSSValue*, bool important, bool implicit = false);
     void addExpandedPropertyForValue(CSSPropertyID propId, CSSValue*, bool);
 
     bool consumeBorder(bool important);
 
     bool parseShorthand(CSSPropertyID, bool important);
     bool consumeShorthandGreedily(const StylePropertyShorthand&, bool important);
     bool consume4Values(const StylePropertyShorthand&, bool important);
 
     // Legacy parsing allows <string>s for animation-name
     bool consumeAnimationShorthand(const StylePropertyShorthand&, bool useLegacyParsing, bool important);
     bool consumeBackgroundShorthand(const StylePropertyShorthand&, bool important);
 
     bool consumeColumns(bool important);
 
     bool consumeGridItemPositionShorthand(CSSPropertyID, bool important);
-    bool consumeGridTemplateRowsAndAreasAndColumns(bool important);
-    bool consumeGridTemplateShorthand(bool important);
+    bool consumeGridTemplateRowsAndAreasAndColumns(CSSPropertyID, bool important);
+    bool consumeGridTemplateShorthand(CSSPropertyID, bool important);
     bool consumeGridShorthand(bool important);
     bool consumeGridAreaShorthand(bool important);
 
     bool consumeFont(bool important);
     bool consumeSystemFont(bool important);
 
     bool consumeBorderSpacing(bool important);
 
     // CSS3 Parsing Routines (for properties specific to CSS3)
     bool consumeBorderImage(CSSPropertyID, bool important);
 
     bool consumeFlex(bool important);
 
     bool consumeLegacyBreakProperty(CSSPropertyID, bool important);
 
-    class ShorthandScope {
-        STACK_ALLOCATED();
-    public:
-        ShorthandScope(CSSPropertyParser* parser, CSSPropertyID propId) : m_parser(parser)
-        {
-            if (!(m_parser->m_inParseShorthand++))
-                m_parser->m_currentShorthand = propId;
-        }
-        ~ShorthandScope()
-        {
-            if (!(--m_parser->m_inParseShorthand))
-                m_parser->m_currentShorthand = CSSPropertyInvalid;
-        }
-
-    private:
-        CSSPropertyParser* m_parser;
-    };
-
 private:
     // Inputs:
     CSSParserTokenRange m_range;
     const CSSParserContext& m_context;
-
     // Outputs:
     HeapVector<CSSProperty, 256>* m_parsedProperties;
-
-    // Locals during parsing:
-    int m_inParseShorthand;
-    CSSPropertyID m_currentShorthand;
 };
 
 CSSPropertyID unresolvedCSSPropertyID(const CSSParserString&);
 CSSValueID cssValueKeywordID(const CSSParserString&);
 
 } // namespace blink
 
 #endif // CSSPropertyParser_h