From 321e30c69ed82814939f8986d3e613d39296e9c0 Mon Sep 17 00:00:00 2001 From: Carmelo Messina Date: Sun, 1 Feb 2026 15:20:31 +0100 Subject: [PATCH] Disable references to fonts.googleapis.com: merged Remove preload of com.google.android.gms.fonts patch --- build/cromite_patches_list.txt | 1 - ...e-references-to-fonts.googleapis.com.patch | 152 +++++++++++++++--- ...load-of-com.google.android.gms.fonts.patch | 70 -------- 3 files changed, 128 insertions(+), 95 deletions(-) delete mode 100644 build/patches/Remove-preload-of-com.google.android.gms.fonts.patch diff --git a/build/cromite_patches_list.txt b/build/cromite_patches_list.txt index 773ac37e..56c60110 100644 --- a/build/cromite_patches_list.txt +++ b/build/cromite_patches_list.txt @@ -154,7 +154,6 @@ Invalidate-components-public-key.patch Improve-plain-text-rendering-on-mobile.patch Remove-segmentation-platform.patch Remove-window-name-on-cross-origin-navigation.patch -Remove-preload-of-com.google.android.gms.fonts.patch Partition-Blink-memory-cache.patch Remove-navigator.connection-info.patch Disable-PrivacyGuide.patch diff --git a/build/patches/Disable-references-to-fonts.googleapis.com.patch b/build/patches/Disable-references-to-fonts.googleapis.com.patch index e17cec30..aceed8fd 100644 --- a/build/patches/Disable-references-to-fonts.googleapis.com.patch +++ b/build/patches/Disable-references-to-fonts.googleapis.com.patch @@ -4,18 +4,123 @@ Subject: Disable references to fonts.googleapis.com License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- - .../side_panel/read_anything/app/read_anything_toolbar.ts | 4 +--- - .../content/browser/dom_distiller_viewer_source.cc | 2 +- - components/dom_distiller/core/html/dom_distiller_viewer.html | 2 -- - components/dom_distiller/core/html/preview.html | 2 +- - .../dom_distiller/core/javascript/dom_distiller_viewer.js | 2 +- - .../crashpad/crashpad/doc/support/crashpad_doxygen.css | 3 +-- - 6 files changed, 5 insertions(+), 10 deletions(-) + chrome/android/java/res/font/reader_mode_lexend.xml | 1 - + chrome/android/java/res_base/font/chrome_google_sans.xml | 8 +------- + .../java/res_base/font/chrome_google_sans_bold.xml | 8 +------- + .../java/res_base/font/chrome_google_sans_medium.xml | 8 +------- + .../java/res_base/font/chrome_google_sans_text.xml | 8 +------- + .../java/res_base/font/chrome_google_sans_text_medium.xml | 8 +------- + .../org/chromium/chrome/browser/fonts/FontPreloader.java | 1 + + .../side_panel/read_anything/app/read_anything_toolbar.ts | 4 +--- + .../content/browser/dom_distiller_viewer_source.cc | 2 +- + .../dom_distiller/core/html/dom_distiller_viewer.html | 2 -- + components/dom_distiller/core/html/preview.html | 2 +- + .../content/browser/font/AndroidFontLookupImpl.java | 1 + + .../crashpad/crashpad/doc/support/crashpad_doxygen.css | 3 +-- + 13 files changed, 11 insertions(+), 45 deletions(-) +diff --git a/chrome/android/java/res/font/reader_mode_lexend.xml b/chrome/android/java/res/font/reader_mode_lexend.xml +--- a/chrome/android/java/res/font/reader_mode_lexend.xml ++++ b/chrome/android/java/res/font/reader_mode_lexend.xml +@@ -12,6 +12,5 @@ found in the LICENSE file. + app:fontProviderAuthority="com.google.android.gms.fonts" + app:fontProviderCerts="@array/ui_com_google_android_gms_fonts_certs" + app:fontProviderFetchStrategy="async" +- app:fontProviderPackage="com.google.android.gms" + app:fontProviderQuery="Lexend" + app:fontProviderSystemFontFamily="sans-serif"/> +diff --git a/chrome/android/java/res_base/font/chrome_google_sans.xml b/chrome/android/java/res_base/font/chrome_google_sans.xml +--- a/chrome/android/java/res_base/font/chrome_google_sans.xml ++++ b/chrome/android/java/res_base/font/chrome_google_sans.xml +@@ -8,10 +8,4 @@ found in the LICENSE file. + ++ tools:ignore="FontValidationError,FontValidationWarning,UnusedResources"/> +diff --git a/chrome/android/java/res_base/font/chrome_google_sans_bold.xml b/chrome/android/java/res_base/font/chrome_google_sans_bold.xml +--- a/chrome/android/java/res_base/font/chrome_google_sans_bold.xml ++++ b/chrome/android/java/res_base/font/chrome_google_sans_bold.xml +@@ -8,10 +8,4 @@ found in the LICENSE file. + ++ tools:ignore="FontValidationError,FontValidationWarning,UnusedResources"/> +diff --git a/chrome/android/java/res_base/font/chrome_google_sans_medium.xml b/chrome/android/java/res_base/font/chrome_google_sans_medium.xml +--- a/chrome/android/java/res_base/font/chrome_google_sans_medium.xml ++++ b/chrome/android/java/res_base/font/chrome_google_sans_medium.xml +@@ -8,10 +8,4 @@ found in the LICENSE file. + ++ tools:ignore="FontValidationError,FontValidationWarning,UnusedResources"/> +diff --git a/chrome/android/java/res_base/font/chrome_google_sans_text.xml b/chrome/android/java/res_base/font/chrome_google_sans_text.xml +--- a/chrome/android/java/res_base/font/chrome_google_sans_text.xml ++++ b/chrome/android/java/res_base/font/chrome_google_sans_text.xml +@@ -8,10 +8,4 @@ found in the LICENSE file. + +\ No newline at end of file ++ tools:ignore="FontValidationError,FontValidationWarning,UnusedResources"/> +diff --git a/chrome/android/java/res_base/font/chrome_google_sans_text_medium.xml b/chrome/android/java/res_base/font/chrome_google_sans_text_medium.xml +--- a/chrome/android/java/res_base/font/chrome_google_sans_text_medium.xml ++++ b/chrome/android/java/res_base/font/chrome_google_sans_text_medium.xml +@@ -8,10 +8,4 @@ found in the LICENSE file. + +\ No newline at end of file ++ tools:ignore="FontValidationError,FontValidationWarning,UnusedResources"/> +diff --git a/chrome/android/java/src/org/chromium/chrome/browser/fonts/FontPreloader.java b/chrome/android/java/src/org/chromium/chrome/browser/fonts/FontPreloader.java +--- a/chrome/android/java/src/org/chromium/chrome/browser/fonts/FontPreloader.java ++++ b/chrome/android/java/src/org/chromium/chrome/browser/fonts/FontPreloader.java +@@ -64,6 +64,7 @@ public class FontPreloader { + mThreadChecker.assertOnValidThread(); + if (!mInitialized) { + mInitialized = true; ++ if ((true)) return; + context = context.getApplicationContext(); + // Create an empty callback so we can call the async version of #getFont. + var callback = diff --git a/chrome/browser/resources/side_panel/read_anything/app/read_anything_toolbar.ts b/chrome/browser/resources/side_panel/read_anything/app/read_anything_toolbar.ts --- a/chrome/browser/resources/side_panel/read_anything/app/read_anything_toolbar.ts +++ b/chrome/browser/resources/side_panel/read_anything/app/read_anything_toolbar.ts -@@ -392,9 +392,7 @@ export class ReadAnythingToolbarElement extends ReadAnythingToolbarElementBase { +@@ -419,9 +419,7 @@ export class ReadAnythingToolbarElement extends ReadAnythingToolbarElementBase { const link = document.createElement('link'); link.rel = 'preload'; link.as = 'style'; @@ -41,15 +146,15 @@ diff --git a/components/dom_distiller/content/browser/dom_distiller_viewer_sourc diff --git a/components/dom_distiller/core/html/dom_distiller_viewer.html b/components/dom_distiller/core/html/dom_distiller_viewer.html --- a/components/dom_distiller/core/html/dom_distiller_viewer.html +++ b/components/dom_distiller/core/html/dom_distiller_viewer.html -@@ -18,8 +18,6 @@ found in the LICENSE file. +@@ -17,8 +17,6 @@ found in the LICENSE file. $1 $i18n{title} - - - $2 - + + +