Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit fed8d834 authored by uazo's avatar uazo Committed by GitHub
Browse files

Rebase to 130 (#1547) 

Rebase to 130
parents d13f5bbd e5a03739

build/RELEASE

+1 −1
Original line number Diff line number Diff line 
129.0.6668.101
 
 No newline at end of file
 
130.0.6723.44
 
 No newline at end of file

build/cromite_patches_list.txt

+0 −1
Original line number Diff line number Diff line
@@ -217,7 +217,6 @@ Disable-GSA-by-default.patch 
Disallowing-MIDI-permission-by-default.patch

Disable-Compression-Dictionary-Transport.patch

Disallow-Android-App-Scheme-as-referrer.patch

Deprecate-Data-URL-in-SVGUseElement.patch

Content-settings-infrastructure.patch

Add-autoplay-site-setting.patch

Site-setting-for-images.patch

build/patches/AImageReader-CFI-crash-mitigations.patch

+2 −2
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ diff --git a/base/android/android_image_reader_compat.h b/base/android/android_i 
diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json

--- a/chrome/browser/flag-metadata.json

+++ b/chrome/browser/flag-metadata.json

@@ -3406,9 +3406,9 @@

@@ -3430,9 +3430,9 @@

     "expiry_milestone": 135

   },

   {
@@ -168,8 +168,8 @@ diff --git a/gpu/config/gpu_finch_features.h b/gpu/config/gpu_finch_features.h 
 #if BUILDFLAG(IS_ANDROID)

+GPU_EXPORT BASE_DECLARE_FEATURE(kAImageReaderMediaPlayer);

 GPU_EXPORT BASE_DECLARE_FEATURE(kAndroidSurfaceControl);

 GPU_EXPORT BASE_DECLARE_FEATURE(kEnableGpuMemoryBufferImplAHB);

 GPU_EXPORT BASE_DECLARE_FEATURE(kWebViewSurfaceControl);

 GPU_EXPORT BASE_DECLARE_FEATURE(kWebViewSurfaceControlForTV);

diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc

--- a/gpu/config/gpu_util.cc

+++ b/gpu/config/gpu_util.cc

build/patches/Add-AllowUserCertificates-flag.patch

+8 −8
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java

--- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java

@@ -233,6 +233,7 @@ import org.chromium.content_public.browser.ScreenOrientationProvider;

@@ -227,6 +227,7 @@ import org.chromium.content_public.browser.ScreenOrientationProvider;

 import org.chromium.content_public.browser.SelectionPopupController;

 import org.chromium.content_public.browser.WebContents;

 import org.chromium.content_public.common.ContentSwitches;
@@ -28,7 +28,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv 
 import org.chromium.printing.PrintManagerDelegateImpl;

 import org.chromium.printing.PrintingController;

 import org.chromium.printing.PrintingControllerImpl;

@@ -1054,6 +1055,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>

@@ -1045,6 +1046,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>

 

         ChromeActivitySessionTracker.getInstance().onStartWithNative(getProfileProviderSupplier());

         ChromeCachedFlags.getInstance().cacheNativeFlags();
@@ -56,10 +56,10 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f 
     public static final String ACCOUNT_REAUTHENTICATION_RECENT_TIME_WINDOW =

             "AccountReauthenticationRecentTimeWindow";

+    public static final String ALLOW_USER_CERTIFICATES = "AllowUserCertificates";

     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_TRANSLATE =

             "AdaptiveButtonInTopToolbarTranslate";

     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_ADD_TO_BOOKMARKS =

@@ -572,6 +573,8 @@ public abstract class ChromeFeatureList {

     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_PAGE_SUMMARY =

             "AdaptiveButtonInTopToolbarPageSummary";

     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_CUSTOMIZATION_V2 =

@@ -583,6 +584,8 @@ public abstract class ChromeFeatureList {

     public static final CachedFlag sAndroidTabDeclutterDedupeTabIdsKillSwitch =

             newCachedFlag(ANDROID_TAB_DECLUTTER_DEDUPE_TAB_IDS_KILL_SWITCH, true);

     public static final CachedFlag sAppSpecificHistory = newCachedFlag(APP_SPECIFIC_HISTORY, true);
@@ -68,14 +68,14 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f 
     public static final CachedFlag sAsyncNotificationManager =

             newCachedFlag(ASYNC_NOTIFICATION_MANAGER, false);

     public static final CachedFlag sBackGestureActivityTabProvider =

@@ -726,6 +729,7 @@ public abstract class ChromeFeatureList {

@@ -746,6 +749,7 @@ public abstract class ChromeFeatureList {

     public static final List<CachedFlag> sFlagsCachedFullBrowserChromium =

             List.of(

                     sAccountReauthenticationRecentTimeWindow,

+                    sAllowUserCertificates,

                     sAndroidAppIntegration,

                     sAndroidBottomToolbar,

                     sAndroidElegantTextHeight,

                     sAndroidGoogleSansText,

diff --git a/cromite_flags/chrome/browser/about_flags_cc/Add-AllowUserCertificates-flag.inc b/cromite_flags/chrome/browser/about_flags_cc/Add-AllowUserCertificates-flag.inc

new file mode 100644

--- /dev/null

build/patches/Add-IsCleartextPermitted-flag.patch

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ new file mode 100644 
diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc

--- a/net/url_request/url_request_http_job.cc

+++ b/net/url_request/url_request_http_job.cc

@@ -390,6 +390,11 @@ std::unique_ptr<URLRequestJob> URLRequestHttpJob::Create(URLRequest* request) {

@@ -391,6 +391,11 @@ std::unique_ptr<URLRequestJob> URLRequestHttpJob::Create(URLRequest* request) {

       }

     }