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

Commit 7f9253c6 authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊
Browse files

Browser: Update to 129.0.6668.71

parent 53794a4d

Dockerfile

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



ENV CHROMIUM_DIR "/srv/chromium"

ENV CHROMIUM_VER "127.0.6533.106"

ENV CHROMIUM_VER "129.0.6668.71"



RUN dpkg --add-architecture i386

build/browser.gn_args

+3 −0
Original line number Diff line number Diff line
@@ -21,7 +21,9 @@ enable_platform_dolby_vision=false 
enable_platform_dts_audio=false

enable_platform_encrypted_dolby_vision=false

enable_platform_hevc=true

enable_precompiled_headers=false

enable_reporting=false

enable_request_header_integrity=false

enable_remoting=false

enable_vr=false

exclude_unwind_tables=false
@@ -33,6 +35,7 @@ is_debug=false 
is_official_build=true

proprietary_codecs=true

rtc_build_examples=false

safe_browsing_use_unrar=false

symbol_level=1

target_os="android"

treat_warnings_as_errors=true

build/copy_cromite_patches.sh

+3 −2
Original line number Diff line number Diff line 
#!/bin/bash



branch="v129.0.6668.71-385912cca32ce2d15a3e295f79d5c4dc3a6f7785"

if [ -d cromite ]; then

    cd cromite

    git fetch origin v127.0.6533.94-5fe9b924075b8c565742b4844362e71aaa9ec0d8

    git fetch origin $branch

    git reset --hard FETCH_HEAD

    cd ..

else

    git clone https://gitlab.e.foundation/e/os/cromite.git -b v127.0.6533.94-5fe9b924075b8c565742b4844362e71aaa9ec0d8 cromite --depth=1

    git clone https://gitlab.e.foundation/e/os/cromite.git -b $branch cromite --depth=1

fi



cromite_patches_list=$(cat "cromite_patches_list.txt")

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

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

@@ -3286,9 +3286,9 @@

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

     "expiry_milestone": 135

   },

   {
@@ -121,7 +121,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

@@ -2696,6 +2696,22 @@

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

         "no_downscaled_overlay_promotion"

       ]

     },
@@ -183,9 +183,9 @@ diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc 
   if (!gpu_preferences.enable_android_surface_control)

     return kGpuFeatureStatusDisabled;

 

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

     gpu_feature_info->status_values[GPU_FEATURE_TYPE_CANVAS_OOP_RASTERIZATION] =

         kGpuFeatureStatusBlocklisted;

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

           kGpuFeatureStatusSoftware;

     }

   }

+

+  if (gpu_feature_info->IsWorkaroundEnabled(DISABLE_AIMAGEREADER)) {
@@ -198,8 +198,8 @@ diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc 
diff --git a/gpu/config/gpu_workaround_list.txt b/gpu/config/gpu_workaround_list.txt

--- a/gpu/config/gpu_workaround_list.txt

+++ b/gpu/config/gpu_workaround_list.txt

@@ -10,6 +10,7 @@ clamp_texture_base_level_and_max_level

 clear_pixel_unpack_buffer_before_copyteximage

@@ -7,6 +7,7 @@ check_egl_fence_before_wait

 check_ycbcr_studio_g22_left_p709_for_nv12_support

 disable_2d_canvas_auto_flush

 disable_accelerated_av1_decode

+disable_aimagereader
@@ -209,7 +209,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

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

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

 

 #if BUILDFLAG(IS_ANDROID)

 #include "ui/gfx/android/android_surface_control_compat.h"
@@ -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)

@@ -721,6 +722,13 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line,

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

   }

 #endif  // BUILDFLAG(IS_WIN)

build/cromite_patches/Add-AllowUserCertificates-flag.patch

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

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

@@ -233,6 +233,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,8 +28,8 @@ 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;

@@ -1070,6 +1071,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>

         super.onStartWithNative();

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

 

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

         ChromeCachedFlags.getInstance().cacheNativeFlags();

+        X509Util.AllowUserCertificates = ChromeFeatureList.isEnabled(
@@ -40,10 +40,10 @@ 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

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

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

     &feed::kFeedPerformanceStudy,

     &feed::kFeedShowSignInCommand,

     &feed::kFeedSignedOutViewDemotion,

     &feed::kFeedUserInteractionReliabilityReport,

+    &kAllowUserCertificates,

     &feed::kInterestFeedV2,

     &feed::kInterestFeedV2Hearts,
@@ -51,7 +51,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse 
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

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

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

     /* Alphabetical: */

     public static final String ACCOUNT_REAUTHENTICATION_RECENT_TIME_WINDOW =

             "AccountReauthenticationRecentTimeWindow";
@@ -59,23 +59,23 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f 
     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_TRANSLATE =

             "AdaptiveButtonInTopToolbarTranslate";

     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_ADD_TO_BOOKMARKS =

@@ -555,6 +556,8 @@ public abstract class ChromeFeatureList {

     public static final CachedFlag sAppInfoTabResumptionModule =

             newCachedFlag(APP_INFO_TAB_RESUMPTION_MODULE, false);

     public static final CachedFlag sAppSpecificHistory = newCachedFlag(APP_SPECIFIC_HISTORY, false);

@@ -572,6 +573,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 sArchiveTabService = newCachedFlag(ARCHIVE_TAB_SERVICE, false);

     public static final CachedFlag sAsyncNotificationManager =

             newCachedFlag(ASYNC_NOTIFICATION_MANAGER, false);

@@ -704,6 +707,7 @@ public abstract class ChromeFeatureList {

     public static final List<CachedFlag> sFlagsCachedFullBrowser =

     public static final CachedFlag sBackGestureActivityTabProvider =

@@ -725,6 +728,7 @@ public abstract class ChromeFeatureList {

     public static final List<CachedFlag> sFlagsCachedFullBrowserChromium =

             List.of(

                     sAccountReauthenticationRecentTimeWindow,

+                    sAllowUserCertificates,

                     sAndroidAppIntegration,

                     sAndroidElegantTextHeight,

                     sAndroidHub,

                     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