Chromium Code Reviews| 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 506fb5b414a3fedbb5fe74406fbc3850870173b9..8be6aa96b200cb1e3906ec9fa738f0744ffe045c 100644 |
| --- a/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp |
| +++ b/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp |
| @@ -434,24 +434,12 @@ static CSSValue* ConsumeAnimationValue(CSSPropertyID property, |
| case CSSPropertyAnimationDelay: |
| case CSSPropertyTransitionDelay: |
| return ConsumeTime(range, kValueRangeAll); |
| - case CSSPropertyAnimationDirection: |
| - return ConsumeIdent<CSSValueNormal, CSSValueAlternate, CSSValueReverse, |
| - CSSValueAlternateReverse>(range); |
| case CSSPropertyAnimationDuration: |
| case CSSPropertyTransitionDuration: |
| return ConsumeTime(range, kValueRangeNonNegative); |
| - case CSSPropertyAnimationFillMode: |
| - return ConsumeIdent<CSSValueNone, CSSValueForwards, CSSValueBackwards, |
| - CSSValueBoth>(range); |
| - case CSSPropertyAnimationIterationCount: |
| - return ConsumeAnimationIterationCount(range); |
| case CSSPropertyAnimationName: |
| return CSSPropertyAnimationNameUtils::ConsumeAnimationName( |
| range, context, use_legacy_parsing); |
| - case CSSPropertyAnimationPlayState: |
| - return ConsumeIdent<CSSValueRunning, CSSValuePaused>(range); |
| - case CSSPropertyTransitionProperty: |
| - return ConsumeTransitionProperty(range); |
| case CSSPropertyAnimationTimingFunction: |
| case CSSPropertyTransitionTimingFunction: |
| return ConsumeAnimationTimingFunction(range); |
| @@ -1056,8 +1044,6 @@ static CSSValue* ConsumeBackgroundComponent(CSSPropertyID unresolved_property, |
| case CSSPropertyAliasWebkitBackgroundSize: |
| return ConsumeBackgroundSize(range, context->Mode(), |
| true /* use_legacy_parsing */); |
| - case CSSPropertyBackgroundColor: |
| - return ConsumeColor(range, context->Mode()); |
| default: |
| break; |
| }; |
| @@ -1604,8 +1590,6 @@ const CSSValue* CSSPropertyParser::ParseSingleValue( |
| } |
| switch (property) { |
| - case CSSPropertyFontWeight: |
| - return CSSPropertyFontUtils::ConsumeFontWeight(range_); |
| case CSSPropertyMaxWidth: |
| case CSSPropertyMaxHeight: |
| return CSSPropertyLengthUtils::ConsumeMaxWidthOrHeight( |
| @@ -1625,16 +1609,6 @@ const CSSValue* CSSPropertyParser::ParseSingleValue( |
| case CSSPropertyWebkitLogicalWidth: |
| case CSSPropertyWebkitLogicalHeight: |
| return CSSPropertyLengthUtils::ConsumeWidthOrHeight(range_, *context_); |
| - case CSSPropertyScrollSnapDestination: |
| - // TODO(crbug.com/724912): Retire scroll-snap-destination |
| - return ConsumePosition(range_, *context_, UnitlessQuirk::kForbid, |
| - Optional<UseCounter::Feature>()); |
| - case CSSPropertyObjectPosition: |
| - return ConsumePosition(range_, *context_, UnitlessQuirk::kForbid, |
| - UseCounter::kThreeValuedPositionObjectPosition); |
| - case CSSPropertyPerspectiveOrigin: |
| - return ConsumePosition(range_, *context_, UnitlessQuirk::kForbid, |
| - UseCounter::kThreeValuedPositionPerspectiveOrigin); |
| case CSSPropertyWebkitHyphenateCharacter: |
| case CSSPropertyWebkitLocale: |
| return ConsumeLocale(range_); |
| @@ -1698,10 +1672,6 @@ const CSSValue* CSSPropertyParser::ParseSingleValue( |
| return CSSPropertyWebkitBorderWidthUtils::ConsumeBorderWidth( |
| range_, context_->Mode(), unitless); |
| } |
| - case CSSPropertyTextShadow: |
| - return ConsumeShadow(range_, context_->Mode(), false); |
| - case CSSPropertyBoxShadow: |
| - return ConsumeShadow(range_, context_->Mode(), true); |
| case CSSPropertyFilter: |
| case CSSPropertyBackdropFilter: |
| return ConsumeFilter(range_, context_); |
| @@ -1765,8 +1735,6 @@ const CSSValue* CSSPropertyParser::ParseSingleValue( |
| return ConsumeBorderImageWidth(range_); |
| case CSSPropertyWebkitBorderImage: |
| return ConsumeWebkitBorderImage(range_, context_); |
| - case CSSPropertyWebkitBoxReflect: |
| - return ConsumeReflect(range_, context_); |
| case CSSPropertyBackgroundAttachment: |
| case CSSPropertyBackgroundBlendMode: |
| case CSSPropertyBackgroundClip: |
| @@ -3305,8 +3273,6 @@ bool CSSPropertyParser::ParseShorthand(CSSPropertyID unresolved_property, |
| important); |
| return true; |
| } |
| - case CSSPropertyBorderColor: |
|
Jia
2017/06/08 22:07:13
This is a shorthand property
Bugs Nash
2017/06/09 00:00:17
good spot, there was a bug in my input! this repre
Jia
2017/06/09 00:10:07
You can keep the group names the same as before, b
Bugs Nash
2017/06/09 05:02:11
Ah, good to know. I think for clarity it would sti
|
| - return Consume4Values(borderColorShorthand(), important); |
| case CSSPropertyBorderStyle: |
| return Consume4Values(borderStyleShorthand(), important); |
| case CSSPropertyBorderWidth: |
| @@ -3372,23 +3338,6 @@ bool CSSPropertyParser::ParseShorthand(CSSPropertyID unresolved_property, |
| return ConsumeBackgroundShorthand(backgroundShorthand(), important); |
| case CSSPropertyWebkitMask: |
| return ConsumeBackgroundShorthand(webkitMaskShorthand(), important); |
| - case CSSPropertyGridGap: { |
|
Jia
2017/06/08 22:07:13
A shorthand property
|
| - DCHECK(RuntimeEnabledFeatures::CSSGridLayoutEnabled()); |
| - DCHECK_EQ(shorthandForProperty(CSSPropertyGridGap).length(), 2u); |
| - CSSValue* row_gap = ConsumeLengthOrPercent(range_, context_->Mode(), |
| - kValueRangeNonNegative); |
| - CSSValue* column_gap = ConsumeLengthOrPercent(range_, context_->Mode(), |
| - kValueRangeNonNegative); |
| - if (!row_gap || !range_.AtEnd()) |
| - return false; |
| - if (!column_gap) |
| - column_gap = row_gap; |
| - AddParsedProperty(CSSPropertyGridRowGap, CSSPropertyGridGap, *row_gap, |
| - important); |
| - AddParsedProperty(CSSPropertyGridColumnGap, CSSPropertyGridGap, |
| - *column_gap, important); |
| - return true; |
| - } |
| case CSSPropertyGridColumn: |
| case CSSPropertyGridRow: |
| return ConsumeGridItemPositionShorthand(property, important); |