Remove CSSFontFaceAutoVariableRange runtime-enabled feature.

This has been shipped for over a year: https://chromium-review.googlesource.com/c/chromium/src/+/3997276 Bug: 973194 Change-Id: I5fe7c43f566843f98efa6af51c8c9f0b2fc665c8 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5014115 Reviewed-by: Munira Tursunova <moonira@google.com> Auto-Submit: Jeremy Roman <jbroman@chromium.org> Commit-Queue: Jeremy Roman <jbroman@chromium.org> Commit-Queue: Munira Tursunova <moonira@google.com> Cr-Commit-Position: refs/heads/main@{#1230782}
Denger-Network · Nov 29, 2023 · 8ebc98c · 8ebc98c
1 parent 68e6177
commit 8ebc98c
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 25 deletions.
diff --git a/third_party/blink/renderer/core/css/font_face.cc b/third_party/blink/renderer/core/css/font_face.cc
@@ -642,7 +642,6 @@ FontSelectionCapabilities FontFace::GetFontSelectionCapabilities() const {
                                 FontSelectionRange::RangeType::kSetExplicitly};
           break;
         case CSSValueID::kAuto:
-          DCHECK(RuntimeEnabledFeatures::CSSFontFaceAutoVariableRangeEnabled());
           capabilities.width = {kNormalWidthValue, kNormalWidthValue,
                                 FontSelectionRange::RangeType::kSetFromAuto};
           break;
@@ -708,7 +707,6 @@ FontSelectionCapabilities FontFace::GetFontSelectionCapabilities() const {
                                 FontSelectionRange::RangeType::kSetExplicitly};
           break;
         case CSSValueID::kAuto:
-          DCHECK(RuntimeEnabledFeatures::CSSFontFaceAutoVariableRangeEnabled());
           capabilities.slope = {kNormalSlopeValue, kNormalSlopeValue,
                                 FontSelectionRange::RangeType::kSetFromAuto};
           break;
@@ -782,7 +780,6 @@ FontSelectionCapabilities FontFace::GetFontSelectionCapabilities() const {
                                  FontSelectionRange::RangeType::kSetExplicitly};
           break;
         case CSSValueID::kAuto:
-          DCHECK(RuntimeEnabledFeatures::CSSFontFaceAutoVariableRangeEnabled());
           capabilities.weight = {kNormalWeightValue, kNormalWeightValue,
                                  FontSelectionRange::RangeType::kSetFromAuto};
           break;

diff --git a/third_party/blink/renderer/core/css/properties/css_parsing_utils.cc b/third_party/blink/renderer/core/css/properties/css_parsing_utils.cc
@@ -5143,8 +5143,7 @@ CSSValue* ConsumeFontStyle(CSSParserTokenRange& range,
     return ConsumeIdent(range);
   }
 
-  if (RuntimeEnabledFeatures::CSSFontFaceAutoVariableRangeEnabled() &&
-      range.Peek().Id() == CSSValueID::kAuto &&
+  if (range.Peek().Id() == CSSValueID::kAuto &&
       context.Mode() == kCSSFontFaceRuleMode) {
     return ConsumeIdent(range);
   }
@@ -5195,8 +5194,7 @@ CSSIdentifierValue* ConsumeFontStretchKeywordOnly(
        token.Id() <= CSSValueID::kUltraExpanded)) {
     return ConsumeIdent(range);
   }
