Skip to content

Commit

Permalink
Android fonts fingerprinting mitigation: replaces system fonts with a…
Browse files Browse the repository at this point in the history
… predefined set downloaded from www.cromite.org (#1829)
  • Loading branch information
uazo committed Feb 16, 2025
1 parent a55d2c4 commit ca3b3a9
Show file tree
Hide file tree
Showing 9 changed files with 3,588 additions and 149 deletions.
4 changes: 2 additions & 2 deletions build/cromite_patches_list.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ Restore-classic-new-tab-page.patch
Always-use-new-tab-page-for-default-home-page.patch
disable-battery-status-updater.patch
Battery-API-return-nothing.patch
updater-disable-updater-pings.patch
Disable-omission-of-URL-elements.patch
Modify-default-preferences.patch
Do-not-store-passwords-by-default.patch
Expand Down Expand Up @@ -183,7 +182,6 @@ WIN-Add-some-prefs-to-secure-preferences.patch
WIN-Disable-search-for-image.patch

AudioBuffer-AnalyserNode-fp-mitigations.patch
Disable-Component-Updates.patch
add-browser-policy.patch
Always-open-browser-controls-in-new-tab.patch
Partitioning-all-cookies-by-top-frame-domain.patch
Expand Down Expand Up @@ -304,6 +302,8 @@ Never-treat-Proguard-warnings-as-errors.patch
Temp-disable-experimental-web-platform-features.patch
Block-leakage-of-urls-in-sandbox-iframes.patch
Fix-chromium-build-bugs.patch
Enable-component-updater.patch
Android-fonts-fingerprinting-mitigation.patch

# adblock patches
eyeo-beta-118.0.5993.48-base.patch
Expand Down
29 changes: 28 additions & 1 deletion build/patches/Add-cromite-flags-support.patch
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
.../privacy/settings/PrivacySettings.java | 2 +-
.../settings/FragmentDependencyProvider.java | 10 +-
.../browser/settings/SettingsActivity.java | 42 ++++-
.../tracing/settings/DeveloperSettings.java | 5 +-
chrome/browser/about_flags.cc | 11 ++
chrome/browser/browser_features.cc | 1 +
chrome/browser/browser_features.h | 1 +
Expand Down Expand Up @@ -105,7 +106,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
third_party/blink/public/common/features.h | 1 +
ui/base/ui_base_features.cc | 1 +
ui/base/ui_base_features.h | 1 +
92 files changed, 805 insertions(+), 28 deletions(-)
93 files changed, 808 insertions(+), 30 deletions(-)
create mode 100644 chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/include_all_directory.java
create mode 100644 chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/java_template/CromiteCachedFlag.java.tmpl
create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-cromite-flags-support.grdp
Expand Down Expand Up @@ -602,6 +603,32 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin
true /* recursive */);
fragmentManager.registerFragmentLifecycleCallbacks(
new WideDisplayPaddingApplier(), false /* recursive */);
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/DeveloperSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/DeveloperSettings.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/DeveloperSettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/DeveloperSettings.java
@@ -17,11 +17,12 @@ import org.chromium.base.version_info.VersionInfo;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
+import org.chromium.chrome.browser.settings.ChromeBaseSettingsFragment;
import org.chromium.components.browser_ui.settings.EmbeddableSettingsPage;
import org.chromium.components.browser_ui.settings.SettingsUtils;

/** Settings fragment containing preferences aimed at Chrome and web developers. */
-public class DeveloperSettings extends PreferenceFragmentCompat implements EmbeddableSettingsPage {
+public class DeveloperSettings extends ChromeBaseSettingsFragment implements EmbeddableSettingsPage {
private static final String UI_PREF_BETA_STABLE_HINT = "beta_stable_hint";

// Non-translated strings:
@@ -52,7 +53,7 @@ public class DeveloperSettings extends PreferenceFragmentCompat implements Embed
}

@Override
- public void onCreatePreferences(Bundle savedInstanceState, String s) {
+ public void onCreatePreferencesCromite(Bundle savedInstanceState, String s) {
SettingsUtils.addPreferencesFromResource(this, R.xml.developer_preferences);

if (VersionInfo.isBetaBuild() || VersionInfo.isStableBuild()) {
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
Expand Down
Loading

0 comments on commit ca3b3a9

Please sign in to comment.