| 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 c1f9099aa4cf6269c3de013198897f7ace6e5d74..0b29379c37b8b4e2d9f3464b412d8c2dc8de136b 100644
|
| --- a/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp
|
| +++ b/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp
|
| @@ -349,45 +349,6 @@ static CSSValue* consumeFontFeatureSettings(CSSParserTokenRange& range) {
|
| return settings;
|
| }
|
|
|
| -static CSSFontVariationValue* consumeFontVariationTag(
|
| - CSSParserTokenRange& range) {
|
| - // Feature tag name consists of 4-letter characters.
|
| - static const unsigned tagNameLength = 4;
|
| -
|
| - const CSSParserToken& token = range.consumeIncludingWhitespace();
|
| - // Feature tag name comes first
|
| - if (token.type() != StringToken)
|
| - return nullptr;
|
| - if (token.value().length() != tagNameLength)
|
| - return nullptr;
|
| - AtomicString tag = token.value().toAtomicString();
|
| - for (unsigned i = 0; i < tagNameLength; ++i) {
|
| - // Limits the range of characters to 0x20-0x7E, following the tag name rules
|
| - // defined in the OpenType specification.
|
| - UChar character = tag[i];
|
| - if (character < 0x20 || character > 0x7E)
|
| - return nullptr;
|
| - }
|
| -
|
| - double tagValue = 0;
|
| - if (!consumeNumberRaw(range, tagValue))
|
| - return nullptr;
|
| - return CSSFontVariationValue::create(tag, clampTo<float>(tagValue));
|
| -}
|
| -
|
| -static CSSValue* consumeFontVariationSettings(CSSParserTokenRange& range) {
|
| - if (range.peek().id() == CSSValueNormal)
|
| - return consumeIdent(range);
|
| - CSSValueList* variationSettings = CSSValueList::createCommaSeparated();
|
| - do {
|
| - CSSFontVariationValue* fontVariationValue = consumeFontVariationTag(range);
|
| - if (!fontVariationValue)
|
| - return nullptr;
|
| - variationSettings->append(*fontVariationValue);
|
| - } while (consumeCommaIncludingWhitespace(range));
|
| - return variationSettings;
|
| -}
|
| -
|
| static CSSValue* consumePage(CSSParserTokenRange& range) {
|
| if (range.peek().id() == CSSValueAuto)
|
| return consumeIdent(range);
|
| @@ -3429,9 +3390,6 @@ const CSSValue* CSSPropertyParser::parseSingleValue(
|
| return consumeFontFeatureSettings(m_range);
|
| case CSSPropertyFontFamily:
|
| return consumeFontFamily(m_range);
|
| - case CSSPropertyFontVariationSettings:
|
| - DCHECK(RuntimeEnabledFeatures::cssVariableFontsEnabled());
|
| - return consumeFontVariationSettings(m_range);
|
| case CSSPropertyFontWeight:
|
| return consumeFontWeight(m_range);
|
| case CSSPropertyLetterSpacing:
|
|
|