0ct0pu5/bromite
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into next/v103

Browse source
This commit is contained in:
csagan5 2022-07-12 00:44:47 +02:00
commit 99ed991ace
2 changed files with 100 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
build/patches/Remove-window-name-on-cross-origin-navigation.patch Normal file
View file

@ -0,0 +1,31 @@
From: uazo <uazo@users.noreply.github.com>
Date: Sat, 9 Jul 2022 06:59:18 +0000
Subject: Remove window name on cross origin navigation
see also https://trac.webkit.org/changeset/209076/webkit
---
third_party/blink/renderer/core/loader/document_loader.cc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_party/blink/renderer/core/loader/document_loader.cc
--- a/third_party/blink/renderer/core/loader/document_loader.cc
+++ b/third_party/blink/renderer/core/loader/document_loader.cc
@@ -2412,7 +2412,7 @@ void DocumentLoader::CommitNavigation() {
// that the name would be nulled and if the name is accessed after we will
// fire a UseCounter. If we decide to move forward with this change, we'd
// actually clean the name here.
- // frame_->tree().setName(g_null_atom);
+ frame_->Tree().SetName(g_null_atom);
frame_->Tree().ExperimentalSetNulledName();
}
@@ -2423,6 +2423,7 @@ void DocumentLoader::CommitNavigation() {
// TODO(shuuran): CrossSiteCrossBrowsingContextGroupSetNulledName will just
// record the fact that the name would be nulled and if the name is accessed
// after we will fire a UseCounter.
+ frame_->Tree().SetName(g_null_atom);
frame_->Tree().CrossSiteCrossBrowsingContextGroupSetNulledName();
}
--
2.25.1

69
build/patches/remove-gms-preload-font.patch Normal file
View file

@ -0,0 +1,69 @@
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
---
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
@@ -6,10 +6,4 @@
<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
@@ -6,10 +6,4 @@
<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
@@ -6,10 +6,4 @@
<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
@@ -70,6 +70,7 @@ public class FontPreloader {
mThreadChecker.assertOnValidThread();
if (!mInitialized) {
mInitialized = true;
+ if ((true)) return;
context = context.getApplicationContext();
OnFontCallback callback = new OnFontCallback();
for (int font : mFonts) {
--
2.25.1