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

Commit 91a458af authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge branch '3548-master-v139' into 'master' 

Update to v139.0.7258.158

See merge request !96
parents 9ae42f7b b655f3bb

.gitlab-ci.yml

+2 −0
Original line number Original line Diff line number Diff line
@@ -9,6 +9,8 @@ stages: 




.build-cromite:

.build-cromite:

  image: registry.gitlab.e.foundation/e/os/docker-android-apps-cicd:chromium-latest

  image: registry.gitlab.e.foundation/e/os/docker-android-apps-cicd:chromium-latest

  rules:

    - if: $CI_PIPELINE_SOURCE != "schedule"

  tags:

  tags:

    - build-browser

    - build-browser

  artifacts:

  artifacts:

build/browser.gn_args

+2 −0
Original line number Original line Diff line number Diff line
@@ -31,6 +31,8 @@ exclude_unwind_tables=false 
ffmpeg_branding="Chrome"

ffmpeg_branding="Chrome"

generate_linker_map=true

generate_linker_map=true

icu_use_data_file=true

icu_use_data_file=true

include_both_v8_snapshots = false

include_both_v8_snapshots_android_secondary_abi = false

is_cfi=false

is_cfi=false

is_component_build=false

is_component_build=false

is_debug=false

is_debug=false

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

+11 −11
Original line number Original line 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

diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json

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

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

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

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

@@ -3514,6 +3514,10 @@

@@ -3627,6 +3627,10 @@

       "chrome-signin-team@google.com"

       "chrome-signin-team@google.com"

     ],

     ],

     "expiry_milestone": 138

     "expiry_milestone": 138
@@ -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

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

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

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

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

@@ -2613,6 +2613,22 @@

@@ -2617,6 +2617,22 @@

         "no_downscaled_overlay_promotion"

         "no_downscaled_overlay_promotion"

       ]

       ]

     },

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

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

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

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

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

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

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

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

              base::FEATURE_DISABLED_BY_DEFAULT);

              base::FEATURE_DISABLED_BY_DEFAULT);

 

 

 #if BUILDFLAG(IS_ANDROID)

 #if BUILDFLAG(IS_ANDROID)
@@ -160,14 +160,14 @@ diff --git a/gpu/config/gpu_finch_features.cc b/gpu/config/gpu_finch_features.cc 
diff --git a/gpu/config/gpu_finch_features.h b/gpu/config/gpu_finch_features.h

diff --git a/gpu/config/gpu_finch_features.h b/gpu/config/gpu_finch_features.h

--- a/gpu/config/gpu_finch_features.h

--- a/gpu/config/gpu_finch_features.h

+++ b/gpu/config/gpu_finch_features.h

+++ b/gpu/config/gpu_finch_features.h

@@ -26,6 +26,7 @@ GPU_EXPORT BASE_DECLARE_FEATURE(kUseGles2ForOopR);

@@ -26,6 +26,7 @@ GPU_CONFIG_EXPORT BASE_DECLARE_FEATURE(kUseGles2ForOopR);

 GPU_EXPORT BASE_DECLARE_FEATURE(kAggressiveShaderCacheLimits);

 GPU_CONFIG_EXPORT BASE_DECLARE_FEATURE(kAggressiveShaderCacheLimits);

 

 

 #if BUILDFLAG(IS_ANDROID)

 #if BUILDFLAG(IS_ANDROID)

+GPU_EXPORT BASE_DECLARE_FEATURE(kAImageReaderMediaPlayer);

+GPU_CONFIG_EXPORT BASE_DECLARE_FEATURE(kAImageReaderMediaPlayer);

 GPU_EXPORT BASE_DECLARE_FEATURE(kAndroidSurfaceControl);

 GPU_CONFIG_EXPORT BASE_DECLARE_FEATURE(kAndroidSurfaceControl);

 GPU_EXPORT BASE_DECLARE_FEATURE(kWebViewSurfaceControl);

 GPU_CONFIG_EXPORT BASE_DECLARE_FEATURE(kWebViewSurfaceControl);

 GPU_EXPORT BASE_DECLARE_FEATURE(kWebViewSurfaceControlForTV);

 GPU_CONFIG_EXPORT BASE_DECLARE_FEATURE(kWebViewSurfaceControlForTV);

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

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

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

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

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

