Commit e669e93e authored by Eric Willigers's avatar Eric Willigers Committed by Commit Bot

CSS font-variation-settings: retire feature flag

font-variation-settings shipped to stable in M62.

The CSSVariableFonts feature flag is no longer needed.

BUG=669453

Change-Id: I3061318331dda4f12a325caea49296b64cd8a05f
Reviewed-on: https://chromium-review.googlesource.com/892759Reviewed-by: default avatarDominik Röttsches <drott@chromium.org>
Commit-Queue: Eric Willigers <ericwilligers@chromium.org>
Cr-Commit-Position: refs/heads/master@{#533036}
parent 362fee3f
...@@ -577,7 +577,6 @@ ...@@ -577,7 +577,6 @@
property_methods: ["ParseSingleValue", "CSSValueFromComputedStyleInternal"], property_methods: ["ParseSingleValue", "CSSValueFromComputedStyleInternal"],
interpolable: true, interpolable: true,
inherited: true, inherited: true,
runtime_flag: "CSSVariableFonts",
font: true, font: true,
name_for_methods: "VariationSettings", name_for_methods: "VariationSettings",
converter: "ConvertFontVariationSettings", converter: "ConvertFontVariationSettings",
......
...@@ -46,7 +46,6 @@ const CSSValue* FontVariationSettings::ParseSingleValue( ...@@ -46,7 +46,6 @@ const CSSValue* FontVariationSettings::ParseSingleValue(
CSSParserTokenRange& range, CSSParserTokenRange& range,
const CSSParserContext& context, const CSSParserContext& context,
const CSSParserLocalContext&) const { const CSSParserLocalContext&) const {
DCHECK(RuntimeEnabledFeatures::CSSVariableFontsEnabled());
if (range.Peek().Id() == CSSValueNormal) if (range.Peek().Id() == CSSValueNormal)
return CSSPropertyParserHelpers::ConsumeIdent(range); return CSSPropertyParserHelpers::ConsumeIdent(range);
CSSValueList* variation_settings = CSSValueList::CreateCommaSeparated(); CSSValueList* variation_settings = CSSValueList::CreateCommaSeparated();
...@@ -66,7 +65,6 @@ const CSSValue* FontVariationSettings::CSSValueFromComputedStyleInternal( ...@@ -66,7 +65,6 @@ const CSSValue* FontVariationSettings::CSSValueFromComputedStyleInternal(
const LayoutObject*, const LayoutObject*,
Node* styled_node, Node* styled_node,
bool allow_visited_style) const { bool allow_visited_style) const {
DCHECK(RuntimeEnabledFeatures::CSSVariableFontsEnabled());
const blink::FontVariationSettings* variation_settings = const blink::FontVariationSettings* variation_settings =
style.GetFontDescription().VariationSettings(); style.GetFontDescription().VariationSettings();
if (!variation_settings || !variation_settings->size()) if (!variation_settings || !variation_settings->size())
......
...@@ -1294,7 +1294,6 @@ static inline bool IsValidCueStyleProperty(CSSPropertyID id) { ...@@ -1294,7 +1294,6 @@ static inline bool IsValidCueStyleProperty(CSSPropertyID id) {
case CSSPropertyTextDecorationSkipInk: case CSSPropertyTextDecorationSkipInk:
return true; return true;
case CSSPropertyFontVariationSettings: case CSSPropertyFontVariationSettings:
DCHECK(RuntimeEnabledFeatures::CSSVariableFontsEnabled());
return true; return true;
default: default:
break; break;
...@@ -1398,7 +1397,6 @@ static inline bool IsValidFirstLetterStyleProperty(CSSPropertyID id) { ...@@ -1398,7 +1397,6 @@ static inline bool IsValidFirstLetterStyleProperty(CSSPropertyID id) {
case CSSPropertyWordSpacing: case CSSPropertyWordSpacing:
return true; return true;
case CSSPropertyFontVariationSettings: case CSSPropertyFontVariationSettings:
DCHECK(RuntimeEnabledFeatures::CSSVariableFontsEnabled());
return true; return true;
case CSSPropertyTextDecorationColor: case CSSPropertyTextDecorationColor:
case CSSPropertyTextDecorationLine: case CSSPropertyTextDecorationLine:
......
...@@ -302,10 +302,6 @@ ...@@ -302,10 +302,6 @@
name: "CSSTypedOM", name: "CSSTypedOM",
status: "experimental", status: "experimental",
}, },
{
name: "CSSVariableFonts",
status: "stable",
},
{ {
name: "CSSVariables2", name: "CSSVariables2",
status: "experimental", status: "experimental",
......
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