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

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

Rebase to v125 (#1084) 

Rebase to v125
parents 5e764c70 00b3446d

build/RELEASE

+1 −1
Original line number Diff line number Diff line 
124.0.6367.202
 
 No newline at end of file
 
125.0.6422.41
 
 No newline at end of file

build/cromite_patches_list.txt

+2 −3
Original line number Diff line number Diff line
@@ -140,7 +140,6 @@ Re-introduce-override_build_timestamp.patch 
enable-ftrivial-auto-var-init-zero.patch

disable-appending-variations-header.patch

Disable-idle-detection.patch

Allow-building-without-supervised-users.patch

Disable-minidump-upload-scheduling.patch

Revert-Permit-blocking-of-view-source.patch

Disable-safety-check.patch
@@ -237,8 +236,6 @@ Add-webRTC-site-settings.patch 
Show-site-settings-for-cookies-javascript-and-ads.patch

Viewport-Protection-flag.patch

Revert-remove-allowscript-content-setting-secondary-url.patch

Revert-remove-allowimage-content-setting-secondary-url.patch

Temp-Alert-for-CC-revert.patch

Timezone-customization.patch

Change-popup-site-setting.patch

Disable-speechSynthesis-getVoices-API.patch
@@ -288,6 +285,8 @@ Enable-platform-aac-audio-and-h264-video.patch 
Disable-Paint-Preview-by-default.patch

Do-not-use-Windows-ClearType-Text-Tuner-setting.patch

Private-network-access-content-settings.patch

Allow-building-without-supervised-users.patch

Keep-ComputePressure-disabled.patch



Temp-PerformanceNavigationTiming-privacy-fix.patch

Temp-disable-predictive-back-gesture.patch

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

+4 −4
Original line number Diff line number Diff line
@@ -90,8 +90,8 @@ 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

@@ -3101,9 +3101,9 @@

     "expiry_milestone": 125

@@ -3186,9 +3186,9 @@

     "expiry_milestone": 135

   },

   {

-    "name": "enable-image-reader",
@@ -183,7 +183,7 @@ diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc 
   if (!gpu_preferences.enable_android_surface_control)

     return kGpuFeatureStatusDisabled;

 

@@ -390,6 +393,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info) {

@@ -385,6 +388,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info) {

     gpu_feature_info->status_values[GPU_FEATURE_TYPE_CANVAS_OOP_RASTERIZATION] =

         kGpuFeatureStatusBlocklisted;

   }
@@ -217,7 +217,7 @@ diff --git a/gpu/ipc/service/gpu_init.cc b/gpu/ipc/service/gpu_init.cc 
 #endif

 

 #if BUILDFLAG(ENABLE_VULKAN)

@@ -708,6 +709,13 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line,

@@ -723,6 +724,13 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line,

   }

 #endif  // BUILDFLAG(IS_WIN)

build/patches/Add-AllowUserCertificates-flag.patch

+10 −10
Original line number Diff line number Diff line
@@ -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;

@@ -1060,6 +1061,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>

@@ -1078,6 +1079,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>

         super.onStartWithNative();

         ChromeActivitySessionTracker.getInstance().onStartWithNative();

         ChromeCachedFlags.getInstance().cacheNativeFlags();
@@ -40,26 +40,26 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv 
diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc

--- a/chrome/browser/flags/android/chrome_feature_list.cc

+++ b/chrome/browser/flags/android/chrome_feature_list.cc

@@ -134,6 +134,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {

@@ -138,6 +138,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {

     &feed::kFeedShowSignInCommand,

     &feed::kFeedSignedOutViewDemotion,

     &feed::kFeedUserInteractionReliabilityReport,

+    &kAllowUserCertificates,

     &feed::kInterestFeedV2,

     &feed::kInterestFeedV2Hearts,

     &feed::kWebFeed,

     &feed::kWebFeedAwareness,

diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java

--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java

+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java

@@ -141,6 +141,7 @@ public abstract class ChromeFeatureList {

         return ChromeFeatureMap.getInstance().mutableFlagWithSafeDefault(featureName, defaultValue);

     }

 

@@ -146,6 +146,7 @@ public abstract class ChromeFeatureList {

     /* Alphabetical: */

     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 =

@@ -533,6 +534,8 @@ public abstract class ChromeFeatureList {

@@ -536,6 +537,8 @@ public abstract class ChromeFeatureList {

     public static final CachedFlag sAndroidTabGroupStableIds =

             newCachedFlag(ANDROID_TAB_GROUP_STABLE_IDS, false);

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

     public static final CachedFlag sAsyncNotificationManager =

             newCachedFlag(ASYNC_NOTIFICATION_MANAGER, false);

@@ -684,6 +687,7 @@ public abstract class ChromeFeatureList {

 

@@ -686,6 +689,7 @@ public abstract class ChromeFeatureList {

     public static final List<CachedFlag> sFlagsCachedFullBrowser =

             List.of(

                     sAccountReauthenticationRecentTimeWindow,

+                    sAllowUserCertificates,

                     sAndroidAppIntegration,

                     sAndroidElegantTextHeight,

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

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

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

       }

     }