Remove FontCacheScaling flag

This is not shipping and the flag is no longer used.

Change-Id: I7c3449db6e665c1e1a7148375914284f7b35a5e6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1572120
Commit-Queue: Avi Drissman <avi@chromium.org>
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Reviewed-by: Avi Drissman <avi@chromium.org>
Reviewed-by: Emil A Eklund <eae@chromium.org>
Auto-Submit: Dominik Röttsches <drott@chromium.org>
Cr-Commit-Position: refs/heads/master@{#654868}

chrome/browser/about_flags.cc

@@ -2181,9 +2181,6 @@ const FeatureEntry kFeatureEntries[] = {
      flag_descriptions::kPassiveEventListenersDueToFlingName,
      flag_descriptions::kPassiveEventListenersDueToFlingDescription, kOsAll,
      FEATURE_VALUE_TYPE(features::kPassiveEventListenersDueToFling)},
-    {"enable-font-cache-scaling", flag_descriptions::kFontCacheScalingName,
-     flag_descriptions::kFontCacheScalingDescription, kOsAll,
-     FEATURE_VALUE_TYPE(features::kFontCacheScaling)},
     {"per-method-can-make-payment-quota",
      flag_descriptions::kPerMethodCanMakePaymentQuotaName,
      flag_descriptions::kPerMethodCanMakePaymentQuotaDescription, kOsAll,

chrome/browser/flag_descriptions.cc

@@ -1018,11 +1018,6 @@ const char kFeaturePolicyDescription[] =
     "Enables granting and removing access to features through the "
     "Feature-Policy HTTP header.";
 
-const char kFontCacheScalingName[] = "FontCache scaling";
-const char kFontCacheScalingDescription[] =
-    "Reuse a cached font in the renderer to serve different sizes of font for "
-    "faster layout.";
-
 const char kForceEffectiveConnectionTypeName[] =
     "Override effective connection type";
 const char kForceEffectiveConnectionTypeDescription[] =

chrome/browser/flag_descriptions.h

@@ -612,7 +612,6 @@ extern const char kExtensionsOnChromeUrlsDescription[];
 extern const char kFeaturePolicyName[];
 extern const char kFeaturePolicyDescription[];
 
-extern const char kFontCacheScalingName[];
 extern const char kFontCacheScalingDescription[];
 
 extern const char kForceEffectiveConnectionTypeName[];

content/child/runtime_features.cc

@@ -234,10 +234,6 @@ void SetIndividualRuntimeFeatures(
       base::FeatureList::IsEnabled(
           features::kPassiveDocumentWheelEventListeners));
 
-  WebRuntimeFeatures::EnableFeatureFromString(
-      "FontCacheScaling",
-      base::FeatureList::IsEnabled(features::kFontCacheScaling));
-
   WebRuntimeFeatures::EnableFeatureFromString(
       "FontSrcLocalMatching",
       base::FeatureList::IsEnabled(features::kFontSrcLocalMatching));

content/public/common/content_features.cc

@@ -152,11 +152,6 @@ const base::Feature kExtendedMouseButtons{"ExtendedMouseButtons",
 const base::Feature kFeaturePolicyForSandbox{"FeaturePolicyForSandbox",
                                              base::FEATURE_DISABLED_BY_DEFAULT};
 
-// Enables a blink::FontCache optimization that reuses a font to serve different
-// size of font.
-const base::Feature kFontCacheScaling{"FontCacheScaling",
-                                      base::FEATURE_DISABLED_BY_DEFAULT};
-
 // Enables fixes for matching src: local() for web fonts correctly against full
 // font name or postscript name. Rolling out behind a flag, as enabling this
 // enables a font indexer on Android which we need to test in the field first.

content/public/common/content_features.h

@@ -45,7 +45,6 @@ CONTENT_EXPORT extern const base::Feature kExperimentalProductivityFeatures;
 CONTENT_EXPORT extern const base::Feature kExpensiveBackgroundTimerThrottling;
 CONTENT_EXPORT extern const base::Feature kExtendedMouseButtons;
 CONTENT_EXPORT extern const base::Feature kFeaturePolicyForSandbox;
-CONTENT_EXPORT extern const base::Feature kFontCacheScaling;
 CONTENT_EXPORT extern const base::Feature kFontSrcLocalMatching;
 CONTENT_EXPORT extern const base::Feature kGuestViewCrossProcessFrames;
 CONTENT_EXPORT extern const base::Feature kHeapCompaction;

third_party/blink/renderer/platform/fonts/font_cache.cc

@@ -127,9 +127,6 @@ FontPlatformData* FontCache::GetFontPlatformData(
   // Remove the font size from the cache key, and handle the font size
   // separately in the inner HashMap. So that different size of FontPlatformData
   // can share underlying SkTypeface.
-  if (RuntimeEnabledFeatures::FontCacheScalingEnabled())
-    key.ClearFontSize();
-
   FontPlatformData* result;
   bool found_result;
 

third_party/blink/renderer/platform/runtime_enabled_features.json5

@@ -576,10 +576,6 @@
       name: "FocuslessSpatialNavigation",
       settable_from_internals: true,
     },
-    {
-      name: "FontCacheScaling",
-      status: "test",
-    },
     {
       name: "FontSrcLocalMatching",
       // No status, as the web platform runtime enabled feature is controlled by