Make UseCounters work on aliased properties

Source/core/css/parser/CSSParser.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "core/css/parser/CSSParser.h"
 
 #include "core/css/CSSKeyframeRule.h"
 #include "core/css/StyleColor.h"
 #include "core/css/StyleRule.h"
@@ skipping 39 matching lines @@
 void CSSParser::parseSheet(const CSSParserContext& context, StyleSheetContents* styleSheet, const String& text, const TextPosition& startPosition, CSSParserObserver* observer, bool logErrors)
 {
     if (RuntimeEnabledFeatures::newCSSParserEnabled()) {
         if (observer)
             return CSSParserImpl::parseStyleSheetForInspector(text, context, *observer);
         return CSSParserImpl::parseStyleSheet(text, context, styleSheet);
     }
     BisonCSSParser(context).parseSheet(styleSheet, text, startPosition, observer, logErrors);
 }
 
-bool CSSParser::parseValue(MutableStylePropertySet* declaration, CSSPropertyID propertyID, const String& string, bool important, CSSParserMode parserMode, StyleSheetContents* styleSheet)
+bool CSSParser::parseValue(MutableStylePropertySet* declaration, CSSPropertyID unresolvedProperty, const String& string, bool important, CSSParserMode parserMode, StyleSheetContents* styleSheet)
 {
     if (string.isEmpty())
         return false;
-    if (parseFastPath(declaration, propertyID, string, important, parserMode))
+    if (parseFastPath(declaration, unresolvedProperty, string, important, parserMode))
         return true;
     CSSParserContext context(parserMode, 0);
     if (styleSheet) {
         context = styleSheet->parserContext();
         context.setMode(parserMode);
     }
-    return parseValue(declaration, propertyID, string, important, context);
+    return parseValue(declaration, unresolvedProperty, string, important, context);
 }
 
-bool CSSParser::parseValue(MutableStylePropertySet* declaration, CSSPropertyID propertyID, const String& string, bool important, const CSSParserContext& context)
+bool CSSParser::parseValue(MutableStylePropertySet* declaration, CSSPropertyID unresolvedProperty, const String& string, bool important, const CSSParserContext& context)
 {
     if (RuntimeEnabledFeatures::newCSSParserEnabled())
-        return CSSParserImpl::parseValue(declaration, propertyID, string, important, context);
-    return BisonCSSParser::parseValue(declaration, propertyID, string, important, context);
+        return CSSParserImpl::parseValue(declaration, unresolvedProperty, string, important, context);
+    return BisonCSSParser::parseValue(declaration, unresolvedProperty, string, important, context);
 }
 
-bool CSSParser::parseFastPath(MutableStylePropertySet* declaration, CSSPropertyID propertyID, const String& string, bool important, CSSParserMode parserMode)
+bool CSSParser::parseFastPath(MutableStylePropertySet* declaration, CSSPropertyID unresolvedProperty, const String& string, bool important, CSSParserMode parserMode)
 {
-    RefPtrWillBeRawPtr<CSSValue> value = CSSParserFastPaths::maybeParseValue(propertyID, string, parserMode);
+    CSSPropertyID resolvedProperty = resolveCSSPropertyID(unresolvedProperty);
+    RefPtrWillBeRawPtr<CSSValue> value = CSSParserFastPaths::maybeParseValue(resolvedProperty, string, parserMode);
     if (!value)
         return false;
-    declaration->addParsedProperty(CSSProperty(propertyID, value.release(), important));
+    declaration->addParsedProperty(CSSProperty(resolvedProperty, value.release(), important));
     return true;
 }
 
 PassRefPtrWillBeRawPtr<CSSValue> CSSParser::parseSingleValue(CSSPropertyID propertyID, const String& string, const CSSParserContext& context)
 {
     if (string.isEmpty())
         return nullptr;
     RefPtrWillBeRawPtr<MutableStylePropertySet> stylePropertySet = MutableStylePropertySet::create();
     bool success = parseFastPath(stylePropertySet.get(), propertyID, string, false, context.mode())
         || parseValue(stylePropertySet.get(), propertyID, string, false, context);
@@ skipping 79 matching lines @@
     CSSValueID id = cssValueKeywordID(cssColor);
     if (!CSSPropertyParser::isSystemColor(id))
         return false;
 
     Color parsedColor = LayoutTheme::theme().systemColor(id);
     color = parsedColor.rgb();
     return true;
 }
 
 } // namespace blink