Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(574)

Unified Diff: Source/core/css/parser/CSSParser.cpp

Issue 1096963002: Make UseCounters work on aliased properties (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/css/parser/CSSParser.h ('k') | Source/core/css/parser/CSSParserImpl.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/parser/CSSParser.cpp
diff --git a/Source/core/css/parser/CSSParser.cpp b/Source/core/css/parser/CSSParser.cpp
index 12a1953c489998ce8e3ff723ea85794fbc912390..e355639fb86a8cd58842e0398c82ceef04982ea1 100644
--- a/Source/core/css/parser/CSSParser.cpp
+++ b/Source/core/css/parser/CSSParser.cpp
@@ -57,33 +57,34 @@ void CSSParser::parseSheet(const CSSParserContext& context, StyleSheetContents*
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;
}
« no previous file with comments | « Source/core/css/parser/CSSParser.h ('k') | Source/core/css/parser/CSSParserImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698