Browser: Bump to 118.0.5993.89

if [ ! -d "$chromium_dir" ]; then

    chromium_dir=$root_dir

fi

chromium_version="117.0.5938.153"

chromium_version="118.0.5993.89"

chromium_code=$(echo "$chromium_version" | tr -d '.' | cut -c5-)

clean=0

gsync=0

From 4f01cc05c38f2abb1fbbc71c679d03f02a06324f Mon Sep 17 00:00:00 2001

From a0792c381e02fcbbc34e81fb58648ea5e5c394aa Mon Sep 17 00:00:00 2001

From: csagan5 <32685696+csagan5@users.noreply.github.com>

Date: Tue, 5 May 2020 07:22:20 +0200

Subject: [PATCH 106/192] AImageReader CFI crash mitigations

   AndroidImageReader();

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

index fded6daa7c8e2..a6d5da2c7c3a6 100644

index df52470edf175..6b5e122a736d9 100644

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

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

@@ -2928,9 +2928,9 @@

@@ -2961,9 +2961,9 @@

     "expiry_milestone": 125

   },

   {

   {

     "name": "enable-immersive-fullscreen-toolbar",

diff --git a/gpu/config/gpu_driver_bug_list.json b/gpu/config/gpu_driver_bug_list.json

index 71a4f139d781f..7144b22e13688 100644

index 074c6698aa6ef..2c7c31c465e43 100644

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

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

@@ -3688,6 +3688,22 @@

       "id": 381,

       "cr_bugs": [

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

index f0138acdeae0c..76c2d34ed046a 100644

index 3e1396c11b10e..f8cd10fa0dab0 100644

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

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

@@ -65,6 +65,11 @@ BASE_FEATURE(kUseGles2ForOopR,

 // Use android SurfaceControl API for managing display compositor's buffer queue

 // and using overlays on Android. Also used by webview to disable surface

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

index c77113dda67c4..662e100792a16 100644

index 130555dba39e4..e5078e7b49117 100644

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

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

@@ -17,6 +17,7 @@ namespace features {

 #if BUILDFLAG(IS_ANDROID)

 GPU_EXPORT BASE_DECLARE_FEATURE(kAndroidSurfaceControl);

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

index 82528e1b97ab6..572ea0893e45e 100644

index 87e0039b27763..048da95fbbbea 100644

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

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

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

   if (!gpu_preferences.enable_android_surface_control)

     return kGpuFeatureStatusDisabled;

@@ -351,6 +354,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info) {

@@ -347,6 +350,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info) {

     gpu_feature_info->status_values[GPU_FEATURE_TYPE_CANVAS_OOP_RASTERIZATION] =

         kGpuFeatureStatusBlocklisted;

   }

 // Estimates roughly user total disk space by counting in the drives where

diff --git a/gpu/config/gpu_workaround_list.txt b/gpu/config/gpu_workaround_list.txt

index 164df51c709af..f2a7ebad434c3 100644

index 2a27f6798a557..95eb14116840f 100644

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

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

@@ -16,6 +16,7 @@ decode_encode_srgb_for_generatemipmap

 disable_accelerated_h264_decode

 disable_accelerated_h264_encode

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

index e8af3b3325636..ae69ecc8a7384 100644

index 7703764a6551d..5128afb064d61 100644

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

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

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

              : TextureOwner::Mode::kSurfaceTextureInsecure;

 }

diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc

index 2c8a257f5ea4a..c1c11e4a8b615 100644

index 5d8b05871c6ac..33bd3cb0fa13f 100644

--- a/media/base/media_switches.cc

+++ b/media/base/media_switches.cc

@@ -950,6 +950,11 @@ BASE_FEATURE(kHardwareSecureDecryptionExperiment,

@@ -981,6 +981,11 @@ BASE_FEATURE(kHardwareSecureDecryptionExperiment,

 // Allows automatically disabling hardware secure Content Decryption Module

 // (CDM) after failures or crashes to fallback to software secure CDMs. If this

 // feature is disabled, the fallback will never happen and users could be stuck

 BASE_FEATURE(kHardwareSecureDecryptionFallback,

              "HardwareSecureDecryptionFallback",

diff --git a/media/base/media_switches.h b/media/base/media_switches.h

index e59c53e4bb47d..1bbc1ee4056aa 100644

index b863b52529b62..ddfb976435f77 100644

--- a/media/base/media_switches.h

+++ b/media/base/media_switches.h

@@ -328,6 +328,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVideoBlitColorAccuracy);

@@ -332,6 +332,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVideoBlitColorAccuracy);

 MEDIA_EXPORT BASE_DECLARE_FEATURE(kVideoToolboxVideoDecoder);

 #endif  // BUILDFLAG(IS_APPLE)

 MEDIA_EXPORT BASE_DECLARE_FEATURE(kWebRTCColorAccuracy);

 MEDIA_EXPORT BASE_DECLARE_FEATURE(kWebContentsCaptureHiDpi);

 MEDIA_EXPORT BASE_DECLARE_FEATURE(kWebrtcMediaCapabilitiesParameters);

-- 

2.34.1

2.25.1

From c2c6c28c0a830799a637c647f8fecea70a240c6d Mon Sep 17 00:00:00 2001

From c4102ee5c03b166c65ea6e5b0bede3ee3281c543 Mon Sep 17 00:00:00 2001

From: uazo <uazo@users.noreply.github.com>

Date: Mon, 26 Apr 2021 13:28:24 +0000

Subject: [PATCH 130/192] Add AllowUserCertificates flag

 8 files changed, 33 insertions(+)

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

index a4956e49ad6b7..dd309ae5dcfd9 100644

index 45fe6050c7265..97d590651b99d 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java

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

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

         // postDeferredStartupIfNeeded() is called in TabModelSelectorTabObsever#onLoadStopped(),

         // #onPageLoadFinished() and #onCrash(). If we are not actively loading a tab (e.g.

diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc

index 1b2515a172b22..a30a18f00179e 100644

index d8667ce95bc90..653e5fd8a3b8a 100644

--- a/chrome/browser/about_flags.cc

+++ b/chrome/browser/about_flags.cc

@@ -9309,6 +9309,13 @@ const FeatureEntry kFeatureEntries[] = {

@@ -9371,6 +9371,13 @@ const FeatureEntry kFeatureEntries[] = {

      flag_descriptions::kEnableDrDcDescription, kOsAll,

      FEATURE_VALUE_TYPE(features::kEnableDrDc)},

      flag_descriptions::kForceGpuMainThreadToNormalPriorityDrDcName,

      flag_descriptions::kForceGpuMainThreadToNormalPriorityDrDcDescription,

diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc

index 9faf86f94d203..4032bab43c722 100644

index 8c01c7d4c0864..b9e8726ca4eda 100644

--- a/chrome/browser/flag_descriptions.cc

+++ b/chrome/browser/flag_descriptions.cc

@@ -16,6 +16,11 @@

 const char kAccelerated2dCanvasDescription[] =

     "Enables the use of the GPU to perform 2d canvas rendering instead of "

diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h

index c095902cd95fc..e95beecefb599 100644

index 6f58c5b567ce9..bbafe308415ef 100644

--- a/chrome/browser/flag_descriptions.h

+++ b/chrome/browser/flag_descriptions.h

@@ -42,6 +42,9 @@ namespace flag_descriptions {

 extern const char kAccelerated2dCanvasDescription[];

diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc

index 81cadb4071645..45fb8f39dd1dd 100644

index 782b9c1308433..bdc5d75df4102 100644

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

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

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

     &feed::kFeedBoCSigninInterstitial,

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

     &feed::kFeedSignedOutViewDemotion,

     &feed::kFeedUserInteractionReliabilityReport,

     &feed::kInterestFeedContentSuggestions,

+    &kAllowUserCertificates,

     &feed::kInterestFeedV2,

     &feed::kInterestFeedV2Autoplay,

     &feed::kInterestFeedV2Hearts,

@@ -467,6 +468,10 @@ BASE_FEATURE(kSearchReadyOmniboxFeature,

@@ -473,6 +474,10 @@ BASE_FEATURE(kSearchReadyOmniboxFeature,

              "SearchReadyOmnibox",

              base::FEATURE_DISABLED_BY_DEFAULT);

              "FocusOmniboxInIncognitoTabIntents",

              base::FEATURE_ENABLED_BY_DEFAULT);

diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h

index b24ca80ae7978..f279afd2d62f0 100644

index 79febc078d346..a80ac84fec46c 100644

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

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

@@ -22,6 +22,7 @@ BASE_DECLARE_FEATURE(kAdvancedPeripheralsSupport);

 BASE_DECLARE_FEATURE(kAndroidAppIntegration);

+BASE_DECLARE_FEATURE(kAllowUserCertificates);

 BASE_DECLARE_FEATURE(kAndroidAppIntegrationSafeSearch);

 BASE_DECLARE_FEATURE(kAndroidHatsRefactor);

 BASE_DECLARE_FEATURE(kAndroidSearchEngineChoiceNotification);

 BASE_DECLARE_FEATURE(kAndroidImprovedBookmarks);

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

index cd651e7d1a787..d0d1a4271442a 100644

index 342296f2b5053..c073dc3994756 100644

--- 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

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

     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR = "AdaptiveButtonInTopToolbar";

     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_TRANSLATE =

             "AdaptiveButtonInTopToolbarTranslate";

@@ -504,6 +505,8 @@ public abstract class ChromeFeatureList {

     public static final String XSURFACE_METRICS_REPORTING = "XsurfaceMetricsReporting";

@@ -514,6 +515,8 @@ public abstract class ChromeFeatureList {

     /* Alphabetical: */

     public static final CachedFlag sAndroidAppIntegration =

             new CachedFlag(ANDROID_APP_INTEGRATION, false);

+    public static final CachedFlag sAllowUserCertificates =

+            new CachedFlag(ALLOW_USER_CERTIFICATES, false);

     public static final CachedFlag sAppMenuMobileSiteOption =

             new CachedFlag(APP_MENU_MOBILE_SITE_OPTION, false);

     public static final CachedFlag sBackGestureActivityTabProvider =

@@ -629,6 +632,7 @@ public abstract class ChromeFeatureList {

@@ -634,6 +637,7 @@ public abstract class ChromeFeatureList {

     public static final List<CachedFlag> sFlagsCachedFullBrowser = List.of(

             // clang-format off

         sAndroidAppIntegration,

+        sAllowUserCertificates,

         sAppMenuMobileSiteOption,

         sBackGestureActivityTabProvider,

                                                isIssuedByKnownRoot, verifiedChain);

         }

-- 

2.34.1

2.25.1

From bdd8e07d76dd8f5e2b18fdc6117ecf6c657dd2d0 Mon Sep 17 00:00:00 2001

From afb6e221cc8da3979c405ceb0acab245e27b7c36 Mon Sep 17 00:00:00 2001

From: csagan5 <32685696+csagan5@users.noreply.github.com>

Date: Tue, 9 Mar 2021 19:43:00 +0100

Subject: [PATCH 128/192] Add Alt+D hotkey to focus address bar

         KeyboardShortcutGroup webpageShortcutGroup = new KeyboardShortcutGroup(

-- 

2.34.1

2.25.1