+++ b/gpu/config/gpu_util.cc
@@ -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

diff --git a/gpu/ipc/service/gpu_init.cc b/gpu/ipc/service/gpu_init.cc

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

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

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

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

@@ -70,6 +70,7 @@

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

 

 

 #if BUILDFLAG(IS_ANDROID)

 #if BUILDFLAG(IS_ANDROID)

 #include "ui/gfx/android/android_surface_control_compat.h"

 #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

 #endif

 

 

 #if BUILDFLAG(ENABLE_VULKAN)

 #if BUILDFLAG(ENABLE_VULKAN)

@@ -687,6 +688,13 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line,

@@ -688,6 +689,13 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line,

   }

   }

 #endif  // BUILDFLAG(IS_WIN)

 #endif  // BUILDFLAG(IS_WIN)

build/cromite_patches/Add-AllowUserCertificates-flag.patch

+4 −4
Original line number Original line 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.PrintManagerDelegateImpl;

 import org.chromium.printing.PrintingController;

 import org.chromium.printing.PrintingController;

 import org.chromium.printing.PrintingControllerImpl;

 import org.chromium.printing.PrintingControllerImpl;

@@ -981,6 +982,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity

@@ -977,6 +978,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity

         super.onStartWithNative();

         super.onStartWithNative();

 

 

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

         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

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

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

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

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

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

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

     &feed::kFeedPerformanceStudy,

     &feed::kFeedPerformanceStudy,

     &feed::kFeedShowSignInCommand,

     &feed::kFeedShowSignInCommand,

     &feed::kFeedSignedOutViewDemotion,

     &feed::kFeedSignedOutViewDemotion,
@@ -59,7 +59,7 @@ 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 =

     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_PAGE_SUMMARY =

             "AdaptiveButtonInTopToolbarPageSummary";

             "AdaptiveButtonInTopToolbarPageSummary";

     public static final String ALLOW_TAB_CLOSING_UPON_MINIMIZATION =

     public static final String ALLOW_TAB_CLOSING_UPON_MINIMIZATION =

@@ -680,6 +681,8 @@ public abstract class ChromeFeatureList {

@@ -728,6 +729,8 @@ public abstract class ChromeFeatureList {

     public static final CachedFlag sAndroidWindowPopupLargeScreen =

     public static final CachedFlag sAndroidWindowPopupLargeScreen =

             newCachedFlag(ANDROID_WINDOW_POPUP_LARGE_SCREEN, false);

             newCachedFlag(ANDROID_WINDOW_POPUP_LARGE_SCREEN, false);

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

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

     public static final CachedFlag sAsyncNotificationManager =

             newCachedFlag(ASYNC_NOTIFICATION_MANAGER, false, true);

             newCachedFlag(ASYNC_NOTIFICATION_MANAGER, false, true);

     public static final CachedFlag sAsyncNotificationManagerForDownload =

     public static final CachedFlag sAsyncNotificationManagerForDownload =

@@ -941,6 +944,7 @@ public abstract class ChromeFeatureList {

@@ -1032,6 +1035,7 @@ public abstract class ChromeFeatureList {

                     sAccountForSuppressedKeyboardInsets,

                     sAccountForSuppressedKeyboardInsets,

                     sAllowTabClosingUponMinimization,

                     sAllowTabClosingUponMinimization,

                     sAndroidAppIntegration,

                     sAndroidAppIntegration,

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

+1 −1
Original line number Original line 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

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

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

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

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

@@ -839,6 +839,11 @@ public class KeyboardShortcuts {

@@ -888,6 +888,11 @@ public class KeyboardShortcuts {

                     KeyEvent.KEYCODE_B,

                     KeyEvent.KEYCODE_B,

                     (KeyEvent.META_CTRL_ON | KeyEvent.META_SHIFT_ON));

                     (KeyEvent.META_CTRL_ON | KeyEvent.META_SHIFT_ON));

         }

         }