Commit 3c40dcac authored by Fredrik Söderquist's avatar Fredrik Söderquist Committed by Commit Bot

Fix style on some parameter names in the CSS parser

  unitlessZeroFeature -> unitless_zero_feature
  negativeSize -> negative_size
  threeValuePosition -> three_value_position

Change-Id: Id42906e518e6780bfa601031d8ad00430b2f48b4
Reviewed-on: https://chromium-review.googlesource.com/1027878
Commit-Queue: Eric Willigers <ericwilligers@chromium.org>
Reviewed-by: default avatarEric Willigers <ericwilligers@chromium.org>
Cr-Commit-Position: refs/heads/master@{#553777}
parent 6b5ac2ef
...@@ -404,10 +404,10 @@ CSSPrimitiveValue* ConsumeGradientLengthOrPercent( ...@@ -404,10 +404,10 @@ CSSPrimitiveValue* ConsumeGradientLengthOrPercent(
CSSPrimitiveValue* ConsumeAngle( CSSPrimitiveValue* ConsumeAngle(
CSSParserTokenRange& range, CSSParserTokenRange& range,
const CSSParserContext* context, const CSSParserContext* context,
base::Optional<WebFeature> unitlessZeroFeature) { base::Optional<WebFeature> unitless_zero_feature) {
// Ensure that we have a context for counting the unitlessZeroFeature if it is // Ensure that we have a context for counting the
// requested. // unitless_zero_feature if it is requested.
DCHECK(context || !unitlessZeroFeature); DCHECK(context || !unitless_zero_feature);
const CSSParserToken& token = range.Peek(); const CSSParserToken& token = range.Peek();
if (token.GetType() == kDimensionToken) { if (token.GetType() == kDimensionToken) {
switch (token.GetUnitType()) { switch (token.GetUnitType()) {
...@@ -423,9 +423,9 @@ CSSPrimitiveValue* ConsumeAngle( ...@@ -423,9 +423,9 @@ CSSPrimitiveValue* ConsumeAngle(
} }
} }
if (token.GetType() == kNumberToken && token.NumericValue() == 0 && if (token.GetType() == kNumberToken && token.NumericValue() == 0 &&
unitlessZeroFeature) { unitless_zero_feature) {
range.ConsumeIncludingWhitespace(); range.ConsumeIncludingWhitespace();
context->Count(*unitlessZeroFeature); context->Count(*unitless_zero_feature);
return CSSPrimitiveValue::Create(0, CSSPrimitiveValue::UnitType::kDegrees); return CSSPrimitiveValue::Create(0, CSSPrimitiveValue::UnitType::kDegrees);
} }
CalcParser calc_parser(range, kValueRangeAll); CalcParser calc_parser(range, kValueRangeAll);
...@@ -836,7 +836,7 @@ static void PositionFromThreeOrFourValues(CSSValue** values, ...@@ -836,7 +836,7 @@ static void PositionFromThreeOrFourValues(CSSValue** values,
bool ConsumePosition(CSSParserTokenRange& range, bool ConsumePosition(CSSParserTokenRange& range,
const CSSParserContext& context, const CSSParserContext& context,
UnitlessQuirk unitless, UnitlessQuirk unitless,
base::Optional<WebFeature> threeValuePosition, base::Optional<WebFeature> three_value_position,
CSSValue*& result_x, CSSValue*& result_x,
CSSValue*& result_y) { CSSValue*& result_y) {
bool horizontal_edge = false; bool horizontal_edge = false;
...@@ -883,7 +883,7 @@ bool ConsumePosition(CSSParserTokenRange& range, ...@@ -883,7 +883,7 @@ bool ConsumePosition(CSSParserTokenRange& range,
horizontal_edge, vertical_edge); horizontal_edge, vertical_edge);
if (!value4) { if (!value4) {
if (!threeValuePosition) { if (!three_value_position) {
// [top | bottom] <length-percentage> is not permitted // [top | bottom] <length-percentage> is not permitted
if (vertical_edge && !value2->IsIdentifierValue()) { if (vertical_edge && !value2->IsIdentifierValue()) {
range = range_after_first_consume; range = range_after_first_consume;
...@@ -894,8 +894,9 @@ bool ConsumePosition(CSSParserTokenRange& range, ...@@ -894,8 +894,9 @@ bool ConsumePosition(CSSParserTokenRange& range,
PositionFromTwoValues(value1, value2, result_x, result_y); PositionFromTwoValues(value1, value2, result_x, result_y);
return true; return true;
} }
DCHECK_EQ(*threeValuePosition, WebFeature::kThreeValuedPositionBackground); DCHECK_EQ(*three_value_position,
context.Count(*threeValuePosition); WebFeature::kThreeValuedPositionBackground);
context.Count(*three_value_position);
} }
CSSValue* values[5]; CSSValue* values[5];
...@@ -911,10 +912,10 @@ bool ConsumePosition(CSSParserTokenRange& range, ...@@ -911,10 +912,10 @@ bool ConsumePosition(CSSParserTokenRange& range,
CSSValuePair* ConsumePosition(CSSParserTokenRange& range, CSSValuePair* ConsumePosition(CSSParserTokenRange& range,
const CSSParserContext& context, const CSSParserContext& context,
UnitlessQuirk unitless, UnitlessQuirk unitless,
base::Optional<WebFeature> threeValuePosition) { base::Optional<WebFeature> three_value_position) {
CSSValue* result_x = nullptr; CSSValue* result_x = nullptr;
CSSValue* result_y = nullptr; CSSValue* result_y = nullptr;
if (ConsumePosition(range, context, unitless, threeValuePosition, result_x, if (ConsumePosition(range, context, unitless, three_value_position, result_x,
result_y)) result_y))
return CSSValuePair::Create(result_x, result_y, return CSSValuePair::Create(result_x, result_y,
CSSValuePair::kKeepIdenticalValues); CSSValuePair::kKeepIdenticalValues);
......
...@@ -59,9 +59,10 @@ CSSPrimitiveValue* ConsumeLengthOrPercent( ...@@ -59,9 +59,10 @@ CSSPrimitiveValue* ConsumeLengthOrPercent(
ValueRange, ValueRange,
UnitlessQuirk = UnitlessQuirk::kForbid); UnitlessQuirk = UnitlessQuirk::kForbid);
CSSPrimitiveValue* ConsumeAngle(CSSParserTokenRange&, CSSPrimitiveValue* ConsumeAngle(
CSSParserTokenRange&,
const CSSParserContext*, const CSSParserContext*,
base::Optional<WebFeature> unitlessZeroFeature); base::Optional<WebFeature> unitless_zero_feature);
CSSPrimitiveValue* ConsumeTime(CSSParserTokenRange&, ValueRange); CSSPrimitiveValue* ConsumeTime(CSSParserTokenRange&, ValueRange);
CSSPrimitiveValue* ConsumeResolution(CSSParserTokenRange&); CSSPrimitiveValue* ConsumeResolution(CSSParserTokenRange&);
...@@ -88,11 +89,11 @@ CSSValue* ConsumeLineWidth(CSSParserTokenRange&, CSSParserMode, UnitlessQuirk); ...@@ -88,11 +89,11 @@ CSSValue* ConsumeLineWidth(CSSParserTokenRange&, CSSParserMode, UnitlessQuirk);
CSSValuePair* ConsumePosition(CSSParserTokenRange&, CSSValuePair* ConsumePosition(CSSParserTokenRange&,
const CSSParserContext&, const CSSParserContext&,
UnitlessQuirk, UnitlessQuirk,
base::Optional<WebFeature> threeValuePosition); base::Optional<WebFeature> three_value_position);
bool ConsumePosition(CSSParserTokenRange&, bool ConsumePosition(CSSParserTokenRange&,
const CSSParserContext&, const CSSParserContext&,
UnitlessQuirk, UnitlessQuirk,
base::Optional<WebFeature> threeValuePosition, base::Optional<WebFeature> three_value_position,
CSSValue*& result_x, CSSValue*& result_x,
CSSValue*& result_y); CSSValue*& result_y);
bool ConsumeOneOrTwoValuedPosition(CSSParserTokenRange&, bool ConsumeOneOrTwoValuedPosition(CSSParserTokenRange&,
......
...@@ -746,11 +746,11 @@ CSSValue* ConsumeMaskSourceType(CSSParserTokenRange& range) { ...@@ -746,11 +746,11 @@ CSSValue* ConsumeMaskSourceType(CSSParserTokenRange& range) {
CSSPrimitiveValue* ConsumeLengthOrPercentCountNegative( CSSPrimitiveValue* ConsumeLengthOrPercentCountNegative(
CSSParserTokenRange& range, CSSParserTokenRange& range,
const CSSParserContext& context, const CSSParserContext& context,
base::Optional<WebFeature> negativeSize) { base::Optional<WebFeature> negative_size) {
CSSPrimitiveValue* result = CSSPrimitiveValue* result =
ConsumeLengthOrPercent(range, context.Mode(), kValueRangeNonNegative, ConsumeLengthOrPercent(range, context.Mode(), kValueRangeNonNegative,
CSSPropertyParserHelpers::UnitlessQuirk::kForbid); CSSPropertyParserHelpers::UnitlessQuirk::kForbid);
if (result || !negativeSize) if (result || !negative_size)
return result; return result;
result = result =
...@@ -758,13 +758,13 @@ CSSPrimitiveValue* ConsumeLengthOrPercentCountNegative( ...@@ -758,13 +758,13 @@ CSSPrimitiveValue* ConsumeLengthOrPercentCountNegative(
CSSPropertyParserHelpers::UnitlessQuirk::kForbid); CSSPropertyParserHelpers::UnitlessQuirk::kForbid);
if (result) if (result)
context.Count(*negativeSize); context.Count(*negative_size);
return result; return result;
} }
CSSValue* ConsumeBackgroundSize(CSSParserTokenRange& range, CSSValue* ConsumeBackgroundSize(CSSParserTokenRange& range,
const CSSParserContext& context, const CSSParserContext& context,
base::Optional<WebFeature> negativeSize, base::Optional<WebFeature> negative_size,
ParsingStyle parsing_style) { ParsingStyle parsing_style) {
if (CSSPropertyParserHelpers::IdentMatches<CSSValueContain, CSSValueCover>( if (CSSPropertyParserHelpers::IdentMatches<CSSValueContain, CSSValueCover>(
range.Peek().Id())) { range.Peek().Id())) {
...@@ -775,7 +775,7 @@ CSSValue* ConsumeBackgroundSize(CSSParserTokenRange& range, ...@@ -775,7 +775,7 @@ CSSValue* ConsumeBackgroundSize(CSSParserTokenRange& range,
CSSPropertyParserHelpers::ConsumeIdent<CSSValueAuto>(range); CSSPropertyParserHelpers::ConsumeIdent<CSSValueAuto>(range);
if (!horizontal) { if (!horizontal) {
horizontal = horizontal =
ConsumeLengthOrPercentCountNegative(range, context, negativeSize); ConsumeLengthOrPercentCountNegative(range, context, negative_size);
} }
CSSValue* vertical = nullptr; CSSValue* vertical = nullptr;
...@@ -784,7 +784,7 @@ CSSValue* ConsumeBackgroundSize(CSSParserTokenRange& range, ...@@ -784,7 +784,7 @@ CSSValue* ConsumeBackgroundSize(CSSParserTokenRange& range,
range.ConsumeIncludingWhitespace(); range.ConsumeIncludingWhitespace();
} else { } else {
vertical = vertical =
ConsumeLengthOrPercentCountNegative(range, context, negativeSize); ConsumeLengthOrPercentCountNegative(range, context, negative_size);
} }
} else if (parsing_style == ParsingStyle::kLegacy) { } else if (parsing_style == ParsingStyle::kLegacy) {
// Legacy syntax: "-webkit-background-size: 10px" is equivalent to // Legacy syntax: "-webkit-background-size: 10px" is equivalent to
...@@ -843,9 +843,9 @@ CSSValue* ParseBackgroundBox(CSSParserTokenRange& range, ...@@ -843,9 +843,9 @@ CSSValue* ParseBackgroundBox(CSSParserTokenRange& range,
CSSValue* ParseBackgroundOrMaskSize(CSSParserTokenRange& range, CSSValue* ParseBackgroundOrMaskSize(CSSParserTokenRange& range,
const CSSParserContext& context, const CSSParserContext& context,
const CSSParserLocalContext& local_context, const CSSParserLocalContext& local_context,
base::Optional<WebFeature> negativeSize) { base::Optional<WebFeature> negative_size) {
return CSSPropertyParserHelpers::ConsumeCommaSeparatedList( return CSSPropertyParserHelpers::ConsumeCommaSeparatedList(
ConsumeBackgroundSize, range, context, negativeSize, ConsumeBackgroundSize, range, context, negative_size,
local_context.UseAliasParsing() ? ParsingStyle::kLegacy local_context.UseAliasParsing() ? ParsingStyle::kLegacy
: ParsingStyle::kNotLegacy); : ParsingStyle::kNotLegacy);
} }
......
...@@ -87,7 +87,7 @@ CSSValue* ParseBackgroundBox(CSSParserTokenRange&, ...@@ -87,7 +87,7 @@ CSSValue* ParseBackgroundBox(CSSParserTokenRange&,
CSSValue* ParseBackgroundOrMaskSize(CSSParserTokenRange&, CSSValue* ParseBackgroundOrMaskSize(CSSParserTokenRange&,
const CSSParserContext&, const CSSParserContext&,
const CSSParserLocalContext&, const CSSParserLocalContext&,
base::Optional<WebFeature> negativeSize); base::Optional<WebFeature> negative_size);
bool ParseBackgroundOrMask(bool, bool ParseBackgroundOrMask(bool,
CSSParserTokenRange&, CSSParserTokenRange&,
const CSSParserContext&, const CSSParserContext&,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment