disable kGMSCoreEmoji flag
This commit is contained in:
parent
2c3e9c272b
commit
5a18e6d724
1 changed files with 34 additions and 2 deletions
|
@ -3,8 +3,10 @@ Date: Wed, 19 Jan 2022 12:39:24 +0000
|
|||
Subject: Remove fetching google fonts from gms
|
||||
|
||||
---
|
||||
.../chromium/content/browser/font/AndroidFontLookupImpl.java | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
.../content/browser/font/AndroidFontLookupImpl.java | 2 ++
|
||||
third_party/blink/common/features.cc | 2 +-
|
||||
third_party/blink/renderer/platform/fonts/font_cache.cc | 8 ++++----
|
||||
3 files changed, 7 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/content/public/android/java/src/org/chromium/content/browser/font/AndroidFontLookupImpl.java b/content/public/android/java/src/org/chromium/content/browser/font/AndroidFontLookupImpl.java
|
||||
--- a/content/public/android/java/src/org/chromium/content/browser/font/AndroidFontLookupImpl.java
|
||||
|
@ -18,6 +20,36 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/font/A
|
|||
String query = mFullFontNameToQuery.get(fontUniqueName);
|
||||
if (query == null) {
|
||||
Log.d(TAG, "Query format not found for full font name: %s", fontUniqueName);
|
||||
diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
|
||||
--- a/third_party/blink/common/features.cc
|
||||
+++ b/third_party/blink/common/features.cc
|
||||
@@ -45,7 +45,7 @@ const base::Feature kConversionMeasurement{"ConversionMeasurement",
|
||||
base::FEATURE_DISABLED_BY_DEFAULT};
|
||||
|
||||
const base::Feature kGMSCoreEmoji{"GMSCoreEmoji",
|
||||
- base::FEATURE_ENABLED_BY_DEFAULT};
|
||||
+ base::FEATURE_DISABLED_BY_DEFAULT};
|
||||
|
||||
// Whether the HandwritingRecognition API can be enabled by origin trial.
|
||||
// Disabling this feature disables both the origin trial and the mojo interface.
|
||||
diff --git a/third_party/blink/renderer/platform/fonts/font_cache.cc b/third_party/blink/renderer/platform/fonts/font_cache.cc
|
||||
--- a/third_party/blink/renderer/platform/fonts/font_cache.cc
|
||||
+++ b/third_party/blink/renderer/platform/fonts/font_cache.cc
|
||||
@@ -300,10 +300,10 @@ scoped_refptr<SimpleFontData> FontCache::FontDataFromFontPlatformData(
|
||||
const FontPlatformData* platform_data,
|
||||
ShouldRetain should_retain,
|
||||
bool subpixel_ascent_descent) {
|
||||
-#if DCHECK_IS_ON()
|
||||
- if (should_retain == kDoNotRetain)
|
||||
- DCHECK(purge_prevent_count_);
|
||||
-#endif
|
||||
+// #if DCHECK_IS_ON()
|
||||
+// if (should_retain == kDoNotRetain)
|
||||
+// DCHECK(purge_prevent_count_);
|
||||
+// #endif
|
||||
|
||||
return font_data_cache_.Get(platform_data, should_retain,
|
||||
subpixel_ascent_descent);
|
||||
--
|
||||
2.20.1
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue