Add feature configuration for src:local() font matching

Bug: 867866 Change-Id: If25d954db330ee2dfa32779fb1e8e7f40b2152f4 Reviewed-on: https://chromium-review.googlesource.com/1151203 Commit-Queue: Dominik Röttsches <drott@chromium.org> Reviewed-by: Emil A Eklund <eae@chromium.org> Reviewed-by: Jochen Eisinger <jochen@chromium.org> Cr-Commit-Position: refs/heads/master@{#579031}
hylschwy · Jul 30, 2018 · ccb7693 · ccb7693
1 parent c79a5be
commit ccb7693
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 0 deletions.
diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc
@@ -265,6 +265,10 @@ void SetRuntimeFeaturesDefaultsAndUpdateFromArgs(
       "FontCacheScaling",
       base::FeatureList::IsEnabled(features::kFontCacheScaling));
 
+  WebRuntimeFeatures::EnableFeatureFromString(
+      "FontSrcLocalMatching",
+      base::FeatureList::IsEnabled(features::kFontSrcLocalMatching));
+
   WebRuntimeFeatures::EnableFeatureFromString(
       "FramebustingNeedsSameOriginOrUserGesture",
       base::FeatureList::IsEnabled(

diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
@@ -144,6 +144,12 @@ const base::Feature kExtendedMouseButtons{"ExtendedMouseButtons",
 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.
+const base::Feature kFontSrcLocalMatching{"FontSrcLocalMatching",
+                                          base::FEATURE_DISABLED_BY_DEFAULT};
+
 // Enables a security restriction on iframes navigating their top frame.
 // When enabled, the navigation will only be permitted if the iframe is
 // same-origin to the top frame, or if a user gesture is being processed.

diff --git a/content/public/common/content_features.h b/content/public/common/content_features.h
@@ -43,6 +43,7 @@ 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 kFontCacheScaling;
+CONTENT_EXPORT extern const base::Feature kFontSrcLocalMatching;
 CONTENT_EXPORT extern const base::Feature
     kFramebustingNeedsSameOriginOrUserGesture;
 CONTENT_EXPORT extern const base::Feature kGamepadExtensions;

diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -516,6 +516,10 @@
       name: "FontCacheScaling",
       status: "test",
     },
+    {
+      name: "FontSrcLocalMatching",
+      status: "test",
+    },
     // For simulating Android's overlay fullscreen video in layout tests on Linux.
     {
       name: "ForceOverlayFullscreenVideo",