-  if (RuntimeEnabledFeatures::CSSFontFaceAutoVariableRangeEnabled() &&
-      token.Id() == CSSValueID::kAuto &&
+  if (token.Id() == CSSValueID::kAuto &&
       context.Mode() == kCSSFontFaceRuleMode) {
     return ConsumeIdent(range);
   }
@@ -5240,10 +5238,8 @@ CSSValue* ConsumeFontWeight(CSSParserTokenRange& range,
       return ConsumeIdent(range);
     }
   } else {
-    if ((token.Id() == CSSValueID::kNormal ||
-         token.Id() == CSSValueID::kBold) ||
-        (RuntimeEnabledFeatures::CSSFontFaceAutoVariableRangeEnabled() &&
-         token.Id() == CSSValueID::kAuto)) {
+    if (token.Id() == CSSValueID::kNormal || token.Id() == CSSValueID::kBold ||
+        token.Id() == CSSValueID::kAuto) {
       return ConsumeIdent(range);
     }
   }

diff --git a/third_party/blink/renderer/platform/fonts/font_custom_platform_data.cc b/third_party/blink/renderer/platform/fonts/font_custom_platform_data.cc
@@ -143,7 +143,6 @@ FontPlatformData FontCustomPlatformData::GetFontPlatformData(
     absl::optional<SkFontParameters::Variation::Axis> wght_parameters =
         RetrieveVariationDesignParametersByTag(base_typeface_, kWghtTag);
     if (selection_capabilities.weight.IsRangeSetFromAuto() && wght_parameters) {
-      DCHECK(RuntimeEnabledFeatures::CSSFontFaceAutoVariableRangeEnabled());
       FontSelectionRange wght_range = {
           FontSelectionValue(wght_parameters->min),
           FontSelectionValue(wght_parameters->max)};
@@ -160,7 +159,6 @@ FontPlatformData FontCustomPlatformData::GetFontPlatformData(
     absl::optional<SkFontParameters::Variation::Axis> wdth_parameters =
         RetrieveVariationDesignParametersByTag(base_typeface_, kWdthTag);
     if (selection_capabilities.width.IsRangeSetFromAuto() && wdth_parameters) {
-      DCHECK(RuntimeEnabledFeatures::CSSFontFaceAutoVariableRangeEnabled());
       FontSelectionRange wdth_range = {
           FontSelectionValue(wdth_parameters->min),
           FontSelectionValue(wdth_parameters->max)};
@@ -179,7 +177,6 @@ FontPlatformData FontCustomPlatformData::GetFontPlatformData(
     absl::optional<SkFontParameters::Variation::Axis> slnt_parameters =
         RetrieveVariationDesignParametersByTag(base_typeface_, kSlntTag);
     if (selection_capabilities.slope.IsRangeSetFromAuto() && slnt_parameters) {
-      DCHECK(RuntimeEnabledFeatures::CSSFontFaceAutoVariableRangeEnabled());
       FontSelectionRange slnt_range = {
           FontSelectionValue(slnt_parameters->min),
           FontSelectionValue(slnt_parameters->max)};

diff --git a/third_party/blink/renderer/platform/fonts/font_selection_types.h b/third_party/blink/renderer/platform/fonts/font_selection_types.h
@@ -29,7 +29,6 @@
 #include <algorithm>
 
 #include "third_party/blink/renderer/platform/platform_export.h"
-#include "third_party/blink/renderer/platform/runtime_enabled_features.h"
 #include "third_party/blink/renderer/platform/wtf/allocator/allocator.h"
 #include "third_party/blink/renderer/platform/wtf/hash_table_deleted_value_type.h"
 #include "third_party/blink/renderer/platform/wtf/hash_traits.h"
@@ -280,9 +279,7 @@ struct FontSelectionRange {
   FontSelectionValue minimum{FontSelectionValue(1)};
   FontSelectionValue maximum{FontSelectionValue(0)};
 
-  RangeType type = RuntimeEnabledFeatures::CSSFontFaceAutoVariableRangeEnabled()
-                       ? kSetFromAuto
-                       : kSetExplicitly;
+  RangeType type = kSetFromAuto;
 };
 
 struct PLATFORM_EXPORT FontSelectionRequest {

diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -911,13 +911,6 @@
       name: "CSSFirstLetterNoNewLineAsPrecedingChar",
       status: "stable",
     },
-    {
-      // @font-face Font property descriptors auto range.
-      // https://www.w3.org/TR/css-fonts-4/#font-prop-desc
-      name: "CSSFontFaceAutoVariableRange",
-      status: "stable",
-      base_feature: "none",
-    },
     {
       name: "CSSFontSizeAdjust",
       status: "experimental",