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

Commit 8b57ca9a authored by Nishith Khanna's avatar Nishith Khanna
Browse files

[Auto] Update cromite patches

parent e26a19c4

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

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

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

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

       "chrome-signin-team@google.com"

     ],

     "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

--- a/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"

       ]

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

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

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

              base::FEATURE_DISABLED_BY_DEFAULT);

 

 #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

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

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

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

 GPU_EXPORT BASE_DECLARE_FEATURE(kAggressiveShaderCacheLimits);

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

 GPU_CONFIG_EXPORT BASE_DECLARE_FEATURE(kAggressiveShaderCacheLimits);

 

 #if BUILDFLAG(IS_ANDROID)

+GPU_EXPORT BASE_DECLARE_FEATURE(kAImageReaderMediaPlayer);

 GPU_EXPORT BASE_DECLARE_FEATURE(kAndroidSurfaceControl);

 GPU_EXPORT BASE_DECLARE_FEATURE(kWebViewSurfaceControl);

 GPU_EXPORT BASE_DECLARE_FEATURE(kWebViewSurfaceControlForTV);

+GPU_CONFIG_EXPORT BASE_DECLARE_FEATURE(kAImageReaderMediaPlayer);

 GPU_CONFIG_EXPORT BASE_DECLARE_FEATURE(kAndroidSurfaceControl);

 GPU_CONFIG_EXPORT BASE_DECLARE_FEATURE(kWebViewSurfaceControl);

 GPU_CONFIG_EXPORT BASE_DECLARE_FEATURE(kWebViewSurfaceControlForTV);

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

@@ -70,6 +70,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)

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

build/cromite_patches/Add-AllowUserCertificates-flag.patch

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

 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();

 

         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

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

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

     &feed::kFeedPerformanceStudy,

     &feed::kFeedShowSignInCommand,

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

             "AdaptiveButtonInTopToolbarPageSummary";

     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 =

             newCachedFlag(ANDROID_WINDOW_POPUP_LARGE_SCREEN, false);

     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 =

             newCachedFlag(ASYNC_NOTIFICATION_MANAGER, false, true);

     public static final CachedFlag sAsyncNotificationManagerForDownload =

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

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

                     sAccountForSuppressedKeyboardInsets,

                     sAllowTabClosingUponMinimization,

                     sAndroidAppIntegration,

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

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

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

                     KeyEvent.KEYCODE_B,

                     (KeyEvent.META_CTRL_ON | KeyEvent.META_SHIFT_ON));

         }

build/cromite_patches/Add-IsCleartextPermitted-flag.patch

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ new file mode 100644 
diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc

--- a/net/url_request/url_request_http_job.cc

+++ b/net/url_request/url_request_http_job.cc

@@ -387,6 +387,11 @@ std::unique_ptr<URLRequestJob> URLRequestHttpJob::Create(URLRequest* request) {

@@ -398,6 +398,11 @@ std::unique_ptr<URLRequestJob> URLRequestHttpJob::Create(URLRequest* request) {

       }

     }

build/cromite_patches/Add-a-proxy-configuration-page.patch

+12 −12
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi 
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java

--- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java

@@ -101,6 +101,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment

@@ -100,6 +100,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment

     private static final String PREF_PASSWORD_LEAK_DETECTION = "password_leak_detection";

     private static final String PREF_SYNC_AND_SERVICES_LINK = "sync_and_services_link";

     private static final String PREF_PRIVACY_SANDBOX = "privacy_sandbox";
@@ -100,7 +100,7 @@ diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc 
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd

--- a/chrome/browser/browser_resources.grd

+++ b/chrome/browser/browser_resources.grd

@@ -221,6 +221,9 @@

@@ -215,6 +215,9 @@

         <include name="IDR_PREF_HASH_SEED_BIN" file="resources\settings\internal\pref_hash_seed.bin" type="BINDATA" />

         <include name="IDR_ADDITIONAL_MODULE_IDS" file="${additional_modules_list_file}" use_base_dir="false" type="BINDATA" />

       </if>
@@ -197,7 +197,7 @@ diff --git a/chrome/browser/net/proxy_service_factory.h b/chrome/browser/net/pro 
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc

--- a/chrome/browser/prefs/browser_prefs.cc

