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

Commit 7f8e606f authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge branch '2980-master-v133' into 'master' 

Update to v133

See merge request !78
parents 70e9db31 ffd5bc57

Dockerfile

+1 −1
Original line number Diff line number Diff line 
FROM ubuntu:20.04



ENV CHROMIUM_DIR "/srv/chromium"

ENV CHROMIUM_VER "132.0.6834.83"

ENV CHROMIUM_VER "133.0.6943.99"



RUN apt-get update && \

    DEBIAN_FRONTEND=noninteractive \

build.sh

+1 −1
Original line number Diff line number Diff line 
#!/bin/bash

#!/usr/bin/env bash



set -e

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

+6 −6
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

@@ -3290,6 +3290,10 @@

@@ -3219,6 +3219,10 @@

     "name": "enable-identity-in-auth-error",

     "owners": [ "jlebel@chromium.org", "chrome-signin-team@google.com" ],

     "expiry_milestone": 135
@@ -119,7 +119,7 @@ new file mode 100644 
diff --git a/gpu/config/gpu_driver_bug_list.json b/gpu/config/gpu_driver_bug_list.json

--- a/gpu/config/gpu_driver_bug_list.json

+++ b/gpu/config/gpu_driver_bug_list.json

@@ -2606,6 +2606,22 @@

@@ -2605,6 +2605,22 @@

         "no_downscaled_overlay_promotion"

       ]

     },
@@ -171,7 +171,7 @@ diff --git a/gpu/config/gpu_finch_features.h b/gpu/config/gpu_finch_features.h 
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

@@ -125,6 +125,9 @@ GpuFeatureStatus GetAndroidSurfaceControlFeatureStatus(

@@ -126,6 +126,9 @@ GpuFeatureStatus GetAndroidSurfaceControlFeatureStatus(

 #if !BUILDFLAG(IS_ANDROID)

   return kGpuFeatureStatusDisabled;

 #else
@@ -181,7 +181,7 @@ diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc 
   if (!gpu_preferences.enable_android_surface_control)

     return kGpuFeatureStatusDisabled;

 

@@ -378,6 +381,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info,

@@ -379,6 +382,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info,

           kGpuFeatureStatusSoftware;

     }

   }
@@ -207,7 +207,7 @@ diff --git a/gpu/config/gpu_workaround_list.txt b/gpu/config/gpu_workaround_list 
diff --git a/gpu/ipc/service/gpu_init.cc b/gpu/ipc/service/gpu_init.cc

--- a/gpu/ipc/service/gpu_init.cc

+++ b/gpu/ipc/service/gpu_init.cc

@@ -68,6 +68,7 @@

@@ -69,6 +69,7 @@

 

 #if BUILDFLAG(IS_ANDROID)

 #include "ui/gfx/android/android_surface_control_compat.h"
@@ -215,7 +215,7 @@ diff --git a/gpu/ipc/service/gpu_init.cc b/gpu/ipc/service/gpu_init.cc 
 #endif

 

 #if BUILDFLAG(ENABLE_VULKAN)

@@ -701,6 +702,13 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line,

@@ -716,6 +717,13 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line,

   }

 #endif  // BUILDFLAG(IS_WIN)

build/cromite_patches/Add-AllowUserCertificates-flag.patch

+15 −15
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

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

@@ -225,6 +225,7 @@ import org.chromium.content_public.browser.LoadUrlParams;

 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;

@@ -1056,6 +1057,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>

@@ -963,6 +964,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity

         super.onStartWithNative();

 

         ChromeActivitySessionTracker.getInstance().onStartWithNative(getProfileProviderSupplier());
@@ -40,42 +40,42 @@ 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

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

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

     &feed::kFeedPerformanceStudy,

     &feed::kFeedShowSignInCommand,

     &feed::kFeedSignedOutViewDemotion,

+    &kAllowUserCertificates,

     &feed::kFeedRecyclerBinderUnmountOnDetach,

     &feed::kInterestFeedV2,

     &feed::kInterestFeedV2Hearts,

     &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

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

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

 

     // Feature names.

     /* 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_PAGE_SUMMARY =

             "AdaptiveButtonInTopToolbarPageSummary";

     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_CUSTOMIZATION_V2 =

@@ -586,6 +587,8 @@ public abstract class ChromeFeatureList {

@@ -616,6 +617,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);

+    public static final CachedFlag sAllowUserCertificates =

+            newCachedFlag(ALLOW_USER_CERTIFICATES, false);

     public static final CachedFlag sAsyncNotificationManager =

             newCachedFlag(ASYNC_NOTIFICATION_MANAGER, false);

             newCachedFlag(ASYNC_NOTIFICATION_MANAGER, false, true);

     public static final CachedFlag sBlockIntentsWhileLocked =

@@ -744,6 +747,7 @@ public abstract class ChromeFeatureList {

@@ -832,6 +835,7 @@ public abstract class ChromeFeatureList {

     public static final List<CachedFlag> sFlagsCachedFullBrowserChromium =

             List.of(

                     sAccountReauthenticationRecentTimeWindow,

+                    sAllowUserCertificates,

                     sAndroidAppIntegration,

+                    sAllowUserCertificates,

                     sAndroidAppIntegrationModule,

                     sAndroidAppIntegrationV2,

                     sAndroidAppIntegrationWithFavicon,

                     sNewTabPageCustomization,

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
@@ -111,7 +111,7 @@ new file mode 100644 
diff --git a/net/android/java/src/org/chromium/net/X509Util.java b/net/android/java/src/org/chromium/net/X509Util.java

--- a/net/android/java/src/org/chromium/net/X509Util.java

+++ b/net/android/java/src/org/chromium/net/X509Util.java

@@ -525,6 +525,8 @@ public class X509Util {

@@ -528,6 +528,8 @@ public class X509Util {

         return userRootBytes.toArray(new byte[0][]);

     }
@@ -120,7 +120,7 @@ diff --git a/net/android/java/src/org/chromium/net/X509Util.java b/net/android/j 
     public static AndroidCertVerifyResult verifyServerCertificates(

             byte[][] certChain, String authType, String host)

             throws KeyStoreException, NoSuchAlgorithmException {

@@ -613,6 +615,9 @@ public class X509Util {

@@ -616,6 +618,9 @@ public class X509Util {

                 isIssuedByKnownRoot = isKnownRoot(root);

             }

build/cromite_patches/Add-Alt-D-hotkey-to-focus-address-bar.patch

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,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/KeyboardShortcuts.java b/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java

--- a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java

@@ -403,6 +403,8 @@ public class KeyboardShortcuts {

@@ -472,6 +472,8 @@ public class KeyboardShortcuts {

                 R.string.keyboard_shortcut_address_bar,

                 KeyEvent.KEYCODE_L,

                 KeyEvent.META_CTRL_ON);