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

Commit 7816f4e3 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge branch '3203-master-update_135' into 'master' 

Browser: update to v135

See merge request !82
parents f693a7f2 17060389

.gitlab-ci.yml

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ build-docker: 
  stage: prepare

  rules:

    - if: $CI_PIPELINE_SOURCE != "schedule"

  when: manual

  tags:

    - generic_privileged

  variables:
@@ -33,6 +34,7 @@ build-docker: 
  image: $CONTAINER_IMAGE

  rules:

    - if: $CI_PIPELINE_SOURCE != "schedule"

  when: manual

  tags:

    - build-browser

  artifacts:

Dockerfile

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



ENV CHROMIUM_DIR "/srv/chromium"

ENV CHROMIUM_VER "134.0.6998.89"

ENV CHROMIUM_VER "135.0.7049.100"



RUN apt-get update && \

    DEBIAN_FRONTEND=noninteractive \

build.sh

+0 −7
Original line number Diff line number Diff line
@@ -115,13 +115,6 @@ patch() { 
        git am -C0 -3 --ignore-whitespace "${root_dir}/build/e_patches/$file"

    done



    while read dir patch; do

        [ -z "$dir" ] && continue  # skip empty lines

        cd $chromium_dir/src/third_party/$dir

        git am -C0 -3 --ignore-whitespace "${root_dir}/build/third_party/$patch"

        cd $chromium_dir/src

    done < "${root_dir}/build/third_party_patches_list.txt"



    # Rename Chrome to Browser

    rename

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

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

@@ -3224,6 +3224,10 @@

@@ -3268,6 +3268,10 @@

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

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

     "expiry_milestone": 135
@@ -145,7 +145,7 @@ diff --git a/gpu/config/gpu_driver_bug_list.json b/gpu/config/gpu_driver_bug_lis 
diff --git a/gpu/config/gpu_finch_features.cc b/gpu/config/gpu_finch_features.cc

--- a/gpu/config/gpu_finch_features.cc

+++ b/gpu/config/gpu_finch_features.cc

@@ -59,6 +59,11 @@ BASE_FEATURE(kAggressiveShaderCacheLimits,

@@ -58,6 +58,11 @@ BASE_FEATURE(kAggressiveShaderCacheLimits,

              base::FEATURE_DISABLED_BY_DEFAULT);

 

 #if BUILDFLAG(IS_ANDROID)
@@ -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;

 

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

@@ -348,6 +351,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info,

           kGpuFeatureStatusSoftware;

     }

   }
@@ -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)

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

@@ -692,6 +693,13 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line,

   }

 #endif  // BUILDFLAG(IS_WIN)

build/cromite_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

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

@@ -227,6 +227,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;

@@ -968,6 +969,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity

@@ -969,6 +970,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity

         super.onStartWithNative();

 

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

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

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

     &feed::kFeedPerformanceStudy,

     &feed::kFeedShowSignInCommand,

     &feed::kFeedSignedOutViewDemotion,
@@ -59,16 +59,16 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f 
     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_PAGE_SUMMARY =

             "AdaptiveButtonInTopToolbarPageSummary";

     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_CUSTOMIZATION_V2 =

@@ -624,6 +625,8 @@ public abstract class ChromeFeatureList {

     public static final CachedFlag sAndroidTabDeclutterDedupeTabIdsKillSwitch =

             newCachedFlag(ANDROID_TAB_DECLUTTER_DEDUPE_TAB_IDS_KILL_SWITCH, true);

@@ -643,6 +644,8 @@ public abstract class ChromeFeatureList {

     public static final CachedFlag sAndroidMinimalUiLargeScreen =

             newCachedFlag(ANDROID_MINIMAL_UI_LARGE_SCREEN, false);

     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, true);

     public static final CachedFlag sBlockIntentsWhileLocked =

@@ -845,6 +848,7 @@ public abstract class ChromeFeatureList {

     public static final CachedFlag sAsyncNotificationManagerForDownload =

@@ -878,6 +881,7 @@ public abstract class ChromeFeatureList {

     public static final List<CachedFlag> sFlagsCachedFullBrowserChromium =

             List.of(

                     sAndroidAppIntegration,