diff options
335 files changed, 2137 insertions, 1735 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile index 1b182a83fd94..7cf97215acbb 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -1,14 +1,12 @@ PORTNAME= chromium -PORTVERSION= 130.0.6723.116 -PORTREVISION= 1 +PORTVERSION= 131.0.6778.69 PULSEMV= 16 PULSEV= ${PULSEMV}.1 CATEGORIES= www wayland MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ https://nerd.hu/distfiles/:external \ - https://chromium-tarballs.syd1.cdn.digitaloceanspaces.com/:unofficial \ https://freedesktop.org/software/pulseaudio/releases/:pulseaudio -DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:unofficial \ +DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:external \ chrome-linux-${PORTVERSION}-llvm17.profdata${EXTRACT_SUFX}:external \ pulseaudio-${PULSEV}.tar.gz:pulseaudio @@ -225,7 +223,7 @@ WIDEVINE_DESC= Depend on foreign-cdm to enable playback of DRM content WIDEVINE_RUN_DEPENDS= foreign-cdm>0:www/foreign-cdm .include "Makefile.tests" -TEST_DISTFILES= ${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX}:unofficial +TEST_DISTFILES= ${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX}:external TEST_ALL_TARGET= ${TEST_TARGETS} .include <bsd.port.options.mk> @@ -290,7 +288,7 @@ pre-configure: #./build/linux/unbundle/remove_bundled_libraries.py [list of preserved] cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \ ./build/linux/unbundle/replace_gn_files.py --system-libraries \ - dav1d flac fontconfig freetype harfbuzz-ng icu libdrm libevent libpng \ + dav1d flac fontconfig harfbuzz-ng icu libdrm libevent libpng \ libusb libwebp libxml libxslt openh264 opus || ${FALSE} # Chromium uses an unreleased version of FFmpeg, so configure it cd ${WRKSRC}/media/ffmpeg && \ diff --git a/www/chromium/distinfo b/www/chromium/distinfo index c2acae28379f..a463103d14d9 100644 --- a/www/chromium/distinfo +++ b/www/chromium/distinfo @@ -1,13 +1,13 @@ -TIMESTAMP = 1730895800 -SHA256 (chromium-130.0.6723.116.tar.xz) = 489f98fa4e44e97bfd2df73ab74d35f43a618d725098cd233e57b02fd43b9ee9 -SIZE (chromium-130.0.6723.116.tar.xz) = 4699442864 -SHA256 (chrome-linux-130.0.6723.116-llvm17.profdata.tar.xz) = a9176288e7af87bf42fd4f8d6f7340a750f73e112365bc8089bfb564c6f5158b -SIZE (chrome-linux-130.0.6723.116-llvm17.profdata.tar.xz) = 30491052 +TIMESTAMP = 1731579327 +SHA256 (chromium-131.0.6778.69.tar.xz) = 9a3454710aacb495275da698e4d9efe785ed8a492713faa2d5dd90d58e111875 +SIZE (chromium-131.0.6778.69.tar.xz) = 4507189692 +SHA256 (chrome-linux-131.0.6778.69-llvm17.profdata.tar.xz) = 83a49920395a9c167d977cef27d83e0d8c15af93bad8beaf8e488fd5b21e4386 +SIZE (chrome-linux-131.0.6778.69-llvm17.profdata.tar.xz) = 30613316 SHA256 (pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92 SIZE (pulseaudio-16.1.tar.gz) = 2763111 -SHA256 (chrome-v8-130.0.6723.116.profdata.tar.xz) = dc08102a453c720f61a10b4392afbfc18e8c2056d17b4b64b587ad3218105b62 -SIZE (chrome-v8-130.0.6723.116.profdata.tar.xz) = 276108 -SHA256 (chrome-gn-130.0.6723.116-src.tar.xz) = 96fce8436bfa59677a28386742da15c2df8902a21ebdac322f947ba10e63da66 -SIZE (chrome-gn-130.0.6723.116-src.tar.xz) = 762476 -SHA256 (chromium-130.0.6723.116-testdata.tar.xz) = 7a4417cbf1344c3ef5a41f84d7ff2df6a8866b8fe16f86780911e14b62edf56b -SIZE (chromium-130.0.6723.116-testdata.tar.xz) = 83048 +SHA256 (chrome-v8-131.0.6778.69.profdata.tar.xz) = 80b9a60e91fe4eb12f7eb9ac51c82dff2a716489a15e6794e6455f68f28fc681 +SIZE (chrome-v8-131.0.6778.69.profdata.tar.xz) = 273720 +SHA256 (chrome-gn-131.0.6778.69-src.tar.xz) = b8c2afac409532ada5aa8d42e12762bdb284865bb2af49551a12e75ccccee0ab +SIZE (chrome-gn-131.0.6778.69-src.tar.xz) = 762288 +SHA256 (chromium-131.0.6778.69-testdata.tar.xz) = f2c0320296f022cd92f6c3b00e8b710f3b5fa13aca38968da338cfdce209e25c +SIZE (chromium-131.0.6778.69-testdata.tar.xz) = 282547888 diff --git a/www/chromium/files/patch-BUILD.gn b/www/chromium/files/patch-BUILD.gn index bb9e20c58dfe..d66e670523c3 100644 --- a/www/chromium/files/patch-BUILD.gn +++ b/www/chromium/files/patch-BUILD.gn @@ -1,4 +1,4 @@ ---- BUILD.gn.orig 2024-10-22 08:31:56 UTC +--- BUILD.gn.orig 2024-11-14 07:57:23 UTC +++ BUILD.gn @@ -66,7 +66,7 @@ declare_args() { root_extra_deps = [] @@ -17,7 +17,7 @@ "//net:net_unittests", "//sandbox:sandbox_unittests", "//services:services_unittests", -@@ -437,7 +436,7 @@ group("gn_all") { +@@ -444,7 +443,7 @@ group("gn_all") { } } @@ -26,7 +26,7 @@ deps += [ "//third_party/breakpad:breakpad_unittests", "//third_party/breakpad:core-2-minidump", -@@ -628,6 +627,15 @@ group("gn_all") { +@@ -634,6 +633,15 @@ group("gn_all") { } } @@ -42,7 +42,7 @@ if (is_mac) { deps += [ "//third_party/breakpad:dump_syms($host_system_allocator_toolchain)", -@@ -676,7 +684,7 @@ group("gn_all") { +@@ -682,7 +690,7 @@ group("gn_all") { } } @@ -51,7 +51,7 @@ # The official builders use this binary from the default toolchain's # output directory after building in order to upload the symbols of that # binary. They build the binary like `ninja symupload` which requires the -@@ -1158,7 +1166,7 @@ if (use_blink && !is_cronet_build) { +@@ -1168,7 +1176,7 @@ if (use_blink && !is_cronet_build) { ] } @@ -60,7 +60,7 @@ script_test("chrome_wpt_tests") { script = "//third_party/blink/tools/run_wpt_tests.py" args = _common_web_test_options + [ "--product=chrome" ] -@@ -1251,7 +1259,7 @@ if (use_blink && !is_cronet_build) { +@@ -1261,7 +1269,7 @@ if (use_blink && !is_cronet_build) { data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ] } @@ -69,7 +69,7 @@ # Using the default toolchain for this tool, as it's run during tests not # during the build. This places a symlink in the root_build_dir for scrips # to use. -@@ -1265,7 +1273,7 @@ if (use_blink && !is_cronet_build) { +@@ -1275,7 +1283,7 @@ if (use_blink && !is_cronet_build) { data_deps += [ "//third_party/breakpad:dump_syms" ] } @@ -78,7 +78,7 @@ # Using the default toolchain for this tool, as it's run during tests not # during the build. This places a symlink in the root_build_dir for scrips # to use. -@@ -1729,7 +1737,7 @@ group("chromium_builder_perf") { +@@ -1739,7 +1747,7 @@ group("chromium_builder_perf") { data_deps += [ "//chrome/test:performance_browser_tests" ] } diff --git a/www/chromium/files/patch-ash_display_mirror__window__controller.cc b/www/chromium/files/patch-ash_display_mirror__window__controller.cc index a737f68789ff..c5461906602e 100644 --- a/www/chromium/files/patch-ash_display_mirror__window__controller.cc +++ b/www/chromium/files/patch-ash_display_mirror__window__controller.cc @@ -1,6 +1,6 @@ ---- ash/display/mirror_window_controller.cc.orig 2023-09-13 12:11:42 UTC +--- ash/display/mirror_window_controller.cc.orig 2024-11-14 07:57:23 UTC +++ ash/display/mirror_window_controller.cc -@@ -294,7 +294,11 @@ void MirrorWindowController::UpdateWindow( +@@ -295,7 +295,11 @@ void MirrorWindowController::UpdateWindow( if (!base::Contains(display_info_list, iter->first, &display::ManagedDisplayInfo::id)) { CloseAndDeleteHost(iter->second, true); diff --git a/www/chromium/files/patch-base_BUILD.gn b/www/chromium/files/patch-base_BUILD.gn index 0def502abd0d..362eb13e4f08 100644 --- a/www/chromium/files/patch-base_BUILD.gn +++ b/www/chromium/files/patch-base_BUILD.gn @@ -1,6 +1,6 @@ ---- base/BUILD.gn.orig 2024-10-23 07:00:35 UTC +--- base/BUILD.gn.orig 2024-11-14 07:57:23 UTC +++ base/BUILD.gn -@@ -1101,11 +1101,26 @@ component("base") { +@@ -1097,11 +1097,26 @@ component("base") { # Needed for <atomic> if using newer C++ library than sysroot, except if # building inside the cros_sdk environment - use host_toolchain as a # more robust check for this. @@ -28,7 +28,7 @@ if (use_allocator_shim) { if (is_apple) { sources += [ "allocator/early_zone_registration_apple.h" ] -@@ -1125,7 +1140,7 @@ component("base") { +@@ -1121,7 +1136,7 @@ component("base") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -37,7 +37,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -2102,6 +2117,22 @@ component("base") { +@@ -2113,6 +2128,22 @@ component("base") { ] } @@ -60,7 +60,7 @@ # iOS if (is_ios) { sources += [ -@@ -2246,6 +2277,33 @@ component("base") { +@@ -2257,6 +2288,33 @@ component("base") { } } @@ -94,7 +94,7 @@ if (use_blink) { sources += [ "files/file_path_watcher.cc", -@@ -2572,7 +2630,7 @@ buildflag_header("protected_memory_buildflags") { +@@ -2583,7 +2641,7 @@ buildflag_header("protected_memory_buildflags") { header = "protected_memory_buildflags.h" header_dir = "base/memory" @@ -103,7 +103,7 @@ (is_win || is_linux || is_android || is_mac) flags = [ "PROTECTED_MEMORY_ENABLED=$protected_memory_enabled" ] -@@ -3055,7 +3113,7 @@ if (is_apple) { +@@ -3068,7 +3126,7 @@ if (is_apple) { } } @@ -112,7 +112,7 @@ # This test must compile with -fstack-protector-all source_set("stack_canary_linux_unittests") { testonly = true -@@ -3717,7 +3775,7 @@ test("base_unittests") { +@@ -3744,7 +3802,7 @@ test("base_unittests") { ] } @@ -121,7 +121,7 @@ sources += [ "debug/proc_maps_linux_unittest.cc", "files/scoped_file_linux_unittest.cc", -@@ -3744,7 +3802,7 @@ test("base_unittests") { +@@ -3771,7 +3829,7 @@ test("base_unittests") { "posix/file_descriptor_shuffle_unittest.cc", "posix/unix_domain_socket_unittest.cc", ] @@ -130,7 +130,7 @@ sources += [ "profiler/stack_base_address_posix_unittest.cc", "profiler/stack_copier_signal_unittest.cc", -@@ -3755,7 +3813,7 @@ test("base_unittests") { +@@ -3782,7 +3840,7 @@ test("base_unittests") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -139,7 +139,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -3942,7 +4000,7 @@ test("base_unittests") { +@@ -3972,7 +4030,7 @@ test("base_unittests") { deps += [ ":base_profiler_test_support_library" ] } diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni index 3619816cbd31..4a1f3cc941bc 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni +++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni @@ -1,7 +1,7 @@ ---- base/allocator/partition_allocator/partition_alloc.gni.orig 2024-10-22 08:31:56 UTC +--- base/allocator/partition_allocator/partition_alloc.gni.orig 2024-11-14 07:57:23 UTC +++ base/allocator/partition_allocator/partition_alloc.gni -@@ -31,7 +31,7 @@ if (is_nacl) { - use_large_empty_slot_span_ring = is_mac +@@ -38,7 +38,7 @@ if (is_nacl) { + use_large_empty_slot_span_ring = true has_memory_tagging = - current_cpu == "arm64" && is_clang && !is_asan && (is_linux || is_android) @@ -9,7 +9,7 @@ declare_args() { # Causes all the allocations to be routed via allocator_shim.cc. Usually, -@@ -391,7 +391,7 @@ assert(!use_asan_backup_ref_ptr || use_raw_ptr_hookabl +@@ -432,7 +432,7 @@ assert(!use_asan_backup_ref_ptr || use_raw_ptr_hookabl # dependencies that use partition_allocator are compiled in AOSP against a # version of glibc that does not include pkeys syscall numbers. is_pkeys_available = diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn index 6a1996092d0a..30c5ec23bb9f 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn +++ b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig 2024-10-22 08:31:56 UTC +--- base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig 2024-11-14 07:57:23 UTC +++ base/allocator/partition_allocator/src/partition_alloc/BUILD.gn -@@ -858,7 +858,7 @@ if (is_clang_or_gcc) { +@@ -863,7 +863,7 @@ if (is_clang_or_gcc) { configs -= [ partition_alloc_enable_arc_config ] } } diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.cc b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.cc index c9d3ac186486..d948c6171ce7 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.cc +++ b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.cc @@ -1,7 +1,7 @@ ---- base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.cc.orig 2024-08-26 12:06:38 UTC +--- base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.cc.orig 2024-11-14 07:57:23 UTC +++ base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.cc -@@ -9,7 +9,7 @@ - #include "partition_alloc/page_allocator.h" +@@ -38,7 +38,7 @@ uint32_t SecTaskGetCodeSignStatus(SecTaskRef task) API + #endif // PA_BUILDFLAG(IS_MAC) #if PA_BUILDFLAG(HAS_MEMORY_TAGGING) || \ - (defined(__ARM_FEATURE_BTI_DEFAULT) && (__ARM_FEATURE_BTI_DEFAULT == 1)) diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.h b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.h index 83d4eab7009e..b5e1aa43d047 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.h +++ b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.h @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.h.orig 2024-10-22 08:31:56 UTC +--- base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.h.orig 2024-11-14 07:57:23 UTC +++ base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.h -@@ -412,8 +412,12 @@ bool TryRecommitSystemPagesInternal( +@@ -302,8 +302,12 @@ bool TryRecommitSystemPagesInternal( void DiscardSystemPagesInternal(uintptr_t address, size_t length) { void* ptr = reinterpret_cast<void*>(address); diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h index 898ecdf52440..dd242942fe84 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h +++ b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h.orig 2024-10-22 08:31:56 UTC +--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h.orig 2024-11-14 07:57:23 UTC +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h -@@ -168,7 +168,7 @@ constexpr bool kUseLazyCommit = false; +@@ -170,7 +170,7 @@ constexpr bool kUseLazyCommit = false; // This may be required on more platforms in the future. #define PA_CONFIG_HAS_ATFORK_HANDLER() \ (PA_BUILDFLAG(IS_APPLE) || PA_BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ // Enable shadow metadata. // -@@ -231,7 +231,7 @@ constexpr bool kUseLazyCommit = false; +@@ -233,7 +233,7 @@ constexpr bool kUseLazyCommit = false; // Also enabled on ARM64 macOS and iOS, as the 16kiB pages on this platform lead // to larger slot spans. #if PA_BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc index 21651f45af00..e0c5f996fd5f 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc +++ b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc @@ -1,4 +1,4 @@ ---- base/allocator/partition_allocator/src/partition_alloc/partition_root.cc.orig 2024-10-22 08:31:56 UTC +--- base/allocator/partition_allocator/src/partition_alloc/partition_root.cc.orig 2024-11-14 07:57:23 UTC +++ base/allocator/partition_allocator/src/partition_alloc/partition_root.cc @@ -44,7 +44,7 @@ #include "wow64apiset.h" @@ -7,9 +7,9 @@ -#if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS) +#if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS) || PA_BUILDFLAG(IS_BSD) #include <pthread.h> - #endif - -@@ -290,7 +290,7 @@ void PartitionAllocMallocInitOnce() { + #if PA_CONFIG(ENABLE_SHADOW_METADATA) + #include <sys/mman.h> +@@ -293,7 +293,7 @@ void PartitionAllocMallocInitOnce() { return; } @@ -18,7 +18,7 @@ // When fork() is called, only the current thread continues to execute in the // child process. If the lock is held, but *not* by this thread when fork() is // called, we have a deadlock. -@@ -1110,7 +1110,7 @@ void PartitionRoot::Init(PartitionOptions opts) { +@@ -1113,7 +1113,7 @@ void PartitionRoot::Init(PartitionOptions opts) { // apple OSes. PA_CHECK((internal::SystemPageSize() == (size_t{1} << 12)) || (internal::SystemPageSize() == (size_t{1} << 14))); diff --git a/www/chromium/files/patch-base_compiler__specific.h b/www/chromium/files/patch-base_compiler__specific.h index e0364a93cf53..b46998603cc6 100644 --- a/www/chromium/files/patch-base_compiler__specific.h +++ b/www/chromium/files/patch-base_compiler__specific.h @@ -1,20 +1,11 @@ ---- base/compiler_specific.h.orig 2024-10-22 08:31:56 UTC +--- base/compiler_specific.h.orig 2024-11-14 07:57:23 UTC +++ base/compiler_specific.h -@@ -257,7 +257,7 @@ - // - // In some cases it's desirable to remove this, e.g. on hot functions, or if - // we have purposely changed the reference canary. --#if defined(COMPILER_GCC) || defined(__clang__) -+#if (defined(COMPILER_GCC) || defined(__clang__)) && !defined(__OpenBSD__) && !defined(__FreeBSD__) - #if HAS_ATTRIBUTE(__no_stack_protector__) - #define NO_STACK_PROTECTOR __attribute__((__no_stack_protector__)) +@@ -683,7 +683,7 @@ inline constexpr bool AnalyzerAssumeTrue(bool arg) { + #if __has_cpp_attribute(clang::preserve_most) && \ + (defined(ARCH_CPU_ARM64) || defined(ARCH_CPU_X86_64)) && \ + !defined(COMPONENT_BUILD) && \ +- !(BUILDFLAG(IS_WIN) && defined(ARCH_CPU_ARM64)) ++ !((BUILDFLAG(IS_WIN) || BUILDFLAG(IS_OPENBSD)) && defined(ARCH_CPU_ARM64)) + #define PRESERVE_MOST [[clang::preserve_most]] #else -@@ -388,7 +388,7 @@ inline constexpr bool AnalyzerAssumeTrue(bool arg) { - // See https://clang.llvm.org/docs/AttributeReference.html#preserve-most for - // more details. - #if (defined(ARCH_CPU_ARM64) || defined(ARCH_CPU_X86_64)) && \ -- !(BUILDFLAG(IS_WIN) && defined(ARCH_CPU_ARM64)) && \ -+ !((BUILDFLAG(IS_WIN) || BUILDFLAG(IS_OPENBSD)) && defined(ARCH_CPU_ARM64)) && \ - !defined(COMPONENT_BUILD) && defined(__clang__) && \ - __clang_major__ >= 17 && HAS_ATTRIBUTE(preserve_most) - #define PRESERVE_MOST __attribute__((preserve_most)) + #define PRESERVE_MOST diff --git a/www/chromium/files/patch-base_debug_stack__trace__posix.cc b/www/chromium/files/patch-base_debug_stack__trace__posix.cc index 8d10e2218c3d..d7485be3bf5e 100644 --- a/www/chromium/files/patch-base_debug_stack__trace__posix.cc +++ b/www/chromium/files/patch-base_debug_stack__trace__posix.cc @@ -1,4 +1,4 @@ ---- base/debug/stack_trace_posix.cc.orig 2024-07-30 11:12:21 UTC +--- base/debug/stack_trace_posix.cc.orig 2024-11-14 07:57:23 UTC +++ base/debug/stack_trace_posix.cc @@ -46,7 +46,7 @@ // execinfo.h and backtrace(3) are really only present in glibc and in macOS @@ -21,7 +21,7 @@ #include "base/debug/proc_maps_linux.h" #endif -@@ -307,7 +309,7 @@ void PrintToStderr(const char* output) { +@@ -322,7 +324,7 @@ void PrintToStderr(const char* output) { std::ignore = HANDLE_EINTR(write(STDERR_FILENO, output, strlen(output))); } @@ -30,7 +30,7 @@ void AlarmSignalHandler(int signal, siginfo_t* info, void* void_context) { // We have seen rare cases on AMD linux where the default signal handler // either does not run or a thread (Probably an AMD driver thread) prevents -@@ -324,7 +326,11 @@ void AlarmSignalHandler(int signal, siginfo_t* info, v +@@ -339,7 +341,11 @@ void AlarmSignalHandler(int signal, siginfo_t* info, v "Warning: Default signal handler failed to terminate process.\n"); PrintToStderr("Calling exit_group() directly to prevent timeout.\n"); // See: https://man7.org/linux/man-pages/man2/exit_group.2.html @@ -42,7 +42,7 @@ } #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || // BUILDFLAG(IS_CHROMEOS) -@@ -541,7 +547,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf +@@ -537,7 +543,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf _exit(EXIT_FAILURE); } @@ -51,7 +51,7 @@ // Set an alarm to trigger in case the default handler does not terminate // the process. See 'AlarmSignalHandler' for more details. struct sigaction action; -@@ -566,6 +572,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf +@@ -562,6 +568,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf // signals that do not re-raise autonomously), such as signals delivered via // kill() and asynchronous hardware faults such as SEGV_MTEAERR, which would // otherwise be lost when re-raising the signal via raise(). @@ -59,7 +59,7 @@ long retval = syscall(SYS_rt_tgsigqueueinfo, getpid(), syscall(SYS_gettid), info->si_signo, info); if (retval == 0) { -@@ -580,6 +587,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf +@@ -576,6 +583,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf if (errno != EPERM) { _exit(EXIT_FAILURE); } @@ -67,7 +67,7 @@ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || // BUILDFLAG(IS_CHROMEOS) -@@ -769,6 +777,7 @@ class SandboxSymbolizeHelper { +@@ -772,6 +780,7 @@ class SandboxSymbolizeHelper { return -1; } @@ -75,7 +75,7 @@ // This class is copied from // third_party/crashpad/crashpad/util/linux/scoped_pr_set_dumpable.h. // It aims at ensuring the process is dumpable before opening /proc/self/mem. -@@ -861,11 +870,15 @@ class SandboxSymbolizeHelper { +@@ -864,11 +873,15 @@ class SandboxSymbolizeHelper { r.base = cur_base; } } @@ -91,7 +91,7 @@ // Reads /proc/self/maps. std::string contents; if (!ReadProcMaps(&contents)) { -@@ -883,6 +896,7 @@ class SandboxSymbolizeHelper { +@@ -886,6 +899,7 @@ class SandboxSymbolizeHelper { is_initialized_ = true; return true; diff --git a/www/chromium/files/patch-base_files_drive__info.h b/www/chromium/files/patch-base_files_drive__info.h new file mode 100644 index 000000000000..02474b7542a2 --- /dev/null +++ b/www/chromium/files/patch-base_files_drive__info.h @@ -0,0 +1,11 @@ +--- base/files/drive_info.h.orig 2024-11-14 07:57:23 UTC ++++ base/files/drive_info.h +@@ -40,7 +40,7 @@ class BASE_EXPORT DriveInfo { + std::optional<bool> has_seek_penalty; + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // Whether the drive is a removable drive. + // + // Note on macOS: that SSDs that are connected over USB that you can eject diff --git a/www/chromium/files/patch-base_files_drive__info__posix.cc b/www/chromium/files/patch-base_files_drive__info__posix.cc new file mode 100644 index 000000000000..874bb817fc2b --- /dev/null +++ b/www/chromium/files/patch-base_files_drive__info__posix.cc @@ -0,0 +1,11 @@ +--- base/files/drive_info_posix.cc.orig 2024-11-14 07:57:23 UTC ++++ base/files/drive_info_posix.cc +@@ -28,7 +28,7 @@ DriveInfo& DriveInfo::operator=(DriveInfo&&) = default + + std::optional<DriveInfo> GetFileDriveInfo(const FilePath& file_path) { + DriveInfo drive_info; +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + drive_info.has_seek_penalty = false; + return drive_info; + #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-base_files_file__util__posix.cc b/www/chromium/files/patch-base_files_file__util__posix.cc index 8ba56e1a0f99..5011b20fd25a 100644 --- a/www/chromium/files/patch-base_files_file__util__posix.cc +++ b/www/chromium/files/patch-base_files_file__util__posix.cc @@ -1,6 +1,6 @@ ---- base/files/file_util_posix.cc.orig 2024-07-30 11:12:21 UTC +--- base/files/file_util_posix.cc.orig 2024-11-14 07:57:23 UTC +++ base/files/file_util_posix.cc -@@ -889,36 +889,33 @@ bool CreateNewTempDirectory(const FilePath::StringType +@@ -897,36 +897,33 @@ bool CreateNewTempDirectory(const FilePath::StringType bool CreateDirectoryAndGetError(const FilePath& full_path, File::Error* error) { ScopedBlockingCall scoped_blocking_call( FROM_HERE, BlockingType::MAY_BLOCK); // For call to mkdir(). diff --git a/www/chromium/files/patch-base_files_file__util__unittest.cc b/www/chromium/files/patch-base_files_file__util__unittest.cc index 807b54966832..dd13eb105eb2 100644 --- a/www/chromium/files/patch-base_files_file__util__unittest.cc +++ b/www/chromium/files/patch-base_files_file__util__unittest.cc @@ -1,6 +1,6 @@ ---- base/files/file_util_unittest.cc.orig 2024-10-22 08:31:56 UTC +--- base/files/file_util_unittest.cc.orig 2024-11-14 07:57:23 UTC +++ base/files/file_util_unittest.cc -@@ -3886,7 +3886,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) { +@@ -3928,7 +3928,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) { } #endif // BUILDFLAG(IS_WIN) @@ -9,7 +9,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithProcFileSystem) { FilePath file_path("/proc/cpuinfo"); std::string data = "temp"; -@@ -4608,7 +4608,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles +@@ -4665,7 +4665,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles NULL); #else size_t bytes_written = diff --git a/www/chromium/files/patch-base_logging__unittest.cc b/www/chromium/files/patch-base_logging__unittest.cc index 5fd5df784d36..60223f479389 100644 --- a/www/chromium/files/patch-base_logging__unittest.cc +++ b/www/chromium/files/patch-base_logging__unittest.cc @@ -1,4 +1,4 @@ ---- base/logging_unittest.cc.orig 2024-06-17 12:56:06 UTC +--- base/logging_unittest.cc.orig 2024-11-14 07:57:23 UTC +++ base/logging_unittest.cc @@ -41,7 +41,7 @@ #include "base/posix/eintr_wrapper.h" @@ -9,7 +9,7 @@ #include <ucontext.h> #endif -@@ -579,14 +579,18 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo +@@ -585,14 +585,18 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo // need the arch-specific boilerplate below, which is inspired by breakpad. // At the same time, on OSX, ucontext.h is deprecated but si_addr works fine. uintptr_t crash_addr = 0; diff --git a/www/chromium/files/patch-base_process_launch.h b/www/chromium/files/patch-base_process_launch.h index 896e594bd512..0fbe1ad9dea7 100644 --- a/www/chromium/files/patch-base_process_launch.h +++ b/www/chromium/files/patch-base_process_launch.h @@ -1,6 +1,6 @@ ---- base/process/launch.h.orig 2024-10-22 08:31:56 UTC +--- base/process/launch.h.orig 2024-11-14 07:57:23 UTC +++ base/process/launch.h -@@ -237,7 +237,7 @@ struct BASE_EXPORT LaunchOptions { +@@ -241,7 +241,7 @@ struct BASE_EXPORT LaunchOptions { bool clear_environment = false; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA) diff --git a/www/chromium/files/patch-base_system_sys__info.cc b/www/chromium/files/patch-base_system_sys__info.cc index abd773bef61b..6d4b7dbf6a7e 100644 --- a/www/chromium/files/patch-base_system_sys__info.cc +++ b/www/chromium/files/patch-base_system_sys__info.cc @@ -1,6 +1,6 @@ ---- base/system/sys_info.cc.orig 2024-08-26 12:06:38 UTC +--- base/system/sys_info.cc.orig 2024-11-14 07:57:23 UTC +++ base/system/sys_info.cc -@@ -223,7 +223,7 @@ std::string SysInfo::HardwareModelName() { +@@ -229,7 +229,7 @@ std::string SysInfo::SocManufacturer() { #endif void SysInfo::GetHardwareInfo(base::OnceCallback<void(HardwareInfo)> callback) { diff --git a/www/chromium/files/patch-base_system_sys__info.h b/www/chromium/files/patch-base_system_sys__info.h index 3be2c25e6497..a8f51dfda062 100644 --- a/www/chromium/files/patch-base_system_sys__info.h +++ b/www/chromium/files/patch-base_system_sys__info.h @@ -1,6 +1,6 @@ ---- base/system/sys_info.h.orig 2024-05-21 18:07:39 UTC +--- base/system/sys_info.h.orig 2024-11-14 07:57:23 UTC +++ base/system/sys_info.h -@@ -325,6 +325,8 @@ class BASE_EXPORT SysInfo { +@@ -331,6 +331,8 @@ class BASE_EXPORT SysInfo { static void ResetCpuSecurityMitigationsEnabledForTesting(); #endif @@ -9,7 +9,7 @@ private: friend class test::ScopedAmountOfPhysicalMemoryOverride; FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory); -@@ -337,7 +339,7 @@ class BASE_EXPORT SysInfo { +@@ -343,7 +345,7 @@ class BASE_EXPORT SysInfo { static HardwareInfo GetHardwareInfoSync(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ diff --git a/www/chromium/files/patch-base_threading_hang__watcher.cc b/www/chromium/files/patch-base_threading_hang__watcher.cc index dbd9804afc30..ad3db7146d94 100644 --- a/www/chromium/files/patch-base_threading_hang__watcher.cc +++ b/www/chromium/files/patch-base_threading_hang__watcher.cc @@ -1,6 +1,6 @@ ---- base/threading/hang_watcher.cc.orig 2024-07-30 11:12:21 UTC +--- base/threading/hang_watcher.cc.orig 2024-11-14 07:57:23 UTC +++ base/threading/hang_watcher.cc -@@ -354,7 +354,7 @@ void HangWatcher::InitializeOnMainThread(ProcessType p +@@ -352,7 +352,7 @@ void HangWatcher::InitializeOnMainThread(ProcessType p bool enable_hang_watcher = base::FeatureList::IsEnabled(kEnableHangWatcher); diff --git a/www/chromium/files/patch-build_config_clang_BUILD.gn b/www/chromium/files/patch-build_config_clang_BUILD.gn index 3ea9d91eeb03..5c5c309b3619 100644 --- a/www/chromium/files/patch-build_config_clang_BUILD.gn +++ b/www/chromium/files/patch-build_config_clang_BUILD.gn @@ -1,6 +1,6 @@ ---- build/config/clang/BUILD.gn.orig 2024-10-22 08:31:56 UTC +--- build/config/clang/BUILD.gn.orig 2024-11-14 07:57:23 UTC +++ build/config/clang/BUILD.gn -@@ -236,7 +236,12 @@ template("clang_lib") { +@@ -210,7 +210,12 @@ template("clang_lib") { # Adds a dependency on the Clang runtime library clang_rt.builtins. clang_lib("compiler_builtins") { diff --git a/www/chromium/files/patch-build_config_compiler_BUILD.gn b/www/chromium/files/patch-build_config_compiler_BUILD.gn index 151d67f6b479..b95f3a510c40 100644 --- a/www/chromium/files/patch-build_config_compiler_BUILD.gn +++ b/www/chromium/files/patch-build_config_compiler_BUILD.gn @@ -1,4 +1,4 @@ ---- build/config/compiler/BUILD.gn.orig 2024-10-22 08:31:56 UTC +--- build/config/compiler/BUILD.gn.orig 2024-11-15 08:32:03 UTC +++ build/config/compiler/BUILD.gn @@ -199,7 +199,7 @@ declare_args() { # This greatly reduces the size of debug builds, at the cost of @@ -47,7 +47,7 @@ cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ] if (save_reproducers_on_lld_crash && use_lld) { ldflags += [ -@@ -1217,7 +1224,7 @@ config("compiler_cpu_abi") { +@@ -1220,7 +1227,7 @@ config("compiler_cpu_abi") { ] } } else if (current_cpu == "arm") { @@ -56,7 +56,7 @@ !(is_chromeos_lacros && is_chromeos_device)) { cflags += [ "--target=arm-linux-gnueabihf" ] ldflags += [ "--target=arm-linux-gnueabihf" ] -@@ -1232,7 +1239,7 @@ config("compiler_cpu_abi") { +@@ -1235,7 +1242,7 @@ config("compiler_cpu_abi") { cflags += [ "-mtune=$arm_tune" ] } } else if (current_cpu == "arm64") { @@ -65,7 +65,7 @@ !(is_chromeos_lacros && is_chromeos_device)) { cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] -@@ -1567,7 +1574,7 @@ config("compiler_deterministic") { +@@ -1570,7 +1577,7 @@ config("compiler_deterministic") { # different build directory like "out/feature_a" and "out/feature_b" if # we build same files with same compile flag. # Other paths are already given in relative, no need to normalize them. @@ -74,7 +74,7 @@ # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here. cflags += [ "-Xclang", -@@ -1625,7 +1632,7 @@ config("compiler_deterministic") { +@@ -1628,7 +1635,7 @@ config("compiler_deterministic") { } config("clang_revision") { @@ -83,17 +83,17 @@ current_os != "zos") { update_args = [ "--print-revision", -@@ -1955,9 +1962,6 @@ config("default_warnings") { - - # TODO(crbug.com/40286317): Evaluate and possibly enable. - "-Wno-vla-extension", +@@ -1952,9 +1959,6 @@ config("default_warnings") { + cflags += [ + # TODO(crbug.com/330524456): -Wcast-function-type is under -Wextra now. + "-Wno-cast-function-type", - - # TODO(crbug.com/40284799): Fix and re-enable. - "-Wno-thread-safety-reference-return", ] cflags_cc += [ -@@ -1965,17 +1969,11 @@ config("default_warnings") { +@@ -1962,18 +1966,12 @@ config("default_warnings") { "-Wenum-compare-conditional", ] @@ -103,16 +103,17 @@ # TODO(crbug.com/41486292): Fix and re-enable. "-Wno-c++11-narrowing-const-reference", ] -- + - # TODO(crbug.com/344680447): Fix and re-enable. - cflags_cc += [ "-Wno-missing-template-arg-list-after-template-kw" ] - - # TODO(crbug.com/356172342): Fix and re-enable. - cflags_cc += [ "-Wno-dangling-assignment-gsl" ] - } - } - -@@ -2709,7 +2707,7 @@ config("afdo_optimize_size") { +- + if (llvm_force_head_revision) { + # TODO(crbug.com/373130005): Fix and re-enable. + cflags_cc += [ "-Wno-deprecated-literal-operator" ] +@@ -2711,7 +2709,7 @@ config("afdo_optimize_size") { # There are some targeted places that AFDO regresses, so we provide a separate # config to allow AFDO to be disabled per-target. config("afdo") { @@ -121,7 +122,7 @@ cflags = [] if (clang_emit_debug_info_for_profiling) { # Add the following flags to generate debug info for profiling. -@@ -2736,7 +2734,7 @@ config("afdo") { +@@ -2738,7 +2736,7 @@ config("afdo") { cflags += [ "-Wno-backend-plugin" ] inputs = [ _clang_sample_profile ] } @@ -130,7 +131,7 @@ cflags = [ "-fauto-profile=${auto_profile_path}" ] inputs = [ auto_profile_path ] } -@@ -2913,7 +2911,7 @@ config("symbols") { +@@ -2915,7 +2913,7 @@ config("symbols") { cflags += [ "-gomit-unreferenced-methods" ] } diff --git a/www/chromium/files/patch-build_config_rust.gni b/www/chromium/files/patch-build_config_rust.gni index 240ce7fe07d6..bd09d3cc3964 100644 --- a/www/chromium/files/patch-build_config_rust.gni +++ b/www/chromium/files/patch-build_config_rust.gni @@ -1,6 +1,6 @@ ---- build/config/rust.gni.orig 2024-10-22 08:31:56 UTC +--- build/config/rust.gni.orig 2024-11-14 07:57:23 UTC +++ build/config/rust.gni -@@ -277,6 +277,10 @@ if (is_linux || is_chromeos) { +@@ -321,6 +321,10 @@ if (is_linux || is_chromeos) { } } diff --git a/www/chromium/files/patch-build_linux_unbundle_icu.gn b/www/chromium/files/patch-build_linux_unbundle_icu.gn index d1588b8a6ff0..9b2b82bc8c7f 100644 --- a/www/chromium/files/patch-build_linux_unbundle_icu.gn +++ b/www/chromium/files/patch-build_linux_unbundle_icu.gn @@ -1,4 +1,4 @@ ---- build/linux/unbundle/icu.gn.orig 2024-11-06 12:34:11 UTC +--- build/linux/unbundle/icu.gn.orig 2024-11-14 07:57:23 UTC +++ build/linux/unbundle/icu.gn @@ -17,6 +17,15 @@ config("icu_config") { "USING_SYSTEM_ICU=1", @@ -35,3 +35,18 @@ } pkg_config("system_icui18n") { +@@ -46,6 +67,14 @@ pkg_config("system_icuuc") { + } + + source_set("icui18n") { ++ deps = [ ":icui18n_shim" ] ++ public_configs = [ ++ ":icu_config", ++ ":system_icui18n", ++ ] ++} ++ ++source_set("icui18n_hidden_visibility") { + deps = [ ":icui18n_shim" ] + public_configs = [ + ":icu_config", diff --git a/www/chromium/files/patch-cc_base_features.cc b/www/chromium/files/patch-cc_base_features.cc index 650b93c05d07..92ff05cfdeaf 100644 --- a/www/chromium/files/patch-cc_base_features.cc +++ b/www/chromium/files/patch-cc_base_features.cc @@ -1,6 +1,6 @@ ---- cc/base/features.cc.orig 2024-10-22 08:31:56 UTC +--- cc/base/features.cc.orig 2024-11-14 07:57:23 UTC +++ cc/base/features.cc -@@ -78,7 +78,7 @@ const base::FeatureParam<int> kDeferImplInvalidationFr +@@ -85,7 +85,7 @@ const base::FeatureParam<int> kDeferImplInvalidationFr // be using a separate flag to control the launch on GL. BASE_FEATURE(kUseDMSAAForTiles, "UseDMSAAForTiles", diff --git a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc index 06d825f3d2c5..3a0e5a22fce3 100644 --- a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc +++ b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc @@ -1,4 +1,4 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/app/chrome_main_delegate.cc @@ -145,7 +145,7 @@ #include "components/about_ui/credit_utils.h" @@ -30,7 +30,7 @@ #include "chrome/browser/policy/policy_path_parser.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -343,7 +343,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty +@@ -342,7 +342,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty // and resources loaded. bool SubprocessNeedsResourceBundle(const std::string& process_type) { return @@ -39,7 +39,7 @@ // The zygote process opens the resources for the renderers. process_type == switches::kZygoteProcess || #endif -@@ -428,7 +428,7 @@ bool HandleVersionSwitches(const base::CommandLine& co +@@ -427,7 +427,7 @@ bool HandleVersionSwitches(const base::CommandLine& co // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -48,16 +48,16 @@ // Show the man page if --help or -h is on the command line. void HandleHelpSwitches(const base::CommandLine& command_line) { if (command_line.HasSwitch(switches::kHelp) || -@@ -474,7 +474,7 @@ void SetCrashpadUploadConsentPostLogin() { +@@ -439,7 +439,7 @@ void HandleHelpSwitches(const base::CommandLine& comma } - #endif // BUILDFLAG(IS_CHROMEOS_LACROS) + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_ANDROID) +#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_BSD) void SIGTERMProfilingShutdown(int signal) { content::Profiling::Stop(); struct sigaction sigact; -@@ -556,7 +556,7 @@ std::optional<int> AcquireProcessSingleton( +@@ -521,7 +521,7 @@ std::optional<int> AcquireProcessSingleton( // process can be exited. ChromeProcessSingleton::CreateInstance(user_data_dir); @@ -66,7 +66,7 @@ // Read the xdg-activation token and set it in the command line for the // duration of the notification in order to ensure this is propagated to an // already running browser process if it exists. -@@ -640,7 +640,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -605,7 +605,7 @@ void InitializeUserDataDir(base::CommandLine* command_ std::string process_type = command_line->GetSwitchValueASCII(switches::kProcessType); @@ -75,7 +75,7 @@ // On Linux, Chrome does not support running multiple copies under different // DISPLAYs, so the profile directory can be specified in the environment to // support the virtual desktop use-case. -@@ -770,7 +770,7 @@ void RecordMainStartupMetrics(const StartupTimestamps& +@@ -698,7 +698,7 @@ void RecordMainStartupMetrics(const StartupTimestamps& #endif #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ @@ -84,7 +84,7 @@ // Record the startup process creation time on supported platforms. On Android // this is recorded in ChromeMainDelegateAndroid. startup_metric_utils::GetCommon().RecordStartupProcessCreationTime( -@@ -964,7 +964,7 @@ std::optional<int> ChromeMainDelegate::PostEarlyInitia +@@ -887,7 +887,7 @@ std::optional<int> ChromeMainDelegate::PostEarlyInitia #if BUILDFLAG(IS_OZONE) // Initialize Ozone platform and add required feature flags as per platform's // properties. @@ -93,7 +93,7 @@ ui::SetOzonePlatformForLinuxIfNeeded(*base::CommandLine::ForCurrentProcess()); #endif ui::OzonePlatform::PreEarlyInitialization(); -@@ -1168,7 +1168,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv +@@ -1091,7 +1091,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv const bool is_canary_dev = IsCanaryDev(); const bool emit_crashes = #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -102,7 +102,7 @@ is_canary_dev; #else false; -@@ -1318,7 +1318,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom +@@ -1241,7 +1241,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom // TODO(crbug.com/40118868): Revisit the macro expression once build flag // switch of lacros-chrome is complete. @@ -111,7 +111,7 @@ // This will directly exit if the user asked for help. HandleHelpSwitches(command_line); #endif -@@ -1348,7 +1348,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom +@@ -1271,7 +1271,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom #if BUILDFLAG(IS_CHROMEOS) chromeos::dbus_paths::RegisterPathProvider(); #endif @@ -120,7 +120,7 @@ nacl::RegisterPathProvider(); #endif -@@ -1725,7 +1725,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1634,7 +1634,7 @@ void ChromeMainDelegate::PreSandboxStartup() { CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale; } @@ -129,7 +129,7 @@ // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess && !command_line.HasSwitch(switches::kDisableCrashpadForTesting)) { -@@ -1821,13 +1821,13 @@ absl::variant<int, content::MainFunctionParams> Chrome +@@ -1723,13 +1723,13 @@ absl::variant<int, content::MainFunctionParams> Chrome #else #if BUILDFLAG(IS_MAC) || (BUILDFLAG(ENABLE_NACL) && !BUILDFLAG(IS_LINUX) && \ diff --git a/www/chromium/files/patch-chrome_browser_BUILD.gn b/www/chromium/files/patch-chrome_browser_BUILD.gn index 9ef03462fac5..70acad195b97 100644 --- a/www/chromium/files/patch-chrome_browser_BUILD.gn +++ b/www/chromium/files/patch-chrome_browser_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/browser/BUILD.gn.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/BUILD.gn.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/BUILD.gn -@@ -6905,6 +6905,13 @@ static_library("browser") { +@@ -6980,6 +6980,13 @@ static_library("browser") { } } diff --git a/www/chromium/files/patch-chrome_browser_about__flags.cc b/www/chromium/files/patch-chrome_browser_about__flags.cc index bb559dc11318..36e94e376ec1 100644 --- a/www/chromium/files/patch-chrome_browser_about__flags.cc +++ b/www/chromium/files/patch-chrome_browser_about__flags.cc @@ -1,6 +1,6 @@ ---- chrome/browser/about_flags.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/about_flags.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/about_flags.cc -@@ -244,7 +244,7 @@ +@@ -246,7 +246,7 @@ #include "ui/ui_features.h" #include "url/url_features.h" @@ -9,7 +9,7 @@ #include "base/allocator/buildflags.h" #endif -@@ -337,7 +337,7 @@ +@@ -341,7 +341,7 @@ #include "device/vr/public/cpp/features.h" #endif @@ -18,7 +18,7 @@ #include "ui/ozone/public/ozone_switches.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) -@@ -346,7 +346,7 @@ +@@ -350,7 +350,7 @@ #include "chrome/browser/win/mica_titlebar.h" #endif @@ -27,7 +27,7 @@ #include "chrome/browser/enterprise/profile_management/profile_management_features.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -@@ -356,7 +356,7 @@ +@@ -360,7 +360,7 @@ #include "components/user_education/common/user_education_features.h" // nogncheck #endif @@ -36,7 +36,7 @@ #include "chrome/browser/ui/ui_features.h" #include "ui/base/ui_base_features.h" #endif -@@ -498,7 +498,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap +@@ -506,7 +506,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap {"Max 3 Frames", &kDXGIWaitableSwapChain3Frames, 1, nullptr}}; #endif @@ -45,7 +45,7 @@ const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = { {flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""}, {flag_descriptions::kOzonePlatformHintChoiceAuto, -@@ -775,6 +775,26 @@ const FeatureEntry::FeatureVariation +@@ -783,6 +783,26 @@ const FeatureEntry::FeatureVariation std::size(kWebIdentityDigitalIdentityCredentialHighRiskDialogParam), nullptr}}; @@ -72,7 +72,7 @@ const FeatureEntry::FeatureParam kClipboardMaximumAge60Seconds[] = { {"UIClipboardMaximumAge", "60"}}; const FeatureEntry::FeatureParam kClipboardMaximumAge90Seconds[] = { -@@ -1188,7 +1208,7 @@ const FeatureEntry::FeatureVariation kPageContentAnnot +@@ -1224,7 +1244,7 @@ const FeatureEntry::FeatureVariation kPageContentAnnot }; #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -81,7 +81,7 @@ const FeatureEntry::FeatureParam kHistoryEmbeddingsAtKeywordAcceleration[]{ {"AtKeywordAcceleration", "true"}, }; -@@ -1232,7 +1252,7 @@ const FeatureEntry::FeatureVariation +@@ -1268,7 +1288,7 @@ const FeatureEntry::FeatureVariation }; #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -90,7 +90,16 @@ const FeatureEntry::FeatureParam kShortcutBoostSingleUrl[] = { {"ShortcutBoostSearchScore", "0"}, {"ShortcutBoostNonTopHitThreshold", "0"}, -@@ -3678,7 +3698,7 @@ const flags_ui::FeatureEntry::FeatureVariation +@@ -1886,7 +1906,7 @@ const FeatureEntry::FeatureVariation kTabScrollingVari + #endif + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + const FeatureEntry::FeatureParam kTabstripDeclutterQuickModeParams[] = { + {"stale_threshold_duration", "10s"}, + {"declutter_timer_interval", "10s"}, +@@ -3635,7 +3655,7 @@ const flags_ui::FeatureEntry::FeatureVariation }; #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -99,7 +108,16 @@ const flags_ui::FeatureEntry::FeatureParam kPwaNavigationCapturingDefaultOn[] = {{"link_capturing_state", "on_by_default"}}; const flags_ui::FeatureEntry::FeatureParam kPwaNavigationCapturingDefaultOff[] = -@@ -4920,7 +4940,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4159,7 +4179,7 @@ const FeatureEntry::FeatureVariation + std::size(kSecurePaymentConfirmationNetworkAndIssuerIcons_Rows), + nullptr}}; + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + const FeatureEntry::FeatureParam kTranslationAPI_SkipLanguagePackLimit[] = { + {"TranslationAPIAcceptLanguagesCheck", "false"}, + {"TranslationAPILimitLanguagePackCount", "false"}}; +@@ -4905,7 +4925,7 @@ const FeatureEntry kFeatureEntries[] = { }, #endif // BUILDFLAG(IS_WIN) @@ -108,16 +126,16 @@ { "fluent-overlay-scrollbars", flag_descriptions::kFluentOverlayScrollbarsName, -@@ -5332,7 +5352,7 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kWebAppUniversalInstallDescription, kOsDesktop, - FEATURE_VALUE_TYPE(features::kWebAppUniversalInstall)}, +@@ -5314,7 +5334,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kDesktopPWAsSyncChangesDescription, kOsDesktop, + FEATURE_VALUE_TYPE(features::kWebAppDontAddExistingAppsToSync)}, #endif // !BUILDFLAG(IS_ANDROID) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) {"shortcuts-not-apps", flag_descriptions::kShortcutsNotAppsName, flag_descriptions::kShortcutsNotAppsDescription, kOsMac | kOsWin | kOsLinux, -@@ -5487,7 +5507,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5469,7 +5489,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kWebShare)}, #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -126,10 +144,10 @@ {"pulseaudio-loopback-for-cast", flag_descriptions::kPulseaudioLoopbackForCastName, flag_descriptions::kPulseaudioLoopbackForCastDescription, kOsLinux, -@@ -5514,9 +5534,18 @@ const FeatureEntry kFeatureEntries[] = { - {"wayland-text-input-v3", flag_descriptions::kWaylandTextInputV3Name, - flag_descriptions::kWaylandTextInputV3Description, kOsLinux, - FEATURE_VALUE_TYPE(features::kWaylandTextInputV3)}, +@@ -5500,9 +5520,18 @@ const FeatureEntry kFeatureEntries[] = { + {"wayland-ui-scaling", flag_descriptions::kWaylandUiScalingName, + flag_descriptions::kWaylandUiScalingDescription, kOsLinux, + FEATURE_VALUE_TYPE(features::kWaylandUiScale)}, +#if BUILDFLAG(IS_BSD) + {"audio-backend", + flag_descriptions::kAudioBackendName, @@ -146,7 +164,7 @@ {"skip-undecryptable-passwords", flag_descriptions::kSkipUndecryptablePasswordsName, flag_descriptions::kSkipUndecryptablePasswordsDescription, -@@ -6465,7 +6494,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6414,7 +6443,7 @@ const FeatureEntry kFeatureEntries[] = { "MlUrlScoring")}, #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -155,7 +173,7 @@ {"omnibox-domain-suggestions", flag_descriptions::kOmniboxDomainSuggestionsName, flag_descriptions::kOmniboxDomainSuggestionsDescription, kOsDesktop, -@@ -6752,7 +6781,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6620,7 +6649,7 @@ const FeatureEntry kFeatureEntries[] = { "OrganicRepeatableQueries")}, #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -164,7 +182,7 @@ {"history-embeddings", flag_descriptions::kHistoryEmbeddingsName, flag_descriptions::kHistoryEmbeddingsDescription, kOsDesktop, FEATURE_WITH_PARAMS_VALUE_TYPE(history_embeddings::kHistoryEmbeddings, -@@ -7341,7 +7370,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7235,7 +7264,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(printing::features::kAddPrinterViaPrintscanmgr)}, #endif // BUILDFLAG(IS_CHROMEOS) @@ -173,7 +191,7 @@ {"cups-ipp-printing-backend", flag_descriptions::kCupsIppPrintingBackendName, flag_descriptions::kCupsIppPrintingBackendDescription, kOsDesktop, -@@ -8326,7 +8355,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8239,7 +8268,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kCooperativeSchedulingDescription, kOsAll, FEATURE_VALUE_TYPE(features::kCooperativeScheduling)}, @@ -182,17 +200,17 @@ {"enable-network-service-sandbox", flag_descriptions::kEnableNetworkServiceSandboxName, flag_descriptions::kEnableNetworkServiceSandboxDescription, -@@ -8350,7 +8379,7 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(media::kV4L2FlatStatefulVideoDecoder)}, - #endif +@@ -8255,7 +8284,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(media::kUseOutOfProcessVideoDecoding)}, + #endif // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER) -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) {"enable-family-link-extensions-permissions", flag_descriptions:: kEnableExtensionsPermissionsForSupervisedUsersOnDesktopName, -@@ -9184,7 +9213,7 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(ash::features::kWallpaperPerDesk)}, +@@ -9069,7 +9098,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(ash::features::kWallpaperGooglePhotosSharedAlbums)}, #endif // BUILDFLAG(IS_CHROMEOS_ASH) -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) @@ -200,7 +218,7 @@ {"enable-get-all-screens-media", flag_descriptions::kGetAllScreensMediaName, flag_descriptions::kGetAllScreensMediaDescription, kOsCrOS | kOsLacros | kOsLinux, -@@ -9217,7 +9246,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9102,7 +9131,7 @@ const FeatureEntry kFeatureEntries[] = { #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -209,7 +227,7 @@ { "ui-debug-tools", flag_descriptions::kUIDebugToolsName, -@@ -9745,7 +9774,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9603,7 +9632,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kRenderPassDrawnRect)}, #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -218,7 +236,7 @@ {"media-session-enter-picture-in-picture", flag_descriptions::kMediaSessionEnterPictureInPictureName, flag_descriptions::kMediaSessionEnterPictureInPictureDescription, -@@ -10592,7 +10621,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10390,7 +10419,7 @@ const FeatureEntry kFeatureEntries[] = { kOsDesktop | kOsAndroid, FEATURE_VALUE_TYPE(features::kProcessPerSiteUpToMainFrameThreshold)}, @@ -227,7 +245,7 @@ {"camera-mic-effects", flag_descriptions::kCameraMicEffectsName, flag_descriptions::kCameraMicEffectsDescription, static_cast<unsigned short>(kOsMac | kOsWin | kOsLinux), -@@ -10630,7 +10659,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10421,7 +10450,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kSiteInstanceGroupsForDataUrls)}, #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -236,7 +254,7 @@ {"site-search-settings-policy", flag_descriptions::kSiteSearchSettingsPolicyName, flag_descriptions::kSiteSearchSettingsPolicyDescription, kOsAll, -@@ -10759,7 +10788,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10546,7 +10575,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kHideIncognitoMediaMetadataDescription, kOsAll, FEATURE_VALUE_TYPE(media::kHideIncognitoMediaMetadata)}, @@ -245,7 +263,7 @@ {"third-party-profile-management", flag_descriptions::kThirdPartyProfileManagementName, flag_descriptions::kThirdPartyProfileManagementDescription, -@@ -10801,7 +10830,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10588,7 +10617,7 @@ const FeatureEntry kFeatureEntries[] = { #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -254,7 +272,7 @@ {"enable-user-navigation-capturing-pwa", flag_descriptions::kPwaNavigationCapturingName, flag_descriptions::kPwaNavigationCapturingDescription, -@@ -11726,7 +11755,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -11476,7 +11505,7 @@ const FeatureEntry kFeatureEntries[] = { kAuthenticateUsingUserConsentVerifierInteropApi)}, #endif @@ -263,7 +281,7 @@ {"sync-enable-bookmarks-in-transport-mode", flag_descriptions::kSyncEnableBookmarksInTransportModeName, flag_descriptions::kSyncEnableBookmarksInTransportModeDescription, -@@ -11816,7 +11845,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -11575,7 +11604,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -272,7 +290,7 @@ {"classify-url-on-process-response-event", flag_descriptions::kClassifyUrlOnProcessResponseEventName, flag_descriptions::kClassifyUrlOnProcessResponseEventDescription, -@@ -11825,7 +11854,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -11584,7 +11613,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -281,7 +299,7 @@ {"tab-organization", flag_descriptions::kTabOrganizationName, flag_descriptions::kTabOrganizationDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kTabOrganization)}, -@@ -11864,7 +11893,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -11629,7 +11658,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kLanguageDetectionAPIDescription, kOsAll, FEATURE_VALUE_TYPE(blink::features::kLanguageDetectionAPI)}, @@ -290,3 +308,21 @@ {"supervised-profile-hide-guest", flag_descriptions::kSupervisedProfileHideGuestName, flag_descriptions::kSupervisedProfileHideGuestDescription, +@@ -11882,7 +11911,7 @@ const FeatureEntry kFeatureEntries[] = { + segmentation_platform::features::kSegmentationSurveyPage)}, + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + {"autofill-enable-buy-now-pay-later-for-affirm", + flag_descriptions::kAutofillEnableBuyNowPayLaterForAffirmName, + flag_descriptions::kAutofillEnableBuyNowPayLaterForAffirmDescription, +@@ -12017,7 +12046,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE( + autofill::features::kAutofillEnableCardInfoRuntimeRetrieval)}, + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + {"translation-api", flag_descriptions::kTranslationAPIName, + flag_descriptions::kTranslationAPIDescription, kOsMac | kOsWin | kOsLinux, + FEATURE_WITH_PARAMS_VALUE_TYPE(blink::features::kEnableTranslationAPI, diff --git a/www/chromium/files/patch-chrome_browser_browser__features.cc b/www/chromium/files/patch-chrome_browser_browser__features.cc index 5f6d2af16751..91bb00589148 100644 --- a/www/chromium/files/patch-chrome_browser_browser__features.cc +++ b/www/chromium/files/patch-chrome_browser_browser__features.cc @@ -1,4 +1,4 @@ ---- chrome/browser/browser_features.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/browser_features.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/browser_features.cc @@ -71,7 +71,7 @@ BASE_FEATURE(kClosedTabCache, "ClosedTabCache", @@ -18,7 +18,7 @@ base::FEATURE_ENABLED_BY_DEFAULT); #else base::FEATURE_DISABLED_BY_DEFAULT); -@@ -347,7 +347,7 @@ BASE_FEATURE(kSandboxExternalProtocolBlockedWarning, +@@ -268,7 +268,7 @@ BASE_FEATURE(kSandboxExternalProtocolBlockedWarning, "SandboxExternalProtocolBlockedWarning", base::FEATURE_ENABLED_BY_DEFAULT); @@ -27,12 +27,3 @@ // If true, encrypt new data with the key provided by SecretPortalKeyProvider. // Otherwise, it will only decrypt existing data. BASE_FEATURE(kSecretPortalKeyProviderUseForEncryption, -@@ -360,7 +360,7 @@ BASE_FEATURE(kSecretPortalKeyProviderUseForEncryption, - BASE_FEATURE(kSupportSearchSuggestionForPrerender2, - "SupportSearchSuggestionForPrerender2", - #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ -- BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -+ BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - base::FEATURE_ENABLED_BY_DEFAULT); - #else - base::FEATURE_DISABLED_BY_DEFAULT); diff --git a/www/chromium/files/patch-chrome_browser_browser__features.h b/www/chromium/files/patch-chrome_browser_browser__features.h index 6811aeecabc3..b7af00eb51e4 100644 --- a/www/chromium/files/patch-chrome_browser_browser__features.h +++ b/www/chromium/files/patch-chrome_browser_browser__features.h @@ -1,6 +1,6 @@ ---- chrome/browser/browser_features.h.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/browser_features.h.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/browser_features.h -@@ -29,7 +29,7 @@ BASE_DECLARE_FEATURE(kCertificateTransparencyAskBefore +@@ -38,7 +38,7 @@ BASE_DECLARE_FEATURE(kCertificateTransparencyAskBefore BASE_DECLARE_FEATURE(kCertVerificationNetworkTime); BASE_DECLARE_FEATURE(kClosedTabCache); @@ -9,7 +9,7 @@ BASE_DECLARE_FEATURE(kDbusSecretPortal); #endif -@@ -143,7 +143,7 @@ BASE_DECLARE_FEATURE(kRestartNetworkServiceUnsandboxed +@@ -117,7 +117,7 @@ BASE_DECLARE_FEATURE(kRestartNetworkServiceUnsandboxed BASE_DECLARE_FEATURE(kSandboxExternalProtocolBlocked); BASE_DECLARE_FEATURE(kSandboxExternalProtocolBlockedWarning); diff --git a/www/chromium/files/patch-chrome_browser_browser__process__impl.cc b/www/chromium/files/patch-chrome_browser_browser__process__impl.cc index 98344e80f8de..cfac581d4581 100644 --- a/www/chromium/files/patch-chrome_browser_browser__process__impl.cc +++ b/www/chromium/files/patch-chrome_browser_browser__process__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/browser_process_impl.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/browser_process_impl.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/browser_process_impl.cc -@@ -235,7 +235,7 @@ +@@ -236,7 +236,7 @@ #include "chrome/browser/ui/profiles/profile_picker.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/error_reporting/chrome_js_error_report_processor.h" // nogncheck #endif -@@ -256,7 +256,7 @@ +@@ -257,7 +257,7 @@ #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h" #endif @@ -18,7 +18,7 @@ #include "chrome/browser/browser_features.h" #include "components/os_crypt/async/browser/secret_portal_key_provider.h" #endif -@@ -1124,7 +1124,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySim +@@ -1125,7 +1125,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySim GoogleUpdateSettings::GetCollectStatsConsent()); registry->RegisterBooleanPref(prefs::kDevToolsRemoteDebuggingAllowed, true); @@ -27,7 +27,7 @@ os_crypt_async::SecretPortalKeyProvider::RegisterLocalPrefs(registry); #endif } -@@ -1307,7 +1307,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { +@@ -1308,7 +1308,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { ApplyMetricsReportingPolicy(); @@ -36,8 +36,8 @@ ChromeJsErrorReportProcessor::Create(); #endif -@@ -1404,7 +1404,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { - } +@@ -1398,7 +1398,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { + features::kUseAppBoundEncryptionProviderForEncryption)))); #endif // BUILDFLAG(IS_WIN) -#if BUILDFLAG(IS_LINUX) @@ -45,7 +45,7 @@ if (base::FeatureList::IsEnabled(features::kDbusSecretPortal)) { providers.emplace_back( /*precedence=*/10u, -@@ -1655,7 +1655,7 @@ void BrowserProcessImpl::Unpin() { +@@ -1648,7 +1648,7 @@ void BrowserProcessImpl::Unpin() { // Mac is currently not supported. // TODO(crbug.com/40118868): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__field__trials.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__field__trials.cc index 49d6d0be4398..0ddb4ddaf333 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__browser__field__trials.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__field__trials.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_field_trials.cc.orig 2024-08-26 12:06:38 UTC +--- chrome/browser/chrome_browser_field_trials.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/chrome_browser_field_trials.cc -@@ -48,7 +48,7 @@ +@@ -49,7 +49,7 @@ #include "chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_trial.h" #endif @@ -9,7 +9,7 @@ #include "base/nix/xdg_util.h" #include "ui/base/ui_base_features.h" #endif // BUILDFLAG(IS_LINUX) -@@ -155,7 +155,7 @@ void ChromeBrowserFieldTrials::RegisterSyntheticTrials +@@ -135,7 +135,7 @@ void ChromeBrowserFieldTrials::RegisterSyntheticTrials #endif } diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__field__trials.h b/www/chromium/files/patch-chrome_browser_chrome__browser__field__trials.h index d6beb8cbeffc..34f3d97dc933 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__browser__field__trials.h +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__field__trials.h @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_field_trials.h.orig 2024-08-26 12:06:38 UTC +--- chrome/browser/chrome_browser_field_trials.h.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/chrome_browser_field_trials.h -@@ -34,7 +34,7 @@ class ChromeBrowserFieldTrials : public variations::Pl +@@ -33,7 +33,7 @@ class ChromeBrowserFieldTrials : public variations::Pl const variations::EntropyProviders& entropy_providers, base::FeatureList* feature_list) override; void RegisterSyntheticTrials() override; diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc index 25be38a27ec6..dd2aded5b784 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_interface_binders.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/chrome_browser_interface_binders.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/chrome_browser_interface_binders.cc -@@ -128,12 +128,12 @@ +@@ -129,12 +129,12 @@ #endif // BUILDFLAG(FULL_SAFE_BROWSING) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -13,17 +13,17 @@ -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "chrome/browser/ui/webui/app_settings/web_app_settings_ui.h" + #include "chrome/browser/ui/webui/on_device_translation_internals/on_device_translation_internals_ui.h" #include "ui/webui/resources/cr_components/app_management/app_management.mojom.h" - #endif -@@ -221,7 +221,7 @@ +@@ -224,7 +224,7 @@ #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #include "chrome/browser/companion/visual_query/visual_query_suggestions_service_factory.h" #include "chrome/browser/screen_ai/screen_ai_service_router.h" #include "chrome/browser/screen_ai/screen_ai_service_router_factory.h" + #include "chrome/browser/ui/web_applications/sub_apps_service_impl.h" @@ -234,7 +234,7 @@ #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) @@ -33,7 +33,7 @@ #include "chrome/browser/ui/webui/whats_new/whats_new_ui.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -859,7 +859,7 @@ void BindMediaFoundationPreferences( +@@ -865,7 +865,7 @@ void BindMediaFoundationPreferences( #endif // BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -42,7 +42,7 @@ void BindScreenAIAnnotator( content::RenderFrameHost* frame_host, mojo::PendingReceiver<screen_ai::mojom::ScreenAIAnnotator> receiver) { -@@ -1083,7 +1083,7 @@ void PopulateChromeFrameBinders( +@@ -1078,7 +1078,7 @@ void PopulateChromeFrameBinders( #endif // BUILDFLAG(ENABLE_SPEECH_SERVICE) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -51,7 +51,7 @@ if (base::FeatureList::IsEnabled(blink::features::kDesktopPWAsSubApps) && !render_frame_host->GetParentOrOuterDocument()) { // The service binder will reject non-primary main frames, but we still need -@@ -1179,7 +1179,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -1168,7 +1168,7 @@ void PopulateChromeWebUIFrameBinders( DataSharingInternalsUI>(map); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -60,7 +60,7 @@ RegisterWebUIControllerInterfaceBinder< connectors_internals::mojom::PageHandler, enterprise_connectors::ConnectorsInternalsUI>(map); -@@ -1190,7 +1190,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -1179,7 +1179,7 @@ void PopulateChromeWebUIFrameBinders( policy::DlpInternalsUI>(map); #endif @@ -68,8 +68,8 @@ +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) RegisterWebUIControllerInterfaceBinder< app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map); - #endif -@@ -1276,14 +1276,14 @@ void PopulateChromeWebUIFrameBinders( + +@@ -1278,14 +1278,14 @@ void PopulateChromeWebUIFrameBinders( page_image_service::mojom::PageImageServiceHandler, HistoryUI, HistoryClustersSidePanelUI, NewTabPageUI, BookmarksSidePanelUI>(map); @@ -86,7 +86,7 @@ WhatsNewUI, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) NewTabPageUI>(map); -@@ -1779,7 +1779,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -1794,7 +1794,7 @@ void PopulateChromeWebUIFrameBinders( #endif // BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc index 2083470a9110..62df56b2a21c 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc @@ -1,4 +1,4 @@ ---- chrome/browser/chrome_browser_main.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/chrome_browser_main.cc @@ -249,15 +249,15 @@ @@ -36,7 +36,7 @@ #include "chrome/browser/headless/headless_mode_metrics.h" // nogncheck #include "chrome/browser/headless/headless_mode_util.h" // nogncheck #include "components/headless/select_file_dialog/headless_select_file_dialog.h" -@@ -369,14 +369,14 @@ +@@ -365,14 +365,14 @@ #endif // BUILDFLAG(IS_WIN) && BUILDFLAG(USE_BROWSER_SPELLCHECKER) #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -53,7 +53,7 @@ constexpr base::FilePath::CharType kMediaHistoryDatabaseName[] = FILE_PATH_LITERAL("Media History"); -@@ -541,7 +541,7 @@ void ProcessSingletonNotificationCallbackImpl( +@@ -537,7 +537,7 @@ void ProcessSingletonNotificationCallbackImpl( } #endif @@ -62,7 +62,7 @@ // Set the global activation token sent as a command line switch by another // browser process. This also removes the switch after use to prevent any side // effects of leaving it in the command line after this point. -@@ -1118,7 +1118,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1114,7 +1114,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { browser_creator_->AddFirstRunTabs(master_prefs_->new_tabs); } @@ -71,7 +71,7 @@ // Create directory for user-level Native Messaging manifest files. This // makes it less likely that the directory will be created by third-party // software with incorrect owner or permission. See crbug.com/725513 . -@@ -1166,7 +1166,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1162,7 +1162,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -80,7 +80,7 @@ metrics::DesktopSessionDurationTracker::Initialize(); ProfileActivityMetricsRecorder::Initialize(); TouchModeStatsTracker::Initialize( -@@ -1362,7 +1362,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* +@@ -1358,7 +1358,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* #endif // BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -89,7 +89,7 @@ // Delete the media history database if it still exists. // TODO(crbug.com/40177301): Remove this. base::ThreadPool::PostTask( -@@ -1411,7 +1411,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* +@@ -1407,7 +1407,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* *UrlLanguageHistogramFactory::GetForBrowserContext(profile)); #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -98,7 +98,7 @@ if (headless::IsHeadlessMode()) { headless::ReportHeadlessActionMetrics(); } -@@ -1523,7 +1523,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl( +@@ -1516,7 +1516,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl( // In headless mode provide alternate SelectFileDialog factory overriding // any platform specific SelectFileDialog implementation that may have been // set. @@ -107,7 +107,7 @@ if (headless::IsHeadlessMode()) { headless::HeadlessSelectFileDialogFactory::SetUp(); } -@@ -2072,7 +2072,7 @@ bool ChromeBrowserMainParts::ProcessSingletonNotificat +@@ -2073,7 +2073,7 @@ bool ChromeBrowserMainParts::ProcessSingletonNotificat // Drop the request if headless mode is in effect or the request is from // a headless Chrome process. diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc index ea8a54c3ec96..f11631f62717 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc @@ -1,4 +1,4 @@ ---- chrome/browser/chrome_browser_main_linux.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/chrome_browser_main_linux.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/chrome_browser_main_linux.cc @@ -25,7 +25,7 @@ #include "device/bluetooth/dbus/bluez_dbus_thread_manager.h" @@ -9,7 +9,7 @@ #include "ui/ozone/public/ozone_platform.h" #endif -@@ -84,7 +84,9 @@ void ChromeBrowserMainPartsLinux::PostCreateMainMessag +@@ -72,7 +72,9 @@ void ChromeBrowserMainPartsLinux::PostCreateMainMessag #endif // BUILDFLAG(IS_CHROMEOS) #if !BUILDFLAG(IS_CHROMEOS) @@ -19,7 +19,7 @@ // Set up crypt config. This needs to be done before anything starts the // network service, as the raw encryption key needs to be shared with the -@@ -110,7 +112,7 @@ void ChromeBrowserMainPartsLinux::PostCreateMainMessag +@@ -98,7 +100,7 @@ void ChromeBrowserMainPartsLinux::PostCreateMainMessag ChromeBrowserMainPartsPosix::PostCreateMainMessageLoop(); } @@ -28,8 +28,8 @@ void ChromeBrowserMainPartsLinux::PostMainMessageLoopRun() { ChromeBrowserMainPartsPosix::PostMainMessageLoopRun(); ui::OzonePlatform::GetInstance()->PostMainMessageLoopRun(); -@@ -170,7 +172,7 @@ void ChromeBrowserMainPartsLinux::CheckIfSanitizeCompl - #endif // BUILDFLAG(IS_CHROMEOS_ASH) +@@ -136,7 +138,7 @@ void ChromeBrowserMainPartsLinux::PostBrowserStart() { + #endif // (defined(USE_DBUS) && !BUILDFLAG(IS_CHROMEOS)) void ChromeBrowserMainPartsLinux::PostDestroyThreads() { -#if BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc index 2c5b0919c1e3..fd06318595ce 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_content_browser_client.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -491,7 +491,7 @@ +@@ -498,7 +498,7 @@ #include "storage/browser/file_system/external_mount_points.h" // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ #include "chrome/browser/chrome_browser_main_linux.h" #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h" #elif BUILDFLAG(IS_ANDROID) -@@ -608,12 +608,12 @@ +@@ -615,12 +615,12 @@ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -24,7 +24,7 @@ #include "components/crash/core/app/crash_switches.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -624,7 +624,7 @@ +@@ -631,7 +631,7 @@ #include "chrome/browser/apps/link_capturing/web_app_link_capturing_delegate.h" #endif @@ -33,7 +33,7 @@ #include "chrome/browser/enterprise/chrome_browser_main_extra_parts_enterprise.h" #include "chrome/browser/enterprise/profile_management/oidc_auth_response_capture_navigation_throttle.h" #include "chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.h" -@@ -632,7 +632,7 @@ +@@ -640,7 +640,7 @@ #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -42,7 +42,7 @@ #include "chrome/browser/enterprise/connectors/device_trust/navigation_throttle.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || // BUILDFLAG(IS_CHROMEOS_ASH) -@@ -647,7 +647,7 @@ +@@ -655,7 +655,7 @@ #include "chrome/browser/ui/views/lens/lens_side_panel_navigation_helper.h" #endif @@ -51,7 +51,7 @@ #include "chrome/browser/chrome_browser_main_extra_parts_linux.h" #elif BUILDFLAG(IS_OZONE) #include "chrome/browser/chrome_browser_main_extra_parts_ozone.h" -@@ -1603,7 +1603,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre +@@ -1572,7 +1572,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre #if BUILDFLAG(IS_CHROMEOS) registry->RegisterBooleanPref(prefs::kNativeClientForceAllowed, false); #endif // BUILDFLAG(IS_CHROMEOS) @@ -60,7 +60,7 @@ registry->RegisterBooleanPref(prefs::kOutOfProcessSystemDnsResolutionEnabled, true); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) -@@ -1803,7 +1803,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1774,7 +1774,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo #elif BUILDFLAG(IS_CHROMEOS_LACROS) main_parts = std::make_unique<ChromeBrowserMainPartsLacros>( is_integration_test, &startup_data_); @@ -69,7 +69,7 @@ main_parts = std::make_unique<ChromeBrowserMainPartsLinux>( is_integration_test, &startup_data_); #elif BUILDFLAG(IS_ANDROID) -@@ -1837,7 +1837,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1808,7 +1808,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo std::make_unique<ChromeBrowserMainExtraPartsViewsLacros>()); // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -78,7 +78,7 @@ main_parts->AddParts( std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>()); #else -@@ -1858,7 +1858,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1829,7 +1829,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLacros>()); #endif @@ -87,7 +87,7 @@ main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>()); #elif BUILDFLAG(IS_OZONE) main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>()); -@@ -1877,7 +1877,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1848,7 +1848,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo chrome::AddMetricsExtraParts(main_parts.get()); @@ -96,7 +96,7 @@ main_parts->AddParts( std::make_unique< enterprise_util::ChromeBrowserMainExtraPartsEnterprise>()); -@@ -2749,7 +2749,9 @@ void MaybeAppendBlinkSettingsSwitchForFieldTrial( +@@ -2721,7 +2721,9 @@ void MaybeAppendBlinkSettingsSwitchForFieldTrial( void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( base::CommandLine* command_line, int child_process_id) { @@ -106,7 +106,7 @@ #if BUILDFLAG(IS_MAC) std::unique_ptr<metrics::ClientInfo> client_info = GoogleUpdateSettings::LoadMetricsClientInfo(); -@@ -2758,7 +2760,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2730,7 +2732,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin client_info->client_id); } #elif BUILDFLAG(IS_POSIX) @@ -115,7 +115,7 @@ pid_t pid; if (crash_reporter::GetHandlerSocket(nullptr, &pid)) { command_line->AppendSwitchASCII( -@@ -3117,7 +3119,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -3095,7 +3097,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin } } @@ -124,7 +124,7 @@ // Opt into a hardened stack canary mitigation if it hasn't already been // force-disabled. if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) { -@@ -4941,7 +4943,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst +@@ -4946,7 +4948,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst } } @@ -133,7 +133,25 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -5530,7 +5532,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5067,7 +5069,7 @@ std::wstring ChromeContentBrowserClient::GetAppContain + case sandbox::mojom::Sandbox::kPrintCompositor: + case sandbox::mojom::Sandbox::kAudio: + case sandbox::mojom::Sandbox::kScreenAI: +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + case sandbox::mojom::Sandbox::kVideoEffects: + #endif + case sandbox::mojom::Sandbox::kSpeechRecognition: +@@ -5172,7 +5174,7 @@ bool ChromeContentBrowserClient::PreSpawnChild( + #if !BUILDFLAG(IS_ANDROID) + case sandbox::mojom::Sandbox::kScreenAI: + #endif +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + case sandbox::mojom::Sandbox::kVideoEffects: + #endif + case sandbox::mojom::Sandbox::kAudio: +@@ -5531,7 +5533,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati &throttles); } @@ -142,7 +160,7 @@ MaybeAddThrottle( WebAppSettingsNavigationThrottle::MaybeCreateThrottleFor(handle), &throttles); -@@ -5544,7 +5546,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5548,7 +5550,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -151,7 +169,7 @@ MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle:: MaybeCreateThrottleFor(handle), &throttles); -@@ -5583,7 +5585,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5587,7 +5589,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati handle)); } @@ -160,7 +178,7 @@ MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle:: MaybeCreateThrottleFor(handle), &throttles); -@@ -7543,7 +7545,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS +@@ -7552,7 +7554,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS bool ChromeContentBrowserClient::ShouldRunOutOfProcessSystemDnsResolution() { // This enterprise policy is supported on Android, but the feature will not be // launched there. diff --git a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h index c30e0b725792..5ecbe7d61df9 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h +++ b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_content_browser_client.h.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/chrome_content_browser_client.h.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/chrome_content_browser_client.h -@@ -525,7 +525,7 @@ class ChromeContentBrowserClient : public content::Con +@@ -531,7 +531,7 @@ class ChromeContentBrowserClient : public content::Con bool IsPluginAllowedToUseDevChannelAPIs( content::BrowserContext* browser_context, const GURL& url) override; diff --git a/www/chromium/files/patch-chrome_browser_component__updater_registration.cc b/www/chromium/files/patch-chrome_browser_component__updater_registration.cc new file mode 100644 index 000000000000..b59518f0a0c1 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_component__updater_registration.cc @@ -0,0 +1,20 @@ +--- chrome/browser/component_updater/registration.cc.orig 2024-11-14 07:57:23 UTC ++++ chrome/browser/component_updater/registration.cc +@@ -82,7 +82,7 @@ + #include "media/base/media_switches.h" + #endif // !BUILDFLAG(IS_ANDROID) + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "chrome/browser/component_updater/translate_kit_component_installer.h" + #include "chrome/browser/component_updater/translate_kit_language_pack_component_installer.h" + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +@@ -232,7 +232,7 @@ void RegisterComponentsForUpdate() { + + RegisterPlusAddressBlocklistComponent(cus); + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // TODO(crbug.com/364795294): Support other platforms. + RegisterTranslateKitComponent(cus, g_browser_process->local_state(), + /*force_install=*/false, diff --git a/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc b/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc index 72b2ec93bab0..104f28b9d170 100644 --- a/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc +++ b/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/download/chrome_download_manager_delegate.cc -@@ -1796,7 +1796,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1851,7 +1851,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferredForFile( const base::FilePath& path) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -9,7 +9,7 @@ if (path.MatchesExtension(FILE_PATH_LITERAL(".pdf"))) { return !download_prefs_->ShouldOpenPdfInSystemReader(); } -@@ -1942,7 +1942,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow +@@ -1994,7 +1994,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow content::CheckDownloadAllowedCallback check_download_allowed_cb) { DCHECK_CURRENTLY_ON(BrowserThread::UI); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -18,7 +18,7 @@ // Don't download pdf if it is a file URL, as that might cause an infinite // download loop if Chrome is not the system pdf viewer. if (url.SchemeIsFile() && download_prefs_->ShouldOpenPdfInSystemReader()) { -@@ -2020,7 +2020,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl +@@ -2076,7 +2076,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl DCHECK(download_item->IsSavePackageDownload()); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/chromium/files/patch-chrome_browser_download_download__item__model.cc b/www/chromium/files/patch-chrome_browser_download_download__item__model.cc index 5c266f3ef8d1..5b0585e0fd81 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__item__model.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__item__model.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_item_model.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/download/download_item_model.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/download/download_item_model.cc -@@ -790,7 +790,7 @@ bool DownloadItemModel::IsCommandChecked( +@@ -760,7 +760,7 @@ bool DownloadItemModel::IsCommandChecked( download_crx_util::IsExtensionDownload(*download_); case DownloadCommands::ALWAYS_OPEN_TYPE: #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -9,7 +9,7 @@ if (download_commands->CanOpenPdfInSystemViewer()) { DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile()); return prefs->ShouldOpenPdfInSystemReader(); -@@ -838,7 +838,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand +@@ -808,7 +808,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand DownloadCommands::ALWAYS_OPEN_TYPE); DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile()); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -18,7 +18,7 @@ if (download_commands->CanOpenPdfInSystemViewer()) { prefs->SetShouldOpenPdfInSystemReader(!is_checked); SetShouldPreferOpeningInBrowser(is_checked); -@@ -1227,7 +1227,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe +@@ -1195,7 +1195,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe return; } diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc b/www/chromium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc index de8f48e76dcf..1e1618e8cf22 100644 --- a/www/chromium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc +++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/enterprise/connectors/connectors_service.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/enterprise/connectors/connectors_service.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/enterprise/connectors/connectors_service.cc -@@ -528,7 +528,7 @@ bool ConnectorsService::ConnectorsEnabled() const { +@@ -510,7 +510,7 @@ bool ConnectorsService::ConnectorsEnabled() const { Profile* profile = Profile::FromBrowserContext(context_); diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc b/www/chromium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc index db30b262ec4c..e3a3d20c3ae1 100644 --- a/www/chromium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc +++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc -@@ -59,7 +59,7 @@ +@@ -58,7 +58,7 @@ #include "base/strings/utf_string_conversions.h" #endif @@ -9,8 +9,8 @@ #include "chrome/browser/enterprise/signals/signals_aggregator_factory.h" #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h" #include "components/device_signals/core/browser/signals_aggregator.h" -@@ -144,7 +144,7 @@ void UploadSecurityEventReport(base::Value::Dict event - std::move(report), std::move(upload_callback)); +@@ -143,7 +143,7 @@ void UploadSecurityEventReport(base::Value::Dict event + std::move(upload_callback)); } -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) @@ -18,7 +18,7 @@ void PopulateSignals(base::Value::Dict event, policy::CloudPolicyClient* client, std::string name, -@@ -421,7 +421,7 @@ void RealtimeReportingClient::ReportPastEvent(const st +@@ -420,7 +420,7 @@ void RealtimeReportingClient::ReportPastEvent(const st /*include_profile_user_name=*/false); } @@ -27,7 +27,7 @@ void AddCrowdstrikeSignalsToEvent( base::Value::Dict& event, -@@ -480,7 +480,7 @@ void RealtimeReportingClient::ReportEventWithTimestamp +@@ -479,7 +479,7 @@ void RealtimeReportingClient::ReportEventWithTimestamp if (include_profile_user_name) { event.Set(kKeyProfileUserName, GetProfileUserName()); } @@ -36,7 +36,7 @@ Profile* profile = Profile::FromBrowserContext(context_); device_signals::SignalsAggregator* signals_aggregator = enterprise_signals::SignalsAggregatorFactory::GetForProfile(profile); -@@ -504,7 +504,7 @@ std::string RealtimeReportingClient::GetProfileUserNam +@@ -503,7 +503,7 @@ std::string RealtimeReportingClient::GetProfileUserNam std::string username = identity_manager_ ? GetProfileEmail(identity_manager_) : std::string(); diff --git a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn index ec3ba722153f..90e233f4ad7e 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn +++ b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/BUILD.gn.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/extensions/BUILD.gn.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/extensions/BUILD.gn -@@ -1499,6 +1499,10 @@ source_set("extensions") { +@@ -1439,6 +1439,10 @@ source_set("extensions") { deps += [ "//chrome/services/printing/public/mojom" ] } diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_api__browser__context__keyed__service__factories.cc b/www/chromium/files/patch-chrome_browser_extensions_api_api__browser__context__keyed__service__factories.cc index 46666c96794e..6030b84a7905 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_api__browser__context__keyed__service__factories.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_api__browser__context__keyed__service__factories.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc -@@ -41,7 +41,7 @@ +@@ -42,7 +42,7 @@ #include "pdf/buildflags.h" #include "printing/buildflags/buildflags.h" @@ -9,7 +9,7 @@ #include "chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.h" #endif -@@ -117,7 +117,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt +@@ -108,7 +108,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt extensions::SettingsPrivateEventRouterFactory::GetInstance(); extensions::SettingsOverridesAPI::GetFactoryInstance(); extensions::SidePanelService::GetFactoryInstance(); diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc index 86bbc48a6f98..8df532229ee6 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc -@@ -41,7 +41,7 @@ +@@ -42,7 +42,7 @@ #include "components/reporting/util/statusor.h" #endif @@ -9,8 +9,17 @@ #include <optional> #include "base/strings/string_util.h" -@@ -158,7 +158,7 @@ api::enterprise_reporting_private::ContextInfo ToConte - return info; +@@ -160,7 +160,7 @@ api::enterprise_reporting_private::ContextInfo ToConte + } + + bool AllowClientCertificateReportingForUsers() { +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return base::FeatureList::IsEnabled( + enterprise_signals::features::kAllowClientCertificateReportingForUsers); + #else +@@ -173,7 +173,7 @@ bool IsProfilePrefManaged(Profile* profile, std::strin + return pref && pref->IsManaged(); } -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) @@ -18,7 +27,7 @@ device_signals::SignalsAggregationRequest CreateAggregationRequest( device_signals::SignalName signal_name) { -@@ -220,7 +220,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction:: +@@ -235,7 +235,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction:: // getPersistentSecret @@ -27,7 +36,7 @@ EnterpriseReportingPrivateGetPersistentSecretFunction:: EnterpriseReportingPrivateGetPersistentSecretFunction() = default; -@@ -646,7 +646,7 @@ void EnterpriseReportingPrivateEnqueueRecordFunction:: +@@ -673,7 +673,7 @@ void EnterpriseReportingPrivateEnqueueRecordFunction:: } #endif diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_messaging_launch__context__posix.cc b/www/chromium/files/patch-chrome_browser_extensions_api_messaging_launch__context__posix.cc index 99adccb3f79c..c9db7cee9df4 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_messaging_launch__context__posix.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_messaging_launch__context__posix.cc @@ -1,11 +1,11 @@ ---- chrome/browser/extensions/api/messaging/launch_context_posix.cc.orig 2024-08-26 12:06:38 UTC +--- chrome/browser/extensions/api/messaging/launch_context_posix.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/extensions/api/messaging/launch_context_posix.cc -@@ -86,7 +86,7 @@ std::optional<LaunchContext::ProcessState> LaunchConte +@@ -84,7 +84,7 @@ std::optional<LaunchContext::ProcessState> LaunchConte - // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + options.current_directory = command_line.GetProgram().DirName(); + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Don't use no_new_privs mode, e.g. in case the host needs to use sudo. options.allow_new_privs = true; #endif diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc b/www/chromium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc index 1f5f9f3af370..9cc125497390 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc -@@ -636,7 +636,7 @@ void PasswordsPrivateDelegateImpl::OnFetchingFamilyMem +@@ -652,7 +652,7 @@ void PasswordsPrivateDelegateImpl::OnFetchingFamilyMem } void PasswordsPrivateDelegateImpl::OsReauthTimeoutCall() { diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc b/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc index 334068713fe4..f99521b9836e 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -193,7 +193,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -188,7 +188,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist (*s_allowlist)[autofill::prefs::kAutofillPaymentCardBenefits] = settings_api::PrefType::kBoolean; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ (*s_allowlist)[autofill::prefs::kAutofillPredictionImprovementsEnabled] = settings_api::PrefType::kBoolean; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || -@@ -211,7 +211,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -206,7 +206,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist (*s_allowlist)[tab_groups::prefs::kAutoPinNewTabGroups] = settings_api::PrefType::kBoolean; @@ -18,7 +18,7 @@ (*s_allowlist)[::prefs::kUseCustomChromeFrame] = settings_api::PrefType::kBoolean; #endif -@@ -223,7 +223,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -218,7 +218,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist (*s_allowlist)[::prefs::kCurrentThemeID] = settings_api::PrefType::kString; (*s_allowlist)[::prefs::kPinnedActions] = settings_api::PrefType::kList; (*s_allowlist)[::prefs::kPolicyThemeColor] = settings_api::PrefType::kNumber; diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_tabs_tabs__api.cc b/www/chromium/files/patch-chrome_browser_extensions_api_tabs_tabs__api.cc index b2f630be9b75..64e9a2e1aa70 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_tabs_tabs__api.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_tabs_tabs__api.cc @@ -1,11 +1,11 @@ ---- chrome/browser/extensions/api/tabs/tabs_api.cc.orig 2024-10-26 13:10:01 UTC +--- chrome/browser/extensions/api/tabs/tabs_api.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/extensions/api/tabs/tabs_api.cc -@@ -886,7 +886,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio - // minimized. +@@ -896,7 +896,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio + // created as minimized. // TODO(crbug.com/40254339): Remove this workaround when linux is fixed. // TODO(crbug.com/40254339): Find a fix for wayland as well. -#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11) - if (new_window->initial_show_state() == ui::SHOW_STATE_MINIMIZED) { + if (new_window->initial_show_state() == + ui::mojom::WindowShowState::kMinimized) { new_window->window()->Minimize(); - } diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc b/www/chromium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc index 56aa4680bb09..9dad62a236f8 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc.orig 2024-01-30 07:53:34 UTC +--- chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc -@@ -29,7 +29,7 @@ +@@ -28,7 +28,7 @@ #include "extensions/browser/process_manager.h" #include "extensions/common/error_utils.h" @@ -9,7 +9,7 @@ #include "extensions/common/permissions/permissions_data.h" #endif -@@ -38,7 +38,7 @@ namespace { +@@ -37,7 +37,7 @@ namespace { bool CanEnableAudioDebugRecordingsFromExtension( const extensions::Extension* extension) { bool enabled_by_permissions = false; @@ -18,7 +18,7 @@ if (extension) { enabled_by_permissions = extension->permissions_data()->active_permissions().HasAPIPermission( -@@ -576,7 +576,7 @@ void WebrtcLoggingPrivateStartEventLoggingFunction::Fi +@@ -575,7 +575,7 @@ void WebrtcLoggingPrivateStartEventLoggingFunction::Fi ExtensionFunction::ResponseAction WebrtcLoggingPrivateGetLogsDirectoryFunction::Run() { diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc b/www/chromium/files/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc index 6b493e6efd8b..d23e0b92447f 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/extensions/api/webstore_private/webstore_private_api.cc -@@ -915,7 +915,7 @@ void WebstorePrivateBeginInstallWithManifest3Function: +@@ -914,7 +914,7 @@ void WebstorePrivateBeginInstallWithManifest3Function: #if BUILDFLAG(IS_CHROMEOS) RequestExtensionApproval(contents); return; diff --git a/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc b/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc index b6cbe5cd1310..b5c871bf4b0a 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc @@ -1,15 +1,15 @@ ---- chrome/browser/extensions/external_provider_impl.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/extensions/external_provider_impl.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/extensions/external_provider_impl.cc -@@ -816,7 +816,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -792,7 +792,7 @@ void ExternalProviderImpl::CreateExternalProviders( + + #endif // BUILDFLAG(IS_CHROMEOS) if (!profile->GetPrefs()->GetBoolean(pref_names::kBlockExternalExtensions)) { - // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) provider_list->push_back(std::make_unique<ExternalProviderImpl>( service, base::MakeRefCounted<ExternalPrefLoader>( -@@ -844,7 +844,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -820,7 +820,7 @@ void ExternalProviderImpl::CreateExternalProviders( bundled_extension_creation_flags)); // Define a per-user source of external extensions. diff --git a/www/chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc b/www/chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc index ff4050efbef7..10b480da1dfd 100644 --- a/www/chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc +++ b/www/chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc @@ -1,6 +1,6 @@ ---- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc -@@ -324,7 +324,7 @@ const struct { +@@ -336,7 +336,7 @@ const struct { FILE_PATH_LITERAL("Library/Mobile Documents/com~apple~CloudDocs"), kDontBlockChildren}, #endif diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc index c6c12ab5f20a..e2dfedf71797 100644 --- a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc +++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc @@ -1,6 +1,6 @@ ---- chrome/browser/flag_descriptions.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/flag_descriptions.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/flag_descriptions.cc -@@ -458,7 +458,7 @@ const char kIsolatedSandboxedIframesDescription[] = +@@ -475,7 +475,7 @@ const char kIsolatedSandboxedIframesDescription[] = "grouping when enabled is per-site."; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,16 @@ const char kAutofillEnableAmountExtractionDesktopName[] = "Enable checkout amount extraction on Chrome desktop"; const char kAutofillEnableAmountExtractionDesktopDescription[] = -@@ -939,7 +939,7 @@ const char kDevicePostureDescription[] = +@@ -490,7 +490,7 @@ const char kAutofillEnableAndroidNKeyForFidoAuthentica + "authentication when autofilling server credit cards."; + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + const char kAutofillEnableBuyNowPayLaterForAffirmName[] = + "Enable buy now pay later on Autofill for Affirm"; + const char kAutofillEnableBuyNowPayLaterForAffirmDescription[] = +@@ -997,7 +997,7 @@ const char kDevicePostureDescription[] = "Enables Device Posture API (foldable devices)"; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -18,7 +27,7 @@ const char kDocumentPictureInPictureAnimateResizeName[] = "Document Picture-in-Picture Animate Resize"; const char kDocumentPictureInPictureAnimateResizeDescription[] = -@@ -3519,7 +3519,7 @@ const char kShowAutofillTypePredictionsDescription[] = +@@ -3515,7 +3515,7 @@ const char kShowAutofillTypePredictionsDescription[] = "text."; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -27,7 +36,7 @@ const char kShowFeaturedEnterpriseSiteSearchName[] = "Show featured Enterprise site search engines in Omnibox"; const char kShowFeaturedEnterpriseSiteSearchDescription[] = -@@ -3551,7 +3551,7 @@ const char kSiteInstanceGroupsForDataUrlsDescription[] +@@ -3547,7 +3547,7 @@ const char kSiteInstanceGroupsForDataUrlsDescription[] "but in the same SiteInstanceGroup, and thus the same process."; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -36,7 +45,16 @@ const char kSiteSearchSettingsPolicyName[] = "Enable SiteSearchSettings policy"; const char kSiteSearchSettingsPolicyDescription[] = "Allow site search engines to be defined by the SiteSearchSettings policy."; -@@ -7912,7 +7912,7 @@ const char kBlinkExtensionDiagnosticsDescription[] = +@@ -3763,7 +3763,7 @@ const char kTranslateForceTriggerOnEnglishDescription[ + "Force the Translate Triggering on English pages experiment to be enabled " + "with the selected language model active."; + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + const char kTranslationAPIName[] = "Experimental translation API"; + const char kTranslationAPIDescription[] = + "Eables the on-device language translation API. " +@@ -7824,7 +7824,7 @@ const char kBlinkExtensionDiagnosticsDescription[] = "Enable the experimental Diagnostics Blink Extension."; #endif // #if BUILDFLAG(IS_CHROMEOS_LACROS) @@ -45,7 +63,7 @@ const char kGetAllScreensMediaName[] = "GetAllScreensMedia API"; const char kGetAllScreensMediaDescription[] = "When enabled, the getAllScreensMedia API for capturing multiple screens " -@@ -8148,7 +8148,7 @@ const char kV4L2FlatStatefulVideoDecoderDescription[] +@@ -8058,7 +8058,7 @@ const char kEnableArmHwdrmDescription[] = "Enable HW b // Linux ----------------------------------------------------------------------- @@ -54,10 +72,10 @@ const char kOzonePlatformHintChoiceDefault[] = "Default"; const char kOzonePlatformHintChoiceAuto[] = "Auto"; const char kOzonePlatformHintChoiceX11[] = "X11"; -@@ -8181,6 +8181,18 @@ const char kWaylandPerWindowScalingDescription[] = - const char kWaylandTextInputV3Name[] = "Wayland text-input-v3"; - const char kWaylandTextInputV3Description[] = - "Enable Wayland's text-input-v3 experimental support."; +@@ -8098,6 +8098,18 @@ const char kWaylandUiScalingDescription[] = + "Enable experimental support for text scaling in the Wayland backend " + "backed by full UI scaling. Requires #wayland-per-window-scaling to be " + "enabled too."; + +#if BUILDFLAG(IS_BSD) +const char kAudioBackendName[] = @@ -72,8 +90,8 @@ +#endif #endif // BUILDFLAG(IS_LINUX) - // All views-based platforms -------------------------------------------------- -@@ -8207,7 +8219,7 @@ const char kZeroCopyVideoCaptureDescription[] = + // Random platform combinations ----------------------------------------------- +@@ -8110,7 +8122,7 @@ const char kZeroCopyVideoCaptureDescription[] = #endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -82,7 +100,7 @@ const char kFollowingFeedSidepanelName[] = "Following feed in the sidepanel"; const char kFollowingFeedSidepanelDescription[] = "Enables the following feed in the sidepanel."; -@@ -8220,7 +8232,7 @@ const char kTaskManagerDesktopRefreshDescription[] = +@@ -8127,7 +8139,7 @@ const char kTaskManagerDesktopRefreshDescription[] = "Enables a refreshed design for the Task Manager on Desktop platforms."; #endif // BUILDFLAG(IS_ANDROID) @@ -91,7 +109,7 @@ const char kEnableNetworkServiceSandboxName[] = "Enable the network service sandbox."; const char kEnableNetworkServiceSandboxDescription[] = -@@ -8252,7 +8264,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti +@@ -8159,7 +8171,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti "Bluetooth"; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) @@ -100,7 +118,7 @@ const char kSkipUndecryptablePasswordsName[] = "Skip undecryptable passwords to use the available decryptable " "passwords."; -@@ -8398,7 +8410,7 @@ const char kElementCaptureDescription[] = +@@ -8314,7 +8326,7 @@ const char kElementCaptureDescription[] = #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -109,8 +127,8 @@ const char kUIDebugToolsName[] = "Debugging tools for UI"; const char kUIDebugToolsDescription[] = "Enables additional keyboard shortcuts to help debugging."; -@@ -8472,7 +8484,7 @@ const char kAutofillCaretExtractionDescription[] = - "Enables passing caret position via Autofill"; +@@ -8386,7 +8398,7 @@ const char kComposeUpfrontInputModesDescription[] = + "Enables upfront input modes in the Compose dialog"; #endif // BUILDFLAG(ENABLE_COMPOSE) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) @@ -118,9 +136,9 @@ const char kThirdPartyProfileManagementName[] = "Third party profile management"; const char kThirdPartyProfileManagementDescription[] = -@@ -8561,7 +8573,7 @@ const char kEnableCertManagementV2UIDescription[] = - "chrome://settings/certificates"; - #endif // BUILDFLAG(CHROME_ROOT_STORE_CERT_MANAGEMENT_UI) +@@ -8489,7 +8501,7 @@ const char kOverlayScrollbarsOSSettingsDescription[] = + "Enable the os settings for overlay scrollbars on ChromeOS."; + #endif // BUILDFLAG(IS_CHROMEOS_ASH) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.h b/www/chromium/files/patch-chrome_browser_flag__descriptions.h index 561c21c4cad1..6a5e485a0308 100644 --- a/www/chromium/files/patch-chrome_browser_flag__descriptions.h +++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.h @@ -1,6 +1,6 @@ ---- chrome/browser/flag_descriptions.h.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/flag_descriptions.h.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/flag_descriptions.h -@@ -297,7 +297,7 @@ extern const char kImprovedSigninUIOnDesktopName[]; +@@ -293,7 +293,7 @@ extern const char kImprovedSigninUIOnDesktopName[]; extern const char kImprovedSigninUIOnDesktopDescription[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,16 @@ extern const char kAutofillEnableAmountExtractionDesktopName[]; extern const char kAutofillEnableAmountExtractionDesktopDescription[]; #endif -@@ -715,7 +715,7 @@ extern const char kDevicePostureName[]; +@@ -302,7 +302,7 @@ extern const char kAutofillEnableAndroidNKeyForFidoAut + extern const char kAutofillEnableAndroidNKeyForFidoAuthenticationDescription[]; + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + extern const char kAutofillEnableBuyNowPayLaterForAffirmName[]; + extern const char kAutofillEnableBuyNowPayLaterForAffirmDescription[]; + +@@ -737,7 +737,7 @@ extern const char kDevicePostureName[]; extern const char kDevicePostureDescription[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -18,7 +27,7 @@ extern const char kDocumentPictureInPictureAnimateResizeName[]; extern const char kDocumentPictureInPictureAnimateResizeDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || -@@ -2022,7 +2022,7 @@ extern const char kShowAutofillTypePredictionsName[]; +@@ -1998,7 +1998,7 @@ extern const char kShowAutofillTypePredictionsName[]; extern const char kShowAutofillTypePredictionsDescription[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -27,7 +36,7 @@ extern const char kShowFeaturedEnterpriseSiteSearchName[]; extern const char kShowFeaturedEnterpriseSiteSearchDescription[]; -@@ -2044,7 +2044,7 @@ extern const char kSiteInstanceGroupsForDataUrlsName[] +@@ -2020,7 +2020,7 @@ extern const char kSiteInstanceGroupsForDataUrlsName[] extern const char kSiteInstanceGroupsForDataUrlsDescription[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -36,7 +45,16 @@ extern const char kSiteSearchSettingsPolicyName[]; extern const char kSiteSearchSettingsPolicyDescription[]; -@@ -4576,7 +4576,7 @@ extern const char kBlinkExtensionDiagnosticsName[]; +@@ -2182,7 +2182,7 @@ extern const char kTouchTextEditingRedesignDescription + extern const char kTranslateForceTriggerOnEnglishName[]; + extern const char kTranslateForceTriggerOnEnglishDescription[]; + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + extern const char kTranslationAPIName[]; + extern const char kTranslationAPIDescription[]; + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +@@ -4514,7 +4514,7 @@ extern const char kBlinkExtensionDiagnosticsName[]; extern const char kBlinkExtensionDiagnosticsDescription[]; #endif // #if BUILDFLAG(IS_CHROMEOS_LACROS) @@ -45,7 +63,7 @@ extern const char kGetAllScreensMediaName[]; extern const char kGetAllScreensMediaDescription[]; #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -4713,7 +4713,7 @@ extern const char kV4L2FlatStatefulVideoDecoderDescrip +@@ -4652,7 +4652,7 @@ extern const char kEnableArmHwdrmDescription[]; // Linux --------------------------------------------------------------------- @@ -54,17 +72,17 @@ extern const char kOzonePlatformHintChoiceDefault[]; extern const char kOzonePlatformHintChoiceAuto[]; extern const char kOzonePlatformHintChoiceX11[]; -@@ -4735,6 +4735,9 @@ extern const char kWaylandPerWindowScalingDescription[ +@@ -4677,6 +4677,9 @@ extern const char kWaylandTextInputV3Description[]; - extern const char kWaylandTextInputV3Name[]; - extern const char kWaylandTextInputV3Description[]; + extern const char kWaylandUiScalingName[]; + extern const char kWaylandUiScalingDescription[]; + +extern const char kAudioBackendName[]; +extern const char kAudioBackendDescription[]; #endif // BUILDFLAG(IS_LINUX) - // All views-based platforms -------------------------------------------------- -@@ -4764,7 +4767,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa + // Random platform combinations ----------------------------------------------- +@@ -4696,7 +4699,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa extern const char kWebBluetoothConfirmPairingSupportDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) @@ -73,8 +91,8 @@ extern const char kSkipUndecryptablePasswordsName[]; extern const char kSkipUndecryptablePasswordsDescription[]; -@@ -4780,7 +4783,7 @@ extern const char kScreenlockReauthPromoCardDescriptio - #endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +@@ -4718,7 +4721,7 @@ extern const char kScreenlockReauthPromoCardDescriptio + // BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) @@ -82,7 +100,7 @@ extern const char kFollowingFeedSidepanelName[]; extern const char kFollowingFeedSidepanelDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || -@@ -4791,7 +4794,7 @@ extern const char kTaskManagerDesktopRefreshName[]; +@@ -4732,7 +4735,7 @@ extern const char kTaskManagerDesktopRefreshName[]; extern const char kTaskManagerDesktopRefreshDescription[]; #endif // BUILDFLAG(IS_ANDROID) @@ -91,7 +109,7 @@ extern const char kEnableNetworkServiceSandboxName[]; extern const char kEnableNetworkServiceSandboxDescription[]; -@@ -4888,7 +4891,7 @@ extern const char kElementCaptureDescription[]; +@@ -4829,7 +4832,7 @@ extern const char kElementCaptureDescription[]; #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -100,8 +118,8 @@ extern const char kUIDebugToolsName[]; extern const char kUIDebugToolsDescription[]; #endif -@@ -4942,7 +4945,7 @@ extern const char kAutofillCaretExtractionName[]; - extern const char kAutofillCaretExtractionDescription[]; +@@ -4880,7 +4883,7 @@ extern const char kComposeUpfrontInputModesName[]; + extern const char kComposeUpfrontInputModesDescription[]; #endif // BUILDFLAG(ENABLE_COMPOSE) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) @@ -109,9 +127,9 @@ extern const char kThirdPartyProfileManagementName[]; extern const char kThirdPartyProfileManagementDescription[]; -@@ -4998,7 +5001,7 @@ extern const char kEnableCertManagementV2UIName[]; - extern const char kEnableCertManagementV2UIDescription[]; - #endif // BUILDFLAG(CHROME_ROOT_STORE_CERT_MANAGEMENT_UI) +@@ -4946,7 +4949,7 @@ extern const char kOverlayScrollbarsOSSettingsName[]; + extern const char kOverlayScrollbarsOSSettingsDescription[]; + #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) diff --git a/www/chromium/files/patch-chrome_browser_headless_headless__mode__util.cc b/www/chromium/files/patch-chrome_browser_headless_headless__mode__util.cc index 428d84fa1c0e..a1653e5eeb41 100644 --- a/www/chromium/files/patch-chrome_browser_headless_headless__mode__util.cc +++ b/www/chromium/files/patch-chrome_browser_headless_headless__mode__util.cc @@ -1,5 +1,14 @@ ---- chrome/browser/headless/headless_mode_util.cc.orig 2024-03-22 08:19:40 UTC +--- chrome/browser/headless/headless_mode_util.cc.orig 2024-11-14 10:02:21 UTC +++ chrome/browser/headless/headless_mode_util.cc +@@ -10,7 +10,7 @@ + // New headless mode is available on Linux, Windows and Mac platforms. + // More platforms will be added later, so avoid function level clutter + // by providing stub implementations at the end of the file. +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + + #include "base/base_switches.h" + #include "base/files/file_path.h" @@ -19,7 +19,7 @@ #include "chrome/common/chrome_switches.h" #include "content/public/common/content_switches.h" @@ -9,8 +18,8 @@ #include "ui/gl/gl_switches.h" // nogncheck #include "ui/ozone/public/ozone_switches.h" // nogncheck #endif // BUILDFLAG(IS_LINUX) -@@ -87,7 +87,7 @@ class HeadlessModeHandleImpl : public HeadlessModeHand - command_line->AppendSwitchPath(switches::kUserDataDir, GetUserDataDir()); +@@ -94,7 +94,7 @@ class HeadlessModeHandleImpl : public HeadlessModeHand + } } -#if BUILDFLAG(IS_LINUX) diff --git a/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc b/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc index 24f9cfdf3393..856520781c26 100644 --- a/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc +++ b/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc @@ -1,4 +1,4 @@ ---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc @@ -88,8 +88,10 @@ @@ -30,7 +30,7 @@ #include "components/power_metrics/system_power_monitor.h" #endif -@@ -869,7 +871,7 @@ void RecordStartupMetrics() { +@@ -870,7 +872,7 @@ void RecordStartupMetrics() { // Record whether Chrome is the default browser or not. // Disabled on Linux due to hanging browser tests, see crbug.com/1216328. @@ -39,7 +39,7 @@ shell_integration::DefaultWebClientState default_state = shell_integration::GetDefaultBrowser(); base::UmaHistogramEnumeration("DefaultBrowser.State", default_state, -@@ -1177,11 +1179,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt +@@ -1182,11 +1184,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt } #endif // !BUILDFLAG(IS_ANDROID) diff --git a/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc b/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc index bc1975b75f1c..8d9b11532d54 100644 --- a/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc +++ b/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/metrics/chrome_metrics_service_client.cc -@@ -195,11 +195,11 @@ +@@ -196,11 +196,11 @@ #include "chrome/notification_helper/notification_helper_constants.h" #endif @@ -14,7 +14,7 @@ #include "chrome/browser/metrics/chrome_metrics_service_crash_reporter.h" #endif -@@ -213,7 +213,7 @@ +@@ -214,7 +214,7 @@ #include "chrome/browser/metrics/power/power_metrics_provider_mac.h" #endif @@ -23,7 +23,7 @@ #include "chrome/browser/metrics/bluetooth_metrics_provider.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -535,7 +535,7 @@ void ChromeMetricsServiceClient::RegisterPrefs(PrefReg +@@ -536,7 +536,7 @@ void ChromeMetricsServiceClient::RegisterPrefs(PrefReg #endif // BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -32,7 +32,7 @@ metrics::structured::StructuredMetricsService::RegisterPrefs(registry); #if !BUILDFLAG(IS_CHROMEOS_ASH) -@@ -707,7 +707,7 @@ void ChromeMetricsServiceClient::Initialize() { +@@ -708,7 +708,7 @@ void ChromeMetricsServiceClient::Initialize() { RegisterUKMProviders(); } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -41,7 +41,7 @@ metrics::structured::Recorder::GetInstance()->SetUiTaskRunner( base::SequencedTaskRunner::GetCurrentDefault()); #endif -@@ -758,7 +758,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -759,7 +759,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic metrics_service_->RegisterMetricsProvider( std::make_unique<metrics::CPUMetricsProvider>()); @@ -50,7 +50,7 @@ metrics_service_->RegisterMetricsProvider( std::make_unique<metrics::MotherboardMetricsProvider>()); #endif -@@ -843,7 +843,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -846,7 +846,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ @@ -59,7 +59,7 @@ metrics_service_->RegisterMetricsProvider( std::make_unique<DesktopPlatformFeaturesMetricsProvider>()); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) || -@@ -951,7 +951,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -954,7 +954,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic std::make_unique<PowerMetricsProvider>()); #endif @@ -68,7 +68,7 @@ metrics_service_->RegisterMetricsProvider( metrics::CreateDesktopSessionMetricsProvider()); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) -@@ -1138,7 +1138,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve +@@ -1141,7 +1141,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ @@ -77,7 +77,7 @@ // This creates the DesktopProfileSessionDurationsServices if it didn't exist // already. metrics::DesktopProfileSessionDurationsServiceFactory::GetForBrowserContext( -@@ -1472,7 +1472,7 @@ void ChromeMetricsServiceClient::CreateStructuredMetri +@@ -1475,7 +1475,7 @@ void ChromeMetricsServiceClient::CreateStructuredMetri recorder = base::MakeRefCounted<metrics::structured::AshStructuredMetricsRecorder>( cros_system_profile_provider_.get()); diff --git a/www/chromium/files/patch-chrome_browser_net_profile__network__context__service.cc b/www/chromium/files/patch-chrome_browser_net_profile__network__context__service.cc index 8a011460e340..aef15cad1187 100644 --- a/www/chromium/files/patch-chrome_browser_net_profile__network__context__service.cc +++ b/www/chromium/files/patch-chrome_browser_net_profile__network__context__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/net/profile_network_context_service.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/net/profile_network_context_service.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/net/profile_network_context_service.cc -@@ -140,7 +140,7 @@ +@@ -142,7 +142,7 @@ #include "chromeos/startup/browser_params_proxy.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/enterprise/client_certificates/certificate_provisioning_service_factory.h" #include "components/enterprise/client_certificates/core/certificate_provisioning_service.h" #include "components/enterprise/client_certificates/core/client_certificates_service.h" -@@ -260,7 +260,7 @@ void UpdateCookieSettings(Profile* profile, ContentSet +@@ -269,7 +269,7 @@ void UpdateCookieSettings(Profile* profile, ContentSet }); } @@ -18,7 +18,7 @@ std::unique_ptr<net::ClientCertStore> GetWrappedCertStore( Profile* profile, std::unique_ptr<net::ClientCertStore> platform_store) { -@@ -986,7 +986,7 @@ ProfileNetworkContextService::CreateClientCertStore() +@@ -1141,7 +1141,7 @@ ProfileNetworkContextService::CreateClientCertStore() store = std::make_unique<ClientCertStoreLacros>( std::move(certificate_provider), cert_db_initializer, std::move(store)); #endif // BUILDFLAG(IS_CHROMEOS_LACROS) diff --git a/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc index 82bbec961129..90ee39d5f2d9 100644 --- a/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc +++ b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc @@ -1,4 +1,4 @@ ---- chrome/browser/net/system_network_context_manager.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/net/system_network_context_manager.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/net/system_network_context_manager.cc @@ -102,7 +102,7 @@ @@ -136,7 +136,7 @@ gssapi_library_loader_observer_.Install(network_service); #endif // BUILDFLAG(IS_LINUX) -@@ -969,7 +969,7 @@ bool SystemNetworkContextManager::IsNetworkSandboxEnab +@@ -965,7 +965,7 @@ bool SystemNetworkContextManager::IsNetworkSandboxEnab break; } diff --git a/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc b/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc index bdcec2a9c38e..8e6e74a6c8d5 100644 --- a/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc +++ b/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/password_manager/chrome_password_manager_client.cc -@@ -590,7 +590,7 @@ void ChromePasswordManagerClient:: +@@ -601,7 +601,7 @@ void ChromePasswordManagerClient:: bool ChromePasswordManagerClient::IsReauthBeforeFillingRequired( device_reauth::DeviceAuthenticator* authenticator) { #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ if (!GetLocalStatePrefs() || !GetPrefs() || !authenticator) { return false; } -@@ -828,7 +828,7 @@ void ChromePasswordManagerClient::NotifyUserCredential +@@ -846,7 +846,7 @@ void ChromePasswordManagerClient::NotifyUserCredential } void ChromePasswordManagerClient::NotifyKeychainError() { diff --git a/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc b/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc index 829796fd3fe0..1a33128b57a1 100644 --- a/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc +++ b/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc @@ -1,4 +1,4 @@ ---- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc @@ -247,19 +247,19 @@ #include "components/spellcheck/browser/pref_names.h" @@ -39,7 +39,7 @@ #include "components/search_engines/enterprise/site_search_policy_handler.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) -@@ -559,7 +559,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -565,7 +565,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = { key::kDefaultDirectSocketsSetting, prefs::kManagedDefaultDirectSocketsSetting, base::Value::Type::INTEGER }, @@ -48,7 +48,7 @@ { key::kDeletingUndecryptablePasswordsEnabled, password_manager::prefs::kDeletingUndecryptablePasswordsEnabled, base::Value::Type::BOOLEAN }, -@@ -901,7 +901,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -910,7 +910,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kManagedDefaultGeolocationSetting, base::Value::Type::INTEGER }, #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \ @@ -57,7 +57,7 @@ { key::kRequireOnlineRevocationChecksForLocalAnchors, prefs::kCertRevocationCheckingRequiredLocalAnchors, base::Value::Type::BOOLEAN }, -@@ -910,7 +910,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -919,7 +919,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) // || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -66,8 +66,8 @@ { key::kFullscreenAllowed, prefs::kFullscreenAllowed, base::Value::Type::BOOLEAN }, -@@ -1738,7 +1738,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = - base::Value::Type::INTEGER}, +@@ -1753,7 +1753,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_CHROMEOS_ASH) -#if BUILDFLAG(IS_LINUX) @@ -75,7 +75,7 @@ { key::kGSSAPILibraryName, prefs::kGSSAPILibraryName, base::Value::Type::STRING }, -@@ -1797,7 +1797,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1812,7 +1812,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_WIN) @@ -84,7 +84,7 @@ { key::kNetworkServiceSandboxEnabled, prefs::kNetworkServiceSandboxEnabled, base::Value::Type::BOOLEAN }, -@@ -1823,12 +1823,12 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1838,12 +1838,12 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kTotalMemoryLimitMb, base::Value::Type::INTEGER }, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -99,7 +99,7 @@ { key::kUnmanagedDeviceSignalsConsentFlowEnabled, device_signals::prefs::kUnmanagedDeviceSignalsConsentFlowEnabled, base::Value::Type::BOOLEAN }, -@@ -1836,7 +1836,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1851,7 +1851,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kProfileSeparationDomainExceptionList, base::Value::Type::LIST }, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) @@ -108,7 +108,7 @@ { key::kDefaultBrowserSettingEnabled, prefs::kDefaultBrowserSettingEnabled, base::Value::Type::BOOLEAN }, -@@ -1848,7 +1848,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1863,7 +1863,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) \ @@ -117,7 +117,7 @@ { key::kAutoplayAllowed, prefs::kAutoplayAllowed, base::Value::Type::BOOLEAN }, -@@ -1949,7 +1949,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1964,7 +1964,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS) @@ -126,7 +126,7 @@ { key::kAlternativeBrowserPath, browser_switcher::prefs::kAlternativeBrowserPath, base::Value::Type::STRING }, -@@ -2066,7 +2066,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2075,7 +2075,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::LIST }, #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -135,7 +135,7 @@ { key::kAuthNegotiateDelegateByKdcPolicy, prefs::kAuthNegotiateDelegateByKdcPolicy, base::Value::Type::BOOLEAN }, -@@ -2145,7 +2145,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2154,7 +2154,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = ash::prefs::kUrlParameterToAutofillSAMLUsername, base::Value::Type::STRING }, #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -144,7 +144,7 @@ { key::kTabDiscardingExceptions, performance_manager::user_tuning::prefs::kManagedTabDiscardingExceptions, base::Value::Type::LIST }, -@@ -2174,7 +2174,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2183,7 +2183,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kUiAutomationProviderEnabled, base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_WIN) @@ -153,7 +153,7 @@ { key::kOutOfProcessSystemDnsResolutionEnabled, prefs::kOutOfProcessSystemDnsResolutionEnabled, base::Value::Type::BOOLEAN }, -@@ -2217,7 +2217,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2226,7 +2226,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::INTEGER }, #endif #if BUILDFLAG(ENABLE_EXTENSIONS) @@ -162,7 +162,7 @@ { key::kExtensionInstallTypeBlocklist, extensions::pref_names::kExtensionInstallTypeBlocklist, base::Value::Type::LIST}, -@@ -2240,7 +2240,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2252,7 +2252,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = { key::kTabCompareSettings, optimization_guide::prefs::kProductSpecificationsEnterprisePolicyAllowed, base::Value::Type::INTEGER}, @@ -171,7 +171,7 @@ { key::kChromeForTestingAllowed, prefs::kChromeForTestingAllowed, base::Value::Type::BOOLEAN }, -@@ -2378,7 +2378,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2394,7 +2394,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH // Policies for all platforms - End #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -180,7 +180,7 @@ handlers->AddHandler(std::make_unique<IntRangePolicyHandler>( key::kMemorySaverModeSavings, performance_manager::user_tuning::prefs::kMemorySaverModeAggressiveness, -@@ -2394,7 +2394,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2410,7 +2410,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH // BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -189,7 +189,7 @@ handlers->AddHandler( std::make_unique<SiteSearchPolicyHandler>(chrome_schema)); -@@ -2607,7 +2607,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2623,7 +2623,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -198,7 +198,7 @@ handlers->AddHandler( std::make_unique<enterprise_idle::IdleTimeoutPolicyHandler>()); handlers->AddHandler( -@@ -2660,7 +2660,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2676,7 +2676,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime, chrome_schema)); @@ -207,7 +207,7 @@ handlers->AddHandler(std::make_unique<LocalSyncPolicyHandler>()); handlers->AddHandler(std::make_unique<ThemeColorPolicyHandler>()); handlers->AddHandler( -@@ -2745,7 +2745,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2767,7 +2767,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH std::vector<std::unique_ptr<ConfigurationPolicyHandler>> signin_legacy_policies; #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -216,7 +216,7 @@ signin_legacy_policies.push_back(std::make_unique<SimplePolicyHandler>( key::kForceBrowserSignin, prefs::kForceBrowserSignin, base::Value::Type::BOOLEAN)); -@@ -3116,7 +3116,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -3139,7 +3139,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif #if BUILDFLAG(ENABLE_SPELLCHECK) @@ -225,7 +225,7 @@ handlers->AddHandler(std::make_unique<SpellcheckLanguagePolicyHandler>()); handlers->AddHandler( std::make_unique<SpellcheckLanguageBlocklistPolicyHandler>( -@@ -3124,7 +3124,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -3147,7 +3147,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) #endif // BUILDFLAG(ENABLE_SPELLCHECK) @@ -234,7 +234,7 @@ handlers->AddHandler(std::make_unique<SimplePolicyHandler>( key::kAllowSystemNotifications, prefs::kAllowSystemNotifications, base::Value::Type::BOOLEAN)); -@@ -3142,7 +3142,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -3165,7 +3165,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH first_party_sets::FirstPartySetsOverridesPolicyHandler>( key::kRelatedWebsiteSetsOverrides, chrome_schema))); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -243,7 +243,7 @@ handlers->AddHandler(std::make_unique<PrivacySandboxPolicyHandler>()); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -@@ -3165,7 +3165,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -3188,7 +3188,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH base::Value::Type::BOOLEAN))); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -252,12 +252,12 @@ handlers->AddHandler(std::make_unique<BatterySaverPolicyHandler>()); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS_ASH) -@@ -3189,7 +3189,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -3212,7 +3212,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH std::vector<GenAiDefaultSettingsPolicyHandler::GenAiPolicyDetails> gen_ai_default_policies; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS_ASH) + BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) gen_ai_default_policies.emplace_back( - key::kHelpMeWriteSettings, - optimization_guide::prefs::kComposeEnterprisePolicyAllowed); + key::kAutofillPredictionSettings, + optimization_guide::prefs:: diff --git a/www/chromium/files/patch-chrome_browser_policy_device__management__service__configuration.cc b/www/chromium/files/patch-chrome_browser_policy_device__management__service__configuration.cc index 3ae32d3c0cc6..a621338347d9 100644 --- a/www/chromium/files/patch-chrome_browser_policy_device__management__service__configuration.cc +++ b/www/chromium/files/patch-chrome_browser_policy_device__management__service__configuration.cc @@ -1,6 +1,6 @@ ---- chrome/browser/policy/device_management_service_configuration.cc.orig 2024-04-19 13:02:56 UTC +--- chrome/browser/policy/device_management_service_configuration.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/policy/device_management_service_configuration.cc -@@ -24,7 +24,7 @@ +@@ -23,7 +23,7 @@ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \ @@ -9,12 +9,3 @@ #include "chrome/browser/enterprise/connectors/common.h" #include "chrome/browser/enterprise/connectors/connectors_service.h" #endif -@@ -102,7 +102,7 @@ DeviceManagementServiceConfiguration::GetReportingConn - content::BrowserContext* context) const { - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ - ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \ -- !BUILDFLAG(IS_ANDROID)) -+ !BUILDFLAG(IS_ANDROID)) || BUILDFLAG(IS_BSD) - auto* service = - enterprise_connectors::ConnectorsServiceFactory::GetForBrowserContext( - context); diff --git a/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc b/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc index dd780031463c..cf157271162d 100644 --- a/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc +++ b/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc @@ -1,4 +1,4 @@ ---- chrome/browser/prefs/browser_prefs.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/prefs/browser_prefs.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/prefs/browser_prefs.cc @@ -313,7 +313,7 @@ #include "components/user_notes/user_notes_prefs.h" @@ -9,7 +9,7 @@ #include "chrome/browser/ui/webui/whats_new/whats_new_ui.h" #endif -@@ -491,18 +491,18 @@ +@@ -488,18 +488,18 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -31,7 +31,7 @@ #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h" #endif -@@ -537,7 +537,7 @@ +@@ -534,7 +534,7 @@ #include "chrome/browser/sessions/session_service_log.h" #endif @@ -40,7 +40,7 @@ #include "ui/color/system_theme.h" #endif -@@ -1678,7 +1678,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) +@@ -1753,7 +1753,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) on_device_translation::RegisterLocalStatePrefs(registry); #endif // BUILDFLAG(IS_ANDROID) @@ -49,7 +49,7 @@ WhatsNewUI::RegisterLocalStatePrefs(registry); #endif -@@ -1854,7 +1854,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) +@@ -1929,7 +1929,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) #endif // BUILDFLAG(ENABLE_PDF) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -58,7 +58,7 @@ registry->RegisterBooleanPref(prefs::kChromeForTestingAllowed, true); #endif -@@ -2213,12 +2213,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync +@@ -2286,12 +2286,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc b/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc index 065ab481f40e..de56bda1d713 100644 --- a/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc +++ b/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc @@ -1,6 +1,6 @@ ---- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/prefs/pref_service_incognito_allowlist.cc -@@ -198,7 +198,7 @@ const char* const kPersistentPrefNames[] = { +@@ -199,7 +199,7 @@ const char* const kPersistentPrefNames[] = { prefs::kShowFullscreenToolbar, #endif diff --git a/www/chromium/files/patch-chrome_browser_printing_print__backend__service__manager.cc b/www/chromium/files/patch-chrome_browser_printing_print__backend__service__manager.cc index 9c002e8a8cd0..338a5d180c50 100644 --- a/www/chromium/files/patch-chrome_browser_printing_print__backend__service__manager.cc +++ b/www/chromium/files/patch-chrome_browser_printing_print__backend__service__manager.cc @@ -1,4 +1,4 @@ ---- chrome/browser/printing/print_backend_service_manager.cc.orig 2024-08-26 12:06:38 UTC +--- chrome/browser/printing/print_backend_service_manager.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/printing/print_backend_service_manager.cc @@ -36,7 +36,7 @@ #include "printing/printing_context.h" @@ -9,7 +9,7 @@ #include "content/public/common/content_switches.h" #endif -@@ -877,7 +877,7 @@ PrintBackendServiceManager::GetServiceFromBundle( +@@ -884,7 +884,7 @@ PrintBackendServiceManager::GetServiceFromBundle( host.BindNewPipeAndPassReceiver(), content::ServiceProcessHost::Options() .WithDisplayName(IDS_UTILITY_PROCESS_PRINT_BACKEND_SERVICE_NAME) @@ -18,7 +18,7 @@ .WithExtraCommandLineSwitches({switches::kMessageLoopTypeUi}) #endif .Pass()); -@@ -1054,7 +1054,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate +@@ -1061,7 +1061,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate return kNoClientsRegisteredResetOnIdleTimeout; case ClientType::kQueryWithUi: diff --git a/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc b/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc index 13102dc5b58f..7888e609ce80 100644 --- a/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc +++ b/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc @@ -1,7 +1,7 @@ ---- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -347,7 +347,7 @@ - #include "chromeos/constants/chromeos_features.h" +@@ -349,7 +349,7 @@ + #include "chrome/browser/profiles/gaia_info_update_service_factory.h" #endif -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) @@ -9,12 +9,12 @@ #include "chrome/browser/policy/messaging_layer/util/manual_test_heartbeat_event_factory.h" #endif -@@ -440,18 +440,18 @@ +@@ -429,18 +429,18 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS_ASH) -+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.h" #include "chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.h" #include "chrome/browser/enterprise/signals/user_permission_service_factory.h" @@ -31,7 +31,7 @@ #include "chrome/browser/browser_switcher/browser_switcher_service_factory.h" #include "chrome/browser/enterprise/client_certificates/certificate_provisioning_service_factory.h" #include "chrome/browser/enterprise/client_certificates/certificate_store_factory.h" -@@ -706,7 +706,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -700,7 +700,7 @@ void ChromeBrowserMainExtraPartsProfiles:: DiceBoundSessionCookieServiceFactory::GetInstance(); #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) #endif // BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS) @@ -40,16 +40,16 @@ browser_switcher::BrowserSwitcherServiceFactory::GetInstance(); #endif browser_sync::UserEventServiceFactory::GetInstance(); -@@ -839,7 +839,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -809,7 +809,7 @@ void ChromeBrowserMainExtraPartsProfiles:: enterprise_connectors::ConnectorsServiceFactory::GetInstance(); #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS_ASH) -+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) enterprise_connectors::DeviceTrustConnectorServiceFactory::GetInstance(); enterprise_connectors::DeviceTrustServiceFactory::GetInstance(); #endif -@@ -847,25 +847,25 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -817,25 +817,25 @@ void ChromeBrowserMainExtraPartsProfiles:: enterprise_connectors::ExtensionInstallEventRouterFactory::GetInstance(); enterprise_connectors::ExtensionTelemetryEventRouterFactory::GetInstance(); #endif @@ -62,7 +62,7 @@ + BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) enterprise_idle::IdleServiceFactory::GetInstance(); #endif - #if !BUILDFLAG(IS_CHROMEOS_ASH) + #if !BUILDFLAG(IS_CHROMEOS) enterprise_reporting::CloudProfileReportingServiceFactory::GetInstance(); #endif enterprise_reporting::LegacyTechServiceFactory::GetInstance(); @@ -71,8 +71,8 @@ enterprise_signals::SignalsAggregatorFactory::GetInstance(); #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS_ASH) -+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) enterprise_signals::UserPermissionServiceFactory::GetInstance(); #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) @@ -80,16 +80,16 @@ enterprise_signin::EnterpriseSigninServiceFactory::GetInstance(); #endif #if BUILDFLAG(ENABLE_SESSION_SERVICE) -@@ -995,7 +995,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -958,7 +958,7 @@ void ChromeBrowserMainExtraPartsProfiles:: + #if BUILDFLAG(IS_ANDROID) + MerchantViewerDataManagerFactory::GetInstance(); #endif - // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ - (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance(); #endif -@@ -1100,7 +1100,7 @@ void ChromeBrowserMainExtraPartsProfiles:: + NavigationPredictorKeyedServiceFactory::GetInstance(); +@@ -1060,7 +1060,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #if BUILDFLAG(IS_CHROMEOS) policy::PolicyCertServiceFactory::GetInstance(); #endif @@ -98,8 +98,8 @@ policy::ProfileTokenPolicyWebSigninServiceFactory::GetInstance(); policy::UserPolicyOidcSigninServiceFactory::GetInstance(); #endif -@@ -1149,7 +1149,7 @@ void ChromeBrowserMainExtraPartsProfiles:: - #if !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_ANDROID) +@@ -1108,7 +1108,7 @@ void ChromeBrowserMainExtraPartsProfiles:: + #if !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_ANDROID) ProfileStatisticsFactory::GetInstance(); #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) @@ -107,7 +107,7 @@ ProfileTokenWebSigninInterceptorFactory::GetInstance(); OidcAuthenticationSigninInterceptorFactory::GetInstance(); #endif -@@ -1168,7 +1168,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -1127,7 +1127,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #endif ReduceAcceptLanguageFactory::GetInstance(); RendererUpdaterFactory::GetInstance(); @@ -115,4 +115,4 @@ +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) reporting::ManualTestHeartbeatEventFactory::GetInstance(); #endif - #if BUILDFLAG(IS_CHROMEOS_LACROS) + #if !BUILDFLAG(IS_ANDROID) diff --git a/www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc b/www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc index 826b9afe98e6..5abac23c8afa 100644 --- a/www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc +++ b/www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/profiles/profile_impl.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/profiles/profile_impl.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/profiles/profile_impl.cc -@@ -267,6 +267,10 @@ +@@ -263,6 +263,10 @@ #include "chrome/browser/spellchecker/spellcheck_service.h" #endif @@ -11,16 +11,16 @@ using bookmarks::BookmarkModel; using content::BrowserThread; using content::DownloadManagerDelegate; -@@ -603,7 +607,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async - #else +@@ -573,7 +577,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async + policy_provider = GetUserCloudPolicyManagerAsh(); + #else // !BUILDFLAG(IS_CHROMEOS) { - #endif // BUILDFLAG(IS_CHROMEOS_LACROS) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) ProfileManager* profile_manager = g_browser_process->profile_manager(); ProfileAttributesEntry* entry = profile_manager->GetProfileAttributesStorage() -@@ -908,7 +912,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) +@@ -886,7 +890,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) } base::FilePath ProfileImpl::last_selected_directory() { diff --git a/www/chromium/files/patch-chrome_browser_profiles_profiles__state.cc b/www/chromium/files/patch-chrome_browser_profiles_profiles__state.cc index 48fb82f712bf..53fda794231f 100644 --- a/www/chromium/files/patch-chrome_browser_profiles_profiles__state.cc +++ b/www/chromium/files/patch-chrome_browser_profiles_profiles__state.cc @@ -1,6 +1,6 @@ ---- chrome/browser/profiles/profiles_state.cc.orig 2024-07-30 11:12:21 UTC +--- chrome/browser/profiles/profiles_state.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/profiles/profiles_state.cc -@@ -196,7 +196,7 @@ bool IsGuestModeRequested(const base::CommandLine& com +@@ -190,7 +190,7 @@ bool IsGuestModeRequested(const base::CommandLine& com PrefService* local_state, bool show_warning) { #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ @@ -9,7 +9,7 @@ DCHECK(local_state); // Check if guest mode enforcement commandline switch or policy are provided. -@@ -243,7 +243,7 @@ bool IsGuestModeEnabled() { +@@ -226,7 +226,7 @@ bool IsGuestModeEnabled() { return false; } @@ -18,7 +18,7 @@ // If there are any supervised profiles, disable guest mode. if (base::FeatureList::IsEnabled( supervised_user::kHideGuestModeForSupervisedUsers) && -@@ -259,7 +259,7 @@ bool IsGuestModeEnabled() { +@@ -245,7 +245,7 @@ bool IsGuestModeEnabled() { } bool IsGuestModeEnabled(const Profile& profile) { diff --git a/www/chromium/files/patch-chrome_browser_safe__browsing_chrome__password__protection__service.cc b/www/chromium/files/patch-chrome_browser_safe__browsing_chrome__password__protection__service.cc new file mode 100644 index 000000000000..dcbdc94863f5 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_safe__browsing_chrome__password__protection__service.cc @@ -0,0 +1,11 @@ +--- chrome/browser/safe_browsing/chrome_password_protection_service.cc.orig 2024-11-14 07:57:23 UTC ++++ chrome/browser/safe_browsing/chrome_password_protection_service.cc +@@ -1250,7 +1250,7 @@ std::string ChromePasswordProtectionService::GetOrgani + ReusedPasswordAccountType password_type) const { + if (base::FeatureList::IsEnabled( + safe_browsing::kEnterprisePasswordReuseUiRefresh)) { +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return GetPrefs()->GetString(prefs::kEnterpriseCustomLabel); + #else + return std::string(); diff --git a/www/chromium/files/patch-chrome_browser_screen__ai_screen__ai__install__state.cc b/www/chromium/files/patch-chrome_browser_screen__ai_screen__ai__install__state.cc index e5398efea0ba..5475e488665a 100644 --- a/www/chromium/files/patch-chrome_browser_screen__ai_screen__ai__install__state.cc +++ b/www/chromium/files/patch-chrome_browser_screen__ai_screen__ai__install__state.cc @@ -1,6 +1,6 @@ ---- chrome/browser/screen_ai/screen_ai_install_state.cc.orig 2024-07-30 11:12:21 UTC +--- chrome/browser/screen_ai/screen_ai_install_state.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/screen_ai/screen_ai_install_state.cc -@@ -17,7 +17,7 @@ +@@ -16,7 +16,7 @@ #include "services/screen_ai/public/cpp/utilities.h" #include "ui/accessibility/accessibility_features.h" @@ -9,7 +9,7 @@ #include "base/cpu.h" #include "base/files/file_util.h" #endif -@@ -27,7 +27,7 @@ const int kScreenAICleanUpDelayInDays = 30; +@@ -26,7 +26,7 @@ const int kScreenAICleanUpDelayInDays = 30; const char kMinExpectedVersion[] = "124.2"; bool IsDeviceCompatible() { diff --git a/www/chromium/files/patch-chrome_browser_sessions_session__restore.cc b/www/chromium/files/patch-chrome_browser_sessions_session__restore.cc index e4c6a4cd8fb6..82caa0aef14e 100644 --- a/www/chromium/files/patch-chrome_browser_sessions_session__restore.cc +++ b/www/chromium/files/patch-chrome_browser_sessions_session__restore.cc @@ -1,8 +1,6 @@ -diff --git chrome/browser/sessions/session_restore.cc chrome/browser/sessions/session_restore.cc 2024-11-02 08:11:27 UTC -index 04610ad2c0..175c381644 100644 ---- chrome/browser/sessions/session_restore.cc +--- chrome/browser/sessions/session_restore.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/sessions/session_restore.cc -@@ -103,7 +103,7 @@ +@@ -102,7 +102,7 @@ #include "chrome/browser/web_applications/web_app_registrar.h" #endif // BUILDFLAG(IS_CHROMEOS) @@ -11,7 +9,7 @@ index 04610ad2c0..175c381644 100644 #include "chrome/browser/ui/webui/whats_new/whats_new_fetcher.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -1081,7 +1081,7 @@ class SessionRestoreImpl : public BrowserListObserver { +@@ -1093,7 +1093,7 @@ class SessionRestoreImpl : public BrowserListObserver bool is_first_tab = true; for (const auto& startup_tab : startup_tabs) { const GURL& url = startup_tab.url; diff --git a/www/chromium/files/patch-chrome_browser_supervised__user_classify__url__navigation__throttle.cc b/www/chromium/files/patch-chrome_browser_supervised__user_classify__url__navigation__throttle.cc new file mode 100644 index 000000000000..0e7aaff8915d --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_supervised__user_classify__url__navigation__throttle.cc @@ -0,0 +1,11 @@ +--- chrome/browser/supervised_user/classify_url_navigation_throttle.cc.orig 2024-11-14 07:57:23 UTC ++++ chrome/browser/supervised_user/classify_url_navigation_throttle.cc +@@ -219,7 +219,7 @@ void ClassifyUrlNavigationThrottle::OnInterstitialResu + case SupervisedUserNavigationThrottle::kCancelWithInterstitial: { + CHECK(navigation_handle()); + // LINT.IfChange(cancel_with_interstitial) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + if (ShouldShowReAuthInterstitial(*navigation_handle(), is_main_frame)) { + // Show the re-authentication interstitial if the user signed out of + // the content area, as parent's approval requires authentication. diff --git a/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__browser__utils.cc b/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__browser__utils.cc index b93dcb83d0bd..5bd618376549 100644 --- a/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__browser__utils.cc +++ b/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__browser__utils.cc @@ -1,20 +1,20 @@ ---- chrome/browser/supervised_user/supervised_user_browser_utils.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/supervised_user/supervised_user_browser_utils.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/supervised_user/supervised_user_browser_utils.cc -@@ -42,7 +42,7 @@ +@@ -40,7 +40,7 @@ + #include "chrome/browser/ash/profiles/profile_helper.h" + #include "components/user_manager/user.h" #include "components/user_manager/user_type.h" - #elif BUILDFLAG(IS_CHROMEOS_LACROS) - #include "chromeos/startup/browser_params_proxy.h" -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) #include "chrome/browser/supervised_user/supervised_user_verification_controller_client.h" - #include "chrome/browser/supervised_user/supervised_user_verification_page.h" - #endif -@@ -165,7 +165,7 @@ void AssertChildStatusOfTheUser(Profile* profile, bool + #include "chrome/browser/supervised_user/supervised_user_verification_page_blocked_sites.h" + #include "chrome/browser/supervised_user/supervised_user_verification_page_youtube.h" +@@ -158,7 +158,7 @@ void AssertChildStatusOfTheUser(Profile* profile, bool #endif } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - std::string CreateReauthenticationInterstitial( - content::NavigationHandle& navigation_handle, - SupervisedUserVerificationPage::VerificationPurpose verification_purpose) { + std::string CreateReauthenticationInterstitialForYouTube( + content::NavigationHandle& navigation_handle) { + content::WebContents* web_contents = navigation_handle.GetWebContents(); diff --git a/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__browser__utils.h b/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__browser__utils.h index f7c24935bb1a..25dc67f21f8b 100644 --- a/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__browser__utils.h +++ b/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__browser__utils.h @@ -1,15 +1,6 @@ ---- chrome/browser/supervised_user/supervised_user_browser_utils.h.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/supervised_user/supervised_user_browser_utils.h.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/supervised_user/supervised_user_browser_utils.h -@@ -11,7 +11,7 @@ - #include "content/public/browser/web_contents.h" - #include "url/gurl.h" - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - #include "chrome/browser/supervised_user/supervised_user_verification_page.h" - #endif - -@@ -55,7 +55,7 @@ std::string GetAccountGivenName(Profile& profile); +@@ -52,7 +52,7 @@ std::string GetAccountGivenName(Profile& profile); // of the user. void AssertChildStatusOfTheUser(Profile* profile, bool is_child); @@ -17,4 +8,4 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) // Returns the html content of the reauthentication interstitial for blocked // sites. This interstitial is associated with the given NavigationHandle. - std::string CreateReauthenticationInterstitial( + std::string CreateReauthenticationInterstitialForBlockedSites( diff --git a/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc b/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc index 7d38dcd88db4..592754647d45 100644 --- a/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc +++ b/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/supervised_user/supervised_user_extensions_manager.cc.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/supervised_user/supervised_user_extensions_manager.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/supervised_user/supervised_user_extensions_manager.cc -@@ -359,7 +359,7 @@ void SupervisedUserExtensionsManager:: +@@ -357,7 +357,7 @@ void SupervisedUserExtensionsManager:: ActivateManagementPolicyAndUpdateRegistration() { SetActiveForSupervisedUsers(); UpdateManagementPolicyRegistration(); @@ -9,7 +9,7 @@ MaybeMarkExtensionsLocallyParentApproved(); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) } -@@ -477,7 +477,7 @@ bool SupervisedUserExtensionsManager::ShouldBlockExten +@@ -475,7 +475,7 @@ bool SupervisedUserExtensionsManager::ShouldBlockExten return false; } diff --git a/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc b/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc index 20305c24b76a..0bd5050de2e2 100644 --- a/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc +++ b/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc @@ -1,6 +1,6 @@ ---- chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.cc.orig 2024-11-06 12:34:11 UTC +--- chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.cc -@@ -31,7 +31,7 @@ +@@ -32,7 +32,7 @@ #include "chrome/browser/supervised_user/child_accounts/child_account_service_android.h" #include "components/signin/public/identity_manager/identity_manager.h" #include "ui/android/view_android.h" @@ -9,7 +9,7 @@ #include "chrome/browser/supervised_user/supervised_user_verification_controller_client.h" #include "chrome/browser/supervised_user/supervised_user_verification_page.h" #endif -@@ -147,7 +147,7 @@ SupervisedUserGoogleAuthNavigationThrottle::ShouldProc +@@ -148,7 +148,7 @@ SupervisedUserGoogleAuthNavigationThrottle::ShouldProc return content::NavigationThrottle::DEFER; } diff --git a/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__navigation__throttle.cc b/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__navigation__throttle.cc index 29c21184297c..aed93948955f 100644 --- a/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__navigation__throttle.cc +++ b/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__navigation__throttle.cc @@ -1,20 +1,20 @@ ---- chrome/browser/supervised_user/supervised_user_navigation_throttle.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/supervised_user/supervised_user_navigation_throttle.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/supervised_user/supervised_user_navigation_throttle.cc -@@ -201,7 +201,7 @@ void SupervisedUserNavigationThrottle::OnCheckDone( - } - } - +@@ -213,7 +213,7 @@ void SupervisedUserNavigationThrottle::OnInterstitialR + case kCancelWithInterstitial: { + CHECK(navigation_handle()); + // LINT.IfChange(cancel_with_interstitial) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - SupervisedUserVerificationPage::VerificationPurpose - GetVerificationPurposeFromFilteringReason( - supervised_user::FilteringBehaviorReason reason) { -@@ -235,7 +235,7 @@ void SupervisedUserNavigationThrottle::OnInterstitialR - Profile* profile = Profile::FromBrowserContext( - navigation_handle()->GetWebContents()->GetBrowserContext()); + if (supervised_user::ShouldShowReAuthInterstitial(*navigation_handle(), + is_main_frame)) { + // Show the re-authentication interstitial if the user signed out of +@@ -244,7 +244,7 @@ void SupervisedUserNavigationThrottle::OnInterstitialR + } + namespace supervised_user { -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - supervised_user::ChildAccountService* child_account_service = - ChildAccountServiceFactory::GetForProfile(profile); - if (base::FeatureList::IsEnabled( + + bool ShouldShowReAuthInterstitial(content::NavigationHandle& navigation_handle, + bool is_main_frame) { diff --git a/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__navigation__throttle.h b/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__navigation__throttle.h new file mode 100644 index 000000000000..2f12955fcffe --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__navigation__throttle.h @@ -0,0 +1,11 @@ +--- chrome/browser/supervised_user/supervised_user_navigation_throttle.h.orig 2024-11-14 07:57:23 UTC ++++ chrome/browser/supervised_user/supervised_user_navigation_throttle.h +@@ -22,7 +22,7 @@ + class Profile; + + namespace supervised_user { +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + bool ShouldShowReAuthInterstitial(content::NavigationHandle& navigation_handle, + bool is_main_frame); + #endif diff --git a/www/chromium/files/patch-chrome_browser_sync_sync__service__factory.cc b/www/chromium/files/patch-chrome_browser_sync_sync__service__factory.cc index f2df83cee4b9..0ecbc22b7e36 100644 --- a/www/chromium/files/patch-chrome_browser_sync_sync__service__factory.cc +++ b/www/chromium/files/patch-chrome_browser_sync_sync__service__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/sync/sync_service_factory.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/sync/sync_service_factory.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/sync/sync_service_factory.cc -@@ -105,7 +105,7 @@ +@@ -109,7 +109,7 @@ #endif // BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -9,7 +9,7 @@ #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_keyed_service.h" #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_service_factory.h" #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_utils.h" -@@ -153,7 +153,7 @@ syncer::DataTypeSet GetDisabledCommonDataTypes() { +@@ -157,7 +157,7 @@ syncer::DataTypeSet GetDisabledCommonDataTypes() { tab_groups::TabGroupSyncService* GetTabGroupSyncService(Profile* profile) { CHECK(profile); #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -18,7 +18,7 @@ tab_groups::TabGroupSyncService* service = tab_groups::SavedTabGroupUtils::GetServiceForProfile(profile); CHECK(service); -@@ -381,7 +381,7 @@ std::unique_ptr<KeyedService> BuildSyncService( +@@ -395,7 +395,7 @@ std::unique_ptr<KeyedService> BuildSyncService( // included in lacros-chrome once build flag switch of lacros-chrome is // complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ @@ -27,7 +27,7 @@ syncer::SyncPrefs prefs(profile->GetPrefs()); local_sync_backend_enabled = prefs.IsLocalSyncEnabled(); base::UmaHistogramBoolean("Sync.Local.Enabled2", local_sync_backend_enabled); -@@ -517,7 +517,7 @@ SyncServiceFactory::SyncServiceFactory() +@@ -531,7 +531,7 @@ SyncServiceFactory::SyncServiceFactory() DependsOn(ProfilePasswordStoreFactory::GetInstance()); DependsOn(PowerBookmarkServiceFactory::GetInstance()); #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ diff --git a/www/chromium/files/patch-chrome_browser_tab__group__sync_tab__group__sync__service__factory.cc b/www/chromium/files/patch-chrome_browser_tab__group__sync_tab__group__sync__service__factory.cc index a939a693bb69..d2f8c605919b 100644 --- a/www/chromium/files/patch-chrome_browser_tab__group__sync_tab__group__sync__service__factory.cc +++ b/www/chromium/files/patch-chrome_browser_tab__group__sync_tab__group__sync__service__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/tab_group_sync/tab_group_sync_service_factory.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/tab_group_sync/tab_group_sync_service_factory.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/tab_group_sync/tab_group_sync_service_factory.cc -@@ -30,7 +30,7 @@ +@@ -31,7 +31,7 @@ #include "components/sync_device_info/device_info_sync_service.h" #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -9,7 +9,7 @@ #include "chrome/browser/ui/tabs/saved_tab_groups/tab_group_sync_delegate_desktop.h" #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || // BUILDFLAG(IS_WIN) -@@ -110,7 +110,7 @@ TabGroupSyncServiceFactory::BuildServiceInstanceForBro +@@ -89,7 +89,7 @@ TabGroupSyncServiceFactory::BuildServiceInstanceForBro std::unique_ptr<TabGroupSyncDelegate> delegate; #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ diff --git a/www/chromium/files/patch-chrome_browser_ui_actions_chrome__action__id.h b/www/chromium/files/patch-chrome_browser_ui_actions_chrome__action__id.h index e9c3f3d9759d..b2f35a3fcca5 100644 --- a/www/chromium/files/patch-chrome_browser_ui_actions_chrome__action__id.h +++ b/www/chromium/files/patch-chrome_browser_ui_actions_chrome__action__id.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/actions/chrome_action_id.h.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/ui/actions/chrome_action_id.h.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/ui/actions/chrome_action_id.h -@@ -511,7 +511,7 @@ +@@ -513,7 +513,7 @@ IDC_CONTENT_CONTEXT_QUICK_ANSWERS_INLINE_ANSWER) \ E(kActionContentContextQuickAnswersInlineQuery, \ IDC_CONTENT_CONTEXT_QUICK_ANSWERS_INLINE_QUERY) diff --git a/www/chromium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.cc b/www/chromium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.cc index d8b40c1169c7..82566393a25d 100644 --- a/www/chromium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.cc +++ b/www/chromium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/autofill/payments/desktop_payments_window_manager.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/ui/autofill/payments/desktop_payments_window_manager.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/ui/autofill/payments/desktop_payments_window_manager.cc -@@ -48,7 +48,7 @@ gfx::Rect GetPopupSizeForVcn3ds() { +@@ -49,7 +49,7 @@ gfx::Rect GetPopupSizeForVcn3ds() { DesktopPaymentsWindowManager::DesktopPaymentsWindowManager( ContentAutofillClient* client) : client_(CHECK_DEREF(client)) { @@ -9,7 +9,7 @@ scoped_observation_.Observe(BrowserList::GetInstance()); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) } -@@ -108,7 +108,7 @@ void DesktopPaymentsWindowManager::WebContentsDestroye +@@ -109,7 +109,7 @@ void DesktopPaymentsWindowManager::WebContentsDestroye } } diff --git a/www/chromium/files/patch-chrome_browser_ui_browser.h b/www/chromium/files/patch-chrome_browser_ui_browser.h index 5fad31246aa2..cb0f3be73b0a 100644 --- a/www/chromium/files/patch-chrome_browser_ui_browser.h +++ b/www/chromium/files/patch-chrome_browser_ui_browser.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/browser.h.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/ui/browser.h.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/ui/browser.h -@@ -299,7 +299,7 @@ class Browser : public TabStripModelObserver, +@@ -302,7 +302,7 @@ class Browser : public TabStripModelObserver, std::optional<int64_t> display_id; #endif diff --git a/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc b/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc index 480db67e2275..4dcbbf6333aa 100644 --- a/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc +++ b/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/browser_command_controller.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/ui/browser_command_controller.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/ui/browser_command_controller.cc -@@ -129,7 +129,7 @@ +@@ -127,7 +127,7 @@ #include "components/user_manager/user_manager.h" #endif @@ -9,7 +9,7 @@ #include "ui/base/ime/text_input_flags.h" #include "ui/linux/linux_ui.h" #endif -@@ -138,7 +138,7 @@ +@@ -136,7 +136,7 @@ #include "ui/ozone/public/ozone_platform.h" #endif @@ -18,7 +18,7 @@ #include "chrome/browser/ui/shortcuts/desktop_shortcuts_utils.h" #endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -@@ -319,7 +319,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( +@@ -317,7 +317,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( #endif } @@ -27,7 +27,7 @@ // If this key was registered by the user as a content editing hotkey, then // it is not reserved. auto* linux_ui = ui::LinuxUi::instance(); -@@ -574,7 +574,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -572,7 +572,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -36,7 +36,7 @@ case IDC_MINIMIZE_WINDOW: browser_->window()->Minimize(); break; -@@ -586,7 +586,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -584,7 +584,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo break; #endif @@ -45,7 +45,7 @@ case IDC_USE_SYSTEM_TITLE_BAR: { PrefService* prefs = profile()->GetPrefs(); prefs->SetBoolean(prefs::kUseCustomChromeFrame, -@@ -787,7 +787,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -788,7 +788,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo break; case IDC_CREATE_SHORTCUT: base::RecordAction(base::UserMetricsAction("CreateShortcut")); @@ -54,7 +54,7 @@ if (base::FeatureList::IsEnabled(features::kShortcutsNotApps)) { chrome::CreateDesktopShortcutForActiveWebContents(browser_); } else { -@@ -1265,12 +1265,12 @@ void BrowserCommandController::InitCommandState() { +@@ -1267,12 +1267,12 @@ void BrowserCommandController::InitCommandState() { #endif // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -69,7 +69,7 @@ bool use_system_title_bar = true; #if BUILDFLAG(IS_OZONE) use_system_title_bar = ui::OzonePlatform::GetInstance() -@@ -1601,7 +1601,7 @@ void BrowserCommandController::UpdateCommandsForTabSta +@@ -1603,7 +1603,7 @@ void BrowserCommandController::UpdateCommandsForTabSta bool can_create_web_app = web_app::CanCreateWebApp(browser_); command_updater_.UpdateCommandEnabled(IDC_INSTALL_PWA, can_create_web_app); diff --git a/www/chromium/files/patch-chrome_browser_ui_browser__commands.cc b/www/chromium/files/patch-chrome_browser_ui_browser__commands.cc index f047cf3d1c12..2c64f94861f5 100644 --- a/www/chromium/files/patch-chrome_browser_ui_browser__commands.cc +++ b/www/chromium/files/patch-chrome_browser_ui_browser__commands.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/browser_commands.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/ui/browser_commands.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/ui/browser_commands.cc -@@ -2036,7 +2036,7 @@ void OpenUpdateChromeDialog(Browser* browser) { +@@ -2035,7 +2035,7 @@ void OpenUpdateChromeDialog(Browser* browser) { } else if (UpgradeDetector::GetInstance()->is_outdated_install_no_au()) { UpgradeDetector::GetInstance()->NotifyOutdatedInstallNoAutoUpdate(); } else { diff --git a/www/chromium/files/patch-chrome_browser_ui_browser__ui__prefs.cc b/www/chromium/files/patch-chrome_browser_ui_browser__ui__prefs.cc index b743bf466499..c3d7e12b9e47 100644 --- a/www/chromium/files/patch-chrome_browser_ui_browser__ui__prefs.cc +++ b/www/chromium/files/patch-chrome_browser_ui_browser__ui__prefs.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/browser_ui_prefs.cc.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/ui/browser_ui_prefs.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/ui/browser_ui_prefs.cc -@@ -74,7 +74,7 @@ void RegisterBrowserPrefs(PrefRegistrySimple* registry +@@ -72,7 +72,7 @@ void RegisterBrowserPrefs(PrefRegistrySimple* registry registry->RegisterIntegerPref(prefs::kDefaultBrowserDeclinedCount, 0); registry->RegisterTimePref(prefs::kDefaultBrowserFirstShownTime, base::Time()); @@ -9,7 +9,7 @@ registry->RegisterStringPref(prefs::kEnterpriseCustomLabel, std::string()); registry->RegisterStringPref(prefs::kEnterpriseLogoUrl, std::string()); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -@@ -184,7 +184,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistry +@@ -182,7 +182,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistry registry->RegisterDictionaryPref(prefs::kHttpsUpgradeFallbacks); registry->RegisterDictionaryPref(prefs::kHttpsUpgradeNavigations); registry->RegisterBooleanPref(prefs::kHttpsOnlyModeAutoEnabled, false); @@ -17,4 +17,4 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) registry->RegisterStringPref(prefs::kEnterpriseLogoUrl, std::string()); registry->RegisterStringPref(prefs::kEnterpriseCustomLabel, std::string()); - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) + registry->RegisterStringPref(prefs::kEnterpriseLogoUrlForProfile, diff --git a/www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc b/www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc index 312d5945716a..bcc1f940789d 100644 --- a/www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc +++ b/www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/chrome_pages.cc.orig 2024-08-26 12:06:38 UTC +--- chrome/browser/ui/chrome_pages.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/ui/chrome_pages.cc @@ -87,7 +87,7 @@ #include "components/signin/public/identity_manager/identity_manager.h" @@ -18,7 +18,7 @@ void ShowChromeWhatsNew(Browser* browser) { ShowSingletonTab(browser, GURL(kChromeUIWhatsNewURL)); } -@@ -722,7 +722,7 @@ void ShowShortcutCustomizationApp(Profile* profile, +@@ -726,7 +726,7 @@ void ShowShortcutCustomizationApp(Profile* profile, #endif // BUILDFLAG(IS_CHROMEOS_ASH) } diff --git a/www/chromium/files/patch-chrome_browser_ui_chrome__pages.h b/www/chromium/files/patch-chrome_browser_ui_chrome__pages.h index 00db2048b23a..2044b480d9de 100644 --- a/www/chromium/files/patch-chrome_browser_ui_chrome__pages.h +++ b/www/chromium/files/patch-chrome_browser_ui_chrome__pages.h @@ -1,4 +1,4 @@ ---- chrome/browser/ui/chrome_pages.h.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/ui/chrome_pages.h.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/ui/chrome_pages.h @@ -39,7 +39,7 @@ namespace signin { enum class ConsentLevel; @@ -9,7 +9,7 @@ namespace web_app { enum class AppSettingsPageEntryPoint; } // namespace web_app -@@ -174,7 +174,7 @@ void ShowShortcutCustomizationApp(Profile* profile, +@@ -176,7 +176,7 @@ void ShowShortcutCustomizationApp(Profile* profile, const std::string& category); #endif diff --git a/www/chromium/files/patch-chrome_browser_ui_managed__ui.cc b/www/chromium/files/patch-chrome_browser_ui_managed__ui.cc index 4bc1e0f7642b..a88558d8c803 100644 --- a/www/chromium/files/patch-chrome_browser_ui_managed__ui.cc +++ b/www/chromium/files/patch-chrome_browser_ui_managed__ui.cc @@ -1,20 +1,20 @@ ---- chrome/browser/ui/managed_ui.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/ui/managed_ui.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/ui/managed_ui.cc -@@ -435,7 +435,7 @@ std::optional<std::string> GetDeviceManagerIdentity() +@@ -439,7 +439,7 @@ std::optional<std::string> GetDeviceManagerIdentity() g_browser_process->platform_part()->browser_policy_connector_ash(); return connector->GetEnterpriseDomainManager(); #else -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - std::string custom_management_label = - g_browser_process->local_state() - ? g_browser_process->local_state()->GetString( -@@ -469,7 +469,7 @@ std::optional<std::string> GetAccountManagerIdentity(P + if (base::FeatureList::IsEnabled( + features::kEnterpriseManagementDisclaimerUsesCustomLabel)) { + std::string custom_management_label = +@@ -476,7 +476,7 @@ std::optional<std::string> GetAccountManagerIdentity(P policy::EnterpriseManagementAuthority::CLOUD)) return std::nullopt; -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - std::string custom_management_label = - profile->GetPrefs()->GetString(prefs::kEnterpriseCustomLabel); - if (!custom_management_label.empty()) { + if (base::FeatureList::IsEnabled( + features::kEnterpriseManagementDisclaimerUsesCustomLabel)) { + std::string custom_management_label = diff --git a/www/chromium/files/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc b/www/chromium/files/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc index 593b127d3af5..b9665dc933a2 100644 --- a/www/chromium/files/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc +++ b/www/chromium/files/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/passwords/manage_passwords_ui_controller.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/ui/passwords/manage_passwords_ui_controller.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/ui/passwords/manage_passwords_ui_controller.cc -@@ -93,7 +93,7 @@ namespace { +@@ -97,7 +97,7 @@ namespace { using Logger = autofill::SavePasswordProgressLogger; @@ -9,7 +9,7 @@ // Should be kept in sync with constant declared in // bubble_controllers/relaunch_chrome_bubble_controller.cc. constexpr int kMaxNumberOfTimesKeychainErrorBubbleIsShown = 3; -@@ -513,7 +513,7 @@ void ManagePasswordsUIController::OnBiometricAuthBefor +@@ -517,7 +517,7 @@ void ManagePasswordsUIController::OnBiometricAuthBefor } void ManagePasswordsUIController::OnKeychainError() { diff --git a/www/chromium/files/patch-chrome_browser_ui_signin_signin__view__controller.cc b/www/chromium/files/patch-chrome_browser_ui_signin_signin__view__controller.cc index 5cb0c8219e42..fc7c1d00f400 100644 --- a/www/chromium/files/patch-chrome_browser_ui_signin_signin__view__controller.cc +++ b/www/chromium/files/patch-chrome_browser_ui_signin_signin__view__controller.cc @@ -1,8 +1,8 @@ ---- chrome/browser/ui/signin/signin_view_controller.cc.orig 2024-08-26 12:06:38 UTC +--- chrome/browser/ui/signin/signin_view_controller.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/ui/signin/signin_view_controller.cc -@@ -492,7 +492,7 @@ void SigninViewController::ShowModalManagedUserNoticeD - signin::SigninChoiceCallbackVariant process_user_choice_callback, - base::OnceClosure done_callback) { +@@ -489,7 +489,7 @@ void SigninViewController::ShowModalManagedUserNoticeD + std::unique_ptr<signin::EnterpriseProfileCreationDialogParams> + create_param) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS_LACROS) + BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) diff --git a/www/chromium/files/patch-chrome_browser_ui_signin_signin__view__controller__delegate.h b/www/chromium/files/patch-chrome_browser_ui_signin_signin__view__controller__delegate.h index e395b613af22..7f6fa6668ffe 100644 --- a/www/chromium/files/patch-chrome_browser_ui_signin_signin__view__controller__delegate.h +++ b/www/chromium/files/patch-chrome_browser_ui_signin_signin__view__controller__delegate.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/signin/signin_view_controller_delegate.h.orig 2024-07-30 11:12:21 UTC +--- chrome/browser/ui/signin/signin_view_controller_delegate.h.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/ui/signin/signin_view_controller_delegate.h -@@ -83,7 +83,7 @@ class SigninViewControllerDelegate { +@@ -85,7 +85,7 @@ class SigninViewControllerDelegate { #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc b/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc index b358ae41f3ed..ac52ac65bfcb 100644 --- a/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc +++ b/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2024-06-17 12:56:06 UTC +--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/ui/startup/bad_flags_prompt.cc -@@ -107,7 +107,7 @@ const char* const kBadFlags[] = { +@@ -105,7 +105,7 @@ const char* const kBadFlags[] = { // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc index d17350fe59ce..aebf99885d64 100644 --- a/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc +++ b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/ui/startup/startup_browser_creator.cc -@@ -138,7 +138,7 @@ +@@ -139,7 +139,7 @@ #include "chrome/credential_provider/common/gcp_strings.h" #endif // BUILDFLAG(IS_WIN) @@ -9,7 +9,7 @@ #include "chrome/browser/headless/headless_mode_util.h" #include "chrome/browser/ui/startup/web_app_info_recorder_utils.h" #include "components/headless/policy/headless_mode_policy.h" -@@ -963,7 +963,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -968,7 +968,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( TRACE_EVENT0("startup", "StartupBrowserCreator::ProcessCmdLineImpl"); ComputeAndRecordLaunchMode(command_line); @@ -18,7 +18,7 @@ if (headless::IsHeadlessMode() && headless::HeadlessModePolicy::IsHeadlessModeDisabled( g_browser_process->local_state())) { -@@ -1080,7 +1080,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -1069,7 +1069,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( silent_launch = true; } @@ -27,7 +27,7 @@ // Writes open and installed web apps to the specified file without // launching a new browser window or tab. if (base::FeatureList::IsEnabled(features::kListWebAppsSwitch) && -@@ -1295,7 +1295,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -1284,7 +1284,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( CHECK_EQ(profile_info.mode, StartupProfileMode::kBrowserWindow) << "Failed launch with app: couldn't pick a profile"; std::string app_id = command_line.GetSwitchValueASCII(switches::kAppId); diff --git a/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc index b62a8a1e38fc..897961268977 100644 --- a/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc +++ b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/tab_helpers.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/ui/tab_helpers.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/ui/tab_helpers.cc -@@ -241,7 +241,7 @@ +@@ -240,7 +240,7 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ #include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/hats/hats_helper.h" -@@ -719,12 +719,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con +@@ -718,12 +718,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ diff --git a/www/chromium/files/patch-chrome_browser_ui_ui__features.cc b/www/chromium/files/patch-chrome_browser_ui_ui__features.cc index b2997634729b..88f2eaa1eda3 100644 --- a/www/chromium/files/patch-chrome_browser_ui_ui__features.cc +++ b/www/chromium/files/patch-chrome_browser_ui_ui__features.cc @@ -1,8 +1,6 @@ -diff --git chrome/browser/ui/ui_features.cc chrome/browser/ui/ui_features.cc 2024-11-02 08:11:27 UTC -index c92ebcbca5..55b0da1030 100644 ---- chrome/browser/ui/ui_features.cc +--- chrome/browser/ui/ui_features.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/ui/ui_features.cc -@@ -103,7 +103,7 @@ BASE_FEATURE(kAccessCodeCastUI, +@@ -104,7 +104,7 @@ BASE_FEATURE(kAccessCodeCastUI, base::FEATURE_ENABLED_BY_DEFAULT); #endif @@ -11,16 +9,7 @@ index c92ebcbca5..55b0da1030 100644 // Enables the feature to remove the last confirmation dialog when relaunching // to update Chrome. BASE_FEATURE(kFewerUpdateConfirmations, -@@ -402,7 +402,7 @@ BASE_FEATURE(kTopChromeWebUIUsesSpareRenderer, - "TopChromeWebUIUsesSpareRenderer", - base::FEATURE_ENABLED_BY_DEFAULT); - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Enables alternate update-related text to be displayed in browser app menu - // button, menu item and confirmation dialog. - BASE_FEATURE(kUpdateTextOptions, -@@ -474,7 +474,7 @@ BASE_FEATURE(kStopLoadingAnimationForHiddenWindow, +@@ -446,7 +446,7 @@ BASE_FEATURE(kStopLoadingAnimationForHiddenWindow, "StopLoadingAnimationForHiddenWindow", base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/www/chromium/files/patch-chrome_browser_ui_ui__features.h b/www/chromium/files/patch-chrome_browser_ui_ui__features.h index 72ec0b2dea6a..bcb259db4267 100644 --- a/www/chromium/files/patch-chrome_browser_ui_ui__features.h +++ b/www/chromium/files/patch-chrome_browser_ui_ui__features.h @@ -1,8 +1,6 @@ -diff --git chrome/browser/ui/ui_features.h chrome/browser/ui/ui_features.h 2024-11-02 08:11:27 UTC -index 81800575fc..f14c478473 100644 ---- chrome/browser/ui/ui_features.h +--- chrome/browser/ui/ui_features.h.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/ui/ui_features.h -@@ -78,7 +78,7 @@ bool IsExtensionMenuInRootAppMenu(); +@@ -76,7 +76,7 @@ bool IsExtensionMenuInRootAppMenu(); BASE_DECLARE_FEATURE(kAccessCodeCastUI); #endif @@ -11,16 +9,7 @@ index 81800575fc..f14c478473 100644 BASE_DECLARE_FEATURE(kFewerUpdateConfirmations); #endif -@@ -266,7 +266,7 @@ bool IsToolbarPinningEnabled(); - - BASE_DECLARE_FEATURE(kTopChromeWebUIUsesSpareRenderer); - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - BASE_DECLARE_FEATURE(kUpdateTextOptions); - extern const base::FeatureParam<int> kUpdateTextOptionNumber; - #endif -@@ -291,7 +291,7 @@ BASE_DECLARE_FEATURE(kViewsJSAppModalDialog); +@@ -279,7 +279,7 @@ BASE_DECLARE_FEATURE(kViewsJSAppModalDialog); BASE_DECLARE_FEATURE(kStopLoadingAnimationForHiddenWindow); diff --git a/www/chromium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc b/www/chromium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc index 4e0a6bba92a4..f767bae9c2af 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc.orig 2022-07-22 17:30:31 UTC +--- chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc -@@ -19,7 +19,7 @@ +@@ -20,7 +20,7 @@ #include "ui/gfx/image/image_skia.h" #include "ui/views/widget/widget.h" diff --git a/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h b/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h index 2338a25599ce..2eedd2eff633 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h +++ b/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/chrome_views_delegate.h.orig 2024-06-17 12:56:06 UTC +--- chrome/browser/ui/views/chrome_views_delegate.h.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/ui/views/chrome_views_delegate.h -@@ -59,11 +59,11 @@ class ChromeViewsDelegate : public views::ViewsDelegat +@@ -61,11 +61,11 @@ class ChromeViewsDelegate : public views::ViewsDelegat base::OnceClosure callback) override; // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc index 9c1027c5d8f7..7be083ec5ddf 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/browser_frame.cc.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/ui/views/frame/browser_frame.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/ui/views/frame/browser_frame.cc -@@ -54,7 +54,7 @@ +@@ -55,7 +55,7 @@ #include "components/user_manager/user_manager.h" #endif @@ -9,7 +9,7 @@ #include "ui/display/screen.h" #include "ui/linux/linux_ui.h" #endif -@@ -89,7 +89,7 @@ class ThemeChangedObserver : public views::WidgetObser +@@ -90,7 +90,7 @@ class ThemeChangedObserver : public views::WidgetObser }; bool IsUsingLinuxSystemTheme(Profile* profile) { @@ -18,7 +18,7 @@ return ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme(); #else return false; -@@ -184,7 +184,7 @@ void BrowserFrame::InitBrowserFrame() { +@@ -185,7 +185,7 @@ void BrowserFrame::InitBrowserFrame() { Init(std::move(params)); @@ -27,7 +27,7 @@ SelectNativeTheme(); #else SetNativeTheme(ui::NativeTheme::GetInstanceForNativeUi()); -@@ -370,7 +370,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() { +@@ -372,7 +372,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() { chrome::SaveWindowWorkspace(browser_view_->browser(), GetWorkspace()); chrome::SaveWindowVisibleOnAllWorkspaces(browser_view_->browser(), IsVisibleOnAllWorkspaces()); @@ -36,7 +36,7 @@ // If the window was sent to a different workspace, prioritize it if // it was sent to the current workspace and deprioritize it // otherwise. This is done by MoveBrowsersInWorkspaceToFront() -@@ -564,7 +564,7 @@ void BrowserFrame::OnMenuClosed() { +@@ -566,7 +566,7 @@ void BrowserFrame::OnMenuClosed() { } void BrowserFrame::SelectNativeTheme() { @@ -45,7 +45,7 @@ // Use the regular NativeTheme instance if running incognito mode, regardless // of system theme (gtk, qt etc). ui::NativeTheme* native_theme = ui::NativeTheme::GetInstanceForNativeUi(); -@@ -605,7 +605,7 @@ void BrowserFrame::OnTouchUiChanged() { +@@ -607,7 +607,7 @@ void BrowserFrame::OnTouchUiChanged() { bool BrowserFrame::RegenerateFrameOnThemeChange( BrowserThemeChangeType theme_change_type) { bool need_regenerate = false; diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.h b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.h index 3386bfb16c67..53b4a0c05e42 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.h +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/browser_frame.h.orig 2024-02-23 21:04:38 UTC +--- chrome/browser/ui/views/frame/browser_frame.h.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/ui/views/frame/browser_frame.h -@@ -65,7 +65,7 @@ class BrowserFrame : public views::Widget, public view +@@ -66,7 +66,7 @@ class BrowserFrame : public views::Widget, public view ~BrowserFrame() override; @@ -9,7 +9,7 @@ // Returns whether the frame is in a tiled state. bool tiled() const { return tiled_; } void set_tiled(bool tiled) { tiled_ = tiled; } -@@ -225,7 +225,7 @@ class BrowserFrame : public views::Widget, public view +@@ -226,7 +226,7 @@ class BrowserFrame : public views::Widget, public view // contents for smoother dragging. TabDragKind tab_drag_kind_ = TabDragKind::kNone; diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame__view__linux.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame__view__linux.cc index 2a1ffc8d4ca0..29bf06a735bf 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame__view__linux.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame__view__linux.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/browser_frame_view_linux.cc.orig 2024-04-19 13:02:56 UTC +--- chrome/browser/ui/views/frame/browser_frame_view_linux.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/ui/views/frame/browser_frame_view_linux.cc -@@ -60,7 +60,7 @@ gfx::ShadowValues BrowserFrameViewLinux::GetShadowValu +@@ -70,7 +70,7 @@ gfx::ShadowValues BrowserFrameViewLinux::GetShadowValu void BrowserFrameViewLinux::PaintRestoredFrameBorder( gfx::Canvas* canvas) const { @@ -9,7 +9,7 @@ const bool tiled = frame()->tiled(); #else const bool tiled = false; -@@ -104,7 +104,7 @@ void BrowserFrameViewLinux::OnWindowButtonOrderingChan +@@ -125,7 +125,7 @@ int BrowserFrameViewLinux::NonClientHitTest(const gfx: } float BrowserFrameViewLinux::GetRestoredCornerRadiusDip() const { diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc index 4176e0a0e463..69a45016bba0 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/browser_view.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/ui/views/frame/browser_view.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/ui/views/frame/browser_view.cc -@@ -2346,7 +2346,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra +@@ -2367,7 +2367,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra // CrOS cleanup is done. // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc index 81c2e1ba9710..6b0fe6f45e8e 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc @@ -61,7 +61,7 @@ #include "ui/aura/window.h" @@ -27,7 +27,7 @@ // Calculate input bounds for Linux. This is needed because the input bounds // is not necessary the same as the local bounds on Linux. if (pip_browser_frame_view_->ShouldDrawFrameShadow()) { -@@ -591,7 +591,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow +@@ -590,7 +590,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow AddChildView(std::move(auto_pip_setting_overlay)); } @@ -36,7 +36,7 @@ auto* profile = browser_view->browser()->profile(); auto* linux_ui_theme = ui::LinuxUiTheme::GetForProfile(profile); auto* theme_service_factory = ThemeServiceFactory::GetForProfile(profile); -@@ -813,7 +813,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged( +@@ -812,7 +812,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged( for (ContentSettingImageView* view : content_setting_views_) view->SetIconColor(color_provider->GetColor(kColorPipWindowForeground)); @@ -45,7 +45,7 @@ // On Linux the top bar background will be drawn in OnPaint(). top_bar_container_view_->SetBackground(views::CreateSolidBackground( color_provider->GetColor(kColorPipWindowTopBarBackground))); -@@ -897,7 +897,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg +@@ -896,7 +896,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg BrowserNonClientFrameView::RemovedFromWidget(); } @@ -54,7 +54,7 @@ gfx::Insets PictureInPictureBrowserFrameView::RestoredMirroredFrameBorderInsets() const { auto border = FrameBorderInsets(); -@@ -1189,7 +1189,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre +@@ -1188,7 +1188,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre // views::View implementations: void PictureInPictureBrowserFrameView::OnPaint(gfx::Canvas* canvas) { @@ -63,7 +63,7 @@ // Draw the PiP window frame borders and shadows, including the top bar // background. if (window_frame_provider_) { -@@ -1344,7 +1344,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie +@@ -1343,7 +1343,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie } gfx::Insets PictureInPictureBrowserFrameView::FrameBorderInsets() const { @@ -72,7 +72,7 @@ if (window_frame_provider_) { const auto insets = window_frame_provider_->GetFrameThicknessDip(); const bool tiled = frame()->tiled(); -@@ -1362,7 +1362,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor +@@ -1361,7 +1361,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor } gfx::Insets PictureInPictureBrowserFrameView::ResizeBorderInsets() const { @@ -81,7 +81,7 @@ return FrameBorderInsets(); #elif !BUILDFLAG(IS_CHROMEOS_ASH) return gfx::Insets(kResizeBorder); -@@ -1383,7 +1383,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie +@@ -1382,7 +1382,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie top_height + border_thickness.bottom()); } diff --git a/www/chromium/files/patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc b/www/chromium/files/patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc index f32d0dbf71de..5319a2d46cbd 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/omnibox/omnibox_view_views.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/ui/views/omnibox/omnibox_view_views.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/ui/views/omnibox/omnibox_view_views.cc -@@ -1992,7 +1992,7 @@ void OmniboxViewViews::MaybeAddSendTabToSelfItem( +@@ -1989,7 +1989,7 @@ void OmniboxViewViews::MaybeAddSendTabToSelfItem( } void OmniboxViewViews::OnPopupOpened() { diff --git a/www/chromium/files/patch-chrome_browser_ui_views_passwords_password__bubble__view__base.cc b/www/chromium/files/patch-chrome_browser_ui_views_passwords_password__bubble__view__base.cc index 4179776ca45a..46d3931a1dec 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_passwords_password__bubble__view__base.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_passwords_password__bubble__view__base.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/passwords/password_bubble_view_base.cc.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/ui/views/passwords/password_bubble_view_base.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/ui/views/passwords/password_bubble_view_base.cc -@@ -41,7 +41,7 @@ +@@ -40,7 +40,7 @@ #include "ui/base/metadata/metadata_impl_macros.h" #include "ui/views/controls/button/button.h" @@ -9,7 +9,7 @@ #include "chrome/browser/ui/views/passwords/password_relaunch_chrome_view.h" #endif -@@ -156,7 +156,7 @@ PasswordBubbleViewBase* PasswordBubbleViewBase::Create +@@ -155,7 +155,7 @@ PasswordBubbleViewBase* PasswordBubbleViewBase::Create } else if (model_state == password_manager::ui::NOTIFY_RECEIVED_SHARED_CREDENTIALS) { view = new SharedPasswordsNotificationView(web_contents, anchor_view); diff --git a/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view.cc index e1055aeaa95e..5fe9999ecae5 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/profiles/profile_menu_view.cc.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/ui/views/profiles/profile_menu_view.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/ui/views/profiles/profile_menu_view.cc -@@ -83,7 +83,7 @@ +@@ -89,7 +89,7 @@ #include "ui/strings/grit/ui_strings.h" #include "ui/views/accessibility/view_accessibility.h" @@ -9,7 +9,7 @@ #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h" #endif -@@ -566,7 +566,7 @@ void ProfileMenuView::BuildIdentity() { +@@ -572,7 +572,7 @@ void ProfileMenuView::BuildIdentity() { badge_image_model, menu_title_, menu_subtitle_, management_label); } else { std::string profile_user_display_name, profile_user_email; diff --git a/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc b/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc index d55e2e3ae9cd..12bcc76a6627 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/ui/views/profiles/profile_menu_view_base.cc -@@ -674,7 +674,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo( +@@ -693,7 +693,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo( + image_model, management_badge, this, + ProfileMenuViewBase::kIdentityImageSize, kIdentityImageBorder); - // TODO(crbug.com/40118868): Revisit once build flag switch of lacros-chrome is - // complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // crbug.com/1161166: Orca does not read the accessible window title of the // bubble, so we duplicate it in the top-level menu item. To be revisited // after considering other options, including fixes on the AT side. diff --git a/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc b/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc index 8d8c8f868d08..701deea09339 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc @@ -57,7 +57,7 @@ namespace { @@ -9,7 +9,7 @@ const int kManagedUserNoticeConfirmationDialogWidth = 512; const int kManagedUserNoticeConfirmationDialogHeight = 576; const int kManagedUserNoticeConfirmationUpdatedDialogWidth = 780; -@@ -175,7 +175,7 @@ SigninViewControllerDelegateViews::CreateProfileCustom +@@ -179,7 +179,7 @@ SigninViewControllerDelegateViews::CreateProfileCustom #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -36,7 +36,7 @@ void SigninViewControllerDelegateViews::DeleteProfileOnCancel() { ProfileAttributesEntry* entry = g_browser_process->profile_manager() -@@ -502,7 +502,7 @@ SigninViewControllerDelegate::CreateProfileCustomizati +@@ -504,7 +504,7 @@ SigninViewControllerDelegate::CreateProfileCustomizati #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h b/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h index d2d854dd1925..a5321a86c21a 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h +++ b/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h @@ -76,7 +76,7 @@ class SigninViewControllerDelegateViews #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS) @@ -9,7 +9,7 @@ static std::unique_ptr<views::WebView> CreateManagedUserNoticeConfirmationWebView( Browser* browser, -@@ -143,7 +143,7 @@ class SigninViewControllerDelegateViews +@@ -139,7 +139,7 @@ class SigninViewControllerDelegateViews InitializeSigninWebDialogUI initialize_signin_web_dialog_ui); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc index 4e44d2fcc23a..a67b94cc1a5b 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/tabs/tab.cc.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/ui/views/tabs/tab.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/ui/views/tabs/tab.cc -@@ -625,7 +625,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& +@@ -627,7 +627,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& return; } diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc index 9a9bcc5134cb..6e2af6d98ce8 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/ui/views/tabs/tab_drag_controller.cc -@@ -214,7 +214,7 @@ bool IsWindowDragUsingSystemDragDropAllowed() { +@@ -215,7 +215,7 @@ bool IsWindowDragUsingSystemDragDropAllowed() { void UpdateSystemDnDDragImage(TabDragContext* attached_context, const gfx::ImageSkia& image) { @@ -9,7 +9,7 @@ aura::Window* root_window = attached_context->GetWidget()->GetNativeWindow()->GetRootWindow(); if (aura::client::GetDragDropClient(root_window)) { -@@ -414,7 +414,7 @@ TabDragController::Liveness TabDragController::Init( +@@ -415,7 +415,7 @@ TabDragController::Liveness TabDragController::Init( // synchronous on desktop Linux, so use that. // - ChromeOS Ash // Releasing capture on Ash cancels gestures so avoid it. @@ -18,7 +18,7 @@ ref->can_release_capture_ = false; #endif ref->start_point_in_screen_ = -@@ -1020,7 +1020,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon +@@ -1021,7 +1021,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -27,7 +27,7 @@ // EndMoveLoop is going to snap the window back to its original location. // Hide it so users don't see this. Hiding a window in Linux aura causes // it to lose capture so skip it. -@@ -2084,7 +2084,7 @@ void TabDragController::CompleteDrag() { +@@ -2085,7 +2085,7 @@ void TabDragController::CompleteDrag() { } // If source window was maximized - maximize the new window as well. @@ -36,7 +36,7 @@ // Keeping maximized state breaks snap to Grid on Windows when dragging // tabs from maximized windows. TODO:(crbug.com/727051) Explore doing this // for other desktop OS's. kMaximizedStateRetainedOnTabDrag in -@@ -2530,7 +2530,7 @@ TabDragController::Liveness TabDragController::GetLoca +@@ -2534,7 +2534,7 @@ TabDragController::Liveness TabDragController::GetLoca } // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc index 2d28deb4ab15..9286d1f41fd3 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc -@@ -375,7 +375,7 @@ TabHoverCardBubbleView::TabHoverCardBubbleView(Tab* ta +@@ -376,7 +376,7 @@ TabHoverCardBubbleView::TabHoverCardBubbleView(Tab* ta // not become active. Setting this to false creates the need to explicitly // hide the hovercard on press, touch, and keyboard events. SetCanActivate(false); diff --git a/www/chromium/files/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc b/www/chromium/files/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc index dea0b1050cbf..66c41e4c6007 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/user_education/browser_user_education_service.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/ui/views/user_education/browser_user_education_service.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/ui/views/user_education/browser_user_education_service.cc -@@ -777,7 +777,7 @@ void MaybeRegisterChromeFeaturePromos( +@@ -845,7 +845,7 @@ void MaybeRegisterChromeFeaturePromos( "defaulted to saved for the first time."))); } @@ -9,9 +9,9 @@ // kIPHSupervisedUserProfileSigninFeature registry.RegisterFeature(std::move( FeaturePromoSpecification::CreateForCustomAction( -@@ -1003,7 +1003,7 @@ void MaybeRegisterChromeFeaturePromos( - FeaturePromoSpecification::AcceleratorInfo()) - .SetBubbleArrow(HelpBubbleArrow::kTopLeft))); +@@ -1085,7 +1085,7 @@ void MaybeRegisterChromeFeaturePromos( + "Triggered to inform users of the availability of the " + "new translate screen feature on the Lens Overlay."))); -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) diff --git a/www/chromium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc b/www/chromium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc index 608aeb73d3e8..ebe3fa4c95c0 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc @@ -516,7 +516,7 @@ std::string GetFileExtension(FileExtension file_extens } @@ -9,7 +9,7 @@ SiteConfig GetSiteConfigurationFromAppName(const std::string& app_name) { SiteConfig config; bool is_app_found = false; -@@ -2101,7 +2101,7 @@ void WebAppIntegrationTestDriver::DeletePlatformShortc +@@ -2109,7 +2109,7 @@ void WebAppIntegrationTestDriver::DeletePlatformShortc if (app_name.empty()) { app_name = GetSiteConfiguration(site).app_name; } @@ -18,7 +18,7 @@ ASSERT_TRUE(override_registration_->test_override().IsShortcutCreated( profile(), app_id, app_name)); ASSERT_TRUE( -@@ -3428,7 +3428,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginEna +@@ -3452,7 +3452,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginEna app_state->id, app_state->name); ASSERT_TRUE(icon_color.has_value()); ASSERT_THAT(site_config.icon_color, testing::Eq(icon_color.value())); @@ -27,7 +27,7 @@ ASSERT_TRUE(override_registration_->test_override().IsRunOnOsLoginEnabled( profile(), app_state->id, app_state->name)); #endif -@@ -3443,7 +3443,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis +@@ -3467,7 +3467,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis GetAppBySiteMode(after_state_change_action_state_.get(), profile(), site); ASSERT_TRUE(app_state); base::ScopedAllowBlockingForTesting allow_blocking; @@ -36,7 +36,7 @@ ASSERT_FALSE(override_registration_->test_override().IsRunOnOsLoginEnabled( profile(), app_state->id, app_state->name)); #endif -@@ -3453,7 +3453,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis +@@ -3477,7 +3477,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis void WebAppIntegrationTestDriver::CheckSiteHandlesFile( Site site, FileExtension file_extension) { @@ -45,7 +45,7 @@ if (!BeforeStateCheckAction(__FUNCTION__)) { return; } -@@ -3469,7 +3469,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile +@@ -3493,7 +3493,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile void WebAppIntegrationTestDriver::CheckSiteNotHandlesFile( Site site, FileExtension file_extension) { @@ -54,7 +54,7 @@ if (!BeforeStateCheckAction(__FUNCTION__)) { return; } -@@ -4286,7 +4286,7 @@ base::FilePath WebAppIntegrationTestDriver::GetShortcu +@@ -4310,7 +4310,7 @@ base::FilePath WebAppIntegrationTestDriver::GetShortcu base::FilePath shortcut_dir, const std::string& app_name, const webapps::AppId& app_id) { @@ -63,7 +63,7 @@ return override_registration_->test_override().GetShortcutPath( profile(), shortcut_dir, app_id, app_name); #else -@@ -4486,7 +4486,7 @@ bool WebAppIntegrationTestDriver::IsShortcutAndIconCre +@@ -4510,7 +4510,7 @@ bool WebAppIntegrationTestDriver::IsShortcutAndIconCre const webapps::AppId& id) { base::ScopedAllowBlockingForTesting allow_blocking; bool is_shortcut_and_icon_correct = false; @@ -72,7 +72,7 @@ bool is_shortcut_correct = override_registration_->test_override().IsShortcutCreated(profile, id, name); -@@ -4530,7 +4530,7 @@ bool WebAppIntegrationTestDriver::DoIconColorsMatch(Pr +@@ -4554,7 +4554,7 @@ bool WebAppIntegrationTestDriver::DoIconColorsMatch(Pr do_icon_colors_match = (expected_icon_pixel_color == shortcut_pixel_color_apps_folder.value()); } diff --git a/www/chromium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc b/www/chromium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc index ca1a1d515bf2..5270b5467923 100644 --- a/www/chromium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc +++ b/www/chromium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/web_applications/web_app_ui_manager_impl.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/ui/web_applications/web_app_ui_manager_impl.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/ui/web_applications/web_app_ui_manager_impl.cc -@@ -573,7 +573,7 @@ void WebAppUiManagerImpl::MaybeShowIPHPromoForAppsLaun +@@ -583,7 +583,7 @@ void WebAppUiManagerImpl::MaybeShowIPHPromoForAppsLaun Browser* browser, Profile* profile, const std::string& app_id) { @@ -9,7 +9,7 @@ WebAppProvider* provider = WebAppProvider::GetForWebApps(profile); CHECK(provider); -@@ -799,7 +799,7 @@ void WebAppUiManagerImpl::ClearWebAppSiteDataIfNeeded( +@@ -809,7 +809,7 @@ void WebAppUiManagerImpl::ClearWebAppSiteDataIfNeeded( } } diff --git a/www/chromium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.h b/www/chromium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.h index ec1b77b95154..f5491838da3f 100644 --- a/www/chromium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.h +++ b/www/chromium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/web_applications/web_app_ui_manager_impl.h.orig 2024-04-19 13:02:56 UTC +--- chrome/browser/ui/web_applications/web_app_ui_manager_impl.h.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/ui/web_applications/web_app_ui_manager_impl.h -@@ -222,7 +222,7 @@ class WebAppUiManagerImpl : public BrowserListObserver +@@ -227,7 +227,7 @@ class WebAppUiManagerImpl : public BrowserListObserver UninstallCompleteCallback uninstall_complete_callback, webapps::UninstallResultCode uninstall_code); diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_app__settings_web__app__settings__ui.h b/www/chromium/files/patch-chrome_browser_ui_webui_app__settings_web__app__settings__ui.h new file mode 100644 index 000000000000..c9a6b86f7715 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_webui_app__settings_web__app__settings__ui.h @@ -0,0 +1,18 @@ +--- chrome/browser/ui/webui/app_settings/web_app_settings_ui.h.orig 2024-11-14 07:57:23 UTC ++++ chrome/browser/ui/webui/app_settings/web_app_settings_ui.h +@@ -14,13 +14,13 @@ + #include "ui/webui/mojo_web_ui_controller.h" + #include "ui/webui/resources/cr_components/app_management/app_management.mojom-forward.h" + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "chrome/common/webui_url_constants.h" + #include "content/public/browser/webui_config.h" + #include "content/public/common/url_constants.h" + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + class WebAppSettingsUI; + + class WebAppSettingsUIConfig diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_certificate__manager_certificate__manager__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_certificate__manager_certificate__manager__handler.cc index a1151cd3b5fc..41708a6144cf 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_certificate__manager_certificate__manager__handler.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_certificate__manager_certificate__manager__handler.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/certificate_manager/certificate_manager_handler.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/ui/webui/certificate_manager/certificate_manager_handler.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/ui/webui/certificate_manager/certificate_manager_handler.cc -@@ -154,7 +154,7 @@ CertificateManagerPageHandler::GetCertSource( +@@ -162,7 +162,7 @@ CertificateManagerPageHandler::GetCertSource( "distrusted_certs", cert_verifier::mojom::CertificateTrust::kDistrusted); break; diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc b/www/chromium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc index 636f4efcc1ce..94e7f76125fa 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/certificate_manager/client_cert_sources.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/ui/webui/certificate_manager/client_cert_sources.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/ui/webui/certificate_manager/client_cert_sources.cc -@@ -43,7 +43,7 @@ +@@ -51,7 +51,7 @@ #include "net/ssl/client_cert_store_mac.h" #endif // BUILDFLAG(IS_MAC) @@ -9,16 +9,16 @@ #include "chrome/browser/enterprise/client_certificates/certificate_provisioning_service_factory.h" #include "components/enterprise/client_certificates/core/certificate_provisioning_service.h" #include "components/enterprise/client_certificates/core/client_certificates_service.h" -@@ -191,7 +191,7 @@ std::unique_ptr<ClientCertStoreLoader> CreatePlatformC - #endif +@@ -195,7 +195,7 @@ std::unique_ptr<ClientCertStoreLoader> CreatePlatformC } + #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // ClientCertStore implementation that always returns an empty list. The // CertificateProvisioningService implementation expects to wrap a platform // cert store, but here we only want to get results from the provisioning -@@ -673,7 +673,7 @@ CreatePlatformClientCertSource( +@@ -1056,7 +1056,7 @@ CreatePlatformClientCertSource( #endif } diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.h b/www/chromium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.h index cbb70e10223f..b196706ddb7f 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.h +++ b/www/chromium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/certificate_manager/client_cert_sources.h.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/ui/webui/certificate_manager/client_cert_sources.h.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/ui/webui/certificate_manager/client_cert_sources.h -@@ -18,7 +18,7 @@ CreatePlatformClientCertSource( +@@ -19,7 +19,7 @@ CreatePlatformClientCertSource( remote_client, Profile* profile); diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__configs.cc b/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__configs.cc index 1c6829abf7a2..c18e38d21f4f 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__configs.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__configs.cc @@ -1,17 +1,58 @@ ---- chrome/browser/ui/webui/chrome_web_ui_configs.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/ui/webui/chrome_web_ui_configs.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/ui/webui/chrome_web_ui_configs.cc -@@ -77,7 +77,7 @@ - #include "chrome/browser/ui/webui/certificate_manager/certificate_manager_ui.h" - #endif // BUILDFLAG(CHROME_ROOT_STORE_CERT_MANAGEMENT_UI) +@@ -135,30 +135,30 @@ + #include "chrome/browser/ui/webui/conflicts/conflicts_ui.h" + #endif // BUILDFLAG(IS_WIN) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include "chrome/browser/ui/webui/webui_js_error/webui_js_error_ui.h" + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "chrome/browser/ui/webui/app_settings/web_app_settings_ui.h" + #include "chrome/browser/ui/webui/browser_switch/browser_switch_ui.h" #include "chrome/browser/ui/webui/whats_new/whats_new_ui.h" - #endif + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + #include "chrome/browser/ui/webui/sandbox/sandbox_internals_ui.h" + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || + // BUILDFLAG(IS_ANDROID) + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS_ASH) ++ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + #include "chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.h" + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || + // BUILDFLAG(IS_CHROMEOS_ASH) + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include "chrome/browser/ui/webui/discards/discards_ui.h" + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || + // BUILDFLAG(IS_CHROMEOS) +@@ -194,7 +194,7 @@ + #include "chrome/browser/ui/webui/signin/signin_error_ui.h" + #endif // !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_ANDROID) + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "chrome/browser/ui/webui/on_device_translation_internals/on_device_translation_internals_ui.h" + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -148,10 +148,10 @@ void RegisterChromeWebUIConfigs() { +@@ -315,14 +315,14 @@ void RegisterChromeWebUIConfigs() { map.AddWebUIConfig(std::make_unique<WebuiGalleryUIConfig>()); - #endif // !BUILDFLAG(IS_ANDROID) + #endif // BUILDFLAG(IS_ANDROID) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + map.AddWebUIConfig(std::make_unique<WebUIJsErrorUIConfig>()); + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OPENBSD) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) @@ -22,12 +63,36 @@ #if BUILDFLAG(ENABLE_EXTENSIONS) map.AddWebUIConfig(std::make_unique<extensions::ExtensionsUIConfig>()); -@@ -165,7 +165,7 @@ void RegisterChromeWebUIConfigs() { - map.AddWebUIConfig(std::make_unique<CertificateManagerUIConfig>()); - #endif // BUILDFLAG(CHROME_ROOT_STORE_CERT_MANAGEMENT_UI) +@@ -344,7 +344,7 @@ void RegisterChromeWebUIConfigs() { + map.AddWebUIConfig(std::make_unique<ConflictsUIConfig>()); + #endif // BUILDFLAG(IS_WIN) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + map.AddWebUIConfig(std::make_unique<BrowserSwitchUIConfig>()); + map.AddWebUIConfig(std::make_unique<WebAppSettingsUIConfig>()); map.AddWebUIConfig(std::make_unique<WhatsNewUIConfig>()); +@@ -352,20 +352,20 @@ void RegisterChromeWebUIConfigs() { #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + map.AddWebUIConfig(std::make_unique<SandboxInternalsUIConfig>()); + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || + // BUILDFLAG(IS_ANDROID) + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS_ASH) ++ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + map.AddWebUIConfig( + std::make_unique<enterprise_connectors::ConnectorsInternalsUIConfig>()); + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || + // BUILDFLAG(IS_CHROMEOS_ASH) + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + map.AddWebUIConfig(std::make_unique<DiscardsUIConfig>()); + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || + // BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc b/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc index 562b925014be..d5c1f71d6752 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc @@ -1,22 +1,12 @@ ---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -176,7 +176,7 @@ - #include "chrome/browser/ui/webui/chromeos/chrome_url_disabled/chrome_url_disabled_ui.h" - #endif - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #include "chrome/browser/ui/webui/webui_js_error/webui_js_error_ui.h" - #endif - -@@ -201,22 +201,22 @@ +@@ -130,16 +130,16 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "chrome/browser/ui/webui/commerce/product_specifications_ui.h" - #include "chrome/browser/ui/webui/discards/discards_ui.h" #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -25,68 +15,12 @@ #include "chrome/browser/ui/webui/sandbox/sandbox_internals_ui.h" #endif - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS_ASH) -+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) - #include "chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.h" - #endif - -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "chrome/browser/ui/webui/whats_new/whats_new_ui.h" #endif -@@ -506,7 +506,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we - if (url.host_piece() == chrome::kChromeUIMobileSetupHost) - return &NewWebUI<ash::cellular_setup::MobileSetupUI>; - #endif // BUILDFLAG(IS_CHROMEOS_ASH) --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - if (url.host_piece() == chrome::kChromeUIWebUIJsErrorHost) - return &NewWebUI<WebUIJsErrorUI>; - #endif -@@ -558,7 +558,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we - if (url.host_piece() == chrome::kChromeUINaClHost) - return &NewWebUI<NaClUI>; - #endif --#if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \ -+#if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && \ - defined(TOOLKIT_VIEWS)) || \ - defined(USE_AURA) - if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost) -@@ -599,26 +599,26 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we - } - #endif - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ -- BUILDFLAG(IS_ANDROID) -+ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - if (url.host_piece() == chrome::kChromeUISandboxHost) { - return &NewWebUI<SandboxInternalsUI>; - } - #endif - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS_ASH) -+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) - if (url.host_piece() == chrome::kChromeUIConnectorsInternalsHost) - return &NewWebUI<enterprise_connectors::ConnectorsInternalsUI>; - #endif - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - if (url.host_piece() == chrome::kChromeUIDiscardsHost) - return &NewWebUI<DiscardsUI>; - #endif --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (url.host_piece() == chrome::kChromeUIBrowserSwitchHost) - return &NewWebUI<BrowserSwitchUI>; - #endif --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (url.host_piece() == chrome::kChromeUIWebAppSettingsHost) - return &NewWebUI<WebAppSettingsUI>; - #endif -@@ -854,7 +854,7 @@ base::RefCountedMemory* ChromeWebUIControllerFactory:: +@@ -465,7 +465,7 @@ base::RefCountedMemory* ChromeWebUIControllerFactory:: if (page_url.host_piece() == chrome::kChromeUINewTabPageHost) return NewTabPageUI::GetFaviconResourceBytes(scale_factor); @@ -95,7 +29,7 @@ if (page_url.host_piece() == chrome::kChromeUIWhatsNewHost) return WhatsNewUI::GetFaviconResourceBytes(scale_factor); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -882,7 +882,7 @@ base::RefCountedMemory* ChromeWebUIControllerFactory:: +@@ -493,7 +493,7 @@ base::RefCountedMemory* ChromeWebUIControllerFactory:: return ManagementUI::GetFaviconResourceBytes(scale_factor); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_internals_user__education_user__education__internals__page__handler__impl.cc b/www/chromium/files/patch-chrome_browser_ui_webui_internals_user__education_user__education__internals__page__handler__impl.cc index a808f187bb44..52188f7ee192 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_internals_user__education_user__education__internals__page__handler__impl.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_internals_user__education_user__education__internals__page__handler__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/internals/user_education/user_education_internals_page_handler_impl.cc.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/ui/webui/internals/user_education/user_education_internals_page_handler_impl.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/ui/webui/internals/user_education/user_education_internals_page_handler_impl.cc -@@ -41,7 +41,7 @@ +@@ -44,7 +44,7 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/webui/resource_path.h" @@ -9,7 +9,7 @@ #include "chrome/browser/ui/browser_navigator.h" #include "chrome/browser/ui/browser_navigator_params.h" #include "net/base/url_util.h" -@@ -81,7 +81,7 @@ user_education::NewBadgeRegistry* GetNewBadgeRegistry( +@@ -84,7 +84,7 @@ user_education::NewBadgeRegistry* GetNewBadgeRegistry( } whats_new::WhatsNewRegistry* GetWhatsNewRegistry() { @@ -18,7 +18,7 @@ return g_browser_process->GetFeatures()->whats_new_registry(); #else return nullptr; -@@ -765,7 +765,7 @@ void UserEducationInternalsPageHandlerImpl::ClearWhats +@@ -767,7 +767,7 @@ void UserEducationInternalsPageHandlerImpl::ClearWhats } void UserEducationInternalsPageHandlerImpl::LaunchWhatsNewStaging() { diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_interstitials_interstitial__ui.cc b/www/chromium/files/patch-chrome_browser_ui_webui_interstitials_interstitial__ui.cc index db8a73007fc9..3acf90c8c8bc 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_interstitials_interstitial__ui.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_interstitials_interstitial__ui.cc @@ -1,29 +1,29 @@ ---- chrome/browser/ui/webui/interstitials/interstitial_ui.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/ui/webui/interstitials/interstitial_ui.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/ui/webui/interstitials/interstitial_ui.cc -@@ -71,7 +71,7 @@ +@@ -74,7 +74,7 @@ #include "components/security_interstitials/content/captive_portal_blocking_page.h" #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) #include "chrome/browser/supervised_user/supervised_user_verification_controller_client.h" - #include "chrome/browser/supervised_user/supervised_user_verification_page.h" - #endif -@@ -378,7 +378,7 @@ std::unique_ptr<EnterpriseWarnPage> CreateEnterpriseWa + #include "chrome/browser/supervised_user/supervised_user_verification_page_blocked_sites.h" + #include "chrome/browser/supervised_user/supervised_user_verification_page_youtube.h" +@@ -396,7 +396,7 @@ std::unique_ptr<EnterpriseWarnPage> CreateEnterpriseWa kRequestUrl)); } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - std::unique_ptr<SupervisedUserVerificationPage> - CreateSupervisedUserVerificationPage(content::WebContents* web_contents, - bool is_main_frame) { -@@ -594,7 +594,7 @@ void InterstitialHTMLSource::StartDataRequest( + std::unique_ptr<SupervisedUserVerificationPageForYouTube> + CreateSupervisedUserVerificationPageForYouTube( + content::WebContents* web_contents, +@@ -613,7 +613,7 @@ void InterstitialHTMLSource::StartDataRequest( interstitial_delegate = CreateInsecureFormPage(web_contents); } else if (path_without_query == "/https_only") { interstitial_delegate = CreateHttpsOnlyModePage(web_contents); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) } else if (path_without_query == "/supervised-user-verify") { - interstitial_delegate = CreateSupervisedUserVerificationPage( + interstitial_delegate = CreateSupervisedUserVerificationPageForYouTube( web_contents, /*is_main_frame=*/true); diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui.cc b/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui.cc index 3da625653899..f61f85bebef4 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/management/management_ui.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/ui/webui/management/management_ui.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/ui/webui/management/management_ui.cc -@@ -108,11 +108,11 @@ content::WebUIDataSource* CreateAndAddManagementUIHtml +@@ -185,11 +185,11 @@ void ManagementUI::GetLocalizedStrings( IDS_MANAGEMENT_FILE_TRANSFER_VISIBLE_DATA}, {kManagementReportFileEvents, IDS_MANAGEMENT_REPORT_FILE_EVENTS}, #endif // BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__constants.cc b/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__constants.cc index c1fd6b6c3d64..815960a09d92 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__constants.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__constants.cc @@ -1,8 +1,8 @@ ---- chrome/browser/ui/webui/management/management_ui_constants.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/ui/webui/management/management_ui_constants.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/ui/webui/management/management_ui_constants.cc -@@ -88,12 +88,12 @@ const char kProfileReportingBrowser[] = "profileReport - const char kProfileReportingExtension[] = "profileReportingExtension"; +@@ -89,12 +89,12 @@ const char kProfileReportingExtension[] = "profileRepo const char kProfileReportingPolicy[] = "profileReportingPolicy"; + const char kProfileReportingLearnMore[] = "profileReportingLearnMore"; -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc index 6e360158bb00..c4b532266f68 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/webui/management/management_ui_handler.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/ui/webui/management/management_ui_handler.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/ui/webui/management/management_ui_handler.cc @@ -58,7 +58,7 @@ #include "ui/base/l10n/l10n_util.h" @@ -9,16 +9,25 @@ #include "chrome/browser/enterprise/signals/user_permission_service_factory.h" #include "components/device_signals/core/browser/user_permission_service.h" // nogncheck #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -365,7 +365,7 @@ void ManagementUIHandler::AddReportingInfo(base::Value +@@ -349,7 +349,7 @@ void ManagementUIHandler::AddReportingInfo(base::Value report_sources->Append(std::move(data)); } - } + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + auto device_signal_data = GetDeviceSignalGrantedMessage(); + if (!device_signal_data.empty()) { + report_sources->Append(std::move(device_signal_data)); +@@ -371,7 +371,7 @@ void ManagementUIHandler::AddReportingInfo(base::Value + report_sources->Append(std::move(data)); + } + -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Insert the device signals consent disclosure at the end of browser - // reporting section. - auto* user_permission_service = GetUserPermissionService(); -@@ -557,7 +557,7 @@ policy::PolicyService* ManagementUIHandler::GetPolicyS + auto device_signal_data = GetDeviceSignalGrantedMessage(); + if (!device_signal_data.empty()) { + report_sources->Append(std::move(device_signal_data)); +@@ -561,7 +561,7 @@ policy::PolicyService* ManagementUIHandler::GetPolicyS ->policy_service(); } diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.h b/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.h index 94ece6e35a7f..31336d655a80 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.h +++ b/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.h @@ -1,4 +1,4 @@ ---- chrome/browser/ui/webui/management/management_ui_handler.h.orig 2024-06-17 12:56:06 UTC +--- chrome/browser/ui/webui/management/management_ui_handler.h.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/ui/webui/management/management_ui_handler.h @@ -31,7 +31,7 @@ namespace policy { class PolicyService; @@ -16,5 +16,5 @@ -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) virtual device_signals::UserPermissionService* GetUserPermissionService(); + base::Value::Dict GetDeviceSignalGrantedMessage(); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) - diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_password__manager_promo__cards__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_password__manager_promo__cards__handler.cc index 16bd75ca9bfc..22e63314322d 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_password__manager_promo__cards__handler.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_password__manager_promo__cards__handler.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/webui/password_manager/promo_cards_handler.cc.orig 2024-08-26 12:06:38 UTC +--- chrome/browser/ui/webui/password_manager/promo_cards_handler.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/ui/webui/password_manager/promo_cards_handler.cc @@ -28,7 +28,7 @@ #include "chrome/browser/ui/webui/password_manager/promo_cards/web_password_manager_promo.h" @@ -9,7 +9,7 @@ #include "chrome/browser/ui/webui/password_manager/promo_cards/relaunch_chrome_promo.h" #endif -@@ -75,7 +75,7 @@ std::vector<std::unique_ptr<PasswordPromoCardBase>> Ge +@@ -81,7 +81,7 @@ std::vector<std::unique_ptr<PasswordPromoCardBase>> Ge .get())); #endif diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_searchbox_searchbox__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_searchbox_searchbox__handler.cc index 4c14e1f77700..f10c57629ef8 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_searchbox_searchbox__handler.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_searchbox_searchbox__handler.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/webui/searchbox/searchbox_handler.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/ui/webui/searchbox/searchbox_handler.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/ui/webui/searchbox/searchbox_handler.cc @@ -108,7 +108,7 @@ const char* kMacShareIconResourceName = #elif BUILDFLAG(IS_WIN) @@ -18,7 +18,7 @@ kLinuxShareIconResourceName = "//resources/cr_components/searchbox/icons/share_cr23.svg"; #else -@@ -645,7 +645,7 @@ std::string SearchboxHandler::ActionVectorIconToResour +@@ -653,7 +653,7 @@ std::string SearchboxHandler::ActionVectorIconToResour icon.name == omnibox::kShareWinChromeRefreshIcon.name) { return kWinShareIconResourceName; } diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc b/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc index 5e54f12d9d51..7bf4cb0c7d15 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -144,7 +144,7 @@ +@@ -148,7 +148,7 @@ #include "chrome/browser/ui/chrome_pages.h" #endif @@ -9,7 +9,7 @@ #include "ui/display/screen.h" #endif -@@ -163,7 +163,7 @@ +@@ -167,7 +167,7 @@ #include "chrome/browser/ui/webui/certificate_manager_localized_strings_provider.h" #endif @@ -18,7 +18,7 @@ #include "ui/linux/linux_ui_factory.h" #include "ui/ozone/public/ozone_platform.h" #endif -@@ -287,7 +287,7 @@ void AddA11yStrings(content::WebUIDataSource* html_sou +@@ -292,7 +292,7 @@ void AddA11yStrings(content::WebUIDataSource* html_sou {"focusHighlightLabel", IDS_SETTINGS_ACCESSIBILITY_FOCUS_HIGHLIGHT_DESCRIPTION}, #endif @@ -27,7 +27,7 @@ {"overscrollHistoryNavigationTitle", IDS_SETTINGS_OVERSCROLL_HISTORY_NAVIGATION_TITLE}, {"overscrollHistoryNavigationSubtitle", -@@ -412,7 +412,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -548,7 +548,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht {"uiFeatureAlignLeft", IDS_SETTINGS_UI_FEATURE_ALIGN_LEFT}, {"uiFeatureAlignRight", IDS_SETTINGS_UI_FEATURE_ALIGN_RIGHT}, {"resetToDefault", IDS_SETTINGS_RESET_TO_DEFAULT}, @@ -36,7 +36,7 @@ {"gtkTheme", IDS_SETTINGS_GTK_THEME}, {"useGtkTheme", IDS_SETTINGS_USE_GTK_THEME}, {"qtTheme", IDS_SETTINGS_QT_THEME}, -@@ -420,7 +420,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -556,7 +556,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht {"classicTheme", IDS_SETTINGS_CLASSIC_THEME}, {"useClassicTheme", IDS_SETTINGS_USE_CLASSIC_THEME}, #endif @@ -45,7 +45,7 @@ {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS}, #endif #if BUILDFLAG(IS_MAC) -@@ -448,7 +448,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -584,7 +584,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc index 97451b90d79d..2af7e43a5a9e 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/webui/signin/profile_picker_handler.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/ui/webui/signin/profile_picker_handler.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/ui/webui/signin/profile_picker_handler.cc @@ -209,7 +209,7 @@ base::Value::Dict CreateProfileEntry(const ProfileAttr @@ -9,7 +9,7 @@ } else if (base::FeatureList::IsEnabled( supervised_user::kShowKiteForSupervisedUsers) && entry->IsSupervised()) { -@@ -1224,7 +1224,7 @@ void ProfilePickerHandler::BeginFirstWebContentsProfil +@@ -1211,7 +1211,7 @@ void ProfilePickerHandler::BeginFirstWebContentsProfil } void ProfilePickerHandler::MaybeUpdateGuestMode() { diff --git a/www/chromium/files/patch-chrome_browser_ui_window__sizer_window__sizer.cc b/www/chromium/files/patch-chrome_browser_ui_window__sizer_window__sizer.cc index dd9c0ab839eb..23668fffa50b 100644 --- a/www/chromium/files/patch-chrome_browser_ui_window__sizer_window__sizer.cc +++ b/www/chromium/files/patch-chrome_browser_ui_window__sizer_window__sizer.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/window_sizer/window_sizer.cc.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/ui/window_sizer/window_sizer.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/ui/window_sizer/window_sizer.cc -@@ -209,7 +209,7 @@ void WindowSizer::GetBrowserWindowBoundsAndShowState( +@@ -214,7 +214,7 @@ void WindowSizer::GetBrowserWindowBoundsAndShowState( browser, window_bounds, show_state); } diff --git a/www/chromium/files/patch-chrome_browser_web__applications_policy_web__app__policy__manager.cc b/www/chromium/files/patch-chrome_browser_web__applications_policy_web__app__policy__manager.cc index e0dc650aeadd..6927530b0768 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_policy_web__app__policy__manager.cc +++ b/www/chromium/files/patch-chrome_browser_web__applications_policy_web__app__policy__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/policy/web_app_policy_manager.cc.orig 2024-09-30 07:45:04 UTC +--- chrome/browser/web_applications/policy/web_app_policy_manager.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/web_applications/policy/web_app_policy_manager.cc -@@ -102,7 +102,7 @@ namespace web_app { +@@ -106,7 +106,7 @@ namespace web_app { BASE_FEATURE(kDesktopPWAsForceUnregisterOSIntegration, "DesktopPWAsForceUnregisterOSIntegration", diff --git a/www/chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc b/www/chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc index 44adc82505fb..c2e482a8bee4 100644 --- a/www/chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc +++ b/www/chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/browser/webauthn/chrome_authenticator_request_delegate.cc -@@ -1143,7 +1143,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureDisc +@@ -1166,7 +1166,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureDisc g_observer->ConfiguringCable(request_type); } diff --git a/www/chromium/files/patch-chrome_common_chrome__features.cc b/www/chromium/files/patch-chrome_common_chrome__features.cc index 20ee1d8e317b..7cefe3a75cd5 100644 --- a/www/chromium/files/patch-chrome_common_chrome__features.cc +++ b/www/chromium/files/patch-chrome_common_chrome__features.cc @@ -1,6 +1,6 @@ ---- chrome/common/chrome_features.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/common/chrome_features.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/common/chrome_features.cc -@@ -82,7 +82,7 @@ BASE_FEATURE(kUseAdHocSigningForWebAppShims, +@@ -83,7 +83,7 @@ BASE_FEATURE(kUseAdHocSigningForWebAppShims, #endif // BUILDFLAG(IS_MAC) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ // Enables or disables the Autofill survey triggered by opening a prompt to // save address info. BASE_FEATURE(kAutofillAddressSurvey, -@@ -100,7 +100,7 @@ BASE_FEATURE(kAutofillPasswordSurvey, +@@ -101,7 +101,7 @@ BASE_FEATURE(kAutofillPasswordSurvey, base::FEATURE_DISABLED_BY_DEFAULT); #endif @@ -18,7 +18,7 @@ // Enables the Restart background mode optimization. When all Chrome UI is // closed and it goes in the background, allows to restart the browser to // discard memory. -@@ -267,7 +267,7 @@ BASE_FEATURE(kDesktopPWAsElidedExtensionsMenu, +@@ -273,7 +273,7 @@ BASE_FEATURE(kDesktopPWAsElidedExtensionsMenu, BASE_FEATURE(kDesktopPWAsRunOnOsLogin, "DesktopPWAsRunOnOsLogin", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -27,7 +27,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -299,7 +299,7 @@ BASE_FEATURE(kDesktopPWAsTabStripSettings, +@@ -305,7 +305,7 @@ BASE_FEATURE(kDesktopPWAsTabStripSettings, "DesktopPWAsTabStripSettings", base::FEATURE_DISABLED_BY_DEFAULT); @@ -36,7 +36,7 @@ // Controls whether Chrome Apps are supported. See https://crbug.com/1221251. // If the feature is disabled, Chrome Apps continue to work. If enabled, Chrome // Apps will not launch and will be marked in the UI as deprecated. -@@ -871,7 +871,7 @@ BASE_FEATURE(kKAnonymityServiceStorage, +@@ -867,7 +867,7 @@ BASE_FEATURE(kKAnonymityServiceStorage, "KAnonymityServiceStorage", base::FEATURE_ENABLED_BY_DEFAULT); @@ -45,7 +45,7 @@ BASE_FEATURE(kLinuxLowMemoryMonitor, "LinuxLowMemoryMonitor", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -884,7 +884,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit +@@ -880,7 +880,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit &kLinuxLowMemoryMonitor, "critical_level", 255}; #endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-chrome_common_chrome__features.h b/www/chromium/files/patch-chrome_common_chrome__features.h index 658933262e81..b01398339e50 100644 --- a/www/chromium/files/patch-chrome_common_chrome__features.h +++ b/www/chromium/files/patch-chrome_common_chrome__features.h @@ -1,4 +1,4 @@ ---- chrome/common/chrome_features.h.orig 2024-10-22 08:31:56 UTC +--- chrome/common/chrome_features.h.orig 2024-11-14 07:57:23 UTC +++ chrome/common/chrome_features.h @@ -60,13 +60,13 @@ BASE_DECLARE_FEATURE(kUseAdHocSigningForWebAppShims); #endif // BUILDFLAG(IS_MAC) @@ -25,7 +25,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kChromeAppsDeprecation); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kShortcutsNotApps); -@@ -512,7 +512,7 @@ BASE_DECLARE_FEATURE(kKAnonymityServiceOHTTPRequests); +@@ -503,7 +503,7 @@ BASE_DECLARE_FEATURE(kKAnonymityServiceOHTTPRequests); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kKAnonymityServiceStorage); @@ -34,7 +34,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kLinuxLowMemoryMonitor); COMPONENT_EXPORT(CHROME_FEATURES) extern const base::FeatureParam<int> kLinuxLowMemoryMonitorModerateLevel; -@@ -520,7 +520,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) +@@ -511,7 +511,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::FeatureParam<int> kLinuxLowMemoryMonitorCriticalLevel; #endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-chrome_common_chrome__paths.cc b/www/chromium/files/patch-chrome_common_chrome__paths.cc index 90d3b4a6ad4e..899c1fa3ed23 100644 --- a/www/chromium/files/patch-chrome_common_chrome__paths.cc +++ b/www/chromium/files/patch-chrome_common_chrome__paths.cc @@ -1,4 +1,4 @@ ---- chrome/common/chrome_paths.cc.orig 2024-06-17 12:56:06 UTC +--- chrome/common/chrome_paths.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/common/chrome_paths.cc @@ -30,7 +30,7 @@ #include "base/apple/foundation_util.h" @@ -27,7 +27,7 @@ #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -225,7 +225,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -219,7 +219,7 @@ bool PathProvider(int key, base::FilePath* result) { } break; case chrome::DIR_DEFAULT_DOWNLOADS_SAFE: @@ -36,7 +36,7 @@ if (!GetUserDownloadsDirectorySafe(&cur)) { return false; } -@@ -541,7 +541,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -535,7 +535,7 @@ bool PathProvider(int key, base::FilePath* result) { return false; } break; @@ -45,7 +45,7 @@ case chrome::DIR_POLICY_FILES: { cur = base::FilePath(policy::kPolicyPath); break; -@@ -552,7 +552,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -546,7 +546,7 @@ bool PathProvider(int key, base::FilePath* result) { #if BUILDFLAG(IS_CHROMEOS_ASH) || \ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ BUILDFLAG(CHROMIUM_BRANDING)) || \ @@ -54,7 +54,7 @@ case chrome::DIR_USER_EXTERNAL_EXTENSIONS: { if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) { return false; -@@ -561,7 +561,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -555,7 +555,7 @@ bool PathProvider(int key, base::FilePath* result) { break; } #endif @@ -63,7 +63,7 @@ case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: { cur = base::FilePath(kFilepathSinglePrefExtensions); break; -@@ -599,7 +599,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -593,7 +593,7 @@ bool PathProvider(int key, base::FilePath* result) { break; #if BUILDFLAG(ENABLE_EXTENSIONS) && \ @@ -72,7 +72,7 @@ case chrome::DIR_NATIVE_MESSAGING: #if BUILDFLAG(IS_MAC) #if BUILDFLAG(GOOGLE_CHROME_BRANDING) -@@ -613,6 +613,9 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -607,6 +607,9 @@ bool PathProvider(int key, base::FilePath* result) { #if BUILDFLAG(GOOGLE_CHROME_BRANDING) cur = base::FilePath( FILE_PATH_LITERAL("/etc/opt/chrome/native-messaging-hosts")); diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.cc b/www/chromium/files/patch-chrome_common_chrome__switches.cc index 0fff6861f546..d6ddad1182ee 100644 --- a/www/chromium/files/patch-chrome_common_chrome__switches.cc +++ b/www/chromium/files/patch-chrome_common_chrome__switches.cc @@ -1,6 +1,6 @@ ---- chrome/common/chrome_switches.cc.orig 2024-09-30 07:45:04 UTC +--- chrome/common/chrome_switches.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/common/chrome_switches.cc -@@ -886,14 +886,14 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket- +@@ -892,7 +892,7 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket- #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -9,7 +9,8 @@ const char kEnableNewAppMenuIcon[] = "enable-new-app-menu-icon"; // Causes the browser to launch directly in guest mode. - const char kGuest[] = "guest"; +@@ -902,7 +902,7 @@ const char kGuest[] = "guest"; + const char kForceNtpMobilePromo[] = "force-ntp-mobile-promo"; #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.h b/www/chromium/files/patch-chrome_common_chrome__switches.h index 2866a907946e..624fc028f293 100644 --- a/www/chromium/files/patch-chrome_common_chrome__switches.h +++ b/www/chromium/files/patch-chrome_common_chrome__switches.h @@ -1,6 +1,6 @@ ---- chrome/common/chrome_switches.h.orig 2024-09-30 07:45:04 UTC +--- chrome/common/chrome_switches.h.orig 2024-11-14 07:57:23 UTC +++ chrome/common/chrome_switches.h -@@ -275,12 +275,12 @@ extern const char kAllowNaClSocketAPI[]; +@@ -277,13 +277,13 @@ extern const char kAllowNaClSocketAPI[]; #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -8,6 +8,7 @@ + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) extern const char kEnableNewAppMenuIcon[]; extern const char kGuest[]; + extern const char kForceNtpMobilePromo[]; #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) diff --git a/www/chromium/files/patch-chrome_common_pref__names.h b/www/chromium/files/patch-chrome_common_pref__names.h index 38a36eab051d..c8bf03e1367e 100644 --- a/www/chromium/files/patch-chrome_common_pref__names.h +++ b/www/chromium/files/patch-chrome_common_pref__names.h @@ -1,6 +1,6 @@ ---- chrome/common/pref_names.h.orig 2024-10-22 08:31:56 UTC +--- chrome/common/pref_names.h.orig 2024-11-14 07:57:23 UTC +++ chrome/common/pref_names.h -@@ -1379,7 +1379,7 @@ inline constexpr char kUseAshProxy[] = "lacros.proxy.u +@@ -1387,7 +1387,7 @@ inline constexpr char kUseAshProxy[] = "lacros.proxy.u // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ // Linux specific preference on whether we should match the system theme. inline constexpr char kSystemTheme[] = "extensions.theme.system_theme"; #endif -@@ -1552,7 +1552,7 @@ inline constexpr char kShowUpdatePromotionInfoBar[] = +@@ -1564,7 +1564,7 @@ inline constexpr char kShowUpdatePromotionInfoBar[] = "browser.show_update_promotion_info_bar"; #endif @@ -18,7 +18,7 @@ // Boolean that is false if we should show window manager decorations. If // true, we draw a custom chrome frame (thicker title bar and blue border). inline constexpr char kUseCustomChromeFrame[] = "browser.custom_chrome_frame"; -@@ -2159,7 +2159,7 @@ inline constexpr char kDownloadDefaultDirectory[] = +@@ -2176,7 +2176,7 @@ inline constexpr char kDownloadDefaultDirectory[] = inline constexpr char kDownloadDirUpgraded[] = "download.directory_upgrade"; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -27,7 +27,7 @@ inline constexpr char kOpenPdfDownloadInSystemReader[] = "download.open_pdf_in_system_reader"; #endif -@@ -2602,14 +2602,14 @@ inline constexpr char kMediaStorageIdSalt[] = "media.s +@@ -2619,14 +2619,14 @@ inline constexpr char kMediaStorageIdSalt[] = "media.s inline constexpr char kMediaCdmOriginData[] = "media.cdm.origin_data"; #endif // BUILDFLAG(IS_WIN) @@ -44,7 +44,7 @@ // Records whether the user has seen an HTTP auth "negotiate" header. inline constexpr char kReceivedHttpAuthNegotiateHeader[] = "net.received_http_auth_negotiate_headers"; -@@ -2687,7 +2687,7 @@ inline constexpr char kAmbientAuthenticationInPrivateM +@@ -2704,7 +2704,7 @@ inline constexpr char kAmbientAuthenticationInPrivateM inline constexpr char kBasicAuthOverHttpEnabled[] = "auth.basic_over_http_enabled"; @@ -53,7 +53,7 @@ // Boolean that specifies whether OK-AS-DELEGATE flag from KDC is respected // along with kAuthNegotiateDelegateAllowlist. inline constexpr char kAuthNegotiateDelegateByKdcPolicy[] = -@@ -3228,7 +3228,7 @@ inline constexpr char kDeviceWeeklyScheduledSuspend[] +@@ -3245,7 +3245,7 @@ inline constexpr char kDeviceWeeklyScheduledSuspend[] #endif // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -62,7 +62,7 @@ // Defines administrator-set availability of Chrome for Testing. inline constexpr char kChromeForTestingAllowed[] = "chrome_for_testing.allowed"; #endif -@@ -3824,7 +3824,7 @@ inline constexpr char kFileOrDirectoryPickerWithoutGes +@@ -3836,7 +3836,7 @@ inline constexpr char kFileOrDirectoryPickerWithoutGes inline constexpr char kSandboxExternalProtocolBlocked[] = "profile.sandbox_external_protocol_blocked"; @@ -71,7 +71,7 @@ // Boolean that indicates if system notifications are allowed to be used in // place of Chrome notifications. inline constexpr char kAllowSystemNotifications[] = -@@ -4094,7 +4094,7 @@ inline constexpr char kLensDesktopNTPSearchEnabled[] = +@@ -4103,7 +4103,7 @@ inline constexpr char kLensDesktopNTPSearchEnabled[] = "policy.lens_desktop_ntp_search_enabled"; #endif @@ -80,7 +80,7 @@ // A dict mapping the edition name with the major version it was shown. inline constexpr char kWhatsNewEditionUsed[] = "browser.whats_new.edition_used"; // A list containing the features of each module in order of when they -@@ -4188,7 +4188,7 @@ inline constexpr char kPrintingOAuth2AuthorizationServ +@@ -4197,7 +4197,7 @@ inline constexpr char kPrintingOAuth2AuthorizationServ "printing.oauth2_authorization_servers"; #endif diff --git a/www/chromium/files/patch-chrome_common_url__constants.h b/www/chromium/files/patch-chrome_common_url__constants.h index 6be570d58c5f..ea0a8e0c600f 100644 --- a/www/chromium/files/patch-chrome_common_url__constants.h +++ b/www/chromium/files/patch-chrome_common_url__constants.h @@ -1,6 +1,6 @@ ---- chrome/common/url_constants.h.orig 2024-10-22 08:31:56 UTC +--- chrome/common/url_constants.h.orig 2024-11-14 07:57:23 UTC +++ chrome/common/url_constants.h -@@ -929,7 +929,7 @@ inline constexpr char kOutdatedPluginLearnMoreURL[] = +@@ -950,7 +950,7 @@ inline constexpr char kOutdatedPluginLearnMoreURL[] = inline constexpr char kPhoneHubPermissionLearnMoreURL[] = "https://support.google.com/chromebook?p=multidevice"; diff --git a/www/chromium/files/patch-chrome_common_webui__url__constants.h b/www/chromium/files/patch-chrome_common_webui__url__constants.h index 793bf92ee831..a11737eee192 100644 --- a/www/chromium/files/patch-chrome_common_webui__url__constants.h +++ b/www/chromium/files/patch-chrome_common_webui__url__constants.h @@ -1,6 +1,6 @@ ---- chrome/common/webui_url_constants.h.orig 2024-10-22 08:31:56 UTC +--- chrome/common/webui_url_constants.h.orig 2024-11-14 07:57:23 UTC +++ chrome/common/webui_url_constants.h -@@ -581,24 +581,24 @@ inline constexpr char16_t kOsUISystemURL[] = u"os://sy +@@ -578,24 +578,24 @@ inline constexpr char16_t kOsUISystemURL[] = u"os://sy inline constexpr char kOsUIVersionURL[] = "os://version"; #endif @@ -29,7 +29,7 @@ inline constexpr char kChromeUIWebAppSettingsHost[] = "app-settings"; inline constexpr char kChromeUIWebAppSettingsURL[] = "chrome://app-settings/"; inline constexpr char kChromeUIWhatsNewHost[] = "whats-new"; -@@ -610,13 +610,13 @@ inline constexpr char kChromeUILinuxProxyConfigHost[] +@@ -607,13 +607,13 @@ inline constexpr char kChromeUILinuxProxyConfigHost[] #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -45,7 +45,7 @@ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) inline constexpr char kChromeUIBrowserSwitchHost[] = "browser-switch"; inline constexpr char kChromeUIBrowserSwitchURL[] = "chrome://browser-switch/"; -@@ -638,7 +638,7 @@ inline constexpr char kChromeUIProfilePickerStartupQue +@@ -635,7 +635,7 @@ inline constexpr char kChromeUIProfilePickerStartupQue inline constexpr char kChromeUIProfilePickerUrl[] = "chrome://profile-picker/"; #endif diff --git a/www/chromium/files/patch-chrome_enterprise__companion_enterprise__companion__client.cc b/www/chromium/files/patch-chrome_enterprise__companion_enterprise__companion__client.cc index 962a46b0d4ba..4cf8324680fd 100644 --- a/www/chromium/files/patch-chrome_enterprise__companion_enterprise__companion__client.cc +++ b/www/chromium/files/patch-chrome_enterprise__companion_enterprise__companion__client.cc @@ -1,6 +1,6 @@ ---- chrome/enterprise_companion/enterprise_companion_client.cc.orig 2024-09-30 07:45:04 UTC +--- chrome/enterprise_companion/enterprise_companion_client.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/enterprise_companion/enterprise_companion_client.cc -@@ -36,7 +36,7 @@ namespace { +@@ -37,7 +37,7 @@ namespace { #if BUILDFLAG(IS_MAC) constexpr char kServerName[] = MAC_BUNDLE_IDENTIFIER_STRING ".service"; diff --git a/www/chromium/files/patch-chrome_updater_configurator.cc b/www/chromium/files/patch-chrome_updater_configurator.cc index 83d7d22fc698..18ba28b2f2e3 100644 --- a/www/chromium/files/patch-chrome_updater_configurator.cc +++ b/www/chromium/files/patch-chrome_updater_configurator.cc @@ -1,6 +1,6 @@ ---- chrome/updater/configurator.cc.orig 2024-10-22 08:31:56 UTC +--- chrome/updater/configurator.cc.orig 2024-11-14 07:57:23 UTC +++ chrome/updater/configurator.cc -@@ -69,7 +69,7 @@ Configurator::Configurator(scoped_refptr<UpdaterPrefs> +@@ -70,7 +70,7 @@ Configurator::Configurator(scoped_refptr<UpdaterPrefs> return std::nullopt; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) }()) { diff --git a/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc b/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc index 67a946b6e7ec..eda2fbee2783 100644 --- a/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc +++ b/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc @@ -1,4 +1,4 @@ ---- chromecast/browser/cast_browser_main_parts.cc.orig 2024-05-21 18:07:39 UTC +--- chromecast/browser/cast_browser_main_parts.cc.orig 2024-11-14 07:57:23 UTC +++ chromecast/browser/cast_browser_main_parts.cc @@ -94,7 +94,7 @@ #include "ui/ozone/public/ozone_platform.h" @@ -19,7 +19,7 @@ base::FilePath GetApplicationFontsDir() { std::unique_ptr<base::Environment> env(base::Environment::Create()); @@ -313,7 +313,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { - {cc::switches::kDisableThreadedAnimation, ""}, + {switches::kDisableThreadedAnimation, ""}, #endif // BUILDFLAG(IS_ANDROID) #endif // BUILDFLAG(IS_CAST_AUDIO_ONLY) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-chromecast_cast__core_runtime_browser_runtime__application__service__impl.cc b/www/chromium/files/patch-chromecast_cast__core_runtime_browser_runtime__application__service__impl.cc index 769ad26c85f6..cad07919f30e 100644 --- a/www/chromium/files/patch-chromecast_cast__core_runtime_browser_runtime__application__service__impl.cc +++ b/www/chromium/files/patch-chromecast_cast__core_runtime_browser_runtime__application__service__impl.cc @@ -1,11 +1,11 @@ ---- chromecast/cast_core/runtime/browser/runtime_application_service_impl.cc.orig 2024-07-30 11:12:21 UTC +--- chromecast/cast_core/runtime/browser/runtime_application_service_impl.cc.orig 2024-11-14 07:57:23 UTC +++ chromecast/cast_core/runtime/browser/runtime_application_service_impl.cc -@@ -336,7 +336,7 @@ CastWebView::Scoped RuntimeApplicationServiceImpl::Cre - GetFlagEntry(feature::kCastCoreIsRemoteControlMode, - config_.extra_features(), /*default_value=*/false); - params->enabled_for_dev = IsEnabledForDev(); +@@ -346,7 +346,7 @@ CastWebView::Scoped RuntimeApplicationServiceImpl::Cre + params->force_720p_resolution = + GetFlagEntry(feature::kCastCoreForce720p, config_.extra_features(), + /*default_value=*/false); -#if BUILDFLAG(ENABLE_CAST_RECEIVER) && BUILDFLAG(IS_LINUX) +#if BUILDFLAG(ENABLE_CAST_RECEIVER) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) - // cast_receiver::ApplicationControlsImpl constructs an instance of - // url_rewrite::UrlRequestRewriteRulesManager. CastWebContentsImpl should NOT - // construct its own instance, or UrlRequestRulesReceiver will crash when a + // Starboard-based (linux) cast receivers may not render their UI at 720p, so + // we need to scale to the proper resolution. For example, a 4k TV may render + // the window at 1920x1080, so a scaling factor of 1.5 is necessary for a 720p diff --git a/www/chromium/files/patch-components_autofill_core_browser_payments__data__manager.cc b/www/chromium/files/patch-components_autofill_core_browser_payments__data__manager.cc index c3acb38f6873..62c68a4896cd 100644 --- a/www/chromium/files/patch-components_autofill_core_browser_payments__data__manager.cc +++ b/www/chromium/files/patch-components_autofill_core_browser_payments__data__manager.cc @@ -1,6 +1,6 @@ ---- components/autofill/core/browser/payments_data_manager.cc.orig 2024-10-22 08:31:56 UTC +--- components/autofill/core/browser/payments_data_manager.cc.orig 2024-11-14 07:57:23 UTC +++ components/autofill/core/browser/payments_data_manager.cc -@@ -1054,7 +1054,7 @@ bool PaymentsDataManager::ShouldShowCardsFromAccountOp +@@ -1095,7 +1095,7 @@ bool PaymentsDataManager::ShouldShowCardsFromAccountOp // The feature is only for Linux, Windows, Mac, and Fuchsia. // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc b/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc index 273679b309c7..34ddb15bbc6c 100644 --- a/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc +++ b/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc @@ -1,4 +1,4 @@ ---- components/autofill/core/common/autofill_payments_features.cc.orig 2024-10-22 08:31:56 UTC +--- components/autofill/core/common/autofill_payments_features.cc.orig 2024-11-14 07:57:23 UTC +++ components/autofill/core/common/autofill_payments_features.cc @@ -8,7 +8,7 @@ @@ -9,7 +9,7 @@ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) // When enabled, Chrome will extract the checkout amount from the checkout page // of the allowlisted merchant websites. -@@ -320,7 +320,7 @@ BASE_FEATURE(kAutofillSyncEwalletAccounts, +@@ -331,7 +331,7 @@ BASE_FEATURE(kAutofillSyncEwalletAccounts, bool ShouldShowImprovedUserConsentForCreditCardSave() { // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-components_commerce_core_commerce__feature__list.cc b/www/chromium/files/patch-components_commerce_core_commerce__feature__list.cc index f70422eb9597..07bbf1714d0c 100644 --- a/www/chromium/files/patch-components_commerce_core_commerce__feature__list.cc +++ b/www/chromium/files/patch-components_commerce_core_commerce__feature__list.cc @@ -1,4 +1,4 @@ ---- components/commerce/core/commerce_feature_list.cc.orig 2024-10-22 08:31:56 UTC +--- components/commerce/core/commerce_feature_list.cc.orig 2024-11-14 07:57:23 UTC +++ components/commerce/core/commerce_feature_list.cc @@ -168,7 +168,7 @@ BASE_FEATURE(kPriceInsights, "PriceInsights", @@ -9,7 +9,7 @@ BASE_FEATURE(kPriceInsightsRegionLaunched, "PriceInsightsRegionLaunched", base::FEATURE_ENABLED_BY_DEFAULT); -@@ -246,7 +246,7 @@ const base::FeatureParam<bool> kDiscountOnShoppyPage{ +@@ -250,7 +250,7 @@ const base::FeatureParam<bool> kDiscountOnShoppyPage{ &kEnableDiscountInfoApi, kDiscountOnShoppyPageParam, false}; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -18,7 +18,7 @@ BASE_FEATURE(kEnableDiscountInfoApiRegionLaunched, "EnableDiscountInfoApiRegionLaunched", base::FEATURE_ENABLED_BY_DEFAULT); -@@ -281,7 +281,7 @@ const base::FeatureParam<bool> kDeleteAllMerchantsOnCl +@@ -289,7 +289,7 @@ const base::FeatureParam<bool> kDeleteAllMerchantsOnCl BASE_FEATURE(kShoppingList, "ShoppingList", base::FEATURE_DISABLED_BY_DEFAULT); #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ diff --git a/www/chromium/files/patch-components_device__signals_core_common_signals__features.cc b/www/chromium/files/patch-components_device__signals_core_common_signals__features.cc index 776994b16213..34a6aa346dde 100644 --- a/www/chromium/files/patch-components_device__signals_core_common_signals__features.cc +++ b/www/chromium/files/patch-components_device__signals_core_common_signals__features.cc @@ -1,6 +1,6 @@ ---- components/device_signals/core/common/signals_features.cc.orig 2023-08-17 07:33:31 UTC +--- components/device_signals/core/common/signals_features.cc.orig 2024-11-14 07:57:23 UTC +++ components/device_signals/core/common/signals_features.cc -@@ -46,7 +46,7 @@ bool IsNewFunctionEnabled(NewEvFunction new_ev_functio +@@ -50,7 +50,7 @@ bool IsNewFunctionEnabled(NewEvFunction new_ev_functio } #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ diff --git a/www/chromium/files/patch-components_device__signals_core_common_signals__features.h b/www/chromium/files/patch-components_device__signals_core_common_signals__features.h index 14669ecc9c48..8fe0844de5a5 100644 --- a/www/chromium/files/patch-components_device__signals_core_common_signals__features.h +++ b/www/chromium/files/patch-components_device__signals_core_common_signals__features.h @@ -1,6 +1,6 @@ ---- components/device_signals/core/common/signals_features.h.orig 2023-08-17 07:33:31 UTC +--- components/device_signals/core/common/signals_features.h.orig 2024-11-14 07:57:23 UTC +++ components/device_signals/core/common/signals_features.h -@@ -28,7 +28,7 @@ enum class NewEvFunction { kFileSystemInfo, kSettings, +@@ -31,7 +31,7 @@ enum class NewEvFunction { kFileSystemInfo, kSettings, bool IsNewFunctionEnabled(NewEvFunction new_ev_function); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ diff --git a/www/chromium/files/patch-components_feature__engagement_public_event__constants.cc b/www/chromium/files/patch-components_feature__engagement_public_event__constants.cc index e2eaf62b7d02..7d0fe1c50202 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_event__constants.cc +++ b/www/chromium/files/patch-components_feature__engagement_public_event__constants.cc @@ -1,4 +1,4 @@ ---- components/feature_engagement/public/event_constants.cc.orig 2022-02-28 16:54:41 UTC +--- components/feature_engagement/public/event_constants.cc.orig 2024-11-14 07:57:23 UTC +++ components/feature_engagement/public/event_constants.cc @@ -11,7 +11,7 @@ namespace feature_engagement { namespace events { @@ -8,4 +8,4 @@ + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) const char kNewTabOpened[] = "new_tab_opened"; const char kSixthTabOpened[] = "sixth_tab_opened"; - const char kTabGroupCreated[] = "tab_group_created"; + const char kReadingListItemAdded[] = "reading_list_item_added"; diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc index a16f4ec731a2..a4371eb77e44 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc @@ -1,4 +1,4 @@ ---- components/feature_engagement/public/feature_constants.cc.orig 2024-10-22 08:31:56 UTC +--- components/feature_engagement/public/feature_constants.cc.orig 2024-11-14 07:57:23 UTC +++ components/feature_engagement/public/feature_constants.cc @@ -18,7 +18,7 @@ BASE_FEATURE(kIPHDemoMode, "IPH_DemoMode", base::FEATU BASE_FEATURE(kIPHDummyFeature, "IPH_Dummy", base::FEATURE_DISABLED_BY_DEFAULT); @@ -9,7 +9,7 @@ #if BUILDFLAG(GOOGLE_CHROME_BRANDING) BASE_FEATURE(kEsbDownloadRowPromoFeature, "EsbDownloadRowPromo", -@@ -639,7 +639,8 @@ BASE_FEATURE(kDefaultBrowserTriggerCriteriaExperiment, +@@ -646,7 +646,8 @@ BASE_FEATURE(kDefaultBrowserTriggerCriteriaExperiment, #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -19,7 +19,7 @@ BASE_FEATURE(kIPHAutofillCreditCardBenefitFeature, "IPH_AutofillCreditCardBenefit", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -776,7 +777,7 @@ BASE_FEATURE(kIPHScalableIphGamingFeature, +@@ -786,7 +787,7 @@ BASE_FEATURE(kIPHScalableIphGamingFeature, base::FEATURE_DISABLED_BY_DEFAULT); #endif diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h index bcac552a4d1c..7e4f5dd718e9 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h @@ -1,4 +1,4 @@ ---- components/feature_engagement/public/feature_constants.h.orig 2024-10-22 08:31:56 UTC +--- components/feature_engagement/public/feature_constants.h.orig 2024-11-14 07:57:23 UTC +++ components/feature_engagement/public/feature_constants.h @@ -20,7 +20,7 @@ BASE_DECLARE_FEATURE(kIPHDemoMode); BASE_DECLARE_FEATURE(kIPHDummyFeature); @@ -9,7 +9,7 @@ #if BUILDFLAG(GOOGLE_CHROME_BRANDING) BASE_DECLARE_FEATURE(kEsbDownloadRowPromoFeature); #endif -@@ -258,7 +258,8 @@ BASE_DECLARE_FEATURE(kDefaultBrowserTriggerCriteriaExp +@@ -261,7 +261,8 @@ BASE_DECLARE_FEATURE(kDefaultBrowserTriggerCriteriaExp #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -19,7 +19,7 @@ BASE_DECLARE_FEATURE(kIPHAutofillCreditCardBenefitFeature); BASE_DECLARE_FEATURE(kIPHAutofillDisabledVirtualCardSuggestionFeature); BASE_DECLARE_FEATURE(kIPHAutofillExternalAccountProfileSuggestionFeature); -@@ -309,7 +310,7 @@ BASE_DECLARE_FEATURE(kIPHScalableIphHelpAppBasedTenFea +@@ -313,7 +314,7 @@ BASE_DECLARE_FEATURE(kIPHScalableIphHelpAppBasedTenFea BASE_DECLARE_FEATURE(kIPHScalableIphGamingFeature); #endif diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc b/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc index c741213e074d..632f422cb795 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc @@ -1,6 +1,6 @@ ---- components/feature_engagement/public/feature_list.cc.orig 2024-10-22 08:31:56 UTC +--- components/feature_engagement/public/feature_list.cc.orig 2024-11-14 07:57:23 UTC +++ components/feature_engagement/public/feature_list.cc -@@ -165,7 +165,7 @@ const base::Feature* const kAllFeatures[] = { +@@ -162,7 +162,7 @@ const base::Feature* const kAllFeatures[] = { &kIPHiOSLensOverlayEntrypointTipFeature, #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -19,7 +19,7 @@ &kIPHAutofillCreditCardBenefitFeature, &kIPHAutofillDisabledVirtualCardSuggestionFeature, &kIPHAutofillExternalAccountProfileSuggestionFeature, -@@ -281,7 +282,7 @@ const base::Feature* const kAllFeatures[] = { +@@ -282,7 +283,7 @@ const base::Feature* const kAllFeatures[] = { &kIPHScalableIphGamingFeature, #endif // BUILDFLAG(IS_CHROMEOS_ASH) diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__list.h b/www/chromium/files/patch-components_feature__engagement_public_feature__list.h index aefecd3be49a..19fda397b512 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_feature__list.h +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__list.h @@ -1,6 +1,6 @@ ---- components/feature_engagement/public/feature_list.h.orig 2024-10-22 08:31:56 UTC +--- components/feature_engagement/public/feature_list.h.orig 2024-11-14 07:57:23 UTC +++ components/feature_engagement/public/feature_list.h -@@ -288,7 +288,7 @@ DEFINE_VARIATION_PARAM(kIPHHomeCustomizationMenuFeatur +@@ -282,7 +282,7 @@ DEFINE_VARIATION_PARAM(kIPHHomeCustomizationMenuFeatur #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ #if BUILDFLAG(GOOGLE_CHROME_BRANDING) DEFINE_VARIATION_PARAM(kEsbDownloadRowPromoFeature, "EsbDownloadRowPromo"); #endif -@@ -389,7 +389,8 @@ DEFINE_VARIATION_PARAM(kIPHTabGroupsSaveV2CloseGroupFe +@@ -388,7 +388,8 @@ DEFINE_VARIATION_PARAM(kIPHTabGroupsSaveV2CloseGroupFe // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -19,7 +19,7 @@ DEFINE_VARIATION_PARAM(kIPHAutofillCreditCardBenefitFeature, "IPH_AutofillCreditCardBenefit"); -@@ -481,7 +482,7 @@ DEFINE_VARIATION_PARAM(kIPHScalableIphHelpAppBasedTenF +@@ -482,7 +483,7 @@ DEFINE_VARIATION_PARAM(kIPHScalableIphHelpAppBasedTenF DEFINE_VARIATION_PARAM(kIPHScalableIphGamingFeature, "IPH_ScalableIphGaming"); #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -28,7 +28,7 @@ DEFINE_VARIATION_PARAM(kIPHDesktopPWAsLinkCapturingLaunch, "IPH_DesktopPWAsLinkCapturingLaunch"); DEFINE_VARIATION_PARAM(kIPHToolbarManagementButtonFeature, -@@ -646,7 +647,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation +@@ -644,7 +645,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation VARIATION_ENTRY(kIPHHomeCustomizationMenuFeature), VARIATION_ENTRY(kIPHiOSLensOverlayEntrypointTipFeature), #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -37,7 +37,7 @@ VARIATION_ENTRY(kIPHBatterySaverModeFeature), VARIATION_ENTRY(kIPHCompanionSidePanelFeature), VARIATION_ENTRY(kIPHCompanionSidePanelRegionSearchFeature), -@@ -701,7 +702,8 @@ constexpr flags_ui::FeatureEntry::FeatureVariation +@@ -700,7 +701,8 @@ constexpr flags_ui::FeatureEntry::FeatureVariation // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -47,7 +47,7 @@ VARIATION_ENTRY(kIPHAutofillCreditCardBenefitFeature), VARIATION_ENTRY(kIPHAutofillDisabledVirtualCardSuggestionFeature), VARIATION_ENTRY(kIPHAutofillExternalAccountProfileSuggestionFeature), -@@ -753,7 +755,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation +@@ -752,7 +754,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation VARIATION_ENTRY(kIPHScalableIphGamingFeature), #endif // BUILDFLAG(IS_CHROMEOS_ASH) diff --git a/www/chromium/files/patch-components_media__router_common_providers_cast_channel_enum__table.h b/www/chromium/files/patch-components_media__router_common_providers_cast_channel_enum__table.h index 7f893f33578a..0543d3ba788d 100644 --- a/www/chromium/files/patch-components_media__router_common_providers_cast_channel_enum__table.h +++ b/www/chromium/files/patch-components_media__router_common_providers_cast_channel_enum__table.h @@ -1,6 +1,4 @@ -diff --git components/media_router/common/providers/cast/channel/enum_table.h components/media_router/common/providers/cast/channel/enum_table.h 2024-11-02 08:11:27 UTC -index 18fd272c6a..ad9ec2c243 100644 ---- components/media_router/common/providers/cast/channel/enum_table.h +--- components/media_router/common/providers/cast/channel/enum_table.h.orig 2024-11-14 07:57:23 UTC +++ components/media_router/common/providers/cast/channel/enum_table.h @@ -368,7 +368,12 @@ class EnumTable { diff --git a/www/chromium/files/patch-components_metrics_dwa_dwa__service.cc b/www/chromium/files/patch-components_metrics_dwa_dwa__service.cc new file mode 100644 index 000000000000..3fe2ed918c50 --- /dev/null +++ b/www/chromium/files/patch-components_metrics_dwa_dwa__service.cc @@ -0,0 +1,11 @@ +--- components/metrics/dwa/dwa_service.cc.orig 2024-11-14 07:57:23 UTC ++++ components/metrics/dwa/dwa_service.cc +@@ -88,7 +88,7 @@ void DwaService::RecordCoarseSystemInformation( + coarse_system_info->set_platform(::dwa::CoarseSystemInfo::PLATFORM_WINDOWS); + #elif BUILDFLAG(IS_MAC) + coarse_system_info->set_platform(::dwa::CoarseSystemInfo::PLATFORM_MACOS); +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + coarse_system_info->set_platform(::dwa::CoarseSystemInfo::PLATFORM_LINUX); + #elif BUILDFLAG(IS_ANDROID) + // TODO(b/366276323): Populate set_platform using more granular diff --git a/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc b/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc deleted file mode 100644 index ca60cd2dcd40..000000000000 --- a/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- components/network_session_configurator/browser/network_session_configurator.cc.orig 2024-10-22 08:31:56 UTC -+++ components/network_session_configurator/browser/network_session_configurator.cc -@@ -849,7 +849,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C - // backport, having it behave differently than in stable would be a bigger - // problem. TODO: Does this work in later macOS releases? - #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ -- BUILDFLAG(IS_MAC) -+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - return net::URLRequestContextBuilder::HttpCacheParams::DISK_SIMPLE; - #else - return net::URLRequestContextBuilder::HttpCacheParams::DISK_BLOCKFILE; diff --git a/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator__unittest.cc b/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator__unittest.cc deleted file mode 100644 index 878e509e7640..000000000000 --- a/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator__unittest.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- components/network_session_configurator/browser/network_session_configurator_unittest.cc.orig 2024-10-22 08:31:56 UTC -+++ components/network_session_configurator/browser/network_session_configurator_unittest.cc -@@ -855,7 +855,7 @@ TEST_F(NetworkSessionConfiguratorTest, HostRules) { - - TEST_F(NetworkSessionConfiguratorTest, DefaultCacheBackend) { - #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ -- BUILDFLAG(IS_MAC) -+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - EXPECT_EQ(net::URLRequestContextBuilder::HttpCacheParams::DISK_SIMPLE, - ChooseCacheType()); - #else diff --git a/www/chromium/files/patch-components_optimization__guide_core_optimization__guide__features.cc b/www/chromium/files/patch-components_optimization__guide_core_optimization__guide__features.cc new file mode 100644 index 000000000000..7613c8caa55e --- /dev/null +++ b/www/chromium/files/patch-components_optimization__guide_core_optimization__guide__features.cc @@ -0,0 +1,11 @@ +--- components/optimization_guide/core/optimization_guide_features.cc.orig 2024-11-14 07:57:23 UTC ++++ components/optimization_guide/core/optimization_guide_features.cc +@@ -140,7 +140,7 @@ BASE_FEATURE(kOptimizationGuideModelExecution, + // Whether to use the on device model service in optimization guide. + BASE_FEATURE(kOptimizationGuideOnDeviceModel, + "OptimizationGuideOnDeviceModel", +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + base::FEATURE_ENABLED_BY_DEFAULT); + #else + base::FEATURE_DISABLED_BY_DEFAULT); diff --git a/www/chromium/files/patch-components_optimization__guide_core_optimization__guide__util.cc b/www/chromium/files/patch-components_optimization__guide_core_optimization__guide__util.cc index 515b7da9085d..bfd5088276d5 100644 --- a/www/chromium/files/patch-components_optimization__guide_core_optimization__guide__util.cc +++ b/www/chromium/files/patch-components_optimization__guide_core_optimization__guide__util.cc @@ -1,6 +1,6 @@ ---- components/optimization_guide/core/optimization_guide_util.cc.orig 2024-07-30 11:12:21 UTC +--- components/optimization_guide/core/optimization_guide_util.cc.orig 2024-11-14 07:57:23 UTC +++ components/optimization_guide/core/optimization_guide_util.cc -@@ -35,7 +35,7 @@ optimization_guide::proto::Platform GetPlatform() { +@@ -37,7 +37,7 @@ optimization_guide::proto::Platform GetPlatform() { return optimization_guide::proto::PLATFORM_CHROMEOS; #elif BUILDFLAG(IS_ANDROID) return optimization_guide::proto::PLATFORM_ANDROID; diff --git a/www/chromium/files/patch-components_password__manager_core_browser_features_password__features.cc b/www/chromium/files/patch-components_password__manager_core_browser_features_password__features.cc index ac43a422645a..ef80381efd60 100644 --- a/www/chromium/files/patch-components_password__manager_core_browser_features_password__features.cc +++ b/www/chromium/files/patch-components_password__manager_core_browser_features_password__features.cc @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/features/password_features.cc.orig 2024-10-22 08:31:56 UTC +--- components/password_manager/core/browser/features/password_features.cc.orig 2024-11-14 07:57:23 UTC +++ components/password_manager/core/browser/features/password_features.cc -@@ -41,7 +41,7 @@ BASE_FEATURE(kClearUndecryptablePasswords, +@@ -45,7 +45,7 @@ BASE_FEATURE(kClearUndecryptablePasswords, BASE_FEATURE(kClearUndecryptablePasswordsOnSync, "ClearUndecryptablePasswordsInSync", #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_IOS) || \ @@ -9,8 +9,8 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -92,7 +92,7 @@ BASE_FEATURE(kPasswordManualFallbackAvailable, - "PasswordManualFallbackAvailable", +@@ -108,7 +108,7 @@ BASE_FEATURE(kReuseDetectionBasedOnPasswordHashes, + "ReuseDetectionBasedOnPasswordHashes", base::FEATURE_DISABLED_BY_DEFAULT); -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) diff --git a/www/chromium/files/patch-components_password__manager_core_browser_features_password__features.h b/www/chromium/files/patch-components_password__manager_core_browser_features_password__features.h index 6dfee4f65d4c..01700d88ebf5 100644 --- a/www/chromium/files/patch-components_password__manager_core_browser_features_password__features.h +++ b/www/chromium/files/patch-components_password__manager_core_browser_features_password__features.h @@ -1,8 +1,8 @@ ---- components/password_manager/core/browser/features/password_features.h.orig 2024-10-22 08:31:56 UTC +--- components/password_manager/core/browser/features/password_features.h.orig 2024-11-14 07:57:23 UTC +++ components/password_manager/core/browser/features/password_features.h -@@ -93,7 +93,7 @@ BASE_DECLARE_FEATURE(kPasswordManagerLogToTerminal); - // Enables triggering password suggestions through the context menu. - BASE_DECLARE_FEATURE(kPasswordManualFallbackAvailable); +@@ -106,7 +106,7 @@ BASE_DECLARE_FEATURE(kPasswordManualFallbackAvailable) + // Detects password reuse based on hashed password values. + BASE_DECLARE_FEATURE(kReuseDetectionBasedOnPasswordHashes); -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/chromium/files/patch-components_password__manager_core_browser_password__manager.cc b/www/chromium/files/patch-components_password__manager_core_browser_password__manager.cc index 2dd0b725a063..da507ef6e393 100644 --- a/www/chromium/files/patch-components_password__manager_core_browser_password__manager.cc +++ b/www/chromium/files/patch-components_password__manager_core_browser_password__manager.cc @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/password_manager.cc.orig 2024-09-30 07:45:04 UTC +--- components/password_manager/core/browser/password_manager.cc.orig 2024-11-14 07:57:23 UTC +++ components/password_manager/core/browser/password_manager.cc -@@ -414,7 +414,7 @@ void PasswordManager::RegisterProfilePrefs( +@@ -419,7 +419,7 @@ void PasswordManager::RegisterProfilePrefs( prefs::kAutofillableCredentialsAccountStoreLoginDatabase, false); #endif // BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS) registry->RegisterBooleanPref(prefs::kPasswordSharingEnabled, true); @@ -9,7 +9,7 @@ registry->RegisterIntegerPref(prefs::kRelaunchChromeBubbleDismissedCounter, 0); #endif -@@ -427,7 +427,7 @@ void PasswordManager::RegisterProfilePrefs( +@@ -432,7 +432,7 @@ void PasswordManager::RegisterProfilePrefs( #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-components_password__manager_core_browser_password__manager__client.h b/www/chromium/files/patch-components_password__manager_core_browser_password__manager__client.h index 8610a7ba5307..acfa874fc7e2 100644 --- a/www/chromium/files/patch-components_password__manager_core_browser_password__manager__client.h +++ b/www/chromium/files/patch-components_password__manager_core_browser_password__manager__client.h @@ -1,4 +1,4 @@ ---- components/password_manager/core/browser/password_manager_client.h.orig 2024-10-22 08:31:56 UTC +--- components/password_manager/core/browser/password_manager_client.h.orig 2024-11-14 07:57:23 UTC +++ components/password_manager/core/browser/password_manager_client.h @@ -30,7 +30,7 @@ #include "net/cert/cert_status_flags.h" @@ -9,7 +9,7 @@ #include "base/i18n/rtl.h" #include "components/password_manager/core/browser/password_cross_domain_confirmation_popup_controller.h" #include "ui/gfx/geometry/rect_f.h" -@@ -545,7 +545,7 @@ class PasswordManagerClient { +@@ -551,7 +551,7 @@ class PasswordManagerClient { CredentialsCallback callback); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ diff --git a/www/chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.cc b/www/chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.cc index cf5bb1a9ef66..3960702d7052 100644 --- a/www/chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.cc +++ b/www/chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.cc @@ -1,4 +1,4 @@ ---- components/password_manager/core/browser/password_manual_fallback_flow.cc.orig 2024-10-22 08:31:56 UTC +--- components/password_manager/core/browser/password_manual_fallback_flow.cc.orig 2024-11-14 07:57:23 UTC +++ components/password_manager/core/browser/password_manual_fallback_flow.cc @@ -43,7 +43,7 @@ std::u16string GetUsernameFromLabel(const std::u16stri } @@ -18,7 +18,7 @@ std::optional<password_manager::PasswordForm> credentials = GetCorrespondingPasswordForm( suggestion.GetPayload<Suggestion::PasswordSuggestionDetails>(), -@@ -413,7 +413,7 @@ void PasswordManualFallbackFlow::EnsureCrossDomainPass +@@ -418,7 +418,7 @@ void PasswordManualFallbackFlow::EnsureCrossDomainPass const Suggestion::PasswordSuggestionDetails& payload, base::OnceClosure on_allowed) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ diff --git a/www/chromium/files/patch-components_password__manager_core_browser_stub__password__manager__client.cc b/www/chromium/files/patch-components_password__manager_core_browser_stub__password__manager__client.cc index b78b8a31d10f..e9166c8c679b 100644 --- a/www/chromium/files/patch-components_password__manager_core_browser_stub__password__manager__client.cc +++ b/www/chromium/files/patch-components_password__manager_core_browser_stub__password__manager__client.cc @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/stub_password_manager_client.cc.orig 2024-10-22 08:31:56 UTC +--- components/password_manager/core/browser/stub_password_manager_client.cc.orig 2024-11-14 07:57:23 UTC +++ components/password_manager/core/browser/stub_password_manager_client.cc -@@ -187,7 +187,7 @@ version_info::Channel StubPasswordManagerClient::GetCh +@@ -190,7 +190,7 @@ version_info::Channel StubPasswordManagerClient::GetCh } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ diff --git a/www/chromium/files/patch-components_performance__manager_decorators_process__metrics__decorator.cc b/www/chromium/files/patch-components_performance__manager_decorators_process__metrics__decorator.cc new file mode 100644 index 000000000000..8031f0f8627d --- /dev/null +++ b/www/chromium/files/patch-components_performance__manager_decorators_process__metrics__decorator.cc @@ -0,0 +1,11 @@ +--- components/performance_manager/decorators/process_metrics_decorator.cc.orig 2024-11-14 07:57:23 UTC ++++ components/performance_manager/decorators/process_metrics_decorator.cc +@@ -264,7 +264,7 @@ void ProcessMetricsDecorator::DidGetMemoryUsage( + // RSS and PMF to each node proportionally to its V8 heap size. + uint64_t process_rss = process_dump_iter.os_dump().resident_set_kb; + process_node->set_resident_set_kb(process_rss); +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + process_node->set_private_swap_kb( + process_dump_iter.os_dump().private_footprint_swap_kb); + #endif diff --git a/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc b/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc index f6d626ae9731..d3c58b09fbcc 100644 --- a/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc +++ b/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc @@ -1,6 +1,6 @@ ---- components/policy/core/common/cloud/cloud_policy_client.cc.orig 2024-10-22 08:31:56 UTC +--- components/policy/core/common/cloud/cloud_policy_client.cc.orig 2024-11-14 07:57:23 UTC +++ components/policy/core/common/cloud/cloud_policy_client.cc -@@ -703,7 +703,7 @@ void CloudPolicyClient::FetchPolicy(PolicyFetchReason +@@ -720,7 +720,7 @@ void CloudPolicyClient::FetchPolicy(PolicyFetchReason fetch_request->set_invalidation_payload(invalidation_payload_); } } diff --git a/www/chromium/files/patch-components_safe__browsing_core_common_features.cc b/www/chromium/files/patch-components_safe__browsing_core_common_features.cc index 150c858666e8..9be8ca3f47ed 100644 --- a/www/chromium/files/patch-components_safe__browsing_core_common_features.cc +++ b/www/chromium/files/patch-components_safe__browsing_core_common_features.cc @@ -1,6 +1,6 @@ ---- components/safe_browsing/core/common/features.cc.orig 2024-10-22 08:31:56 UTC +--- components/safe_browsing/core/common/features.cc.orig 2024-11-14 07:57:23 UTC +++ components/safe_browsing/core/common/features.cc -@@ -237,7 +237,7 @@ BASE_FEATURE(kRippleForEnhancedProtection, +@@ -249,7 +249,7 @@ constexpr base::FeatureParam<std::string> kRedWarningS BASE_FEATURE(kSafeBrowsingAsyncRealTimeCheck, "SafeBrowsingAsyncRealTimeCheck", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-components_search__engines_search__engine__choice_search__engine__choice__service.cc b/www/chromium/files/patch-components_search__engines_search__engine__choice_search__engine__choice__service.cc index ec0be06ae29d..8ae3c6b455de 100644 --- a/www/chromium/files/patch-components_search__engines_search__engine__choice_search__engine__choice__service.cc +++ b/www/chromium/files/patch-components_search__engines_search__engine__choice_search__engine__choice__service.cc @@ -1,6 +1,6 @@ ---- components/search_engines/search_engine_choice/search_engine_choice_service.cc.orig 2024-10-22 08:31:56 UTC +--- components/search_engines/search_engine_choice/search_engine_choice_service.cc.orig 2024-11-14 07:57:23 UTC +++ components/search_engines/search_engine_choice/search_engine_choice_service.cc -@@ -594,7 +594,7 @@ void SearchEngineChoiceService::RegisterLocalStatePref +@@ -613,7 +613,7 @@ void SearchEngineChoiceService::RegisterLocalStatePref int SearchEngineChoiceService::GetCountryIdInternal() { // `country_codes::kCountryIDAtInstall` may not be set yet. diff --git a/www/chromium/files/patch-components_search__engines_template__url__service.cc b/www/chromium/files/patch-components_search__engines_template__url__service.cc index 8e9b5efbf323..f0aa30c1a827 100644 --- a/www/chromium/files/patch-components_search__engines_template__url__service.cc +++ b/www/chromium/files/patch-components_search__engines_template__url__service.cc @@ -1,6 +1,6 @@ ---- components/search_engines/template_url_service.cc.orig 2024-10-22 08:31:56 UTC +--- components/search_engines/template_url_service.cc.orig 2024-11-14 07:57:23 UTC +++ components/search_engines/template_url_service.cc -@@ -3060,7 +3060,7 @@ bool TemplateURLService::MatchesDefaultSearchProvider( +@@ -3069,7 +3069,7 @@ bool TemplateURLService::MatchesDefaultSearchProvider( std::unique_ptr<EnterpriseSiteSearchManager> TemplateURLService::GetEnterpriseSiteSearchManager(PrefService* prefs) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-components_services_on__device__translation_sandbox__hook.cc b/www/chromium/files/patch-components_services_on__device__translation_sandbox__hook.cc new file mode 100644 index 000000000000..3abf4d20fa2a --- /dev/null +++ b/www/chromium/files/patch-components_services_on__device__translation_sandbox__hook.cc @@ -0,0 +1,43 @@ +--- components/services/on_device_translation/sandbox_hook.cc.orig 2024-11-14 07:57:23 UTC ++++ components/services/on_device_translation/sandbox_hook.cc +@@ -7,12 +7,15 @@ + #include "components/services/on_device_translation/translate_kit_client.h" + #include "sandbox/linux/syscall_broker/broker_command.h" + ++#if !BUILDFLAG(IS_BSD) + using sandbox::syscall_broker::BrokerFilePermission; + using sandbox::syscall_broker::MakeBrokerCommandSet; ++#endif + + namespace on_device_translation { + namespace { + ++#if !BUILDFLAG(IS_BSD) + // Gets the file permissions required by the TranslateKit + std::vector<BrokerFilePermission> GetOnDeviceTranslationFilePermissions() { + std::vector<BrokerFilePermission> permissions{ +@@ -21,6 +24,7 @@ std::vector<BrokerFilePermission> GetOnDeviceTranslati + }; + return permissions; + } ++#endif + + } // namespace + +@@ -29,6 +33,7 @@ bool OnDeviceTranslationSandboxHook( + // Call `TranslateKitClient::Get()` to load libtranslatekit.so + TranslateKitClient::Get(); + ++#if !BUILDFLAG(IS_BSD) + auto* instance = sandbox::policy::SandboxLinux::GetInstance(); + instance->StartBrokerProcess(MakeBrokerCommandSet({ + sandbox::syscall_broker::COMMAND_OPEN, +@@ -36,7 +41,7 @@ bool OnDeviceTranslationSandboxHook( + GetOnDeviceTranslationFilePermissions(), + options); + instance->EngageNamespaceSandboxIfPossible(); +- ++#endif + return true; + } + diff --git a/www/chromium/files/patch-components_services_on__device__translation_sandbox__hook.h b/www/chromium/files/patch-components_services_on__device__translation_sandbox__hook.h new file mode 100644 index 000000000000..d27468a99063 --- /dev/null +++ b/www/chromium/files/patch-components_services_on__device__translation_sandbox__hook.h @@ -0,0 +1,16 @@ +--- components/services/on_device_translation/sandbox_hook.h.orig 2024-11-14 07:57:23 UTC ++++ components/services/on_device_translation/sandbox_hook.h +@@ -5,7 +5,13 @@ + #ifndef COMPONENTS_SERVICES_ON_DEVICE_TRANSLATION_SANDBOX_HOOK_H_ + #define COMPONENTS_SERVICES_ON_DEVICE_TRANSLATION_SANDBOX_HOOK_H_ + ++#include "build/build_config.h" ++ ++#if BUILDFLAG(IS_BSD) ++#include "sandbox/policy/sandbox.h" ++#else + #include "sandbox/policy/linux/sandbox_linux.h" ++#endif + + namespace on_device_translation { + diff --git a/www/chromium/files/patch-components_supervised__user_core_common_features.cc b/www/chromium/files/patch-components_supervised__user_core_common_features.cc index cd5634d0d346..84fdac14a16a 100644 --- a/www/chromium/files/patch-components_supervised__user_core_common_features.cc +++ b/www/chromium/files/patch-components_supervised__user_core_common_features.cc @@ -1,4 +1,4 @@ ---- components/supervised_user/core/common/features.cc.orig 2024-10-22 08:31:56 UTC +--- components/supervised_user/core/common/features.cc.orig 2024-11-14 07:57:23 UTC +++ components/supervised_user/core/common/features.cc @@ -66,7 +66,7 @@ BASE_FEATURE(kUpdatedSupervisedUserExtensionApprovalSt "UpdatedSupervisedUserExtensionApprovalStrings", @@ -43,3 +43,12 @@ BASE_FEATURE(kForceSupervisedUserReauthenticationForYouTube, "ForceSupervisedUserReauthenticationForYouTube", base::FEATURE_DISABLED_BY_DEFAULT); +@@ -172,7 +172,7 @@ BASE_FEATURE(kReplaceSupervisionSystemCapabilitiesWith + + BASE_FEATURE(kFetchListFamilyMembersWithCapability, + "FetchListFamilyMembersWithCapability", +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + base::FEATURE_ENABLED_BY_DEFAULT + #else + base::FEATURE_DISABLED_BY_DEFAULT diff --git a/www/chromium/files/patch-components_viz_service_display_skia__renderer.cc b/www/chromium/files/patch-components_viz_service_display_skia__renderer.cc index 7c918ed9c215..15ec90d2b193 100644 --- a/www/chromium/files/patch-components_viz_service_display_skia__renderer.cc +++ b/www/chromium/files/patch-components_viz_service_display_skia__renderer.cc @@ -1,6 +1,6 @@ ---- components/viz/service/display/skia_renderer.cc.orig 2024-10-22 08:31:56 UTC +--- components/viz/service/display/skia_renderer.cc.orig 2024-11-14 07:57:23 UTC +++ components/viz/service/display/skia_renderer.cc -@@ -1363,7 +1363,7 @@ void SkiaRenderer::ClearFramebuffer() { +@@ -1364,7 +1364,7 @@ void SkiaRenderer::ClearFramebuffer() { if (current_frame()->current_render_pass->has_transparent_background) { ClearCanvas(SkColors::kTransparent); } else { diff --git a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc index 2f0a0f07e57d..2f74644fcad0 100644 --- a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc +++ b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc @@ -1,4 +1,4 @@ ---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2024-10-22 08:31:56 UTC +--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2024-11-14 07:57:23 UTC +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc @@ -113,7 +113,7 @@ RootCompositorFrameSinkImpl::Create( output_surface->SetNeedsSwapSizeNotifications( @@ -9,7 +9,7 @@ // For X11, we need notify client about swap completion after resizing, so the // client can use it for synchronize with X11 WM. output_surface->SetNeedsSwapSizeNotifications(true); -@@ -793,7 +793,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw +@@ -792,7 +792,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw if (display_client_ && enable_swap_completion_callback_) { display_client_->DidCompleteSwapWithSize(pixel_size); } diff --git a/www/chromium/files/patch-content_browser_BUILD.gn b/www/chromium/files/patch-content_browser_BUILD.gn index f883f47f0a8b..b0deb42e25e3 100644 --- a/www/chromium/files/patch-content_browser_BUILD.gn +++ b/www/chromium/files/patch-content_browser_BUILD.gn @@ -1,6 +1,6 @@ ---- content/browser/BUILD.gn.orig 2024-10-22 08:31:56 UTC +--- content/browser/BUILD.gn.orig 2024-11-14 07:57:23 UTC +++ content/browser/BUILD.gn -@@ -2432,6 +2432,14 @@ source_set("browser") { +@@ -2434,6 +2434,14 @@ source_set("browser") { ] } @@ -15,7 +15,7 @@ if (is_linux || is_chromeos) { sources += [ "child_process_launcher_helper_linux.cc", -@@ -2475,6 +2483,15 @@ source_set("browser") { +@@ -2477,6 +2485,15 @@ source_set("browser") { if (allow_oop_video_decoder) { sources += [ "media/stable_video_decoder_factory.cc" ] deps += [ "//media/mojo/mojom/stable:stable_video_decoder" ] diff --git a/www/chromium/files/patch-content_browser_child__process__launcher__helper.h b/www/chromium/files/patch-content_browser_child__process__launcher__helper.h index 51b5f70a1366..ba6438936766 100644 --- a/www/chromium/files/patch-content_browser_child__process__launcher__helper.h +++ b/www/chromium/files/patch-content_browser_child__process__launcher__helper.h @@ -1,6 +1,6 @@ ---- content/browser/child_process_launcher_helper.h.orig 2024-09-30 07:45:04 UTC +--- content/browser/child_process_launcher_helper.h.orig 2024-11-14 07:57:23 UTC +++ content/browser/child_process_launcher_helper.h -@@ -293,7 +293,7 @@ class ChildProcessLauncherHelper +@@ -304,7 +304,7 @@ class ChildProcessLauncherHelper std::optional<base::ProcessId> process_id_ = std::nullopt; #endif // BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-content_browser_gpu_compositor__util.cc b/www/chromium/files/patch-content_browser_gpu_compositor__util.cc index 90227326dc66..66e119fad52f 100644 --- a/www/chromium/files/patch-content_browser_gpu_compositor__util.cc +++ b/www/chromium/files/patch-content_browser_gpu_compositor__util.cc @@ -1,4 +1,4 @@ ---- content/browser/gpu/compositor_util.cc.orig 2024-08-26 12:06:38 UTC +--- content/browser/gpu/compositor_util.cc.orig 2024-11-14 07:57:23 UTC +++ content/browser/gpu/compositor_util.cc @@ -153,7 +153,7 @@ std::vector<GpuFeatureData> GetGpuFeatureData( "video_decode", @@ -6,7 +6,7 @@ gpu_feature_info, gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE, -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - !base::FeatureList::IsEnabled(media::kVaapiVideoDecodeLinux) || + !base::FeatureList::IsEnabled(media::kAcceleratedVideoDecodeLinux) || #endif // BUILDFLAG(IS_LINUX) command_line.HasSwitch(switches::kDisableAcceleratedVideoDecode)), @@ -165,7 +165,7 @@ std::vector<GpuFeatureData> GetGpuFeatureData( @@ -15,6 +15,6 @@ gpu_feature_info, gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_ENCODE, -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - !base::FeatureList::IsEnabled(media::kVaapiVideoEncodeLinux)), + !base::FeatureList::IsEnabled(media::kAcceleratedVideoEncodeLinux)), #else command_line.HasSwitch(switches::kDisableAcceleratedVideoEncode)), diff --git a/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc b/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc index ce993ceadd12..909012a334a4 100644 --- a/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc +++ b/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc @@ -1,6 +1,6 @@ ---- content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2024-10-22 08:31:56 UTC +--- content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2024-11-14 07:57:23 UTC +++ content/browser/gpu/gpu_data_manager_impl_private.cc -@@ -1661,7 +1661,7 @@ void GpuDataManagerImplPrivate::RecordCompositingMode( +@@ -1672,7 +1672,7 @@ void GpuDataManagerImplPrivate::RecordCompositingMode( UMA_HISTOGRAM_ENUMERATION("GPU.CompositingMode", compositing_mode); } diff --git a/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h b/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h index be6a01f8e271..951077472009 100644 --- a/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h +++ b/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h @@ -1,4 +1,4 @@ ---- content/browser/gpu/gpu_data_manager_impl_private.h.orig 2024-08-26 12:06:38 UTC +--- content/browser/gpu/gpu_data_manager_impl_private.h.orig 2024-11-14 07:57:23 UTC +++ content/browser/gpu/gpu_data_manager_impl_private.h @@ -147,7 +147,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate { void OnDisplayMetricsChanged(const display::Display& display, @@ -9,7 +9,7 @@ bool IsGpuMemoryBufferNV12Supported(); void SetGpuMemoryBufferNV12Supported(bool supported); #endif // BUILDFLAG(IS_LINUX) -@@ -303,7 +303,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate { +@@ -311,7 +311,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate { bool application_is_visible_ = true; bool disable_gpu_compositing_ = false; diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc deleted file mode 100644 index 8282da8edfd9..000000000000 --- a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc +++ /dev/null @@ -1,55 +0,0 @@ ---- content/browser/renderer_host/render_process_host_impl.cc.orig 2024-10-22 08:31:56 UTC -+++ content/browser/renderer_host/render_process_host_impl.cc -@@ -220,7 +220,7 @@ - #include "third_party/blink/public/mojom/android_font_lookup/android_font_lookup.mojom.h" - #endif - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #include <sys/resource.h> - - #include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck -@@ -1082,7 +1082,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = - // to indicate failure and std::numeric_limits<size_t>::max() to indicate - // unlimited. - size_t GetPlatformProcessLimit() { --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - struct rlimit limit; - if (getrlimit(RLIMIT_NPROC, &limit) != 0) - return kUnknownPlatformProcessLimit; -@@ -1263,7 +1263,7 @@ RenderProcessHostImpl::IOThreadHostImpl::~IOThreadHost - - void RenderProcessHostImpl::IOThreadHostImpl::SetPid( - base::ProcessId child_pid) { --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - child_thread_type_switcher_.SetPid(child_pid); - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) - } -@@ -3286,7 +3286,7 @@ void RenderProcessHostImpl::AppendRendererCommandLine( - base::TimeTicks::UnixEpoch().since_origin().InMicroseconds())); - } - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Append `kDisableVideoCaptureUseGpuMemoryBuffer` flag if there is no support - // for NV12 GPU memory buffer. - if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled() && -@@ -3342,6 +3342,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin - switches::kDisableSpeechAPI, - switches::kDisableThreadedCompositing, - switches::kDisableTouchDragDrop, -+ switches::kDisableUnveil, - switches::kDisableV8IdleTasks, - switches::kDisableVideoCaptureUseGpuMemoryBuffer, - switches::kDisableWebGLImageChromium, -@@ -5112,7 +5113,7 @@ uint64_t RenderProcessHostImpl::GetPrivateMemoryFootpr - // - Win: https://crbug.com/707022 . - uint64_t total_size = 0; - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ -- BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - total_size = dump->platform_private_footprint->rss_anon_bytes + - dump->platform_private_footprint->vm_swap_bytes; - #elif BUILDFLAG(IS_APPLE) diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h index 4172bb8f7536..dd2a3170de0e 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h +++ b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h @@ -1,4 +1,4 @@ ---- content/browser/renderer_host/render_process_host_impl.h.orig 2024-10-22 08:31:56 UTC +--- content/browser/renderer_host/render_process_host_impl.h.orig 2024-11-14 07:57:23 UTC +++ content/browser/renderer_host/render_process_host_impl.h @@ -102,7 +102,7 @@ #include "media/fuchsia_media_codec_provider_impl.h" @@ -18,7 +18,7 @@ // Launch the zygote early in the browser startup. static void EarlyZygoteLaunch(); #endif // BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_MAC) -@@ -977,7 +977,7 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -973,7 +973,7 @@ class CONTENT_EXPORT RenderProcessHostImpl std::unique_ptr<service_manager::BinderRegistry> binders_; mojo::Receiver<mojom::ChildProcessHost> receiver_{this}; diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc b/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc index 2e7c8683a2bb..8ae45042b5e1 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_view_host_impl.cc.orig 2024-10-22 08:31:56 UTC +--- content/browser/renderer_host/render_view_host_impl.cc.orig 2024-11-14 07:57:23 UTC +++ content/browser/renderer_host/render_view_host_impl.cc -@@ -275,7 +275,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs( +@@ -274,7 +274,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs( display::win::ScreenWin::GetSystemMetricsInDIP(SM_CYVSCROLL); prefs->arrow_bitmap_width_horizontal_scroll_bar_in_dips = display::win::ScreenWin::GetSystemMetricsInDIP(SM_CXHSCROLL); diff --git a/www/chromium/files/patch-content_browser_utility__process__host.cc b/www/chromium/files/patch-content_browser_utility__process__host.cc index 06521a91466e..2a9d64db2a13 100644 --- a/www/chromium/files/patch-content_browser_utility__process__host.cc +++ b/www/chromium/files/patch-content_browser_utility__process__host.cc @@ -1,4 +1,4 @@ ---- content/browser/utility_process_host.cc.orig 2024-10-22 08:31:56 UTC +--- content/browser/utility_process_host.cc.orig 2024-11-14 07:57:23 UTC +++ content/browser/utility_process_host.cc @@ -62,7 +62,7 @@ #include "content/browser/v8_snapshot_files.h" @@ -9,16 +9,16 @@ #include "base/files/file_util.h" #include "base/files/scoped_file.h" #include "base/pickle.h" -@@ -75,7 +75,7 @@ - #include "services/network/public/mojom/network_service.mojom.h" +@@ -76,7 +76,7 @@ #endif --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) #include "base/task/sequenced_task_runner.h" #include "components/viz/host/gpu_client.h" #include "media/capture/capture_switches.h" -@@ -86,7 +86,7 @@ namespace content { +@@ -87,7 +87,7 @@ namespace content { namespace { @@ -27,25 +27,25 @@ base::ScopedFD PassNetworkContextParentDirs( std::vector<base::FilePath> network_context_parent_dirs) { base::Pickle pickle; -@@ -151,7 +151,7 @@ UtilityProcessHost::UtilityProcessHost(std::unique_ptr - started_(false), +@@ -153,7 +153,7 @@ UtilityProcessHost::UtilityProcessHost(std::unique_ptr name_(u"utility process"), file_data_(std::make_unique<ChildProcessLauncherFileData>()), --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) allowed_gpu_(false), gpu_client_(nullptr, base::OnTaskRunnerDeleter(nullptr)), #endif -@@ -210,7 +210,7 @@ void UtilityProcessHost::SetPreloadLibraries( - #endif // BUILDFLAG(IS_WIN) +@@ -213,7 +213,7 @@ void UtilityProcessHost::SetPreloadLibraries( void UtilityProcessHost::SetAllowGpuClient() { --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) allowed_gpu_ = true; #endif } -@@ -406,7 +406,7 @@ bool UtilityProcessHost::StartProcess() { +@@ -410,7 +410,7 @@ bool UtilityProcessHost::StartProcess() { file_data_->files_to_preload.merge(GetV8SnapshotFilesToPreload(*cmd_line)); #endif // BUILDFLAG(IS_POSIX) @@ -54,12 +54,12 @@ // The network service should have access to the parent directories // necessary for its usage. if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork) { -@@ -417,13 +417,13 @@ bool UtilityProcessHost::StartProcess() { +@@ -421,13 +421,13 @@ bool UtilityProcessHost::StartProcess() { } - #endif // BUILDFLAG(IS_LINUX) + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) // Pass `kVideoCaptureUseGpuMemoryBuffer` flag to video capture service only // when the video capture use GPU memory buffer enabled. if (metrics_name_ == video_capture::mojom::VideoCaptureService::Name_) { diff --git a/www/chromium/files/patch-content_browser_utility__process__host.h b/www/chromium/files/patch-content_browser_utility__process__host.h index e3370ab6b787..bc0085292a06 100644 --- a/www/chromium/files/patch-content_browser_utility__process__host.h +++ b/www/chromium/files/patch-content_browser_utility__process__host.h @@ -1,20 +1,20 @@ ---- content/browser/utility_process_host.h.orig 2024-05-21 18:07:39 UTC +--- content/browser/utility_process_host.h.orig 2024-11-14 07:57:23 UTC +++ content/browser/utility_process_host.h -@@ -33,7 +33,7 @@ namespace base { - class Thread; +@@ -34,7 +34,7 @@ class Thread; } // namespace base --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) namespace viz { class GpuClient; } // namespace viz -@@ -200,7 +200,7 @@ class CONTENT_EXPORT UtilityProcessHost - }; +@@ -202,7 +202,7 @@ class CONTENT_EXPORT UtilityProcessHost LaunchState launch_state_ = LaunchState::kLaunchInProgress; --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) bool allowed_gpu_; std::unique_ptr<viz::GpuClient, base::OnTaskRunnerDeleter> gpu_client_; #endif diff --git a/www/chromium/files/patch-content_browser_utility__process__host__receiver__bindings.cc b/www/chromium/files/patch-content_browser_utility__process__host__receiver__bindings.cc index 01d070d67677..c05b027c5b4b 100644 --- a/www/chromium/files/patch-content_browser_utility__process__host__receiver__bindings.cc +++ b/www/chromium/files/patch-content_browser_utility__process__host__receiver__bindings.cc @@ -1,6 +1,6 @@ ---- content/browser/utility_process_host_receiver_bindings.cc.orig 2024-04-19 13:02:56 UTC +--- content/browser/utility_process_host_receiver_bindings.cc.orig 2024-11-14 07:57:23 UTC +++ content/browser/utility_process_host_receiver_bindings.cc -@@ -10,12 +10,12 @@ +@@ -10,13 +10,13 @@ #include "content/public/browser/content_browser_client.h" #include "content/public/common/content_client.h" @@ -10,12 +10,13 @@ #include "content/browser/font_service.h" // nogncheck #endif --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) #include "components/viz/host/gpu_client.h" #include "content/public/browser/gpu_client.h" #endif -@@ -24,13 +24,13 @@ namespace content { +@@ -25,14 +25,14 @@ namespace content { void UtilityProcessHost::BindHostReceiver( mojo::GenericPendingReceiver receiver) { @@ -26,8 +27,9 @@ return; } #endif --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) if (allowed_gpu_) { // TODO(crbug.com/328099369) Remove once all clients get this directly. if (auto gpu_receiver = receiver.As<viz::mojom::Gpu>()) { diff --git a/www/chromium/files/patch-content_browser_utility__sandbox__delegate.cc b/www/chromium/files/patch-content_browser_utility__sandbox__delegate.cc index e08b42921339..0dfd05b1d4b5 100644 --- a/www/chromium/files/patch-content_browser_utility__sandbox__delegate.cc +++ b/www/chromium/files/patch-content_browser_utility__sandbox__delegate.cc @@ -1,4 +1,4 @@ ---- content/browser/utility_sandbox_delegate.cc.orig 2024-10-22 08:31:56 UTC +--- content/browser/utility_sandbox_delegate.cc.orig 2024-11-14 07:57:23 UTC +++ content/browser/utility_sandbox_delegate.cc @@ -76,10 +76,10 @@ UtilitySandboxedProcessLauncherDelegate:: #if BUILDFLAG(IS_FUCHSIA) @@ -13,7 +13,20 @@ sandbox_type_ == sandbox::mojom::Sandbox::kHardwareVideoEncoding || #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -137,10 +137,10 @@ ZygoteCommunication* UtilitySandboxedProcessLauncherDe +@@ -93,10 +93,10 @@ UtilitySandboxedProcessLauncherDelegate:: + #if BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) + sandbox_type_ == sandbox::mojom::Sandbox::kScreenAI || + #endif +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + sandbox_type_ == sandbox::mojom::Sandbox::kVideoEffects || + #endif +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + sandbox_type_ == sandbox::mojom::Sandbox::kOnDeviceTranslation || + #endif + sandbox_type_ == sandbox::mojom::Sandbox::kAudio || +@@ -142,10 +142,10 @@ ZygoteCommunication* UtilitySandboxedProcessLauncherDe // process upon startup. if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork || sandbox_type_ == sandbox::mojom::Sandbox::kOnDeviceModelExecution || @@ -26,3 +39,12 @@ sandbox_type_ == sandbox::mojom::Sandbox::kHardwareVideoEncoding || #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_CHROMEOS_ASH) +@@ -163,7 +163,7 @@ ZygoteCommunication* UtilitySandboxedProcessLauncherDe + #if BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) + sandbox_type_ == sandbox::mojom::Sandbox::kScreenAI || + #endif +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + sandbox_type_ == sandbox::mojom::Sandbox::kVideoEffects || + sandbox_type_ == sandbox::mojom::Sandbox::kOnDeviceTranslation || + #endif // BUILDFLAG(IS_LINUX) diff --git a/www/chromium/files/patch-content_browser_renderer__host_input_input__device__change__observer.cc b/www/chromium/files/patch-content_browser_web__contents_slow__web__preference__cache.cc index 00e9275d7d0d..8fd05f971bf8 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_input_input__device__change__observer.cc +++ b/www/chromium/files/patch-content_browser_web__contents_slow__web__preference__cache.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/input/input_device_change_observer.cc.orig 2022-02-28 16:54:41 UTC -+++ content/browser/renderer_host/input/input_device_change_observer.cc -@@ -9,7 +9,7 @@ +--- content/browser/web_contents/slow_web_preference_cache.cc.orig 2024-11-14 07:57:23 UTC ++++ content/browser/web_contents/slow_web_preference_cache.cc +@@ -16,7 +16,7 @@ #if BUILDFLAG(IS_WIN) #include "ui/events/devices/input_device_observer_win.h" @@ -8,9 +8,9 @@ +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "ui/events/devices/device_data_manager.h" #elif BUILDFLAG(IS_ANDROID) - #include "ui/events/devices/input_device_observer_android.h" -@@ -21,7 +21,7 @@ InputDeviceChangeObserver::InputDeviceChangeObserver(R - render_view_host_impl_ = rvhi; + #include "ui/base/device_form_factor.h" +@@ -54,7 +54,7 @@ SlowWebPreferenceCache::SlowWebPreferenceCache() { + #if BUILDFLAG(IS_WIN) ui::InputDeviceObserverWin::GetInstance()->AddObserver(this); -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -18,8 +18,8 @@ ui::DeviceDataManager::GetInstance()->AddObserver(this); #elif BUILDFLAG(IS_ANDROID) ui::InputDeviceObserverAndroid::GetInstance()->AddObserver(this); -@@ -31,7 +31,7 @@ InputDeviceChangeObserver::InputDeviceChangeObserver(R - InputDeviceChangeObserver::~InputDeviceChangeObserver() { +@@ -64,7 +64,7 @@ SlowWebPreferenceCache::SlowWebPreferenceCache() { + SlowWebPreferenceCache::~SlowWebPreferenceCache() { #if BUILDFLAG(IS_WIN) ui::InputDeviceObserverWin::GetInstance()->RemoveObserver(this); -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc b/www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc index a882ab95ee13..39a0baf21aee 100644 --- a/www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc +++ b/www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc @@ -1,4 +1,4 @@ ---- content/browser/web_contents/web_contents_view_aura.cc.orig 2024-09-30 07:45:04 UTC +--- content/browser/web_contents/web_contents_view_aura.cc.orig 2024-11-14 07:57:23 UTC +++ content/browser/web_contents/web_contents_view_aura.cc @@ -174,7 +174,7 @@ class WebDragSourceAura : public content::WebContentsO raw_ptr<aura::Window> window_; @@ -18,7 +18,7 @@ // We set the file contents before the URL because the URL also sets file // contents (to a .URL shortcut). We want to prefer file content data over // a shortcut so we add it first. -@@ -1324,7 +1324,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent* +@@ -1326,7 +1326,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent* // Linux window managers like to handle raise-on-click themselves. If we // raise-on-click manually, this may override user settings that prevent // focus-stealing. diff --git a/www/chromium/files/patch-content_child_child__process.cc b/www/chromium/files/patch-content_child_child__process.cc index 8c09ac22d3e6..8dff5f8d7440 100644 --- a/www/chromium/files/patch-content_child_child__process.cc +++ b/www/chromium/files/patch-content_child_child__process.cc @@ -1,6 +1,6 @@ ---- content/child/child_process.cc.orig 2024-09-30 07:45:04 UTC +--- content/child/child_process.cc.orig 2024-11-14 07:57:23 UTC +++ content/child/child_process.cc -@@ -32,7 +32,7 @@ +@@ -31,7 +31,7 @@ #include "content/common/android/cpu_time_metrics.h" #endif @@ -9,7 +9,7 @@ #include "content/child/sandboxed_process_thread_type_handler.h" #endif -@@ -179,7 +179,7 @@ void ChildProcess::set_main_thread(ChildThreadImpl* th +@@ -178,7 +178,7 @@ void ChildProcess::set_main_thread(ChildThreadImpl* th main_thread_.reset(thread); } diff --git a/www/chromium/files/patch-content_common_features.cc b/www/chromium/files/patch-content_common_features.cc index 601722243491..7c92051387d1 100644 --- a/www/chromium/files/patch-content_common_features.cc +++ b/www/chromium/files/patch-content_common_features.cc @@ -1,4 +1,4 @@ ---- content/common/features.cc.orig 2024-10-22 08:31:56 UTC +--- content/common/features.cc.orig 2024-11-14 07:57:23 UTC +++ content/common/features.cc @@ -143,7 +143,7 @@ BASE_FEATURE(kEnableBackForwardCacheForOngoingSubframe base::FEATURE_ENABLED_BY_DEFAULT); @@ -9,7 +9,7 @@ BASE_FEATURE(kEnableDevToolsJsErrorReporting, "EnableDevToolsJsErrorReporting", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -299,7 +299,7 @@ BASE_FEATURE(kGroupNIKByJoiningOrigin, +@@ -306,7 +306,7 @@ BASE_FEATURE(kGroupNIKByJoiningOrigin, // process and having browser process handle adjusting thread properties (nice // value, c-group, latency sensitivity...) for children which have sandbox // restrictions. diff --git a/www/chromium/files/patch-content_common_features.h b/www/chromium/files/patch-content_common_features.h index 74d24b9f07c5..408b632183f3 100644 --- a/www/chromium/files/patch-content_common_features.h +++ b/www/chromium/files/patch-content_common_features.h @@ -1,4 +1,4 @@ ---- content/common/features.h.orig 2024-10-22 08:31:56 UTC +--- content/common/features.h.orig 2024-11-14 07:57:23 UTC +++ content/common/features.h @@ -34,7 +34,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kDocumentPolicyNeg CONTENT_EXPORT BASE_DECLARE_FEATURE(kEnableBackForwardCacheForScreenReader); @@ -9,7 +9,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kEnableDevToolsJsErrorReporting); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) CONTENT_EXPORT BASE_DECLARE_FEATURE(kEmbeddingRequiresOptIn); -@@ -76,7 +76,7 @@ CONTENT_EXPORT extern const base::FeatureParam<int> +@@ -80,7 +80,7 @@ CONTENT_EXPORT extern const base::FeatureParam<int> CONTENT_EXPORT BASE_DECLARE_FEATURE(kGpuInfoCollectionSeparatePrefetch); #endif CONTENT_EXPORT BASE_DECLARE_FEATURE(kGroupNIKByJoiningOrigin); diff --git a/www/chromium/files/patch-content_gpu_gpu__main.cc b/www/chromium/files/patch-content_gpu_gpu__main.cc index 52846da0be3a..d530be3002ae 100644 --- a/www/chromium/files/patch-content_gpu_gpu__main.cc +++ b/www/chromium/files/patch-content_gpu_gpu__main.cc @@ -1,4 +1,4 @@ ---- content/gpu/gpu_main.cc.orig 2024-10-22 08:31:56 UTC +--- content/gpu/gpu_main.cc.orig 2024-11-14 07:57:23 UTC +++ content/gpu/gpu_main.cc @@ -95,10 +95,14 @@ #include "sandbox/win/src/sandbox.h" @@ -34,7 +34,7 @@ return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs); #elif BUILDFLAG(IS_WIN) return StartSandboxWindows(sandbox_info_); -@@ -285,7 +289,7 @@ int GpuMain(MainFunctionParams parameters) { +@@ -293,7 +297,7 @@ int GpuMain(MainFunctionParams parameters) { std::make_unique<base::SingleThreadTaskExecutor>( gpu_preferences.message_pump_type); } @@ -43,7 +43,7 @@ #error "Unsupported Linux platform." #elif BUILDFLAG(IS_MAC) // Cross-process CoreAnimation requires a CFRunLoop to function at all, and -@@ -308,7 +312,8 @@ int GpuMain(MainFunctionParams parameters) { +@@ -318,7 +322,8 @@ int GpuMain(MainFunctionParams parameters) { base::PlatformThread::SetName("CrGpuMain"); mojo::InterfaceEndpointClient::SetThreadNameSuffixForMetrics("GpuMain"); @@ -53,7 +53,7 @@ // Thread type delegate of the process should be registered before // thread type change below for the main thread and for thread pool in // ChildProcess constructor. -@@ -439,7 +444,7 @@ int GpuMain(MainFunctionParams parameters) { +@@ -449,7 +454,7 @@ int GpuMain(MainFunctionParams parameters) { namespace { @@ -62,7 +62,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdog_thread, const gpu::GPUInfo* gpu_info, const gpu::GpuPreferences& gpu_prefs) { -@@ -479,7 +484,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo +@@ -489,7 +494,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo sandbox_options.accelerated_video_encode_enabled = !gpu_prefs.disable_accelerated_video_encode; diff --git a/www/chromium/files/patch-content_public_browser_content__browser__client.cc b/www/chromium/files/patch-content_public_browser_content__browser__client.cc index 8e600106e754..026947e2f5a2 100644 --- a/www/chromium/files/patch-content_public_browser_content__browser__client.cc +++ b/www/chromium/files/patch-content_public_browser_content__browser__client.cc @@ -1,6 +1,6 @@ ---- content/public/browser/content_browser_client.cc.orig 2024-10-22 08:31:56 UTC +--- content/public/browser/content_browser_client.cc.orig 2024-11-14 07:57:23 UTC +++ content/public/browser/content_browser_client.cc -@@ -1330,7 +1330,7 @@ bool ContentBrowserClient::ShouldRunOutOfProcessSystem +@@ -1343,7 +1343,7 @@ bool ContentBrowserClient::ShouldRunOutOfProcessSystem // that can be adequately sandboxed. // Currently Android's network service will not run out of process or sandboxed, // so OutOfProcessSystemDnsResolution is not currently enabled on Android. diff --git a/www/chromium/files/patch-content_public_browser_service__process__host.cc b/www/chromium/files/patch-content_public_browser_service__process__host.cc index d0242d944596..b93b036634f0 100644 --- a/www/chromium/files/patch-content_public_browser_service__process__host.cc +++ b/www/chromium/files/patch-content_public_browser_service__process__host.cc @@ -1,11 +1,11 @@ ---- content/public/browser/service_process_host.cc.orig 2024-05-21 18:07:39 UTC +--- content/public/browser/service_process_host.cc.orig 2024-11-14 07:57:23 UTC +++ content/public/browser/service_process_host.cc -@@ -70,7 +70,7 @@ ServiceProcessHost::Options::WithPreloadedLibraries( - +@@ -71,7 +71,7 @@ ServiceProcessHost::Options::WithPreloadedLibraries( ServiceProcessHost::Options& ServiceProcessHost::Options::WithGpuClient( base::PassKey<ServiceProcessHostGpuClient> passkey) { --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) allow_gpu_client = true; #endif return *this; diff --git a/www/chromium/files/patch-content_public_common_content__features.cc b/www/chromium/files/patch-content_public_common_content__features.cc index 4fdacd312524..a63516821cfb 100644 --- a/www/chromium/files/patch-content_public_common_content__features.cc +++ b/www/chromium/files/patch-content_public_common_content__features.cc @@ -1,4 +1,4 @@ ---- content/public/common/content_features.cc.orig 2024-10-22 08:31:56 UTC +--- content/public/common/content_features.cc.orig 2024-11-14 07:57:23 UTC +++ content/public/common/content_features.cc @@ -65,7 +65,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess, // TODO(crbug.com/40118868): Remove !IS_CHROMEOS_LACROS once lacros starts being @@ -9,7 +9,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -1206,9 +1206,9 @@ BASE_FEATURE(kWebAssemblyTiering, +@@ -1218,9 +1218,9 @@ BASE_FEATURE(kWebAssemblyTiering, BASE_FEATURE(kWebAssemblyTrapHandler, "WebAssemblyTrapHandler", #if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ @@ -21,7 +21,7 @@ defined(ARCH_CPU_ARM64)) base::FEATURE_ENABLED_BY_DEFAULT #else -@@ -1245,7 +1245,11 @@ BASE_FEATURE(kWebUICodeCache, +@@ -1257,7 +1257,11 @@ BASE_FEATURE(kWebUICodeCache, // Controls whether the WebUSB API is enabled: // https://wicg.github.io/webusb diff --git a/www/chromium/files/patch-content_public_common_content__switches.cc b/www/chromium/files/patch-content_public_common_content__switches.cc index a206f6021364..33ba02af69c4 100644 --- a/www/chromium/files/patch-content_public_common_content__switches.cc +++ b/www/chromium/files/patch-content_public_common_content__switches.cc @@ -1,4 +1,4 @@ ---- content/public/common/content_switches.cc.orig 2024-10-22 08:31:56 UTC +--- content/public/common/content_switches.cc.orig 2024-11-14 07:57:23 UTC +++ content/public/common/content_switches.cc @@ -350,6 +350,8 @@ const char kEnableIsolatedWebAppsInRenderer[] = // builds. @@ -9,7 +9,7 @@ // Enables the type, downlinkMax attributes of the NetInfo API. Also, enables // triggering of change attribute of the NetInfo API when there is a change in // the connection type. -@@ -976,7 +978,7 @@ const char kPreventResizingContentsForTesting[] = +@@ -969,7 +971,7 @@ const char kPreventResizingContentsForTesting[] = // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-content_public_common_content__switches.h b/www/chromium/files/patch-content_public_common_content__switches.h index ef1af9970a7c..e3413ca43144 100644 --- a/www/chromium/files/patch-content_public_common_content__switches.h +++ b/www/chromium/files/patch-content_public_common_content__switches.h @@ -1,4 +1,4 @@ ---- content/public/common/content_switches.h.orig 2024-10-22 08:31:56 UTC +--- content/public/common/content_switches.h.orig 2024-11-14 07:57:23 UTC +++ content/public/common/content_switches.h @@ -110,6 +110,7 @@ CONTENT_EXPORT extern const char kEnableGpuMemoryBuffe CONTENT_EXPORT extern const char kEnableIsolatedWebAppsInRenderer[]; @@ -8,7 +8,7 @@ CONTENT_EXPORT extern const char kEnableNetworkInformationDownlinkMax[]; CONTENT_EXPORT extern const char kEnableCanvas2DLayers[]; CONTENT_EXPORT extern const char kEnablePluginPlaceholderTesting[]; -@@ -266,7 +267,7 @@ CONTENT_EXPORT extern const char kPreventResizingConte +@@ -265,7 +266,7 @@ CONTENT_EXPORT extern const char kPreventResizingConte // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-content_renderer_render__thread__impl.cc b/www/chromium/files/patch-content_renderer_render__thread__impl.cc index deafe1af536d..decce10e2973 100644 --- a/www/chromium/files/patch-content_renderer_render__thread__impl.cc +++ b/www/chromium/files/patch-content_renderer_render__thread__impl.cc @@ -1,6 +1,6 @@ ---- content/renderer/render_thread_impl.cc.orig 2024-10-22 08:31:56 UTC +--- content/renderer/render_thread_impl.cc.orig 2024-11-14 07:57:23 UTC +++ content/renderer/render_thread_impl.cc -@@ -215,6 +215,8 @@ +@@ -214,6 +214,8 @@ #if BUILDFLAG(IS_APPLE) #include <malloc/malloc.h> @@ -9,25 +9,25 @@ #else #include <malloc.h> #endif -@@ -1022,7 +1024,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1017,7 +1019,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: kGpuStreamIdMedia, kGpuStreamPriorityMedia); const bool enable_video_decode_accelerator = -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - base::FeatureList::IsEnabled(media::kVaapiVideoDecodeLinux) && + base::FeatureList::IsEnabled(media::kAcceleratedVideoDecodeLinux) && #endif // BUILDFLAG(IS_LINUX) !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode) && -@@ -1031,7 +1033,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1026,7 +1028,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: gpu::kGpuFeatureStatusEnabled); const bool enable_video_encode_accelerator = -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - base::FeatureList::IsEnabled(media::kVaapiVideoEncodeLinux) && + base::FeatureList::IsEnabled(media::kAcceleratedVideoEncodeLinux) && #else !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoEncode) && -@@ -1815,7 +1817,7 @@ std::unique_ptr<CodecFactory> RenderThreadImpl::Create +@@ -1830,7 +1832,7 @@ std::unique_ptr<CodecFactory> RenderThreadImpl::Create bool enable_video_encode_accelerator) { mojo::PendingRemote<media::mojom::VideoEncodeAcceleratorProvider> vea_provider; diff --git a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h index 521415dca991..2441a8eb3239 100644 --- a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h +++ b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h @@ -1,6 +1,6 @@ ---- content/renderer/renderer_blink_platform_impl.h.orig 2024-10-22 08:31:56 UTC +--- content/renderer/renderer_blink_platform_impl.h.orig 2024-11-14 07:57:23 UTC +++ content/renderer/renderer_blink_platform_impl.h -@@ -255,7 +255,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -254,7 +254,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi void Collect3DContextInformation(blink::Platform::GraphicsInfo* gl_info, const gpu::GPUInfo& gpu_info) const; diff --git a/www/chromium/files/patch-content_shell_BUILD.gn b/www/chromium/files/patch-content_shell_BUILD.gn index 7299106814f4..212570ba3768 100644 --- a/www/chromium/files/patch-content_shell_BUILD.gn +++ b/www/chromium/files/patch-content_shell_BUILD.gn @@ -1,6 +1,6 @@ ---- content/shell/BUILD.gn.orig 2024-10-22 08:31:56 UTC +--- content/shell/BUILD.gn.orig 2024-11-14 07:57:23 UTC +++ content/shell/BUILD.gn -@@ -1084,7 +1084,7 @@ group("content_shell_crash_test") { +@@ -1086,7 +1086,7 @@ group("content_shell_crash_test") { if (is_win) { data_deps += [ "//build/win:copy_cdb_to_output" ] } diff --git a/www/chromium/files/patch-content_shell_app_shell__main__delegate.cc b/www/chromium/files/patch-content_shell_app_shell__main__delegate.cc index d0df0b4af78f..f94d43ace5fc 100644 --- a/www/chromium/files/patch-content_shell_app_shell__main__delegate.cc +++ b/www/chromium/files/patch-content_shell_app_shell__main__delegate.cc @@ -1,6 +1,6 @@ ---- content/shell/app/shell_main_delegate.cc.orig 2024-08-26 12:06:38 UTC +--- content/shell/app/shell_main_delegate.cc.orig 2024-11-14 07:57:23 UTC +++ content/shell/app/shell_main_delegate.cc -@@ -276,7 +276,7 @@ void ShellMainDelegate::PreSandboxStartup() { +@@ -269,7 +269,7 @@ void ShellMainDelegate::PreSandboxStartup() { // Reporting for sub-processes will be initialized in ZygoteForked. if (process_type != switches::kZygoteProcess) { crash_reporter::InitializeCrashpad(process_type.empty(), process_type); diff --git a/www/chromium/files/patch-content_utility_services.cc b/www/chromium/files/patch-content_utility_services.cc index e5d042c751aa..fc6417228ac6 100644 --- a/www/chromium/files/patch-content_utility_services.cc +++ b/www/chromium/files/patch-content_utility_services.cc @@ -1,4 +1,4 @@ ---- content/utility/services.cc.orig 2024-10-22 08:31:56 UTC +--- content/utility/services.cc.orig 2024-11-14 07:57:23 UTC +++ content/utility/services.cc @@ -74,7 +74,7 @@ extern sandbox::TargetServices* g_utility_target_services; @@ -18,23 +18,16 @@ (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) #include "content/common/features.h" #include "media/mojo/services/stable_video_decoder_factory_process_service.h" // nogncheck -@@ -120,13 +120,13 @@ extern sandbox::TargetServices* g_utility_target_servi +@@ -120,7 +120,7 @@ extern sandbox::TargetServices* g_utility_target_servi #endif // BUILDFLAG(ENABLE_ACCESSIBILITY_SERVICE) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || \ -- BUILDFLAG(ENABLE_VIDEO_EFFECTS) -+ BUILDFLAG(ENABLE_VIDEO_EFFECTS) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + #include "media/capture/capture_switches.h" #include "services/viz/public/cpp/gpu/gpu.h" #include "services/viz/public/mojom/gpu.mojom.h" - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || - // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(ENABLE_VIDEO_EFFECTS) - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) - #include "media/capture/capture_switches.h" - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || - // BUILDFLAG(IS_CHROMEOS_ASH) -@@ -244,7 +244,7 @@ auto RunAudio(mojo::PendingReceiver<audio::mojom::Audi +@@ -240,7 +240,7 @@ auto RunAudio(mojo::PendingReceiver<audio::mojom::Audi << "task_policy_set TASK_QOS_POLICY"; #endif @@ -43,16 +36,16 @@ auto* command_line = base::CommandLine::ForCurrentProcess(); if (sandbox::policy::SandboxTypeFromCommandLine(*command_line) == sandbox::mojom::Sandbox::kNoSandbox) { -@@ -340,7 +340,7 @@ auto RunVideoCapture( - #endif // BUILDFLAG(IS_CHROMEOS_ASH) +@@ -337,7 +337,7 @@ auto RunVideoCapture( auto service = std::make_unique<UtilityThreadVideoCaptureServiceImpl>( std::move(receiver), base::SingleThreadTaskRunner::GetCurrentDefault()); --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) #if BUILDFLAG(IS_CHROMEOS_ASH) { #else -@@ -395,7 +395,7 @@ auto RunOOPArcVideoAcceleratorFactoryService( +@@ -392,7 +392,7 @@ auto RunOOPArcVideoAcceleratorFactoryService( #endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) || // BUILDFLAG(USE_V4L2_CODEC)) @@ -61,7 +54,7 @@ (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) auto RunStableVideoDecoderFactoryProcessService( mojo::PendingReceiver< -@@ -406,7 +406,7 @@ auto RunStableVideoDecoderFactoryProcessService( +@@ -403,7 +403,7 @@ auto RunStableVideoDecoderFactoryProcessService( #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && // (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) @@ -70,7 +63,7 @@ auto RunVideoEncodeAcceleratorProviderFactory( mojo::PendingReceiver<media::mojom::VideoEncodeAcceleratorProviderFactory> receiver) { -@@ -429,7 +429,7 @@ void RegisterIOThreadServices(mojo::ServiceFactory& se +@@ -426,7 +426,7 @@ void RegisterIOThreadServices(mojo::ServiceFactory& se // loop of type IO that can get notified when pipes have data. services.Add(RunNetworkService); @@ -79,7 +72,7 @@ (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) if (base::FeatureList::IsEnabled( features::kRunStableVideoDecoderFactoryProcessServiceOnIOThread)) { -@@ -485,7 +485,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& +@@ -482,7 +482,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& #endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) || // BUILDFLAG(USE_V4L2_CODEC)) @@ -88,7 +81,7 @@ (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) if (!base::FeatureList::IsEnabled( features::kRunStableVideoDecoderFactoryProcessServiceOnIOThread)) { -@@ -494,7 +494,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& +@@ -491,7 +491,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && // (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) diff --git a/www/chromium/files/patch-content_utility_utility__main.cc b/www/chromium/files/patch-content_utility_utility__main.cc index 70de06b3e8f0..4d9827529fb0 100644 --- a/www/chromium/files/patch-content_utility_utility__main.cc +++ b/www/chromium/files/patch-content_utility_utility__main.cc @@ -1,8 +1,8 @@ ---- content/utility/utility_main.cc.orig 2024-10-22 08:31:56 UTC +--- content/utility/utility_main.cc.orig 2024-11-14 07:57:23 UTC +++ content/utility/utility_main.cc -@@ -36,17 +36,21 @@ - #include "services/screen_ai/buildflags/buildflags.h" +@@ -37,17 +37,21 @@ #include "services/tracing/public/cpp/trace_startup.h" + #include "services/video_effects/public/cpp/buildflags.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) @@ -23,7 +23,7 @@ #include "services/audio/audio_sandbox_hook_linux.h" #include "services/network/network_sandbox_hook_linux.h" // gn check is not smart enough to realize that this include only applies to -@@ -58,10 +62,15 @@ +@@ -59,11 +63,16 @@ #endif #endif @@ -32,15 +32,17 @@ #include "media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) +-#if BUILDFLAG(ENABLE_VIDEO_EFFECTS) && BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_BSD) +#include "sandbox/policy/sandbox.h" +#include "content/common/gpu_pre_sandbox_hook_bsd.h" +#endif + - #if BUILDFLAG(IS_CHROMEOS_ASH) - #include "chromeos/ash/components/assistant/buildflags.h" - #include "chromeos/ash/services/ime/ime_sandbox_hook.h" -@@ -73,7 +82,7 @@ ++#if BUILDFLAG(ENABLE_VIDEO_EFFECTS) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) + #include "services/video_effects/video_effects_sandbox_hook_linux.h" // nogncheck + #endif // BUILDFLAG(ENABLE_VIDEO_EFFECTS) && BUILDFLAG(IS_LINUX) + +@@ -78,7 +87,7 @@ #endif // BUILDFLAG(IS_CHROMEOS_ASH) #if (BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) && \ @@ -49,7 +51,15 @@ #include "services/screen_ai/public/cpp/utilities.h" // nogncheck #include "services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.h" // nogncheck #endif -@@ -101,7 +110,7 @@ namespace content { +@@ -102,14 +111,14 @@ + sandbox::TargetServices* g_utility_target_services = nullptr; + #endif // BUILDFLAG(IS_WIN) + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "components/services/on_device_translation/sandbox_hook.h" + #endif // BUILDFLAG(IS_LINUX) + namespace content { namespace { @@ -58,7 +68,7 @@ std::vector<std::string> GetNetworkContextsParentDirectories() { base::MemoryMappedFile::Region region; base::ScopedFD read_pipe_fd = base::FileDescriptorStore::GetInstance().TakeFD( -@@ -128,9 +137,10 @@ std::vector<std::string> GetNetworkContextsParentDirec +@@ -136,9 +145,10 @@ std::vector<std::string> GetNetworkContextsParentDirec return dirs; } @@ -70,7 +80,7 @@ sandbox_type == sandbox::mojom::Sandbox::kHardwareVideoDecoding || #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) sandbox_type == sandbox::mojom::Sandbox::kHardwareVideoEncoding; -@@ -145,6 +155,7 @@ bool ShouldUseAmdGpuPolicy(sandbox::mojom::Sandbox san +@@ -153,6 +163,7 @@ bool ShouldUseAmdGpuPolicy(sandbox::mojom::Sandbox san return false; } @@ -78,7 +88,7 @@ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_WIN) -@@ -242,7 +253,8 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -250,7 +261,8 @@ int UtilityMain(MainFunctionParams parameters) { CHECK(on_device_model::OnDeviceModelService::PreSandboxInit()); } @@ -88,7 +98,7 @@ // Thread type delegate of the process should be registered before first // thread type change in ChildProcess constructor. It also needs to be // registered before the process has multiple threads, which may race with -@@ -254,7 +266,7 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -262,7 +274,7 @@ int UtilityMain(MainFunctionParams parameters) { } #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -97,16 +107,32 @@ // Initializes the sandbox before any threads are created. // TODO(jorgelo): move this after GTK initialization when we enable a strict // Seccomp-BPF policy. -@@ -295,7 +307,7 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -292,7 +304,7 @@ int UtilityMain(MainFunctionParams parameters) { + pre_sandbox_hook = + base::BindOnce(&speech::SpeechRecognitionPreSandboxHook); + break; +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + case sandbox::mojom::Sandbox::kOnDeviceTranslation: + pre_sandbox_hook = base::BindOnce( + &on_device_translation::OnDeviceTranslationSandboxHook); +@@ -306,13 +318,13 @@ int UtilityMain(MainFunctionParams parameters) { + screen_ai::GetBinaryPathSwitch())); + break; + #endif +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) case sandbox::mojom::Sandbox::kVideoEffects: - // TODO(crbug.com/361128453): Implement this. - NOTREACHED() << "kVideoEffects sandbox not implemented."; + pre_sandbox_hook = + base::BindOnce(&video_effects::VideoEffectsPreSandboxHook); + break; + #endif // BUILDFLAG(IS_LINUX) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) case sandbox::mojom::Sandbox::kHardwareVideoDecoding: pre_sandbox_hook = base::BindOnce(&media::HardwareVideoDecodingPreSandboxHook); -@@ -322,6 +334,7 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -339,6 +351,7 @@ int UtilityMain(MainFunctionParams parameters) { default: break; } @@ -114,7 +140,7 @@ if (!sandbox::policy::IsUnsandboxedSandboxType(sandbox_type) && (parameters.zygote_child || !pre_sandbox_hook.is_null())) { sandbox_options.use_amd_specific_policies = -@@ -329,6 +342,11 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -346,6 +359,11 @@ int UtilityMain(MainFunctionParams parameters) { sandbox::policy::Sandbox::Initialize( sandbox_type, std::move(pre_sandbox_hook), sandbox_options); } diff --git a/www/chromium/files/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc b/www/chromium/files/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc index 416d8125faa8..8e2ebe9b2d13 100644 --- a/www/chromium/files/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc +++ b/www/chromium/files/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc @@ -1,6 +1,6 @@ ---- extensions/browser/api/api_browser_context_keyed_service_factories.cc.orig 2024-10-22 08:31:56 UTC +--- extensions/browser/api/api_browser_context_keyed_service_factories.cc.orig 2024-11-14 07:57:23 UTC +++ extensions/browser/api/api_browser_context_keyed_service_factories.cc -@@ -114,7 +114,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt +@@ -117,7 +117,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt #endif MessageService::GetFactoryInstance(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ diff --git a/www/chromium/files/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc b/www/chromium/files/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc index f8459b174feb..cbeb4f7f0728 100644 --- a/www/chromium/files/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc +++ b/www/chromium/files/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc @@ -1,18 +1,18 @@ ---- extensions/browser/api/networking_private/networking_private_delegate_factory.cc.orig 2023-10-11 18:22:24 UTC +--- extensions/browser/api/networking_private/networking_private_delegate_factory.cc.orig 2024-11-14 07:57:23 UTC +++ extensions/browser/api/networking_private/networking_private_delegate_factory.cc -@@ -14,7 +14,7 @@ +@@ -12,7 +12,7 @@ + + #if BUILDFLAG(IS_CHROMEOS) #include "extensions/browser/api/networking_private/networking_private_chromeos.h" - #elif BUILDFLAG(IS_CHROMEOS_LACROS) - #include "extensions/browser/api/networking_private/networking_private_lacros.h" -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "extensions/browser/api/networking_private/networking_private_linux.h" #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) #include "components/wifi/wifi_service.h" -@@ -67,7 +67,7 @@ NetworkingPrivateDelegateFactory::BuildServiceInstance +@@ -63,7 +63,7 @@ NetworkingPrivateDelegateFactory::BuildServiceInstance + std::unique_ptr<NetworkingPrivateDelegate> delegate; + #if BUILDFLAG(IS_CHROMEOS) delegate = std::make_unique<NetworkingPrivateChromeOS>(browser_context); - #elif BUILDFLAG(IS_CHROMEOS_LACROS) - delegate = std::make_unique<NetworkingPrivateLacros>(browser_context); -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) delegate = std::make_unique<NetworkingPrivateLinux>(); diff --git a/www/chromium/files/patch-gpu_command__buffer_service_dawn__context__provider.cc b/www/chromium/files/patch-gpu_command__buffer_service_dawn__context__provider.cc index 90b798d5a10d..7e1139e5815d 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_dawn__context__provider.cc +++ b/www/chromium/files/patch-gpu_command__buffer_service_dawn__context__provider.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/dawn_context_provider.cc.orig 2024-10-22 08:31:56 UTC +--- gpu/command_buffer/service/dawn_context_provider.cc.orig 2024-11-14 07:57:23 UTC +++ gpu/command_buffer/service/dawn_context_provider.cc -@@ -307,7 +307,7 @@ wgpu::BackendType DawnContextProvider::GetDefaultBacke +@@ -302,7 +302,7 @@ wgpu::BackendType DawnContextProvider::GetDefaultBacke return base::FeatureList::IsEnabled(features::kSkiaGraphiteDawnUseD3D12) ? wgpu::BackendType::D3D12 : wgpu::BackendType::D3D11; diff --git a/www/chromium/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc b/www/chromium/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc index d144ef536f9f..f01da4b83f17 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc +++ b/www/chromium/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/gles2_cmd_decoder.cc.orig 2024-09-30 07:45:04 UTC +--- gpu/command_buffer/service/gles2_cmd_decoder.cc.orig 2024-11-14 07:57:23 UTC +++ gpu/command_buffer/service/gles2_cmd_decoder.cc -@@ -2906,7 +2906,7 @@ GLES2Decoder* GLES2Decoder::Create( +@@ -2879,7 +2879,7 @@ GLES2Decoder* GLES2Decoder::Create( } // Allow linux to run fuzzers. diff --git a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc index a53b3e28f14f..4455fefd7025 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc +++ b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig 2024-10-22 08:31:56 UTC +--- gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig 2024-11-14 07:57:23 UTC +++ gpu/command_buffer/service/shared_image/external_vk_image_backing.cc -@@ -59,7 +59,7 @@ +@@ -57,7 +57,7 @@ #include "ui/gl/gl_version_info.h" #include "ui/gl/scoped_binders.h" @@ -9,7 +9,7 @@ #include "gpu/command_buffer/service/shared_image/external_vk_image_dawn_representation.h" #if BUILDFLAG(DAWN_ENABLE_BACKEND_OPENGLES) #include "gpu/command_buffer/service/shared_image/dawn_gl_texture_representation.h" -@@ -727,7 +727,7 @@ std::unique_ptr<DawnImageRepresentation> ExternalVkIma +@@ -704,7 +704,7 @@ std::unique_ptr<DawnImageRepresentation> ExternalVkIma wgpu::BackendType backend_type, std::vector<wgpu::TextureFormat> view_formats, scoped_refptr<SharedContextState> context_state) { diff --git a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc index 3c7a9ee9f458..2f917384c1c0 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc +++ b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc @@ -1,11 +1,11 @@ ---- gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc.orig 2024-10-22 08:31:56 UTC +--- gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc.orig 2024-11-14 07:57:23 UTC +++ gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc -@@ -142,7 +142,7 @@ bool IsFormatSupported(viz::SharedImageFormat format, - } // namespace +@@ -176,7 +176,7 @@ bool IsFormatSupported(viz::SharedImageFormat format, - constexpr SharedImageUsageSet kSupportedUsage = + SharedImageUsageSet SupportedUsage() { + SharedImageUsageSet supported_usage = -#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_DAWN) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_DAWN) - SHARED_IMAGE_USAGE_WEBGPU_READ | SHARED_IMAGE_USAGE_WEBGPU_WRITE | - SHARED_IMAGE_USAGE_WEBGPU_SWAP_CHAIN_TEXTURE | - SHARED_IMAGE_USAGE_WEBGPU_STORAGE_TEXTURE | + SHARED_IMAGE_USAGE_WEBGPU_READ | SHARED_IMAGE_USAGE_WEBGPU_WRITE | + SHARED_IMAGE_USAGE_WEBGPU_SWAP_CHAIN_TEXTURE | + SHARED_IMAGE_USAGE_WEBGPU_STORAGE_TEXTURE | diff --git a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc index eda9c1460799..cbc070141075 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc +++ b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc @@ -1,11 +1,11 @@ ---- gpu/command_buffer/service/shared_image/shared_image_manager.cc.orig 2024-10-22 08:31:56 UTC +--- gpu/command_buffer/service/shared_image/shared_image_manager.cc.orig 2024-11-14 07:57:23 UTC +++ gpu/command_buffer/service/shared_image/shared_image_manager.cc -@@ -603,7 +603,7 @@ bool SharedImageManager::SupportsScanoutImages() { +@@ -605,7 +605,7 @@ bool SharedImageManager::SupportsScanoutImages() { return true; #elif BUILDFLAG(IS_ANDROID) return base::AndroidHardwareBufferCompat::IsSupportAvailable(); -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - return ui::OzonePlatform::GetInstance() - ->GetPlatformRuntimeProperties() - .supports_native_pixmaps; + // We are in the process of tightening scanout support on Ozone to be guarded + // by overlays being supported rather than merely native pixmaps being + // supported, as native pixmap support doesn't always imply that those native diff --git a/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc b/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc index d37de69df23a..873c859317df 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc +++ b/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2024-10-22 08:31:56 UTC +--- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2024-11-14 07:57:23 UTC +++ gpu/command_buffer/service/webgpu_decoder_impl.cc -@@ -1309,7 +1309,7 @@ WGPUFuture WebGPUDecoderImpl::RequestAdapterImpl( +@@ -1390,7 +1390,7 @@ WGPUFuture WebGPUDecoderImpl::RequestAdapterImpl( force_fallback_adapter = true; } @@ -9,7 +9,7 @@ if (!shared_context_state_->GrContextIsVulkan() && !shared_context_state_->IsGraphiteDawnVulkan() && use_webgpu_adapter_ != WebGPUAdapterName::kOpenGLES) { -@@ -1978,7 +1978,7 @@ WebGPUDecoderImpl::AssociateMailboxDawn( +@@ -2075,7 +2075,7 @@ WebGPUDecoderImpl::AssociateMailboxDawn( } #if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_APPLE) && \ diff --git a/www/chromium/files/patch-gpu_config_gpu__control__list.cc b/www/chromium/files/patch-gpu_config_gpu__control__list.cc index 9f398e3c4572..36a0028869f6 100644 --- a/www/chromium/files/patch-gpu_config_gpu__control__list.cc +++ b/www/chromium/files/patch-gpu_config_gpu__control__list.cc @@ -1,6 +1,6 @@ ---- gpu/config/gpu_control_list.cc.orig 2024-09-30 07:45:04 UTC +--- gpu/config/gpu_control_list.cc.orig 2024-11-14 07:57:23 UTC +++ gpu/config/gpu_control_list.cc -@@ -282,7 +282,7 @@ bool GpuControlList::More::GLVersionInfoMismatch( +@@ -277,7 +277,7 @@ bool GpuControlList::More::GLVersionInfoMismatch( GpuControlList::GLType GpuControlList::More::GetDefaultGLType() { #if BUILDFLAG(IS_CHROMEOS) return kGLTypeGL; @@ -9,7 +9,7 @@ return kGLTypeGL; #elif BUILDFLAG(IS_MAC) return kGLTypeGL; -@@ -819,7 +819,7 @@ GpuControlList::OsType GpuControlList::GetOsType() { +@@ -848,7 +848,7 @@ GpuControlList::OsType GpuControlList::GetOsType() { return kOsAndroid; #elif BUILDFLAG(IS_FUCHSIA) return kOsFuchsia; diff --git a/www/chromium/files/patch-gpu_config_gpu__finch__features.cc b/www/chromium/files/patch-gpu_config_gpu__finch__features.cc index a3f0d6b9435d..fc707fcb6fbc 100644 --- a/www/chromium/files/patch-gpu_config_gpu__finch__features.cc +++ b/www/chromium/files/patch-gpu_config_gpu__finch__features.cc @@ -1,20 +1,12 @@ ---- gpu/config/gpu_finch_features.cc.orig 2024-10-22 08:31:56 UTC +--- gpu/config/gpu_finch_features.cc.orig 2024-11-14 07:57:23 UTC +++ gpu/config/gpu_finch_features.cc -@@ -150,7 +150,7 @@ const base::FeatureParam<std::string> +@@ -147,7 +147,8 @@ const base::FeatureParam<std::string> BASE_FEATURE(kDefaultEnableGpuRasterization, "DefaultEnableGpuRasterization", #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) -+ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - base::FEATURE_ENABLED_BY_DEFAULT - #else - base::FEATURE_DISABLED_BY_DEFAULT -@@ -163,7 +163,7 @@ BASE_FEATURE(kCanvasOopRasterization, - "CanvasOopRasterization", - #if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_WIN) || \ - (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) || BUILDFLAG(IS_ANDROID) || \ -- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || \ ++ BUILDFLAG(IS_BSD) base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT diff --git a/www/chromium/files/patch-gpu_config_gpu__info__collector.cc b/www/chromium/files/patch-gpu_config_gpu__info__collector.cc index db3219d9b43c..9cf97fbc34b9 100644 --- a/www/chromium/files/patch-gpu_config_gpu__info__collector.cc +++ b/www/chromium/files/patch-gpu_config_gpu__info__collector.cc @@ -1,6 +1,6 @@ ---- gpu/config/gpu_info_collector.cc.orig 2024-10-22 08:31:56 UTC +--- gpu/config/gpu_info_collector.cc.orig 2024-11-14 07:57:23 UTC +++ gpu/config/gpu_info_collector.cc -@@ -368,7 +368,7 @@ void ReportWebGPUAdapterMetrics(dawn::native::Instance +@@ -362,7 +362,7 @@ void ReportWebGPUAdapterMetrics(dawn::native::Instance void ReportWebGPUSupportMetrics(dawn::native::Instance* instance) { static BASE_FEATURE(kCollectWebGPUSupportMetrics, "CollectWebGPUSupportMetrics", diff --git a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc index 133c8a383c95..a90b5bcb07a4 100644 --- a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc +++ b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc @@ -1,4 +1,4 @@ ---- gpu/ipc/service/gpu_init.cc.orig 2024-09-30 07:45:04 UTC +--- gpu/ipc/service/gpu_init.cc.orig 2024-11-14 07:57:23 UTC +++ gpu/ipc/service/gpu_init.cc @@ -387,7 +387,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL enable_watchdog = false; @@ -36,7 +36,7 @@ VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly " << "on Linux"; return false; -@@ -761,7 +761,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -766,7 +766,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_); @@ -45,7 +45,7 @@ // Driver may create a compatibility profile context when collect graphics // information on Linux platform. Try to collect graphics information // based on core profile context after disabling platform extensions. -@@ -816,7 +816,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -821,7 +821,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } } } @@ -54,7 +54,7 @@ (BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_CHROMEOS_DEVICE)) if (!gl_disabled && !gl_use_swiftshader_ && std::getenv("RUNNING_UNDER_RR")) { // https://rr-project.org/ is a Linux-only record-and-replay debugger that -@@ -1001,7 +1001,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -1008,7 +1008,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c } bool gl_disabled = gl::GetGLImplementation() == gl::kGLImplementationDisabled; @@ -63,7 +63,7 @@ (BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_CHROMEOS_DEVICE)) if (!gl_disabled && !gl_use_swiftshader_ && std::getenv("RUNNING_UNDER_RR")) { // https://rr-project.org/ is a Linux-only record-and-replay debugger that -@@ -1056,7 +1056,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -1063,7 +1063,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c } } diff --git a/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc b/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc index 657057aeb7b2..8a9650353fe3 100644 --- a/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc +++ b/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc @@ -1,4 +1,4 @@ ---- headless/lib/browser/headless_content_browser_client.cc.orig 2024-10-22 08:31:56 UTC +--- headless/lib/browser/headless_content_browser_client.cc.orig 2024-11-14 07:57:23 UTC +++ headless/lib/browser/headless_content_browser_client.cc @@ -56,7 +56,7 @@ #include "content/public/common/content_descriptors.h" @@ -9,7 +9,7 @@ #include "components/os_crypt/sync/os_crypt.h" // nogncheck #include "content/public/browser/network_service_util.h" #endif -@@ -478,7 +478,7 @@ void HeadlessContentBrowserClient::HandleExplicitlyAll +@@ -488,7 +488,7 @@ void HeadlessContentBrowserClient::HandleExplicitlyAll void HeadlessContentBrowserClient::SetEncryptionKey( ::network::mojom::NetworkService* network_service) { diff --git a/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc b/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc index 4f631c326796..7692f2a1f693 100644 --- a/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc +++ b/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc @@ -1,6 +1,6 @@ ---- headless/lib/headless_content_main_delegate.cc.orig 2024-09-30 07:45:04 UTC +--- headless/lib/headless_content_main_delegate.cc.orig 2024-11-14 07:57:23 UTC +++ headless/lib/headless_content_main_delegate.cc -@@ -406,7 +406,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( +@@ -407,7 +407,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( if (process_type != ::switches::kZygoteProcess) { g_headless_crash_client.Pointer()->set_crash_dumps_dir( command_line.GetSwitchValuePath(switches::kCrashDumpsDir)); diff --git a/www/chromium/files/patch-ipc_ipc__message__utils.cc b/www/chromium/files/patch-ipc_ipc__message__utils.cc index 6b9ca0f01212..2dc0167f1c0e 100644 --- a/www/chromium/files/patch-ipc_ipc__message__utils.cc +++ b/www/chromium/files/patch-ipc_ipc__message__utils.cc @@ -1,6 +1,6 @@ ---- ipc/ipc_message_utils.cc.orig 2024-08-26 12:06:38 UTC +--- ipc/ipc_message_utils.cc.orig 2024-11-14 07:57:23 UTC +++ ipc/ipc_message_utils.cc -@@ -400,7 +400,7 @@ void ParamTraits<unsigned int>::Log(const param_type& +@@ -399,7 +399,7 @@ void ParamTraits<unsigned int>::Log(const param_type& } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/chromium/files/patch-media_base_media__switches.cc b/www/chromium/files/patch-media_base_media__switches.cc index 27c785d42001..92ea05ebf056 100644 --- a/www/chromium/files/patch-media_base_media__switches.cc +++ b/www/chromium/files/patch-media_base_media__switches.cc @@ -1,4 +1,4 @@ ---- media/base/media_switches.cc.orig 2024-10-22 08:31:56 UTC +--- media/base/media_switches.cc.orig 2024-11-14 07:57:23 UTC +++ media/base/media_switches.cc @@ -21,7 +21,7 @@ #include "ui/gl/gl_features.h" @@ -49,7 +49,7 @@ #endif // BUILDFLAG(IS_LINUX) // When enabled, MediaCapabilities will check with GPU Video Accelerator -@@ -682,7 +704,7 @@ BASE_FEATURE(kFileDialogsBlockPictureInPicture, +@@ -674,7 +696,7 @@ BASE_FEATURE(kFileDialogsBlockPictureInPicture, // Show toolbar button that opens dialog for controlling media sessions. BASE_FEATURE(kGlobalMediaControls, "GlobalMediaControls", @@ -58,7 +58,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -705,7 +727,7 @@ BASE_FEATURE(kGlobalMediaControlsUpdatedUI, +@@ -697,7 +719,7 @@ BASE_FEATURE(kGlobalMediaControlsUpdatedUI, // If enabled, users can request Media Remoting without fullscreen-in-tab. BASE_FEATURE(kMediaRemotingWithoutFullscreen, "MediaRemotingWithoutFullscreen", @@ -67,7 +67,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -717,7 +739,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen, +@@ -709,7 +731,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen, BASE_FEATURE(kGlobalMediaControlsPictureInPicture, "GlobalMediaControlsPictureInPicture", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -76,25 +76,25 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -746,7 +768,7 @@ BASE_FEATURE(kUnifiedAutoplay, +@@ -738,7 +760,7 @@ BASE_FEATURE(kUnifiedAutoplay, "UnifiedAutoplay", base::FEATURE_ENABLED_BY_DEFAULT); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Enable vaapi video decoding on linux. This is already enabled by default on - // chromeos, but needs an experiment on linux. - BASE_FEATURE(kVaapiVideoDecodeLinux, -@@ -846,7 +868,7 @@ BASE_FEATURE(kVSyncMjpegDecoding, + // Enable vaapi/v4l2 video decoding on linux. This is already enabled by default + // on chromeos, but needs an experiment on linux. + BASE_FEATURE(kAcceleratedVideoDecodeLinux, +@@ -838,7 +860,7 @@ BASE_FEATURE(kVSyncMjpegDecoding, "VSyncMjpegDecoding", base::FEATURE_DISABLED_BY_DEFAULT); #endif // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Enables the new V4L2StatefulVideoDecoder instead of V4L2VideoDecoder. - // Owners: frkoenig@chromium.org, mcasas@chromium.org - // Expiry: When the |V4L2FlatVideoDecoder| flag handles stateful decoding on -@@ -1479,7 +1501,7 @@ BASE_FEATURE(kUseGTFOOutOfProcessVideoDecoding, + // Enable H264 temporal layer encoding with V4L2 HW encoder on ChromeOS. + BASE_FEATURE(kV4L2H264TemporalLayerHWEncoding, + "V4L2H264TemporalLayerHWEncoding", +@@ -1453,7 +1475,7 @@ BASE_FEATURE(kUseGTFOOutOfProcessVideoDecoding, base::FEATURE_DISABLED_BY_DEFAULT); #endif // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER) @@ -103,7 +103,7 @@ // Spawn utility processes to perform hardware encode acceleration instead of // using the GPU process. BASE_FEATURE(kUseOutOfProcessVideoEncoding, -@@ -1559,7 +1581,7 @@ BASE_FEATURE(kRecordWebAudioEngagement, +@@ -1533,7 +1555,7 @@ BASE_FEATURE(kRecordWebAudioEngagement, "RecordWebAudioEngagement", base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/www/chromium/files/patch-media_base_media__switches.h b/www/chromium/files/patch-media_base_media__switches.h index 3034c2f6ba50..718c246c62a8 100644 --- a/www/chromium/files/patch-media_base_media__switches.h +++ b/www/chromium/files/patch-media_base_media__switches.h @@ -1,6 +1,6 @@ ---- media/base/media_switches.h.orig 2024-10-22 08:31:56 UTC +--- media/base/media_switches.h.orig 2024-11-14 07:57:23 UTC +++ media/base/media_switches.h -@@ -331,13 +331,25 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kPlatformHEVCEncoder +@@ -333,13 +333,25 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kPlatformHEVCEncoder MEDIA_EXPORT BASE_DECLARE_FEATURE(kPlaybackSpeedButton); MEDIA_EXPORT BASE_DECLARE_FEATURE(kPreloadMediaEngagementData); MEDIA_EXPORT BASE_DECLARE_FEATURE(kPreloadMetadataSuspend); @@ -28,25 +28,25 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kReduceHardwareVideoDecoderBuffers); #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) MEDIA_EXPORT BASE_DECLARE_FEATURE(kResumeBackgroundVideo); -@@ -352,7 +364,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUnifiedAutoplay); +@@ -353,7 +365,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kSuspendMutedAudio); + MEDIA_EXPORT BASE_DECLARE_FEATURE(kUnifiedAutoplay); MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseAndroidOverlayForSecureOnly); - MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseDecoderStreamForWebRTC); MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseFakeDeviceForMediaStream); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoDecodeLinux); - MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoDecodeLinuxGL); - MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoEncodeLinux); -@@ -373,7 +385,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp8TemporalLay + MEDIA_EXPORT BASE_DECLARE_FEATURE(kAcceleratedVideoDecodeLinux); + MEDIA_EXPORT BASE_DECLARE_FEATURE(kAcceleratedVideoDecodeLinuxGL); + MEDIA_EXPORT BASE_DECLARE_FEATURE(kAcceleratedVideoEncodeLinux); +@@ -374,7 +386,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp8TemporalLay MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp9SModeHWEncoding); MEDIA_EXPORT BASE_DECLARE_FEATURE(kVSyncMjpegDecoding); #endif // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - MEDIA_EXPORT BASE_DECLARE_FEATURE(kV4L2FlatStatefulVideoDecoder); MEDIA_EXPORT BASE_DECLARE_FEATURE(kV4L2H264TemporalLayerHWEncoding); #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -513,7 +525,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseOutOfProcessVide + MEDIA_EXPORT BASE_DECLARE_FEATURE(kVideoBlitColorAccuracy); +@@ -511,7 +523,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseOutOfProcessVide MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseGTFOOutOfProcessVideoDecoding); #endif // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER) diff --git a/www/chromium/files/patch-media_base_video__frame.cc b/www/chromium/files/patch-media_base_video__frame.cc index a712de5eeb03..b3cbf194d921 100644 --- a/www/chromium/files/patch-media_base_video__frame.cc +++ b/www/chromium/files/patch-media_base_video__frame.cc @@ -1,4 +1,4 @@ ---- media/base/video_frame.cc.orig 2024-10-22 08:31:56 UTC +--- media/base/video_frame.cc.orig 2024-11-14 07:57:23 UTC +++ media/base/video_frame.cc @@ -88,7 +88,7 @@ std::string VideoFrame::StorageTypeToString( return "OWNED_MEMORY"; @@ -27,7 +27,16 @@ bool is_native_buffer = gpu_memory_buffer ? (gpu_memory_buffer->GetType() != gfx::SHARED_MEMORY_BUFFER) -@@ -782,7 +782,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM +@@ -453,7 +453,7 @@ VideoFrame::CreateFrameForGpuMemoryBufferOrMappableSII + } + + // static +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + scoped_refptr<VideoFrame> VideoFrame::WrapOOPVDMailbox( + VideoPixelFormat format, + const gpu::Mailbox& mailbox, +@@ -769,7 +769,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM return frame; } @@ -36,7 +45,16 @@ // static scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs( const VideoFrameLayout& layout, -@@ -1489,7 +1489,7 @@ scoped_refptr<gpu::ClientSharedImage> VideoFrame::shar +@@ -1261,7 +1261,7 @@ bool VideoFrame::IsMappable() const { + return IsStorageTypeMappable(storage_type_); + } + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + bool VideoFrame::HasOOPVDMailbox() const { + return wrapped_frame_ ? wrapped_frame_->HasOOPVDMailbox() + : !oopvd_mailbox_.IsZero(); +@@ -1490,7 +1490,7 @@ scoped_refptr<gpu::ClientSharedImage> VideoFrame::shar return wrapped_frame_ ? wrapped_frame_->shared_image() : shared_image_; } diff --git a/www/chromium/files/patch-media_base_video__frame.h b/www/chromium/files/patch-media_base_video__frame.h index 8a4f70fd49b2..2be61c53da94 100644 --- a/www/chromium/files/patch-media_base_video__frame.h +++ b/www/chromium/files/patch-media_base_video__frame.h @@ -1,4 +1,4 @@ ---- media/base/video_frame.h.orig 2024-10-22 08:31:56 UTC +--- media/base/video_frame.h.orig 2024-11-14 07:57:23 UTC +++ media/base/video_frame.h @@ -50,7 +50,7 @@ #include "base/apple/scoped_cftyperef.h" @@ -9,7 +9,7 @@ #include "base/files/scoped_file.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -116,7 +116,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -109,7 +109,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte STORAGE_UNOWNED_MEMORY = 2, // External, non owned data pointers. STORAGE_OWNED_MEMORY = 3, // VideoFrame has allocated its own data buffer. STORAGE_SHMEM = 4, // Backed by read-only shared memory. @@ -18,7 +18,16 @@ // TODO(mcasas): Consider turning this type into STORAGE_NATIVE // based on the idea of using this same enum value for both DMA // buffers on Linux and CVPixelBuffers on Mac (which currently use -@@ -393,7 +393,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -240,7 +240,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte + base::TimeDelta timestamp, + bool zero_initialize_memory); + +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // Wraps RegisteredMailboxFrameConverter mailbox with a VideoFrame. This is + // used only by ChromeOS/Linux's out-of-process video decoder. + // |mailbox_holder_release_cb| will be called with a sync token as the +@@ -386,7 +386,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte ReleaseMailboxAndGpuMemoryBufferCB mailbox_holder_and_gmb_release_cb, base::TimeDelta timestamp); @@ -27,16 +36,34 @@ // Wraps provided dmabufs // (https://www.kernel.org/doc/html/latest/driver-api/dma-buf.html) with a // VideoFrame. The frame will take ownership of |dmabuf_fds|, and will -@@ -711,7 +711,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -551,7 +551,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte + // visible_data() etc. + bool IsMappable() const; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // Returns true if `frame` has `oopvd_mailbox`. + bool HasOOPVDMailbox() const; + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +@@ -717,7 +717,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte // wait for the included sync point. scoped_refptr<gpu::ClientSharedImage> shared_image() const; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // The number of DmaBufs will be equal or less than the number of planes of - // the frame. If there are less, this means that the last FD contains the - // remaining planes. Should be > 0 for STORAGE_DMABUFS. -@@ -953,7 +953,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte + // Returns the OOPVD mailbox set by `WrapOOPVDMailbox`. + // Only valid to call if this is a NATIVE_TEXTURE frame. Before using the + // mailbox, the caller must wait for the included sync point. +@@ -966,7 +966,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte + // VideoFrame. + const uint8_t* data_[kMaxPlanes]; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // Native texture mailbox, if this frame HasOOPVDMailbox(). + gpu::Mailbox oopvd_mailbox_; + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +@@ -995,7 +995,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte // GpuMemoryBuffers. Clients will set this flag while creating a VideoFrame. bool is_mappable_si_enabled_ = false; diff --git a/www/chromium/files/patch-media_gpu_buffer__validation.cc b/www/chromium/files/patch-media_gpu_buffer__validation.cc index e88c78e3363e..b1a6e38fe556 100644 --- a/www/chromium/files/patch-media_gpu_buffer__validation.cc +++ b/www/chromium/files/patch-media_gpu_buffer__validation.cc @@ -1,46 +1,29 @@ ---- media/gpu/buffer_validation.cc.orig 2024-02-23 21:04:38 UTC +--- media/gpu/buffer_validation.cc.orig 2024-11-14 07:57:23 UTC +++ media/gpu/buffer_validation.cc -@@ -16,7 +16,7 @@ +@@ -15,7 +15,7 @@ #include "ui/gfx/geometry/size.h" #include "ui/gfx/gpu_memory_buffer.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #include <drm_fourcc.h> #include <sys/types.h> #include <unistd.h> -@@ -29,7 +29,7 @@ + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +@@ -23,7 +23,7 @@ namespace media { - namespace { --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #ifndef I915_FORMAT_MOD_4_TILED_MTL_MC_CCS - // TODO(b/271455200): Remove this definition once drm_fourcc.h contains it. - /* -@@ -55,7 +55,7 @@ bool IsIntelMediaCompressedModifier(uint64_t modifier) - } // namespace - bool GetFileSize(const int fd, size_t* size) { -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (fd < 0) { VLOG(1) << "Invalid file descriptor"; return false; -@@ -109,14 +109,14 @@ bool VerifyGpuMemoryBufferHandle( +@@ -77,7 +77,7 @@ bool VerifyGpuMemoryBufferHandle( VLOG(1) << "Unsupported: " << pixel_format; return false; } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - const uint64_t modifier = gmb_handle.native_pixmap_handle.modifier; - const bool is_intel_media_compressed_buffer = - IsIntelMediaCompressedModifier(modifier); - const bool is_intel_media_compression_enabled = - #if BUILDFLAG(IS_CHROMEOS) - base::FeatureList::IsEnabled(features::kEnableIntelMediaCompression); --#elif BUILDFLAG(IS_LINUX) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - false; - #endif - + const size_t num_planes = media::VideoFrame::NumPlanes(pixel_format); + if (num_planes != gmb_handle.native_pixmap_handle.planes.size() || + num_planes == 0) { diff --git a/www/chromium/files/patch-media_gpu_chromeos_libyuv__image__processor__backend.cc b/www/chromium/files/patch-media_gpu_chromeos_libyuv__image__processor__backend.cc index ecb57fcfdc9b..798caf94eb76 100644 --- a/www/chromium/files/patch-media_gpu_chromeos_libyuv__image__processor__backend.cc +++ b/www/chromium/files/patch-media_gpu_chromeos_libyuv__image__processor__backend.cc @@ -1,4 +1,4 @@ ---- media/gpu/chromeos/libyuv_image_processor_backend.cc.orig 2024-09-30 07:45:04 UTC +--- media/gpu/chromeos/libyuv_image_processor_backend.cc.orig 2024-11-14 07:57:23 UTC +++ media/gpu/chromeos/libyuv_image_processor_backend.cc @@ -53,7 +53,7 @@ static constexpr struct { #define CONV(in, out, trans, result) \ @@ -9,7 +9,7 @@ CONV(NV12, AR24, kConversion, Supported), #endif CONV(NV12, NV12, kConversion, Supported), -@@ -420,7 +420,7 @@ int LibYUVImageProcessorBackend::DoConversion(const Fr +@@ -412,7 +412,7 @@ int LibYUVImageProcessorBackend::DoConversion(const Fr fr->GetWritableVisibleData(VideoFrame::Plane::kUV)), \ fr->stride(VideoFrame::Plane::kUV) @@ -18,7 +18,7 @@ #define ARGB_DATA(fr) \ fr->GetWritableVisibleData(VideoFrame::Plane::kARGB), \ fr->stride(VideoFrame::Plane::kARGB) -@@ -582,7 +582,7 @@ int LibYUVImageProcessorBackend::DoConversion(const Fr +@@ -574,7 +574,7 @@ int LibYUVImageProcessorBackend::DoConversion(const Fr } } diff --git a/www/chromium/files/patch-media_gpu_chromeos_native__pixmap__frame__resource.cc b/www/chromium/files/patch-media_gpu_chromeos_native__pixmap__frame__resource.cc deleted file mode 100644 index b6a822f44080..000000000000 --- a/www/chromium/files/patch-media_gpu_chromeos_native__pixmap__frame__resource.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- media/gpu/chromeos/native_pixmap_frame_resource.cc.orig 2024-08-26 12:06:38 UTC -+++ media/gpu/chromeos/native_pixmap_frame_resource.cc -@@ -176,7 +176,7 @@ scoped_refptr<NativePixmapFrameResource> NativePixmapF - const bool is_intel_media_compression_enabled = - #if BUILDFLAG(IS_CHROMEOS) - base::FeatureList::IsEnabled(features::kEnableIntelMediaCompression); --#elif BUILDFLAG(IS_LINUX) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - false; - #endif - CHECK(!is_intel_media_compressed_buffer || diff --git a/www/chromium/files/patch-media_gpu_chromeos_platform__video__frame__utils.cc b/www/chromium/files/patch-media_gpu_chromeos_platform__video__frame__utils.cc index c3c23ddb60b3..4f1ec7d754d0 100644 --- a/www/chromium/files/patch-media_gpu_chromeos_platform__video__frame__utils.cc +++ b/www/chromium/files/patch-media_gpu_chromeos_platform__video__frame__utils.cc @@ -1,6 +1,6 @@ ---- media/gpu/chromeos/platform_video_frame_utils.cc.orig 2024-06-17 12:56:06 UTC +--- media/gpu/chromeos/platform_video_frame_utils.cc.orig 2024-11-14 07:57:23 UTC +++ media/gpu/chromeos/platform_video_frame_utils.cc -@@ -68,7 +68,7 @@ static std::unique_ptr<ui::GbmDevice> CreateGbmDevice( +@@ -67,7 +67,7 @@ static std::unique_ptr<ui::GbmDevice> CreateGbmDevice( const base::FilePath dev_path(FILE_PATH_LITERAL( base::StrCat({drm_node_file_prefix, base::NumberToString(i)}))); @@ -9,21 +9,3 @@ const bool is_render_node = base::Contains(drm_node_file_prefix, "render"); // TODO(b/313513760): don't guard base::File::FLAG_WRITE behind -@@ -196,7 +196,7 @@ class GbmDeviceWrapper { - const bool is_intel_media_compression_enabled = - #if BUILDFLAG(IS_CHROMEOS) - base::FeatureList::IsEnabled(features::kEnableIntelMediaCompression); --#elif BUILDFLAG(IS_LINUX) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - false; - #endif - if (is_intel_media_compression_enabled) { -@@ -350,7 +350,7 @@ scoped_refptr<VideoFrame> CreateVideoFrameFromGpuMemor - const bool is_intel_media_compression_enabled = - #if BUILDFLAG(IS_CHROMEOS) - base::FeatureList::IsEnabled(features::kEnableIntelMediaCompression); --#elif BUILDFLAG(IS_LINUX) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - false; - #endif - diff --git a/www/chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc b/www/chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc index d1790f2e0cb9..8238c4b15405 100644 --- a/www/chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc +++ b/www/chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc @@ -1,6 +1,6 @@ ---- media/gpu/chromeos/video_decoder_pipeline.cc.orig 2024-08-26 12:06:38 UTC +--- media/gpu/chromeos/video_decoder_pipeline.cc.orig 2024-11-14 07:57:23 UTC +++ media/gpu/chromeos/video_decoder_pipeline.cc -@@ -1096,7 +1096,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -1095,7 +1095,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( } #endif @@ -9,7 +9,7 @@ // Linux should always use a custom allocator (to allocate buffers using // libva) and a PlatformVideoFramePool. CHECK(allocator.has_value()); -@@ -1105,7 +1105,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -1104,7 +1104,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( // VideoFrame::StorageType of VideoFrame::STORAGE_DMABUFS. main_frame_pool_->AsPlatformVideoFramePool()->SetCustomFrameAllocator( *allocator, VideoFrame::STORAGE_DMABUFS); @@ -18,7 +18,7 @@ // Linux w/ V4L2 should not use a custom allocator // Only tested with video_decode_accelerator_tests // TODO(wenst@) Test with full Chromium Browser -@@ -1287,7 +1287,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -1286,7 +1286,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( << " VideoFrames"; auxiliary_frame_pool_->set_parent_task_runner(decoder_task_runner_); diff --git a/www/chromium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc b/www/chromium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc index e9d24ec7ecfc..78df627171c4 100644 --- a/www/chromium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc +++ b/www/chromium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc @@ -1,4 +1,4 @@ ---- media/gpu/gpu_video_encode_accelerator_factory.cc.orig 2024-04-19 13:02:56 UTC +--- media/gpu/gpu_video_encode_accelerator_factory.cc.orig 2024-11-14 07:57:23 UTC +++ media/gpu/gpu_video_encode_accelerator_factory.cc @@ -118,7 +118,7 @@ std::vector<VEAFactoryFunction> GetVEAFactoryFunctions return vea_factory_functions; @@ -6,6 +6,15 @@ #if BUILDFLAG(USE_VAAPI) -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (base::FeatureList::IsEnabled(kVaapiVideoEncodeLinux)) + if (base::FeatureList::IsEnabled(kAcceleratedVideoEncodeLinux)) { vea_factory_functions.push_back(base::BindRepeating(&CreateVaapiVEA)); - #else + } +@@ -126,7 +126,7 @@ std::vector<VEAFactoryFunction> GetVEAFactoryFunctions + vea_factory_functions.push_back(base::BindRepeating(&CreateVaapiVEA)); + #endif + #elif BUILDFLAG(USE_V4L2_CODEC) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (base::FeatureList::IsEnabled(kAcceleratedVideoEncodeLinux)) { + vea_factory_functions.push_back(base::BindRepeating(&CreateV4L2VEA)); + } diff --git a/www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc b/www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc index 99083d877d75..cf9af5b9b36c 100644 --- a/www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc +++ b/www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc @@ -1,4 +1,4 @@ ---- media/mojo/mojom/video_frame_mojom_traits.cc.orig 2024-09-30 07:45:04 UTC +--- media/mojo/mojom/video_frame_mojom_traits.cc.orig 2024-11-14 07:57:23 UTC +++ media/mojo/mojom/video_frame_mojom_traits.cc @@ -27,7 +27,7 @@ #include "ui/gfx/mojom/color_space_mojom_traits.h" @@ -9,3 +9,21 @@ #include "base/posix/eintr_wrapper.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +@@ -152,7 +152,7 @@ media::mojom::VideoFrameDataPtr MakeVideoFrameData( + std::move(shared_image), std::move(mailbox_holder.sync_token), + std::move(mailbox_holder.texture_target), + std::move(input->ycbcr_info()))); +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + } else if (input->HasOOPVDMailbox()) { + return media::mojom::VideoFrameData::NewMailboxData( + media::mojom::MailboxVideoFrameData::New(input->oopvd_mailbox())); +@@ -353,7 +353,7 @@ bool StructTraits<media::mojom::VideoFrameDataView, + frame = media::VideoFrame::WrapExternalGpuMemoryBuffer( + visible_rect, natural_size, std::move(gpu_memory_buffer), shared_image, + sync_token, base::NullCallback(), timestamp); +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + } else if (data.is_mailbox_data()) { + media::mojom::MailboxVideoFrameDataDataView mailbox_data; + data.GetMailboxDataDataView(&mailbox_data); diff --git a/www/chromium/files/patch-media_video_fake__gpu__memory__buffer.cc b/www/chromium/files/patch-media_video_fake__gpu__memory__buffer.cc index ecd3f1f1bbfc..818c17fcc1a5 100644 --- a/www/chromium/files/patch-media_video_fake__gpu__memory__buffer.cc +++ b/www/chromium/files/patch-media_video_fake__gpu__memory__buffer.cc @@ -1,4 +1,4 @@ ---- media/video/fake_gpu_memory_buffer.cc.orig 2024-09-30 07:45:04 UTC +--- media/video/fake_gpu_memory_buffer.cc.orig 2024-11-14 07:57:23 UTC +++ media/video/fake_gpu_memory_buffer.cc @@ -14,7 +14,7 @@ #include "media/base/format_utils.h" @@ -9,7 +9,7 @@ #include <fcntl.h> #include <sys/stat.h> #include <sys/types.h> -@@ -57,7 +57,7 @@ class FakeGpuMemoryBufferImpl : public gpu::GpuMemoryB +@@ -63,7 +63,7 @@ class FakeGpuMemoryBufferImpl : public gpu::GpuMemoryB } // namespace @@ -18,7 +18,7 @@ base::ScopedFD GetDummyFD() { base::ScopedFD fd(open("/dev/zero", O_RDWR)); DCHECK(fd.is_valid()); -@@ -87,7 +87,7 @@ FakeGpuMemoryBuffer::FakeGpuMemoryBuffer(const gfx::Si +@@ -102,7 +102,7 @@ FakeGpuMemoryBuffer::FakeGpuMemoryBuffer(const gfx::Si static base::AtomicSequenceNumber buffer_id_generator; handle_.id = gfx::GpuMemoryBufferId(buffer_id_generator.GetNext()); @@ -27,7 +27,7 @@ for (size_t i = 0; i < VideoFrame::NumPlanes(video_pixel_format_); i++) { const gfx::Size plane_size_in_bytes = VideoFrame::PlaneSize(video_pixel_format_, i, size_); -@@ -149,7 +149,7 @@ gfx::GpuMemoryBufferHandle FakeGpuMemoryBuffer::CloneH +@@ -176,7 +176,7 @@ gfx::GpuMemoryBufferHandle FakeGpuMemoryBuffer::CloneH gfx::GpuMemoryBufferHandle handle; handle.type = gfx::NATIVE_PIXMAP; handle.id = handle_.id; diff --git a/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc b/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc index 2f7879758c96..8ba110116c36 100644 --- a/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc +++ b/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc @@ -1,24 +1,15 @@ ---- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2024-10-22 08:31:56 UTC +--- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2024-11-14 07:57:23 UTC +++ media/video/gpu_memory_buffer_video_frame_pool.cc -@@ -98,7 +98,7 @@ class GpuMemoryBufferVideoFramePool::PoolImpl - gpu::SHARED_IMAGE_USAGE_RASTER_READ | - gpu::SHARED_IMAGE_USAGE_DISPLAY_READ | - gpu::SHARED_IMAGE_USAGE_SCANOUT; --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - // TODO(crbug.com/40194712): Always add the flag once the - // OzoneImageBacking is by default turned on. - if (base::CommandLine::ForCurrentProcess()->HasSwitch( -@@ -695,7 +695,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa +@@ -641,7 +641,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa } - bool is_software_backed_video_frame = !video_frame->HasTextures(); + bool is_software_backed_video_frame = !video_frame->HasSharedImage(); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) is_software_backed_video_frame &= !video_frame->HasDmaBufs(); #endif -@@ -1104,7 +1104,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo +@@ -1049,7 +1049,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo media::IOSurfaceIsWebGPUCompatible(handle.io_surface.get()); #endif @@ -27,3 +18,12 @@ is_webgpu_compatible = handle.native_pixmap_handle.supports_zero_copy_webgpu_import; #endif +@@ -1236,7 +1236,7 @@ GpuMemoryBufferVideoFramePool::PoolImpl::GetOrCreateFr + si_usage |= gpu::SHARED_IMAGE_USAGE_SCANOUT; + } + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + // TODO(crbug.com/40194712): Always add the flag once the + // OzoneImageBacking is by default turned on. + if (base::CommandLine::ForCurrentProcess()->HasSwitch( diff --git a/www/chromium/files/patch-media_video_video__encode__accelerator__adapter.cc b/www/chromium/files/patch-media_video_video__encode__accelerator__adapter.cc index 9ec3cc474e13..214072181755 100644 --- a/www/chromium/files/patch-media_video_video__encode__accelerator__adapter.cc +++ b/www/chromium/files/patch-media_video_video__encode__accelerator__adapter.cc @@ -1,17 +1,17 @@ ---- media/video/video_encode_accelerator_adapter.cc.orig 2024-09-30 07:45:04 UTC +--- media/video/video_encode_accelerator_adapter.cc.orig 2024-11-14 07:57:23 UTC +++ media/video/video_encode_accelerator_adapter.cc -@@ -164,7 +164,7 @@ VideoEncodeAccelerator::Config SetUpVeaConfig( - if (is_rgb) +@@ -160,7 +160,7 @@ VideoEncodeAccelerator::Config SetUpVeaConfig( config.input_format = PIXEL_FORMAT_I420; + } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (format != PIXEL_FORMAT_I420 || !VideoFrame::IsStorageTypeMappable(storage_type)) { // ChromeOS/Linux hardware video encoders supports I420 on-memory -@@ -550,7 +550,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal - SetUpVeaConfig(profile_, options_, format, first_frame->storage_type(), - supported_rc_modes_, required_encoder_type_); +@@ -519,7 +519,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal + profile_, options_, format, first_frame->storage_type(), + supported_rc_modes_, required_encoder_type_, is_gpu_supported_format); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) diff --git a/www/chromium/files/patch-net_BUILD.gn b/www/chromium/files/patch-net_BUILD.gn index 4a0c5cc882a8..5ea8b7e95b7c 100644 --- a/www/chromium/files/patch-net_BUILD.gn +++ b/www/chromium/files/patch-net_BUILD.gn @@ -1,6 +1,6 @@ ---- net/BUILD.gn.orig 2024-10-22 08:31:56 UTC +--- net/BUILD.gn.orig 2024-11-14 07:57:23 UTC +++ net/BUILD.gn -@@ -125,7 +125,7 @@ net_configs = [ +@@ -126,7 +126,7 @@ net_configs = [ "//build/config/compiler:wexit_time_destructors", ] @@ -9,7 +9,7 @@ net_configs += [ "//build/config/linux:libresolv" ] } -@@ -1277,6 +1277,19 @@ component("net") { +@@ -1287,6 +1287,19 @@ component("net") { ] } @@ -29,7 +29,7 @@ if (is_mac) { sources += [ "base/network_notification_thread_mac.cc", -@@ -1438,7 +1451,7 @@ component("net") { +@@ -1450,7 +1463,7 @@ component("net") { } # Use getifaddrs() on POSIX platforms, except Linux. @@ -38,7 +38,7 @@ sources += [ "base/network_interfaces_getifaddrs.cc", "base/network_interfaces_getifaddrs.h", -@@ -2921,7 +2934,7 @@ target(_test_target_type, "net_unittests") { +@@ -2935,7 +2948,7 @@ target(_test_target_type, "net_unittests") { ] } @@ -47,7 +47,7 @@ sources += [ "base/address_tracker_linux_unittest.cc", "base/network_interfaces_linux_unittest.cc", -@@ -3014,6 +3027,10 @@ target(_test_target_type, "net_unittests") { +@@ -3028,6 +3041,10 @@ target(_test_target_type, "net_unittests") { ] } @@ -58,7 +58,7 @@ if (enable_websockets) { sources += [ "server/http_connection_unittest.cc", -@@ -3080,7 +3097,7 @@ target(_test_target_type, "net_unittests") { +@@ -3094,7 +3111,7 @@ target(_test_target_type, "net_unittests") { ] } @@ -67,7 +67,7 @@ sources += [ "tools/quic/quic_simple_server_test.cc" ] } -@@ -3219,7 +3236,7 @@ target(_test_target_type, "net_unittests") { +@@ -3233,7 +3250,7 @@ target(_test_target_type, "net_unittests") { } # Use getifaddrs() on POSIX platforms, except Linux. diff --git a/www/chromium/files/patch-net_cert_cert__verify__proc.h b/www/chromium/files/patch-net_cert_cert__verify__proc.h index d2101f16a249..60b5536f1659 100644 --- a/www/chromium/files/patch-net_cert_cert__verify__proc.h +++ b/www/chromium/files/patch-net_cert_cert__verify__proc.h @@ -1,6 +1,6 @@ ---- net/cert/cert_verify_proc.h.orig 2024-10-22 08:31:56 UTC +--- net/cert/cert_verify_proc.h.orig 2024-11-14 07:57:23 UTC +++ net/cert/cert_verify_proc.h -@@ -178,7 +178,7 @@ class NET_EXPORT CertVerifyProc +@@ -186,7 +186,7 @@ class NET_EXPORT CertVerifyProc kMaxValue = kChainLengthOne }; diff --git a/www/chromium/files/patch-net_disk__cache_backend__experiment.h b/www/chromium/files/patch-net_disk__cache_backend__experiment.h new file mode 100644 index 000000000000..b286abed6dda --- /dev/null +++ b/www/chromium/files/patch-net_disk__cache_backend__experiment.h @@ -0,0 +1,11 @@ +--- net/disk_cache/backend_experiment.h.orig 2024-11-14 07:57:23 UTC ++++ net/disk_cache/backend_experiment.h +@@ -14,7 +14,7 @@ namespace disk_cache { + // default. + constexpr bool IsSimpleBackendEnabledByDefaultPlatform() { + return BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC); ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD); + } + + // True if assigned to any of disk cache backend experiment groups. diff --git a/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc b/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc index 40998626d20e..922f95161f4b 100644 --- a/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc +++ b/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc @@ -1,7 +1,7 @@ ---- pdf/pdfium/pdfium_engine.cc.orig 2024-10-22 08:31:56 UTC +--- pdf/pdfium/pdfium_engine.cc.orig 2024-11-14 07:57:23 UTC +++ pdf/pdfium/pdfium_engine.cc -@@ -94,7 +94,7 @@ - #include "gin/public/cppgc.h" +@@ -99,7 +99,7 @@ + #include "ui/accessibility/ax_features.mojom-features.h" #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -9,7 +9,7 @@ #include "pdf/pdfium/pdfium_font_linux.h" #endif -@@ -523,7 +523,7 @@ void InitializeSDK(bool enable_v8, +@@ -528,7 +528,7 @@ void InitializeSDK(bool enable_v8, FPDF_InitLibraryWithConfig(&config); diff --git a/www/chromium/files/patch-printing_backend_print__backend__cups.cc b/www/chromium/files/patch-printing_backend_print__backend__cups.cc index ae7d68c0094a..11a541f2051b 100644 --- a/www/chromium/files/patch-printing_backend_print__backend__cups.cc +++ b/www/chromium/files/patch-printing_backend_print__backend__cups.cc @@ -1,4 +1,4 @@ ---- printing/backend/print_backend_cups.cc.orig 2024-10-22 08:31:56 UTC +--- printing/backend/print_backend_cups.cc.orig 2024-11-14 07:57:23 UTC +++ printing/backend/print_backend_cups.cc @@ -33,7 +33,7 @@ #include "printing/mojom/print.mojom.h" @@ -17,8 +17,8 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) // This may be removed when Amazon Linux 2 reaches EOL (30 Jun 2025). bool AreNewerCupsFunctionsAvailable() { - return cupsFindDestDefault && cupsFindDestSupported && ippValidateAttributes; -@@ -291,7 +291,7 @@ bool PrintBackendCUPS::IsValidPrinter(const std::strin + return cupsFindDestDefault && cupsFindDestSupported && cupsUserAgent && +@@ -292,7 +292,7 @@ bool PrintBackendCUPS::IsValidPrinter(const std::strin #if !BUILDFLAG(IS_CHROMEOS) scoped_refptr<PrintBackend> PrintBackend::CreateInstanceImpl( const std::string& locale) { diff --git a/www/chromium/files/patch-printing_print__settings.cc b/www/chromium/files/patch-printing_print__settings.cc index 073188648cf0..71693350f790 100644 --- a/www/chromium/files/patch-printing_print__settings.cc +++ b/www/chromium/files/patch-printing_print__settings.cc @@ -1,6 +1,6 @@ ---- printing/print_settings.cc.orig 2023-10-11 18:22:24 UTC +--- printing/print_settings.cc.orig 2024-11-14 07:57:23 UTC +++ printing/print_settings.cc -@@ -320,7 +320,7 @@ PrintSettings& PrintSettings::operator=(const PrintSet +@@ -319,7 +319,7 @@ PrintSettings& PrintSettings::operator=(const PrintSet #endif is_modifiable_ = settings.is_modifiable_; pages_per_sheet_ = settings.pages_per_sheet_; @@ -9,7 +9,7 @@ for (const auto& item : settings.advanced_settings_) advanced_settings_.emplace(item.first, item.second.Clone()); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -350,7 +350,7 @@ bool PrintSettings::operator==(const PrintSettings& ot +@@ -349,7 +349,7 @@ bool PrintSettings::operator==(const PrintSettings& ot #endif is_modifiable_, requested_custom_margins_in_points_, pages_per_sheet_ @@ -18,7 +18,7 @@ , advanced_settings_ #endif -@@ -374,7 +374,7 @@ bool PrintSettings::operator==(const PrintSettings& ot +@@ -373,7 +373,7 @@ bool PrintSettings::operator==(const PrintSettings& ot other.is_modifiable_, other.requested_custom_margins_in_points_, other.pages_per_sheet_ @@ -27,7 +27,7 @@ , other.advanced_settings_ #endif -@@ -414,7 +414,7 @@ void PrintSettings::Clear() { +@@ -413,7 +413,7 @@ void PrintSettings::Clear() { #endif is_modifiable_ = true; pages_per_sheet_ = 1; diff --git a/www/chromium/files/patch-printing_printing__context__linux.cc b/www/chromium/files/patch-printing_printing__context__linux.cc index 98abb1c7e22d..3f863d9a17ba 100644 --- a/www/chromium/files/patch-printing_printing__context__linux.cc +++ b/www/chromium/files/patch-printing_printing__context__linux.cc @@ -1,4 +1,4 @@ ---- printing/printing_context_linux.cc.orig 2023-12-10 06:10:27 UTC +--- printing/printing_context_linux.cc.orig 2024-11-14 07:57:23 UTC +++ printing/printing_context_linux.cc @@ -23,7 +23,7 @@ #endif @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #endif -@@ -68,7 +68,7 @@ mojom::ResultCode PrintingContextLinux::UseDefaultSett +@@ -66,7 +66,7 @@ mojom::ResultCode PrintingContextLinux::UseDefaultSett ResetSettings(); @@ -18,7 +18,7 @@ if (!ui::LinuxUi::instance()) return mojom::ResultCode::kSuccess; -@@ -84,7 +84,7 @@ mojom::ResultCode PrintingContextLinux::UseDefaultSett +@@ -82,7 +82,7 @@ mojom::ResultCode PrintingContextLinux::UseDefaultSett } gfx::Size PrintingContextLinux::GetPdfPaperSizeDeviceUnits() { @@ -27,7 +27,7 @@ if (ui::LinuxUi::instance()) return ui::LinuxUi::instance()->GetPdfPaperSize(this); #endif -@@ -97,7 +97,7 @@ mojom::ResultCode PrintingContextLinux::UpdatePrinterS +@@ -95,7 +95,7 @@ mojom::ResultCode PrintingContextLinux::UpdatePrinterS DCHECK(!printer_settings.show_system_dialog); DCHECK(!in_print_job_); diff --git a/www/chromium/files/patch-remoting_host_chromoting__host__context.cc b/www/chromium/files/patch-remoting_host_chromoting__host__context.cc index 52d08746e061..76c2498d7077 100644 --- a/www/chromium/files/patch-remoting_host_chromoting__host__context.cc +++ b/www/chromium/files/patch-remoting_host_chromoting__host__context.cc @@ -1,6 +1,6 @@ ---- remoting/host/chromoting_host_context.cc.orig 2023-08-17 07:33:31 UTC +--- remoting/host/chromoting_host_context.cc.orig 2024-11-14 07:57:23 UTC +++ remoting/host/chromoting_host_context.cc -@@ -294,7 +294,7 @@ std::unique_ptr<ChromotingHostContext> ChromotingHostC +@@ -293,7 +293,7 @@ std::unique_ptr<ChromotingHostContext> ChromotingHostC // on a UI thread. scoped_refptr<AutoThreadTaskRunner> input_task_runner = AutoThread::CreateWithType("ChromotingInputThread", ui_task_runner, diff --git a/www/chromium/files/patch-remoting_host_ipc__constants.cc b/www/chromium/files/patch-remoting_host_ipc__constants.cc index 157a0d647307..c36ecb328356 100644 --- a/www/chromium/files/patch-remoting_host_ipc__constants.cc +++ b/www/chromium/files/patch-remoting_host_ipc__constants.cc @@ -1,4 +1,4 @@ ---- remoting/host/ipc_constants.cc.orig 2023-02-08 09:03:45 UTC +--- remoting/host/ipc_constants.cc.orig 2024-11-14 07:57:23 UTC +++ remoting/host/ipc_constants.cc @@ -17,7 +17,7 @@ namespace remoting { @@ -9,7 +9,7 @@ #if !defined(NDEBUG) // Use a different IPC name for debug builds so that we can run the host -@@ -68,7 +68,7 @@ GetChromotingHostServicesServerName() { +@@ -81,7 +81,7 @@ GetChromotingHostServicesServerName() { static const base::NoDestructor<mojo::NamedPlatformChannel::ServerName> server_name( named_mojo_ipc_server::WorkingDirectoryIndependentServerNameFromUTF8( diff --git a/www/chromium/files/patch-remoting_host_it2me_it2me__host.cc b/www/chromium/files/patch-remoting_host_it2me_it2me__host.cc index 07cdca7cca85..d8f11098fff9 100644 --- a/www/chromium/files/patch-remoting_host_it2me_it2me__host.cc +++ b/www/chromium/files/patch-remoting_host_it2me_it2me__host.cc @@ -1,6 +1,6 @@ ---- remoting/host/it2me/it2me_host.cc.orig 2024-10-22 08:31:56 UTC +--- remoting/host/it2me/it2me_host.cc.orig 2024-11-14 07:57:23 UTC +++ remoting/host/it2me/it2me_host.cc -@@ -57,7 +57,7 @@ +@@ -58,7 +58,7 @@ #include "remoting/host/chromeos/features.h" #endif @@ -9,7 +9,7 @@ #include "remoting/host/linux/wayland_manager.h" #include "remoting/host/linux/wayland_utils.h" #endif // BUILDFLAG(IS_LINUX) -@@ -185,7 +185,7 @@ void It2MeHost::Connect( +@@ -184,7 +184,7 @@ void It2MeHost::Connect( OnPolicyUpdate(std::move(policies)); diff --git a/www/chromium/files/patch-remoting_host_mojo__caller__security__checker.cc b/www/chromium/files/patch-remoting_host_mojo__caller__security__checker.cc new file mode 100644 index 000000000000..8d2d6f236384 --- /dev/null +++ b/www/chromium/files/patch-remoting_host_mojo__caller__security__checker.cc @@ -0,0 +1,29 @@ +--- remoting/host/mojo_caller_security_checker.cc.orig 2024-11-14 07:57:23 UTC ++++ remoting/host/mojo_caller_security_checker.cc +@@ -37,7 +37,7 @@ + namespace remoting { + namespace { + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + constexpr auto kAllowedCallerProgramNames = + base::MakeFixedFlatSet<base::FilePath::StringPieceType>({ + "remote-open-url", +@@ -98,7 +98,7 @@ bool IsTrustedMojoEndpoint( + return true; + #endif + +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + + // TODO: yuweih - see if it's possible to move away from PID-based security + // checks, which might be susceptible of PID reuse attacks. +@@ -122,7 +122,7 @@ bool IsTrustedMojoEndpoint( + base::FilePath::StringType program_name = + caller_process_image_path.BaseName().value(); + if (!kAllowedCallerProgramNames.contains(program_name)) { +-#if BUILDFLAG(IS_LINUX) && !defined(NDEBUG) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !defined(NDEBUG) + // Linux binaries generated in out/Debug are underscore-separated. To make + // debugging easier, we just check the name again with underscores replaced + // with hyphens. diff --git a/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc b/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc index 60acc91c53e1..6d01c2c5cd76 100644 --- a/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc +++ b/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc @@ -1,6 +1,6 @@ ---- remoting/host/remoting_me2me_host.cc.orig 2024-10-22 08:31:56 UTC +--- remoting/host/remoting_me2me_host.cc.orig 2024-11-14 07:57:23 UTC +++ remoting/host/remoting_me2me_host.cc -@@ -134,7 +134,7 @@ +@@ -146,7 +146,7 @@ #include "remoting/host/mac/permission_utils.h" #endif // BUILDFLAG(IS_APPLE) @@ -9,7 +9,7 @@ #if defined(REMOTING_USE_X11) #include <gtk/gtk.h> #endif // defined(REMOTING_USE_X11) -@@ -145,13 +145,13 @@ +@@ -157,13 +157,13 @@ #endif // defined(REMOTING_USE_X11) #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -25,7 +25,7 @@ #include "remoting/host/host_utmp_logger.h" #endif -@@ -164,7 +164,7 @@ +@@ -177,7 +177,7 @@ #include "remoting/host/win/session_desktop_environment.h" #endif // BUILDFLAG(IS_WIN) @@ -34,7 +34,7 @@ #include "remoting/host/linux/wayland_manager.h" #include "remoting/host/linux/wayland_utils.h" #endif // BUILDFLAG(IS_LINUX) -@@ -193,7 +193,7 @@ const char kApplicationName[] = "chromoting"; +@@ -205,7 +205,7 @@ const char kApplicationName[] = "chromoting"; const char kStdinConfigPath[] = "-"; #endif // !defined(REMOTING_MULTI_PROCESS) @@ -43,16 +43,16 @@ // The command line switch used to pass name of the pipe to capture audio on // linux. const char kAudioPipeSwitchName[] = "audio-pipe-name"; -@@ -412,7 +412,7 @@ class HostProcess : public ConfigWatcher::Delegate, - - std::unique_ptr<ChromotingHostContext> context_; +@@ -448,7 +448,7 @@ class HostProcess : public ConfigWatcher::Delegate, + std::unique_ptr<AgentProcessBrokerClient> agent_process_broker_client_; + #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Watch for certificate changes and kill the host when changes occur std::unique_ptr<CertificateWatcher> cert_watcher_; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -478,7 +478,7 @@ class HostProcess : public ConfigWatcher::Delegate, +@@ -515,7 +515,7 @@ class HostProcess : public ConfigWatcher::Delegate, std::unique_ptr<HostStatusLogger> host_status_logger_; std::unique_ptr<HostEventLogger> host_event_logger_; @@ -61,7 +61,7 @@ std::unique_ptr<HostUTMPLogger> host_utmp_logger_; #endif std::unique_ptr<HostPowerSaveBlocker> power_save_blocker_; -@@ -785,7 +785,7 @@ void HostProcess::StartOnNetworkThread() { +@@ -834,7 +834,7 @@ void HostProcess::StartOnNetworkThread() { void HostProcess::ShutdownOnNetworkThread() { DCHECK(context_->network_task_runner()->BelongsToCurrentThread()); config_watcher_.reset(); @@ -70,7 +70,7 @@ cert_watcher_.reset(); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) } -@@ -856,7 +856,7 @@ void HostProcess::CreateAuthenticatorFactory() { +@@ -905,7 +905,7 @@ void HostProcess::CreateAuthenticatorFactory() { context_->url_loader_factory(), service_account_email_, oauth_refresh_token_)); @@ -79,7 +79,7 @@ if (!cert_watcher_) { cert_watcher_ = std::make_unique<CertificateWatcher>( base::BindRepeating(&HostProcess::ShutdownHost, -@@ -1001,13 +1001,13 @@ void HostProcess::StartOnUiThread() { +@@ -1047,13 +1047,13 @@ void HostProcess::StartOnUiThread() { base::BindRepeating(&HostProcess::OnPolicyUpdate, base::Unretained(this)), base::BindRepeating(&HostProcess::OnPolicyError, base::Unretained(this))); @@ -95,7 +95,7 @@ // If an audio pipe is specific on the command-line then initialize // AudioCapturerLinux to capture from it. base::FilePath audio_pipe_name = -@@ -1084,7 +1084,7 @@ void HostProcess::ShutdownOnUiThread() { +@@ -1130,7 +1130,7 @@ void HostProcess::ShutdownOnUiThread() { // It is now safe for the HostProcess to be deleted. self_ = nullptr; @@ -104,7 +104,7 @@ // Cause the global AudioPipeReader to be freed, otherwise the audio // thread will remain in-use and prevent the process from exiting. // TODO(wez): DesktopEnvironmentFactory should own the pipe reader. -@@ -1092,7 +1092,7 @@ void HostProcess::ShutdownOnUiThread() { +@@ -1138,7 +1138,7 @@ void HostProcess::ShutdownOnUiThread() { AudioCapturerLinux::InitializePipeReader(nullptr, base::FilePath()); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -113,7 +113,7 @@ context_->input_task_runner()->PostTask( FROM_HERE, base::BindOnce([]() { delete ui::X11EventSource::GetInstance(); })); -@@ -1502,7 +1502,7 @@ bool HostProcess::OnUsernamePolicyUpdate(const base::V +@@ -1592,7 +1592,7 @@ bool HostProcess::OnUsernamePolicyUpdate(const base::V // Returns false: never restart the host after this policy update. DCHECK(context_->network_task_runner()->BelongsToCurrentThread()); @@ -122,7 +122,7 @@ std::optional<bool> host_username_match_required = policies.FindBool(policy::key::kRemoteAccessHostMatchUsername); if (!host_username_match_required.has_value()) { -@@ -1778,7 +1778,7 @@ void HostProcess::StartHost() { +@@ -1866,7 +1866,7 @@ void HostProcess::StartHost() { corp_host_status_logger_->StartObserving(*session_manager); } @@ -131,7 +131,7 @@ desktop_environment_options_.set_enable_remote_webauthn(is_corp_host_); #endif -@@ -1798,7 +1798,7 @@ void HostProcess::StartHost() { +@@ -1886,7 +1886,7 @@ void HostProcess::StartHost() { host_status_logger_ = std::make_unique<HostStatusLogger>( host_->status_monitor(), log_to_server_.get()); @@ -140,7 +140,7 @@ const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); if (cmd_line->HasSwitch(kEnableUtempter)) { host_utmp_logger_ = -@@ -1834,7 +1834,7 @@ void HostProcess::StartHost() { +@@ -1922,7 +1922,7 @@ void HostProcess::StartHost() { // addresses. host_->Start(*host_owner_emails_.begin()); @@ -149,7 +149,7 @@ // For Windows, ChromotingHostServices connections are handled by the daemon // process, then the message pipe is forwarded to the network process. host_->StartChromotingHostServices(); -@@ -1968,7 +1968,7 @@ int HostProcessMain() { +@@ -2069,7 +2069,7 @@ int HostProcessMain() { HOST_LOG << "Starting host process: version " << STRINGIZE(VERSION); const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); @@ -158,7 +158,7 @@ #if defined(REMOTING_USE_X11) // Initialize Xlib for multi-threaded use, allowing non-Chromium code to // use X11 safely (such as the WebRTC capturer, GTK ...) -@@ -2017,7 +2017,7 @@ int HostProcessMain() { +@@ -2118,7 +2118,7 @@ int HostProcessMain() { std::unique_ptr<net::NetworkChangeNotifier> network_change_notifier( net::NetworkChangeNotifier::CreateIfNeeded()); diff --git a/www/chromium/files/patch-sandbox_linux_BUILD.gn b/www/chromium/files/patch-sandbox_linux_BUILD.gn index 5aa2a9351c39..2bb71e259404 100644 --- a/www/chromium/files/patch-sandbox_linux_BUILD.gn +++ b/www/chromium/files/patch-sandbox_linux_BUILD.gn @@ -1,4 +1,4 @@ ---- sandbox/linux/BUILD.gn.orig 2023-08-17 07:33:31 UTC +--- sandbox/linux/BUILD.gn.orig 2024-11-14 07:57:23 UTC +++ sandbox/linux/BUILD.gn @@ -12,11 +12,11 @@ if (is_android) { } @@ -15,7 +15,7 @@ # On Android, use plain GTest. use_base_test_suite = is_linux || is_chromeos -@@ -379,6 +379,17 @@ component("sandbox_services") { +@@ -380,6 +380,17 @@ component("sandbox_services") { "services/libc_interceptor.h", ] } diff --git a/www/chromium/files/patch-sandbox_policy_BUILD.gn b/www/chromium/files/patch-sandbox_policy_BUILD.gn index 6a018e40fac7..0aaa66f4c1f6 100644 --- a/www/chromium/files/patch-sandbox_policy_BUILD.gn +++ b/www/chromium/files/patch-sandbox_policy_BUILD.gn @@ -1,4 +1,4 @@ ---- sandbox/policy/BUILD.gn.orig 2024-10-22 08:31:56 UTC +--- sandbox/policy/BUILD.gn.orig 2024-11-14 07:57:23 UTC +++ sandbox/policy/BUILD.gn @@ -50,7 +50,7 @@ component("policy") { "//third_party/jni_zero", @@ -9,7 +9,7 @@ sources += [ "linux/bpf_audio_policy_linux.cc", "linux/bpf_audio_policy_linux.h", -@@ -125,6 +125,27 @@ component("policy") { +@@ -127,6 +127,27 @@ component("policy") { "//sandbox/linux:sandbox_services", "//sandbox/linux:seccomp_bpf", "//sandbox/linux:suid_sandbox_client", diff --git a/www/chromium/files/patch-sandbox_policy_features.cc b/www/chromium/files/patch-sandbox_policy_features.cc index aa0b425de899..c859ee3cff78 100644 --- a/www/chromium/files/patch-sandbox_policy_features.cc +++ b/www/chromium/files/patch-sandbox_policy_features.cc @@ -1,4 +1,4 @@ ---- sandbox/policy/features.cc.orig 2024-10-22 08:31:56 UTC +--- sandbox/policy/features.cc.orig 2024-11-14 07:57:23 UTC +++ sandbox/policy/features.cc @@ -20,7 +20,11 @@ namespace sandbox::policy::features { // (Only causes an effect when feature kNetworkServiceInProcess is disabled.) @@ -12,7 +12,7 @@ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) // Enables a fine-grained seccomp-BPF syscall filter for the network service. -@@ -134,7 +138,7 @@ BASE_FEATURE(kSpectreVariant2Mitigation, +@@ -132,7 +136,7 @@ BASE_FEATURE(kSpectreVariant2Mitigation, base::FEATURE_ENABLED_BY_DEFAULT); #endif // BUILDFLAG(IS_CHROMEOS_ASH) diff --git a/www/chromium/files/patch-sandbox_policy_features.h b/www/chromium/files/patch-sandbox_policy_features.h index 2a02d797dc21..932889f6b609 100644 --- a/www/chromium/files/patch-sandbox_policy_features.h +++ b/www/chromium/files/patch-sandbox_policy_features.h @@ -1,6 +1,6 @@ ---- sandbox/policy/features.h.orig 2024-10-22 08:31:56 UTC +--- sandbox/policy/features.h.orig 2024-11-14 07:57:23 UTC +++ sandbox/policy/features.h -@@ -45,7 +45,7 @@ SANDBOX_POLICY_EXPORT BASE_DECLARE_FEATURE( +@@ -45,7 +45,7 @@ SANDBOX_POLICY_EXPORT BASE_DECLARE_FEATURE(kWinSboxPar SANDBOX_POLICY_EXPORT BASE_DECLARE_FEATURE(kSpectreVariant2Mitigation); #endif // BUILDFLAG(IS_CHROMEOS_ASH) diff --git a/www/chromium/files/patch-sandbox_policy_freebsd_sandbox__freebsd.cc b/www/chromium/files/patch-sandbox_policy_freebsd_sandbox__freebsd.cc index 73457e781f1f..28f8771959c2 100644 --- a/www/chromium/files/patch-sandbox_policy_freebsd_sandbox__freebsd.cc +++ b/www/chromium/files/patch-sandbox_policy_freebsd_sandbox__freebsd.cc @@ -1,6 +1,6 @@ ---- sandbox/policy/freebsd/sandbox_freebsd.cc.orig 2023-04-28 19:19:55 UTC +--- sandbox/policy/freebsd/sandbox_freebsd.cc.orig 2024-11-14 07:57:23 UTC +++ sandbox/policy/freebsd/sandbox_freebsd.cc -@@ -0,0 +1,245 @@ +@@ -0,0 +1,211 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -159,7 +159,7 @@ + return true; + + VLOG(1) << "SandboxLinux::InitializeSandbox: process_type=" -+ << process_type << " sandbox_type=" << GetSandboxTypeInEnglish(sandbox_type); ++ << process_type << " sandbox_type=" << sandbox_type; + + // Only one thread is running, pre-initialize if not already done. + if (!pre_initialized_) @@ -210,39 +210,5 @@ + // !defined(THREAD_SANITIZER) && !defined(LEAK_SANITIZER) +} + -+// static -+std::string SandboxLinux::GetSandboxTypeInEnglish(sandbox::mojom::Sandbox sandbox_type) { -+ switch (sandbox_type) { -+ case sandbox::mojom::Sandbox::kNoSandbox: -+ return "Unsandboxed"; -+ case sandbox::mojom::Sandbox::kRenderer: -+ return "Renderer"; -+ case sandbox::mojom::Sandbox::kUtility: -+ return "Utility"; -+ case sandbox::mojom::Sandbox::kGpu: -+ return "GPU"; -+#if BUILDFLAG(ENABLE_PPAPI) -+ case sandbox::mojom::Sandbox::kPpapi: -+ return "PPAPI"; -+#endif -+ case sandbox::mojom::Sandbox::kNetwork: -+ return "Network"; -+ case sandbox::mojom::Sandbox::kCdm: -+ return "CDM"; -+ case sandbox::mojom::Sandbox::kPrintCompositor: -+ return "Print Compositor"; -+ case sandbox::mojom::Sandbox::kAudio: -+ return "Audio"; -+ case sandbox::mojom::Sandbox::kSpeechRecognition: -+ return "Speech Recognition"; -+ case sandbox::mojom::Sandbox::kService: -+ return "Service"; -+ case sandbox::mojom::Sandbox::kVideoCapture: -+ return "Video Capture"; -+ default: -+ return "Unknown"; -+ } -+} -+ +} // namespace policy +} // namespace sandbox diff --git a/www/chromium/files/patch-sandbox_policy_freebsd_sandbox__freebsd.h b/www/chromium/files/patch-sandbox_policy_freebsd_sandbox__freebsd.h index 8a18b8317c14..486c0e08ea8b 100644 --- a/www/chromium/files/patch-sandbox_policy_freebsd_sandbox__freebsd.h +++ b/www/chromium/files/patch-sandbox_policy_freebsd_sandbox__freebsd.h @@ -1,6 +1,6 @@ ---- sandbox/policy/freebsd/sandbox_freebsd.h.orig 2022-11-30 08:12:58 UTC +--- sandbox/policy/freebsd/sandbox_freebsd.h.orig 2024-11-14 07:57:23 UTC +++ sandbox/policy/freebsd/sandbox_freebsd.h -@@ -0,0 +1,278 @@ +@@ -0,0 +1,276 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -169,8 +169,6 @@ + // is called from inside these processes. + int GetStatus(); + -+ static std::string GetSandboxTypeInEnglish(sandbox::mojom::Sandbox sandbox_type); -+ + // Returns true if the current process is single-threaded or if the number + // of threads cannot be determined. + bool IsSingleThreaded() const; diff --git a/www/chromium/files/patch-sandbox_policy_mojom_sandbox.mojom b/www/chromium/files/patch-sandbox_policy_mojom_sandbox.mojom index 8e371a89ca35..8d8381ae2812 100644 --- a/www/chromium/files/patch-sandbox_policy_mojom_sandbox.mojom +++ b/www/chromium/files/patch-sandbox_policy_mojom_sandbox.mojom @@ -1,6 +1,6 @@ ---- sandbox/policy/mojom/sandbox.mojom.orig 2024-10-22 08:31:56 UTC +--- sandbox/policy/mojom/sandbox.mojom.orig 2024-11-14 07:57:23 UTC +++ sandbox/policy/mojom/sandbox.mojom -@@ -80,6 +80,12 @@ enum Sandbox { +@@ -81,6 +81,12 @@ enum Sandbox { [EnableIf=is_fuchsia] kVideoCapture, diff --git a/www/chromium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.cc b/www/chromium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.cc index 499f85ee6120..7d4a3492712e 100644 --- a/www/chromium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.cc +++ b/www/chromium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.cc @@ -1,6 +1,6 @@ ---- sandbox/policy/openbsd/sandbox_openbsd.cc.orig 2024-03-22 08:19:40 UTC +--- sandbox/policy/openbsd/sandbox_openbsd.cc.orig 2024-11-14 07:57:23 UTC +++ sandbox/policy/openbsd/sandbox_openbsd.cc -@@ -0,0 +1,424 @@ +@@ -0,0 +1,392 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -203,6 +203,7 @@ + ufile = _UNVEIL_MAIN; + break; + case sandbox::mojom::Sandbox::kGpu: ++ case sandbox::mojom::Sandbox::kOnDeviceModelExecution: + ufile = _UNVEIL_GPU; + break; + case sandbox::mojom::Sandbox::kNetwork: @@ -299,7 +300,7 @@ + return true; + + VLOG(1) << "SandboxLinux::InitializeSandbox: process_type=" -+ << process_type << " sandbox_type=" << GetSandboxTypeInEnglish(sandbox_type); ++ << process_type << " sandbox_type=" << sandbox_type; + + // Only one thread is running, pre-initialize if not already done. + if (!pre_initialized_) @@ -331,6 +332,7 @@ + SetPledge("stdio rpath flock prot_exec recvfd sendfd ps", NULL); + break; + case sandbox::mojom::Sandbox::kGpu: ++ case sandbox::mojom::Sandbox::kOnDeviceModelExecution: + SetPledge("stdio drm rpath flock cpath wpath prot_exec recvfd sendfd tmppath", NULL); + break; +#if BUILDFLAG(ENABLE_PPAPI) @@ -353,7 +355,7 @@ + SetPledge("stdio rpath cpath wpath fattr flock sendfd recvfd prot_exec", NULL); + break; + default: -+ LOG(ERROR) << "non-pledge()'d process: " << GetSandboxTypeInEnglish(sandbox_type); ++ LOG(ERROR) << "non-pledge()'d process: " << sandbox_type; + break; + } + @@ -389,39 +391,5 @@ + // !defined(THREAD_SANITIZER) && !defined(LEAK_SANITIZER) +} + -+// static -+std::string SandboxLinux::GetSandboxTypeInEnglish(sandbox::mojom::Sandbox sandbox_type) { -+ switch (sandbox_type) { -+ case sandbox::mojom::Sandbox::kNoSandbox: -+ return "Unsandboxed"; -+ case sandbox::mojom::Sandbox::kRenderer: -+ return "Renderer"; -+ case sandbox::mojom::Sandbox::kUtility: -+ return "Utility"; -+ case sandbox::mojom::Sandbox::kGpu: -+ return "GPU"; -+#if BUILDFLAG(ENABLE_PPAPI) -+ case sandbox::mojom::Sandbox::kPpapi: -+ return "PPAPI"; -+#endif -+ case sandbox::mojom::Sandbox::kNetwork: -+ return "Network"; -+ case sandbox::mojom::Sandbox::kCdm: -+ return "CDM"; -+ case sandbox::mojom::Sandbox::kPrintCompositor: -+ return "Print Compositor"; -+ case sandbox::mojom::Sandbox::kAudio: -+ return "Audio"; -+ case sandbox::mojom::Sandbox::kSpeechRecognition: -+ return "Speech Recognition"; -+ case sandbox::mojom::Sandbox::kService: -+ return "Service"; -+ case sandbox::mojom::Sandbox::kVideoCapture: -+ return "Video Capture"; -+ default: -+ return "Unknown"; -+ } -+} -+ +} // namespace policy +} // namespace sandbox diff --git a/www/chromium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.h b/www/chromium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.h index 88378f8d083c..ac491437c39e 100644 --- a/www/chromium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.h +++ b/www/chromium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.h @@ -1,6 +1,6 @@ ---- sandbox/policy/openbsd/sandbox_openbsd.h.orig 2022-11-30 08:12:58 UTC +--- sandbox/policy/openbsd/sandbox_openbsd.h.orig 2024-11-14 07:57:23 UTC +++ sandbox/policy/openbsd/sandbox_openbsd.h -@@ -0,0 +1,282 @@ +@@ -0,0 +1,280 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -169,8 +169,6 @@ + // is called from inside these processes. + int GetStatus(); + -+ static std::string GetSandboxTypeInEnglish(sandbox::mojom::Sandbox sandbox_type); -+ + // Returns true if the current process is single-threaded or if the number + // of threads cannot be determined. + bool IsSingleThreaded() const; diff --git a/www/chromium/files/patch-sandbox_policy_sandbox__type.cc b/www/chromium/files/patch-sandbox_policy_sandbox__type.cc index 925a25d6e469..d3753c4e21d4 100644 --- a/www/chromium/files/patch-sandbox_policy_sandbox__type.cc +++ b/www/chromium/files/patch-sandbox_policy_sandbox__type.cc @@ -1,4 +1,4 @@ ---- sandbox/policy/sandbox_type.cc.orig 2024-10-22 08:31:56 UTC +--- sandbox/policy/sandbox_type.cc.orig 2024-11-14 07:57:23 UTC +++ sandbox/policy/sandbox_type.cc @@ -38,7 +38,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) { #endif @@ -27,7 +27,20 @@ case Sandbox::kZygoteIntermediateSandbox: case Sandbox::kHardwareVideoEncoding: #endif -@@ -131,7 +131,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi +@@ -81,10 +81,10 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) { + case Sandbox::kScreenAI: + #endif + case Sandbox::kSpeechRecognition: +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + case Sandbox::kVideoEffects: + #endif +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + case Sandbox::kOnDeviceTranslation: + #endif + return false; +@@ -136,7 +136,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi #endif case Sandbox::kPrintCompositor: case Sandbox::kAudio: @@ -36,7 +49,7 @@ case Sandbox::kVideoCapture: #endif #if BUILDFLAG(IS_WIN) -@@ -142,10 +142,10 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi +@@ -147,10 +147,10 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi case Sandbox::kMediaFoundationCdm: case Sandbox::kWindowsSystemProxyResolver: #endif // BUILDFLAG(IS_WIN) @@ -49,7 +62,20 @@ case Sandbox::kHardwareVideoEncoding: #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -171,7 +171,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi +@@ -168,10 +168,10 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi + case Sandbox::kScreenAI: + #endif + case Sandbox::kSpeechRecognition: +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + case Sandbox::kVideoEffects: + #endif +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + case Sandbox::kOnDeviceTranslation: + #endif + DCHECK(command_line->GetSwitchValueASCII(switches::kProcessType) == +@@ -181,7 +181,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi switches::kServiceSandboxType, StringFromUtilitySandboxType(sandbox_type)); break; @@ -58,7 +84,7 @@ case Sandbox::kZygoteIntermediateSandbox: break; #endif -@@ -211,7 +211,7 @@ sandbox::mojom::Sandbox SandboxTypeFromCommandLine( +@@ -221,7 +221,7 @@ sandbox::mojom::Sandbox SandboxTypeFromCommandLine( return Sandbox::kUtility; } @@ -67,7 +93,7 @@ // Intermediate process gains a sandbox later. if (process_type == switches::kZygoteProcessType) return Sandbox::kZygoteIntermediateSandbox; -@@ -259,7 +259,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb +@@ -267,7 +267,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb return switches::kUtilitySandbox; case Sandbox::kAudio: return switches::kAudioSandbox; @@ -76,7 +102,21 @@ case Sandbox::kVideoCapture: return switches::kVideoCaptureSandbox; #endif -@@ -291,11 +291,11 @@ std::string StringFromUtilitySandboxType(Sandbox sandb +@@ -281,11 +281,11 @@ std::string StringFromUtilitySandboxType(Sandbox sandb + case Sandbox::kScreenAI: + return switches::kScreenAISandbox; + #endif +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + case Sandbox::kVideoEffects: + return switches::kVideoEffectsSandbox; + #endif +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + case Sandbox::kOnDeviceTranslation: + return switches::kOnDeviceTranslationSandbox; + #endif +@@ -305,11 +305,11 @@ std::string StringFromUtilitySandboxType(Sandbox sandb case Sandbox::kMirroring: return switches::kMirroringSandbox; #endif @@ -90,7 +130,7 @@ case Sandbox::kHardwareVideoEncoding: return switches::kHardwareVideoEncodingSandbox; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -314,7 +314,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb +@@ -328,7 +328,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb // The following are not utility processes so should not occur. case Sandbox::kRenderer: case Sandbox::kGpu: @@ -98,11 +138,23 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) case Sandbox::kZygoteIntermediateSandbox: #endif - NOTREACHED_IN_MIGRATION(); -@@ -389,15 +389,15 @@ sandbox::mojom::Sandbox UtilitySandboxTypeFromString( + NOTREACHED(); +@@ -399,25 +399,25 @@ sandbox::mojom::Sandbox UtilitySandboxTypeFromString( + if (sandbox_string == switches::kScreenAISandbox) + return Sandbox::kScreenAI; + #endif +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (sandbox_string == switches::kVideoEffectsSandbox) { return Sandbox::kVideoEffects; } + #endif +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + if (sandbox_string == switches::kOnDeviceTranslationSandbox) { + return Sandbox::kOnDeviceTranslation; + } + #endif -#if BUILDFLAG(IS_FUCHSIA) +#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) if (sandbox_string == switches::kVideoCaptureSandbox) diff --git a/www/chromium/files/patch-sandbox_policy_switches.cc b/www/chromium/files/patch-sandbox_policy_switches.cc index f347405b4e91..22fbf10cc660 100644 --- a/www/chromium/files/patch-sandbox_policy_switches.cc +++ b/www/chromium/files/patch-sandbox_policy_switches.cc @@ -1,4 +1,4 @@ ---- sandbox/policy/switches.cc.orig 2024-10-22 08:31:56 UTC +--- sandbox/policy/switches.cc.orig 2024-11-14 07:57:23 UTC +++ sandbox/policy/switches.cc @@ -55,10 +55,10 @@ const char kWindowsSystemProxyResolverSandbox[] = "pro const char kMirroringSandbox[] = "mirroring"; @@ -13,7 +13,16 @@ const char kHardwareVideoEncodingSandbox[] = "hardware_video_encoding"; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -98,7 +98,9 @@ const char kGpuSandboxFailuresFatal[] = "gpu-sandbox-f +@@ -71,7 +71,7 @@ const char kLibassistantSandbox[] = "libassistant"; + #endif // BUILDFLAG(ENABLE_CROS_LIBASSISTANT) + #endif // BUILDFLAG(IS_CHROMEOS_ASH) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + const char kOnDeviceTranslationSandbox[] = "on_device_translation"; + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) + +@@ -102,7 +102,9 @@ const char kGpuSandboxFailuresFatal[] = "gpu-sandbox-f // Meant to be used as a browser-level switch for testing purposes only. const char kNoSandbox[] = "no-sandbox"; diff --git a/www/chromium/files/patch-sandbox_policy_switches.h b/www/chromium/files/patch-sandbox_policy_switches.h index ec38340c0e48..2a35c2eabe16 100644 --- a/www/chromium/files/patch-sandbox_policy_switches.h +++ b/www/chromium/files/patch-sandbox_policy_switches.h @@ -1,4 +1,4 @@ ---- sandbox/policy/switches.h.orig 2024-10-22 08:31:56 UTC +--- sandbox/policy/switches.h.orig 2024-11-14 07:57:23 UTC +++ sandbox/policy/switches.h @@ -58,10 +58,10 @@ SANDBOX_POLICY_EXPORT extern const char kWindowsSystem SANDBOX_POLICY_EXPORT extern const char kMirroringSandbox[]; @@ -13,7 +13,16 @@ SANDBOX_POLICY_EXPORT extern const char kHardwareVideoEncodingSandbox[]; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -83,7 +83,8 @@ SANDBOX_POLICY_EXPORT extern const char kDisableSetuid +@@ -74,7 +74,7 @@ SANDBOX_POLICY_EXPORT extern const char kLibassistantS + #endif // BUILDFLAG(ENABLE_CROS_LIBASSISTANT) + #endif // BUILDFLAG(IS_CHROMEOS_ASH) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + SANDBOX_POLICY_EXPORT extern const char kOnDeviceTranslationSandbox[]; + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) + +@@ -87,7 +87,8 @@ SANDBOX_POLICY_EXPORT extern const char kDisableSetuid SANDBOX_POLICY_EXPORT extern const char kGpuSandboxAllowSysVShm[]; SANDBOX_POLICY_EXPORT extern const char kGpuSandboxFailuresFatal[]; SANDBOX_POLICY_EXPORT extern const char kNoSandbox[]; diff --git a/www/chromium/files/patch-services_device_geolocation_location__provider__manager.cc b/www/chromium/files/patch-services_device_geolocation_location__provider__manager.cc index bb9fadf985cd..5a38ced2f557 100644 --- a/www/chromium/files/patch-services_device_geolocation_location__provider__manager.cc +++ b/www/chromium/files/patch-services_device_geolocation_location__provider__manager.cc @@ -1,6 +1,6 @@ ---- services/device/geolocation/location_provider_manager.cc.orig 2024-08-26 12:06:38 UTC +--- services/device/geolocation/location_provider_manager.cc.orig 2024-11-14 07:57:23 UTC +++ services/device/geolocation/location_provider_manager.cc -@@ -51,7 +51,7 @@ LocationProviderManager::LocationProviderManager( +@@ -87,7 +87,7 @@ LocationProviderManager::LocationProviderManager( #if BUILDFLAG(IS_ANDROID) // On Android, default to using the platform location provider. provider_manager_mode_ = kPlatformOnly; diff --git a/www/chromium/files/patch-services_network_BUILD.gn b/www/chromium/files/patch-services_network_BUILD.gn index 8a194b4807db..855a7d941157 100644 --- a/www/chromium/files/patch-services_network_BUILD.gn +++ b/www/chromium/files/patch-services_network_BUILD.gn @@ -1,6 +1,6 @@ ---- services/network/BUILD.gn.orig 2024-10-22 08:31:56 UTC +--- services/network/BUILD.gn.orig 2024-11-14 07:57:23 UTC +++ services/network/BUILD.gn -@@ -395,7 +395,6 @@ if (is_linux || is_chromeos) { +@@ -401,7 +401,6 @@ if (is_linux || is_chromeos) { ] deps = [ "//base:base", diff --git a/www/chromium/files/patch-services_network_network__context.cc b/www/chromium/files/patch-services_network_network__context.cc index e1174ca287ef..77515099d0dc 100644 --- a/www/chromium/files/patch-services_network_network__context.cc +++ b/www/chromium/files/patch-services_network_network__context.cc @@ -1,6 +1,6 @@ ---- services/network/network_context.cc.orig 2024-10-22 08:31:56 UTC +--- services/network/network_context.cc.orig 2024-11-14 07:57:23 UTC +++ services/network/network_context.cc -@@ -588,7 +588,7 @@ NetworkContext::NetworkContextHttpAuthPreferences:: +@@ -589,7 +589,7 @@ NetworkContext::NetworkContextHttpAuthPreferences:: NetworkContext::NetworkContextHttpAuthPreferences:: ~NetworkContextHttpAuthPreferences() = default; @@ -9,7 +9,7 @@ bool NetworkContext::NetworkContextHttpAuthPreferences::AllowGssapiLibraryLoad() const { if (network_service_) { -@@ -2435,7 +2435,7 @@ void NetworkContext::OnHttpAuthDynamicParamsChanged( +@@ -2444,7 +2444,7 @@ void NetworkContext::OnHttpAuthDynamicParamsChanged( http_auth_dynamic_network_service_params->android_negotiate_account_type); #endif // BUILDFLAG(IS_ANDROID) diff --git a/www/chromium/files/patch-services_network_network__context.h b/www/chromium/files/patch-services_network_network__context.h index 094ed9990a73..f7389c5af01c 100644 --- a/www/chromium/files/patch-services_network_network__context.h +++ b/www/chromium/files/patch-services_network_network__context.h @@ -1,6 +1,6 @@ ---- services/network/network_context.h.orig 2024-10-22 08:31:56 UTC +--- services/network/network_context.h.orig 2024-11-14 07:57:23 UTC +++ services/network/network_context.h -@@ -697,7 +697,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext +@@ -696,7 +696,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext public: explicit NetworkContextHttpAuthPreferences(NetworkService* network_service); ~NetworkContextHttpAuthPreferences() override; diff --git a/www/chromium/files/patch-services_network_public_mojom_BUILD.gn b/www/chromium/files/patch-services_network_public_mojom_BUILD.gn index 503521551d09..fa26f50f3153 100644 --- a/www/chromium/files/patch-services_network_public_mojom_BUILD.gn +++ b/www/chromium/files/patch-services_network_public_mojom_BUILD.gn @@ -1,6 +1,6 @@ ---- services/network/public/mojom/BUILD.gn.orig 2024-08-26 12:06:38 UTC +--- services/network/public/mojom/BUILD.gn.orig 2024-11-14 07:57:23 UTC +++ services/network/public/mojom/BUILD.gn -@@ -493,11 +493,11 @@ mojom("url_loader_base") { +@@ -491,11 +491,11 @@ mojom("url_loader_base") { } enabled_features = [] @@ -14,7 +14,7 @@ # TODO(crbug.com/40263697): Remove this once is_linux in the mojom IDL does # not include lacros. enabled_features += [ "use_network_interface_change_listener" ] -@@ -1490,7 +1490,7 @@ mojom("mojom") { +@@ -1493,7 +1493,7 @@ mojom("mojom") { } } diff --git a/www/chromium/files/patch-services_on__device__model_on__device__model__service.h b/www/chromium/files/patch-services_on__device__model_on__device__model__service.h index dafec70587cd..8ac8fd1a0d0f 100644 --- a/www/chromium/files/patch-services_on__device__model_on__device__model__service.h +++ b/www/chromium/files/patch-services_on__device__model_on__device__model__service.h @@ -1,7 +1,7 @@ ---- services/on_device_model/on_device_model_service.h.orig 2024-10-22 08:31:56 UTC +--- services/on_device_model/on_device_model_service.h.orig 2024-11-14 07:57:23 UTC +++ services/on_device_model/on_device_model_service.h -@@ -27,6 +27,10 @@ namespace ml { - class OnDeviceModelInternalImpl; +@@ -31,6 +31,10 @@ class OnDeviceModelInternalImpl; + class TsHolder; } +#if BUILDFLAG(IS_BSD) @@ -11,7 +11,7 @@ namespace on_device_model { class COMPONENT_EXPORT(ON_DEVICE_MODEL) OnDeviceModelService -@@ -40,7 +44,7 @@ class COMPONENT_EXPORT(ON_DEVICE_MODEL) OnDeviceModelS +@@ -44,7 +48,7 @@ class COMPONENT_EXPORT(ON_DEVICE_MODEL) OnDeviceModelS // Must be called in the service's process after the run loop finished. [[nodiscard]] static bool Shutdown(); diff --git a/www/chromium/files/patch-services_video__capture_video__capture__service__impl.cc b/www/chromium/files/patch-services_video__capture_video__capture__service__impl.cc index 855b6a84dffa..21cb9d5a53ca 100644 --- a/www/chromium/files/patch-services_video__capture_video__capture__service__impl.cc +++ b/www/chromium/files/patch-services_video__capture_video__capture__service__impl.cc @@ -1,38 +1,38 @@ ---- services/video_capture/video_capture_service_impl.cc.orig 2024-09-30 07:45:04 UTC +--- services/video_capture/video_capture_service_impl.cc.orig 2024-11-14 07:57:23 UTC +++ services/video_capture/video_capture_service_impl.cc -@@ -42,7 +42,7 @@ - #include "services/video_capture/lacros/device_factory_adapter_lacros.h" +@@ -43,7 +43,7 @@ #endif // BUILDFLAG(IS_CHROMEOS_LACROS) --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) #include "media/capture/capture_switches.h" #include "media/capture/video/video_capture_gpu_channel_host.h" #include "services/viz/public/cpp/gpu/context_provider_command_buffer.h" -@@ -110,7 +110,7 @@ class VideoCaptureServiceImpl::GpuDependenciesContext - this}; +@@ -112,7 +112,7 @@ class VideoCaptureServiceImpl::GpuDependenciesContext }; --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) // Intended usage of this class is to create viz::Gpu in utility process and // connect to viz::GpuClient of browser process, which will call to Gpu service. // Also, this class holds the viz::ContextProvider to listen and monitor Gpu -@@ -337,7 +337,7 @@ void VideoCaptureServiceImpl::LazyInitializeGpuDepende +@@ -334,7 +334,7 @@ void VideoCaptureServiceImpl::LazyInitializeGpuDepende gpu_dependencies_context_ = std::make_unique<GpuDependenciesContext>(); - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) --#if BUILDFLAG(IS_CHROMEOS_ASH) -+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_CHROMEOS_ASH) { #else - if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled()) { -@@ -469,7 +469,7 @@ void VideoCaptureServiceImpl::OnGpuInfoUpdate(const CH - } +@@ -468,7 +468,7 @@ void VideoCaptureServiceImpl::OnGpuInfoUpdate(const CH #endif --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) void VideoCaptureServiceImpl::SetVizGpu(std::unique_ptr<viz::Gpu> viz_gpu) { viz_gpu_ = std::move(viz_gpu); } diff --git a/www/chromium/files/patch-services_video__capture_video__capture__service__impl.h b/www/chromium/files/patch-services_video__capture_video__capture__service__impl.h index defb6de7a365..43018ffe319c 100644 --- a/www/chromium/files/patch-services_video__capture_video__capture__service__impl.h +++ b/www/chromium/files/patch-services_video__capture_video__capture__service__impl.h @@ -1,29 +1,29 @@ ---- services/video_capture/video_capture_service_impl.h.orig 2024-08-26 12:06:38 UTC +--- services/video_capture/video_capture_service_impl.h.orig 2024-11-14 07:57:23 UTC +++ services/video_capture/video_capture_service_impl.h -@@ -27,7 +27,7 @@ - #include "services/video_capture/ash/video_capture_device_factory_ash.h" +@@ -28,7 +28,7 @@ #endif // BUILDFLAG(IS_CHROMEOS_ASH) --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) #include "services/viz/public/cpp/gpu/gpu.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || - // BUILDFLAG(IS_CHROMEOS_ASH) -@@ -75,7 +75,7 @@ class VideoCaptureServiceImpl : public mojom::VideoCap - #if BUILDFLAG(IS_WIN) + // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_MAC) +@@ -77,7 +77,7 @@ class VideoCaptureServiceImpl : public mojom::VideoCap void OnGpuInfoUpdate(const CHROME_LUID& luid) override; #endif --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) void SetVizGpu(std::unique_ptr<viz::Gpu> viz_gpu); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || - // BUILDFLAG(IS_CHROMEOS_ASH) -@@ -120,7 +120,7 @@ class VideoCaptureServiceImpl : public mojom::VideoCap - factory_receivers_ash_; + // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_MAC) +@@ -123,7 +123,7 @@ class VideoCaptureServiceImpl : public mojom::VideoCap #endif --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) class VizGpuContextProvider; std::unique_ptr<VizGpuContextProvider> viz_gpu_context_provider_; std::unique_ptr<viz::Gpu> viz_gpu_; diff --git a/www/chromium/files/patch-services_video__effects_video__effects__sandbox__hook__linux.cc b/www/chromium/files/patch-services_video__effects_video__effects__sandbox__hook__linux.cc new file mode 100644 index 000000000000..30a49be10376 --- /dev/null +++ b/www/chromium/files/patch-services_video__effects_video__effects__sandbox__hook__linux.cc @@ -0,0 +1,27 @@ +--- services/video_effects/video_effects_sandbox_hook_linux.cc.orig 2024-11-14 07:57:23 UTC ++++ services/video_effects/video_effects_sandbox_hook_linux.cc +@@ -6,7 +6,13 @@ + + #include <dlfcn.h> + ++#include "build/build_config.h" ++ ++#if BUILDFLAG(IS_BSD) ++#include "sandbox/policy/sandbox.h" ++#else + #include "sandbox/policy/linux/sandbox_linux.h" ++#endif + #include "services/on_device_model/ml/chrome_ml.h" + + namespace video_effects { +@@ -29,8 +35,10 @@ bool VideoEffectsPreSandboxHook( + DVLOG(1) << "Successfully opened Chrome ML shared library."; + } + ++#if !BUILDFLAG(IS_BSD) + auto* instance = sandbox::policy::SandboxLinux::GetInstance(); + instance->EngageNamespaceSandboxIfPossible(); ++#endif + return true; + } + diff --git a/www/chromium/files/patch-services_video__effects_video__effects__sandbox__hook__linux.h b/www/chromium/files/patch-services_video__effects_video__effects__sandbox__hook__linux.h new file mode 100644 index 000000000000..2db51ef5a895 --- /dev/null +++ b/www/chromium/files/patch-services_video__effects_video__effects__sandbox__hook__linux.h @@ -0,0 +1,16 @@ +--- services/video_effects/video_effects_sandbox_hook_linux.h.orig 2024-11-14 07:57:23 UTC ++++ services/video_effects/video_effects_sandbox_hook_linux.h +@@ -5,7 +5,13 @@ + #ifndef SERVICES_VIDEO_EFFECTS_VIDEO_EFFECTS_SANDBOX_HOOK_LINUX_H_ + #define SERVICES_VIDEO_EFFECTS_VIDEO_EFFECTS_SANDBOX_HOOK_LINUX_H_ + ++#include "build/build_config.h" ++ ++#if BUILDFLAG(IS_BSD) ++#include "sandbox/policy/sandbox.h" ++#else + #include "sandbox/policy/linux/sandbox_linux.h" ++#endif + + namespace video_effects { + diff --git a/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp b/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp index 126f758438d7..a383ba5909ea 100644 --- a/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp +++ b/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp @@ -1,4 +1,4 @@ ---- third_party/angle/src/libANGLE/Display.cpp.orig 2024-08-26 12:06:38 UTC +--- third_party/angle/src/libANGLE/Display.cpp.orig 2024-11-14 07:57:23 UTC +++ third_party/angle/src/libANGLE/Display.cpp @@ -60,7 +60,7 @@ # include "libANGLE/renderer/gl/cgl/DisplayCGL.h" @@ -36,7 +36,7 @@ # if defined(ANGLE_USE_GBM) if (platformType == EGL_PLATFORM_GBM_KHR && rx::IsVulkanGbmDisplayAvailable()) { -@@ -2158,7 +2158,7 @@ static ClientExtensions GenerateClientExtensions() +@@ -2131,7 +2131,7 @@ static ClientExtensions GenerateClientExtensions() extensions.x11Visual = true; #endif diff --git a/www/chromium/files/patch-third__party_blink_public_platform_web__vector.h b/www/chromium/files/patch-third__party_blink_public_platform_web__vector.h index f46fb390340a..b680b664cd9a 100644 --- a/www/chromium/files/patch-third__party_blink_public_platform_web__vector.h +++ b/www/chromium/files/patch-third__party_blink_public_platform_web__vector.h @@ -1,6 +1,6 @@ ---- third_party/blink/public/platform/web_vector.h.orig 2024-08-26 12:06:38 UTC +--- third_party/blink/public/platform/web_vector.h.orig 2024-11-14 07:57:23 UTC +++ third_party/blink/public/platform/web_vector.h -@@ -91,7 +91,7 @@ class WebVector { +@@ -86,7 +86,7 @@ class WebVector { // The vector can be populated using reserve() and emplace_back(). WebVector() = default; diff --git a/www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc b/www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc index be95c8a57636..eef329799cb9 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/controller/blink_initializer.cc.orig 2024-06-17 12:56:06 UTC +--- third_party/blink/renderer/controller/blink_initializer.cc.orig 2024-11-14 07:57:23 UTC +++ third_party/blink/renderer/controller/blink_initializer.cc @@ -81,12 +81,12 @@ #include "third_party/blink/renderer/controller/private_memory_footprint_provider.h" @@ -15,7 +15,7 @@ #include "third_party/blink/renderer/controller/highest_pmf_reporter.h" #include "third_party/blink/renderer/controller/user_level_memory_pressure_signal_generator.h" #endif -@@ -256,7 +256,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder +@@ -255,7 +255,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder main_thread_task_runner); #endif @@ -24,7 +24,7 @@ binders.Add<mojom::blink::MemoryUsageMonitorLinux>( ConvertToBaseRepeatingCallback( CrossThreadBindRepeating(&MemoryUsageMonitorPosix::Bind)), -@@ -303,7 +303,7 @@ void BlinkInitializer::RegisterMemoryWatchers(Platform +@@ -302,7 +302,7 @@ void BlinkInitializer::RegisterMemoryWatchers(Platform #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ diff --git a/www/chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc b/www/chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc index 9bd9ac387b44..4fd279cacac4 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/controller/memory_usage_monitor_posix.cc.orig 2024-08-26 12:06:38 UTC +--- third_party/blink/renderer/controller/memory_usage_monitor_posix.cc.orig 2024-11-14 07:57:23 UTC +++ third_party/blink/renderer/controller/memory_usage_monitor_posix.cc -@@ -133,15 +133,17 @@ void MemoryUsageMonitorPosix::ResetFileDescriptors() { +@@ -128,15 +128,17 @@ void MemoryUsageMonitorPosix::ResetFileDescriptors() { void MemoryUsageMonitorPosix::SetProcFiles(base::File statm_file, base::File status_file) { diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc b/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc index 725324dc6d95..9ab9172f35e3 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2024-10-22 08:31:56 UTC +--- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2024-11-14 07:57:23 UTC +++ third_party/blink/renderer/core/exported/web_view_impl.cc @@ -428,7 +428,7 @@ SkFontHinting RendererPreferencesToSkiaHinting( const blink::RendererPreferences& prefs) { @@ -9,7 +9,7 @@ if (!prefs.should_antialias_text) { // When anti-aliasing is off, GTK maps all non-zero hinting settings to // 'Normal' hinting so we do the same. Otherwise, folks who have 'Slight' -@@ -3413,7 +3413,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs +@@ -3415,7 +3415,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs renderer_preferences_.use_subpixel_positioning); // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc b/www/chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc index 9c5eb73c25a8..ec933462b3b4 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/frame/web_frame_test.cc.orig 2024-10-22 08:31:56 UTC +--- third_party/blink/renderer/core/frame/web_frame_test.cc.orig 2024-11-14 07:57:23 UTC +++ third_party/blink/renderer/core/frame/web_frame_test.cc -@@ -6478,7 +6478,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) { +@@ -6474,7 +6474,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) { } #if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ // TODO(crbug.com/1090246): Fix these tests on Fuchsia and re-enable. // TODO(crbug.com/1317375): Build these tests on all platforms. #define MAYBE_SelectRangeStaysHorizontallyAlignedWhenMoved \ -@@ -6887,7 +6887,7 @@ TEST_F(CompositedSelectionBoundsTest, LargeSelectionSc +@@ -6883,7 +6883,7 @@ TEST_F(CompositedSelectionBoundsTest, LargeSelectionSc TEST_F(CompositedSelectionBoundsTest, LargeSelectionNoScroll) { RunTest("composited_selection_bounds_large_selection_noscroll.html"); } diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc b/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc index 601e8174b016..e8fe88d8ac6f 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/core/layout/layout_view.cc.orig 2024-10-22 08:31:56 UTC +--- third_party/blink/renderer/core/layout/layout_view.cc.orig 2024-11-14 07:57:23 UTC +++ third_party/blink/renderer/core/layout/layout_view.cc @@ -73,7 +73,7 @@ #include "ui/display/screen_info.h" @@ -9,7 +9,7 @@ #include "third_party/blink/renderer/platform/fonts/font_cache.h" #endif -@@ -776,7 +776,7 @@ void LayoutView::LayoutRoot() { +@@ -769,7 +769,7 @@ void LayoutView::LayoutRoot() { intrinsic_logical_widths_ = LogicalWidth(); } diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_origin__trials_origin__trial__context.cc b/www/chromium/files/patch-third__party_blink_renderer_core_origin__trials_origin__trial__context.cc new file mode 100644 index 000000000000..704568b854ce --- /dev/null +++ b/www/chromium/files/patch-third__party_blink_renderer_core_origin__trials_origin__trial__context.cc @@ -0,0 +1,11 @@ +--- third_party/blink/renderer/core/origin_trials/origin_trial_context.cc.orig 2024-11-14 07:57:23 UTC ++++ third_party/blink/renderer/core/origin_trials/origin_trial_context.cc +@@ -553,7 +553,7 @@ bool OriginTrialContext::CanEnableTrialFromName(const + } + + if (trial_name == "TranslationAPI") { +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return base::FeatureList::IsEnabled(features::kEnableTranslationAPI); + #else + return false; diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc index 2dc30279c060..bb98bb890e47 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc.orig 2024-04-19 13:02:56 UTC +--- third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc.orig 2024-11-14 07:57:23 UTC +++ third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc -@@ -813,7 +813,7 @@ TEST_F(AudioRendererMixerManagerTest, MixerParamsLaten +@@ -874,7 +874,7 @@ TEST_F(AudioRendererMixerManagerTest, MixerParamsLaten mixer->get_output_params_for_testing().sample_rate()); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \ diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_peerconnection_rtc__data__channel.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_peerconnection_rtc__data__channel.cc index a094c3af19df..733377f47069 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_modules_peerconnection_rtc__data__channel.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_modules_peerconnection_rtc__data__channel.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/peerconnection/rtc_data_channel.cc.orig 2024-10-22 08:31:56 UTC +--- third_party/blink/renderer/modules/peerconnection/rtc_data_channel.cc.orig 2024-11-14 07:57:23 UTC +++ third_party/blink/renderer/modules/peerconnection/rtc_data_channel.cc -@@ -557,6 +557,7 @@ void RTCDataChannel::send(Blob* data, ExceptionState& +@@ -542,6 +542,7 @@ void RTCDataChannel::send(Blob* data, ExceptionState& pending_messages_.push_back(message); } diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc index 7e8874fe9721..25f0b21d9e65 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig 2024-10-22 08:31:56 UTC +--- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig 2024-11-14 07:57:23 UTC +++ third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -@@ -6304,7 +6304,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid +@@ -6321,7 +6321,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid constexpr bool kAllowZeroCopyImages = true; #endif diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn b/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn index 027d6bf7330b..eed17bd37390 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/BUILD.gn.orig 2024-10-22 08:31:56 UTC +--- third_party/blink/renderer/platform/BUILD.gn.orig 2024-11-14 07:57:23 UTC +++ third_party/blink/renderer/platform/BUILD.gn -@@ -2015,7 +2015,7 @@ static_library("test_support") { +@@ -2019,7 +2019,7 @@ static_library("test_support") { ] # fuzzed_data_provider may not work with a custom toolchain. diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 b/www/chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 index e7cb5db07ad1..d143bd127ccf 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2024-10-22 08:31:56 UTC +--- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2024-11-14 07:57:23 UTC +++ third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -384,7 +384,7 @@ +@@ -388,7 +388,7 @@ name: "AppTitle", status: "experimental", origin_trial_feature_name: "AppTitle", @@ -9,7 +9,7 @@ base_feature: "WebAppEnableAppTitle", }, { -@@ -1840,7 +1840,7 @@ +@@ -1845,7 +1845,7 @@ base_feature: "none", public: true, origin_trial_feature_name: "FedCmMultipleIdentityProviders", @@ -18,7 +18,7 @@ origin_trial_allows_third_party: true, }, { -@@ -3208,7 +3208,7 @@ +@@ -3233,7 +3233,7 @@ // Tracking bug for the implementation: https://crbug.com/1462930 name: "PermissionElement", origin_trial_feature_name: "PermissionElement", @@ -27,7 +27,7 @@ status: "experimental", public: true, base_feature_status: "enabled", -@@ -3354,7 +3354,7 @@ +@@ -3369,7 +3369,7 @@ { name: "PrivateNetworkAccessPermissionPrompt", origin_trial_feature_name: "PrivateNetworkAccessPermissionPrompt", @@ -36,7 +36,7 @@ status: "stable", public: true, base_feature: "none", -@@ -4365,7 +4365,7 @@ +@@ -4379,7 +4379,7 @@ name: "UnrestrictedSharedArrayBuffer", base_feature: "none", origin_trial_feature_name: "UnrestrictedSharedArrayBuffer", @@ -45,7 +45,7 @@ }, // Enables using policy-controlled feature "usb-unrestricted" to allow // isolated context to access protected USB interface classes and to -@@ -4515,7 +4515,7 @@ +@@ -4544,7 +4544,7 @@ { name: "WebAppScopeExtensions", origin_trial_feature_name: "WebAppScopeExtensions", @@ -54,7 +54,7 @@ status: "experimental", base_feature: "none", }, -@@ -4558,7 +4558,7 @@ +@@ -4587,7 +4587,7 @@ status: "experimental", base_feature: "none", origin_trial_feature_name: "WebAppUrlHandling", diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_scheduler_common_thread.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_scheduler_common_thread.cc index 7cdd625a0b9e..cbcde22d5c49 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_scheduler_common_thread.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_scheduler_common_thread.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/scheduler/common/thread.cc.orig 2024-09-30 07:45:04 UTC +--- third_party/blink/renderer/platform/scheduler/common/thread.cc.orig 2024-11-14 07:57:23 UTC +++ third_party/blink/renderer/platform/scheduler/common/thread.cc -@@ -88,7 +88,7 @@ void Thread::CreateAndSetCompositorThread() { +@@ -87,7 +87,7 @@ void Thread::CreateAndSetCompositorThread() { "Compositor"); })); diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_text_text__codec__icu.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_text_text__codec__icu.cc index 6e2a65389fb7..eee0906272b6 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_text_text__codec__icu.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_text_text__codec__icu.cc @@ -1,6 +1,24 @@ ---- third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc.orig 2024-08-26 12:06:38 UTC +--- third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc.orig 2024-11-14 07:57:23 UTC +++ third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc -@@ -615,6 +615,7 @@ static void GbkUrlEscapedEntityCallack( +@@ -323,7 +323,7 @@ void TextCodecICU::CreateICUConverter() const { + DCHECK(!converter_icu_); + + #if defined(USING_SYSTEM_ICU) +- const char* name = encoding_.GetName(); ++ const AtomicString& name = encoding_.GetName(); + needs_gbk_fallbacks_ = + name[0] == 'G' && name[1] == 'B' && name[2] == 'K' && !name[3]; + #endif +@@ -448,7 +448,7 @@ String TextCodecICU::Decode(base::span<const uint8_t> + // <http://bugs.webkit.org/show_bug.cgi?id=17014> + // Simplified Chinese pages use the code A3A0 to mean "full-width space", but + // ICU decodes it as U+E5E5. +- if (!strcmp(encoding_.GetName(), "GBK")) { ++ if (!strcmp(encoding_.GetName().Utf8().c_str(), "GBK")) { + if (EqualIgnoringASCIICase(encoding_.GetName(), "gb18030")) + resultString.Replace(0xE5E5, kIdeographicSpaceCharacter); + // Make GBK compliant to the encoding spec and align with GB18030 +@@ -611,6 +611,7 @@ static void GbkUrlEscapedEntityCallack( code_point, reason, err); } @@ -8,7 +26,7 @@ static void GbkCallbackSubstitute(const void* context, UConverterFromUnicodeArgs* from_unicode_args, const UChar* code_units, -@@ -632,6 +633,7 @@ static void GbkCallbackSubstitute(const void* context, +@@ -628,6 +629,7 @@ static void GbkCallbackSubstitute(const void* context, UCNV_FROM_U_CALLBACK_SUBSTITUTE(context, from_unicode_args, code_units, length, code_point, reason, err); } diff --git a/www/chromium/files/patch-third__party_ffmpeg_configure b/www/chromium/files/patch-third__party_ffmpeg_configure index b4fa3715e0b0..0703d450233d 100644 --- a/www/chromium/files/patch-third__party_ffmpeg_configure +++ b/www/chromium/files/patch-third__party_ffmpeg_configure @@ -1,6 +1,6 @@ ---- third_party/ffmpeg/configure.orig 2024-07-30 11:12:21 UTC +--- third_party/ffmpeg/configure.orig 2024-11-14 07:57:23 UTC +++ third_party/ffmpeg/configure -@@ -6818,8 +6818,8 @@ if ! disabled pthreads && ! enabled w32threads && ! en +@@ -6833,8 +6833,8 @@ if ! disabled pthreads && ! enabled w32threads && ! en if enabled pthread_np_h; then hdrs="$hdrs pthread_np.h" fi diff --git a/www/chromium/files/patch-third__party_libaom_source_libaom_aom__ports_aarch64__cpudetect.c b/www/chromium/files/patch-third__party_libaom_source_libaom_aom__ports_aarch64__cpudetect.c index cd09cd9764e1..4e1bd4a57ff4 100644 --- a/www/chromium/files/patch-third__party_libaom_source_libaom_aom__ports_aarch64__cpudetect.c +++ b/www/chromium/files/patch-third__party_libaom_source_libaom_aom__ports_aarch64__cpudetect.c @@ -1,6 +1,6 @@ ---- third_party/libaom/source/libaom/aom_ports/aarch64_cpudetect.c.orig 2024-06-03 12:51:57 UTC +--- third_party/libaom/source/libaom/aom_ports/aarch64_cpudetect.c.orig 2024-11-14 07:57:23 UTC +++ third_party/libaom/source/libaom/aom_ports/aarch64_cpudetect.c -@@ -99,9 +99,45 @@ static int arm_get_cpu_caps(void) { +@@ -127,9 +127,45 @@ static int arm_get_cpu_caps(void) { return flags; } diff --git a/www/chromium/files/patch-third__party_libvpx_source_libvpx_vpx__ports_aarch64__cpudetect.c b/www/chromium/files/patch-third__party_libvpx_source_libvpx_vpx__ports_aarch64__cpudetect.c index b18fab093f99..5bc574e37a09 100644 --- a/www/chromium/files/patch-third__party_libvpx_source_libvpx_vpx__ports_aarch64__cpudetect.c +++ b/www/chromium/files/patch-third__party_libvpx_source_libvpx_vpx__ports_aarch64__cpudetect.c @@ -1,6 +1,6 @@ ---- third_party/libvpx/source/libvpx/vpx_ports/aarch64_cpudetect.c.orig 2024-05-21 18:07:39 UTC +--- third_party/libvpx/source/libvpx/vpx_ports/aarch64_cpudetect.c.orig 2024-11-14 07:57:23 UTC +++ third_party/libvpx/source/libvpx/vpx_ports/aarch64_cpudetect.c -@@ -92,9 +92,23 @@ static int arm_get_cpu_caps(void) { +@@ -120,9 +120,23 @@ static int arm_get_cpu_caps(void) { return flags; } diff --git a/www/chromium/files/patch-third__party_node_node.py b/www/chromium/files/patch-third__party_node_node.py index e867b37aba00..963973c31c3b 100644 --- a/www/chromium/files/patch-third__party_node_node.py +++ b/www/chromium/files/patch-third__party_node_node.py @@ -1,6 +1,6 @@ ---- third_party/node/node.py.orig 2024-07-30 11:12:21 UTC +--- third_party/node/node.py.orig 2024-11-14 07:57:23 UTC +++ third_party/node/node.py -@@ -20,6 +20,8 @@ def GetBinaryPath(): +@@ -21,6 +21,8 @@ def GetBinaryPath(): return os_path.join(os_path.dirname(__file__), *{ 'Darwin': (darwin_path, darwin_name, 'bin', 'node'), 'Linux': ('linux', 'node-linux-x64', 'bin', 'node'), diff --git a/www/chromium/files/patch-third__party_perfetto_src_tracing_core_clock__snapshots.cc b/www/chromium/files/patch-third__party_perfetto_src_base_clock__snapshots.cc index d627e835db6c..625b3ee79e12 100644 --- a/www/chromium/files/patch-third__party_perfetto_src_tracing_core_clock__snapshots.cc +++ b/www/chromium/files/patch-third__party_perfetto_src_base_clock__snapshots.cc @@ -1,5 +1,5 @@ ---- third_party/perfetto/src/tracing/core/clock_snapshots.cc.orig 2024-04-19 13:02:56 UTC -+++ third_party/perfetto/src/tracing/core/clock_snapshots.cc +--- third_party/perfetto/src/base/clock_snapshots.cc.orig 2024-11-14 07:57:23 UTC ++++ third_party/perfetto/src/base/clock_snapshots.cc @@ -26,7 +26,8 @@ ClockSnapshotVector CaptureClockSnapshots() { ClockSnapshotVector snapshot_data; #if !PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) && \ diff --git a/www/chromium/files/patch-third__party_perfetto_src_base_utils.cc b/www/chromium/files/patch-third__party_perfetto_src_base_utils.cc index b9a5eefa8c08..c3467a818740 100644 --- a/www/chromium/files/patch-third__party_perfetto_src_base_utils.cc +++ b/www/chromium/files/patch-third__party_perfetto_src_base_utils.cc @@ -1,4 +1,4 @@ ---- third_party/perfetto/src/base/utils.cc.orig 2024-10-22 08:31:56 UTC +--- third_party/perfetto/src/base/utils.cc.orig 2024-11-14 07:57:23 UTC +++ third_party/perfetto/src/base/utils.cc @@ -38,8 +38,9 @@ #include <mach/vm_page_size.h> @@ -12,7 +12,32 @@ #include <sys/prctl.h> #ifndef PR_GET_TAGGED_ADDR_CTRL -@@ -337,8 +338,9 @@ void AlignedFree(void* ptr) { +@@ -278,14 +279,22 @@ void Daemonize(std::function<int()> parent_cb) { + + std::string GetCurExecutablePath() { + std::string self_path; +-#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ ++#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ + PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \ +- PERFETTO_BUILDFLAG(PERFETTO_OS_FUCHSIA) ++ PERFETTO_BUILDFLAG(PERFETTO_OS_FUCHSIA)) && \ ++ !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD) + char buf[PATH_MAX]; + ssize_t size = readlink("/proc/self/exe", buf, sizeof(buf)); + PERFETTO_CHECK(size != -1); + // readlink does not null terminate. + self_path = std::string(buf, static_cast<size_t>(size)); ++#elif PERFETTO_BUILDFLAG(PERFETTO_OS_BSD) ++ char *buf; ++ const char *cpath = "/usr/local/chrome/chrome"; ++ if ((buf = getenv("CHROME_EXE_PATH")) != NULL) ++ self_path = std::string(buf); ++ else ++ self_path = std::string(cpath); + #elif PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) + uint32_t size = 0; + PERFETTO_CHECK(_NSGetExecutablePath(nullptr, &size)); +@@ -337,8 +346,9 @@ void AlignedFree(void* ptr) { } bool IsSyncMemoryTaggingEnabled() { diff --git a/www/chromium/files/patch-third__party_perfetto_src_tracing_platform__posix.cc b/www/chromium/files/patch-third__party_perfetto_src_tracing_platform__posix.cc new file mode 100644 index 000000000000..de931549fb4d --- /dev/null +++ b/www/chromium/files/patch-third__party_perfetto_src_tracing_platform__posix.cc @@ -0,0 +1,19 @@ +--- third_party/perfetto/src/tracing/platform_posix.cc.orig 2024-11-14 07:57:23 UTC ++++ third_party/perfetto/src/tracing/platform_posix.cc +@@ -110,12 +110,13 @@ std::unique_ptr<base::TaskRunner> PlatformPosix::Creat + } + + std::string PlatformPosix::GetCurrentProcessName() { +-#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ +- PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) ++#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ ++ PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)) && \ ++ !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD) + std::string cmdline; + base::ReadFile("/proc/self/cmdline", &cmdline); + return cmdline.substr(0, cmdline.find('\0')); +-#elif PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) ++#elif PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) || PERFETTO_BUILDFLAG(PERFETTO_OS_BSD) + return std::string(getprogname()); + #else + return "unknown_producer"; diff --git a/www/chromium/files/patch-third__party_perfetto_src_tracing_track.cc b/www/chromium/files/patch-third__party_perfetto_src_tracing_track.cc index 1d2969ed043e..6549ff009877 100644 --- a/www/chromium/files/patch-third__party_perfetto_src_tracing_track.cc +++ b/www/chromium/files/patch-third__party_perfetto_src_tracing_track.cc @@ -1,6 +1,18 @@ ---- third_party/perfetto/src/tracing/track.cc.orig 2024-07-30 11:12:21 UTC +--- third_party/perfetto/src/tracing/track.cc.orig 2024-11-14 07:57:23 UTC +++ third_party/perfetto/src/tracing/track.cc -@@ -155,7 +155,7 @@ namespace internal { +@@ -60,8 +60,9 @@ protos::gen::TrackDescriptor ProcessTrack::Serialize() + auto desc = Track::Serialize(); + auto pd = desc.mutable_process(); + pd->set_pid(static_cast<int32_t>(pid)); +-#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ +- PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) ++#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ ++ PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)) && \ ++ !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD) + std::string cmdline; + if (base::ReadFile("/proc/self/cmdline", &cmdline)) { + // Since cmdline is a zero-terminated list of arguments, this ends up +@@ -155,7 +156,7 @@ namespace internal { namespace { uint64_t GetProcessStartTime() { diff --git a/www/chromium/files/patch-third__party_vulkan-loader_src_loader_vk__loader__platform.h b/www/chromium/files/patch-third__party_vulkan-loader_src_loader_vk__loader__platform.h index 4dc8a632697d..a619d683d95b 100644 --- a/www/chromium/files/patch-third__party_vulkan-loader_src_loader_vk__loader__platform.h +++ b/www/chromium/files/patch-third__party_vulkan-loader_src_loader_vk__loader__platform.h @@ -1,6 +1,6 @@ ---- third_party/vulkan-loader/src/loader/vk_loader_platform.h.orig 2024-07-30 11:12:21 UTC +--- third_party/vulkan-loader/src/loader/vk_loader_platform.h.orig 2024-11-14 07:57:23 UTC +++ third_party/vulkan-loader/src/loader/vk_loader_platform.h -@@ -327,7 +327,15 @@ static inline char *loader_platform_executable_path(ch +@@ -342,7 +342,15 @@ static inline char *loader_platform_executable_path(ch return buffer; } diff --git a/www/chromium/files/patch-ui_base_cursor_cursor__factory.cc b/www/chromium/files/patch-ui_base_cursor_cursor__factory.cc index 45450ad553f8..d6b71e79ac85 100644 --- a/www/chromium/files/patch-ui_base_cursor_cursor__factory.cc +++ b/www/chromium/files/patch-ui_base_cursor_cursor__factory.cc @@ -1,6 +1,6 @@ ---- ui/base/cursor/cursor_factory.cc.orig 2024-03-22 08:19:40 UTC +--- ui/base/cursor/cursor_factory.cc.orig 2024-11-14 07:57:23 UTC +++ ui/base/cursor/cursor_factory.cc -@@ -97,7 +97,7 @@ void CursorFactory::ObserveThemeChanges() { +@@ -96,7 +96,7 @@ void CursorFactory::ObserveThemeChanges() { NOTIMPLEMENTED(); } diff --git a/www/chromium/files/patch-ui_base_ui__base__features.cc b/www/chromium/files/patch-ui_base_ui__base__features.cc index f4d694f70a1b..39a474573d3c 100644 --- a/www/chromium/files/patch-ui_base_ui__base__features.cc +++ b/www/chromium/files/patch-ui_base_ui__base__features.cc @@ -1,6 +1,6 @@ ---- ui/base/ui_base_features.cc.orig 2024-09-30 07:45:04 UTC +--- ui/base/ui_base_features.cc.orig 2024-11-14 07:57:23 UTC +++ ui/base/ui_base_features.cc -@@ -162,7 +162,7 @@ BASE_FEATURE(kWaylandTextInputV3, +@@ -173,7 +173,7 @@ BASE_FEATURE(kWaylandUiScale, base::FEATURE_DISABLED_BY_DEFAULT); #endif // BUILDFLAG(IS_OZONE) @@ -9,7 +9,7 @@ // If this feature is enabled, users not specify --ozone-platform-hint switch // will get --ozone-platform-hint=auto treatment. https://crbug.com/40250220. COMPONENT_EXPORT(UI_BASE_FEATURES) -@@ -264,7 +264,7 @@ BASE_FEATURE(kExperimentalFlingAnimation, +@@ -275,7 +275,7 @@ BASE_FEATURE(kExperimentalFlingAnimation, "ExperimentalFlingAnimation", // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -18,7 +18,7 @@ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ !BUILDFLAG(IS_CHROMEOS_LACROS)) base::FEATURE_ENABLED_BY_DEFAULT -@@ -366,7 +366,7 @@ bool IsForcedColorsEnabled() { +@@ -379,7 +379,7 @@ bool IsForcedColorsEnabled() { BASE_FEATURE(kEyeDropper, "EyeDropper", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-ui_base_ui__base__features.h b/www/chromium/files/patch-ui_base_ui__base__features.h index 3be2ab61e20b..7460ada1ea8c 100644 --- a/www/chromium/files/patch-ui_base_ui__base__features.h +++ b/www/chromium/files/patch-ui_base_ui__base__features.h @@ -1,7 +1,7 @@ ---- ui/base/ui_base_features.h.orig 2024-09-30 07:45:04 UTC +--- ui/base/ui_base_features.h.orig 2024-11-14 07:57:23 UTC +++ ui/base/ui_base_features.h -@@ -141,7 +141,7 @@ COMPONENT_EXPORT(UI_BASE_FEATURES) - BASE_DECLARE_FEATURE(kWaylandTextInputV3); +@@ -148,7 +148,7 @@ COMPONENT_EXPORT(UI_BASE_FEATURES) + BASE_DECLARE_FEATURE(kWaylandUiScale); #endif // BUILDFLAG(IS_OZONE) -#if BUILDFLAG(IS_LINUX) diff --git a/www/chromium/files/patch-ui_compositor_compositor.cc b/www/chromium/files/patch-ui_compositor_compositor.cc index d0e640a38172..2788e3671dc7 100644 --- a/www/chromium/files/patch-ui_compositor_compositor.cc +++ b/www/chromium/files/patch-ui_compositor_compositor.cc @@ -1,11 +1,11 @@ ---- ui/compositor/compositor.cc.orig 2024-10-22 08:31:56 UTC +--- ui/compositor/compositor.cc.orig 2024-11-14 07:57:23 UTC +++ ui/compositor/compositor.cc -@@ -925,7 +925,7 @@ void Compositor::OnResume() { +@@ -915,7 +915,7 @@ void Compositor::OnResume() { obs.ResetIfActive(); } -#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11) void Compositor::OnCompleteSwapWithNewSize(const gfx::Size& size) { - for (auto& observer : observer_list_) - observer.OnCompositingCompleteSwapWithNewSize(this, size); + observer_list_.Notify( + &CompositorObserver::OnCompositingCompleteSwapWithNewSize, this, size); diff --git a/www/chromium/files/patch-ui_gfx_BUILD.gn b/www/chromium/files/patch-ui_gfx_BUILD.gn index 652f2937be6b..4318b1814f5d 100644 --- a/www/chromium/files/patch-ui_gfx_BUILD.gn +++ b/www/chromium/files/patch-ui_gfx_BUILD.gn @@ -1,6 +1,6 @@ ---- ui/gfx/BUILD.gn.orig 2024-08-26 12:06:38 UTC +--- ui/gfx/BUILD.gn.orig 2024-11-14 07:57:23 UTC +++ ui/gfx/BUILD.gn -@@ -664,7 +664,7 @@ source_set("memory_buffer_sources") { +@@ -666,7 +666,7 @@ source_set("memory_buffer_sources") { deps += [ "//build/config/linux/libdrm" ] } diff --git a/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.cc b/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.cc index 525b921796f7..c0487e95f7f6 100644 --- a/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.cc +++ b/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.cc @@ -1,6 +1,6 @@ ---- ui/gfx/gpu_memory_buffer.cc.orig 2024-05-21 18:07:39 UTC +--- ui/gfx/gpu_memory_buffer.cc.orig 2024-11-14 07:57:23 UTC +++ ui/gfx/gpu_memory_buffer.cc -@@ -55,7 +55,7 @@ GpuMemoryBufferHandle GpuMemoryBufferHandle::Clone() c +@@ -63,7 +63,7 @@ GpuMemoryBufferHandle GpuMemoryBufferHandle::Clone() c handle.region = region.Duplicate(); handle.offset = offset; handle.stride = stride; diff --git a/www/chromium/files/patch-ui_gl_BUILD.gn b/www/chromium/files/patch-ui_gl_BUILD.gn index 1b9620849b22..0449b86a94b3 100644 --- a/www/chromium/files/patch-ui_gl_BUILD.gn +++ b/www/chromium/files/patch-ui_gl_BUILD.gn @@ -1,4 +1,4 @@ ---- ui/gl/BUILD.gn.orig 2024-10-22 08:31:56 UTC +--- ui/gl/BUILD.gn.orig 2024-11-14 07:57:23 UTC +++ ui/gl/BUILD.gn @@ -168,7 +168,6 @@ component("gl") { public_deps = [ @@ -16,7 +16,7 @@ ] if (enable_swiftshader) { data_deps += [ -@@ -538,7 +536,6 @@ test("gl_unittests") { +@@ -541,7 +539,6 @@ test("gl_unittests") { data_deps = [ "//testing/buildbot/filters:gl_unittests_filters", diff --git a/www/chromium/files/patch-ui_gl_gl__context.cc b/www/chromium/files/patch-ui_gl_gl__context.cc index ecfa7aa6ccdf..7f4c33f4ad6d 100644 --- a/www/chromium/files/patch-ui_gl_gl__context.cc +++ b/www/chromium/files/patch-ui_gl_gl__context.cc @@ -1,6 +1,6 @@ ---- ui/gl/gl_context.cc.orig 2024-10-22 08:31:56 UTC +--- ui/gl/gl_context.cc.orig 2024-11-14 07:57:23 UTC +++ ui/gl/gl_context.cc -@@ -522,7 +522,7 @@ bool GLContext::MakeVirtuallyCurrent( +@@ -517,7 +517,7 @@ bool GLContext::MakeVirtuallyCurrent( DCHECK(virtual_context->IsCurrent(surface)); if (switched_real_contexts || virtual_context != current_virtual_context_) { diff --git a/www/chromium/files/patch-ui_native__theme_native__theme__features.cc b/www/chromium/files/patch-ui_native__theme_native__theme__features.cc index 739f03590ca8..b9bc68f9e2a3 100644 --- a/www/chromium/files/patch-ui_native__theme_native__theme__features.cc +++ b/www/chromium/files/patch-ui_native__theme_native__theme__features.cc @@ -1,6 +1,6 @@ ---- ui/native_theme/native_theme_features.cc.orig 2024-01-30 07:53:34 UTC +--- ui/native_theme/native_theme_features.cc.orig 2024-11-14 07:57:23 UTC +++ ui/native_theme/native_theme_features.cc -@@ -54,7 +54,7 @@ bool IsOverlayScrollbarEnabled() { +@@ -65,7 +65,7 @@ bool IsOverlayScrollbarEnabled() { bool IsFluentScrollbarEnabled() { // Fluent scrollbars are only used for some OSes due to UI design guidelines. @@ -9,7 +9,7 @@ return base::FeatureList::IsEnabled(features::kFluentScrollbar) || IsFluentOverlayScrollbarEnabled(); #else -@@ -63,7 +63,7 @@ bool IsFluentScrollbarEnabled() { +@@ -74,7 +74,7 @@ bool IsFluentScrollbarEnabled() { } bool IsFluentOverlayScrollbarEnabled() { // Fluent scrollbars are only used for some OSes due to UI design guidelines. diff --git a/www/chromium/files/patch-ui_ozone_common_features.cc b/www/chromium/files/patch-ui_ozone_common_features.cc index 9af6132ee450..401830418069 100644 --- a/www/chromium/files/patch-ui_ozone_common_features.cc +++ b/www/chromium/files/patch-ui_ozone_common_features.cc @@ -1,6 +1,6 @@ ---- ui/ozone/common/features.cc.orig 2024-10-22 08:31:56 UTC +--- ui/ozone/common/features.cc.orig 2024-11-14 07:57:23 UTC +++ ui/ozone/common/features.cc -@@ -30,7 +30,7 @@ BASE_FEATURE(kWaylandSurfaceSubmissionInPixelCoordinat +@@ -35,7 +35,7 @@ BASE_FEATURE(kWaylandSurfaceSubmissionInPixelCoordinat // enabled. BASE_FEATURE(kWaylandFractionalScaleV1, "WaylandFractionalScaleV1", @@ -9,7 +9,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -42,7 +42,7 @@ BASE_FEATURE(kWaylandFractionalScaleV1, +@@ -47,7 +47,7 @@ BASE_FEATURE(kWaylandFractionalScaleV1, // protocol is supported. BASE_FEATURE(kWaylandXdgToplevelDrag, "WaylandXdgToplevelDrag", diff --git a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__screen.cc b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__screen.cc index 7937489a04cb..130f6fa980d3 100644 --- a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__screen.cc +++ b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__screen.cc @@ -1,29 +1,29 @@ ---- ui/ozone/platform/wayland/host/wayland_screen.cc.orig 2024-10-22 08:31:56 UTC +--- ui/ozone/platform/wayland/host/wayland_screen.cc.orig 2024-11-14 07:57:23 UTC +++ ui/ozone/platform/wayland/host/wayland_screen.cc -@@ -46,7 +46,7 @@ +@@ -47,7 +47,7 @@ #include "ui/ozone/platform/wayland/host/org_gnome_mutter_idle_monitor.h" #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "ui/base/ui_base_features.h" #include "ui/linux/linux_ui.h" #endif - -@@ -133,7 +133,7 @@ WaylandScreen::WaylandScreen(WaylandConnection* connec +@@ -135,7 +135,7 @@ WaylandScreen::WaylandScreen(WaylandConnection* connec tablet_state_ = connection_->GetTabletState(); #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (auto* linux_ui = ui::LinuxUi::instance()) { + if (connection_->IsUiScaleEnabled() && LinuxUi::instance()) { OnDeviceScaleFactorChanged(); - display_scale_factor_observer_.Observe(linux_ui); -@@ -606,7 +606,7 @@ bool WaylandScreen::VerifyOutputStateConsistentForTest + display_scale_factor_observer_.Observe(LinuxUi::instance()); +@@ -614,7 +614,7 @@ bool WaylandScreen::VerifyOutputStateConsistentForTest return true; } -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) void WaylandScreen::OnDeviceScaleFactorChanged() { - if (const auto* linux_ui = ui::LinuxUi::instance()) { - const float new_font_scale = linux_ui->display_config().font_scale; + CHECK(connection_->IsUiScaleEnabled()); + CHECK(LinuxUi::instance()); diff --git a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__screen.h b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__screen.h index d17eee298e45..beafb4ed4e66 100644 --- a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__screen.h +++ b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__screen.h @@ -1,6 +1,6 @@ ---- ui/ozone/platform/wayland/host/wayland_screen.h.orig 2024-10-22 08:31:56 UTC +--- ui/ozone/platform/wayland/host/wayland_screen.h.orig 2024-11-14 07:57:23 UTC +++ ui/ozone/platform/wayland/host/wayland_screen.h -@@ -24,7 +24,7 @@ +@@ -23,7 +23,7 @@ #include "ui/ozone/platform/wayland/host/wayland_output.h" #include "ui/ozone/public/platform_screen.h" @@ -9,7 +9,7 @@ #include "base/scoped_observation.h" #include "ui/linux/device_scale_factor_observer.h" #include "ui/linux/linux_ui.h" -@@ -44,7 +44,7 @@ class OrgGnomeMutterIdleMonitor; +@@ -43,7 +43,7 @@ class OrgGnomeMutterIdleMonitor; // A PlatformScreen implementation for Wayland. class WaylandScreen : public PlatformScreen @@ -18,7 +18,7 @@ , public DeviceScaleFactorObserver #endif -@@ -96,7 +96,7 @@ class WaylandScreen : public PlatformScreen +@@ -95,7 +95,7 @@ class WaylandScreen : public PlatformScreen display::TabletState GetTabletState() const override; #endif @@ -27,12 +27,12 @@ // DeviceScaleFactorObserver: void OnDeviceScaleFactorChanged() override; #endif -@@ -158,7 +158,7 @@ class WaylandScreen : public PlatformScreen +@@ -155,7 +155,7 @@ class WaylandScreen : public PlatformScreen display::TabletState tablet_state_; #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - float font_scale_ = 1.0f; - base::ScopedObservation<ui::LinuxUi, DeviceScaleFactorObserver> + display_scale_factor_observer_{this}; + #endif diff --git a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.cc b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.cc index bde1154747e4..805262b92109 100644 --- a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.cc +++ b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.cc @@ -1,6 +1,6 @@ ---- ui/ozone/platform/wayland/host/wayland_toplevel_window.cc.orig 2024-09-30 07:45:04 UTC +--- ui/ozone/platform/wayland/host/wayland_toplevel_window.cc.orig 2024-11-14 07:57:23 UTC +++ ui/ozone/platform/wayland/host/wayland_toplevel_window.cc -@@ -634,7 +634,7 @@ void WaylandToplevelWindow::HandleAuraToplevelConfigur +@@ -629,7 +629,7 @@ void WaylandToplevelWindow::HandleToplevelConfigureWit const bool did_active_change = is_active_ != window_states.is_activated; is_active_ = window_states.is_activated; diff --git a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.h b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.h index 08b2cbd5d995..e868b5ea82bc 100644 --- a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.h +++ b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.h @@ -1,6 +1,6 @@ ---- ui/ozone/platform/wayland/host/wayland_toplevel_window.h.orig 2024-09-30 07:45:04 UTC +--- ui/ozone/platform/wayland/host/wayland_toplevel_window.h.orig 2024-11-14 07:57:23 UTC +++ ui/ozone/platform/wayland/host/wayland_toplevel_window.h -@@ -261,7 +261,7 @@ class WaylandToplevelWindow : public WaylandWindow, +@@ -262,7 +262,7 @@ class WaylandToplevelWindow : public WaylandWindow, // The display ID to switch to in case the state is `kFullscreen`. int64_t fullscreen_display_id_ = display::kInvalidDisplayId; diff --git a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__window.cc b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__window.cc index f6b690809364..5034f84fbb5b 100644 --- a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__window.cc +++ b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__window.cc @@ -1,6 +1,6 @@ ---- ui/ozone/platform/wayland/host/wayland_window.cc.orig 2024-10-22 08:31:56 UTC +--- ui/ozone/platform/wayland/host/wayland_window.cc.orig 2024-11-14 07:57:23 UTC +++ ui/ozone/platform/wayland/host/wayland_window.cc -@@ -318,7 +318,7 @@ void WaylandWindow::OnPointerFocusChanged(bool focused +@@ -323,7 +323,7 @@ void WaylandWindow::OnPointerFocusChanged(bool focused // Whenever the window gets the pointer focus back, the cursor shape must be // updated. Otherwise, it is invalidated upon wl_pointer::leave and is not // restored by the Wayland compositor. @@ -9,7 +9,7 @@ if (focused && async_cursor_) { async_cursor_->AddCursorLoadedCallback(base::BindOnce( &WaylandWindow::OnCursorLoaded, AsWeakPtr(), async_cursor_)); -@@ -584,7 +584,7 @@ bool WaylandWindow::ShouldUseNativeFrame() const { +@@ -604,7 +604,7 @@ bool WaylandWindow::ShouldUseNativeFrame() const { void WaylandWindow::SetCursor(scoped_refptr<PlatformCursor> platform_cursor) { DCHECK(platform_cursor); @@ -18,7 +18,7 @@ auto async_cursor = WaylandAsyncCursor::FromPlatformCursor(platform_cursor); if (async_cursor_ == async_cursor) { -@@ -795,7 +795,7 @@ std::string WaylandWindow::WindowStates::ToString() co +@@ -815,7 +815,7 @@ std::string WaylandWindow::WindowStates::ToString() co } else { base::TrimString(states, " ", &states); } @@ -27,7 +27,7 @@ states += "; tiled_edges: "; std::string tiled = ""; if (tiled_edges.left) { -@@ -1283,12 +1283,12 @@ void WaylandWindow::UpdateCursorShape(scoped_refptr<Bi +@@ -1318,12 +1318,12 @@ void WaylandWindow::UpdateCursorShape(scoped_refptr<Bi cursor->bitmaps(), hotspot_in_dips, std::ceil(cursor->cursor_image_scale_factor())); } diff --git a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__window.h b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__window.h index 103d58524087..4ccb8f6da16c 100644 --- a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__window.h +++ b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__window.h @@ -1,4 +1,4 @@ ---- ui/ozone/platform/wayland/host/wayland_window.h.orig 2024-10-22 08:31:56 UTC +--- ui/ozone/platform/wayland/host/wayland_window.h.orig 2024-11-14 07:57:23 UTC +++ ui/ozone/platform/wayland/host/wayland_window.h @@ -41,7 +41,7 @@ #include "ui/platform_window/platform_window_init_properties.h" @@ -9,7 +9,7 @@ #include "ui/ozone/platform/wayland/host/wayland_async_cursor.h" #endif -@@ -285,7 +285,7 @@ class WaylandWindow : public PlatformWindow, +@@ -280,7 +280,7 @@ class WaylandWindow : public PlatformWindow, bool is_snapped_secondary = false; bool is_floated = false; bool is_pip = false; @@ -18,7 +18,7 @@ WindowTiledEdges tiled_edges; #endif -@@ -569,7 +569,7 @@ class WaylandWindow : public PlatformWindow, +@@ -578,7 +578,7 @@ class WaylandWindow : public PlatformWindow, void UpdateCursorShape(scoped_refptr<BitmapCursor> cursor); @@ -27,7 +27,7 @@ void OnCursorLoaded(scoped_refptr<WaylandAsyncCursor> cursor, scoped_refptr<BitmapCursor> bitmap_cursor); #endif -@@ -638,7 +638,7 @@ class WaylandWindow : public PlatformWindow, +@@ -647,7 +647,7 @@ class WaylandWindow : public PlatformWindow, wl::Object<zaura_surface> aura_surface_; diff --git a/www/chromium/files/patch-ui_ozone_platform_wayland_ozone__platform__wayland.cc b/www/chromium/files/patch-ui_ozone_platform_wayland_ozone__platform__wayland.cc index 9941c852e745..5213a63d8ffc 100644 --- a/www/chromium/files/patch-ui_ozone_platform_wayland_ozone__platform__wayland.cc +++ b/www/chromium/files/patch-ui_ozone_platform_wayland_ozone__platform__wayland.cc @@ -1,4 +1,4 @@ ---- ui/ozone/platform/wayland/ozone_platform_wayland.cc.orig 2024-09-30 07:45:04 UTC +--- ui/ozone/platform/wayland/ozone_platform_wayland.cc.orig 2024-11-14 07:57:23 UTC +++ ui/ozone/platform/wayland/ozone_platform_wayland.cc @@ -66,13 +66,13 @@ #include "ui/events/ozone/layout/stub/stub_keyboard_layout_engine.h" @@ -16,7 +16,7 @@ #include "ui/ozone/platform/wayland/host/linux_ui_delegate_wayland.h" #endif -@@ -267,7 +267,7 @@ class OzonePlatformWayland : public OzonePlatform, +@@ -278,7 +278,7 @@ class OzonePlatformWayland : public OzonePlatform, buffer_manager_connector_ = std::make_unique<WaylandBufferManagerConnector>( connection_->buffer_manager_host()); @@ -25,7 +25,7 @@ cursor_factory_ = std::make_unique<WaylandCursorFactory>(connection_.get()); #else cursor_factory_ = std::make_unique<BitmapCursorFactory>(); -@@ -277,7 +277,7 @@ class OzonePlatformWayland : public OzonePlatform, +@@ -288,7 +288,7 @@ class OzonePlatformWayland : public OzonePlatform, supported_buffer_formats_ = connection_->buffer_manager_host()->GetSupportedBufferFormats(); @@ -34,7 +34,7 @@ linux_ui_delegate_ = std::make_unique<LinuxUiDelegateWayland>(connection_.get()); #endif -@@ -343,7 +343,7 @@ class OzonePlatformWayland : public OzonePlatform, +@@ -354,7 +354,7 @@ class OzonePlatformWayland : public OzonePlatform, properties->supports_global_screen_coordinates = kDefaultScreenCoordinateEnabled; @@ -43,7 +43,7 @@ // TODO(crbug.com/40800718): Revisit (and maybe remove) once proper // support, probably backed by org.freedesktop.portal.Screenshot.PickColor // API is implemented. Note: this is restricted to Linux Desktop as Lacros -@@ -545,7 +545,7 @@ class OzonePlatformWayland : public OzonePlatform, +@@ -556,7 +556,7 @@ class OzonePlatformWayland : public OzonePlatform, DrmRenderNodePathFinder path_finder_; #endif diff --git a/www/chromium/files/patch-ui_ozone_platform_x11_x11__window.cc b/www/chromium/files/patch-ui_ozone_platform_x11_x11__window.cc index ed51218d3494..ecb2577fcc1d 100644 --- a/www/chromium/files/patch-ui_ozone_platform_x11_x11__window.cc +++ b/www/chromium/files/patch-ui_ozone_platform_x11_x11__window.cc @@ -1,6 +1,6 @@ ---- ui/ozone/platform/x11/x11_window.cc.orig 2024-09-30 07:45:04 UTC +--- ui/ozone/platform/x11/x11_window.cc.orig 2024-11-14 07:57:23 UTC +++ ui/ozone/platform/x11/x11_window.cc -@@ -1504,7 +1504,7 @@ void X11Window::OnXWindowStateChanged() { +@@ -1488,7 +1488,7 @@ void X11Window::OnXWindowStateChanged() { WindowTiledEdges tiled_state = GetTiledState(); if (tiled_state != tiled_state_) { tiled_state_ = tiled_state; diff --git a/www/chromium/files/patch-ui_platform__window_platform__window__delegate.cc b/www/chromium/files/patch-ui_platform__window_platform__window__delegate.cc index cceb49e19772..08c6f5feb9fe 100644 --- a/www/chromium/files/patch-ui_platform__window_platform__window__delegate.cc +++ b/www/chromium/files/patch-ui_platform__window_platform__window__delegate.cc @@ -1,6 +1,6 @@ ---- ui/platform_window/platform_window_delegate.cc.orig 2024-06-17 12:56:06 UTC +--- ui/platform_window/platform_window_delegate.cc.orig 2024-11-14 07:57:23 UTC +++ ui/platform_window/platform_window_delegate.cc -@@ -61,7 +61,7 @@ gfx::Insets PlatformWindowDelegate::CalculateInsetsInD +@@ -66,7 +66,7 @@ gfx::Insets PlatformWindowDelegate::CalculateInsetsInD return gfx::Insets(); } diff --git a/www/chromium/files/patch-ui_platform__window_platform__window__delegate.h b/www/chromium/files/patch-ui_platform__window_platform__window__delegate.h index 9ac26bd77d21..ce938427b53d 100644 --- a/www/chromium/files/patch-ui_platform__window_platform__window__delegate.h +++ b/www/chromium/files/patch-ui_platform__window_platform__window__delegate.h @@ -1,6 +1,6 @@ ---- ui/platform_window/platform_window_delegate.h.orig 2024-07-30 11:12:21 UTC +--- ui/platform_window/platform_window_delegate.h.orig 2024-11-14 07:57:23 UTC +++ ui/platform_window/platform_window_delegate.h -@@ -181,7 +181,7 @@ class COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindow +@@ -191,7 +191,7 @@ class COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindow virtual void OnWindowStateChanged(PlatformWindowState old_state, PlatformWindowState new_state) = 0; diff --git a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc index cb1d1744dec8..93a04ce38563 100644 --- a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc +++ b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc @@ -1,6 +1,6 @@ ---- ui/views/controls/textfield/textfield.cc.orig 2024-10-22 08:31:56 UTC +--- ui/views/controls/textfield/textfield.cc.orig 2024-11-14 07:57:23 UTC +++ ui/views/controls/textfield/textfield.cc -@@ -85,7 +85,7 @@ +@@ -87,7 +87,7 @@ #include "base/win/win_util.h" #endif @@ -9,7 +9,7 @@ #include "ui/base/ime/linux/text_edit_command_auralinux.h" #include "ui/base/ime/text_input_flags.h" #include "ui/linux/linux_ui.h" -@@ -183,7 +183,7 @@ bool IsControlKeyModifier(int flags) { +@@ -185,7 +185,7 @@ bool IsControlKeyModifier(int flags) { // Control-modified key combination, but we cannot extend it to other platforms // as Control has different meanings and behaviors. // https://crrev.com/2580483002/#msg46 @@ -18,7 +18,7 @@ return flags & ui::EF_CONTROL_DOWN; #else return false; -@@ -761,7 +761,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event +@@ -763,7 +763,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event if (!textfield) return handled; @@ -27,7 +27,7 @@ auto* linux_ui = ui::LinuxUi::instance(); std::vector<ui::TextEditCommandAuraLinux> commands; if (!handled && linux_ui && -@@ -944,7 +944,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo +@@ -946,7 +946,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo } bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) { @@ -36,7 +36,7 @@ // Skip any accelerator handling that conflicts with custom keybindings. auto* linux_ui = ui::LinuxUi::instance(); std::vector<ui::TextEditCommandAuraLinux> commands; -@@ -1994,7 +1994,7 @@ bool Textfield::ShouldDoLearning() { +@@ -1997,7 +1997,7 @@ bool Textfield::ShouldDoLearning() { return false; } @@ -45,7 +45,7 @@ // TODO(crbug.com/41452689): Implement this method to support Korean IME // reconversion feature on native text fields (e.g. find bar). bool Textfield::SetCompositionFromExistingText( -@@ -2500,14 +2500,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( +@@ -2503,14 +2503,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( #endif return ui::TextEditCommand::DELETE_BACKWARD; } diff --git a/www/chromium/files/patch-ui_views_controls_textfield_textfield.h b/www/chromium/files/patch-ui_views_controls_textfield_textfield.h index 2446b08490ac..47fb426f327d 100644 --- a/www/chromium/files/patch-ui_views_controls_textfield_textfield.h +++ b/www/chromium/files/patch-ui_views_controls_textfield_textfield.h @@ -1,6 +1,6 @@ ---- ui/views/controls/textfield/textfield.h.orig 2024-09-30 07:45:04 UTC +--- ui/views/controls/textfield/textfield.h.orig 2024-11-14 07:57:23 UTC +++ ui/views/controls/textfield/textfield.h -@@ -47,7 +47,7 @@ +@@ -48,7 +48,7 @@ #include "ui/views/view_observer.h" #include "ui/views/word_lookup_client.h" @@ -9,7 +9,7 @@ #include <vector> #endif -@@ -463,7 +463,7 @@ class VIEWS_EXPORT Textfield : public View, +@@ -465,7 +465,7 @@ class VIEWS_EXPORT Textfield : public View, // Set whether the text should be used to improve typing suggestions. void SetShouldDoLearning(bool value) { should_do_learning_ = value; } diff --git a/www/chromium/files/patch-ui_views_views__delegate.cc b/www/chromium/files/patch-ui_views_views__delegate.cc index f28d911af263..6e84e8154efd 100644 --- a/www/chromium/files/patch-ui_views_views__delegate.cc +++ b/www/chromium/files/patch-ui_views_views__delegate.cc @@ -1,6 +1,6 @@ ---- ui/views/views_delegate.cc.orig 2024-02-23 21:04:38 UTC +--- ui/views/views_delegate.cc.orig 2024-11-14 07:57:23 UTC +++ ui/views/views_delegate.cc -@@ -95,7 +95,7 @@ bool ViewsDelegate::IsWindowInMetro(gfx::NativeWindow +@@ -97,7 +97,7 @@ bool ViewsDelegate::IsWindowInMetro(gfx::NativeWindow return false; } #elif BUILDFLAG(ENABLE_DESKTOP_AURA) && \ diff --git a/www/chromium/files/patch-ui_views_views__delegate.h b/www/chromium/files/patch-ui_views_views__delegate.h index 6c402c3fd9db..a662a3c85b50 100644 --- a/www/chromium/files/patch-ui_views_views__delegate.h +++ b/www/chromium/files/patch-ui_views_views__delegate.h @@ -1,6 +1,6 @@ ---- ui/views/views_delegate.h.orig 2024-02-23 21:04:38 UTC +--- ui/views/views_delegate.h.orig 2024-11-14 07:57:23 UTC +++ ui/views/views_delegate.h -@@ -146,7 +146,7 @@ class VIEWS_EXPORT ViewsDelegate { +@@ -147,7 +147,7 @@ class VIEWS_EXPORT ViewsDelegate { // environment. virtual bool IsWindowInMetro(gfx::NativeWindow window) const; #elif BUILDFLAG(ENABLE_DESKTOP_AURA) && \ diff --git a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc index 0aff48ffc838..4b9458084b26 100644 --- a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc +++ b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc @@ -1,6 +1,6 @@ ---- ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc.orig 2024-10-22 08:31:56 UTC +--- ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc.orig 2024-11-14 07:57:23 UTC +++ ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc -@@ -206,7 +206,7 @@ DragOperation DesktopDragDropClientOzone::StartDragAnd +@@ -204,7 +204,7 @@ DragOperation DesktopDragDropClientOzone::StartDragAnd return selected_operation_; } diff --git a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.h b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.h index 2ac770e8258a..9e79a1f9d358 100644 --- a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.h +++ b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.h @@ -1,6 +1,6 @@ ---- ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.h.orig 2024-10-22 08:31:56 UTC +--- ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.h.orig 2024-11-14 07:57:23 UTC +++ ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.h -@@ -66,7 +66,7 @@ class VIEWS_EXPORT DesktopDragDropClientOzone +@@ -67,7 +67,7 @@ class VIEWS_EXPORT DesktopDragDropClientOzone // The offset of |drag_widget_| relative to the mouse position. gfx::Vector2d offset; @@ -9,7 +9,7 @@ // The last received drag location. The drag widget is moved asynchronously // so its position is updated when the UI thread has time for that. When // the first change to the location happens, a call to UpdateDragWidget() -@@ -87,7 +87,7 @@ class VIEWS_EXPORT DesktopDragDropClientOzone +@@ -88,7 +88,7 @@ class VIEWS_EXPORT DesktopDragDropClientOzone const gfx::Point& root_location, int allowed_operations, ui::mojom::DragEventSource source) override; diff --git a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc index b7e203a51101..345be9033ab9 100644 --- a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc +++ b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc @@ -1,6 +1,6 @@ ---- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2024-09-30 07:45:04 UTC +--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2024-11-14 07:57:23 UTC +++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc -@@ -48,7 +48,7 @@ +@@ -49,7 +49,7 @@ #include "ui/wm/core/window_util.h" #include "ui/wm/public/window_move_client.h" @@ -9,7 +9,7 @@ #include "ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone_linux.h" #endif -@@ -358,7 +358,7 @@ std::unique_ptr<aura::client::DragDropClient> +@@ -359,7 +359,7 @@ std::unique_ptr<aura::client::DragDropClient> DesktopWindowTreeHostPlatform::CreateDragDropClient() { ui::WmDragHandler* drag_handler = ui::GetWmDragHandler(*(platform_window())); std::unique_ptr<DesktopDragDropClientOzone> drag_drop_client = @@ -18,7 +18,7 @@ std::make_unique<DesktopDragDropClientOzoneLinux>(window(), drag_handler); #else std::make_unique<DesktopDragDropClientOzone>(window(), drag_handler); -@@ -1175,7 +1175,7 @@ bool DesktopWindowTreeHostPlatform::RotateFocusForWidg +@@ -1176,7 +1176,7 @@ bool DesktopWindowTreeHostPlatform::RotateFocusForWidg // DesktopWindowTreeHost: // Linux subclasses this host and adds some Linux specific bits. diff --git a/www/chromium/files/patch-ui_views_widget_root__view.cc b/www/chromium/files/patch-ui_views_widget_root__view.cc index 554b4d8a1f27..a4852d9ea227 100644 --- a/www/chromium/files/patch-ui_views_widget_root__view.cc +++ b/www/chromium/files/patch-ui_views_widget_root__view.cc @@ -1,6 +1,6 @@ ---- ui/views/widget/root_view.cc.orig 2024-10-22 08:31:56 UTC +--- ui/views/widget/root_view.cc.orig 2024-11-14 07:57:23 UTC +++ ui/views/widget/root_view.cc -@@ -139,7 +139,7 @@ class AnnounceTextView : public View { +@@ -110,7 +110,7 @@ class AnnounceTextView : public View { #if BUILDFLAG(IS_CHROMEOS) // On ChromeOS, kAlert role can invoke an unnecessary event on reparenting. GetViewAccessibility().SetRole(ax::mojom::Role::kStaticText); diff --git a/www/chromium/files/patch-ui_views_widget_widget.cc b/www/chromium/files/patch-ui_views_widget_widget.cc index 84abc077b3a7..fe68f5e92e9d 100644 --- a/www/chromium/files/patch-ui_views_widget_widget.cc +++ b/www/chromium/files/patch-ui_views_widget_widget.cc @@ -1,6 +1,6 @@ ---- ui/views/widget/widget.cc.orig 2024-10-22 08:31:56 UTC +--- ui/views/widget/widget.cc.orig 2024-11-14 07:57:23 UTC +++ ui/views/widget/widget.cc -@@ -58,7 +58,7 @@ +@@ -59,7 +59,7 @@ #include "ui/views/window/custom_frame_view.h" #include "ui/views/window/dialog_delegate.h" @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #endif -@@ -2203,7 +2203,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const +@@ -2194,7 +2194,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const if (parent_) return parent_->GetNativeTheme(); diff --git a/www/chromium/files/patch-v8_BUILD.gn b/www/chromium/files/patch-v8_BUILD.gn index c1eea0b9dd95..386214ee9de1 100644 --- a/www/chromium/files/patch-v8_BUILD.gn +++ b/www/chromium/files/patch-v8_BUILD.gn @@ -1,6 +1,6 @@ ---- v8/BUILD.gn.orig 2024-10-22 08:31:56 UTC +--- v8/BUILD.gn.orig 2024-11-14 07:57:23 UTC +++ v8/BUILD.gn -@@ -907,6 +907,8 @@ external_v8_defines = [ +@@ -929,6 +929,8 @@ external_v8_defines = [ "V8_TARGET_OS_MACOS", "V8_TARGET_OS_WIN", "V8_TARGET_OS_CHROMEOS", @@ -9,7 +9,7 @@ ] enabled_external_v8_defines = [ -@@ -983,6 +985,12 @@ if (target_os == "android") { +@@ -1005,6 +1007,12 @@ if (target_os == "android") { } else if (target_os == "chromeos") { enabled_external_v8_defines += [ "V8_HAVE_TARGET_OS" ] enabled_external_v8_defines += [ "V8_TARGET_OS_CHROMEOS" ] @@ -22,7 +22,7 @@ } disabled_external_v8_defines = external_v8_defines - enabled_external_v8_defines -@@ -2535,6 +2543,12 @@ template("run_mksnapshot") { +@@ -2563,6 +2571,12 @@ template("run_mksnapshot") { if (!v8_enable_builtins_profiling && v8_enable_builtins_reordering) { args += [ "--reorder-builtins" ] } @@ -35,7 +35,7 @@ } if (v8_enable_turboshaft_csa) { -@@ -6625,7 +6639,7 @@ v8_component("v8_libbase") { +@@ -6636,7 +6650,7 @@ v8_component("v8_libbase") { } } @@ -44,7 +44,7 @@ sources += [ "src/base/debug/stack_trace_posix.cc", "src/base/platform/platform-linux.cc", -@@ -6636,6 +6650,18 @@ v8_component("v8_libbase") { +@@ -6647,6 +6661,18 @@ v8_component("v8_libbase") { "dl", "rt", ] diff --git a/www/chromium/files/patch-v8_src_api_api.cc b/www/chromium/files/patch-v8_src_api_api.cc index d8add43d4dc1..cd7fefef63ff 100644 --- a/www/chromium/files/patch-v8_src_api_api.cc +++ b/www/chromium/files/patch-v8_src_api_api.cc @@ -1,6 +1,6 @@ ---- v8/src/api/api.cc.orig 2024-10-22 08:31:56 UTC +--- v8/src/api/api.cc.orig 2024-11-14 07:57:23 UTC +++ v8/src/api/api.cc -@@ -149,7 +149,7 @@ +@@ -151,7 +151,7 @@ #include "src/wasm/wasm-serialization.h" #endif // V8_ENABLE_WEBASSEMBLY @@ -9,7 +9,7 @@ #include <signal.h> #include <unistd.h> -@@ -6525,7 +6525,7 @@ bool v8::V8::Initialize(const int build_config) { +@@ -6559,7 +6559,7 @@ bool v8::V8::Initialize(const int build_config) { return true; } diff --git a/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc b/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc index 2a753e7ac56e..f828812bfd2b 100644 --- a/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc +++ b/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc @@ -1,4 +1,4 @@ ---- v8/src/base/platform/platform-posix.cc.orig 2024-10-22 08:31:56 UTC +--- v8/src/base/platform/platform-posix.cc.orig 2024-11-14 07:57:23 UTC +++ v8/src/base/platform/platform-posix.cc @@ -75,7 +75,7 @@ #include <sys/syscall.h> @@ -25,7 +25,7 @@ uintptr_t raw_addr; { MutexGuard guard(rng_mutex.Pointer()); -@@ -416,6 +423,7 @@ void* OS::GetRandomMmapAddr() { +@@ -412,6 +419,7 @@ void* OS::GetRandomMmapAddr() { #endif return reinterpret_cast<void*>(raw_addr); } @@ -33,7 +33,7 @@ // TODO(bbudge) Move Cygwin and Fuchsia stuff into platform-specific files. #if !V8_OS_CYGWIN && !V8_OS_FUCHSIA -@@ -704,7 +712,7 @@ void OS::DestroySharedMemoryHandle(PlatformSharedMemor +@@ -700,7 +708,7 @@ void OS::DestroySharedMemoryHandle(PlatformSharedMemor #if !V8_OS_ZOS // static bool OS::HasLazyCommits() { @@ -42,7 +42,7 @@ return true; #else // TODO(bbudge) Return true for all POSIX platforms. -@@ -1350,7 +1358,7 @@ void Thread::SetThreadLocal(LocalStorageKey key, void* +@@ -1346,7 +1354,7 @@ void Thread::SetThreadLocal(LocalStorageKey key, void* // keep this version in POSIX as most Linux-compatible derivatives will // support it. MacOS and FreeBSD are different here. #if !defined(V8_OS_FREEBSD) && !defined(V8_OS_DARWIN) && !defined(_AIX) && \ diff --git a/www/chromium/files/patch-v8_src_builtins_x64_builtins-x64.cc b/www/chromium/files/patch-v8_src_builtins_x64_builtins-x64.cc deleted file mode 100644 index 2960a88b0451..000000000000 --- a/www/chromium/files/patch-v8_src_builtins_x64_builtins-x64.cc +++ /dev/null @@ -1,14 +0,0 @@ ---- v8/src/builtins/x64/builtins-x64.cc.orig 2024-10-22 08:31:56 UTC -+++ v8/src/builtins/x64/builtins-x64.cc -@@ -2838,7 +2838,11 @@ void Generate_OSREntry(MacroAssembler* masm, Register - // Drop the return address on the stack and jump to the OSR entry - // point of the function. - __ Drop(1); -+#ifdef V8_ENABLE_CET_IBT -+ __ jmp(entry_address, /*notrack=*/true); -+#else - __ jmp(entry_address); -+#endif - } - - enum class OsrSourceTier { diff --git a/www/chromium/files/patch-v8_src_execution_isolate.cc b/www/chromium/files/patch-v8_src_execution_isolate.cc index 2ffe55a85bb9..f72d2af47d46 100644 --- a/www/chromium/files/patch-v8_src_execution_isolate.cc +++ b/www/chromium/files/patch-v8_src_execution_isolate.cc @@ -1,4 +1,4 @@ ---- v8/src/execution/isolate.cc.orig 2024-10-22 08:31:56 UTC +--- v8/src/execution/isolate.cc.orig 2024-11-14 07:57:23 UTC +++ v8/src/execution/isolate.cc @@ -168,6 +168,10 @@ #include "src/execution/simulator-base.h" @@ -11,7 +11,7 @@ extern "C" const uint8_t v8_Default_embedded_blob_code_[]; extern "C" uint32_t v8_Default_embedded_blob_code_size_; extern "C" const uint8_t v8_Default_embedded_blob_data_[]; -@@ -4971,6 +4975,13 @@ void Isolate::InitializeDefaultEmbeddedBlob() { +@@ -4994,6 +4998,13 @@ void Isolate::InitializeDefaultEmbeddedBlob() { uint32_t code_size = DefaultEmbeddedBlobCodeSize(); const uint8_t* data = DefaultEmbeddedBlobData(); uint32_t data_size = DefaultEmbeddedBlobDataSize(); diff --git a/www/chromium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl.h b/www/chromium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl.h index d5c3a478dfa5..490585897ef3 100644 --- a/www/chromium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl.h +++ b/www/chromium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl.h @@ -1,6 +1,6 @@ ---- v8/src/wasm/baseline/ia32/liftoff-assembler-ia32-inl.h.orig 2024-10-22 08:31:56 UTC +--- v8/src/wasm/baseline/ia32/liftoff-assembler-ia32-inl.h.orig 2024-11-14 07:57:23 UTC +++ v8/src/wasm/baseline/ia32/liftoff-assembler-ia32-inl.h -@@ -512,7 +512,7 @@ void LiftoffAssembler::StoreTaggedPointer(Register dst +@@ -579,7 +579,7 @@ void LiftoffAssembler::StoreTaggedPointer(Register dst } void LiftoffAssembler::Load(LiftoffRegister dst, Register src_addr, @@ -9,7 +9,7 @@ LoadType type, uint32_t* protected_load_pc, bool /* is_load_mem */, bool /* i64_offset */, bool needs_shift) { -@@ -592,7 +592,7 @@ void LiftoffAssembler::Load(LiftoffRegister dst, Regis +@@ -659,7 +659,7 @@ void LiftoffAssembler::Load(LiftoffRegister dst, Regis } void LiftoffAssembler::Store(Register dst_addr, Register offset_reg, @@ -18,7 +18,7 @@ StoreType type, LiftoffRegList pinned, uint32_t* protected_store_pc, bool /* is_store_mem */, bool /* i64_offset */) { -@@ -671,7 +671,7 @@ void LiftoffAssembler::Store(Register dst_addr, Regist +@@ -738,7 +738,7 @@ void LiftoffAssembler::Store(Register dst_addr, Regist } void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, Register src_addr, @@ -27,7 +27,7 @@ LoadType type, LiftoffRegList /* pinned */, bool /* i64_offset */) { if (type.value() != LoadType::kI64Load) { -@@ -689,7 +689,7 @@ void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, +@@ -756,7 +756,7 @@ void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, } void LiftoffAssembler::AtomicStore(Register dst_addr, Register offset_reg, @@ -36,7 +36,7 @@ StoreType type, LiftoffRegList pinned, bool /* i64_offset */) { DCHECK_LE(offset_imm, std::numeric_limits<int32_t>::max()); -@@ -759,7 +759,7 @@ enum Binop { kAdd, kSub, kAnd, kOr, kXor, kExchange }; +@@ -826,7 +826,7 @@ enum Binop { kAdd, kSub, kAnd, kOr, kXor, kExchange }; inline void AtomicAddOrSubOrExchange32(LiftoffAssembler* lasm, Binop binop, Register dst_addr, Register offset_reg, @@ -45,7 +45,7 @@ LiftoffRegister value, LiftoffRegister result, StoreType type) { DCHECK_EQ(value, result); -@@ -827,7 +827,7 @@ inline void AtomicAddOrSubOrExchange32(LiftoffAssemble +@@ -894,7 +894,7 @@ inline void AtomicAddOrSubOrExchange32(LiftoffAssemble } inline void AtomicBinop32(LiftoffAssembler* lasm, Binop op, Register dst_addr, @@ -54,7 +54,7 @@ LiftoffRegister value, LiftoffRegister result, StoreType type) { DCHECK_EQ(value, result); -@@ -942,7 +942,7 @@ inline void AtomicBinop32(LiftoffAssembler* lasm, Bino +@@ -1009,7 +1009,7 @@ inline void AtomicBinop32(LiftoffAssembler* lasm, Bino } inline void AtomicBinop64(LiftoffAssembler* lasm, Binop op, Register dst_addr, @@ -63,7 +63,7 @@ LiftoffRegister value, LiftoffRegister result) { // We need {ebx} here, which is the root register. As the root register it // needs special treatment. As we use {ebx} directly in the code below, we -@@ -1038,7 +1038,7 @@ inline void AtomicBinop64(LiftoffAssembler* lasm, Bino +@@ -1105,7 +1105,7 @@ inline void AtomicBinop64(LiftoffAssembler* lasm, Bino } // namespace liftoff void LiftoffAssembler::AtomicAdd(Register dst_addr, Register offset_reg, @@ -72,7 +72,7 @@ LiftoffRegister result, StoreType type, bool /* i64_offset */) { if (type.value() == StoreType::kI64Store) { -@@ -1052,7 +1052,7 @@ void LiftoffAssembler::AtomicAdd(Register dst_addr, Re +@@ -1119,7 +1119,7 @@ void LiftoffAssembler::AtomicAdd(Register dst_addr, Re } void LiftoffAssembler::AtomicSub(Register dst_addr, Register offset_reg, @@ -81,7 +81,7 @@ LiftoffRegister result, StoreType type, bool /* i64_offset */) { if (type.value() == StoreType::kI64Store) { -@@ -1065,7 +1065,7 @@ void LiftoffAssembler::AtomicSub(Register dst_addr, Re +@@ -1132,7 +1132,7 @@ void LiftoffAssembler::AtomicSub(Register dst_addr, Re } void LiftoffAssembler::AtomicAnd(Register dst_addr, Register offset_reg, @@ -90,7 +90,7 @@ LiftoffRegister result, StoreType type, bool /* i64_offset */) { if (type.value() == StoreType::kI64Store) { -@@ -1079,7 +1079,7 @@ void LiftoffAssembler::AtomicAnd(Register dst_addr, Re +@@ -1146,7 +1146,7 @@ void LiftoffAssembler::AtomicAnd(Register dst_addr, Re } void LiftoffAssembler::AtomicOr(Register dst_addr, Register offset_reg, @@ -99,7 +99,7 @@ LiftoffRegister result, StoreType type, bool /* i64_offset */) { if (type.value() == StoreType::kI64Store) { -@@ -1093,7 +1093,7 @@ void LiftoffAssembler::AtomicOr(Register dst_addr, Reg +@@ -1160,7 +1160,7 @@ void LiftoffAssembler::AtomicOr(Register dst_addr, Reg } void LiftoffAssembler::AtomicXor(Register dst_addr, Register offset_reg, @@ -108,7 +108,7 @@ LiftoffRegister result, StoreType type, bool /* i64_offset */) { if (type.value() == StoreType::kI64Store) { -@@ -1107,7 +1107,7 @@ void LiftoffAssembler::AtomicXor(Register dst_addr, Re +@@ -1174,7 +1174,7 @@ void LiftoffAssembler::AtomicXor(Register dst_addr, Re } void LiftoffAssembler::AtomicExchange(Register dst_addr, Register offset_reg, @@ -117,7 +117,7 @@ LiftoffRegister value, LiftoffRegister result, StoreType type, bool /* i64_offset */) { -@@ -1122,7 +1122,7 @@ void LiftoffAssembler::AtomicExchange(Register dst_add +@@ -1189,7 +1189,7 @@ void LiftoffAssembler::AtomicExchange(Register dst_add } void LiftoffAssembler::AtomicCompareExchange( |