| Index: third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp
|
| diff --git a/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp b/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp
|
| index de20d7cc0aed80a2c18262dcebefb623e9b27f70..d88dabdd8e322e4115d0ed1a133bc1fde20de8fb 100644
|
| --- a/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp
|
| +++ b/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp
|
| @@ -816,8 +816,9 @@ static CSSFunctionValue* consumeFilterFunction(
|
| double maxAllowed = isPercentage ? 100.0 : 1.0;
|
| if (toCSSPrimitiveValue(parsedValue)->getDoubleValue() > maxAllowed) {
|
| parsedValue = CSSPrimitiveValue::create(
|
| - maxAllowed, isPercentage ? CSSPrimitiveValue::UnitType::Percentage
|
| - : CSSPrimitiveValue::UnitType::Number);
|
| + maxAllowed,
|
| + isPercentage ? CSSPrimitiveValue::UnitType::Percentage
|
| + : CSSPrimitiveValue::UnitType::Number);
|
| }
|
| }
|
| }
|
| @@ -1796,8 +1797,9 @@ static CSSValue* consumeGridTrackSize(CSSParserTokenRange& range,
|
| CSSParserTokenRange rangeCopy = range;
|
| CSSParserTokenRange args = consumeFunction(rangeCopy);
|
| CSSValue* minTrackBreadth = consumeGridBreadth(args, cssParserMode);
|
| - if (!minTrackBreadth || (minTrackBreadth->isPrimitiveValue() &&
|
| - toCSSPrimitiveValue(minTrackBreadth)->isFlex()) ||
|
| + if (!minTrackBreadth ||
|
| + (minTrackBreadth->isPrimitiveValue() &&
|
| + toCSSPrimitiveValue(minTrackBreadth)->isFlex()) ||
|
| !consumeCommaIncludingWhitespace(args))
|
| return nullptr;
|
| CSSValue* maxTrackBreadth = consumeGridBreadth(args, cssParserMode);
|
| @@ -2137,18 +2139,18 @@ const CSSValue* CSSPropertyParser::parseSingleValue(
|
| case CSSPropertyBorderLeftColor:
|
| case CSSPropertyBorderRightColor:
|
| case CSSPropertyBorderTopColor: {
|
| - bool allowQuirkyColors =
|
| - inQuirksMode() && (currentShorthand == CSSPropertyInvalid ||
|
| - currentShorthand == CSSPropertyBorderColor);
|
| + bool allowQuirkyColors = inQuirksMode() &&
|
| + (currentShorthand == CSSPropertyInvalid ||
|
| + currentShorthand == CSSPropertyBorderColor);
|
| return consumeColor(m_range, m_context->mode(), allowQuirkyColors);
|
| }
|
| case CSSPropertyBorderBottomWidth:
|
| case CSSPropertyBorderLeftWidth:
|
| case CSSPropertyBorderRightWidth:
|
| case CSSPropertyBorderTopWidth: {
|
| - bool allowQuirkyLengths =
|
| - inQuirksMode() && (currentShorthand == CSSPropertyInvalid ||
|
| - currentShorthand == CSSPropertyBorderWidth);
|
| + bool allowQuirkyLengths = inQuirksMode() &&
|
| + (currentShorthand == CSSPropertyInvalid ||
|
| + currentShorthand == CSSPropertyBorderWidth);
|
| UnitlessQuirk unitless =
|
| allowQuirkyLengths ? UnitlessQuirk::Allow : UnitlessQuirk::Forbid;
|
| return consumeBorderWidth(m_range, m_context->mode(), unitless);
|
| @@ -2473,8 +2475,9 @@ bool CSSPropertyParser::consumeFont(bool important) {
|
| CSSIdentifierValue* fontStretch = nullptr;
|
| while (!m_range.atEnd()) {
|
| CSSValueID id = m_range.peek().id();
|
| - if (!fontStyle && CSSParserFastPaths::isValidKeywordPropertyAndValue(
|
| - CSSPropertyFontStyle, id, m_context->mode())) {
|
| + if (!fontStyle &&
|
| + CSSParserFastPaths::isValidKeywordPropertyAndValue(
|
| + CSSPropertyFontStyle, id, m_context->mode())) {
|
| fontStyle = consumeIdent(m_range);
|
| continue;
|
| }
|
| @@ -2491,8 +2494,9 @@ bool CSSPropertyParser::consumeFont(bool important) {
|
| if (fontWeight)
|
| continue;
|
| }
|
| - if (!fontStretch && CSSParserFastPaths::isValidKeywordPropertyAndValue(
|
| - CSSPropertyFontStretch, id, m_context->mode()))
|
| + if (!fontStretch &&
|
| + CSSParserFastPaths::isValidKeywordPropertyAndValue(
|
| + CSSPropertyFontStretch, id, m_context->mode()))
|
| fontStretch = consumeIdent(m_range);
|
| else
|
| break;
|
|
|