Loading build/RELEASE +1 −1 Original line number Diff line number Diff line 90.0.4430.204 91.0.4472.50 build/bromite_patches_list.txt +0 −2 Original line number Diff line number Diff line Loading @@ -80,7 +80,6 @@ Offer-builtin-autocomplete-for-chrome-flags.patch Do-not-grant-notifications-to-default-search-engine.patch Add-flag-to-disable-IPv6-probes.patch Add-a-proxy-configuration-page.patch Disable-previews-by-default.patch Use-4-tile-rows-never-show-logo.patch Disable-metrics-collection-for-NTP-tiles.patch Enable-SPPI-for-devices-with-enough-memory.patch Loading @@ -107,7 +106,6 @@ Use-dummy-DFM-installer.patch Disable-feeds-support-by-default.patch Disable-autofill-assistant-by-default.patch Show-site-settings-for-cookies-javascript-and-ads.patch Revert-Remove-horizontal-tab-switcher-experiment-logic.patch Disable-DRM-media-origin-IDs-preprovisioning.patch Disable-smart-selection-by-default.patch Enable-user-agent-freeze-by-default.patch Loading build/patches/AImageReader-CFI-crash-mitigations.patch +6 −6 Original line number Diff line number Diff line Loading @@ -82,7 +82,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 @@ -1909,7 +1909,7 @@ @@ -1935,7 +1935,7 @@ { "name": "enable-image-reader", "owners": [ "vikassoni", "liberato" ], Loading @@ -94,7 +94,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js 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 @@ -3236,6 +3236,22 @@ @@ -3206,6 +3206,22 @@ "dont_delete_source_texture_for_egl_image" ] }, Loading Loading @@ -171,7 +171,7 @@ 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 @@ -13,6 +13,7 @@ decode_encode_srgb_for_generatemipmap @@ -14,6 +14,7 @@ decode_encode_srgb_for_generatemipmap depth_stencil_renderbuffer_resize_emulation disable_2d_canvas_auto_flush disable_accelerated_av1_decode Loading @@ -182,7 +182,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 @@ -488,6 +488,11 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line, @@ -502,6 +502,11 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line, } } Loading Loading @@ -225,7 +225,7 @@ diff --git a/gpu/ipc/service/stream_texture_android.cc b/gpu/ipc/service/stream_ diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc --- a/media/base/media_switches.cc +++ b/media/base/media_switches.cc @@ -620,6 +620,10 @@ const base::Feature kMediaDrmPreprovisioning{"MediaDrmPreprovisioning", @@ -619,6 +619,10 @@ const base::Feature kMediaDrmPreprovisioning{"MediaDrmPreprovisioning", const base::Feature kMediaDrmPreprovisioningAtStartup{ "MediaDrmPreprovisioningAtStartup", base::FEATURE_ENABLED_BY_DEFAULT}; Loading @@ -239,7 +239,7 @@ diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc diff --git a/media/base/media_switches.h b/media/base/media_switches.h --- a/media/base/media_switches.h +++ b/media/base/media_switches.h @@ -210,6 +210,7 @@ MEDIA_EXPORT extern const base::Feature kMediaControlsExpandGesture; @@ -205,6 +205,7 @@ MEDIA_EXPORT extern const base::Feature kMediaControlsExpandGesture; MEDIA_EXPORT extern const base::Feature kMediaDrmPersistentLicense; MEDIA_EXPORT extern const base::Feature kMediaDrmPreprovisioning; MEDIA_EXPORT extern const base::Feature kMediaDrmPreprovisioningAtStartup; Loading build/patches/AV1-codec-support.patch +24 −24 Original line number Diff line number Diff line Loading @@ -69,10 +69,10 @@ diff --git a/third_party/libaom/libaom_srcs.gni b/third_party/libaom/libaom_srcs diff --git a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.asm b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.asm --- a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.asm +++ b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.asm @@ -46,7 +46,7 @@ CONFIG_NN_V2 equ 0 CONFIG_NORMAL_TILE_MODE equ 1 @@ -47,7 +47,7 @@ CONFIG_NORMAL_TILE_MODE equ 1 CONFIG_OPTICAL_FLOW_API equ 0 CONFIG_OS_SUPPORT equ 1 CONFIG_PARTITION_SEARCH_ORDER equ 0 -CONFIG_PIC equ 0 +CONFIG_PIC equ 1 CONFIG_RD_DEBUG equ 0 Loading @@ -81,10 +81,10 @@ diff --git a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/a diff --git a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h --- a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h +++ b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h @@ -48,7 +48,7 @@ #define CONFIG_NORMAL_TILE_MODE 1 @@ -49,7 +49,7 @@ #define CONFIG_OPTICAL_FLOW_API 0 #define CONFIG_OS_SUPPORT 1 #define CONFIG_PARTITION_SEARCH_ORDER 0 -#define CONFIG_PIC 0 +#define CONFIG_PIC 1 #define CONFIG_RD_DEBUG 0 Loading @@ -93,10 +93,10 @@ diff --git a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/a diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm --- a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm +++ b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm @@ -46,7 +46,7 @@ CONFIG_NN_V2 equ 0 CONFIG_NORMAL_TILE_MODE equ 1 @@ -47,7 +47,7 @@ CONFIG_NORMAL_TILE_MODE equ 1 CONFIG_OPTICAL_FLOW_API equ 0 CONFIG_OS_SUPPORT equ 1 CONFIG_PARTITION_SEARCH_ORDER equ 0 -CONFIG_PIC equ 0 +CONFIG_PIC equ 1 CONFIG_RD_DEBUG equ 0 Loading @@ -105,10 +105,10 @@ diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.a diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h --- a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h +++ b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h @@ -48,7 +48,7 @@ #define CONFIG_NORMAL_TILE_MODE 1 @@ -49,7 +49,7 @@ #define CONFIG_OPTICAL_FLOW_API 0 #define CONFIG_OS_SUPPORT 1 #define CONFIG_PARTITION_SEARCH_ORDER 0 -#define CONFIG_PIC 0 +#define CONFIG_PIC 1 #define CONFIG_RD_DEBUG 0 Loading @@ -117,10 +117,10 @@ diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h diff --git a/third_party/libaom/source/config/linux/arm/config/aom_config.asm b/third_party/libaom/source/config/linux/arm/config/aom_config.asm --- a/third_party/libaom/source/config/linux/arm/config/aom_config.asm +++ b/third_party/libaom/source/config/linux/arm/config/aom_config.asm @@ -46,7 +46,7 @@ CONFIG_NN_V2 equ 0 CONFIG_NORMAL_TILE_MODE equ 1 @@ -47,7 +47,7 @@ CONFIG_NORMAL_TILE_MODE equ 1 CONFIG_OPTICAL_FLOW_API equ 0 CONFIG_OS_SUPPORT equ 1 CONFIG_PARTITION_SEARCH_ORDER equ 0 -CONFIG_PIC equ 0 +CONFIG_PIC equ 1 CONFIG_RD_DEBUG equ 0 Loading @@ -129,10 +129,10 @@ diff --git a/third_party/libaom/source/config/linux/arm/config/aom_config.asm b/ diff --git a/third_party/libaom/source/config/linux/arm/config/aom_config.h b/third_party/libaom/source/config/linux/arm/config/aom_config.h --- a/third_party/libaom/source/config/linux/arm/config/aom_config.h +++ b/third_party/libaom/source/config/linux/arm/config/aom_config.h @@ -48,7 +48,7 @@ #define CONFIG_NORMAL_TILE_MODE 1 @@ -49,7 +49,7 @@ #define CONFIG_OPTICAL_FLOW_API 0 #define CONFIG_OS_SUPPORT 1 #define CONFIG_PARTITION_SEARCH_ORDER 0 -#define CONFIG_PIC 0 +#define CONFIG_PIC 1 #define CONFIG_RD_DEBUG 0 Loading @@ -141,10 +141,10 @@ diff --git a/third_party/libaom/source/config/linux/arm/config/aom_config.h b/th diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_config.asm b/third_party/libaom/source/config/linux/arm64/config/aom_config.asm --- a/third_party/libaom/source/config/linux/arm64/config/aom_config.asm +++ b/third_party/libaom/source/config/linux/arm64/config/aom_config.asm @@ -46,7 +46,7 @@ CONFIG_NN_V2 equ 0 CONFIG_NORMAL_TILE_MODE equ 1 @@ -47,7 +47,7 @@ CONFIG_NORMAL_TILE_MODE equ 1 CONFIG_OPTICAL_FLOW_API equ 0 CONFIG_OS_SUPPORT equ 1 CONFIG_PARTITION_SEARCH_ORDER equ 0 -CONFIG_PIC equ 0 +CONFIG_PIC equ 1 CONFIG_RD_DEBUG equ 0 Loading @@ -153,10 +153,10 @@ diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_config.asm diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_config.h b/third_party/libaom/source/config/linux/arm64/config/aom_config.h --- a/third_party/libaom/source/config/linux/arm64/config/aom_config.h +++ b/third_party/libaom/source/config/linux/arm64/config/aom_config.h @@ -48,7 +48,7 @@ #define CONFIG_NORMAL_TILE_MODE 1 @@ -49,7 +49,7 @@ #define CONFIG_OPTICAL_FLOW_API 0 #define CONFIG_OS_SUPPORT 1 #define CONFIG_PARTITION_SEARCH_ORDER 0 -#define CONFIG_PIC 0 +#define CONFIG_PIC 1 #define CONFIG_RD_DEBUG 0 Loading @@ -165,10 +165,10 @@ diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_config.h b/ diff --git a/third_party/libaom/source/config/linux/generic/config/aom_config.asm b/third_party/libaom/source/config/linux/generic/config/aom_config.asm --- a/third_party/libaom/source/config/linux/generic/config/aom_config.asm +++ b/third_party/libaom/source/config/linux/generic/config/aom_config.asm @@ -46,7 +46,7 @@ CONFIG_NN_V2 equ 0 CONFIG_NORMAL_TILE_MODE equ 1 @@ -47,7 +47,7 @@ CONFIG_NORMAL_TILE_MODE equ 1 CONFIG_OPTICAL_FLOW_API equ 0 CONFIG_OS_SUPPORT equ 1 CONFIG_PARTITION_SEARCH_ORDER equ 0 -CONFIG_PIC equ 0 +CONFIG_PIC equ 1 CONFIG_RD_DEBUG equ 0 Loading @@ -177,10 +177,10 @@ diff --git a/third_party/libaom/source/config/linux/generic/config/aom_config.as diff --git a/third_party/libaom/source/config/linux/generic/config/aom_config.h b/third_party/libaom/source/config/linux/generic/config/aom_config.h --- a/third_party/libaom/source/config/linux/generic/config/aom_config.h +++ b/third_party/libaom/source/config/linux/generic/config/aom_config.h @@ -48,7 +48,7 @@ #define CONFIG_NORMAL_TILE_MODE 1 @@ -49,7 +49,7 @@ #define CONFIG_OPTICAL_FLOW_API 0 #define CONFIG_OS_SUPPORT 1 #define CONFIG_PARTITION_SEARCH_ORDER 0 -#define CONFIG_PIC 0 +#define CONFIG_PIC 1 #define CONFIG_RD_DEBUG 0 Loading @@ -189,10 +189,10 @@ diff --git a/third_party/libaom/source/config/linux/generic/config/aom_config.h diff --git a/third_party/libaom/source/config/linux/x64/config/aom_config.asm b/third_party/libaom/source/config/linux/x64/config/aom_config.asm --- a/third_party/libaom/source/config/linux/x64/config/aom_config.asm +++ b/third_party/libaom/source/config/linux/x64/config/aom_config.asm @@ -36,7 +36,7 @@ %define CONFIG_NORMAL_TILE_MODE 1 @@ -37,7 +37,7 @@ %define CONFIG_OPTICAL_FLOW_API 0 %define CONFIG_OS_SUPPORT 1 %define CONFIG_PARTITION_SEARCH_ORDER 0 -%define CONFIG_PIC 0 +%define CONFIG_PIC 1 %define CONFIG_RD_DEBUG 0 Loading @@ -201,10 +201,10 @@ diff --git a/third_party/libaom/source/config/linux/x64/config/aom_config.asm b/ diff --git a/third_party/libaom/source/config/linux/x64/config/aom_config.h b/third_party/libaom/source/config/linux/x64/config/aom_config.h --- a/third_party/libaom/source/config/linux/x64/config/aom_config.h +++ b/third_party/libaom/source/config/linux/x64/config/aom_config.h @@ -48,7 +48,7 @@ #define CONFIG_NORMAL_TILE_MODE 1 @@ -49,7 +49,7 @@ #define CONFIG_OPTICAL_FLOW_API 0 #define CONFIG_OS_SUPPORT 1 #define CONFIG_PARTITION_SEARCH_ORDER 0 -#define CONFIG_PIC 0 +#define CONFIG_PIC 1 #define CONFIG_RD_DEBUG 0 Loading build/patches/Add-AllowUserCertificates-flag.patch +16 −16 Original line number Diff line number Diff line Loading @@ -18,7 +18,7 @@ Subject: Add AllowUserCertificates flag 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 @@ -207,6 +207,7 @@ import org.chromium.content_public.browser.ScreenOrientationProvider; @@ -209,6 +209,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; Loading @@ -26,7 +26,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; @@ -866,6 +867,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent> @@ -877,6 +878,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent> UpdateMenuItemHelper.getInstance().onStart(); ChromeActivitySessionTracker.getInstance().onStartWithNative(); ChromeCachedFlags.getInstance().cacheNativeFlags(); Loading @@ -38,7 +38,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java b/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java --- a/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java @@ -64,6 +64,7 @@ public class ChromeCachedFlags { @@ -65,6 +65,7 @@ public class ChromeCachedFlags { // clang-format off List<String> featuresToCache = Arrays.asList( Loading @@ -49,9 +49,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/flags/Chrom diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -2759,6 +2759,10 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kCOLRV1FontsDescription, kOsAll, FEATURE_VALUE_TYPE(blink::features::kCOLRV1Fonts)}, @@ -2743,6 +2743,10 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kCSSContainerQueriesDescription, kOsAll, FEATURE_VALUE_TYPE(blink::features::kCSSContainerQueries)}, #if defined(OS_ANDROID) + {"allow-user-certificates", + flag_descriptions::kAllowUserCertificatesName, Loading @@ -78,7 +78,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h @@ -45,6 +45,9 @@ namespace flag_descriptions { @@ -46,6 +46,9 @@ namespace flag_descriptions { // Cross-platform ------------------------------------------------------------- Loading @@ -96,30 +96,30 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse &feed::kXsurfaceMetricsReporting, &history::kHideFromApi3Transitions, + &kAllowUserCertificates, &kAdjustWebApkInstallationSpace, &kAddToHomescreenIPH, &kAllowNewIncognitoTabIntents, &kAllowRemoteContextForNotifications, @@ -333,6 +334,9 @@ const base::Feature* FindFeatureExposedToJava(const std::string& feature_name) { } // namespace // Alphabetical: +const base::Feature kAllowUserCertificates = { + "AllowUserCertificates", base::FEATURE_DISABLED_BY_DEFAULT}; + const base::Feature kAdjustWebApkInstallationSpace = { "AdjustWebApkInstallationSpace", base::FEATURE_DISABLED_BY_DEFAULT}; const base::Feature kAddToHomescreenIPH{"AddToHomescreenIPH", base::FEATURE_DISABLED_BY_DEFAULT}; diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h --- a/chrome/browser/flags/android/chrome_feature_list.h +++ b/chrome/browser/flags/android/chrome_feature_list.h @@ -12,6 +12,7 @@ namespace chrome { @@ -12,6 +12,7 @@ namespace chrome { namespace android { // Alphabetical: +extern const base::Feature kAllowUserCertificates; extern const base::Feature kAdjustWebApkInstallationSpace; // Alphabetical: extern const base::Feature kAddToHomescreenIPH; extern const base::Feature kAllowNewIncognitoTabIntents; extern const base::Feature kAllowRemoteContextForNotifications; diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java Loading @@ -140,8 +140,8 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f /* Alphabetical: */ + public static final String ALLOW_USER_CERTIFICATES = "AllowUserCertificates"; public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR = "AdaptiveButtonInTopToolbar"; public static final String ADD_TO_HOMESCREEN_IPH = "AddToHomescreenIPH"; public static final String ALLOW_NEW_INCOGNITO_TAB_INTENTS = "AllowNewIncognitoTabIntents"; public static final String ALLOW_REMOTE_CONTEXT_FOR_NOTIFICATIONS = diff --git a/net/android/java/src/org/chromium/net/X509Util.java b/net/android/java/src/org/chromium/net/X509Util.java --- a/net/android/java/src/org/chromium/net/X509Util.java +++ b/net/android/java/src/org/chromium/net/X509Util.java Loading Loading
build/bromite_patches_list.txt +0 −2 Original line number Diff line number Diff line Loading @@ -80,7 +80,6 @@ Offer-builtin-autocomplete-for-chrome-flags.patch Do-not-grant-notifications-to-default-search-engine.patch Add-flag-to-disable-IPv6-probes.patch Add-a-proxy-configuration-page.patch Disable-previews-by-default.patch Use-4-tile-rows-never-show-logo.patch Disable-metrics-collection-for-NTP-tiles.patch Enable-SPPI-for-devices-with-enough-memory.patch Loading @@ -107,7 +106,6 @@ Use-dummy-DFM-installer.patch Disable-feeds-support-by-default.patch Disable-autofill-assistant-by-default.patch Show-site-settings-for-cookies-javascript-and-ads.patch Revert-Remove-horizontal-tab-switcher-experiment-logic.patch Disable-DRM-media-origin-IDs-preprovisioning.patch Disable-smart-selection-by-default.patch Enable-user-agent-freeze-by-default.patch Loading
build/patches/AImageReader-CFI-crash-mitigations.patch +6 −6 Original line number Diff line number Diff line Loading @@ -82,7 +82,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 @@ -1909,7 +1909,7 @@ @@ -1935,7 +1935,7 @@ { "name": "enable-image-reader", "owners": [ "vikassoni", "liberato" ], Loading @@ -94,7 +94,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js 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 @@ -3236,6 +3236,22 @@ @@ -3206,6 +3206,22 @@ "dont_delete_source_texture_for_egl_image" ] }, Loading Loading @@ -171,7 +171,7 @@ 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 @@ -13,6 +13,7 @@ decode_encode_srgb_for_generatemipmap @@ -14,6 +14,7 @@ decode_encode_srgb_for_generatemipmap depth_stencil_renderbuffer_resize_emulation disable_2d_canvas_auto_flush disable_accelerated_av1_decode Loading @@ -182,7 +182,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 @@ -488,6 +488,11 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line, @@ -502,6 +502,11 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line, } } Loading Loading @@ -225,7 +225,7 @@ diff --git a/gpu/ipc/service/stream_texture_android.cc b/gpu/ipc/service/stream_ diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc --- a/media/base/media_switches.cc +++ b/media/base/media_switches.cc @@ -620,6 +620,10 @@ const base::Feature kMediaDrmPreprovisioning{"MediaDrmPreprovisioning", @@ -619,6 +619,10 @@ const base::Feature kMediaDrmPreprovisioning{"MediaDrmPreprovisioning", const base::Feature kMediaDrmPreprovisioningAtStartup{ "MediaDrmPreprovisioningAtStartup", base::FEATURE_ENABLED_BY_DEFAULT}; Loading @@ -239,7 +239,7 @@ diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc diff --git a/media/base/media_switches.h b/media/base/media_switches.h --- a/media/base/media_switches.h +++ b/media/base/media_switches.h @@ -210,6 +210,7 @@ MEDIA_EXPORT extern const base::Feature kMediaControlsExpandGesture; @@ -205,6 +205,7 @@ MEDIA_EXPORT extern const base::Feature kMediaControlsExpandGesture; MEDIA_EXPORT extern const base::Feature kMediaDrmPersistentLicense; MEDIA_EXPORT extern const base::Feature kMediaDrmPreprovisioning; MEDIA_EXPORT extern const base::Feature kMediaDrmPreprovisioningAtStartup; Loading
build/patches/AV1-codec-support.patch +24 −24 Original line number Diff line number Diff line Loading @@ -69,10 +69,10 @@ diff --git a/third_party/libaom/libaom_srcs.gni b/third_party/libaom/libaom_srcs diff --git a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.asm b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.asm --- a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.asm +++ b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.asm @@ -46,7 +46,7 @@ CONFIG_NN_V2 equ 0 CONFIG_NORMAL_TILE_MODE equ 1 @@ -47,7 +47,7 @@ CONFIG_NORMAL_TILE_MODE equ 1 CONFIG_OPTICAL_FLOW_API equ 0 CONFIG_OS_SUPPORT equ 1 CONFIG_PARTITION_SEARCH_ORDER equ 0 -CONFIG_PIC equ 0 +CONFIG_PIC equ 1 CONFIG_RD_DEBUG equ 0 Loading @@ -81,10 +81,10 @@ diff --git a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/a diff --git a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h --- a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h +++ b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h @@ -48,7 +48,7 @@ #define CONFIG_NORMAL_TILE_MODE 1 @@ -49,7 +49,7 @@ #define CONFIG_OPTICAL_FLOW_API 0 #define CONFIG_OS_SUPPORT 1 #define CONFIG_PARTITION_SEARCH_ORDER 0 -#define CONFIG_PIC 0 +#define CONFIG_PIC 1 #define CONFIG_RD_DEBUG 0 Loading @@ -93,10 +93,10 @@ diff --git a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/a diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm --- a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm +++ b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm @@ -46,7 +46,7 @@ CONFIG_NN_V2 equ 0 CONFIG_NORMAL_TILE_MODE equ 1 @@ -47,7 +47,7 @@ CONFIG_NORMAL_TILE_MODE equ 1 CONFIG_OPTICAL_FLOW_API equ 0 CONFIG_OS_SUPPORT equ 1 CONFIG_PARTITION_SEARCH_ORDER equ 0 -CONFIG_PIC equ 0 +CONFIG_PIC equ 1 CONFIG_RD_DEBUG equ 0 Loading @@ -105,10 +105,10 @@ diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.a diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h --- a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h +++ b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h @@ -48,7 +48,7 @@ #define CONFIG_NORMAL_TILE_MODE 1 @@ -49,7 +49,7 @@ #define CONFIG_OPTICAL_FLOW_API 0 #define CONFIG_OS_SUPPORT 1 #define CONFIG_PARTITION_SEARCH_ORDER 0 -#define CONFIG_PIC 0 +#define CONFIG_PIC 1 #define CONFIG_RD_DEBUG 0 Loading @@ -117,10 +117,10 @@ diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h diff --git a/third_party/libaom/source/config/linux/arm/config/aom_config.asm b/third_party/libaom/source/config/linux/arm/config/aom_config.asm --- a/third_party/libaom/source/config/linux/arm/config/aom_config.asm +++ b/third_party/libaom/source/config/linux/arm/config/aom_config.asm @@ -46,7 +46,7 @@ CONFIG_NN_V2 equ 0 CONFIG_NORMAL_TILE_MODE equ 1 @@ -47,7 +47,7 @@ CONFIG_NORMAL_TILE_MODE equ 1 CONFIG_OPTICAL_FLOW_API equ 0 CONFIG_OS_SUPPORT equ 1 CONFIG_PARTITION_SEARCH_ORDER equ 0 -CONFIG_PIC equ 0 +CONFIG_PIC equ 1 CONFIG_RD_DEBUG equ 0 Loading @@ -129,10 +129,10 @@ diff --git a/third_party/libaom/source/config/linux/arm/config/aom_config.asm b/ diff --git a/third_party/libaom/source/config/linux/arm/config/aom_config.h b/third_party/libaom/source/config/linux/arm/config/aom_config.h --- a/third_party/libaom/source/config/linux/arm/config/aom_config.h +++ b/third_party/libaom/source/config/linux/arm/config/aom_config.h @@ -48,7 +48,7 @@ #define CONFIG_NORMAL_TILE_MODE 1 @@ -49,7 +49,7 @@ #define CONFIG_OPTICAL_FLOW_API 0 #define CONFIG_OS_SUPPORT 1 #define CONFIG_PARTITION_SEARCH_ORDER 0 -#define CONFIG_PIC 0 +#define CONFIG_PIC 1 #define CONFIG_RD_DEBUG 0 Loading @@ -141,10 +141,10 @@ diff --git a/third_party/libaom/source/config/linux/arm/config/aom_config.h b/th diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_config.asm b/third_party/libaom/source/config/linux/arm64/config/aom_config.asm --- a/third_party/libaom/source/config/linux/arm64/config/aom_config.asm +++ b/third_party/libaom/source/config/linux/arm64/config/aom_config.asm @@ -46,7 +46,7 @@ CONFIG_NN_V2 equ 0 CONFIG_NORMAL_TILE_MODE equ 1 @@ -47,7 +47,7 @@ CONFIG_NORMAL_TILE_MODE equ 1 CONFIG_OPTICAL_FLOW_API equ 0 CONFIG_OS_SUPPORT equ 1 CONFIG_PARTITION_SEARCH_ORDER equ 0 -CONFIG_PIC equ 0 +CONFIG_PIC equ 1 CONFIG_RD_DEBUG equ 0 Loading @@ -153,10 +153,10 @@ diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_config.asm diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_config.h b/third_party/libaom/source/config/linux/arm64/config/aom_config.h --- a/third_party/libaom/source/config/linux/arm64/config/aom_config.h +++ b/third_party/libaom/source/config/linux/arm64/config/aom_config.h @@ -48,7 +48,7 @@ #define CONFIG_NORMAL_TILE_MODE 1 @@ -49,7 +49,7 @@ #define CONFIG_OPTICAL_FLOW_API 0 #define CONFIG_OS_SUPPORT 1 #define CONFIG_PARTITION_SEARCH_ORDER 0 -#define CONFIG_PIC 0 +#define CONFIG_PIC 1 #define CONFIG_RD_DEBUG 0 Loading @@ -165,10 +165,10 @@ diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_config.h b/ diff --git a/third_party/libaom/source/config/linux/generic/config/aom_config.asm b/third_party/libaom/source/config/linux/generic/config/aom_config.asm --- a/third_party/libaom/source/config/linux/generic/config/aom_config.asm +++ b/third_party/libaom/source/config/linux/generic/config/aom_config.asm @@ -46,7 +46,7 @@ CONFIG_NN_V2 equ 0 CONFIG_NORMAL_TILE_MODE equ 1 @@ -47,7 +47,7 @@ CONFIG_NORMAL_TILE_MODE equ 1 CONFIG_OPTICAL_FLOW_API equ 0 CONFIG_OS_SUPPORT equ 1 CONFIG_PARTITION_SEARCH_ORDER equ 0 -CONFIG_PIC equ 0 +CONFIG_PIC equ 1 CONFIG_RD_DEBUG equ 0 Loading @@ -177,10 +177,10 @@ diff --git a/third_party/libaom/source/config/linux/generic/config/aom_config.as diff --git a/third_party/libaom/source/config/linux/generic/config/aom_config.h b/third_party/libaom/source/config/linux/generic/config/aom_config.h --- a/third_party/libaom/source/config/linux/generic/config/aom_config.h +++ b/third_party/libaom/source/config/linux/generic/config/aom_config.h @@ -48,7 +48,7 @@ #define CONFIG_NORMAL_TILE_MODE 1 @@ -49,7 +49,7 @@ #define CONFIG_OPTICAL_FLOW_API 0 #define CONFIG_OS_SUPPORT 1 #define CONFIG_PARTITION_SEARCH_ORDER 0 -#define CONFIG_PIC 0 +#define CONFIG_PIC 1 #define CONFIG_RD_DEBUG 0 Loading @@ -189,10 +189,10 @@ diff --git a/third_party/libaom/source/config/linux/generic/config/aom_config.h diff --git a/third_party/libaom/source/config/linux/x64/config/aom_config.asm b/third_party/libaom/source/config/linux/x64/config/aom_config.asm --- a/third_party/libaom/source/config/linux/x64/config/aom_config.asm +++ b/third_party/libaom/source/config/linux/x64/config/aom_config.asm @@ -36,7 +36,7 @@ %define CONFIG_NORMAL_TILE_MODE 1 @@ -37,7 +37,7 @@ %define CONFIG_OPTICAL_FLOW_API 0 %define CONFIG_OS_SUPPORT 1 %define CONFIG_PARTITION_SEARCH_ORDER 0 -%define CONFIG_PIC 0 +%define CONFIG_PIC 1 %define CONFIG_RD_DEBUG 0 Loading @@ -201,10 +201,10 @@ diff --git a/third_party/libaom/source/config/linux/x64/config/aom_config.asm b/ diff --git a/third_party/libaom/source/config/linux/x64/config/aom_config.h b/third_party/libaom/source/config/linux/x64/config/aom_config.h --- a/third_party/libaom/source/config/linux/x64/config/aom_config.h +++ b/third_party/libaom/source/config/linux/x64/config/aom_config.h @@ -48,7 +48,7 @@ #define CONFIG_NORMAL_TILE_MODE 1 @@ -49,7 +49,7 @@ #define CONFIG_OPTICAL_FLOW_API 0 #define CONFIG_OS_SUPPORT 1 #define CONFIG_PARTITION_SEARCH_ORDER 0 -#define CONFIG_PIC 0 +#define CONFIG_PIC 1 #define CONFIG_RD_DEBUG 0 Loading
build/patches/Add-AllowUserCertificates-flag.patch +16 −16 Original line number Diff line number Diff line Loading @@ -18,7 +18,7 @@ Subject: Add AllowUserCertificates flag 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 @@ -207,6 +207,7 @@ import org.chromium.content_public.browser.ScreenOrientationProvider; @@ -209,6 +209,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; Loading @@ -26,7 +26,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; @@ -866,6 +867,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent> @@ -877,6 +878,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent> UpdateMenuItemHelper.getInstance().onStart(); ChromeActivitySessionTracker.getInstance().onStartWithNative(); ChromeCachedFlags.getInstance().cacheNativeFlags(); Loading @@ -38,7 +38,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java b/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java --- a/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java @@ -64,6 +64,7 @@ public class ChromeCachedFlags { @@ -65,6 +65,7 @@ public class ChromeCachedFlags { // clang-format off List<String> featuresToCache = Arrays.asList( Loading @@ -49,9 +49,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/flags/Chrom diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -2759,6 +2759,10 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kCOLRV1FontsDescription, kOsAll, FEATURE_VALUE_TYPE(blink::features::kCOLRV1Fonts)}, @@ -2743,6 +2743,10 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kCSSContainerQueriesDescription, kOsAll, FEATURE_VALUE_TYPE(blink::features::kCSSContainerQueries)}, #if defined(OS_ANDROID) + {"allow-user-certificates", + flag_descriptions::kAllowUserCertificatesName, Loading @@ -78,7 +78,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h @@ -45,6 +45,9 @@ namespace flag_descriptions { @@ -46,6 +46,9 @@ namespace flag_descriptions { // Cross-platform ------------------------------------------------------------- Loading @@ -96,30 +96,30 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse &feed::kXsurfaceMetricsReporting, &history::kHideFromApi3Transitions, + &kAllowUserCertificates, &kAdjustWebApkInstallationSpace, &kAddToHomescreenIPH, &kAllowNewIncognitoTabIntents, &kAllowRemoteContextForNotifications, @@ -333,6 +334,9 @@ const base::Feature* FindFeatureExposedToJava(const std::string& feature_name) { } // namespace // Alphabetical: +const base::Feature kAllowUserCertificates = { + "AllowUserCertificates", base::FEATURE_DISABLED_BY_DEFAULT}; + const base::Feature kAdjustWebApkInstallationSpace = { "AdjustWebApkInstallationSpace", base::FEATURE_DISABLED_BY_DEFAULT}; const base::Feature kAddToHomescreenIPH{"AddToHomescreenIPH", base::FEATURE_DISABLED_BY_DEFAULT}; diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h --- a/chrome/browser/flags/android/chrome_feature_list.h +++ b/chrome/browser/flags/android/chrome_feature_list.h @@ -12,6 +12,7 @@ namespace chrome { @@ -12,6 +12,7 @@ namespace chrome { namespace android { // Alphabetical: +extern const base::Feature kAllowUserCertificates; extern const base::Feature kAdjustWebApkInstallationSpace; // Alphabetical: extern const base::Feature kAddToHomescreenIPH; extern const base::Feature kAllowNewIncognitoTabIntents; extern const base::Feature kAllowRemoteContextForNotifications; diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java Loading @@ -140,8 +140,8 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f /* Alphabetical: */ + public static final String ALLOW_USER_CERTIFICATES = "AllowUserCertificates"; public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR = "AdaptiveButtonInTopToolbar"; public static final String ADD_TO_HOMESCREEN_IPH = "AddToHomescreenIPH"; public static final String ALLOW_NEW_INCOGNITO_TAB_INTENTS = "AllowNewIncognitoTabIntents"; public static final String ALLOW_REMOTE_CONTEXT_FOR_NOTIFICATIONS = diff --git a/net/android/java/src/org/chromium/net/X509Util.java b/net/android/java/src/org/chromium/net/X509Util.java --- a/net/android/java/src/org/chromium/net/X509Util.java +++ b/net/android/java/src/org/chromium/net/X509Util.java Loading