| 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 b0c84bf2a96c0df47427e4ad828ef9807f8e8d44..a8b4ffd87acbedd8d4effdb5129e5094be341837 100644
|
| --- a/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp
|
| +++ b/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp
|
| @@ -49,6 +49,7 @@
|
| #include "core/css/properties/CSSPropertyOffsetPathUtils.h"
|
| #include "core/css/properties/CSSPropertyPositionUtils.h"
|
| #include "core/css/properties/CSSPropertyShapeUtils.h"
|
| +#include "core/css/properties/CSSPropertyWebkitBorderWidthUtils.h"
|
| #include "core/frame/UseCounter.h"
|
| #include "core/layout/LayoutTheme.h"
|
| #include "platform/wtf/text/StringBuilder.h"
|
| @@ -770,12 +771,6 @@ bool CSSPropertyParser::ConsumeOffsetShorthand(bool important) {
|
| return true;
|
| }
|
|
|
| -static CSSValue* ConsumeBorderWidth(CSSParserTokenRange& range,
|
| - CSSParserMode css_parser_mode,
|
| - UnitlessQuirk unitless) {
|
| - return ConsumeLineWidth(range, css_parser_mode, unitless);
|
| -}
|
| -
|
| static CSSValue* ConsumeNoneOrURI(CSSParserTokenRange& range,
|
| const CSSParserContext* context) {
|
| if (range.Peek().Id() == CSSValueNone)
|
| @@ -1709,12 +1704,6 @@ const CSSValue* CSSPropertyParser::ParseSingleValue(
|
| case CSSPropertyColor:
|
| case CSSPropertyBackgroundColor:
|
| return ConsumeColor(range_, context_->Mode(), InQuirksMode());
|
| - case CSSPropertyWebkitBorderStartWidth:
|
| - case CSSPropertyWebkitBorderEndWidth:
|
| - case CSSPropertyWebkitBorderBeforeWidth:
|
| - case CSSPropertyWebkitBorderAfterWidth:
|
| - return ConsumeBorderWidth(range_, context_->Mode(),
|
| - UnitlessQuirk::kForbid);
|
| case CSSPropertyBorderBottomColor:
|
| case CSSPropertyBorderLeftColor:
|
| case CSSPropertyBorderRightColor:
|
| @@ -1733,7 +1722,8 @@ const CSSValue* CSSPropertyParser::ParseSingleValue(
|
| current_shorthand == CSSPropertyBorderWidth);
|
| UnitlessQuirk unitless =
|
| allow_quirky_lengths ? UnitlessQuirk::kAllow : UnitlessQuirk::kForbid;
|
| - return ConsumeBorderWidth(range_, context_->Mode(), unitless);
|
| + return CSSPropertyWebkitBorderWidthUtils::ConsumeBorderWidth(
|
| + range_, context_->Mode(), unitless);
|
| }
|
| case CSSPropertyTextShadow:
|
| return ConsumeShadow(range_, context_->Mode(), false);
|
|
|