PawletOS/cromite
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Disable references to fonts.googleapis.com: merged Remove preload of com.google.android.gms.fonts patch

Browse Source
This commit is contained in:
Carmelo Messina
2026-02-01 15:20:31 +01:00
parent edd31a7ef7
commit 321e30c69e
3 changed files with 128 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/cromite_patches_list.txt
-1
View File
@@ -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
build/patches/Disable-references-to-fonts.googleapis.com.patch
+128 -24
View File
@@ -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.
<font-family
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
- tools:ignore="FontValidationError,FontValidationWarning,UnusedResources"
- 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="Google Sans"
- app:fontProviderSystemFontFamily="google-sans"/>
+ 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.
<font-family
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
- tools:ignore="FontValidationError,FontValidationWarning,UnusedResources"
- 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="Google Sans:700"
- app:fontProviderSystemFontFamily="google-sans-bold"/>
+ 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.
<font-family
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
- tools:ignore="FontValidationError,FontValidationWarning,UnusedResources"
- 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="Google Sans:500"
- app:fontProviderSystemFontFamily="google-sans-medium"/>
+ 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.
<font-family
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
- tools:ignore="FontValidationError,FontValidationWarning,UnusedResources"
- 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="Google Sans Text"
- app:fontProviderSystemFontFamily="google-sans-text"/>
\ 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.
<font-family
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
- tools:ignore="FontValidationError,FontValidationWarning,UnusedResources"
- 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="Google Sans Text:500"
- app:fontProviderSystemFontFamily="google-sans-text-medium"/>
\ 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.
<!-- Placeholder for CSP. -->
$1
<title>$i18n{title}</title>
- <link href="https://fonts.googleapis.com/icon?family=Material+Icons"
- rel="stylesheet">
<!-- Placeholder for CSS. -->
$2
</head>
<if expr="not(is_ios)">
<!-- Import web fonts. -->
<!-- On iOS, the web fonts block the rendering until the resources are fetched,
diff --git a/components/dom_distiller/core/html/preview.html b/components/dom_distiller/core/html/preview.html
--- a/components/dom_distiller/core/html/preview.html
+++ b/components/dom_distiller/core/html/preview.html
@@ -62,18 +167,17 @@ diff --git a/components/dom_distiller/core/html/preview.html b/components/dom_di
<style>
.english :lang(th) {display: none}
.english :lang(zh) {display: none}
diff --git a/components/dom_distiller/core/javascript/dom_distiller_viewer.js b/components/dom_distiller/core/javascript/dom_distiller_viewer.js
--- a/components/dom_distiller/core/javascript/dom_distiller_viewer.js
+++ b/components/dom_distiller/core/javascript/dom_distiller_viewer.js
@@ -646,7 +646,7 @@ function maybeSetWebFont() {
}
const e = document.createElement('link');
- e.href = 'https://fonts.googleapis.com/css?family=Roboto';
+ e.href = 'chrome://resources/css/roboto.css';
e.rel = 'stylesheet';
e.type = 'text/css';
document.head.appendChild(e);
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
+++ b/content/public/android/java/src/org/chromium/content/browser/font/AndroidFontLookupImpl.java
@@ -214,6 +214,7 @@ public class AndroidFontLookupImpl implements AndroidFontLookup {
* @return An opened font file descriptor, or null if the font file is not available.
*/
private @Nullable ParcelFileDescriptor tryFetchFont(String fontUniqueName) {
+ if ((true)) return null;
ParcelFileDescriptor cachedFd = mFetchedFontCache.get(fontUniqueName);
if (cachedFd != null) {
try {
diff --git a/third_party/crashpad/crashpad/doc/support/crashpad_doxygen.css b/third_party/crashpad/crashpad/doc/support/crashpad_doxygen.css
--- a/third_party/crashpad/crashpad/doc/support/crashpad_doxygen.css
+++ b/third_party/crashpad/crashpad/doc/support/crashpad_doxygen.css
build/patches/Remove-preload-of-com.google.android.gms.fonts.patch
-70
View File
@@ -1,70 +0,0 @@
From: uazo <uazo@users.noreply.github.com>
Date: Wed, 6 Jul 2022 09:37:25 +0000
Subject: Remove preload of com.google.android.gms.fonts
Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
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 +-------
.../org/chromium/chrome/browser/fonts/FontPreloader.java | 1 +
4 files changed, 4 insertions(+), 21 deletions(-)
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.
<font-family
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
- tools:ignore="FontValidationError,FontValidationWarning,UnusedResources"
- 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="Google Sans"
- app:fontProviderSystemFontFamily="google-sans"/>
+ 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.
<font-family
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
- tools:ignore="FontValidationError,FontValidationWarning,UnusedResources"
- 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="Google Sans:700"
- app:fontProviderSystemFontFamily="google-sans-bold"/>
+ 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.
<font-family
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
- tools:ignore="FontValidationError,FontValidationWarning,UnusedResources"
- 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="Google Sans:500"
- app:fontProviderSystemFontFamily="google-sans-medium"/>
+ 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 =
--