+++ b/chrome/browser/prefs/browser_prefs.cc

@@ -204,6 +204,8 @@

@@ -206,6 +206,8 @@

 #include "printing/buildflags/buildflags.h"

 #include "rlz/buildflags/buildflags.h"
@@ -206,7 +206,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse 
 #if BUILDFLAG(ENABLE_BACKGROUND_MODE)

 #include "chrome/browser/background/extensions/background_mode_manager.h"

 #endif

@@ -1613,6 +1615,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {

@@ -1689,6 +1691,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {

   component_updater::RegisterPrefs(registry);

   domain_reliability::RegisterPrefs(registry);

   embedder_support::OriginTrialPrefs::RegisterPrefs(registry);
@@ -218,7 +218,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse 
diff --git a/chrome/browser/prefs/chrome_command_line_pref_store.cc b/chrome/browser/prefs/chrome_command_line_pref_store.cc

--- a/chrome/browser/prefs/chrome_command_line_pref_store.cc

+++ b/chrome/browser/prefs/chrome_command_line_pref_store.cc

@@ -160,7 +160,7 @@ void ChromeCommandLinePrefStore::ApplyProxyMode() {

@@ -163,7 +163,7 @@ void ChromeCommandLinePrefStore::ApplyProxyMode() {

         command_line()->GetSwitchValueASCII(switches::kProxyBypassList);

     SetValue(proxy_config::prefs::kProxy,

              base::Value(ProxyConfigDictionary::CreateFixedServers(
@@ -661,7 +661,7 @@ new file mode 100644 
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn

--- a/chrome/browser/ui/BUILD.gn

+++ b/chrome/browser/ui/BUILD.gn

@@ -204,6 +204,8 @@ static_library("ui") {

@@ -194,6 +194,8 @@ static_library("ui") {

     "webui/metrics_internals/metrics_internals_ui.h",

     "webui/net_export_ui.cc",

     "webui/net_export_ui.h",
@@ -673,17 +673,17 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn 
diff --git a/chrome/browser/ui/webui/chrome_web_ui_configs.cc b/chrome/browser/ui/webui/chrome_web_ui_configs.cc

--- a/chrome/browser/ui/webui/chrome_web_ui_configs.cc

+++ b/chrome/browser/ui/webui/chrome_web_ui_configs.cc

@@ -57,6 +57,9 @@

@@ -56,6 +56,9 @@

 #include "extensions/buildflags/buildflags.h"

 #include "printing/buildflags/buildflags.h"

 

+#include "chrome/browser/ui/webui/proxy_config_ui.h"

+

+

 #if BUILDFLAG(ENABLE_NACL)

 #include "chrome/browser/ui/webui/nacl_ui.h"

 #if BUILDFLAG(ENABLE_WEBUI_CERTIFICATE_VIEWER)

 #include "chrome/browser/ui/webui/certificate_viewer/certificate_viewer_ui.h"

 #endif

@@ -422,7 +425,7 @@ void RegisterChromeWebUIConfigs() {

@@ -415,7 +418,7 @@ void RegisterChromeWebUIConfigs() {

   map.AddWebUIConfig(std::make_unique<glic::GlicUIConfig>());

   map.AddWebUIConfig(std::make_unique<glic::GlicFreUIConfig>());

 #endif
@@ -1150,11 +1150,11 @@ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_cons 
+      kChromeUIProxyConfigHost,

       kChromeUIAboutHost,

       kChromeUIAccessibilityHost,

 #if !BUILDFLAG(IS_ANDROID)

       kChromeUIActorInternalsHost,

diff --git a/chrome/common/webui_url_constants.h b/chrome/common/webui_url_constants.h

--- a/chrome/common/webui_url_constants.h

+++ b/chrome/common/webui_url_constants.h

@@ -179,6 +179,8 @@ inline constexpr char kChromeUINetInternalsHost[] = "net-internals";

@@ -180,6 +180,8 @@ inline constexpr char kChromeUINetInternalsHost[] = "net-internals";

 inline constexpr char kChromeUINetInternalsURL[] = "chrome://net-internals/";

 inline constexpr char kChromeUINewTabHost[] = "newtab";

 inline constexpr char kChromeUINewTabFooterHost[] = "newtab-footer";