diff options
| author | Robert Nagy <rnagy@FreeBSD.org> | 2024-08-27 07:55:04 +0200 |
|---|---|---|
| committer | Robert Nagy <rnagy@FreeBSD.org> | 2024-08-27 07:55:54 +0200 |
| commit | 43ddb9a8a4b22a4b81ca32698948e5832a6d93c6 (patch) | |
| tree | 36898a78b8f81e76f50f97d67720922ace27b53d | |
| parent | misc/llama-cpp: update 3622 → 3631 (diff) | |
www/*chromium: update to 128.0.6613.84
Security: https://vuxml.freebsd.org/freebsd/b339992e-6059-11ef-8a0f-a8a1599412c6.html
823 files changed, 4387 insertions, 4728 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile index 90907970d125..dd07463a657f 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -1,6 +1,5 @@ PORTNAME= chromium -PORTVERSION= 127.0.6533.119 -PORTREVISION= 1 +PORTVERSION= 128.0.6613.84 PULSEMV= 16 PULSEV= ${PULSEMV}.1 CATEGORIES= www wayland diff --git a/www/chromium/distinfo b/www/chromium/distinfo index 5d01778409ae..e64f540a3eb4 100644 --- a/www/chromium/distinfo +++ b/www/chromium/distinfo @@ -1,11 +1,11 @@ -TIMESTAMP = 1723633404 -SHA256 (chromium-127.0.6533.119.tar.xz) = acc9e3f9fd2d180b8831865a1ac4f5cdd9ffe6211f47f467296d9ee1be2a577e -SIZE (chromium-127.0.6533.119.tar.xz) = 6621220264 -SHA256 (chrome-linux-127.0.6533.119-llvm17.profdata.tar.xz) = 49b0f3d4e454ba40edde96db9d4fe2bde78872309464f92b2122afeebc685f7d -SIZE (chrome-linux-127.0.6533.119-llvm17.profdata.tar.xz) = 30457300 +TIMESTAMP = 1724673661 +SHA256 (chromium-128.0.6613.84.tar.xz) = 9297c1e1dc9310534f6a48f90eacc2eac1d964ac3c827dc0798594e8a2742dc4 +SIZE (chromium-128.0.6613.84.tar.xz) = 6703104636 +SHA256 (chrome-linux-128.0.6613.84-llvm17.profdata.tar.xz) = bfb48f25631c4cb9b7746463637fd1b257df550b2595e1eac515a34a1062ff8b +SIZE (chrome-linux-128.0.6613.84-llvm17.profdata.tar.xz) = 30284240 SHA256 (pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92 SIZE (pulseaudio-16.1.tar.gz) = 2763111 -SHA256 (chromium-127.0.6533.119-testdata.tar.xz) = a539a94ce99f6ed058db9106f56069786a911a8b39db677b3d3a78f5b582a743 -SIZE (chromium-127.0.6533.119-testdata.tar.xz) = 280109172 +SHA256 (chromium-128.0.6613.84-testdata.tar.xz) = df1f4b57d6e40f702ff37aeb3faf2a93e16635da566d0bf33a225fb2902dbbc6 +SIZE (chromium-128.0.6613.84-testdata.tar.xz) = 280248684 SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8 SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734 diff --git a/www/chromium/files/patch-BUILD.gn b/www/chromium/files/patch-BUILD.gn index c394db98d5d3..989176aa34c5 100644 --- a/www/chromium/files/patch-BUILD.gn +++ b/www/chromium/files/patch-BUILD.gn @@ -1,4 +1,4 @@ ---- BUILD.gn.orig 2024-07-30 11:12:21 UTC +--- BUILD.gn.orig 2024-08-26 12:06:38 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", -@@ -433,7 +432,7 @@ group("gn_all") { +@@ -431,7 +430,7 @@ group("gn_all") { } } @@ -26,32 +26,32 @@ deps += [ "//third_party/breakpad:breakpad_unittests", "//third_party/breakpad:core-2-minidump", -@@ -629,6 +628,15 @@ group("gn_all") { +@@ -626,6 +625,15 @@ group("gn_all") { } } + if (is_bsd) { + deps -= [ -+ "//third_party/breakpad:dump_syms($host_toolchain)", -+ "//third_party/breakpad:microdump_stackwalk($host_toolchain)", -+ "//third_party/breakpad:minidump_dump($host_toolchain)", -+ "//third_party/breakpad:minidump_stackwalk($host_toolchain)", ++ "//third_party/breakpad:dump_syms($host_system_allocator_toolchain)", ++ "//third_party/breakpad:microdump_stackwalk($host_system_allocator_toolchain)", ++ "//third_party/breakpad:minidump_dump($host_system_allocator_toolchain)", ++ "//third_party/breakpad:minidump_stackwalk($host_system_allocator_toolchain)", + ] + } + if (is_mac) { deps += [ - "//third_party/breakpad:dump_syms", -@@ -675,7 +683,7 @@ group("gn_all") { - host_os == "win") { - deps += [ "//chrome/test/mini_installer:mini_installer_tests" ] + "//third_party/breakpad:dump_syms($host_system_allocator_toolchain)", +@@ -674,7 +682,7 @@ group("gn_all") { } -- } else if (!is_android && !is_ios && !is_fuchsia) { -+ } else if (!is_android && !is_ios && !is_fuchsia && !is_bsd) { - deps += [ "//third_party/breakpad:symupload($host_toolchain)" ] } -@@ -1101,7 +1109,7 @@ if (use_blink && !is_cronet_build) { +- if (!is_fuchsia) { ++ if (!is_fuchsia && !is_bsd) { + # 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 +@@ -1124,7 +1132,7 @@ if (use_blink && !is_cronet_build) { ] } @@ -60,30 +60,30 @@ script_test("chrome_wpt_tests") { script = "//third_party/blink/tools/run_wpt_tests.py" args = [ -@@ -1194,7 +1202,7 @@ if (use_blink && !is_cronet_build) { +@@ -1221,7 +1229,7 @@ if (use_blink && !is_cronet_build) { data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ] } - if (!is_win && !is_android) { + if (!is_win && !is_android && !is_bsd) { - data_deps += - [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] - } -@@ -1203,7 +1211,7 @@ if (use_blink && !is_cronet_build) { - data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] + # 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. +@@ -1235,7 +1243,7 @@ if (use_blink && !is_cronet_build) { + data_deps += [ "//third_party/breakpad:dump_syms" ] } - if (is_linux || is_chromeos) { + if ((is_linux && !is_bsd) || is_chromeos) { - data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] - } - -@@ -1667,7 +1675,7 @@ group("chromium_builder_perf") { + # 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. +@@ -1702,7 +1710,7 @@ group("chromium_builder_perf") { data_deps += [ "//chrome/test:performance_browser_tests" ] } - if (!is_win) { + if (!is_win && !is_bsd) { - data_deps += - [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] + data_deps += [ "//third_party/breakpad:minidump_stackwalk($host_system_allocator_toolchain)" ] } + } diff --git a/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc b/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc index 6683ac0c2578..6a455c3e8d81 100644 --- a/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc +++ b/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc @@ -1,6 +1,6 @@ ---- apps/ui/views/app_window_frame_view.cc.orig 2024-06-17 12:56:06 UTC +--- apps/ui/views/app_window_frame_view.cc.orig 2024-08-26 12:06:38 UTC +++ apps/ui/views/app_window_frame_view.cc -@@ -148,7 +148,7 @@ gfx::Rect AppWindowFrameView::GetWindowBoundsForClient +@@ -149,7 +149,7 @@ gfx::Rect AppWindowFrameView::GetWindowBoundsForClient gfx::Rect window_bounds = client_bounds; // TODO(crbug.com/40118868): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/chromium/files/patch-base_BUILD.gn b/www/chromium/files/patch-base_BUILD.gn index 3a8367fe0b42..4ddad1558a69 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-07-30 11:12:21 UTC +--- base/BUILD.gn.orig 2024-08-26 12:06:38 UTC +++ base/BUILD.gn -@@ -182,7 +182,7 @@ buildflag_header("ios_cronet_buildflags") { +@@ -176,7 +176,7 @@ buildflag_header("ios_cronet_buildflags") { flags = [ "CRONET_BUILD=$is_cronet_build" ] } @@ -43,7 +43,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -2110,6 +2122,22 @@ component("base") { +@@ -2121,6 +2133,22 @@ component("base") { ] } @@ -66,7 +66,7 @@ # iOS if (is_ios) { sources += [ -@@ -2255,6 +2283,33 @@ component("base") { +@@ -2266,6 +2294,33 @@ component("base") { } } @@ -100,7 +100,7 @@ if (use_blink) { sources += [ "files/file_path_watcher.cc", -@@ -2265,7 +2320,7 @@ component("base") { +@@ -2276,7 +2331,7 @@ component("base") { } if (dep_libevent) { @@ -109,7 +109,7 @@ } if (use_libevent) { -@@ -3062,7 +3117,7 @@ if (is_apple) { +@@ -3077,7 +3132,7 @@ if (is_apple) { } } @@ -118,7 +118,7 @@ # This test must compile with -fstack-protector-all source_set("stack_canary_linux_unittests") { testonly = true -@@ -3711,7 +3766,7 @@ test("base_unittests") { +@@ -3730,7 +3785,7 @@ test("base_unittests") { ] } @@ -127,7 +127,7 @@ sources += [ "debug/proc_maps_linux_unittest.cc", "files/scoped_file_linux_unittest.cc", -@@ -3738,7 +3793,7 @@ test("base_unittests") { +@@ -3757,7 +3812,7 @@ test("base_unittests") { "posix/file_descriptor_shuffle_unittest.cc", "posix/unix_domain_socket_unittest.cc", ] @@ -136,7 +136,7 @@ sources += [ "profiler/stack_base_address_posix_unittest.cc", "profiler/stack_copier_signal_unittest.cc", -@@ -3749,7 +3804,7 @@ test("base_unittests") { +@@ -3768,7 +3823,7 @@ test("base_unittests") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -145,8 +145,8 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -4017,7 +4072,7 @@ test("base_unittests") { - } +@@ -3953,7 +4008,7 @@ test("base_unittests") { + deps += [ ":base_profiler_test_support_library" ] } - if (is_fuchsia || is_linux || is_chromeos) { 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 2e90443f5636..3f3f61e4afa2 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,4 +1,4 @@ ---- base/allocator/partition_allocator/partition_alloc.gni.orig 2024-07-30 11:12:21 UTC +--- base/allocator/partition_allocator/partition_alloc.gni.orig 2024-08-26 12:06:38 UTC +++ base/allocator/partition_allocator/partition_alloc.gni @@ -31,7 +31,7 @@ if (is_nacl) { use_large_empty_slot_span_ring = is_mac @@ -9,7 +9,7 @@ declare_args() { # Causes all the allocations to be routed via allocator_shim.cc. Usually, -@@ -360,7 +360,7 @@ assert(!use_asan_backup_ref_ptr || use_raw_ptr_hookabl +@@ -361,7 +361,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 ac4483834cbc..c8f6f4033c4d 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-07-30 11:12:21 UTC +--- base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig 2024-08-26 12:06:38 UTC +++ base/allocator/partition_allocator/src/partition_alloc/BUILD.gn -@@ -863,7 +863,7 @@ if (is_clang_or_gcc) { +@@ -796,7 +796,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.h b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator.h index 635f05dddb18..027b2c44fd46 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator.h +++ b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator.h @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/src/partition_alloc/page_allocator.h.orig 2024-07-30 11:12:21 UTC +--- base/allocator/partition_allocator/src/partition_alloc/page_allocator.h.orig 2024-08-26 12:06:38 UTC +++ base/allocator/partition_allocator/src/partition_alloc/page_allocator.h -@@ -259,7 +259,7 @@ bool DecommitAndZeroSystemPages(void* address, +@@ -269,7 +269,7 @@ bool DecommitAndZeroSystemPages(void* address, // recommitted. Do not assume that this will not change over time. constexpr PA_COMPONENT_EXPORT( PARTITION_ALLOC) bool DecommittedMemoryIsAlwaysZeroed() { diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__constants.h b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__constants.h index adc1cadac766..a5240d273fea 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__constants.h +++ b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__constants.h @@ -1,11 +1,13 @@ ---- base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h.orig 2024-07-30 11:12:21 UTC +--- base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h.orig 2024-08-26 12:06:38 UTC +++ base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h -@@ -26,7 +26,7 @@ +@@ -26,8 +26,8 @@ #define PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR __attribute__((const)) #elif (PA_BUILDFLAG(IS_ANDROID) && PA_BUILDFLAG(PA_ARCH_CPU_64_BITS)) || \ -- (PA_BUILDFLAG(IS_LINUX) && PA_BUILDFLAG(PA_ARCH_CPU_ARM64)) -+ ((PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_BSD)) && PA_BUILDFLAG(PA_ARCH_CPU_ARM64)) +- (PA_BUILDFLAG(IS_LINUX) && PA_BUILDFLAG(PA_ARCH_CPU_ARM64)) || \ +- (PA_BUILDFLAG(IS_LINUX) && PA_BUILDFLAG(PA_ARCH_CPU_PPC64)) ++ ((PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_BSD)) && PA_BUILDFLAG(PA_ARCH_CPU_ARM64)) || \ ++ ((PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_BSD)) && PA_BUILDFLAG(PA_ARCH_CPU_PPC64)) // This should work for all POSIX (if needed), but currently all other // supported OS/architecture combinations use either hard-coded values // (such as x86) or have means to determine these values without needing 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 new file mode 100644 index 000000000000..c9d3ac186486 --- /dev/null +++ b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.cc @@ -0,0 +1,11 @@ +--- 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 +@@ -9,7 +9,7 @@ + #include "partition_alloc/page_allocator.h" + + #if PA_BUILDFLAG(HAS_MEMORY_TAGGING) || \ +- (defined(__ARM_FEATURE_BTI_DEFAULT) && (__ARM_FEATURE_BTI_DEFAULT == 1)) ++ (defined(__ARM_FEATURE_BTI_DEFAULT) && (__ARM_FEATURE_BTI_DEFAULT == 1) && !PA_BUILDFLAG(IS_BSD)) + struct __ifunc_arg_t; + + #include "partition_alloc/aarch64_support.h" diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_proc__maps__linux.cc b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_proc__maps__linux.cc new file mode 100644 index 000000000000..c11438f7bcf6 --- /dev/null +++ b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_proc__maps__linux.cc @@ -0,0 +1,11 @@ +--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/proc_maps_linux.cc.orig 2024-08-26 12:06:38 UTC ++++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/proc_maps_linux.cc +@@ -19,7 +19,7 @@ + #include "partition_alloc/partition_alloc_check.h" + + #if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS) || \ +- PA_BUILDFLAG(IS_ANDROID) ++ PA_BUILDFLAG(IS_ANDROID) || PA_BUILDFLAG(IS_BSD) + #include <inttypes.h> + #endif + 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 4f6538f806ea..62fadd259dc6 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-07-30 11:12:21 UTC +--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h.orig 2024-08-26 12:06:38 UTC +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h -@@ -236,7 +236,7 @@ constexpr bool kUseLazyCommit = false; +@@ -168,7 +168,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 @@ // PartitionAlloc uses PartitionRootEnumerator to acquire all // PartitionRoots at BeforeFork and to release at AfterFork. -@@ -284,7 +284,7 @@ constexpr bool kUseLazyCommit = false; +@@ -216,7 +216,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__alloc__constants.h b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h index a173e021e5bf..2dc8e8b5de85 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h +++ b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h @@ -1,4 +1,4 @@ ---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h.orig 2024-07-30 11:12:21 UTC +--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h.orig 2024-08-26 12:06:38 UTC +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h @@ -329,7 +329,7 @@ PA_DEFINE_OPERATORS_FOR_FLAGS(PoolHandleMask); // 8GB for each of the glued pools). @@ -9,3 +9,12 @@ constexpr size_t kPoolMaxSize = 8 * kGiB; #else constexpr size_t kPoolMaxSize = 16 * kGiB; +@@ -458,7 +458,7 @@ PA_ALWAYS_INLINE constexpr size_t MaxDirectMapped() { + // TODO(casey.smalley@arm.com): under 64k pages we can end up in a situation + // where a normal slot span will be large enough to contain multiple items, + // but the address will go over the final partition page after being aligned. +-#if PA_BUILDFLAG(IS_LINUX) && PA_BUILDFLAG(PA_ARCH_CPU_ARM64) ++#if (PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_BSD)) && PA_BUILDFLAG(PA_ARCH_CPU_ARM64) + constexpr size_t kMaxSupportedAlignment = kSuperPageSize / 4; + #else + constexpr size_t kMaxSupportedAlignment = kSuperPageSize / 2; 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 8c9e225f4237..aacd099a41cc 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,6 +1,6 @@ ---- base/allocator/partition_allocator/src/partition_alloc/partition_root.cc.orig 2024-07-30 11:12:21 UTC +--- base/allocator/partition_allocator/src/partition_alloc/partition_root.cc.orig 2024-08-26 12:06:38 UTC +++ base/allocator/partition_allocator/src/partition_alloc/partition_root.cc -@@ -48,7 +48,7 @@ +@@ -43,7 +43,7 @@ #include "wow64apiset.h" #endif @@ -9,7 +9,7 @@ #include <pthread.h> #endif -@@ -282,7 +282,7 @@ void PartitionAllocMallocInitOnce() { +@@ -277,7 +277,7 @@ void PartitionAllocMallocInitOnce() { return; } @@ -18,12 +18,12 @@ // 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. -@@ -1079,7 +1079,7 @@ void PartitionRoot::Init(PartitionOptions opts) { +@@ -1074,7 +1074,7 @@ void PartitionRoot::Init(PartitionOptions opts) { // apple OSes. PA_CHECK((internal::SystemPageSize() == (size_t{1} << 12)) || (internal::SystemPageSize() == (size_t{1} << 14))); -#elif PA_BUILDFLAG(IS_LINUX) && PA_BUILDFLAG(PA_ARCH_CPU_ARM64) +#elif (PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_BSD)) && PA_BUILDFLAG(PA_ARCH_CPU_ARM64) // Check runtime pagesize. Though the code is currently the same, it is - // not merged with the IS_APPLE case above as a 1 << 16 case needs to be - // added here in the future, to allow 64 kiB pagesize. That is only + // not merged with the IS_APPLE case above as a 1 << 16 case is only + // supported on Linux on AArch64. diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_spinning__mutex.cc b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_spinning__mutex.cc index aacc03277192..04e58e4dc88d 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_spinning__mutex.cc +++ b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_spinning__mutex.cc @@ -1,4 +1,4 @@ ---- base/allocator/partition_allocator/src/partition_alloc/spinning_mutex.cc.orig 2024-02-23 21:04:38 UTC +--- base/allocator/partition_allocator/src/partition_alloc/spinning_mutex.cc.orig 2024-08-26 12:06:38 UTC +++ base/allocator/partition_allocator/src/partition_alloc/spinning_mutex.cc @@ -17,7 +17,16 @@ #endif @@ -17,7 +17,7 @@ #include <sys/syscall.h> #include <unistd.h> -@@ -109,8 +118,16 @@ void SpinningMutex::FutexWait() { +@@ -106,8 +115,16 @@ void SpinningMutex::FutexWait() { // |kLockedContended| anymore. Note that even without spurious wakeups, the // value of |state_| is not guaranteed when this returns, as another thread // may get the lock before we get to run. @@ -34,7 +34,7 @@ if (err) { // These are programming error, check them. -@@ -122,8 +139,16 @@ void SpinningMutex::FutexWait() { +@@ -119,8 +136,16 @@ void SpinningMutex::FutexWait() { void SpinningMutex::FutexWake() { int saved_errno = errno; diff --git a/www/chromium/files/patch-base_compiler__specific.h b/www/chromium/files/patch-base_compiler__specific.h index 32086eb84483..e260cef87df9 100644 --- a/www/chromium/files/patch-base_compiler__specific.h +++ b/www/chromium/files/patch-base_compiler__specific.h @@ -1,6 +1,6 @@ ---- base/compiler_specific.h.orig 2024-02-23 21:04:38 UTC +--- base/compiler_specific.h.orig 2024-08-26 12:06:38 UTC +++ base/compiler_specific.h -@@ -316,7 +316,7 @@ +@@ -326,7 +326,7 @@ // // In some cases it's desirable to remove this, e.g. on hot functions, or if // we have purposely changed the reference canary. diff --git a/www/chromium/files/patch-base_features.cc b/www/chromium/files/patch-base_features.cc index b63201213cbf..17b14f2d6c43 100644 --- a/www/chromium/files/patch-base_features.cc +++ b/www/chromium/files/patch-base_features.cc @@ -1,4 +1,4 @@ ---- base/features.cc.orig 2024-07-30 11:12:21 UTC +--- base/features.cc.orig 2024-08-26 12:06:38 UTC +++ base/features.cc @@ -9,8 +9,10 @@ #include "base/threading/platform_thread.h" @@ -12,7 +12,7 @@ #include "base/message_loop/message_pump_libevent.h" #endif -@@ -97,9 +99,11 @@ void Init(EmitThreadControllerProfilerMetadata +@@ -116,9 +118,11 @@ void Init(EmitThreadControllerProfilerMetadata sequence_manager::internal::ThreadController::InitializeFeatures( emit_thread_controller_profiler_metadata); diff --git a/www/chromium/files/patch-base_native__library__posix.cc b/www/chromium/files/patch-base_native__library__posix.cc index c2b8d0e5e970..c6991b4f66ef 100644 --- a/www/chromium/files/patch-base_native__library__posix.cc +++ b/www/chromium/files/patch-base_native__library__posix.cc @@ -1,6 +1,6 @@ ---- base/native_library_posix.cc.orig 2022-05-19 14:06:27 UTC +--- base/native_library_posix.cc.orig 2024-08-26 12:06:38 UTC +++ base/native_library_posix.cc -@@ -33,7 +33,7 @@ NativeLibrary LoadNativeLibraryWithOptions(const FileP +@@ -34,7 +34,7 @@ NativeLibrary LoadNativeLibraryWithOptions(const FileP // http://crbug.com/17943, http://crbug.com/17557, http://crbug.com/36892, // and http://crbug.com/40794. int flags = RTLD_LAZY; diff --git a/www/chromium/files/patch-base_process_launch.h b/www/chromium/files/patch-base_process_launch.h index c94015969722..684ed62fde12 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 2023-04-28 17:01:32 UTC +--- base/process/launch.h.orig 2024-08-26 12:06:38 UTC +++ base/process/launch.h -@@ -200,7 +200,7 @@ struct BASE_EXPORT LaunchOptions { +@@ -211,7 +211,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_profiler_stack__sampling__profiler__unittest.cc b/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc index 78aebb739b51..e4dd06a254ab 100644 --- a/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc +++ b/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc @@ -1,6 +1,6 @@ ---- base/profiler/stack_sampling_profiler_unittest.cc.orig 2024-05-21 18:07:39 UTC +--- base/profiler/stack_sampling_profiler_unittest.cc.orig 2024-08-26 12:06:38 UTC +++ base/profiler/stack_sampling_profiler_unittest.cc -@@ -43,7 +43,7 @@ +@@ -45,7 +45,7 @@ #include <intrin.h> #include <malloc.h> diff --git a/www/chromium/files/patch-base_rand__util__posix.cc b/www/chromium/files/patch-base_rand__util__posix.cc index 903da2cdc4db..d01b8c299f5e 100644 --- a/www/chromium/files/patch-base_rand__util__posix.cc +++ b/www/chromium/files/patch-base_rand__util__posix.cc @@ -1,4 +1,4 @@ ---- base/rand_util_posix.cc.orig 2024-06-17 12:56:06 UTC +--- base/rand_util_posix.cc.orig 2024-08-26 12:06:38 UTC +++ base/rand_util_posix.cc @@ -28,7 +28,7 @@ #include "base/time/time.h" @@ -9,7 +9,7 @@ #include "third_party/lss/linux_syscall_support.h" #elif BUILDFLAG(IS_MAC) // TODO(crbug.com/40641285): Waiting for this header to appear in the iOS SDK. -@@ -45,6 +45,7 @@ namespace base { +@@ -44,6 +44,7 @@ namespace base { namespace { @@ -17,7 +17,7 @@ #if BUILDFLAG(IS_AIX) // AIX has no 64-bit support for O_CLOEXEC. static constexpr int kOpenFlags = O_RDONLY; -@@ -69,10 +70,11 @@ class URandomFd { +@@ -68,10 +69,11 @@ class URandomFd { private: const int fd_; }; @@ -30,7 +30,7 @@ // TODO(pasko): Unify reading kernel version numbers in: // mojo/core/channel_linux.cc // chrome/browser/android/seccomp_support_detector.cc -@@ -182,6 +184,7 @@ bool UseBoringSSLForRandBytes() { +@@ -181,6 +183,7 @@ bool UseBoringSSLForRandBytes() { namespace { void RandBytesInternal(span<uint8_t> output, bool avoid_allocation) { @@ -38,7 +38,7 @@ #if !BUILDFLAG(IS_NACL) // The BoringSSL experiment takes priority over everything else. if (!avoid_allocation && internal::UseBoringSSLForRandBytes()) { -@@ -220,6 +223,9 @@ void RandBytesInternal(span<uint8_t> output, bool avoi +@@ -217,6 +220,9 @@ void RandBytesInternal(span<uint8_t> output, bool avoi const int urandom_fd = GetUrandomFD(); const bool success = ReadFromFD(urandom_fd, as_writable_chars(output)); CHECK(success); @@ -48,7 +48,7 @@ } } // namespace -@@ -239,9 +245,11 @@ void RandBytes(span<uint8_t> output) { +@@ -236,9 +242,11 @@ void RandBytes(span<uint8_t> output) { RandBytesInternal(output, /*avoid_allocation=*/false); } diff --git a/www/chromium/files/patch-base_synchronization_lock__impl.h b/www/chromium/files/patch-base_synchronization_lock__impl.h index facc847067d6..5915cd66be95 100644 --- a/www/chromium/files/patch-base_synchronization_lock__impl.h +++ b/www/chromium/files/patch-base_synchronization_lock__impl.h @@ -1,6 +1,6 @@ ---- base/synchronization/lock_impl.h.orig 2024-05-21 18:07:39 UTC +--- base/synchronization/lock_impl.h.orig 2024-08-26 12:06:38 UTC +++ base/synchronization/lock_impl.h -@@ -106,6 +106,10 @@ void LockImpl::Unlock() { +@@ -109,6 +109,10 @@ void LockImpl::Unlock() { } #elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA) @@ -11,7 +11,7 @@ #if DCHECK_IS_ON() BASE_EXPORT void dcheck_trylock_result(int rv); -@@ -126,6 +130,9 @@ void LockImpl::Unlock() { +@@ -129,6 +133,9 @@ void LockImpl::Unlock() { dcheck_unlock_result(rv); #endif } diff --git a/www/chromium/files/patch-base_system_sys__info.cc b/www/chromium/files/patch-base_system_sys__info.cc index 99d66657e417..abd773bef61b 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 2023-12-10 06:10:27 UTC +--- base/system/sys_info.cc.orig 2024-08-26 12:06:38 UTC +++ base/system/sys_info.cc -@@ -225,7 +225,7 @@ std::string SysInfo::HardwareModelName() { +@@ -223,7 +223,7 @@ std::string SysInfo::HardwareModelName() { #endif void SysInfo::GetHardwareInfo(base::OnceCallback<void(HardwareInfo)> callback) { diff --git a/www/chromium/files/patch-base_system_sys__info__unittest.cc b/www/chromium/files/patch-base_system_sys__info__unittest.cc index 694323db9a18..e783d88c4a07 100644 --- a/www/chromium/files/patch-base_system_sys__info__unittest.cc +++ b/www/chromium/files/patch-base_system_sys__info__unittest.cc @@ -1,6 +1,6 @@ ---- base/system/sys_info_unittest.cc.orig 2024-04-19 13:02:56 UTC +--- base/system/sys_info_unittest.cc.orig 2024-08-26 12:06:38 UTC +++ base/system/sys_info_unittest.cc -@@ -264,12 +264,16 @@ TEST_F(SysInfoTest, GetHardwareInfo) { +@@ -265,12 +265,16 @@ TEST_F(SysInfoTest, GetHardwareInfo) { EXPECT_TRUE(IsStringUTF8(hardware_info->model)); bool empty_result_expected = #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN) || \ diff --git a/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc b/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc index 6bb0e9b118ae..07784d885e24 100644 --- a/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc +++ b/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc @@ -1,6 +1,6 @@ ---- base/trace_event/malloc_dump_provider.cc.orig 2024-06-17 12:56:06 UTC +--- base/trace_event/malloc_dump_provider.cc.orig 2024-08-26 12:06:38 UTC +++ base/trace_event/malloc_dump_provider.cc -@@ -29,6 +29,8 @@ +@@ -28,6 +28,8 @@ #if BUILDFLAG(IS_APPLE) #include <malloc/malloc.h> @@ -9,7 +9,7 @@ #else #include <malloc.h> #endif -@@ -187,7 +189,7 @@ void ReportAppleAllocStats(size_t* total_virtual_size, +@@ -178,7 +180,7 @@ void ReportAppleAllocStats(size_t* total_virtual_size, #if (PA_BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && BUILDFLAG(IS_ANDROID)) || \ (!PA_BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && !BUILDFLAG(IS_WIN) && \ @@ -18,7 +18,7 @@ void ReportMallinfoStats(ProcessMemoryDump* pmd, size_t* total_virtual_size, size_t* resident_size, -@@ -391,6 +393,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump +@@ -368,6 +370,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump &allocated_objects_count); #elif BUILDFLAG(IS_FUCHSIA) // TODO(fuchsia): Port, see https://crbug.com/706592. diff --git a/www/chromium/files/patch-base_trace__event_process__memory__dump.cc b/www/chromium/files/patch-base_trace__event_process__memory__dump.cc index 2bf231c3eae4..56558e3a58f8 100644 --- a/www/chromium/files/patch-base_trace__event_process__memory__dump.cc +++ b/www/chromium/files/patch-base_trace__event_process__memory__dump.cc @@ -1,15 +1,15 @@ ---- base/trace_event/process_memory_dump.cc.orig 2024-06-17 12:56:06 UTC +--- base/trace_event/process_memory_dump.cc.orig 2024-08-26 12:06:38 UTC +++ base/trace_event/process_memory_dump.cc -@@ -118,7 +118,7 @@ std::optional<size_t> ProcessMemoryDump::CountResident +@@ -120,7 +120,7 @@ std::optional<size_t> ProcessMemoryDump::CountResident #if BUILDFLAG(IS_WIN) - std::unique_ptr<PSAPI_WORKING_SET_EX_INFORMATION[]> vec( - new PSAPI_WORKING_SET_EX_INFORMATION[max_vec_size]); + auto vec = + base::HeapArray<PSAPI_WORKING_SET_EX_INFORMATION>::WithSize(max_vec_size); -#elif BUILDFLAG(IS_APPLE) +#elif BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) - std::unique_ptr<char[]> vec(new char[max_vec_size]); + auto vec = base::HeapArray<char>::WithSize(max_vec_size); #elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA) - std::unique_ptr<unsigned char[]> vec(new unsigned char[max_vec_size]); -@@ -140,7 +140,7 @@ std::optional<size_t> ProcessMemoryDump::CountResident + auto vec = base::HeapArray<unsigned char>::WithSize(max_vec_size); +@@ -143,7 +143,7 @@ std::optional<size_t> ProcessMemoryDump::CountResident for (size_t i = 0; i < page_count; i++) resident_page_count += vec[i].VirtualAttributes.Valid; diff --git a/www/chromium/files/patch-build_config_clang_BUILD.gn b/www/chromium/files/patch-build_config_clang_BUILD.gn index b80b574e0b32..c2cbfd558bed 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-07-30 11:12:21 UTC +--- build/config/clang/BUILD.gn.orig 2024-08-26 12:06:38 UTC +++ build/config/clang/BUILD.gn -@@ -230,7 +230,7 @@ template("clang_lib") { +@@ -237,7 +237,7 @@ 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 73834c76367e..31cac82a30bc 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-07-30 11:12:21 UTC +--- build/config/compiler/BUILD.gn.orig 2024-08-26 16:04:29 UTC +++ build/config/compiler/BUILD.gn @@ -199,7 +199,7 @@ declare_args() { # This greatly reduces the size of debug builds, at the cost of @@ -27,7 +27,7 @@ } # compiler --------------------------------------------------------------------- -@@ -499,6 +502,10 @@ config("compiler") { +@@ -503,6 +506,10 @@ config("compiler") { } } @@ -38,16 +38,16 @@ # Linux-specific compiler flags setup. # ------------------------------------ if (use_icf && (!is_apple || use_lld)) { -@@ -552,7 +559,7 @@ config("compiler") { +@@ -556,7 +563,7 @@ config("compiler") { ldflags += [ "-Wl,-z,keep-text-section-prefix" ] } -- if (is_clang && !is_nacl && current_os != "zos") { -+ if (is_clang && !is_nacl && current_os != "zos" && !is_bsd) { +- if (is_clang && !is_nacl) { ++ if (is_clang && !is_nacl && !is_bsd) { cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ] if (save_reproducers_on_lld_crash && use_lld) { ldflags += [ -@@ -1195,7 +1202,7 @@ config("compiler_cpu_abi") { +@@ -1197,7 +1204,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" ] -@@ -1210,7 +1217,7 @@ config("compiler_cpu_abi") { +@@ -1212,7 +1219,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" ] -@@ -1545,7 +1552,7 @@ config("compiler_deterministic") { +@@ -1547,7 +1554,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,16 +74,16 @@ # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here. cflags += [ "-Xclang", -@@ -1597,7 +1604,7 @@ config("compiler_deterministic") { +@@ -1605,7 +1612,7 @@ config("compiler_deterministic") { } config("clang_revision") { -- if (is_clang && clang_base_path == default_clang_base_path) { -+ if (is_clang && !is_bsd && clang_base_path == default_clang_base_path) { +- if (is_clang && clang_base_path == default_clang_base_path && ++ if (is_clang && !is_bsd && clang_base_path == default_clang_base_path && + current_os != "zos") { update_args = [ "--print-revision", - "--verify-version=$clang_version", -@@ -1908,9 +1915,6 @@ config("default_warnings") { +@@ -1938,9 +1945,6 @@ config("default_warnings") { # TODO(crbug.com/40286317): Evaluate and possibly enable. "-Wno-vla-extension", @@ -93,7 +93,7 @@ ] cflags_cc += [ -@@ -1918,7 +1922,7 @@ config("default_warnings") { +@@ -1948,14 +1952,11 @@ config("default_warnings") { "-Wenum-compare-conditional", ] @@ -102,7 +102,14 @@ cflags_cc += [ # TODO(crbug.com/41486292): Fix and re-enable. "-Wno-c++11-narrowing-const-reference", -@@ -2640,7 +2644,7 @@ config("afdo_optimize_size") { + ] +- +- # TODO(crbug.com/344680447): Fix and re-enable. +- cflags_cc += [ "-Wno-missing-template-arg-list-after-template-kw" ] + } + } + +@@ -2676,7 +2677,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") { @@ -111,7 +118,7 @@ cflags = [] if (clang_emit_debug_info_for_profiling) { # Add the following flags to generate debug info for profiling. -@@ -2667,7 +2671,7 @@ config("afdo") { +@@ -2703,7 +2704,7 @@ config("afdo") { cflags += [ "-Wno-backend-plugin" ] inputs = [ _clang_sample_profile ] } @@ -120,13 +127,12 @@ cflags = [ "-fauto-profile=${auto_profile_path}" ] inputs = [ auto_profile_path ] } -@@ -2832,7 +2836,8 @@ config("symbols") { +@@ -2868,7 +2869,7 @@ config("symbols") { configs += [ "//build/config:compress_debug_sections" ] } -- if (is_clang && (!is_nacl || is_nacl_saigo) && current_os != "zos") { -+ if (is_clang && (!is_nacl || is_nacl_saigo) && current_os != "zos" && -+ !is_bsd) { +- if (is_clang && (!is_nacl || is_nacl_saigo)) { ++ if (is_clang && (!is_nacl || is_nacl_saigo) && !is_bsd) { if (is_apple) { # TODO(crbug.com/40117949): Investigate missing debug info on mac. # Make sure we don't use constructor homing on mac. diff --git a/www/chromium/files/patch-build_linux_unbundle_dav1d.gn b/www/chromium/files/patch-build_linux_unbundle_dav1d.gn deleted file mode 100644 index 523f5c878631..000000000000 --- a/www/chromium/files/patch-build_linux_unbundle_dav1d.gn +++ /dev/null @@ -1,25 +0,0 @@ ---- build/linux/unbundle/dav1d.gn.orig 2024-07-30 11:12:21 UTC -+++ build/linux/unbundle/dav1d.gn -@@ -1,11 +1,11 @@ - import("//build/config/linux/pkg_config.gni") - import("//build/shim_headers.gni") - --pkg_config("system_dav1d") { -+pkg_config("dav1d_config") { - packages = [ "dav1d" ] - } - --shim_headers("dav1d_shim") { -+shim_headers("dav1d_headers") { - root_path = "libdav1d/include" - headers = [ - "dav1d/common.h", -@@ -18,6 +18,6 @@ shim_headers("dav1d_shim") { - } - - source_set("dav1d") { -- deps = [ ":dav1d_shim" ] -- public_configs = [ ":system_dav1d" ] -+ deps = [ ":dav1d_headers" ] -+ public_configs = [ ":dav1d_config" ] - } diff --git a/www/chromium/files/patch-build_linux_unbundle_icu.gn b/www/chromium/files/patch-build_linux_unbundle_icu.gn index cdcc382c6ad5..58312ff8a70a 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-07-30 11:12:21 UTC +--- build/linux/unbundle/icu.gn.orig 2024-08-26 12:06:38 UTC +++ build/linux/unbundle/icu.gn @@ -17,6 +17,15 @@ config("icu_config") { "USING_SYSTEM_ICU=1", @@ -16,14 +16,3 @@ # U_EXPORT (defined in unicode/platform.h) is used to set public visibility # on classes through the U_COMMON_API and U_I18N_API macros (among others). # When linking against the system ICU library, we want its symbols to have -@@ -59,6 +68,10 @@ source_set("icuuc") { - ":icu_config", - ":system_icuuc", - ] -+} -+ -+group("icuuc_public") { -+ public_deps = [ ":icuuc" ] - } - - shim_headers("icui18n_shim") { diff --git a/www/chromium/files/patch-build_rust_rust__bindgen.gni b/www/chromium/files/patch-build_rust_rust__bindgen.gni index 41ce8114edd8..90a5d9c25aea 100644 --- a/www/chromium/files/patch-build_rust_rust__bindgen.gni +++ b/www/chromium/files/patch-build_rust_rust__bindgen.gni @@ -1,11 +1,11 @@ ---- build/rust/rust_bindgen.gni.orig 2024-07-30 19:22:51 UTC +--- build/rust/rust_bindgen.gni.orig 2024-08-26 12:06:38 UTC +++ build/rust/rust_bindgen.gni @@ -11,14 +11,14 @@ if (is_win) { import("//build/toolchain/win/win_toolchain_data.gni") } -_bindgen_path = "${rust_bindgen_root}/bin/bindgen" -+_bindgen_path = "${LOCALBASE}/bin/bindgen" ++_bindgen_path = "/usr/local/bin/bindgen" if (host_os == "win") { _bindgen_path = "${_bindgen_path}.exe" } @@ -13,7 +13,7 @@ # On Windows, the libclang.dll is beside the bindgen.exe, otherwise it is in # ../lib. -_libclang_path = rust_bindgen_root -+_libclang_path = "${LOCALBASE}/llvm${MODCLANG_VERSION}" ++_libclang_path = "/usr/local/llvm17" if (host_os == "win") { _libclang_path += "/bin" } else { diff --git a/www/chromium/files/patch-build_rust_std_BUILD.gn b/www/chromium/files/patch-build_rust_std_BUILD.gn index 0ca959a13e47..7e911bb556b0 100644 --- a/www/chromium/files/patch-build_rust_std_BUILD.gn +++ b/www/chromium/files/patch-build_rust_std_BUILD.gn @@ -1,6 +1,6 @@ ---- build/rust/std/BUILD.gn.orig 2024-03-22 08:19:40 UTC +--- build/rust/std/BUILD.gn.orig 2024-08-26 12:06:38 UTC +++ build/rust/std/BUILD.gn -@@ -90,7 +90,6 @@ if (toolchain_has_rust) { +@@ -100,7 +100,6 @@ if (toolchain_has_rust) { # don't need to pass to the C++ linker because they're used for specialized # purposes. skip_stdlib_files = [ diff --git a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni index 6fd7d35fbaeb..e1cdd7704fda 100644 --- a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni +++ b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni @@ -1,4 +1,4 @@ ---- build/toolchain/gcc_toolchain.gni.orig 2024-07-30 11:12:21 UTC +--- build/toolchain/gcc_toolchain.gni.orig 2024-08-26 12:06:38 UTC +++ build/toolchain/gcc_toolchain.gni @@ -56,6 +56,13 @@ if (enable_resource_allowlist_generation) { "enable_resource_allowlist_generation=true does not work for target_os=$target_os") @@ -14,7 +14,7 @@ # This template defines a toolchain for something that works like gcc # (including clang). # -@@ -864,22 +871,12 @@ template("gcc_toolchain") { +@@ -904,22 +911,12 @@ template("gcc_toolchain") { # actually just be doing a native compile. template("clang_toolchain") { gcc_toolchain(target_name) { diff --git a/www/chromium/files/patch-build_toolchain_toolchain.gni b/www/chromium/files/patch-build_toolchain_toolchain.gni index d4db1261df78..5b6fc0aeba42 100644 --- a/www/chromium/files/patch-build_toolchain_toolchain.gni +++ b/www/chromium/files/patch-build_toolchain_toolchain.gni @@ -1,10 +1,10 @@ ---- build/toolchain/toolchain.gni.orig 2024-03-22 08:19:40 UTC +--- build/toolchain/toolchain.gni.orig 2024-08-26 12:06:38 UTC +++ build/toolchain/toolchain.gni -@@ -68,7 +68,7 @@ if (host_os == "mac") { +@@ -72,7 +72,7 @@ if (host_os == "mac") { host_shlib_extension = ".dylib" } else if (host_os == "win") { host_shlib_extension = ".dll" --} else if (host_os == "linux" || host_os == "aix") { +-} else if (host_os == "linux" || host_os == "aix" || host_os == "zos") { +} else if (is_posix) { host_shlib_extension = ".so" } else { diff --git a/www/chromium/files/patch-cc_BUILD.gn b/www/chromium/files/patch-cc_BUILD.gn index 1345e84f9013..29a72c379dc6 100644 --- a/www/chromium/files/patch-cc_BUILD.gn +++ b/www/chromium/files/patch-cc_BUILD.gn @@ -1,6 +1,6 @@ ---- cc/BUILD.gn.orig 2024-07-30 11:12:21 UTC +--- cc/BUILD.gn.orig 2024-08-26 12:06:38 UTC +++ cc/BUILD.gn -@@ -686,7 +686,7 @@ cc_test_static_library("test_support") { +@@ -685,7 +685,7 @@ cc_test_static_library("test_support") { if (enable_vulkan) { deps += [ "//gpu/vulkan/init" ] } @@ -9,7 +9,7 @@ data_deps = [ "//third_party/mesa_headers" ] } if (skia_use_dawn) { -@@ -945,7 +945,6 @@ cc_test("cc_unittests") { +@@ -944,7 +944,6 @@ cc_test("cc_unittests") { data = [ "//components/test/data/viz/" ] data_deps = [ "//testing/buildbot/filters:cc_unittests_filters", diff --git a/www/chromium/files/patch-cc_base_features.cc b/www/chromium/files/patch-cc_base_features.cc index 7ec5e8082a7c..5387ad9f7b5f 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-07-30 11:12:21 UTC +--- cc/base/features.cc.orig 2024-08-26 12:06:38 UTC +++ cc/base/features.cc -@@ -86,7 +86,7 @@ BASE_FEATURE(kNormalPriorityImageDecoding, +@@ -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.cc b/www/chromium/files/patch-chrome_app_chrome__main.cc index cb1edb8de3a8..a5b5d144369e 100644 --- a/www/chromium/files/patch-chrome_app_chrome__main.cc +++ b/www/chromium/files/patch-chrome_app_chrome__main.cc @@ -1,6 +1,6 @@ ---- chrome/app/chrome_main.cc.orig 2024-03-22 08:19:40 UTC +--- chrome/app/chrome_main.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/app/chrome_main.cc -@@ -28,11 +28,11 @@ +@@ -30,11 +30,11 @@ #include "chrome/app/chrome_main_mac.h" #endif @@ -14,7 +14,16 @@ #include "chrome/app/chrome_main_linux.h" #endif -@@ -80,7 +80,7 @@ int ChromeMain(int argc, const char** argv) { +@@ -55,7 +55,7 @@ + #endif // BUILDFLAG(IS_WIN) + + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + #define ENABLE_OLD_HEADLESS + #endif + +@@ -119,7 +119,7 @@ int ChromeMain(int argc, const char** argv) { #error Unknown platform. #endif @@ -23,7 +32,7 @@ PossiblyDetermineFallbackChromeChannel(argv[0]); #endif -@@ -141,7 +141,7 @@ int ChromeMain(int argc, const char** argv) { +@@ -185,7 +185,7 @@ int ChromeMain(int argc, const char** argv) { SetUpBundleOverrides(); #endif @@ -32,12 +41,3 @@ AppendExtraArgumentsToCommandLine(command_line); #endif -@@ -170,7 +170,7 @@ int ChromeMain(int argc, const char** argv) { - headless_mode_handle = headless::InitHeadlessMode(); - } else { - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ -- BUILDFLAG(IS_WIN) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - if (headless::IsOldHeadlessMode()) { - #if BUILDFLAG(GOOGLE_CHROME_BRANDING) - command_line->AppendSwitch(::headless::switches::kEnableCrashReporter); 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 71912488f3a1..d4f0eb564f1c 100644 --- a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc +++ b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2024-07-30 11:12:21 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/app/chrome_main_delegate.cc -@@ -138,7 +138,7 @@ +@@ -139,7 +139,7 @@ #include "components/about_ui/credit_utils.h" #endif @@ -9,7 +9,7 @@ #include "components/nacl/common/nacl_paths.h" #include "components/nacl/zygote/nacl_fork_delegate_linux.h" #endif -@@ -182,21 +182,21 @@ +@@ -183,21 +183,21 @@ #include "v8/include/v8.h" #endif @@ -35,16 +35,7 @@ #include "chrome/browser/policy/policy_path_parser.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -243,7 +243,7 @@ - #include "base/scoped_add_feature_flags.h" - #include "ui/base/ui_base_features.h" - #include "ui/ozone/public/ozone_platform.h" --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "chrome/browser/chrome_browser_main_extra_parts_linux.h" - #endif - #endif // BUILDFLAG(IS_OZONE) -@@ -343,7 +343,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty +@@ -341,7 +341,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty // and resources loaded. bool SubprocessNeedsResourceBundle(const std::string& process_type) { return @@ -53,7 +44,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 +@@ -426,7 +426,7 @@ bool HandleVersionSwitches(const base::CommandLine& co // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -62,7 +53,7 @@ // 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() { +@@ -472,7 +472,7 @@ void SetCrashpadUploadConsentPostLogin() { } #endif // BUILDFLAG(IS_CHROMEOS_LACROS) @@ -71,7 +62,7 @@ void SIGTERMProfilingShutdown(int signal) { content::Profiling::Stop(); struct sigaction sigact; -@@ -556,7 +556,7 @@ std::optional<int> AcquireProcessSingleton( +@@ -554,7 +554,7 @@ std::optional<int> AcquireProcessSingleton( // process can be exited. ChromeProcessSingleton::CreateInstance(user_data_dir); @@ -80,7 +71,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_ +@@ -638,7 +638,7 @@ void InitializeUserDataDir(base::CommandLine* command_ std::string process_type = command_line->GetSwitchValueASCII(switches::kProcessType); @@ -89,7 +80,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. -@@ -767,7 +767,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat +@@ -768,7 +768,7 @@ void RecordMainStartupMetrics(const StartupTimestamps& #endif #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ @@ -98,7 +89,7 @@ // Record the startup process creation time on supported platforms. On Android // this is recorded in ChromeMainDelegateAndroid. startup_metric_utils::GetCommon().RecordStartupProcessCreationTime( -@@ -959,7 +959,7 @@ std::optional<int> ChromeMainDelegate::PostEarlyInitia +@@ -962,7 +962,7 @@ std::optional<int> ChromeMainDelegate::PostEarlyInitia #if BUILDFLAG(IS_OZONE) // Initialize Ozone platform and add required feature flags as per platform's // properties. @@ -107,7 +98,7 @@ ui::SetOzonePlatformForLinuxIfNeeded(*base::CommandLine::ForCurrentProcess()); #endif ui::OzonePlatform::PreEarlyInitialization(); -@@ -1154,7 +1154,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv +@@ -1160,7 +1160,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) || \ @@ -116,7 +107,7 @@ is_canary_dev; #else false; -@@ -1309,7 +1309,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom +@@ -1315,7 +1315,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom // TODO(crbug.com/40118868): Revisit the macro expression once build flag // switch of lacros-chrome is complete. @@ -125,7 +116,7 @@ // This will directly exit if the user asked for help. HandleHelpSwitches(command_line); #endif -@@ -1339,7 +1339,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom +@@ -1345,7 +1345,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom #if BUILDFLAG(IS_CHROMEOS) chromeos::dbus_paths::RegisterPathProvider(); #endif @@ -134,16 +125,23 @@ nacl::RegisterPathProvider(); #endif -@@ -1726,7 +1726,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1732,7 +1732,7 @@ void ChromeMainDelegate::PreSandboxStartup() { CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale; } -#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD) // Zygote needs to call InitCrashReporter() in RunZygote(). - if (process_type != switches::kZygoteProcess) { - if (command_line.HasSwitch(switches::kPreCrashpadCrashTest)) { -@@ -1827,7 +1827,7 @@ absl::variant<int, content::MainFunctionParams> Chrome + if (process_type != switches::kZygoteProcess && + !command_line.HasSwitch(switches::kDisableCrashpadForTesting)) { +@@ -1828,13 +1828,13 @@ absl::variant<int, content::MainFunctionParams> Chrome + #else + + #if BUILDFLAG(IS_MAC) || (BUILDFLAG(ENABLE_NACL) && !BUILDFLAG(IS_LINUX) && \ +- !BUILDFLAG(IS_CHROMEOS)) ++ !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD)) + static const MainFunction kMainFunctions[] = { + #if BUILDFLAG(IS_MAC) {switches::kRelauncherProcess, mac_relauncher::internal::RelauncherMain}, {switches::kCodeSignCloneCleanupProcess, code_sign_clone_manager::internal::ChromeCodeSignCloneCleanupMain}, diff --git a/www/chromium/files/patch-chrome_browser_BUILD.gn b/www/chromium/files/patch-chrome_browser_BUILD.gn index 7e857d6efd40..0b5dfbe19248 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-07-30 11:12:21 UTC +--- chrome/browser/BUILD.gn.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/BUILD.gn -@@ -6672,6 +6672,13 @@ static_library("browser") { +@@ -7013,6 +7013,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 651de21c0625..b2dd7931439b 100644 --- a/www/chromium/files/patch-chrome_browser_about__flags.cc +++ b/www/chromium/files/patch-chrome_browser_about__flags.cc @@ -1,4 +1,4 @@ ---- chrome/browser/about_flags.cc.orig 2024-08-14 11:02:58 UTC +--- chrome/browser/about_flags.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/about_flags.cc @@ -238,7 +238,7 @@ #include "ui/ui_features.h" @@ -27,7 +27,16 @@ #include "chrome/browser/enterprise/profile_management/profile_management_features.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -@@ -476,7 +476,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap +@@ -351,7 +351,7 @@ + #include "components/user_education/common/user_education_features.h" // nogncheck + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "chrome/browser/ui/ui_features.h" + #include "ui/base/ui_base_features.h" + #endif +@@ -493,7 +493,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap {"Max 3 Frames", &kDXGIWaitableSwapChain3Frames, 1, nullptr}}; #endif @@ -36,7 +45,7 @@ const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = { {flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""}, {flag_descriptions::kOzonePlatformHintChoiceAuto, -@@ -847,6 +847,26 @@ const FeatureEntry::FeatureVariation +@@ -893,6 +893,26 @@ const FeatureEntry::FeatureVariation std::size(kWebIdentityDigitalIdentityCredentialHighRiskDialogParam), nullptr}}; @@ -63,7 +72,7 @@ const FeatureEntry::FeatureParam kClipboardMaximumAge60Seconds[] = { {"UIClipboardMaximumAge", "60"}}; const FeatureEntry::FeatureParam kClipboardMaximumAge90Seconds[] = { -@@ -1260,7 +1280,7 @@ const FeatureEntry::FeatureVariation kPageContentAnnot +@@ -1306,7 +1326,7 @@ const FeatureEntry::FeatureVariation kPageContentAnnot }; #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -72,7 +81,7 @@ const FeatureEntry::FeatureParam kHistoryEmbeddingsAtKeywordAcceleration[]{ {"AtKeywordAcceleration", "true"}, }; -@@ -1323,7 +1343,7 @@ const FeatureEntry::FeatureVariation +@@ -1350,7 +1370,7 @@ const FeatureEntry::FeatureVariation }; #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -81,16 +90,16 @@ const FeatureEntry::FeatureParam kShortcutBoostSingleUrl[] = { {"ShortcutBoostSearchScore", "0"}, {"ShortcutBoostNonTopHitThreshold", "0"}, -@@ -3827,7 +3847,7 @@ const flags_ui::FeatureEntry::FeatureVariation - std::size(kParcelTrackingTestDataOutForDelivery), nullptr}, +@@ -3779,7 +3799,7 @@ const flags_ui::FeatureEntry::FeatureVariation }; --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - const flags_ui::FeatureEntry::FeatureParam - kDesktopPWAsLinkCapturingDefaultOn[] = {{"on_by_default", "true"}}; + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) const flags_ui::FeatureEntry::FeatureParam -@@ -4800,7 +4820,7 @@ const FeatureEntry kFeatureEntries[] = { + kDesktopPWAsLinkCapturingDefaultOn[] = { + {"link_capturing_state", "on_by_default"}}; +@@ -4858,7 +4878,7 @@ const FeatureEntry kFeatureEntries[] = { }, #endif // BUILDFLAG(IS_ANDROID) @@ -99,7 +108,7 @@ { "fluent-overlay-scrollbars", flag_descriptions::kFluentOverlayScrollbarsName, -@@ -5216,7 +5236,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5277,7 +5297,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kWebAppUniversalInstallDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kWebAppUniversalInstall)}, #endif // !BUILDFLAG(IS_ANDROID) @@ -108,7 +117,7 @@ {"shortcuts-not-apps", flag_descriptions::kShortcutsNotAppsName, flag_descriptions::kShortcutsNotAppsDescription, kOsMac | kOsWin | kOsLinux, -@@ -5348,7 +5368,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5413,7 +5433,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kWebShare)}, #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -117,10 +126,10 @@ {"pulseaudio-loopback-for-cast", flag_descriptions::kPulseaudioLoopbackForCastName, flag_descriptions::kPulseaudioLoopbackForCastDescription, kOsLinux, -@@ -5362,9 +5382,19 @@ const FeatureEntry kFeatureEntries[] = { - {"ozone-platform-hint", flag_descriptions::kOzonePlatformHintName, - flag_descriptions::kOzonePlatformHintDescription, kOsLinux, - MULTI_VALUE_TYPE(kOzonePlatformHintRuntimeChoices)}, +@@ -5436,9 +5456,19 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kWaylandPerWindowScalingName, + flag_descriptions::kWaylandPerWindowScalingDescription, kOsLinux, + FEATURE_VALUE_TYPE(features::kWaylandPerSurfaceScale)}, + +#if BUILDFLAG(IS_BSD) + {"audio-backend", @@ -138,8 +147,8 @@ {"skip-undecryptable-passwords", flag_descriptions::kSkipUndecryptablePasswordsName, flag_descriptions::kSkipUndecryptablePasswordsDescription, -@@ -6304,7 +6334,7 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(omnibox::kZeroSuggestInMemoryCaching)}, +@@ -6433,7 +6463,7 @@ const FeatureEntry kFeatureEntries[] = { + "MlUrlScoring")}, #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) @@ -147,7 +156,7 @@ {"omnibox-domain-suggestions", flag_descriptions::kOmniboxDomainSuggestionsName, flag_descriptions::kOmniboxDomainSuggestionsDescription, kOsDesktop, -@@ -6638,7 +6668,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6728,7 +6758,7 @@ const FeatureEntry kFeatureEntries[] = { "OrganicRepeatableQueries")}, #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -156,7 +165,7 @@ {"history-embeddings", flag_descriptions::kHistoryEmbeddingsName, flag_descriptions::kHistoryEmbeddingsDescription, kOsDesktop, FEATURE_WITH_PARAMS_VALUE_TYPE(history_embeddings::kHistoryEmbeddings, -@@ -7328,7 +7358,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7397,7 +7427,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(printing::features::kAddPrinterViaPrintscanmgr)}, #endif // BUILDFLAG(IS_CHROMEOS) @@ -165,7 +174,7 @@ {"cups-ipp-printing-backend", flag_descriptions::kCupsIppPrintingBackendName, flag_descriptions::kCupsIppPrintingBackendDescription, kOsDesktop, -@@ -8327,7 +8357,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8417,7 +8447,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kCooperativeSchedulingDescription, kOsAll, FEATURE_VALUE_TYPE(features::kCooperativeScheduling)}, @@ -174,7 +183,7 @@ {"enable-network-service-sandbox", flag_descriptions::kEnableNetworkServiceSandboxName, flag_descriptions::kEnableNetworkServiceSandboxDescription, -@@ -8351,7 +8381,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8441,7 +8471,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(media::kV4L2FlatStatefulVideoDecoder)}, #endif @@ -183,7 +192,7 @@ {"enable-family-link-extensions-permissions", flag_descriptions:: kEnableExtensionsPermissionsForSupervisedUsersOnDesktopName, -@@ -9213,7 +9243,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9292,7 +9322,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(ash::features::kWallpaperPerDesk)}, #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -192,7 +201,7 @@ {"enable-get-all-screens-media", flag_descriptions::kGetAllScreensMediaName, flag_descriptions::kGetAllScreensMediaDescription, kOsCrOS | kOsLacros | kOsLinux, -@@ -9252,7 +9282,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9331,7 +9361,7 @@ const FeatureEntry kFeatureEntries[] = { #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -201,7 +210,7 @@ { "ui-debug-tools", flag_descriptions::kUIDebugToolsName, -@@ -9494,7 +9524,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9556,7 +9586,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -210,7 +219,7 @@ {"policy-indication-for-managed-default-search", flag_descriptions::kPolicyIndicationForManagedDefaultSearchName, flag_descriptions::kPolicyIndicationForManagedDefaultSearchDescription, -@@ -9807,7 +9837,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9896,7 +9926,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -219,7 +228,7 @@ {"media-session-enter-picture-in-picture", flag_descriptions::kMediaSessionEnterPictureInPictureName, flag_descriptions::kMediaSessionEnterPictureInPictureDescription, -@@ -10702,7 +10732,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10796,7 +10826,7 @@ const FeatureEntry kFeatureEntries[] = { kOsDesktop | kOsAndroid, FEATURE_VALUE_TYPE(features::kProcessPerSiteUpToMainFrameThreshold)}, @@ -228,7 +237,7 @@ {"camera-mic-effects", flag_descriptions::kCameraMicEffectsName, flag_descriptions::kCameraMicEffectsDescription, static_cast<unsigned short>(kOsMac | kOsWin | kOsLinux), -@@ -10740,7 +10770,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10834,7 +10864,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kSiteInstanceGroupsForDataUrls)}, #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -237,7 +246,7 @@ {"site-search-settings-policy", flag_descriptions::kSiteSearchSettingsPolicyName, flag_descriptions::kSiteSearchSettingsPolicyDescription, kOsAll, -@@ -10864,7 +10894,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10959,7 +10989,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kHideIncognitoMediaMetadataDescription, kOsAll, FEATURE_VALUE_TYPE(media::kHideIncognitoMediaMetadata)}, @@ -246,7 +255,16 @@ {"third-party-profile-management", flag_descriptions::kThirdPartyProfileManagementName, flag_descriptions::kThirdPartyProfileManagementDescription, -@@ -11200,7 +11230,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -11002,7 +11032,7 @@ const FeatureEntry kFeatureEntries[] = { + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) + + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + {"enable-user-link-capturing-pwa", + flag_descriptions::kDesktopPWAsUserLinkCapturingName, + flag_descriptions::kDesktopPWAsUserLinkCapturingDescription, +@@ -11318,7 +11348,7 @@ const FeatureEntry kFeatureEntries[] = { trusted_vault::kTrustedVaultFrequentDegradedRecoverabilityPolling)}, #endif @@ -255,12 +273,21 @@ {"restart-to-gain-access-to-keychain", flag_descriptions::kRestartToGainAccessToKeychainName, flag_descriptions::kRestartToGainAccessToKeychainDescription, -@@ -11487,7 +11517,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -11981,7 +12011,7 @@ const FeatureEntry kFeatureEntries[] = { + kAuthenticateUsingUserConsentVerifierInteropApi)}, + #endif + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + {"sync-enable-bookmarks-in-transport-mode", + flag_descriptions::kSyncEnableBookmarksInTransportModeName, + flag_descriptions::kSyncEnableBookmarksInTransportModeDescription, +@@ -12007,7 +12037,7 @@ const FeatureEntry kFeatureEntries[] = { + "AutofillUploadCardRequestTimeout")}, - // Controls the view mode for (history) sync screen. - #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ -- BUILDFLAG(IS_ANDROID) -+ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - {"minor-mode-restrictions-for-history-sync-opt-in", - flag_descriptions::kMinorModeRestrictionsForHistorySyncOptInName, - flag_descriptions::kMinorModeRestrictionsForHistorySyncOptInDescription, + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + {"autofill-enable-amount-extraction-desktop", + flag_descriptions::kAutofillEnableAmountExtractionDesktopName, + flag_descriptions::kAutofillEnableAmountExtractionDesktopDescription, diff --git a/www/chromium/files/patch-chrome_browser_accessibility_page__colors.cc b/www/chromium/files/patch-chrome_browser_accessibility_page__colors.cc new file mode 100644 index 000000000000..8f5326a830d9 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_accessibility_page__colors.cc @@ -0,0 +1,20 @@ +--- chrome/browser/accessibility/page_colors.cc.orig 2024-08-26 12:06:38 UTC ++++ chrome/browser/accessibility/page_colors.cc +@@ -12,7 +12,7 @@ + #include "components/sync_preferences/pref_service_syncable.h" + #include "ui/native_theme/native_theme.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "ui/linux/linux_ui.h" + #include "ui/linux/linux_ui_factory.h" + #endif // BUILDFLAG(IS_LINUX) +@@ -55,7 +55,7 @@ void PageColors::Init() { + + void PageColors::OnPageColorsChanged() { + auto* native_theme = ui::NativeTheme::GetInstanceForNativeUi(); +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Allow the Linux native theme to update its state for page colors. + if (auto* linux_ui_theme = ui::GetDefaultLinuxUiTheme()) { + if (auto* linux_native_theme = linux_ui_theme->GetNativeTheme()) { diff --git a/www/chromium/files/patch-chrome_browser_browser__features.cc b/www/chromium/files/patch-chrome_browser_browser__features.cc index 534d274abda4..34f7561d267a 100644 --- a/www/chromium/files/patch-chrome_browser_browser__features.cc +++ b/www/chromium/files/patch-chrome_browser_browser__features.cc @@ -1,6 +1,6 @@ ---- chrome/browser/browser_features.cc.orig 2024-07-30 11:12:21 UTC +--- chrome/browser/browser_features.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/browser_features.cc -@@ -61,7 +61,7 @@ BASE_FEATURE(kClosedTabCache, +@@ -69,7 +69,7 @@ BASE_FEATURE(kClosedTabCache, BASE_FEATURE(kDestroyProfileOnBrowserClose, "DestroyProfileOnBrowserClose", #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -9,7 +9,7 @@ base::FEATURE_ENABLED_BY_DEFAULT); #else base::FEATURE_DISABLED_BY_DEFAULT); -@@ -330,7 +330,7 @@ BASE_FEATURE(kSandboxExternalProtocolBlockedWarning, +@@ -316,7 +316,7 @@ BASE_FEATURE(kSandboxExternalProtocolBlockedWarning, BASE_FEATURE(kSupportSearchSuggestionForPrerender2, "SupportSearchSuggestionForPrerender2", #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ 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 6e397cc01925..7791628b81cb 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-07-30 11:12:21 UTC +--- chrome/browser/browser_process_impl.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/browser_process_impl.cc -@@ -228,7 +228,7 @@ +@@ -227,7 +227,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 -@@ -1282,7 +1282,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { +@@ -1277,7 +1277,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { ApplyMetricsReportingPolicy(); 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 new file mode 100644 index 000000000000..49d6d0be4398 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__field__trials.cc @@ -0,0 +1,20 @@ +--- chrome/browser/chrome_browser_field_trials.cc.orig 2024-08-26 12:06:38 UTC ++++ chrome/browser/chrome_browser_field_trials.cc +@@ -48,7 +48,7 @@ + #include "chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_trial.h" + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "base/nix/xdg_util.h" + #include "ui/base/ui_base_features.h" + #endif // BUILDFLAG(IS_LINUX) +@@ -155,7 +155,7 @@ void ChromeBrowserFieldTrials::RegisterSyntheticTrials + #endif + } + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // On Linux/Desktop platform variants, such as ozone/wayland, some features + // might need to be disabled as per OzonePlatform's runtime properties. + // OzonePlatform selection and initialization, in turn, depend on Chrome flags 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 new file mode 100644 index 000000000000..d6beb8cbeffc --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__field__trials.h @@ -0,0 +1,11 @@ +--- chrome/browser/chrome_browser_field_trials.h.orig 2024-08-26 12:06:38 UTC ++++ chrome/browser/chrome_browser_field_trials.h +@@ -34,7 +34,7 @@ class ChromeBrowserFieldTrials : public variations::Pl + const variations::EntropyProviders& entropy_providers, + base::FeatureList* feature_list) override; + void RegisterSyntheticTrials() override; +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void RegisterFeatureOverrides(base::FeatureList* feature_list) override; + #endif + 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 c434c54befb7..a5dc410546fe 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-07-30 11:12:21 UTC +--- chrome/browser/chrome_browser_interface_binders.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/chrome_browser_interface_binders.cc -@@ -134,12 +134,12 @@ +@@ -133,12 +133,12 @@ #endif // BUILDFLAG(FULL_SAFE_BROWSING) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -15,7 +15,7 @@ #include "chrome/browser/ui/webui/app_settings/web_app_settings_ui.h" #include "ui/webui/resources/cr_components/app_management/app_management.mojom.h" #endif -@@ -230,7 +230,7 @@ +@@ -226,7 +226,7 @@ #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -24,7 +24,7 @@ #include "chrome/browser/companion/visual_query/visual_query_suggestions_service_factory.h" #include "chrome/browser/ui/web_applications/sub_apps_service_impl.h" #include "chrome/browser/ui/webui/discards/discards.mojom.h" -@@ -241,7 +241,7 @@ +@@ -237,7 +237,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) -@@ -865,7 +865,7 @@ void BindScreen2xMainContentExtractor( +@@ -864,7 +864,7 @@ void BindScreen2xMainContentExtractor( #endif #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -42,7 +42,7 @@ void BindVisualSuggestionsModelProvider( content::RenderFrameHost* frame_host, mojo::PendingReceiver< -@@ -1061,7 +1061,7 @@ void PopulateChromeFrameBinders( +@@ -1060,7 +1060,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 -@@ -1152,7 +1152,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -1158,7 +1158,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); -@@ -1163,7 +1163,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -1169,7 +1169,7 @@ void PopulateChromeWebUIFrameBinders( policy::DlpInternalsUI>(map); #endif @@ -69,7 +69,7 @@ RegisterWebUIControllerInterfaceBinder< app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map); #endif -@@ -1256,7 +1256,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -1261,7 +1261,7 @@ void PopulateChromeWebUIFrameBinders( RegisterWebUIControllerInterfaceBinder< browser_command::mojom::CommandHandlerFactory, @@ -78,7 +78,7 @@ WhatsNewUI, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) NewTabPageUI>(map); -@@ -1797,7 +1797,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -1753,7 +1753,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 cf3611b0cbe1..c77d5a4af3e8 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_main.cc.orig 2024-07-30 11:12:21 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/chrome_browser_main.cc -@@ -247,15 +247,15 @@ +@@ -251,15 +251,15 @@ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -19,7 +19,7 @@ #include "base/nix/xdg_util.h" #endif -@@ -288,14 +288,14 @@ +@@ -292,14 +292,14 @@ // 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) || \ @@ -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" -@@ -367,14 +367,14 @@ +@@ -371,14 +371,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"); -@@ -539,7 +539,7 @@ void ProcessSingletonNotificationCallbackImpl( +@@ -543,7 +543,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. -@@ -1101,7 +1101,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1109,7 +1109,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 . -@@ -1149,7 +1149,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1157,7 +1157,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( -@@ -1336,7 +1336,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* +@@ -1344,7 +1344,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( -@@ -1385,7 +1385,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* +@@ -1393,7 +1393,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* *UrlLanguageHistogramFactory::GetForBrowserContext(profile)); #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -98,7 +98,7 @@ if (headless::IsHeadlessMode()) { headless::ReportHeadlessActionMetrics(); } -@@ -1495,7 +1495,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl( +@@ -1505,7 +1505,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(); } -@@ -2046,7 +2046,7 @@ bool ChromeBrowserMainParts::ProcessSingletonNotificat +@@ -2056,7 +2056,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 82c435ff265e..ec68e77c297e 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-06-17 12:56:06 UTC +--- chrome/browser/chrome_browser_main_linux.cc.orig 2024-08-26 12:06:38 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 -@@ -72,7 +72,9 @@ void ChromeBrowserMainPartsLinux::PostCreateMainMessag +@@ -84,7 +84,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 -@@ -98,7 +100,7 @@ void ChromeBrowserMainPartsLinux::PostCreateMainMessag +@@ -110,7 +112,7 @@ void ChromeBrowserMainPartsLinux::PostCreateMainMessag ChromeBrowserMainPartsPosix::PostCreateMainMessageLoop(); } @@ -28,8 +28,8 @@ void ChromeBrowserMainPartsLinux::PostMainMessageLoopRun() { ChromeBrowserMainPartsPosix::PostMainMessageLoopRun(); ui::OzonePlatform::GetInstance()->PostMainMessageLoopRun(); -@@ -137,7 +139,7 @@ void ChromeBrowserMainPartsLinux::PostBrowserStart() { - #endif // defined(USE_DBUS) && !BUILDFLAG(IS_CHROMEOS) +@@ -169,7 +171,7 @@ void ChromeBrowserMainPartsLinux::CheckIfSanitizeCompl + #endif // BUILDFLAG(IS_CHROMEOS_ASH) 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 10a73c517cf8..002a2473139c 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-07-30 11:12:21 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -469,7 +469,7 @@ +@@ -477,7 +477,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) -@@ -585,12 +585,12 @@ +@@ -593,12 +593,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 -@@ -601,7 +601,7 @@ +@@ -609,7 +609,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" -@@ -609,7 +609,7 @@ +@@ -617,7 +617,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) -@@ -624,7 +624,7 @@ +@@ -632,7 +632,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" -@@ -1538,7 +1538,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) -@@ -1669,7 +1669,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1772,7 +1772,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) -@@ -1703,7 +1703,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1806,7 +1806,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 -@@ -1724,7 +1724,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1827,7 +1827,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>()); -@@ -1743,7 +1743,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1846,7 +1846,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo chrome::AddMetricsExtraParts(main_parts.get()); @@ -96,7 +96,7 @@ main_parts->AddParts( std::make_unique< chrome::enterprise_util::ChromeBrowserMainExtraPartsEnterprise>()); -@@ -2577,7 +2577,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2708,7 +2708,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin client_info->client_id); } #elif BUILDFLAG(IS_POSIX) @@ -105,7 +105,7 @@ pid_t pid; if (crash_reporter::GetHandlerSocket(nullptr, &pid)) { command_line->AppendSwitchASCII( -@@ -2923,7 +2923,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -3060,7 +3060,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin } } @@ -114,7 +114,7 @@ // Opt into a hardened stack canary mitigation if it hasn't already been // force-disabled. if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) { -@@ -4698,7 +4698,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst +@@ -4888,7 +4888,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst } } @@ -123,7 +123,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -5266,7 +5266,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5479,7 +5479,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati &throttles); } @@ -132,7 +132,7 @@ MaybeAddThrottle( WebAppSettingsNavigationThrottle::MaybeCreateThrottleFor(handle), &throttles); -@@ -5280,7 +5280,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5493,7 +5493,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -141,7 +141,7 @@ MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle:: MaybeCreateThrottleFor(handle), &throttles); -@@ -5319,7 +5319,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5532,7 +5532,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati handle)); } @@ -150,7 +150,7 @@ MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle:: MaybeCreateThrottleFor(handle), &throttles); -@@ -7292,7 +7292,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS +@@ -7442,7 +7442,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 9f3282de5b4c..ec12c1f9c76d 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-07-30 11:12:21 UTC +--- chrome/browser/chrome_content_browser_client.h.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/chrome_content_browser_client.h -@@ -513,7 +513,7 @@ class ChromeContentBrowserClient : public content::Con +@@ -523,7 +523,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_download_chrome__download__manager__delegate.cc b/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc index 715ec94e405b..060456a2e260 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-07-30 11:12:21 UTC +--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/download/chrome_download_manager_delegate.cc -@@ -1729,7 +1729,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1753,7 +1753,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(); } -@@ -1875,7 +1875,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow +@@ -1901,7 +1901,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()) { -@@ -1939,7 +1939,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl +@@ -1979,7 +1979,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 7b087caa67cb..b1b1359e418d 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-07-30 11:12:21 UTC +--- chrome/browser/download/download_item_model.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/download/download_item_model.cc -@@ -799,7 +799,7 @@ bool DownloadItemModel::IsCommandChecked( +@@ -814,7 +814,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(); -@@ -847,7 +847,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand +@@ -862,7 +862,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); -@@ -1245,7 +1245,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe +@@ -1260,7 +1260,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe return; } diff --git a/www/chromium/files/patch-chrome_browser_enterprise_browser__management_browser__management__service.cc b/www/chromium/files/patch-chrome_browser_enterprise_browser__management_browser__management__service.cc deleted file mode 100644 index bef6889d4a8e..000000000000 --- a/www/chromium/files/patch-chrome_browser_enterprise_browser__management_browser__management__service.cc +++ /dev/null @@ -1,29 +0,0 @@ ---- chrome/browser/enterprise/browser_management/browser_management_service.cc.orig 2024-04-19 13:02:56 UTC -+++ chrome/browser/enterprise/browser_management/browser_management_service.cc -@@ -21,7 +21,7 @@ namespace policy { - - namespace { - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - void UpdateEnterpriseLogo( - Profile* profile, - base::OnceCallback<void(const gfx::Image&, -@@ -98,7 +98,7 @@ GetManagementStatusProviders(Profile* profile) { - } // namespace - - BrowserManagementMetadata::BrowserManagementMetadata(Profile* profile) { --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - UpdateManagementLogo(profile); - pref_change_registrar_.Init(profile->GetPrefs()); - pref_change_registrar_.Add( -@@ -114,7 +114,7 @@ const gfx::Image& BrowserManagementMetadata::GetManage - return management_logo_; - } - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - void BrowserManagementMetadata::UpdateManagementLogo(Profile* profile) { - UpdateEnterpriseLogo( - profile, base::BindOnce(&BrowserManagementMetadata::SetManagementLogo, diff --git a/www/chromium/files/patch-chrome_browser_enterprise_browser__management_browser__management__service.h b/www/chromium/files/patch-chrome_browser_enterprise_browser__management_browser__management__service.h deleted file mode 100644 index 65bb8b408533..000000000000 --- a/www/chromium/files/patch-chrome_browser_enterprise_browser__management_browser__management__service.h +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/enterprise/browser_management/browser_management_service.h.orig 2024-04-19 13:02:56 UTC -+++ chrome/browser/enterprise/browser_management/browser_management_service.h -@@ -28,7 +28,7 @@ class BrowserManagementMetadata { - - const gfx::Image& GetManagementLogo() const; - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - private: - void UpdateManagementLogo(Profile* profile); - void SetManagementLogo( 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 7824c73a72c6..d091fdf3c06c 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-07-30 11:12:21 UTC +--- chrome/browser/enterprise/connectors/connectors_service.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/enterprise/connectors/connectors_service.cc -@@ -568,7 +568,7 @@ bool ConnectorsService::ConnectorsEnabled() const { +@@ -570,7 +570,7 @@ bool ConnectorsService::ConnectorsEnabled() const { Profile* profile = Profile::FromBrowserContext(context_); diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc index f0e0ac80b052..150a80908e89 100644 --- a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc +++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc @@ -1,4 +1,4 @@ ---- chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc.orig 2023-12-10 06:10:27 UTC +--- chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc @@ -10,7 +10,7 @@ #include "chrome/browser/profiles/profile.h" @@ -18,7 +18,7 @@ return true; #else return false; -@@ -79,7 +79,7 @@ DeviceTrustConnectorServiceFactory::BuildServiceInstan +@@ -84,7 +84,7 @@ DeviceTrustConnectorServiceFactory::BuildServiceInstan std::unique_ptr<DeviceTrustConnectorService> service = std::make_unique<DeviceTrustConnectorService>(profile->GetPrefs()); diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc index 796dbd31bf2c..3da5269bf06a 100644 --- a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc +++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc @@ -1,4 +1,4 @@ ---- chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc.orig 2024-06-17 12:56:06 UTC +--- chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc @@ -23,7 +23,7 @@ #include "components/policy/core/common/management/management_service.h" @@ -18,7 +18,7 @@ policy::CloudPolicyStore* GetUserCloudPolicyStore(Profile* profile) { policy::CloudPolicyManager* user_policy_manager = profile->GetCloudPolicyManager(); -@@ -101,7 +101,7 @@ DeviceTrustServiceFactory::DeviceTrustServiceFactory() +@@ -106,7 +106,7 @@ DeviceTrustServiceFactory::DeviceTrustServiceFactory() DependsOn(DeviceTrustConnectorServiceFactory::GetInstance()); DependsOn(policy::ManagementServiceFactory::GetInstance()); diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc index 93836ab0884c..f706ed4d94a8 100644 --- a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc +++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc @@ -1,4 +1,4 @@ ---- chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc.orig 2023-08-17 07:33:31 UTC +--- chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc @@ -21,7 +21,7 @@ #include "chrome/browser/profiles/profile.h" @@ -8,7 +8,7 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) #include "base/check.h" #include "chrome/browser/enterprise/connectors/device_trust/signals/decorators/browser/browser_signals_decorator.h" - #include "chrome/browser/enterprise/connectors/device_trust/signals/dependency_factory.h" + #include "chrome/browser/enterprise/core/dependency_factory_impl.h" @@ -58,7 +58,7 @@ std::unique_ptr<SignalsService> CreateSignalsService(P enterprise_signals::ContextInfoFetcher::CreateInstance( profile, ConnectorsServiceFactory::GetForBrowserContext(profile)))); diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc b/www/chromium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc index 807671888d97..a0dce50c23cf 100644 --- a/www/chromium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc +++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc @@ -1,6 +1,6 @@ ---- chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.cc.orig 2024-06-17 12:56:06 UTC +--- chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.cc -@@ -11,7 +11,7 @@ namespace enterprise_connectors { +@@ -13,7 +13,7 @@ namespace enterprise_connectors { BrowserCrashEventRouter::BrowserCrashEventRouter( content::BrowserContext* context) { @@ -9,7 +9,7 @@ CrashReportingContext* crash_reporting_context = CrashReportingContext::GetInstance(); Profile* profile = Profile::FromBrowserContext(context); -@@ -21,7 +21,7 @@ BrowserCrashEventRouter::BrowserCrashEventRouter( +@@ -23,7 +23,7 @@ BrowserCrashEventRouter::BrowserCrashEventRouter( } BrowserCrashEventRouter::~BrowserCrashEventRouter() { diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_reporting_crash__reporting__context.cc b/www/chromium/files/patch-chrome_browser_enterprise_connectors_reporting_crash__reporting__context.cc index e4d80ab76388..e78240a538de 100644 --- a/www/chromium/files/patch-chrome_browser_enterprise_connectors_reporting_crash__reporting__context.cc +++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_reporting_crash__reporting__context.cc @@ -1,6 +1,6 @@ ---- chrome/browser/enterprise/connectors/reporting/crash_reporting_context.cc.orig 2024-06-17 12:56:06 UTC +--- chrome/browser/enterprise/connectors/reporting/crash_reporting_context.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/enterprise/connectors/reporting/crash_reporting_context.cc -@@ -18,7 +18,7 @@ +@@ -19,7 +19,7 @@ namespace enterprise_connectors { diff --git a/www/chromium/files/patch-chrome_browser_enterprise_signin_enterprise__signin__service.h b/www/chromium/files/patch-chrome_browser_enterprise_signin_enterprise__signin__service.h new file mode 100644 index 000000000000..3d1947147df1 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_enterprise_signin_enterprise__signin__service.h @@ -0,0 +1,11 @@ +--- chrome/browser/enterprise/signin/enterprise_signin_service.h.orig 2024-08-26 12:06:38 UTC ++++ chrome/browser/enterprise/signin/enterprise_signin_service.h +@@ -9,7 +9,7 @@ + + #include "build/build_config.h" + +-#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)) ++#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)) + #error EnterpriseSigninService should only be built on desktop platforms. + #endif // !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)) + diff --git a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn index f6d44c8b18da..a0b551a744ce 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-07-30 11:12:21 UTC +--- chrome/browser/extensions/BUILD.gn.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/extensions/BUILD.gn -@@ -1415,6 +1415,10 @@ source_set("extensions") { +@@ -1513,6 +1513,10 @@ source_set("extensions") { deps += [ "//chrome/services/printing/public/mojom" ] } diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_management_chrome__management__api__delegate.cc b/www/chromium/files/patch-chrome_browser_extensions_api_management_chrome__management__api__delegate.cc index b6464978e6f0..75dde6dc3a46 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_management_chrome__management__api__delegate.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_management_chrome__management__api__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/management/chrome_management_api_delegate.cc.orig 2024-07-30 11:12:21 UTC +--- chrome/browser/extensions/api/management/chrome_management_api_delegate.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/extensions/api/management/chrome_management_api_delegate.cc -@@ -414,7 +414,7 @@ bool ChromeManagementAPIDelegate::LaunchAppFunctionDel +@@ -417,7 +417,7 @@ bool ChromeManagementAPIDelegate::LaunchAppFunctionDel apps::LaunchContainer launch_container = GetLaunchContainer(extensions::ExtensionPrefs::Get(context), extension); Profile* profile = Profile::FromBrowserContext(context); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_messaging_native__process__launcher__posix.cc b/www/chromium/files/patch-chrome_browser_extensions_api_messaging_launch__context__posix.cc index 31031631739b..99adccb3f79c 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_messaging_native__process__launcher__posix.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_messaging_launch__context__posix.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/messaging/native_process_launcher_posix.cc.orig 2024-06-22 08:49:42 UTC -+++ chrome/browser/extensions/api/messaging/native_process_launcher_posix.cc -@@ -84,7 +84,7 @@ bool NativeProcessLauncher::LaunchNativeProcess( +--- 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 +@@ -86,7 +86,7 @@ std::optional<LaunchContext::ProcessState> LaunchConte // 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_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 15d4b175f352..2e3b1942727d 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-07-30 11:12:21 UTC +--- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc -@@ -611,7 +611,7 @@ void PasswordsPrivateDelegateImpl::OnFetchingFamilyMem +@@ -630,7 +630,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 0854ac85afda..265baef24ab3 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-07-30 11:12:21 UTC +--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -202,7 +202,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -205,7 +205,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist (*s_allowlist)[tab_groups::prefs::kAutoPinNewTabGroups] = settings_api::PrefType::kBoolean; @@ -9,9 +9,9 @@ (*s_allowlist)[::prefs::kUseCustomChromeFrame] = settings_api::PrefType::kBoolean; #endif -@@ -213,7 +213,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist - // Appearance settings. +@@ -217,7 +217,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; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) 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 cb039ab9261d..d5b571c92afa 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-07-30 11:12:21 UTC +--- chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/extensions/api/webstore_private/webstore_private_api.cc -@@ -907,7 +907,7 @@ void WebstorePrivateBeginInstallWithManifest3Function: +@@ -910,7 +910,7 @@ void WebstorePrivateBeginInstallWithManifest3Function: #if BUILDFLAG(IS_CHROMEOS) RequestExtensionApproval(contents); return; diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc index 0e3a8a5390c1..386efd4d6051 100644 --- a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc +++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc @@ -1,6 +1,24 @@ ---- chrome/browser/flag_descriptions.cc.orig 2024-08-14 11:02:58 UTC +--- chrome/browser/flag_descriptions.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/flag_descriptions.cc -@@ -2969,7 +2969,7 @@ const char kCbdTimeframeRequiredDescription[] = +@@ -419,7 +419,7 @@ const char kIsolatedSandboxedIframesDescription[] = + "grouping when enabled is per-site."; + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + const char kAutofillEnableAmountExtractionDesktopName[] = + "Enable checkout amount extraction on Chrome desktop"; + const char kAutofillEnableAmountExtractionDesktopDescription[] = +@@ -856,7 +856,7 @@ const char kDevicePostureDescription[] = + "Enables Device Posture API (foldable devices)"; + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + const char kDocumentPictureInPictureAnimateResizeName[] = + "Document Picture-in-Picture Animate Resize"; + const char kDocumentPictureInPictureAnimateResizeDescription[] = +@@ -3050,7 +3050,7 @@ const char kCbdTimeframeRequiredDescription[] = "value to the list."; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +27,7 @@ const char kPolicyIndicationForManagedDefaultSearchName[] = "Enable policy indication for managed Default Search provider"; const char kPolicyIndicationForManagedDefaultSearchDescription[] = -@@ -3287,7 +3287,7 @@ const char kShowAutofillTypePredictionsDescription[] = +@@ -3385,7 +3385,7 @@ const char kShowAutofillTypePredictionsDescription[] = "text."; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -18,7 +36,7 @@ const char kShowFeaturedEnterpriseSiteSearchName[] = "Show featured Enterprise site search engines in Omnibox"; const char kShowFeaturedEnterpriseSiteSearchDescription[] = -@@ -3324,7 +3324,7 @@ const char kSiteInstanceGroupsForDataUrlsDescription[] +@@ -3422,7 +3422,7 @@ const char kSiteInstanceGroupsForDataUrlsDescription[] "but in the same SiteInstanceGroup, and thus the same process."; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -27,7 +45,7 @@ const char kSiteSearchSettingsPolicyName[] = "Enable SiteSearchSettings policy"; const char kSiteSearchSettingsPolicyDescription[] = "Allow site search engines to be defined by the SiteSearchSettings policy."; -@@ -7725,7 +7725,7 @@ const char kLacrosMergeIcuDataFileDescription[] = +@@ -7869,7 +7869,7 @@ const char kLacrosMergeIcuDataFileDescription[] = "Enables sharing common areas of icudtl.dat between Ash and Lacros."; #endif // #if BUILDFLAG(IS_CHROMEOS_LACROS) @@ -36,7 +54,7 @@ const char kGetAllScreensMediaName[] = "GetAllScreensMedia API"; const char kGetAllScreensMediaDescription[] = "When enabled, the getAllScreensMedia API for capturing multiple screens " -@@ -7976,7 +7976,7 @@ const char kV4L2FlatStatefulVideoDecoderDescription[] +@@ -8126,7 +8126,7 @@ const char kV4L2FlatStatefulVideoDecoderDescription[] // Linux ----------------------------------------------------------------------- @@ -45,10 +63,11 @@ const char kOzonePlatformHintChoiceDefault[] = "Default"; const char kOzonePlatformHintChoiceAuto[] = "Auto"; const char kOzonePlatformHintChoiceX11[] = "X11"; -@@ -7998,6 +7998,17 @@ const char kPulseaudioLoopbackForScreenShareName[] = - const char kPulseaudioLoopbackForScreenShareDescription[] = - "Enable system audio sharing when screen sharing on Linux with pulseaudio."; - +@@ -8156,6 +8156,18 @@ const char kSimplifiedTabDragUIDescription[] = + const char kWaylandPerWindowScalingName[] = "Wayland per-window scaling"; + const char kWaylandPerWindowScalingDescription[] = + "Enable Wayland's per-window scaling experimental support."; ++ +#if BUILDFLAG(IS_BSD) +const char kAudioBackendName[] = + "Audio Backend"; @@ -63,7 +82,7 @@ #endif // BUILDFLAG(IS_LINUX) // All views-based platforms -------------------------------------------------- -@@ -8024,14 +8035,14 @@ const char kZeroCopyVideoCaptureDescription[] = +@@ -8182,14 +8194,14 @@ const char kZeroCopyVideoCaptureDescription[] = #endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -80,7 +99,7 @@ const char kEnableNetworkServiceSandboxName[] = "Enable the network service sandbox."; const char kEnableNetworkServiceSandboxDescription[] = -@@ -8063,7 +8074,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti +@@ -8221,7 +8233,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti "Bluetooth"; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) @@ -89,7 +108,7 @@ const char kSkipUndecryptablePasswordsName[] = "Skip undecryptable passwords to use the available decryptable " "passwords."; -@@ -8213,7 +8224,7 @@ const char kElementCaptureDescription[] = +@@ -8375,7 +8387,7 @@ const char kElementCaptureDescription[] = #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -98,8 +117,8 @@ const char kUIDebugToolsName[] = "Debugging tools for UI"; const char kUIDebugToolsDescription[] = "Enables additional keyboard shortcuts to help debugging."; -@@ -8280,7 +8291,7 @@ const char kComposePoliteNudgeDescription[] = - "available to interact with."; +@@ -8449,7 +8461,7 @@ const char kAutofillCaretExtractionDescription[] = + "Enables passing caret position via Autofill"; #endif // BUILDFLAG(ENABLE_COMPOSE) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.h b/www/chromium/files/patch-chrome_browser_flag__descriptions.h index ff4548181489..3fe7a2990b86 100644 --- a/www/chromium/files/patch-chrome_browser_flag__descriptions.h +++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.h @@ -1,6 +1,24 @@ ---- chrome/browser/flag_descriptions.h.orig 2024-08-14 11:02:58 UTC +--- chrome/browser/flag_descriptions.h.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/flag_descriptions.h -@@ -1722,7 +1722,7 @@ extern const char kCbdTimeframeRequiredName[]; +@@ -273,7 +273,7 @@ extern const char kImageDescriptionsAlternateRoutingNa + extern const char kImageDescriptionsAlternateRoutingDescription[]; + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + extern const char kAutofillEnableAmountExtractionDesktopName[]; + extern const char kAutofillEnableAmountExtractionDesktopDescription[]; + #endif +@@ -660,7 +660,7 @@ extern const char kDevicePostureName[]; + extern const char kDevicePostureDescription[]; + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + extern const char kDocumentPictureInPictureAnimateResizeName[]; + extern const char kDocumentPictureInPictureAnimateResizeDescription[]; + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || +@@ -1764,7 +1764,7 @@ extern const char kCbdTimeframeRequiredName[]; extern const char kCbdTimeframeRequiredDescription[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +27,7 @@ extern const char kPolicyIndicationForManagedDefaultSearchName[]; extern const char kPolicyIndicationForManagedDefaultSearchDescription[]; #endif -@@ -1906,7 +1906,7 @@ extern const char kShowAutofillTypePredictionsName[]; +@@ -1958,7 +1958,7 @@ extern const char kShowAutofillTypePredictionsName[]; extern const char kShowAutofillTypePredictionsDescription[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -18,7 +36,7 @@ extern const char kShowFeaturedEnterpriseSiteSearchName[]; extern const char kShowFeaturedEnterpriseSiteSearchDescription[]; -@@ -1928,7 +1928,7 @@ extern const char kSiteInstanceGroupsForDataUrlsName[] +@@ -1980,7 +1980,7 @@ extern const char kSiteInstanceGroupsForDataUrlsName[] extern const char kSiteInstanceGroupsForDataUrlsDescription[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -26,8 +44,8 @@ + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) extern const char kSiteSearchSettingsPolicyName[]; extern const char kSiteSearchSettingsPolicyDescription[]; - #endif -@@ -4487,7 +4487,7 @@ extern const char kLacrosMergeIcuDataFileName[]; + +@@ -4557,7 +4557,7 @@ extern const char kLacrosMergeIcuDataFileName[]; extern const char kLacrosMergeIcuDataFileDescription[]; #endif // #if BUILDFLAG(IS_CHROMEOS_LACROS) @@ -36,7 +54,7 @@ extern const char kGetAllScreensMediaName[]; extern const char kGetAllScreensMediaDescription[]; #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -4633,7 +4633,7 @@ extern const char kV4L2FlatStatefulVideoDecoderDescrip +@@ -4705,7 +4705,7 @@ extern const char kV4L2FlatStatefulVideoDecoderDescrip // Linux --------------------------------------------------------------------- @@ -45,17 +63,17 @@ extern const char kOzonePlatformHintChoiceDefault[]; extern const char kOzonePlatformHintChoiceAuto[]; extern const char kOzonePlatformHintChoiceX11[]; -@@ -4646,6 +4646,9 @@ extern const char kPulseaudioLoopbackForCastName[]; - extern const char kPulseaudioLoopbackForCastDescription[]; - extern const char kPulseaudioLoopbackForScreenShareName[]; - extern const char kPulseaudioLoopbackForScreenShareDescription[]; +@@ -4724,6 +4724,9 @@ extern const char kSimplifiedTabDragUIDescription[]; + + extern const char kWaylandPerWindowScalingName[]; + extern const char kWaylandPerWindowScalingDescription[]; + +extern const char kAudioBackendName[]; +extern const char kAudioBackendDescription[]; #endif // BUILDFLAG(IS_LINUX) // All views-based platforms -------------------------------------------------- -@@ -4675,7 +4678,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa +@@ -4753,7 +4756,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa extern const char kWebBluetoothConfirmPairingSupportDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) @@ -64,7 +82,7 @@ extern const char kSkipUndecryptablePasswordsName[]; extern const char kSkipUndecryptablePasswordsDescription[]; -@@ -4694,13 +4697,13 @@ extern const char kScreenlockReauthPromoCardDescriptio +@@ -4772,13 +4775,13 @@ extern const char kScreenlockReauthPromoCardDescriptio #endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -80,7 +98,7 @@ extern const char kEnableNetworkServiceSandboxName[]; extern const char kEnableNetworkServiceSandboxDescription[]; -@@ -4796,7 +4799,7 @@ extern const char kElementCaptureDescription[]; +@@ -4877,7 +4880,7 @@ extern const char kElementCaptureDescription[]; #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -89,8 +107,8 @@ extern const char kUIDebugToolsName[]; extern const char kUIDebugToolsDescription[]; #endif -@@ -4844,7 +4847,7 @@ extern const char kComposePoliteNudgeName[]; - extern const char kComposePoliteNudgeDescription[]; +@@ -4931,7 +4934,7 @@ extern const char kAutofillCaretExtractionName[]; + extern const char kAutofillCaretExtractionDescription[]; #endif // BUILDFLAG(ENABLE_COMPOSE) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) diff --git a/www/chromium/files/patch-chrome_browser_gcm_gcm__profile__service__factory.cc b/www/chromium/files/patch-chrome_browser_gcm_gcm__profile__service__factory.cc index 228a5851eb04..2e70a6cd6719 100644 --- a/www/chromium/files/patch-chrome_browser_gcm_gcm__profile__service__factory.cc +++ b/www/chromium/files/patch-chrome_browser_gcm_gcm__profile__service__factory.cc @@ -1,4 +1,4 @@ ---- chrome/browser/gcm/gcm_profile_service_factory.cc.orig 2023-09-13 12:11:42 UTC +--- chrome/browser/gcm/gcm_profile_service_factory.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/gcm/gcm_profile_service_factory.cc @@ -89,7 +89,7 @@ GCMProfileServiceFactory::ScopedTestingFactoryInstalle // static @@ -9,7 +9,7 @@ // On desktop, incognito profiles are checked with IsIncognitoProfile(). // It's possible for non-incognito profiles to also be off-the-record. bool is_profile_supported = -@@ -129,7 +129,7 @@ GCMProfileServiceFactory::~GCMProfileServiceFactory() +@@ -132,7 +132,7 @@ GCMProfileServiceFactory::~GCMProfileServiceFactory() KeyedService* GCMProfileServiceFactory::BuildServiceInstanceFor( content::BrowserContext* context) const { Profile* profile = Profile::FromBrowserContext(context); diff --git a/www/chromium/files/patch-chrome_browser_gcm_instance__id_instance__id__profile__service__factory.cc b/www/chromium/files/patch-chrome_browser_gcm_instance__id_instance__id__profile__service__factory.cc index 4bdb479740ba..a4638607c51f 100644 --- a/www/chromium/files/patch-chrome_browser_gcm_instance__id_instance__id__profile__service__factory.cc +++ b/www/chromium/files/patch-chrome_browser_gcm_instance__id_instance__id__profile__service__factory.cc @@ -1,4 +1,4 @@ ---- chrome/browser/gcm/instance_id/instance_id_profile_service_factory.cc.orig 2023-09-13 12:11:42 UTC +--- chrome/browser/gcm/instance_id/instance_id_profile_service_factory.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/gcm/instance_id/instance_id_profile_service_factory.cc @@ -16,7 +16,7 @@ namespace instance_id { // static @@ -9,7 +9,7 @@ // On desktop, the guest profile is actually the primary OTR profile of // the "regular" guest profile. The regular guest profile is never used // directly by users. Also, user are not able to create child OTR profiles -@@ -61,7 +61,7 @@ InstanceIDProfileServiceFactory::~InstanceIDProfileSer +@@ -64,7 +64,7 @@ InstanceIDProfileServiceFactory::~InstanceIDProfileSer KeyedService* InstanceIDProfileServiceFactory::BuildServiceInstanceFor( content::BrowserContext* context) const { Profile* profile = Profile::FromBrowserContext(context); diff --git a/www/chromium/files/patch-chrome_browser_global__desktop__features.cc b/www/chromium/files/patch-chrome_browser_global__desktop__features.cc new file mode 100644 index 000000000000..714d40a1a0c6 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_global__desktop__features.cc @@ -0,0 +1,19 @@ +--- chrome/browser/global_desktop_features.cc.orig 2024-08-26 12:06:38 UTC ++++ chrome/browser/global_desktop_features.cc +@@ -45,14 +45,14 @@ void GlobalDesktopFeatures::ReplaceGlobalDesktopFeatur + } + + void GlobalDesktopFeatures::Init() { +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (user_education::features::IsWhatsNewV2()) { + whats_new_registry_ = CreateWhatsNewRegistry(); + } + #endif + } + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + std::unique_ptr<whats_new::WhatsNewRegistry> + GlobalDesktopFeatures::CreateWhatsNewRegistry() { + return whats_new::CreateWhatsNewRegistry(); diff --git a/www/chromium/files/patch-chrome_browser_global__desktop__features.h b/www/chromium/files/patch-chrome_browser_global__desktop__features.h new file mode 100644 index 000000000000..e84867a99cb7 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_global__desktop__features.h @@ -0,0 +1,38 @@ +--- chrome/browser/global_desktop_features.h.orig 2024-08-26 12:06:38 UTC ++++ chrome/browser/global_desktop_features.h +@@ -9,7 +9,7 @@ + #include "build/build_config.h" + + namespace whats_new { +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + class WhatsNewRegistry; + #endif + } // namespace whats_new +@@ -37,7 +37,7 @@ class GlobalDesktopFeatures { + // Public accessors for features, e.g. + // FooFeature* foo_feature() { return foo_feature_.get(); } + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + whats_new::WhatsNewRegistry* whats_new_registry() { + return whats_new_registry_.get(); + } +@@ -50,7 +50,7 @@ class GlobalDesktopFeatures { + // testing. e.g. + // virtual std::unique_ptr<FooFeature> CreateFooFeature(); + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + virtual std::unique_ptr<whats_new::WhatsNewRegistry> CreateWhatsNewRegistry(); + #endif + +@@ -58,7 +58,7 @@ class GlobalDesktopFeatures { + // Features will each have a controller. e.g. + // std::unique_ptr<FooFeature> foo_feature_; + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + std::unique_ptr<whats_new::WhatsNewRegistry> whats_new_registry_; + #endif + }; diff --git a/www/chromium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc b/www/chromium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc index 2e6370bf650b..d789ebbdc603 100644 --- a/www/chromium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc +++ b/www/chromium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig 2023-09-13 12:11:42 UTC +--- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc -@@ -39,10 +39,12 @@ void MTPDeviceMapService::RegisterMTPFileSystem( +@@ -40,10 +40,12 @@ void MTPDeviceMapService::RegisterMTPFileSystem( // Note that this initializes the delegate asynchronously, but since // the delegate will only be used from the IO thread, it is guaranteed // to be created before use of it expects it to be there. diff --git a/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc b/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc index 232045b7369f..4754a54d2eda 100644 --- a/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc +++ b/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc @@ -1,6 +1,6 @@ ---- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2024-01-30 07:53:34 UTC +--- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/media_galleries/media_file_system_registry.cc -@@ -584,7 +584,12 @@ class MediaFileSystemRegistry::MediaFileSystemContextI +@@ -585,7 +585,12 @@ class MediaFileSystemRegistry::MediaFileSystemContextI // Constructor in 'private' section because depends on private class definition. MediaFileSystemRegistry::MediaFileSystemRegistry() : file_system_context_(new MediaFileSystemContextImpl) { 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 1dbeb8c7f670..43838f2980ea 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-07-30 11:12:21 UTC +--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2024-08-26 12:06:38 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 -@@ -212,7 +212,7 @@ +@@ -213,7 +213,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) -@@ -534,7 +534,7 @@ void ChromeMetricsServiceClient::RegisterPrefs(PrefReg +@@ -535,7 +535,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) -@@ -706,7 +706,7 @@ void ChromeMetricsServiceClient::Initialize() { +@@ -707,7 +707,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 -@@ -757,7 +757,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -758,7 +758,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 -@@ -842,7 +842,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -843,7 +843,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) || -@@ -944,7 +944,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -950,7 +950,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) -@@ -1131,7 +1131,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve +@@ -1137,7 +1137,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,9 +77,9 @@ // This creates the DesktopProfileSessionDurationsServices if it didn't exist // already. metrics::DesktopProfileSessionDurationsServiceFactory::GetForBrowserContext( -@@ -1465,7 +1465,7 @@ void ChromeMetricsServiceClient::CreateStructuredMetri +@@ -1471,7 +1471,7 @@ void ChromeMetricsServiceClient::CreateStructuredMetri recorder = - std::make_unique<metrics::structured::AshStructuredMetricsRecorder>( + base::MakeRefCounted<metrics::structured::AshStructuredMetricsRecorder>( cros_system_profile_provider_.get()); -#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) +#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) diff --git a/www/chromium/files/patch-chrome_browser_metrics_power_process__monitor.cc b/www/chromium/files/patch-chrome_browser_metrics_power_process__monitor.cc index fd4f81fd8690..414c9ef72df4 100644 --- a/www/chromium/files/patch-chrome_browser_metrics_power_process__monitor.cc +++ b/www/chromium/files/patch-chrome_browser_metrics_power_process__monitor.cc @@ -1,6 +1,6 @@ ---- chrome/browser/metrics/power/process_monitor.cc.orig 2024-06-17 12:56:06 UTC +--- chrome/browser/metrics/power/process_monitor.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/metrics/power/process_monitor.cc -@@ -64,7 +64,7 @@ ProcessMonitor::Metrics SampleMetrics(base::ProcessMet +@@ -65,7 +65,7 @@ ProcessMonitor::Metrics SampleMetrics(base::ProcessMet process_metrics.GetPlatformIndependentCPUUsage()); #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -9,7 +9,7 @@ metrics.idle_wakeups = process_metrics.GetIdleWakeupsPerSecond(); #endif #if BUILDFLAG(IS_MAC) -@@ -82,7 +82,7 @@ void ScaleMetrics(ProcessMonitor::Metrics* metrics, do +@@ -83,7 +83,7 @@ void ScaleMetrics(ProcessMonitor::Metrics* metrics, do } #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -18,7 +18,7 @@ metrics->idle_wakeups *= factor; #endif -@@ -157,7 +157,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me +@@ -158,7 +158,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me } #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ 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 new file mode 100644 index 000000000000..2efac54582d4 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_net_profile__network__context__service.cc @@ -0,0 +1,29 @@ +--- chrome/browser/net/profile_network_context_service.cc.orig 2024-08-26 12:06:38 UTC ++++ chrome/browser/net/profile_network_context_service.cc +@@ -140,7 +140,7 @@ + #include "chromeos/startup/browser_params_proxy.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/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 + }); + } + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + std::unique_ptr<net::ClientCertStore> GetWrappedCertStore( + Profile* profile, + std::unique_ptr<net::ClientCertStore> platform_store) { +@@ -939,7 +939,7 @@ ProfileNetworkContextService::CreateClientCertStore() + store = std::make_unique<ClientCertStoreLacros>( + std::move(certificate_provider), cert_db_initializer, std::move(store)); + #endif // BUILDFLAG(IS_CHROMEOS_LACROS) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return GetWrappedCertStore(profile_, std::move(store)); + #else + return store; 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 8fc4a9e037ec..b341cefe6ba5 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,6 +1,6 @@ ---- chrome/browser/net/system_network_context_manager.cc.orig 2024-07-30 11:12:21 UTC +--- chrome/browser/net/system_network_context_manager.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/net/system_network_context_manager.cc -@@ -97,7 +97,7 @@ +@@ -96,7 +96,7 @@ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ #include "chrome/common/chrome_paths_internal.h" #include "chrome/grit/branded_strings.h" #include "ui/base/l10n/l10n_util.h" -@@ -141,7 +141,7 @@ SystemNetworkContextManager* g_system_network_context_ +@@ -140,7 +140,7 @@ SystemNetworkContextManager* g_system_network_context_ // received a failed launch for a sandboxed network service. bool g_previously_failed_to_launch_sandboxed_service = false; @@ -18,7 +18,7 @@ // Whether kerberos library loading will work in the network service due to the // sandbox. bool g_network_service_will_allow_gssapi_library_load = false; -@@ -149,7 +149,7 @@ bool g_network_service_will_allow_gssapi_library_load +@@ -148,7 +148,7 @@ bool g_network_service_will_allow_gssapi_library_load const char* kGssapiDesiredPref = #if BUILDFLAG(IS_CHROMEOS) prefs::kKerberosEnabled; @@ -27,7 +27,7 @@ prefs::kReceivedHttpAuthNegotiateHeader; #endif #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -195,7 +195,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut +@@ -194,7 +194,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut auth_dynamic_params->basic_over_http_enabled = local_state->GetBoolean(prefs::kBasicAuthOverHttpEnabled); @@ -36,7 +36,7 @@ auth_dynamic_params->delegate_by_kdc_policy = local_state->GetBoolean(prefs::kAuthNegotiateDelegateByKdcPolicy); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -210,7 +210,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut +@@ -209,7 +209,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut local_state->GetString(prefs::kAuthAndroidNegotiateAccountType); #endif // BUILDFLAG(IS_ANDROID) @@ -45,7 +45,7 @@ auth_dynamic_params->allow_gssapi_library_load = local_state->GetBoolean(kGssapiDesiredPref); #endif // BUILDFLAG(IS_CHROMEOS) -@@ -220,7 +220,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut +@@ -219,7 +219,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut void OnNewHttpAuthDynamicParams( network::mojom::HttpAuthDynamicParamsPtr& params) { @@ -54,7 +54,7 @@ // The kerberos library is incompatible with the network service sandbox, so // if library loading is now enabled, the network service needs to be // restarted. It will be restarted unsandboxed because is -@@ -262,11 +262,11 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() +@@ -261,11 +261,11 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() if (g_previously_failed_to_launch_sandboxed_service) { return NetworkSandboxState::kDisabledBecauseOfFailedLaunch; } @@ -68,7 +68,7 @@ // The network service sandbox and the kerberos library are incompatible. // If kerberos is enabled by policy, disable the network service sandbox. if (g_network_service_will_allow_gssapi_library_load || -@@ -282,7 +282,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() +@@ -281,7 +281,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() } #endif // BUILDFLAG(IS_WIN) @@ -77,7 +77,7 @@ if (local_state && local_state->HasPrefPath(prefs::kNetworkServiceSandboxEnabled)) { return local_state->GetBoolean(prefs::kNetworkServiceSandboxEnabled) -@@ -512,7 +512,7 @@ void SystemNetworkContextManager::DeleteInstance() { +@@ -511,7 +511,7 @@ void SystemNetworkContextManager::DeleteInstance() { g_system_network_context_manager = nullptr; } @@ -86,7 +86,7 @@ SystemNetworkContextManager::GssapiLibraryLoadObserver:: GssapiLibraryLoadObserver(SystemNetworkContextManager* owner) : owner_(owner) {} -@@ -570,7 +570,7 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -569,7 +569,7 @@ SystemNetworkContextManager::SystemNetworkContextManag pref_change_registrar_.Add(prefs::kAllHttpAuthSchemesAllowedForOrigins, auth_pref_callback); @@ -95,7 +95,7 @@ pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy, auth_pref_callback); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -584,7 +584,7 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -583,7 +583,7 @@ SystemNetworkContextManager::SystemNetworkContextManag auth_pref_callback); #endif // BUILDFLAG(IS_ANDROID) @@ -104,16 +104,7 @@ pref_change_registrar_.Add(kGssapiDesiredPref, auth_pref_callback); #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -610,7 +610,7 @@ SystemNetworkContextManager::SystemNetworkContextManag - #endif - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - pref_change_registrar_.Add( - prefs::kEnforceLocalAnchorConstraintsEnabled, - base::BindRepeating(&SystemNetworkContextManager:: -@@ -665,7 +665,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -653,7 +653,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe registry->RegisterBooleanPref(prefs::kKerberosEnabled, false); #endif // BUILDFLAG(IS_CHROMEOS_LACROS) @@ -122,16 +113,7 @@ registry->RegisterBooleanPref(prefs::kAuthNegotiateDelegateByKdcPolicy, false); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -689,7 +689,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe - registry->RegisterIntegerPref(prefs::kMaxConnectionsPerProxy, -1); - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - // Note that the default value is not relevant because the pref is only - // evaluated when it is managed. - registry->RegisterBooleanPref(prefs::kEnforceLocalAnchorConstraintsEnabled, -@@ -698,11 +698,11 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -678,11 +678,11 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe registry->RegisterListPref(prefs::kExplicitlyAllowedNetworkPorts); @@ -145,7 +127,7 @@ registry->RegisterBooleanPref(prefs::kReceivedHttpAuthNegotiateHeader, false); #endif // BUILDFLAG(IS_LINUX) -@@ -755,7 +755,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea +@@ -735,7 +735,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea OnNewHttpAuthDynamicParams(http_auth_dynamic_params); network_service->ConfigureHttpAuthPrefs(std::move(http_auth_dynamic_params)); @@ -154,7 +136,7 @@ gssapi_library_loader_observer_.Install(network_service); #endif // BUILDFLAG(IS_LINUX) -@@ -970,7 +970,7 @@ bool SystemNetworkContextManager::IsNetworkSandboxEnab +@@ -950,7 +950,7 @@ bool SystemNetworkContextManager::IsNetworkSandboxEnab break; } @@ -163,12 +145,3 @@ if (!enabled) { g_network_service_will_allow_gssapi_library_load = true; } -@@ -1057,7 +1057,7 @@ void SystemNetworkContextManager::UpdateExplicitlyAllo - } - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - void SystemNetworkContextManager::UpdateEnforceLocalAnchorConstraintsEnabled() { - const PrefService::Preference* enforce_local_anchor_constraints_enabled_pref = - local_state_->FindPreference( diff --git a/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.h b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.h index f4abe9f4e3cc..160365aa556c 100644 --- a/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.h +++ b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.h @@ -1,4 +1,4 @@ ---- chrome/browser/net/system_network_context_manager.h.orig 2024-06-17 12:56:06 UTC +--- chrome/browser/net/system_network_context_manager.h.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/net/system_network_context_manager.h @@ -197,7 +197,7 @@ class SystemNetworkContextManager { class URLLoaderFactoryForSystem; @@ -9,16 +9,7 @@ class GssapiLibraryLoadObserver : public network::mojom::GssapiLibraryLoadObserver { public: -@@ -233,7 +233,7 @@ class SystemNetworkContextManager { - void UpdateExplicitlyAllowedNetworkPorts(); - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - // Applies the current value of the kEnforceLocalAnchorConstraintsEnabled - // pref to the enforcement state. - void UpdateEnforceLocalAnchorConstraintsEnabled(); -@@ -285,7 +285,7 @@ class SystemNetworkContextManager { +@@ -278,7 +278,7 @@ class SystemNetworkContextManager { std::unique_ptr<NetworkAnnotationMonitor> network_annotation_monitor_; #endif // BUILDFLAG(IS_CHROMEOS) 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 c7accb30a281..4703ee48816e 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,15 +1,15 @@ ---- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2024-07-30 11:12:21 UTC +--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/password_manager/chrome_password_manager_client.cc @@ -560,7 +560,7 @@ void ChromePasswordManagerClient:: - bool ChromePasswordManagerClient::CanUseBiometricAuthForFilling( + bool ChromePasswordManagerClient::IsReauthBeforeFillingRequired( device_reauth::DeviceAuthenticator* authenticator) { -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (!GetLocalStatePrefs() || !GetPrefs() || !authenticator) { return false; } -@@ -786,7 +786,7 @@ void ChromePasswordManagerClient::NotifyUserCredential +@@ -798,7 +798,7 @@ void ChromePasswordManagerClient::NotifyUserCredential } void ChromePasswordManagerClient::NotifyKeychainError() { diff --git a/www/chromium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc b/www/chromium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc index 35f443e448a6..f4c82240cfe8 100644 --- a/www/chromium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc +++ b/www/chromium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/password_manager/password_reuse_manager_factory.cc.orig 2024-07-30 11:12:21 UTC +--- chrome/browser/password_manager/password_reuse_manager_factory.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/password_manager/password_reuse_manager_factory.cc -@@ -138,7 +138,7 @@ PasswordReuseManagerFactory::BuildServiceInstanceForBr +@@ -141,7 +141,7 @@ PasswordReuseManagerFactory::BuildServiceInstanceForBr // 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) || \ 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 6e8bfd545151..985caaa432c3 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,6 +1,6 @@ ---- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2024-08-14 11:02:58 UTC +--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -235,19 +235,19 @@ +@@ -236,19 +236,19 @@ #include "components/spellcheck/browser/pref_names.h" #endif // BUILDFLAG(ENABLE_SPELLCHECK) @@ -23,7 +23,7 @@ #include "chrome/browser/privacy_sandbox/privacy_sandbox_policy_handler.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -@@ -261,13 +261,13 @@ +@@ -262,13 +262,13 @@ #endif // BUILDFLAG(ENTERPRISE_CLIENT_CERTIFICATES) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -39,7 +39,16 @@ #include "components/search_engines/site_search_policy_handler.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) -@@ -872,7 +872,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -542,7 +542,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + { key::kDefaultDirectSocketsSetting, + prefs::kManagedDefaultDirectSocketsSetting, + base::Value::Type::INTEGER }, +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + { key::kDeletingUndecryptablePasswordsEnabled, + password_manager::prefs::kDeletingUndecryptablePasswordsEnabled, + base::Value::Type::BOOLEAN }, +@@ -884,7 +884,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kManagedDefaultGeolocationSetting, base::Value::Type::INTEGER }, #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \ @@ -48,7 +57,7 @@ { key::kRequireOnlineRevocationChecksForLocalAnchors, prefs::kCertRevocationCheckingRequiredLocalAnchors, base::Value::Type::BOOLEAN }, -@@ -881,7 +881,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -893,7 +893,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) // || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -57,8 +66,8 @@ { key::kFullscreenAllowed, prefs::kFullscreenAllowed, base::Value::Type::BOOLEAN }, -@@ -1695,7 +1695,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = - base::Value::Type::STRING }, +@@ -1721,7 +1721,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + base::Value::Type::LIST }, #endif // BUILDFLAG(IS_CHROMEOS_ASH) -#if BUILDFLAG(IS_LINUX) @@ -66,7 +75,7 @@ { key::kGSSAPILibraryName, prefs::kGSSAPILibraryName, base::Value::Type::STRING }, -@@ -1749,7 +1749,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1778,7 +1778,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_WIN) @@ -75,7 +84,7 @@ { key::kNetworkServiceSandboxEnabled, prefs::kNetworkServiceSandboxEnabled, base::Value::Type::BOOLEAN }, -@@ -1775,12 +1775,12 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1804,12 +1804,12 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kTotalMemoryLimitMb, base::Value::Type::INTEGER }, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -90,7 +99,7 @@ { key::kUnmanagedDeviceSignalsConsentFlowEnabled, device_signals::prefs::kUnmanagedDeviceSignalsConsentFlowEnabled, base::Value::Type::BOOLEAN }, -@@ -1788,7 +1788,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1817,7 +1817,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kProfileSeparationDomainExceptionList, base::Value::Type::LIST }, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) @@ -99,7 +108,7 @@ { key::kDefaultBrowserSettingEnabled, prefs::kDefaultBrowserSettingEnabled, base::Value::Type::BOOLEAN }, -@@ -1800,7 +1800,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1829,7 +1829,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) \ @@ -108,7 +117,7 @@ { key::kAutoplayAllowed, prefs::kAutoplayAllowed, base::Value::Type::BOOLEAN }, -@@ -1901,7 +1901,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1930,7 +1930,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS) @@ -117,7 +126,7 @@ { key::kAlternativeBrowserPath, browser_switcher::prefs::kAlternativeBrowserPath, base::Value::Type::STRING }, -@@ -2006,7 +2006,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2041,7 +2041,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::LIST }, #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -126,16 +135,7 @@ { key::kAuthNegotiateDelegateByKdcPolicy, prefs::kAuthNegotiateDelegateByKdcPolicy, base::Value::Type::BOOLEAN }, -@@ -2031,7 +2031,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = - #endif // BUILDFLAG(ENABLE_EXTENSIONS) - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - { key::kEnforceLocalAnchorConstraintsEnabled, - prefs::kEnforceLocalAnchorConstraintsEnabled, - base::Value::Type::BOOLEAN }, -@@ -2089,7 +2089,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2120,7 +2120,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 }, -@@ -2118,7 +2118,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2149,7 +2149,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 }, -@@ -2158,7 +2158,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2192,7 +2192,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::INTEGER }, #endif #if BUILDFLAG(ENABLE_EXTENSIONS) @@ -162,16 +162,16 @@ { key::kExtensionInstallTypeBlocklist, extensions::pref_names::kExtensionInstallTypeBlocklist, base::Value::Type::LIST}, -@@ -2179,7 +2179,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = - optimization_guide::model_execution::prefs::kWallpaperSearchEnterprisePolicyAllowed, +@@ -2212,7 +2212,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + optimization_guide::model_execution::prefs::kHistorySearchEnterprisePolicyAllowed, base::Value::Type::INTEGER}, #endif --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) { key::kChromeForTestingAllowed, prefs::kChromeForTestingAllowed, base::Value::Type::BOOLEAN }, -@@ -2307,7 +2307,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2346,7 +2346,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, -@@ -2323,7 +2323,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2362,7 +2362,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)); -@@ -2529,7 +2529,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2575,7 +2575,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( -@@ -2587,7 +2587,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2627,7 +2627,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( -@@ -2701,7 +2701,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2712,7 +2712,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)); -@@ -3058,7 +3058,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -3070,7 +3070,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>( -@@ -3066,7 +3066,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -3078,7 +3078,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)); -@@ -3084,7 +3084,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -3096,7 +3096,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) -@@ -3107,7 +3107,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -3119,7 +3119,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH base::Value::Type::BOOLEAN))); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ 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 e66f40cc5b41..3cf000db1330 100644 --- a/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc +++ b/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc @@ -1,6 +1,15 @@ ---- chrome/browser/prefs/browser_prefs.cc.orig 2024-07-30 11:12:21 UTC +--- chrome/browser/prefs/browser_prefs.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/prefs/browser_prefs.cc -@@ -489,18 +489,18 @@ +@@ -314,7 +314,7 @@ + #include "components/user_notes/user_notes_prefs.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/ui/webui/whats_new/whats_new_ui.h" + #endif + +@@ -496,18 +496,18 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -22,7 +31,7 @@ #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h" #endif -@@ -535,7 +535,7 @@ +@@ -542,7 +542,7 @@ #include "chrome/browser/sessions/session_service_log.h" #endif @@ -31,16 +40,25 @@ #include "ui/color/system_theme.h" #endif -@@ -1953,7 +1953,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) - true); +@@ -1562,7 +1562,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) + registry->RegisterIntegerPref(prefs::kLastWhatsNewVersion, 0); + #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) + WhatsNewUI::RegisterLocalStatePrefs(registry); + #endif + +@@ -1735,7 +1735,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) #endif // BUILDFLAG(ENABLE_PDF) --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ +- BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) registry->RegisterBooleanPref(prefs::kChromeForTestingAllowed, true); #endif -@@ -2309,12 +2309,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync +@@ -2094,12 +2094,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 df059d03d0d6..a55565f9578a 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-07-30 11:12:21 UTC +--- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/prefs/pref_service_incognito_allowlist.cc -@@ -186,7 +186,7 @@ const char* const kPersistentPrefNames[] = { +@@ -188,7 +188,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 aee535df533e..9c002e8a8cd0 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,6 +1,6 @@ ---- chrome/browser/printing/print_backend_service_manager.cc.orig 2024-05-21 18:07:39 UTC +--- chrome/browser/printing/print_backend_service_manager.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/printing/print_backend_service_manager.cc -@@ -35,7 +35,7 @@ +@@ -36,7 +36,7 @@ #include "printing/printing_context.h" #include "printing/printing_features.h" @@ -9,7 +9,7 @@ #include "content/public/common/content_switches.h" #endif -@@ -862,7 +862,7 @@ PrintBackendServiceManager::GetServiceFromBundle( +@@ -877,7 +877,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()); -@@ -1039,7 +1039,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate +@@ -1054,7 +1054,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 5e3da6da91e1..34dffc308710 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,6 +1,6 @@ ---- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2024-07-30 11:12:21 UTC +--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -335,7 +335,7 @@ +@@ -342,7 +342,7 @@ #include "chromeos/constants/chromeos_features.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/policy/messaging_layer/util/manual_test_heartbeat_event_factory.h" #endif -@@ -420,18 +420,18 @@ +@@ -428,18 +428,18 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -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" -@@ -671,7 +671,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -681,7 +681,7 @@ void ChromeBrowserMainExtraPartsProfiles:: DiceBoundSessionCookieServiceFactory::GetInstance(); #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) #endif // BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS) @@ -40,7 +40,7 @@ browser_switcher::BrowserSwitcherServiceFactory::GetInstance(); #endif browser_sync::UserEventServiceFactory::GetInstance(); -@@ -799,32 +799,32 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -810,7 +810,7 @@ void ChromeBrowserMainExtraPartsProfiles:: enterprise_connectors::ConnectorsServiceFactory::GetInstance(); #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -49,8 +49,9 @@ enterprise_connectors::DeviceTrustConnectorServiceFactory::GetInstance(); enterprise_connectors::DeviceTrustServiceFactory::GetInstance(); #endif - #if BUILDFLAG(ENTERPRISE_CONTENT_ANALYSIS) +@@ -818,25 +818,25 @@ void ChromeBrowserMainExtraPartsProfiles:: enterprise_connectors::ExtensionInstallEventRouterFactory::GetInstance(); + enterprise_connectors::ExtensionTelemetryEventRouterFactory::GetInstance(); #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) @@ -79,7 +80,7 @@ enterprise_signin::EnterpriseSigninServiceFactory::GetInstance(); #endif #if BUILDFLAG(ENABLE_SESSION_SERVICE) -@@ -952,7 +952,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -969,7 +969,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #endif // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -88,7 +89,7 @@ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance(); #endif -@@ -1058,7 +1058,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -1075,7 +1075,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #if BUILDFLAG(IS_CHROMEOS) policy::PolicyCertServiceFactory::GetInstance(); #endif @@ -97,7 +98,7 @@ policy::ProfileTokenPolicyWebSigninServiceFactory::GetInstance(); policy::UserPolicyOidcSigninServiceFactory::GetInstance(); #endif -@@ -1101,7 +1101,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -1119,7 +1119,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #if !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_ANDROID) ProfileStatisticsFactory::GetInstance(); #endif @@ -106,7 +107,7 @@ ProfileTokenWebSigninInterceptorFactory::GetInstance(); OidcAuthenticationSigninInterceptorFactory::GetInstance(); #endif -@@ -1120,7 +1120,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -1135,7 +1135,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #endif ReduceAcceptLanguageFactory::GetInstance(); RendererUpdaterFactory::GetInstance(); 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 e624eb3e17d1..200783f9a24f 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-07-30 11:12:21 UTC +--- chrome/browser/profiles/profile_impl.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/profiles/profile_impl.cc -@@ -265,6 +265,10 @@ +@@ -266,6 +266,10 @@ #include "chrome/browser/spellchecker/spellcheck_service.h" #endif diff --git a/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc b/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc index 0d4abf133c4f..20deef6dc8cb 100644 --- a/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc +++ b/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig 2023-12-10 06:10:27 UTC +--- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc -@@ -694,7 +694,7 @@ void IncidentReportingService::OnEnvironmentDataCollec +@@ -695,7 +695,7 @@ void IncidentReportingService::OnEnvironmentDataCollec // Process::Current().CreationTime() is missing on some platforms. #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-chrome_browser_screen__ai_screen__ai__service__router.cc b/www/chromium/files/patch-chrome_browser_screen__ai_screen__ai__service__router.cc index b31a02dc5857..38249806263f 100644 --- a/www/chromium/files/patch-chrome_browser_screen__ai_screen__ai__service__router.cc +++ b/www/chromium/files/patch-chrome_browser_screen__ai_screen__ai__service__router.cc @@ -1,6 +1,6 @@ ---- chrome/browser/screen_ai/screen_ai_service_router.cc.orig 2024-07-30 11:12:21 UTC +--- chrome/browser/screen_ai/screen_ai_service_router.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/screen_ai/screen_ai_service_router.cc -@@ -284,7 +284,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() { +@@ -293,7 +293,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() { base::FilePath binary_path = state_instance->get_component_binary_path(); #if BUILDFLAG(IS_WIN) std::vector<base::FilePath> preload_libraries = {binary_path}; @@ -9,7 +9,7 @@ std::vector<std::string> extra_switches = { base::StringPrintf("--%s=%s", screen_ai::GetBinaryPathSwitch(), binary_path.MaybeAsASCII().c_str())}; -@@ -298,7 +298,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() { +@@ -307,7 +307,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() { .WithPreloadedLibraries( preload_libraries, content::ServiceProcessHostPreloadLibraries::GetPassKey()) 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 2382e3703ad4..e2587befd9c1 100644 --- a/www/chromium/files/patch-chrome_browser_sessions_session__restore.cc +++ b/www/chromium/files/patch-chrome_browser_sessions_session__restore.cc @@ -1,4 +1,4 @@ ---- chrome/browser/sessions/session_restore.cc.orig 2024-07-30 11:12:21 UTC +--- chrome/browser/sessions/session_restore.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/sessions/session_restore.cc @@ -99,7 +99,7 @@ #include "chrome/browser/web_applications/web_app_registrar.h" @@ -9,7 +9,7 @@ #include "chrome/browser/ui/webui/whats_new/whats_new_fetcher.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -1040,7 +1040,7 @@ class SessionRestoreImpl : public BrowserListObserver +@@ -1049,7 +1049,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_supervised__user__google__auth__navigation__throttle.cc b/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc new file mode 100644 index 000000000000..754c0c703d29 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc @@ -0,0 +1,20 @@ +--- chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.cc.orig 2024-08-26 12:06:38 UTC ++++ chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.cc +@@ -25,7 +25,7 @@ + + #if BUILDFLAG(IS_ANDROID) + #include "chrome/browser/supervised_user/child_accounts/child_account_service_android.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 +@@ -139,7 +139,7 @@ SupervisedUserGoogleAuthNavigationThrottle::ShouldProc + return content::NavigationThrottle::DEFER; + } + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + // When an unauthenticated supervised user tries to access YouTube, we force + // re-authentication with an interstitial so that YouTube can be subject to + // content restrictions. This interstitial is only available on Desktop diff --git a/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__metrics__service__factory.cc b/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__metrics__service__factory.cc index 4b861237fdc6..6b7533c01819 100644 --- a/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__metrics__service__factory.cc +++ b/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__metrics__service__factory.cc @@ -1,4 +1,4 @@ ---- chrome/browser/supervised_user/supervised_user_metrics_service_factory.cc.orig 2024-07-30 11:12:21 UTC +--- chrome/browser/supervised_user/supervised_user_metrics_service_factory.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/supervised_user/supervised_user_metrics_service_factory.cc @@ -14,7 +14,7 @@ #include "components/supervised_user/core/browser/supervised_user_service.h" @@ -9,7 +9,7 @@ #include "chrome/browser/supervised_user/linux_mac_windows/supervised_user_extensions_metrics_delegate_impl.h" #endif -@@ -55,7 +55,7 @@ KeyedService* SupervisedUserMetricsServiceFactory::Bui +@@ -61,7 +61,7 @@ KeyedService* SupervisedUserMetricsServiceFactory::Bui std::unique_ptr<supervised_user::SupervisedUserMetricsService :: SupervisedUserMetricsServiceExtensionDelegate> extensions_metrics_delegate = nullptr; diff --git a/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc b/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc index 9faf2fd981aa..891536f9e238 100644 --- a/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc +++ b/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/sync/chrome_sync_client.cc.orig 2024-07-30 11:12:21 UTC +--- chrome/browser/sync/chrome_sync_client.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/sync/chrome_sync_client.cc -@@ -116,7 +116,7 @@ +@@ -119,7 +119,7 @@ #endif // BUILDFLAG(ENABLE_SPELLCHECK) #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -9,7 +9,25 @@ #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" #elif BUILDFLAG(IS_ANDROID) -@@ -475,7 +475,7 @@ ChromeSyncClient::CreateModelTypeControllers( +@@ -233,7 +233,7 @@ bool ShouldSyncAppsTypesInTransportMode() { + syncer::ModelTypeControllerDelegate* GetSavedTabGroupControllerDelegate( + Profile* profile) { + #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + auto* keyed_service = + tab_groups::SavedTabGroupServiceFactory::GetForProfile(profile); + CHECK(keyed_service); +@@ -251,7 +251,7 @@ syncer::ModelTypeControllerDelegate* GetSavedTabGroupC + syncer::ModelTypeControllerDelegate* GetSharedTabGroupControllerDelegate( + Profile* profile) { + #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + tab_groups::SavedTabGroupKeyedService* keyed_service = + tab_groups::SavedTabGroupServiceFactory::GetForProfile(profile); + CHECK(keyed_service); +@@ -545,7 +545,7 @@ ChromeSyncClient::CreateModelTypeControllers( // platforms. bool enable_tab_group_sync = false; #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -18,7 +36,7 @@ enable_tab_group_sync = true; #elif BUILDFLAG(IS_ANDROID) enable_tab_group_sync = -@@ -514,7 +514,7 @@ ChromeSyncClient::CreateModelTypeControllers( +@@ -586,7 +586,7 @@ ChromeSyncClient::CreateModelTypeControllers( // Chrome prefers OS provided spell checkers where they exist. So only sync the // custom dictionary on platforms that typically don't provide one. @@ -27,12 +45,3 @@ // Dictionary sync is enabled by default. if (GetPrefService()->GetBoolean(spellcheck::prefs::kSpellCheckEnable)) { controllers.push_back( -@@ -671,7 +671,7 @@ ChromeSyncClient::GetControllerDelegateForModelType(sy - switch (type) { - case syncer::SAVED_TAB_GROUP: { - #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ -- BUILDFLAG(IS_WIN) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - auto* keyed_service = - tab_groups::SavedTabGroupServiceFactory::GetForProfile(profile_); - CHECK(keyed_service); 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 562c77663b58..915b99bc963d 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-07-30 11:12:21 UTC +--- chrome/browser/sync/sync_service_factory.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/sync/sync_service_factory.cc -@@ -84,7 +84,7 @@ +@@ -85,7 +85,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_service_factory.h" #elif BUILDFLAG(IS_ANDROID) #include "chrome/browser/tab_group_sync/tab_group_sync_service_factory.h" -@@ -135,7 +135,7 @@ std::unique_ptr<KeyedService> BuildSyncService( +@@ -134,7 +134,7 @@ std::unique_ptr<KeyedService> BuildSyncService( // TODO(crbug.com/40118868): Reassess whether the following block needs to be // included in lacros-chrome once build flag switch of lacros-chrome is // complete. @@ -18,7 +18,7 @@ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) syncer::SyncPrefs prefs(profile->GetPrefs()); local_sync_backend_enabled = prefs.IsLocalSyncEnabled(); -@@ -274,7 +274,7 @@ SyncServiceFactory::SyncServiceFactory() +@@ -271,7 +271,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_sync_sync__service__util.cc b/www/chromium/files/patch-chrome_browser_sync_sync__service__util.cc deleted file mode 100644 index 1ead398ac2f1..000000000000 --- a/www/chromium/files/patch-chrome_browser_sync_sync__service__util.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- chrome/browser/sync/sync_service_util.cc.orig 2024-05-21 18:07:39 UTC -+++ chrome/browser/sync/sync_service_util.cc -@@ -9,7 +9,7 @@ - #include "components/sync/base/features.h" - - #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ -- BUILDFLAG(IS_WIN) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - #include "components/variations/service/variations_service.h" - #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || - // BUILDFLAG(IS_WIN) -@@ -21,7 +21,7 @@ bool IsDesktopEnUSLocaleOnlySyncPollFeatureEnabled() { - } - - #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ -- BUILDFLAG(IS_WIN) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - std::string country_code; - auto* variations_service = g_browser_process->variations_service(); - if (variations_service) { 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 new file mode 100644 index 000000000000..17190b1be351 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_tab__group__sync_tab__group__sync__service__factory.cc @@ -0,0 +1,11 @@ +--- chrome/browser/tab_group_sync/tab_group_sync_service_factory.cc.orig 2024-08-26 12:06:38 UTC ++++ chrome/browser/tab_group_sync/tab_group_sync_service_factory.cc +@@ -110,7 +110,7 @@ TabGroupSyncServiceFactory::BuildServiceInstanceForBro + + std::unique_ptr<TabGroupSyncDelegate> delegate; + #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + delegate = + std::make_unique<TabGroupSyncDelegateDesktop>(service.get(), profile); + #else diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc index 3316b458e4e7..c1ef6db869db 100644 --- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc +++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig 2024-02-23 21:04:38 UTC +--- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/task_manager/sampling/task_manager_impl.cc -@@ -218,7 +218,7 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id, +@@ -219,7 +219,7 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id, } int TaskManagerImpl::GetOpenFdCount(TaskId task_id) const { diff --git a/www/chromium/files/patch-chrome_browser_themes_theme__service__aura__linux.cc b/www/chromium/files/patch-chrome_browser_themes_theme__service__aura__linux.cc index 1e9040e78ce0..f79dc5be42c2 100644 --- a/www/chromium/files/patch-chrome_browser_themes_theme__service__aura__linux.cc +++ b/www/chromium/files/patch-chrome_browser_themes_theme__service__aura__linux.cc @@ -1,6 +1,6 @@ ---- chrome/browser/themes/theme_service_aura_linux.cc.orig 2022-11-30 08:12:58 UTC +--- chrome/browser/themes/theme_service_aura_linux.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/themes/theme_service_aura_linux.cc -@@ -24,7 +24,7 @@ namespace { +@@ -23,7 +23,7 @@ namespace { ui::SystemTheme ValidateSystemTheme(ui::SystemTheme system_theme) { switch (system_theme) { case ui::SystemTheme::kDefault: diff --git a/www/chromium/files/patch-chrome_browser_themes_theme__service__factory.cc b/www/chromium/files/patch-chrome_browser_themes_theme__service__factory.cc index c4c38b2cbbec..6094f302997c 100644 --- a/www/chromium/files/patch-chrome_browser_themes_theme__service__factory.cc +++ b/www/chromium/files/patch-chrome_browser_themes_theme__service__factory.cc @@ -1,4 +1,4 @@ ---- chrome/browser/themes/theme_service_factory.cc.orig 2024-06-17 12:56:06 UTC +--- chrome/browser/themes/theme_service_factory.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/themes/theme_service_factory.cc @@ -27,11 +27,11 @@ @@ -14,7 +14,7 @@ #include "ui/linux/linux_ui_factory.h" #endif -@@ -103,7 +103,7 @@ ThemeServiceFactory::~ThemeServiceFactory() = default; +@@ -106,7 +106,7 @@ ThemeServiceFactory::~ThemeServiceFactory() = default; KeyedService* ThemeServiceFactory::BuildServiceInstanceFor( content::BrowserContext* profile) const { @@ -23,7 +23,7 @@ using ThemeService = ThemeServiceAuraLinux; #endif -@@ -117,9 +117,9 @@ void ThemeServiceFactory::RegisterProfilePrefs( +@@ -120,9 +120,9 @@ void ThemeServiceFactory::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { // 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_actions_chrome__action__id.h b/www/chromium/files/patch-chrome_browser_ui_actions_chrome__action__id.h index 25a9d51741f1..03e55deb847e 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-07-30 11:12:21 UTC +--- chrome/browser/ui/actions/chrome_action_id.h.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/ui/actions/chrome_action_id.h -@@ -515,7 +515,7 @@ +@@ -510,7 +510,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_browser.h b/www/chromium/files/patch-chrome_browser_ui_browser.h index 128039bba3d3..43c3f298cd0a 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-07-30 11:12:21 UTC +--- chrome/browser/ui/browser.h.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/ui/browser.h -@@ -339,7 +339,7 @@ class Browser : public TabStripModelObserver, +@@ -338,7 +338,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 1db7d5addf0c..159d2e9a1cff 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,4 +1,4 @@ ---- chrome/browser/ui/browser_command_controller.cc.orig 2024-07-30 11:12:21 UTC +--- chrome/browser/ui/browser_command_controller.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/ui/browser_command_controller.cc @@ -129,7 +129,7 @@ #include "components/user_manager/user_manager.h" @@ -54,7 +54,7 @@ if (base::FeatureList::IsEnabled(features::kShortcutsNotApps)) { chrome::CreateDesktopShortcutForActiveWebContents(browser_); } else { -@@ -1282,12 +1282,12 @@ void BrowserCommandController::InitCommandState() { +@@ -1272,12 +1272,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() -@@ -1602,7 +1602,7 @@ void BrowserCommandController::UpdateCommandsForTabSta +@@ -1592,7 +1592,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 9d457235e21c..762021959320 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-07-30 11:12:21 UTC +--- chrome/browser/ui/browser_commands.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/ui/browser_commands.cc -@@ -2001,7 +2001,7 @@ void OpenUpdateChromeDialog(Browser* browser) { +@@ -2005,7 +2005,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 2145136c91d6..eb9e580e38d4 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,11 +1,20 @@ ---- chrome/browser/ui/browser_ui_prefs.cc.orig 2024-05-21 18:07:39 UTC +--- chrome/browser/ui/browser_ui_prefs.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/ui/browser_ui_prefs.cc -@@ -175,7 +175,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistry +@@ -72,7 +72,7 @@ void RegisterBrowserPrefs(PrefRegistrySimple* registry + registry->RegisterIntegerPref(prefs::kDefaultBrowserDeclinedCount, 0); + registry->RegisterTimePref(prefs::kDefaultBrowserFirstShownTime, + base::Time()); +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + registry->RegisterStringPref(prefs::kEnterpriseCustomLabel, std::string()); + registry->RegisterStringPref(prefs::kEnterpriseLogoUrl, std::string()); + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +@@ -179,7 +179,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistry registry->RegisterDictionaryPref(prefs::kHttpsUpgradeFallbacks); registry->RegisterDictionaryPref(prefs::kHttpsUpgradeNavigations); registry->RegisterBooleanPref(prefs::kHttpsOnlyModeAutoEnabled, false); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#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) - } 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 9b23b468b1fb..312d5945716a 100644 --- a/www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc +++ b/www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/chrome_pages.cc.orig 2024-07-30 11:12:21 UTC +--- chrome/browser/ui/chrome_pages.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/ui/chrome_pages.cc -@@ -86,7 +86,7 @@ +@@ -87,7 +87,7 @@ #include "components/signin/public/identity_manager/identity_manager.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/web_applications/web_app_utils.h" #endif -@@ -379,7 +379,7 @@ void ShowChromeTips(Browser* browser) { +@@ -380,7 +380,7 @@ void ShowChromeTips(Browser* browser) { ShowSingletonTab(browser, GURL(kChromeTipsURL)); } @@ -18,7 +18,7 @@ void ShowChromeWhatsNew(Browser* browser) { ShowSingletonTab(browser, GURL(kChromeUIWhatsNewURL)); } -@@ -721,7 +721,7 @@ void ShowShortcutCustomizationApp(Profile* profile, +@@ -722,7 +722,7 @@ void ShowShortcutCustomizationApp(Profile* profile, #endif // BUILDFLAG(IS_CHROMEOS_ASH) } diff --git a/www/chromium/files/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc b/www/chromium/files/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc index 24a7420bda47..c06a814490f0 100644 --- a/www/chromium/files/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc +++ b/www/chromium/files/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc.orig 2024-06-17 12:56:06 UTC +--- chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc -@@ -1978,7 +1978,7 @@ const gfx::VectorIcon& GetSharingHubVectorIcon() { +@@ -1976,7 +1976,7 @@ const gfx::VectorIcon& GetSharingHubVectorIcon() { return omnibox::kShareMacChromeRefreshIcon; #elif BUILDFLAG(IS_WIN) return omnibox::kShareWinChromeRefreshIcon; 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 8fa9edd86110..c1791b3a5976 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,4 +1,4 @@ ---- chrome/browser/ui/passwords/manage_passwords_ui_controller.cc.orig 2024-07-30 11:12:21 UTC +--- chrome/browser/ui/passwords/manage_passwords_ui_controller.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/ui/passwords/manage_passwords_ui_controller.cc @@ -97,7 +97,7 @@ namespace { @@ -9,7 +9,7 @@ // Should be kept in sync with constant declared in // bubble_controllers/relaunch_chrome_bubble_controller.cc. constexpr int kMaxNumberOfTimesKeychainErrorBubbleIsShown = 3; -@@ -504,7 +504,7 @@ void ManagePasswordsUIController::OnBiometricAuthBefor +@@ -502,7 +502,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 16b338d68f63..5cb0c8219e42 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,7 +1,7 @@ ---- chrome/browser/ui/signin/signin_view_controller.cc.orig 2024-07-30 11:12:21 UTC +--- chrome/browser/ui/signin/signin_view_controller.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/ui/signin/signin_view_controller.cc @@ -492,7 +492,7 @@ void SigninViewController::ShowModalManagedUserNoticeD - signin::SigninChoiceCallback process_user_choice_callback, + signin::SigninChoiceCallbackVariant process_user_choice_callback, base::OnceClosure done_callback) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS_LACROS) 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 11c262325b78..6df95c5b11ad 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-07-30 11:12:21 UTC +--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/ui/startup/startup_browser_creator.cc -@@ -137,7 +137,7 @@ +@@ -138,7 +138,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" -@@ -966,7 +966,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -967,7 +967,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())) { -@@ -1079,7 +1079,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -1084,7 +1084,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) && -@@ -1289,7 +1289,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -1294,7 +1294,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 1a7e37544697..53741368aa2b 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-07-30 11:12:21 UTC +--- chrome/browser/ui/tab_helpers.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/ui/tab_helpers.cc -@@ -243,7 +243,7 @@ +@@ -241,7 +241,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" -@@ -721,12 +721,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con +@@ -719,12 +719,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_tabs_features.cc b/www/chromium/files/patch-chrome_browser_ui_tabs_features.cc index bdd03c2b17a1..da76ad90bbb0 100644 --- a/www/chromium/files/patch-chrome_browser_ui_tabs_features.cc +++ b/www/chromium/files/patch-chrome_browser_ui_tabs_features.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/tabs/features.cc.orig 2024-07-30 11:12:21 UTC +--- chrome/browser/ui/tabs/features.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/ui/tabs/features.cc -@@ -16,7 +16,7 @@ BASE_FEATURE(kTabSearchPositionSetting, +@@ -48,7 +48,7 @@ BASE_FEATURE(kTabStripCollectionStorage, bool CanShowTabSearchPositionSetting() { // Mac and other platforms will always have the tab search position in the // correct location, cros/linux/win git the user the option to change. 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 3705729007a6..a2e8df5a7297 100644 --- a/www/chromium/files/patch-chrome_browser_ui_ui__features.cc +++ b/www/chromium/files/patch-chrome_browser_ui_ui__features.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/ui_features.cc.orig 2024-07-30 11:12:21 UTC +--- chrome/browser/ui/ui_features.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/ui/ui_features.cc -@@ -120,7 +120,7 @@ BASE_FEATURE(kEvDetailsInPageInfo, +@@ -108,7 +108,7 @@ BASE_FEATURE(kEvDetailsInPageInfo, "EvDetailsInPageInfo", base::FEATURE_ENABLED_BY_DEFAULT); @@ -9,7 +9,7 @@ // Enables the feature to remove the last confirmation dialog when relaunching // to update Chrome. BASE_FEATURE(kFewerUpdateConfirmations, -@@ -426,7 +426,7 @@ BASE_FEATURE(kTopChromeWebUIUsesSpareRenderer, +@@ -381,7 +381,7 @@ BASE_FEATURE(kTopChromeWebUIUsesSpareRenderer, "TopChromeWebUIUsesSpareRenderer", base::FEATURE_ENABLED_BY_DEFAULT); @@ -18,3 +18,12 @@ // Enables alternate update-related text to be displayed in browser app menu // button, menu item and confirmation dialog. BASE_FEATURE(kUpdateTextOptions, +@@ -457,7 +457,7 @@ BASE_FEATURE(kStopLoadingAnimationForHiddenWindow, + "StopLoadingAnimationForHiddenWindow", + base::FEATURE_ENABLED_BY_DEFAULT); + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + BASE_FEATURE(kUsePortalAccentColor, + "UsePortalAccentColor", + 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 c11e91a1595f..0f72141e53ed 100644 --- a/www/chromium/files/patch-chrome_browser_ui_ui__features.h +++ b/www/chromium/files/patch-chrome_browser_ui_ui__features.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/ui_features.h.orig 2024-07-30 11:12:21 UTC +--- chrome/browser/ui/ui_features.h.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/ui/ui_features.h -@@ -85,7 +85,7 @@ BASE_DECLARE_FEATURE(kAccessCodeCastUI); +@@ -80,7 +80,7 @@ BASE_DECLARE_FEATURE(kAccessCodeCastUI); BASE_DECLARE_FEATURE(kEvDetailsInPageInfo); @@ -9,7 +9,7 @@ BASE_DECLARE_FEATURE(kFewerUpdateConfirmations); #endif -@@ -256,7 +256,7 @@ bool IsToolbarPinningEnabled(); +@@ -239,7 +239,7 @@ bool IsToolbarPinningEnabled(); BASE_DECLARE_FEATURE(kTopChromeWebUIUsesSpareRenderer); @@ -18,3 +18,12 @@ BASE_DECLARE_FEATURE(kUpdateTextOptions); extern const base::FeatureParam<int> kUpdateTextOptionNumber; #endif +@@ -266,7 +266,7 @@ BASE_DECLARE_FEATURE(kViewsJSAppModalDialog); + + BASE_DECLARE_FEATURE(kStopLoadingAnimationForHiddenWindow); + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + BASE_DECLARE_FEATURE(kUsePortalAccentColor); + #endif + diff --git a/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc b/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc index 392c5e58f282..3e7545e7b1cc 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/accelerator_table.cc.orig 2024-06-17 12:56:06 UTC +--- chrome/browser/ui/views/accelerator_table.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/ui/views/accelerator_table.cc @@ -72,11 +72,11 @@ const AcceleratorMapping kAcceleratorMap[] = { {ui::VKEY_S, ui::EF_PLATFORM_ACCELERATOR, IDC_SAVE_PAGE}, @@ -23,7 +23,7 @@ {ui::VKEY_1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0}, {ui::VKEY_NUMPAD1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0}, {ui::VKEY_2, ui::EF_ALT_DOWN, IDC_SELECT_TAB_1}, -@@ -154,7 +154,7 @@ const AcceleratorMapping kAcceleratorMap[] = { +@@ -156,7 +156,7 @@ const AcceleratorMapping kAcceleratorMap[] = { IDC_SHOW_AVATAR_MENU}, // Platform-specific key maps. @@ -32,12 +32,3 @@ {ui::VKEY_BROWSER_BACK, ui::EF_NONE, IDC_BACK}, {ui::VKEY_BROWSER_FORWARD, ui::EF_NONE, IDC_FORWARD}, {ui::VKEY_BROWSER_HOME, ui::EF_NONE, IDC_HOME}, -@@ -249,7 +249,7 @@ const AcceleratorMapping kAcceleratorMap[] = { - #endif // !BUILDFLAG(IS_CHROMEOS) - #endif // !BUILDFLAG(IS_MAC) - #if BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) && \ -- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) -+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) - {ui::VKEY_S, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, - IDC_CONTENT_CONTEXT_RUN_LAYOUT_EXTRACTION}, - #endif 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 70ca71b54cea..d3acddd8d813 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-07-30 11:12:21 UTC +--- chrome/browser/ui/views/frame/browser_view.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/ui/views/frame/browser_view.cc -@@ -2240,7 +2240,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra +@@ -2258,7 +2258,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_opaque__browser__frame__view.h b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h index b269b939ae9d..92f191a85a84 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h @@ -1,15 +1,15 @@ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view.h.orig 2024-02-23 21:04:38 UTC +--- chrome/browser/ui/views/frame/opaque_browser_frame_view.h.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/ui/views/frame/opaque_browser_frame_view.h -@@ -115,7 +115,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient - void UpdateWindowControlsOverlay( - const gfx::Rect& bounding_rect) const override; +@@ -114,7 +114,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient + FrameButtonStyle GetFrameButtonStyle() const override; + void UpdateWindowControlsOverlay(const gfx::Rect& bounding_rect) override; bool ShouldDrawRestoredFrameShadow() const override; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) bool IsTiled() const override; #endif int WebAppButtonHeight() const override; -@@ -232,7 +232,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient +@@ -231,7 +231,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient // Background painter for the window frame. std::unique_ptr<views::FrameBackground> frame_background_; diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout__delegate.h b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout__delegate.h index def5c143167a..695717794e2b 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout__delegate.h +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout__delegate.h @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_delegate.h.orig 2024-02-23 21:04:38 UTC +--- chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_delegate.h.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_delegate.h @@ -10,7 +10,7 @@ #include "build/build_config.h" @@ -9,7 +9,7 @@ #include "ui/base/ui_base_types.h" #endif -@@ -94,7 +94,7 @@ class OpaqueBrowserFrameViewLayoutDelegate { +@@ -93,7 +93,7 @@ class OpaqueBrowserFrameViewLayoutDelegate { // Returns true if a client-side shadow should be drawn for restored windows. virtual bool ShouldDrawRestoredFrameShadow() const = 0; 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 0a53f8fbac17..c2976a3c9dac 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,6 +1,6 @@ ---- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig 2024-07-30 11:12:21 UTC +--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc -@@ -58,7 +58,7 @@ +@@ -61,7 +61,7 @@ #include "ui/aura/window.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" #include "chrome/browser/ui/views/frame/browser_frame_view_paint_utils_linux.h" -@@ -90,7 +90,7 @@ constexpr int kContentSettingIconSize = 16; +@@ -93,7 +93,7 @@ constexpr int kContentSettingIconSize = 16; // The height of the controls bar at the top of the window. constexpr int kTopControlsHeight = 34; @@ -18,7 +18,7 @@ // Frame border when window shadow is not drawn. constexpr int kFrameBorderThickness = 4; #endif -@@ -182,7 +182,7 @@ class WindowEventObserver : public ui::EventObserver { +@@ -185,7 +185,7 @@ class WindowEventObserver : public ui::EventObserver { gfx::Rect input_bounds = pip_browser_frame_view_->GetLocalBounds(); @@ -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()) { -@@ -578,7 +578,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow +@@ -581,7 +581,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); -@@ -800,7 +800,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged( +@@ -803,7 +803,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))); -@@ -882,7 +882,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg +@@ -885,7 +885,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg BrowserNonClientFrameView::RemovedFromWidget(); } @@ -54,7 +54,7 @@ gfx::Insets PictureInPictureBrowserFrameView::MirroredFrameBorderInsets() const { auto border = FrameBorderInsets(); -@@ -1138,7 +1138,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre +@@ -1153,7 +1153,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_) { -@@ -1272,7 +1272,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie +@@ -1287,7 +1287,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(); -@@ -1290,7 +1290,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor +@@ -1305,7 +1305,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); -@@ -1311,7 +1311,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie +@@ -1326,7 +1326,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie top_height + border_thickness.bottom()); } diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h b/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h index 24ad747ec8cf..734952a0e95f 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig 2024-04-19 13:02:56 UTC +--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h @@ -27,7 +27,7 @@ #include "ui/views/layout/flex_layout_view.h" @@ -18,7 +18,7 @@ #define RESIZE_DOCUMENT_PICTURE_IN_PICTURE_TO_DIALOG 1 #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || // BUILDFLAG(IS_CHROMEOS_LACROS) -@@ -101,7 +101,7 @@ class PictureInPictureBrowserFrameView +@@ -103,7 +103,7 @@ class PictureInPictureBrowserFrameView void Layout(PassKey) override; void AddedToWidget() override; void RemovedFromWidget() override; @@ -27,7 +27,7 @@ gfx::Insets MirroredFrameBorderInsets() const override; gfx::Insets GetInputInsets() const override; SkRRect GetRestoredClipRegion() const override; -@@ -192,7 +192,7 @@ class PictureInPictureBrowserFrameView +@@ -195,7 +195,7 @@ class PictureInPictureBrowserFrameView // Returns true if there's an overlay view that's currently shown. bool IsOverlayViewVisible() const; @@ -36,7 +36,7 @@ // Returns whether a client-side shadow should be drawn for the window. bool ShouldDrawFrameShadow() const; -@@ -368,7 +368,7 @@ class PictureInPictureBrowserFrameView +@@ -371,7 +371,7 @@ class PictureInPictureBrowserFrameView // `top_bar_color_animation_`. std::optional<SkColor> current_foreground_color_; diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc index b86f97296b0e..79a81b2f5467 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2024-06-17 12:56:06 UTC +--- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/ui/views/frame/system_menu_model_builder.cc @@ -75,7 +75,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser ui::SimpleMenuModel* model) { @@ -18,7 +18,7 @@ model->AddSeparator(ui::NORMAL_SEPARATOR); bool supports_server_side_decorations = true; #if BUILDFLAG(IS_OZONE) && !BUILDFLAG(IS_CHROMEOS) -@@ -147,7 +147,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo +@@ -155,7 +155,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo model->AddSeparator(ui::NORMAL_SEPARATOR); model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); } diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_tab__strip__region__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_tab__strip__region__view.cc index 3a45d1eedda9..16ab5c2e1573 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_tab__strip__region__view.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_tab__strip__region__view.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/tab_strip_region_view.cc.orig 2024-07-30 11:12:21 UTC +--- chrome/browser/ui/views/frame/tab_strip_region_view.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/ui/views/frame/tab_strip_region_view.cc -@@ -200,7 +200,7 @@ TabStripRegionView::TabStripRegionView(std::unique_ptr +@@ -201,7 +201,7 @@ TabStripRegionView::TabStripRegionView(std::unique_ptr // 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_omnibox_omnibox__view__views.cc b/www/chromium/files/patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc index e8545de5e0bc..fe1feab539e4 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-07-30 11:12:21 UTC +--- chrome/browser/ui/views/omnibox/omnibox_view_views.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/ui/views/omnibox/omnibox_view_views.cc -@@ -1962,7 +1962,7 @@ void OmniboxViewViews::MaybeAddSendTabToSelfItem( +@@ -1972,7 +1972,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 45022e267fa6..a11c522bacf9 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-07-30 11:12:21 UTC +--- chrome/browser/ui/views/passwords/password_bubble_view_base.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/ui/views/passwords/password_bubble_view_base.cc -@@ -34,7 +34,7 @@ +@@ -37,7 +37,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 -@@ -133,7 +133,7 @@ PasswordBubbleViewBase* PasswordBubbleViewBase::Create +@@ -141,7 +141,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 1a6c9436d42c..8b81d88ad64a 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,4 +1,4 @@ ---- chrome/browser/ui/views/profiles/profile_menu_view.cc.orig 2024-07-30 11:12:21 UTC +--- chrome/browser/ui/views/profiles/profile_menu_view.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/ui/views/profiles/profile_menu_view.cc @@ -83,7 +83,7 @@ #include "ui/strings/grit/ui_strings.h" @@ -9,7 +9,7 @@ #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h" #endif -@@ -577,7 +577,7 @@ void ProfileMenuView::BuildIdentity() { +@@ -568,7 +568,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__picker__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__picker__view.cc new file mode 100644 index 000000000000..9155c7fb5c03 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__picker__view.cc @@ -0,0 +1,20 @@ +--- chrome/browser/ui/views/profiles/profile_picker_view.cc.orig 2024-08-26 12:06:38 UTC ++++ chrome/browser/ui/views/profiles/profile_picker_view.cc +@@ -87,7 +87,7 @@ + #include "chrome/browser/ui/views/profiles/first_run_flow_controller_lacros.h" + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "chrome/browser/shell_integration_linux.h" + #endif + +@@ -117,7 +117,7 @@ class ProfilePickerWidget : public views::Widget { + views::Widget::InitParams params( + views::Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET); + params.delegate = profile_picker_view_; +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + params.wm_class_name = shell_integration_linux::GetProgramClassName(); + params.wm_class_class = shell_integration_linux::GetProgramClassClass(); + params.wayland_app_id = params.wm_class_class; 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 d9fdc0f08980..fcb15c941048 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,6 +1,6 @@ ---- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig 2024-07-30 11:12:21 UTC +--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc -@@ -58,7 +58,7 @@ namespace { +@@ -55,7 +55,7 @@ namespace { const int kModalDialogWidth = 448; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ const int kManagedUserNoticeConfirmationDialogWidth = 512; const int kManagedUserNoticeConfirmationDialogHeight = 576; const int kManagedUserNoticeConfirmationUpdatedDialogWidth = 900; -@@ -184,7 +184,7 @@ SigninViewControllerDelegateViews::CreateProfileCustom +@@ -173,7 +173,7 @@ SigninViewControllerDelegateViews::CreateProfileCustom #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -18,7 +18,7 @@ // static std::unique_ptr<views::WebView> SigninViewControllerDelegateViews::CreateManagedUserNoticeConfirmationWebView( -@@ -346,7 +346,7 @@ SigninViewControllerDelegateViews::SigninViewControlle +@@ -335,7 +335,7 @@ SigninViewControllerDelegateViews::SigninViewControlle SetButtons(ui::DIALOG_BUTTON_NONE); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -27,7 +27,7 @@ // On the local profile creation dialog, cancelling the dialog (for instance // through the VKEY_ESCAPE accelerator) should delete the profile. if (delete_profile_on_cancel) { -@@ -436,7 +436,7 @@ void SigninViewControllerDelegateViews::DisplayModal() +@@ -425,7 +425,7 @@ void SigninViewControllerDelegateViews::DisplayModal() } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -36,7 +36,7 @@ void SigninViewControllerDelegateViews::DeleteProfileOnCancel() { ProfileAttributesEntry* entry = g_browser_process->profile_manager() -@@ -510,7 +510,7 @@ SigninViewControllerDelegate::CreateProfileCustomizati +@@ -499,7 +499,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_tabs_tab.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc index 788f2cad8106..20094b339d7c 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-07-30 11:12:21 UTC +--- chrome/browser/ui/views/tabs/tab.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/ui/views/tabs/tab.cc -@@ -611,7 +611,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& +@@ -616,7 +616,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 0254fbe92440..87ce537b0214 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-07-30 11:12:21 UTC +--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/ui/views/tabs/tab_drag_controller.cc -@@ -95,7 +95,7 @@ +@@ -98,7 +98,7 @@ #include "components/remote_cocoa/browser/window.h" #endif @@ -9,7 +9,7 @@ #include "ui/aura/client/drag_drop_client.h" #endif -@@ -215,7 +215,7 @@ bool IsWindowDragUsingSystemDragDropAllowed() { +@@ -218,7 +218,7 @@ bool IsWindowDragUsingSystemDragDropAllowed() { void UpdateSystemDnDDragImage(TabDragContext* attached_context, const gfx::ImageSkia& image) { @@ -18,7 +18,7 @@ aura::Window* root_window = attached_context->GetWidget()->GetNativeWindow()->GetRootWindow(); if (aura::client::GetDragDropClient(root_window)) { -@@ -405,7 +405,7 @@ TabDragController::Liveness TabDragController::Init( +@@ -416,7 +416,7 @@ TabDragController::Liveness TabDragController::Init( // synchronous on desktop Linux, so use that. // - ChromeOS Ash // Releasing capture on Ash cancels gestures so avoid it. @@ -27,7 +27,7 @@ ref->can_release_capture_ = false; #endif ref->start_point_in_screen_ = -@@ -1070,7 +1070,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon +@@ -1065,7 +1065,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -36,7 +36,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. -@@ -2179,7 +2179,7 @@ void TabDragController::CompleteDrag() { +@@ -2151,7 +2151,7 @@ void TabDragController::CompleteDrag() { } // If source window was maximized - maximize the new window as well. @@ -45,7 +45,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 -@@ -2608,7 +2608,7 @@ TabDragController::Liveness TabDragController::GetLoca +@@ -2597,7 +2597,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__style__views.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__style__views.cc index c338d9ff6647..6b1518ac8ac0 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__style__views.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__style__views.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/tabs/tab_style_views.cc.orig 2024-07-30 11:12:21 UTC +--- chrome/browser/ui/views/tabs/tab_style_views.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/ui/views/tabs/tab_style_views.cc -@@ -502,7 +502,7 @@ float GM2TabStyleViews::GetCurrentActiveOpacity() cons +@@ -550,7 +550,7 @@ float TabStyleViewsImpl::GetCurrentActiveOpacity() con if (!IsHoverAnimationActive()) { return base_opacity; } @@ -8,4 +8,4 @@ + return std::lerp(base_opacity, GetHoverOpacity(), static_cast<float>(GetHoverAnimationValue())); } - TabActive GM2TabStyleViews::GetApparentActiveState() const { + TabActive TabStyleViewsImpl::GetApparentActiveState() const { 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 93a65ae7e07b..eccc950681b6 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-07-30 11:12:21 UTC +--- chrome/browser/ui/views/user_education/browser_user_education_service.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/ui/views/user_education/browser_user_education_service.cc -@@ -1007,7 +1007,7 @@ void MaybeRegisterChromeFeaturePromos( +@@ -1008,7 +1008,7 @@ void MaybeRegisterChromeFeaturePromos( FeaturePromoSpecification::AcceleratorInfo()) .SetBubbleArrow(HelpBubbleArrow::kTopLeft))); 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 2864e2f61e53..cf4b428e65fa 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,6 +1,6 @@ ---- chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc.orig 2024-07-30 11:12:21 UTC +--- chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc -@@ -515,7 +515,7 @@ std::string GetFileExtension(FileExtension file_extens +@@ -516,7 +516,7 @@ std::string GetFileExtension(FileExtension file_extens } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ SiteConfig GetSiteConfigurationFromAppName(const std::string& app_name) { SiteConfig config; bool is_app_found = false; -@@ -2103,7 +2103,7 @@ void WebAppIntegrationTestDriver::DeletePlatformShortc +@@ -2104,7 +2104,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( -@@ -3433,7 +3433,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginEna +@@ -3431,7 +3431,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 -@@ -3448,7 +3448,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis +@@ -3446,7 +3446,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 -@@ -3458,7 +3458,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis +@@ -3456,7 +3456,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis void WebAppIntegrationTestDriver::CheckSiteHandlesFile( Site site, FileExtension file_extension) { @@ -45,7 +45,7 @@ if (!BeforeStateCheckAction(__FUNCTION__)) { return; } -@@ -3474,7 +3474,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile +@@ -3472,7 +3472,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile void WebAppIntegrationTestDriver::CheckSiteNotHandlesFile( Site site, FileExtension file_extension) { @@ -54,7 +54,7 @@ if (!BeforeStateCheckAction(__FUNCTION__)) { return; } -@@ -4288,7 +4288,7 @@ base::FilePath WebAppIntegrationTestDriver::GetShortcu +@@ -4289,7 +4289,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 -@@ -4488,7 +4488,7 @@ bool WebAppIntegrationTestDriver::IsShortcutAndIconCre +@@ -4489,7 +4489,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); -@@ -4532,7 +4532,7 @@ bool WebAppIntegrationTestDriver::DoIconColorsMatch(Pr +@@ -4533,7 +4533,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_webui_about_about__ui.cc b/www/chromium/files/patch-chrome_browser_ui_webui_about_about__ui.cc index cb24cbb88a4b..5bda687550f4 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_about_about__ui.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_about_about__ui.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/about/about_ui.cc.orig 2024-06-17 12:56:06 UTC +--- chrome/browser/ui/webui/about/about_ui.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/ui/webui/about/about_ui.cc -@@ -593,7 +593,7 @@ std::string ChromeURLs(content::BrowserContext* browse +@@ -596,7 +596,7 @@ std::string ChromeURLs(content::BrowserContext* browse return html; } @@ -9,7 +9,7 @@ std::string AboutLinuxProxyConfig() { std::string data; AppendHeader(&data, -@@ -648,7 +648,7 @@ void AboutUIHTMLSource::StartDataRequest( +@@ -651,7 +651,7 @@ void AboutUIHTMLSource::StartDataRequest( response = ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(idr); } 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 new file mode 100644 index 000000000000..9ee825c589ba --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_webui_certificate__manager_certificate__manager__handler.cc @@ -0,0 +1,11 @@ +--- chrome/browser/ui/webui/certificate_manager/certificate_manager_handler.cc.orig 2024-08-26 12:06:38 UTC ++++ chrome/browser/ui/webui/certificate_manager/certificate_manager_handler.cc +@@ -147,7 +147,7 @@ CertificateManagerPageHandler::GetCertSource( + "distrusted_certs", + cert_verifier::mojom::CertificateTrust::kDistrusted); + break; +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + case certificate_manager_v2::mojom::CertificateSource:: + kProvisionedClientCert: + source_ptr = CreateProvisionedClientCertSource(profile_); 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 new file mode 100644 index 000000000000..170f4fb64a7f --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc @@ -0,0 +1,29 @@ +--- chrome/browser/ui/webui/certificate_manager/client_cert_sources.cc.orig 2024-08-26 12:06:38 UTC ++++ chrome/browser/ui/webui/certificate_manager/client_cert_sources.cc +@@ -36,7 +36,7 @@ + #include "net/ssl/client_cert_store_mac.h" + #endif // BUILDFLAG(IS_MAC) + +-#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/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" +@@ -98,7 +98,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 +@@ -373,7 +373,7 @@ CreatePlatformClientCertSource() { + #endif + } + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + std::unique_ptr<CertificateManagerPageHandler::CertSource> + CreateProvisionedClientCertSource(Profile* profile) { + return std::make_unique<ClientCertSource>( 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 new file mode 100644 index 000000000000..7e694256236a --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.h @@ -0,0 +1,11 @@ +--- chrome/browser/ui/webui/certificate_manager/client_cert_sources.h.orig 2024-08-26 12:06:38 UTC ++++ chrome/browser/ui/webui/certificate_manager/client_cert_sources.h +@@ -15,7 +15,7 @@ class Profile; + std::unique_ptr<CertificateManagerPageHandler::CertSource> + CreatePlatformClientCertSource(); + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + std::unique_ptr<CertificateManagerPageHandler::CertSource> + CreateProvisionedClientCertSource(Profile* profile); + #endif 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 064695a59115..4515eb300d3f 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,6 +1,6 @@ ---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2024-07-30 11:12:21 UTC +--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -191,7 +191,7 @@ +@@ -189,7 +189,7 @@ #include "chrome/browser/ui/webui/chromeos/chrome_url_disabled/chrome_url_disabled_ui.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/ui/webui/webui_js_error/webui_js_error_ui.h" #endif -@@ -216,21 +216,21 @@ +@@ -214,21 +214,21 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -35,7 +35,7 @@ #include "chrome/browser/ui/webui/whats_new/whats_new_ui.h" #include "chrome/browser/ui/webui/whats_new/whats_new_util.h" #endif -@@ -384,7 +384,7 @@ bool IsAboutUI(const GURL& url) { +@@ -378,7 +378,7 @@ bool IsAboutUI(const GURL& url) { #if !BUILDFLAG(IS_ANDROID) || url.host_piece() == chrome::kChromeUITermsHost #endif @@ -44,7 +44,7 @@ || url.host_piece() == chrome::kChromeUILinuxProxyConfigHost #endif #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -591,7 +591,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -572,7 +572,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we if (url.host_piece() == chrome::kChromeUIMobileSetupHost) return &NewWebUI<ash::cellular_setup::MobileSetupUI>; #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -53,7 +53,7 @@ if (url.host_piece() == chrome::kChromeUIWebUIJsErrorHost) return &NewWebUI<WebUIJsErrorUI>; #endif -@@ -647,7 +647,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -628,7 +628,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we if (url.host_piece() == chrome::kChromeUINaClHost) return &NewWebUI<NaClUI>; #endif @@ -62,7 +62,7 @@ defined(TOOLKIT_VIEWS)) || \ defined(USE_AURA) if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost) -@@ -678,7 +678,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -659,7 +659,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we if (url.host_piece() == chrome::kChromeUIWebuiGalleryHost) { return &NewWebUI<WebuiGalleryUI>; } @@ -71,7 +71,7 @@ if (url.host_piece() == chrome::kChromeUIWhatsNewHost && whats_new::IsEnabled()) { return &NewWebUI<WhatsNewUI>; -@@ -697,26 +697,26 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -678,26 +678,26 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we } #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -103,7 +103,7 @@ if (url.host_piece() == chrome::kChromeUIWebAppSettingsHost) return &NewWebUI<WebAppSettingsUI>; #endif -@@ -955,7 +955,7 @@ base::RefCountedMemory* ChromeWebUIControllerFactory:: +@@ -936,7 +936,7 @@ base::RefCountedMemory* ChromeWebUIControllerFactory:: if (page_url.host_piece() == chrome::kChromeUINewTabPageHost) return NewTabPageUI::GetFaviconResourceBytes(scale_factor); 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 new file mode 100644 index 000000000000..3985910131a5 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_webui_interstitials_interstitial__ui.cc @@ -0,0 +1,29 @@ +--- chrome/browser/ui/webui/interstitials/interstitial_ui.cc.orig 2024-08-26 12:06:38 UTC ++++ chrome/browser/ui/webui/interstitials/interstitial_ui.cc +@@ -70,7 +70,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 +@@ -376,7 +376,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) { + const GURL kRequestUrl("https://supervised-user-verification.example.net"); +@@ -570,7 +570,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(web_contents); + #endif 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 92aa4a1661bb..30fbbf9754b0 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,6 +1,6 @@ ---- chrome/browser/ui/webui/management/management_ui_constants.cc.orig 2024-06-17 12:56:06 UTC +--- chrome/browser/ui/webui/management/management_ui_constants.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/ui/webui/management/management_ui_constants.cc -@@ -78,12 +78,12 @@ const char kProfileReportingBrowser[] = "profileReport +@@ -82,12 +82,12 @@ const char kProfileReportingBrowser[] = "profileReport const char kProfileReportingExtension[] = "profileReportingExtension"; const char kProfileReportingPolicy[] = "profileReportingPolicy"; 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 315a38d04c05..b0ca0d9b969b 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-06-17 12:56:06 UTC +--- chrome/browser/ui/webui/management/management_ui_handler.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/ui/webui/management/management_ui_handler.cc @@ -58,7 +58,7 @@ #include "ui/base/l10n/l10n_util.h" @@ -9,7 +9,7 @@ #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) -@@ -354,7 +354,7 @@ void ManagementUIHandler::AddReportingInfo(base::Value +@@ -365,7 +365,7 @@ void ManagementUIHandler::AddReportingInfo(base::Value report_sources->Append(std::move(data)); } } @@ -18,7 +18,7 @@ // Insert the device signals consent disclosure at the end of browser // reporting section. auto* user_permission_service = GetUserPermissionService(); -@@ -532,7 +532,7 @@ policy::PolicyService* ManagementUIHandler::GetPolicyS +@@ -543,7 +543,7 @@ policy::PolicyService* ManagementUIHandler::GetPolicyS ->policy_service(); } 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 e12a440b44db..16bd75ca9bfc 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-02-23 21:04:38 UTC +--- 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 @@ -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 -@@ -71,7 +71,7 @@ std::vector<std::unique_ptr<PasswordPromoCardBase>> Ge +@@ -75,7 +75,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 657953d3d9a2..aee8617f746b 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,6 +1,6 @@ ---- chrome/browser/ui/webui/searchbox/searchbox_handler.cc.orig 2024-07-30 11:12:21 UTC +--- chrome/browser/ui/webui/searchbox/searchbox_handler.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/ui/webui/searchbox/searchbox_handler.cc -@@ -105,7 +105,7 @@ const char* kMacShareIconResourceName = +@@ -108,7 +108,7 @@ const char* kMacShareIconResourceName = #elif BUILDFLAG(IS_WIN) const char* kWinShareIconResourceName = "//resources/cr_components/searchbox/icons/win_share.svg"; @@ -9,7 +9,7 @@ const char* kLinuxShareIconResourceName = "//resources/cr_components/searchbox/icons/share.svg"; #else -@@ -165,7 +165,7 @@ static void DefineChromeRefreshRealboxIcons() { +@@ -168,7 +168,7 @@ static void DefineChromeRefreshRealboxIcons() { #elif BUILDFLAG(IS_WIN) kWinShareIconResourceName = "//resources/cr_components/searchbox/icons/win_share_cr23.svg"; @@ -18,7 +18,7 @@ kLinuxShareIconResourceName = "//resources/cr_components/searchbox/icons/share_cr23.svg"; #else -@@ -671,7 +671,7 @@ std::string SearchboxHandler::ActionVectorIconToResour +@@ -675,7 +675,7 @@ std::string SearchboxHandler::ActionVectorIconToResour icon.name == omnibox::kShareWinChromeRefreshIcon.name) { return kWinShareIconResourceName; } diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_settings_accessibility__main__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_settings_accessibility__main__handler.cc deleted file mode 100644 index f7c27c32d677..000000000000 --- a/www/chromium/files/patch-chrome_browser_ui_webui_settings_accessibility__main__handler.cc +++ /dev/null @@ -1,46 +0,0 @@ ---- chrome/browser/ui/webui/settings/accessibility_main_handler.cc.orig 2024-07-30 11:12:21 UTC -+++ chrome/browser/ui/webui/settings/accessibility_main_handler.cc -@@ -19,7 +19,7 @@ - #include "content/public/browser/web_contents.h" - #include "content/public/browser/web_ui.h" - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - #include "ui/accessibility/accessibility_features.h" - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) - -@@ -39,7 +39,7 @@ void AccessibilityMainHandler::RegisterMessages() { - base::BindRepeating( - &AccessibilityMainHandler::HandleCheckAccessibilityImageLabels, - base::Unretained(this))); --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - web_ui()->RegisterMessageCallback( - "getScreenAiInstallState", - base::BindRepeating( -@@ -56,7 +56,7 @@ void AccessibilityMainHandler::OnJavascriptAllowed() { - base::Unretained(this))); - #endif // BUILDFLAG(IS_CHROMEOS_ASH) - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - if (features::IsPdfOcrEnabled() || features::IsMainNodeAnnotationsEnabled()) { - CHECK(!component_ready_observer_.IsObserving()); - component_ready_observer_.Observe( -@@ -70,14 +70,14 @@ void AccessibilityMainHandler::OnJavascriptDisallowed( - accessibility_subscription_ = {}; - #endif // BUILDFLAG(IS_CHROMEOS_ASH) - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - if (features::IsPdfOcrEnabled() || features::IsMainNodeAnnotationsEnabled()) { - component_ready_observer_.Reset(); - } - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) - } - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - void AccessibilityMainHandler::DownloadProgressChanged(double progress) { - CHECK_GE(progress, 0.0); - CHECK_LE(progress, 1.0); diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_settings_accessibility__main__handler.h b/www/chromium/files/patch-chrome_browser_ui_webui_settings_accessibility__main__handler.h deleted file mode 100644 index b9ec3bafed68..000000000000 --- a/www/chromium/files/patch-chrome_browser_ui_webui_settings_accessibility__main__handler.h +++ /dev/null @@ -1,47 +0,0 @@ ---- chrome/browser/ui/webui/settings/accessibility_main_handler.h.orig 2024-02-23 21:04:38 UTC -+++ chrome/browser/ui/webui/settings/accessibility_main_handler.h -@@ -13,7 +13,7 @@ - #include "chrome/browser/ash/accessibility/accessibility_manager.h" - #endif // BUILDFLAG(IS_CHROMEOS_ASH) - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - #include "base/scoped_observation.h" - #include "chrome/browser/screen_ai/screen_ai_install_state.h" - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -@@ -24,7 +24,7 @@ namespace settings { - // chrome://settings/accessibility. - class AccessibilityMainHandler - : public ::settings::SettingsPageUIHandler --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - , - public screen_ai::ScreenAIInstallState::Observer - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -@@ -40,7 +40,7 @@ class AccessibilityMainHandler - void OnJavascriptAllowed() override; - void OnJavascriptDisallowed() override; - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - // screen_ai::ScreenAIInstallState::Observer: - void DownloadProgressChanged(double progress) override; - void StateChanged(screen_ai::ScreenAIInstallState::State state) override; -@@ -50,7 +50,7 @@ class AccessibilityMainHandler - void HandleGetScreenReaderState(const base::Value::List& args); - void HandleCheckAccessibilityImageLabels(const base::Value::List& args); - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - void HandleGetScreenAIInstallState(const base::Value::List& args); - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) - -@@ -63,7 +63,7 @@ class AccessibilityMainHandler - base::CallbackListSubscription accessibility_subscription_; - #endif // BUILDFLAG(IS_CHROMEOS_ASH) - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - base::ScopedObservation<screen_ai::ScreenAIInstallState, - screen_ai::ScreenAIInstallState::Observer> - component_ready_observer_{this}; diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc index f744fa8fd2d3..0dccbdf3d6d5 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/settings/appearance_handler.cc.orig 2022-10-24 13:33:33 UTC +--- chrome/browser/ui/webui/settings/appearance_handler.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/ui/webui/settings/appearance_handler.cc -@@ -28,7 +28,7 @@ void AppearanceHandler::RegisterMessages() { +@@ -34,7 +34,7 @@ void AppearanceHandler::RegisterMessages() { "useDefaultTheme", base::BindRepeating(&AppearanceHandler::HandleUseTheme, base::Unretained(this), ui::SystemTheme::kDefault)); 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 78d225b51a1c..69173fb15776 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-07-30 11:12:21 UTC +--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -142,7 +142,7 @@ +@@ -141,7 +141,7 @@ #include "chrome/browser/ui/chrome_pages.h" #endif @@ -9,7 +9,7 @@ #include "ui/display/screen.h" #endif -@@ -161,7 +161,7 @@ +@@ -160,7 +160,7 @@ #include "chrome/browser/ui/webui/certificate_manager_localized_strings_provider.h" #endif @@ -27,34 +27,25 @@ {"overscrollHistoryNavigationTitle", IDS_SETTINGS_OVERSCROLL_HISTORY_NAVIGATION_TITLE}, {"overscrollHistoryNavigationSubtitle", -@@ -303,7 +303,7 @@ void AddA11yStrings(content::WebUIDataSource* html_sou - html_source->AddLocalizedStrings(kLocalizedStrings); - - #if (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)) && \ -- BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) -+ BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) || BUILDFLAG(IS_BSD) - html_source->AddBoolean( - "mainNodeAnnotationsEnabled", - base::FeatureList::IsEnabled(features::kMainNodeAnnotations)); -@@ -422,7 +422,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht - {"huge", IDS_SETTINGS_HUGE_FONT_SIZE}, +@@ -405,7 +405,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}, -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) {"gtkTheme", IDS_SETTINGS_GTK_THEME}, {"useGtkTheme", IDS_SETTINGS_USE_GTK_THEME}, {"qtTheme", IDS_SETTINGS_QT_THEME}, -@@ -432,7 +432,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht - #else - {"resetToDefaultTheme", IDS_SETTINGS_RESET_TO_DEFAULT_THEME}, +@@ -413,7 +413,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht + {"classicTheme", IDS_SETTINGS_CLASSIC_THEME}, + {"useClassicTheme", IDS_SETTINGS_USE_CLASSIC_THEME}, #endif -#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_LACROS) {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS}, #endif #if BUILDFLAG(IS_MAC) -@@ -458,7 +458,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -441,7 +441,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 new file mode 100644 index 000000000000..f3d1bce351c2 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc @@ -0,0 +1,11 @@ +--- chrome/browser/ui/webui/signin/profile_picker_handler.cc.orig 2024-08-26 12:06:38 UTC ++++ chrome/browser/ui/webui/signin/profile_picker_handler.cc +@@ -203,7 +203,7 @@ base::Value::Dict CreateProfileEntry(const ProfileAttr + + if (AccountInfo::IsManaged(entry->GetHostedDomain())) { + profile_entry.Set("avatarBadge", "cr:domain"); +-#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 (base::FeatureList::IsEnabled( + supervised_user::kShowKiteForSupervisedUsers) && + entry->IsSupervised()) { diff --git a/www/chromium/files/patch-chrome_browser_visited__url__ranking_visited__url__ranking__service__factory.cc b/www/chromium/files/patch-chrome_browser_visited__url__ranking_visited__url__ranking__service__factory.cc index 720a960a5fae..7921cd180f48 100644 --- a/www/chromium/files/patch-chrome_browser_visited__url__ranking_visited__url__ranking__service__factory.cc +++ b/www/chromium/files/patch-chrome_browser_visited__url__ranking_visited__url__ranking__service__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/visited_url_ranking/visited_url_ranking_service_factory.cc.orig 2024-07-30 11:12:21 UTC +--- chrome/browser/visited_url_ranking/visited_url_ranking_service_factory.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/visited_url_ranking/visited_url_ranking_service_factory.cc -@@ -39,7 +39,7 @@ +@@ -41,7 +41,7 @@ #include "components/visited_url_ranking/public/visited_url_ranking_service.h" #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ #include "chrome/browser/visited_url_ranking/desktop_tab_model_url_visit_data_fetcher.h" #elif BUILDFLAG(IS_ANDROID) #include "chrome/browser/visited_url_ranking/android_tab_model_url_visit_data_fetcher.h" -@@ -99,7 +99,7 @@ VisitedURLRankingServiceFactory::BuildServiceInstanceF +@@ -114,7 +114,7 @@ VisitedURLRankingServiceFactory::BuildServiceInstanceF std::map<Fetcher, std::unique_ptr<URLVisitDataFetcher>> data_fetchers; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-chrome_browser_web__applications_commands_launch__web__app__command.cc b/www/chromium/files/patch-chrome_browser_web__applications_commands_launch__web__app__command.cc new file mode 100644 index 000000000000..a307657ca095 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_web__applications_commands_launch__web__app__command.cc @@ -0,0 +1,11 @@ +--- chrome/browser/web_applications/commands/launch_web_app_command.cc.orig 2024-08-26 12:06:38 UTC ++++ chrome/browser/web_applications/commands/launch_web_app_command.cc +@@ -98,7 +98,7 @@ void LaunchWebAppCommand::StartWithLock(std::unique_pt + // OsIntegrationTestOverride can use the xdg install command to detect + // install. + SynchronizeOsOptions options; +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + options.add_shortcut_to_desktop = true; + #endif + lock_->os_integration_manager().Synchronize( diff --git a/www/chromium/files/patch-chrome_browser_web__applications_commands_set__user__display__mode__command.cc b/www/chromium/files/patch-chrome_browser_web__applications_commands_set__user__display__mode__command.cc new file mode 100644 index 000000000000..55114735ee08 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_web__applications_commands_set__user__display__mode__command.cc @@ -0,0 +1,11 @@ +--- chrome/browser/web_applications/commands/set_user_display_mode_command.cc.orig 2024-08-26 12:06:38 UTC ++++ chrome/browser/web_applications/commands/set_user_display_mode_command.cc +@@ -57,7 +57,7 @@ void SetUserDisplayModeCommand::StartWithLock( + // OsIntegrationTestOverride can use the xdg install command to detect + // install. + SynchronizeOsOptions options; +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + options.add_shortcut_to_desktop = true; + #endif + app_lock_->os_integration_manager().Synchronize( diff --git a/www/chromium/files/patch-chrome_browser_web__applications_os__integration_os__integration__manager.cc b/www/chromium/files/patch-chrome_browser_web__applications_os__integration_os__integration__manager.cc index 31cf15bd8307..7a5486106d89 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_os__integration_os__integration__manager.cc +++ b/www/chromium/files/patch-chrome_browser_web__applications_os__integration_os__integration__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/os_integration/os_integration_manager.cc.orig 2024-07-30 11:12:21 UTC +--- chrome/browser/web_applications/os_integration/os_integration_manager.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/web_applications/os_integration/os_integration_manager.cc -@@ -651,7 +651,7 @@ std::unique_ptr<ShortcutInfo> OsIntegrationManager::Bu +@@ -649,7 +649,7 @@ std::unique_ptr<ShortcutInfo> OsIntegrationManager::Bu } } diff --git a/www/chromium/files/patch-chrome_browser_web__applications_os__integration_shortcut__sub__manager.cc b/www/chromium/files/patch-chrome_browser_web__applications_os__integration_shortcut__sub__manager.cc index a36e1ae0c180..6f9edb67197c 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_os__integration_shortcut__sub__manager.cc +++ b/www/chromium/files/patch-chrome_browser_web__applications_os__integration_shortcut__sub__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/os_integration/shortcut_sub_manager.cc.orig 2024-07-30 11:12:21 UTC +--- chrome/browser/web_applications/os_integration/shortcut_sub_manager.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/web_applications/os_integration/shortcut_sub_manager.cc -@@ -186,7 +186,7 @@ void ShortcutSubManager::Execute( +@@ -191,7 +191,7 @@ void ShortcutSubManager::Execute( return; } diff --git a/www/chromium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc b/www/chromium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc index 771573330164..ca3bc40ec775 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc +++ b/www/chromium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc @@ -1,4 +1,4 @@ ---- chrome/browser/web_applications/test/os_integration_test_override_impl.cc.orig 2024-05-21 18:07:39 UTC +--- chrome/browser/web_applications/test/os_integration_test_override_impl.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/web_applications/test/os_integration_test_override_impl.cc @@ -46,7 +46,7 @@ #include "third_party/skia/include/core/SkBitmap.h" @@ -27,7 +27,7 @@ base::FilePath desktop_shortcut_path = GetShortcutPath(profile, desktop(), app_id, app_name); LOG(INFO) << desktop_shortcut_path; -@@ -306,7 +306,7 @@ bool OsIntegrationTestOverrideImpl::DeleteApplicationM +@@ -314,7 +314,7 @@ bool OsIntegrationTestOverrideImpl::DeleteApplicationM } #endif // BUILDFLAG(IS_WIN) @@ -36,7 +36,7 @@ bool OsIntegrationTestOverrideImpl::DeleteDesktopDirOnLinux() { if (desktop_.IsValid()) { return desktop_.Delete(); -@@ -320,7 +320,7 @@ bool OsIntegrationTestOverrideImpl::IsRunOnOsLoginEnab +@@ -328,7 +328,7 @@ bool OsIntegrationTestOverrideImpl::IsRunOnOsLoginEnab Profile* profile, const webapps::AppId& app_id, const std::string& app_name) { @@ -45,7 +45,7 @@ std::string shortcut_filename = "chrome-" + app_id + "-" + profile->GetBaseName().value() + ".desktop"; return base::PathExists(startup().Append(shortcut_filename)); -@@ -376,7 +376,7 @@ bool OsIntegrationTestOverrideImpl::IsFileExtensionHan +@@ -384,7 +384,7 @@ bool OsIntegrationTestOverrideImpl::IsFileExtensionHan is_file_handled = shell_integration::CanApplicationHandleURL(app_path, test_file_url); base::DeleteFile(test_file_path); @@ -54,7 +54,7 @@ base::FilePath user_applications_dir = applications(); bool database_update_called = false; for (const LinuxFileRegistration& command : linux_file_registration_) { -@@ -419,7 +419,7 @@ OsIntegrationTestOverrideImpl::GetShortcutIconTopLeftC +@@ -427,7 +427,7 @@ OsIntegrationTestOverrideImpl::GetShortcutIconTopLeftC return std::nullopt; } return GetIconTopLeftColorFromShortcutFile(shortcut_path); @@ -63,7 +63,7 @@ WebAppProvider* provider = WebAppProvider::GetForLocalAppsUnchecked(profile); if (!provider) { return std::nullopt; -@@ -469,7 +469,7 @@ base::FilePath OsIntegrationTestOverrideImpl::GetShort +@@ -477,7 +477,7 @@ base::FilePath OsIntegrationTestOverrideImpl::GetShort app_installed_profiles.end()) { return shortcut_path; } @@ -72,7 +72,7 @@ std::string shortcut_filename = "chrome-" + app_id + "-" + profile->GetBaseName().value() + ".desktop"; base::FilePath shortcut_path = shortcut_dir.Append(shortcut_filename); -@@ -495,7 +495,7 @@ bool OsIntegrationTestOverrideImpl::IsShortcutCreated( +@@ -502,7 +502,7 @@ bool OsIntegrationTestOverrideImpl::IsShortcutCreated( base::FilePath app_shortcut_path = GetShortcutPath(profile, chrome_apps_folder(), app_id, app_name); return base::PathExists(app_shortcut_path); @@ -81,7 +81,7 @@ base::FilePath desktop_shortcut_path = GetShortcutPath(profile, desktop(), app_id, app_name); return base::PathExists(desktop_shortcut_path); -@@ -683,7 +683,7 @@ void OsIntegrationTestOverrideImpl::EnableOrDisablePat +@@ -690,7 +690,7 @@ void OsIntegrationTestOverrideImpl::EnableOrDisablePat } #endif // BUILDFLAG(IS_MAC) @@ -90,7 +90,7 @@ base::FilePath OsIntegrationTestOverrideImpl::desktop() { return desktop_.GetPath(); } -@@ -734,7 +734,7 @@ OsIntegrationTestOverrideImpl::OsIntegrationTestOverri +@@ -741,7 +741,7 @@ OsIntegrationTestOverrideImpl::OsIntegrationTestOverri success = chrome_apps_folder_.CreateUniqueTempDirUnderPath( outer_temp_dir_.GetPath()); CHECK(success); @@ -99,7 +99,7 @@ success = desktop_.CreateUniqueTempDirUnderPath(outer_temp_dir_.GetPath()); CHECK(success); success = startup_.CreateUniqueTempDirUnderPath(outer_temp_dir_.GetPath()); -@@ -747,7 +747,7 @@ OsIntegrationTestOverrideImpl::OsIntegrationTestOverri +@@ -754,7 +754,7 @@ OsIntegrationTestOverrideImpl::OsIntegrationTestOverri CHECK(success); #endif @@ -108,10 +108,10 @@ auto callback = base::BindRepeating([](base::FilePath filename_in, std::string xdg_command, std::string file_contents) { -@@ -819,7 +819,7 @@ OsIntegrationTestOverrideImpl::~OsIntegrationTestOverr +@@ -826,7 +826,7 @@ OsIntegrationTestOverrideImpl::~OsIntegrationTestOverr EXPECT_TRUE(!startup_.IsValid() || startup_.Delete()); #elif BUILDFLAG(IS_MAC) - EXPECT_TRUE(!chrome_apps_folder_.IsValid() || chrome_apps_folder_.Delete()); + EXPECT_TRUE(!chrome_apps_folder_.IsValid() || DeleteChromeAppsDir()); -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) EXPECT_TRUE(!desktop_.IsValid() || desktop_.Delete()); 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 cd485d915d56..c6fbced77908 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-07-30 11:12:21 UTC +--- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/webauthn/chrome_authenticator_request_delegate.cc -@@ -972,7 +972,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureDisc +@@ -1095,7 +1095,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureDisc g_observer->ConfiguringCable(request_type); } diff --git a/www/chromium/files/patch-chrome_browser_webauthn_enclave__manager.cc b/www/chromium/files/patch-chrome_browser_webauthn_enclave__manager.cc index cc768be1a3fe..f940b7885689 100644 --- a/www/chromium/files/patch-chrome_browser_webauthn_enclave__manager.cc +++ b/www/chromium/files/patch-chrome_browser_webauthn_enclave__manager.cc @@ -1,20 +1,20 @@ ---- chrome/browser/webauthn/enclave_manager.cc.orig 2024-07-30 11:12:21 UTC +--- chrome/browser/webauthn/enclave_manager.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/browser/webauthn/enclave_manager.cc -@@ -646,7 +646,7 @@ base::flat_set<std::string> GetGaiaIDs( - } +@@ -686,7 +686,7 @@ base::flat_set<std::string> GetGaiaIDs( std::string UserVerifyingLabelToString(crypto::UserVerifyingKeyLabel label) { --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS_ASH) ++ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) return label; #else return std::string("placeholder"); -@@ -655,7 +655,7 @@ std::string UserVerifyingLabelToString(crypto::UserVer - +@@ -696,7 +696,7 @@ std::string UserVerifyingLabelToString(crypto::UserVer std::optional<crypto::UserVerifyingKeyLabel> UserVerifyingKeyLabelFromString( std::string saved_label) { --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS_ASH) ++ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) return saved_label; #else return std::nullopt; diff --git a/www/chromium/files/patch-chrome_browser_webauthn_gpm__user__verification__policy.cc b/www/chromium/files/patch-chrome_browser_webauthn_gpm__user__verification__policy.cc new file mode 100644 index 000000000000..c4f1b807af46 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_webauthn_gpm__user__verification__policy.cc @@ -0,0 +1,11 @@ +--- chrome/browser/webauthn/gpm_user_verification_policy.cc.orig 2024-08-26 12:06:38 UTC ++++ chrome/browser/webauthn/gpm_user_verification_policy.cc +@@ -17,7 +17,7 @@ bool GpmWillDoUserVerification(device::UserVerificatio + return platform_has_biometrics; + #elif BUILDFLAG(IS_MAC) + return platform_has_biometrics; +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return false; + #else + // This default is for unit tests. diff --git a/www/chromium/files/patch-chrome_browser_webauthn_unexportable__key__utils.cc b/www/chromium/files/patch-chrome_browser_webauthn_unexportable__key__utils.cc new file mode 100644 index 000000000000..ed72fceaad5c --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_webauthn_unexportable__key__utils.cc @@ -0,0 +1,11 @@ +--- chrome/browser/webauthn/unexportable_key_utils.cc.orig 2024-08-26 12:06:38 UTC ++++ chrome/browser/webauthn/unexportable_key_utils.cc +@@ -33,7 +33,7 @@ GetWebAuthnUnexportableKeyProvider() { + // If there is a scoped UnexportableKeyProvider configured, we always use + // that so that tests can still override the key provider. + const bool use_software_provider = +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + !crypto::internal::HasScopedUnexportableKeyProvider(); + #else + false; diff --git a/www/chromium/files/patch-chrome_common_chrome__features.cc b/www/chromium/files/patch-chrome_common_chrome__features.cc index 2d560c6f1987..511c38cf33fb 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-07-30 11:12:21 UTC +--- chrome/common/chrome_features.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/common/chrome_features.cc -@@ -81,7 +81,7 @@ BASE_FEATURE(kUseAdHocSigningForWebAppShims, +@@ -75,7 +75,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, -@@ -99,7 +99,7 @@ BASE_FEATURE(kAutofillPasswordSurvey, +@@ -93,7 +93,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. -@@ -277,7 +277,7 @@ BASE_FEATURE(kDesktopPWAsElidedExtensionsMenu, +@@ -260,7 +260,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 -@@ -319,7 +319,7 @@ BASE_FEATURE(kDesktopPWAsTabStripSettings, +@@ -309,7 +309,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. -@@ -876,7 +876,7 @@ BASE_FEATURE(kKAnonymityServiceStorage, +@@ -897,7 +897,7 @@ BASE_FEATURE(kKAnonymityServiceStorage, "KAnonymityServiceStorage", base::FEATURE_ENABLED_BY_DEFAULT); @@ -45,7 +45,7 @@ BASE_FEATURE(kLinuxLowMemoryMonitor, "LinuxLowMemoryMonitor", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -889,7 +889,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit +@@ -910,7 +910,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 e37c9d6776fa..8faeb0fcf9f7 100644 --- a/www/chromium/files/patch-chrome_common_chrome__features.h +++ b/www/chromium/files/patch-chrome_common_chrome__features.h @@ -1,6 +1,6 @@ ---- chrome/common/chrome_features.h.orig 2024-07-30 11:12:21 UTC +--- chrome/common/chrome_features.h.orig 2024-08-26 12:06:38 UTC +++ chrome/common/chrome_features.h -@@ -60,13 +60,13 @@ BASE_DECLARE_FEATURE(kUseAdHocSigningForWebAppShims); +@@ -55,13 +55,13 @@ BASE_DECLARE_FEATURE(kUseAdHocSigningForWebAppShims); #endif // BUILDFLAG(IS_MAC) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -16,7 +16,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kBackgroundModeAllowRestart); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -193,7 +193,7 @@ BASE_DECLARE_FEATURE(kDesktopPWAsPreventClose); +@@ -192,7 +192,7 @@ BASE_DECLARE_FEATURE(kDesktopPWAsPreventClose); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kDesktopPWAsTabStripSettings); @@ -25,7 +25,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kChromeAppsDeprecation); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kShortcutsNotApps); -@@ -529,7 +529,7 @@ BASE_DECLARE_FEATURE(kKAnonymityServiceOHTTPRequests); +@@ -545,7 +545,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; -@@ -537,7 +537,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) +@@ -553,7 +553,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__switches.cc b/www/chromium/files/patch-chrome_common_chrome__switches.cc index 8a663cee6cde..251d4826278d 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-07-30 11:12:21 UTC +--- chrome/common/chrome_switches.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/common/chrome_switches.cc -@@ -867,14 +867,14 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket- +@@ -898,14 +898,14 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket- #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.h b/www/chromium/files/patch-chrome_common_chrome__switches.h index 14cf6e911416..a2dd168f5590 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-07-30 11:12:21 UTC +--- chrome/common/chrome_switches.h.orig 2024-08-26 12:06:38 UTC +++ chrome/common/chrome_switches.h -@@ -274,12 +274,12 @@ extern const char kAllowNaClSocketAPI[]; +@@ -279,12 +279,12 @@ extern const char kAllowNaClSocketAPI[]; #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/chromium/files/patch-chrome_common_pref__names.h b/www/chromium/files/patch-chrome_common_pref__names.h index ed773cfae3b3..a4a801ccf8ad 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-07-30 11:12:21 UTC +--- chrome/common/pref_names.h.orig 2024-08-26 12:06:38 UTC +++ chrome/common/pref_names.h -@@ -1340,7 +1340,7 @@ inline constexpr char kUseAshProxy[] = "lacros.proxy.u +@@ -1364,7 +1364,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 -@@ -1483,7 +1483,7 @@ inline constexpr char kShowUpdatePromotionInfoBar[] = +@@ -1507,7 +1507,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"; -@@ -2088,7 +2088,7 @@ inline constexpr char kDownloadDefaultDirectory[] = +@@ -2112,7 +2112,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 -@@ -2528,14 +2528,14 @@ inline constexpr char kMediaStorageIdSalt[] = "media.s +@@ -2549,14 +2549,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"; -@@ -2613,7 +2613,7 @@ inline constexpr char kAmbientAuthenticationInPrivateM +@@ -2634,7 +2634,7 @@ inline constexpr char kAmbientAuthenticationInPrivateM inline constexpr char kBasicAuthOverHttpEnabled[] = "auth.basic_over_http_enabled"; @@ -53,16 +53,16 @@ // Boolean that specifies whether OK-AS-DELEGATE flag from KDC is respected // along with kAuthNegotiateDelegateAllowlist. inline constexpr char kAuthNegotiateDelegateByKdcPolicy[] = -@@ -3133,7 +3133,7 @@ inline constexpr char kDeviceWeeklyScheduledSuspend[] - +@@ -3164,7 +3164,7 @@ inline constexpr char kDeviceWeeklyScheduledSuspend[] #endif // BUILDFLAG(IS_CHROMEOS) --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ +- BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) // Defines administrator-set availability of Chrome for Testing. inline constexpr char kChromeForTestingAllowed[] = "chrome_for_testing.allowed"; #endif -@@ -3706,7 +3706,7 @@ inline constexpr char kFileOrDirectoryPickerWithoutGes +@@ -3760,7 +3760,7 @@ inline constexpr char kFileOrDirectoryPickerWithoutGes inline constexpr char kSandboxExternalProtocolBlocked[] = "profile.sandbox_external_protocol_blocked"; @@ -71,16 +71,16 @@ // Boolean that indicates if system notifications are allowed to be used in // place of Chrome notifications. inline constexpr char kAllowSystemNotifications[] = -@@ -3755,7 +3755,7 @@ inline constexpr char kCACertificateManagementAllowed[ +@@ -4034,7 +4034,7 @@ inline constexpr char kLensDesktopNTPSearchEnabled[] = + "policy.lens_desktop_ntp_search_enabled"; #endif - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - inline constexpr char kEnforceLocalAnchorConstraintsEnabled[] = - "enforce_local_anchor_constraints_enabled"; - #endif -@@ -4063,7 +4063,7 @@ inline constexpr char kPrintingOAuth2AuthorizationServ +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + // 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 +@@ -4128,7 +4128,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 9353b149ebdd..40b40603eebb 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-07-30 11:12:21 UTC +--- chrome/common/url_constants.h.orig 2024-08-26 12:06:38 UTC +++ chrome/common/url_constants.h -@@ -907,7 +907,7 @@ inline constexpr char kOutdatedPluginLearnMoreURL[] = +@@ -927,7 +927,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.cc b/www/chromium/files/patch-chrome_common_webui__url__constants.cc index 276d71e70641..77ec404671be 100644 --- a/www/chromium/files/patch-chrome_common_webui__url__constants.cc +++ b/www/chromium/files/patch-chrome_common_webui__url__constants.cc @@ -1,103 +1,37 @@ ---- chrome/common/webui_url_constants.cc.orig 2024-07-30 11:12:21 UTC +--- chrome/common/webui_url_constants.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/common/webui_url_constants.cc -@@ -259,7 +259,7 @@ const char kChromeUIVersionURL[] = "chrome://version/" - const char kChromeUIWelcomeHost[] = "welcome"; - const char kChromeUIWelcomeURL[] = "chrome://welcome/"; - --#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 kChromeUIWhatsNewHost[] = "whats-new"; - const char kChromeUIWhatsNewURL[] = "chrome://whats-new/"; - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -523,18 +523,18 @@ const char kOsUISystemURL[] = "os://system"; - const char kOsUIVersionURL[] = "os://version"; - #endif - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - const char kChromeUIWebUIJsErrorHost[] = "webuijserror"; - const char kChromeUIWebUIJsErrorURL[] = "chrome://webuijserror/"; - #endif - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS_ASH) -+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) - const char kChromeUIConnectorsInternalsHost[] = "connectors-internals"; - #endif - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - const char kChromeUIDiscardsHost[] = "discards"; - const char kChromeUIDiscardsURL[] = "chrome://discards/"; - #endif -@@ -549,14 +549,14 @@ const char kChromeUILinuxProxyConfigHost[] = "linux-pr - #endif - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ -- BUILDFLAG(IS_ANDROID) -+ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - const char kChromeUISandboxHost[] = "sandbox"; - #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) || \ -- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) - const char kChromeUIBrowserSwitchHost[] = "browser-switch"; - const char kChromeUIBrowserSwitchURL[] = "chrome://browser-switch/"; - const char kChromeUIIntroHost[] = "intro"; -@@ -575,7 +575,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro - const char kChromeUIProfilePickerStartupQuery[] = "startup"; - #endif - --#if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \ -+#if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && \ - defined(TOOLKIT_VIEWS)) || \ - defined(USE_AURA) - const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog"; -@@ -654,7 +654,7 @@ const char kTrackingProtectionSubPagePath[] = "/tracki - const char kCookiesSubPagePath[] = "/cookies"; - #endif - --#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 kChromeUIWebAppSettingsURL[] = "chrome://app-settings/"; - const char kChromeUIWebAppSettingsHost[] = "app-settings"; - #endif -@@ -802,21 +802,21 @@ const char* const kChromeHostURLs[] = { - kChromeUIAssistantOptInHost, +@@ -197,21 +197,21 @@ base::span<const base::cstring_view> ChromeURLHosts() + kChromeUIAssistantOptInHost, #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS_ASH) + BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) - kChromeUIConnectorsInternalsHost, + kChromeUIConnectorsInternalsHost, #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - kChromeUIDiscardsHost, + kChromeUIDiscardsHost, #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - kChromeUIWebAppSettingsHost, + kChromeUIWebAppSettingsHost, #endif #if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_ANDROID) - kChromeUILinuxProxyConfigHost, + kChromeUILinuxProxyConfigHost, #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_ANDROID) + BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - kChromeUISandboxHost, + kChromeUISandboxHost, #endif #if BUILDFLAG(IS_WIN) -@@ -883,7 +883,7 @@ const char* const kChromeDebugURLs[] = { - blink::kChromeUIGpuJavaCrashURL, - kChromeUIJavaCrashURL, +@@ -284,7 +284,7 @@ base::span<const base::cstring_view> ChromeDebugURLs() + blink::kChromeUIGpuJavaCrashURL, + kChromeUIJavaCrashURL, #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - kChromeUIWebUIJsErrorURL, + kChromeUIWebUIJsErrorURL, #endif - kChromeUIQuitURL, + kChromeUIQuitURL, 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 76a123635366..051929de4db6 100644 --- a/www/chromium/files/patch-chrome_common_webui__url__constants.h +++ b/www/chromium/files/patch-chrome_common_webui__url__constants.h @@ -1,56 +1,56 @@ ---- chrome/common/webui_url_constants.h.orig 2024-07-30 11:12:21 UTC +--- chrome/common/webui_url_constants.h.orig 2024-08-26 12:06:38 UTC +++ chrome/common/webui_url_constants.h -@@ -438,23 +438,23 @@ extern const char kOsUISystemURL[]; - extern const char kOsUIVersionURL[]; +@@ -564,24 +564,24 @@ inline constexpr char16_t kOsUISystemURL[] = u"os://sy + inline constexpr char kOsUIVersionURL[] = "os://version"; #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - extern const char kChromeUIWebUIJsErrorHost[]; - extern const char kChromeUIWebUIJsErrorURL[]; + inline constexpr char kChromeUIWebUIJsErrorHost[] = "webuijserror"; + inline constexpr char kChromeUIWebUIJsErrorURL[] = "chrome://webuijserror/"; #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS_ASH) + BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) - extern const char kChromeUIConnectorsInternalsHost[]; + inline constexpr char kChromeUIConnectorsInternalsHost[] = + "connectors-internals"; #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - extern const char kChromeUIDiscardsHost[]; - extern const char kChromeUIDiscardsURL[]; + inline constexpr char kChromeUIDiscardsHost[] = "discards"; + inline constexpr char kChromeUIDiscardsURL[] = "chrome://discards/"; #endif -#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 kChromeUIWebAppSettingsURL[]; - extern const char kChromeUIWebAppSettingsHost[]; - extern const char kChromeUIWhatsNewHost[]; -@@ -471,14 +471,14 @@ extern const char kChromeUILinuxProxyConfigHost[]; + inline constexpr char kChromeUIWebAppSettingsHost[] = "app-settings"; + inline constexpr char kChromeUIWebAppSettingsURL[] = "chrome://app-settings/"; + inline constexpr char kChromeUIWhatsNewHost[] = "whats-new"; +@@ -593,13 +593,13 @@ inline constexpr char kChromeUILinuxProxyConfigHost[] #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_ANDROID) + BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - extern const char kChromeUISandboxHost[]; + inline constexpr char kChromeUISandboxHost[] = "sandbox"; #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) || \ -- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) - extern const char kChromeUIBrowserSwitchHost[]; - extern const char kChromeUIBrowserSwitchURL[]; - extern const char kChromeUIIntroHost[]; -@@ -494,7 +494,7 @@ extern const char kChromeUIProfilePickerUrl[]; - extern const char kChromeUIProfilePickerStartupQuery[]; +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ + (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) + inline constexpr char kChromeUIBrowserSwitchHost[] = "browser-switch"; + inline constexpr char kChromeUIBrowserSwitchURL[] = "chrome://browser-switch/"; +@@ -621,7 +621,7 @@ inline constexpr char kChromeUIProfilePickerStartupQue + inline constexpr char kChromeUIProfilePickerUrl[] = "chrome://profile-picker/"; #endif -#if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \ +#if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && \ defined(TOOLKIT_VIEWS)) || \ defined(USE_AURA) - extern const char kChromeUITabModalConfirmDialogHost[]; + inline constexpr char kChromeUITabModalConfirmDialogHost[] = 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 28114f43a6ec..a929c8dc8588 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,11 +1,11 @@ ---- chrome/enterprise_companion/enterprise_companion_client.cc.orig 2024-07-30 11:12:21 UTC +--- chrome/enterprise_companion/enterprise_companion_client.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/enterprise_companion/enterprise_companion_client.cc -@@ -9,7 +9,7 @@ namespace enterprise_companion { - mojo::NamedPlatformChannel::ServerName GetServerName() { +@@ -33,7 +33,7 @@ namespace { + #if BUILDFLAG(IS_MAC) - return "org.chromium.ChromeEnterpriseCompanion.service"; + constexpr char kServerName[] = MAC_BUNDLE_IDENTIFIER_STRING ".service"; -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - return "/run/Chromium/ChromeEnterpriseCompanion/service.sk"; + constexpr char kServerName[] = + "/run/" COMPANY_SHORTNAME_STRING "/" PRODUCT_FULLNAME_STRING "/service.sk"; #elif BUILDFLAG(IS_WIN) - return L"ChromeEnterpriseCompanionService"; diff --git a/www/chromium/files/patch-chrome_enterprise__companion_lock.cc b/www/chromium/files/patch-chrome_enterprise__companion_lock.cc index 1a7c1ec67e20..d552b9f60ce3 100644 --- a/www/chromium/files/patch-chrome_enterprise__companion_lock.cc +++ b/www/chromium/files/patch-chrome_enterprise__companion_lock.cc @@ -1,20 +1,20 @@ ---- chrome/enterprise_companion/lock.cc.orig 2024-07-30 11:12:21 UTC +--- chrome/enterprise_companion/lock.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/enterprise_companion/lock.cc -@@ -16,7 +16,7 @@ +@@ -17,7 +17,7 @@ namespace { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - constexpr char kLockName[] = "/ChromeEnterpriseCompanion.lock"; + constexpr char kLockName[] = "/" PRODUCT_FULLNAME_STRING ".lock"; #elif BUILDFLAG(IS_MAC) - constexpr char kLockName[] = "org.chromium.ChromeEnterpriseCompanion.lock"; -@@ -41,7 +41,7 @@ CSecurityDesc GetAdminDaclSecurityDescriptor() { + constexpr char kLockName[] = MAC_BUNDLE_IDENTIFIER_STRING ".lock"; +@@ -42,7 +42,7 @@ CSecurityDesc GetAdminDaclSecurityDescriptor() { namespace enterprise_companion { - std::unique_ptr<ScopedLock> CreateScopedLock() { + std::unique_ptr<ScopedLock> CreateScopedLock(base::TimeDelta timeout) { -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - return named_system_lock::ScopedLock::Create(kLockName, base::Seconds(0)); + return named_system_lock::ScopedLock::Create(kLockName, timeout); #elif BUILDFLAG(IS_WIN) CSecurityAttributes sa = diff --git a/www/chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc b/www/chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc index d272033e54dd..8a0089aa1826 100644 --- a/www/chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc +++ b/www/chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc @@ -1,6 +1,6 @@ ---- chrome/services/printing/print_backend_service_impl.cc.orig 2024-06-17 12:56:06 UTC +--- chrome/services/printing/print_backend_service_impl.cc.orig 2024-08-26 12:06:38 UTC +++ chrome/services/printing/print_backend_service_impl.cc -@@ -49,7 +49,7 @@ +@@ -50,7 +50,7 @@ #include "printing/backend/cups_connection_pool.h" #endif @@ -9,7 +9,7 @@ #include "base/no_destructor.h" #include "ui/linux/linux_ui.h" #include "ui/linux/linux_ui_delegate_stub.h" -@@ -76,7 +76,7 @@ namespace printing { +@@ -77,7 +77,7 @@ namespace printing { namespace { @@ -18,7 +18,7 @@ void InstantiateLinuxUiDelegate() { // TODO(crbug.com/40561724) Until a real UI can be used in a utility process, // need to use the stub version. -@@ -85,7 +85,7 @@ void InstantiateLinuxUiDelegate() { +@@ -86,7 +86,7 @@ void InstantiateLinuxUiDelegate() { #endif scoped_refptr<base::SequencedTaskRunner> GetPrintingTaskRunner() { @@ -27,7 +27,7 @@ // Use task runner associated with equivalent of UI thread. Needed for calls // made through `PrintDialogLinuxInterface` to properly execute. CHECK(base::SequencedTaskRunner::HasCurrentDefault()); -@@ -469,7 +469,7 @@ void PrintBackendServiceImpl::Init( +@@ -470,7 +470,7 @@ void PrintBackendServiceImpl::Init( // `InitCommon()`. InitializeProcessForPrinting(); print_backend_ = PrintBackend::CreateInstance(locale); @@ -36,7 +36,7 @@ // Test framework already initializes the UI, so this should not go in // `InitCommon()`. Additionally, low-level Linux UI is not needed when tests // are using `TestPrintingContext`. -@@ -690,7 +690,7 @@ void PrintBackendServiceImpl::UpdatePrintSettings( +@@ -691,7 +691,7 @@ void PrintBackendServiceImpl::UpdatePrintSettings( crash_keys_ = std::make_unique<crash_keys::ScopedPrinterInfo>( *printer_name, print_backend_->GetPrinterDriverInfo(*printer_name)); 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 0d9503ca2570..0b70355c2e74 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-07-30 11:12:21 UTC +--- components/autofill/core/browser/payments_data_manager.cc.orig 2024-08-26 12:06:38 UTC +++ components/autofill/core/browser/payments_data_manager.cc -@@ -1065,7 +1065,7 @@ bool PaymentsDataManager::ShouldShowCardsFromAccountOp +@@ -1055,7 +1055,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__features.cc b/www/chromium/files/patch-components_autofill_core_common_autofill__features.cc index abccaaff3499..ea43c5a0af99 100644 --- a/www/chromium/files/patch-components_autofill_core_common_autofill__features.cc +++ b/www/chromium/files/patch-components_autofill_core_common_autofill__features.cc @@ -1,6 +1,6 @@ ---- components/autofill/core/common/autofill_features.cc.orig 2024-07-30 11:12:21 UTC +--- components/autofill/core/common/autofill_features.cc.orig 2024-08-26 12:06:38 UTC +++ components/autofill/core/common/autofill_features.cc -@@ -661,7 +661,7 @@ BASE_FEATURE(kAutofillTextAreaChangeEvents, +@@ -673,7 +673,7 @@ BASE_FEATURE(kAutofillSilentProfileUpdateForInsufficie // Enabled by default for Mac and Windows platforms. BASE_FEATURE(kAutofillContentEditableChangeEvents, "AutofillContentEditableChangeEvents", 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 83c478e86c9b..c5b3c403f0df 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,6 +1,15 @@ ---- components/autofill/core/common/autofill_payments_features.cc.orig 2024-07-30 11:12:21 UTC +--- components/autofill/core/common/autofill_payments_features.cc.orig 2024-08-26 12:06:38 UTC +++ components/autofill/core/common/autofill_payments_features.cc -@@ -248,7 +248,7 @@ BASE_FEATURE(kAutofillSyncEwalletAccounts, +@@ -8,7 +8,7 @@ + + namespace autofill::features { + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ + (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) + // When enabled, Chrome will extract the checkout amount from the checkout page + // of the allowlisted merchant websites. +@@ -272,7 +272,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_autofill_core_common_autofill__payments__features.h b/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.h new file mode 100644 index 000000000000..f10f6c5f3121 --- /dev/null +++ b/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.h @@ -0,0 +1,11 @@ +--- components/autofill/core/common/autofill_payments_features.h.orig 2024-08-26 12:06:38 UTC ++++ components/autofill/core/common/autofill_payments_features.h +@@ -14,7 +14,7 @@ namespace autofill::features { + + // All features in alphabetical order. + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + COMPONENT_EXPORT(AUTOFILL) + BASE_DECLARE_FEATURE(kAutofillEnableAmountExtractionDesktop); + #endif diff --git a/www/chromium/files/patch-components_autofill_core_common_autofill__util.cc b/www/chromium/files/patch-components_autofill_core_common_autofill__util.cc deleted file mode 100644 index e470b52aa1f9..000000000000 --- a/www/chromium/files/patch-components_autofill_core_common_autofill__util.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- components/autofill/core/common/autofill_util.cc.orig 2024-06-17 12:56:06 UTC -+++ components/autofill/core/common/autofill_util.cc -@@ -132,7 +132,7 @@ bool SanitizedFieldIsEmpty(const std::u16string& value - - bool ShouldAutoselectFirstSuggestionOnArrowDown() { - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - return true; - #else - return false; 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 8695fcec4492..dea347d7a475 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-07-30 11:12:21 UTC +--- components/commerce/core/commerce_feature_list.cc.orig 2024-08-26 12:06:38 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); -@@ -244,7 +244,7 @@ const base::FeatureParam<bool> kDeleteAllMerchantsOnCl +@@ -261,7 +261,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_constrained__window_constrained__window__views.cc b/www/chromium/files/patch-components_constrained__window_constrained__window__views.cc index e2283ed78db4..5e84f5bda510 100644 --- a/www/chromium/files/patch-components_constrained__window_constrained__window__views.cc +++ b/www/chromium/files/patch-components_constrained__window_constrained__window__views.cc @@ -1,6 +1,6 @@ ---- components/constrained_window/constrained_window_views.cc.orig 2024-07-30 11:12:21 UTC +--- components/constrained_window/constrained_window_views.cc.orig 2024-08-26 12:06:38 UTC +++ components/constrained_window/constrained_window_views.cc -@@ -360,7 +360,7 @@ bool SupportsGlobalScreenCoordinates() { +@@ -369,7 +369,7 @@ bool SupportsGlobalScreenCoordinates() { } bool PlatformClipsChildrenToViewport() { diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc b/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc index 3dadfd25620d..48b4101bf52b 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc @@ -1,4 +1,4 @@ ---- components/feature_engagement/public/feature_configurations.cc.orig 2024-07-30 11:12:21 UTC +--- components/feature_engagement/public/feature_configurations.cc.orig 2024-08-26 12:06:38 UTC +++ components/feature_engagement/public/feature_configurations.cc @@ -99,7 +99,7 @@ std::optional<FeatureConfig> CreateNewUserGestureInPro @@ -15,15 +15,16 @@ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - if (kIPHPasswordsAccountStorageFeature.name == feature->name) { + if (kIPHPasswordsManagementBubbleAfterSaveFeature.name == feature->name) { std::optional<FeatureConfig> config = FeatureConfig(); config->valid = true; -@@ -1607,7 +1607,7 @@ std::optional<FeatureConfig> GetClientSideFeatureConfi - +@@ -1599,7 +1599,8 @@ std::optional<FeatureConfig> GetClientSideFeatureConfi #endif // BUILDFLAG(IS_ANDROID) --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ ++ BUILDFLAG(IS_BSD) if (kIPHAutofillCreditCardBenefitFeature.name == feature->name) { + // Credit card benefit IPH is shown: 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 09f916a8bbf3..ce96046f60ba 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-07-30 11:12:21 UTC +--- components/feature_engagement/public/feature_constants.cc.orig 2024-08-26 12:06:38 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); @@ -6,10 +6,10 @@ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(GOOGLE_CHROME_BRANDING) BASE_FEATURE(kEsbDownloadRowPromoFeature, "EsbDownloadRowPromo", - base::FEATURE_DISABLED_BY_DEFAULT); -@@ -626,7 +626,8 @@ BASE_FEATURE(kDefaultBrowserTriggerCriteriaExperiment, +@@ -637,7 +637,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); -@@ -757,7 +758,7 @@ BASE_FEATURE(kIPHScalableIphGamingFeature, +@@ -771,7 +772,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 ce12983ef21a..5f8f9794d9ad 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-07-30 11:12:21 UTC +--- components/feature_engagement/public/feature_constants.h.orig 2024-08-26 12:06:38 UTC +++ components/feature_engagement/public/feature_constants.h @@ -20,7 +20,7 @@ BASE_DECLARE_FEATURE(kIPHDemoMode); BASE_DECLARE_FEATURE(kIPHDummyFeature); @@ -6,10 +6,10 @@ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(GOOGLE_CHROME_BRANDING) BASE_DECLARE_FEATURE(kEsbDownloadRowPromoFeature); - BASE_DECLARE_FEATURE(kIPHBatterySaverModeFeature); - BASE_DECLARE_FEATURE(kIPHCompanionSidePanelFeature); -@@ -259,7 +259,8 @@ BASE_DECLARE_FEATURE(kDefaultBrowserTriggerCriteriaExp + #endif +@@ -264,7 +264,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(kIPHAutofillExternalAccountProfileSuggestionFeature); BASE_DECLARE_FEATURE(kIPHAutofillManualFallbackFeature); -@@ -308,7 +309,7 @@ BASE_DECLARE_FEATURE(kIPHScalableIphHelpAppBasedTenFea +@@ -314,7 +315,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 f50254639ef7..a28401e904bb 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,15 +1,15 @@ ---- components/feature_engagement/public/feature_list.cc.orig 2024-07-30 11:12:21 UTC +--- components/feature_engagement/public/feature_list.cc.orig 2024-08-26 12:06:38 UTC +++ components/feature_engagement/public/feature_list.cc -@@ -152,7 +152,7 @@ const base::Feature* const kAllFeatures[] = { - &kIPHiOSSavedTabGroupClosed, +@@ -155,7 +155,7 @@ const base::Feature* const kAllFeatures[] = { + &kIPHiOSContextualPanelPriceInsightsFeature, #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(GOOGLE_CHROME_BRANDING) &kEsbDownloadRowPromoFeature, - &kIPHBatterySaverModeFeature, - &kIPHCompanionSidePanelFeature, -@@ -218,7 +218,8 @@ const base::Feature* const kAllFeatures[] = { + #endif +@@ -223,7 +223,8 @@ const base::Feature* const kAllFeatures[] = { // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -19,7 +19,7 @@ &kIPHAutofillCreditCardBenefitFeature, &kIPHAutofillExternalAccountProfileSuggestionFeature, &kIPHAutofillManualFallbackFeature, -@@ -267,7 +268,7 @@ const base::Feature* const kAllFeatures[] = { +@@ -273,7 +274,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 9830fb0910b2..2c9774a68aba 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,15 +1,15 @@ ---- components/feature_engagement/public/feature_list.h.orig 2024-07-30 11:12:21 UTC +--- components/feature_engagement/public/feature_list.h.orig 2024-08-26 12:06:38 UTC +++ components/feature_engagement/public/feature_list.h -@@ -273,7 +273,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSSavedTabGroupClosed, +@@ -278,7 +278,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSContextualPanelPriceInsi #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(GOOGLE_CHROME_BRANDING) DEFINE_VARIATION_PARAM(kEsbDownloadRowPromoFeature, "EsbDownloadRowPromo"); - DEFINE_VARIATION_PARAM(kIPHBatterySaverModeFeature, "IPH_BatterySaverMode"); - DEFINE_VARIATION_PARAM(kIPHCompanionSidePanelFeature, "IPH_CompanionSidePanel"); -@@ -383,7 +383,8 @@ DEFINE_VARIATION_PARAM(kIPHTabGroupsSaveV2CloseGroupFe + #endif +@@ -385,7 +385,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"); DEFINE_VARIATION_PARAM(kIPHAutofillExternalAccountProfileSuggestionFeature, -@@ -470,7 +471,7 @@ DEFINE_VARIATION_PARAM(kIPHScalableIphHelpAppBasedTenF +@@ -474,7 +475,7 @@ DEFINE_VARIATION_PARAM(kIPHScalableIphHelpAppBasedTenF DEFINE_VARIATION_PARAM(kIPHScalableIphGamingFeature, "IPH_ScalableIphGaming"); #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -28,16 +28,16 @@ DEFINE_VARIATION_PARAM(kIPHDesktopPWAsLinkCapturingLaunch, "IPH_DesktopPWAsLinkCapturingLaunch"); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -626,7 +627,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation - VARIATION_ENTRY(kIPHiOSOverflowMenuCustomizationFeature), - VARIATION_ENTRY(kIPHiOSSavedTabGroupClosed), +@@ -632,7 +633,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation + VARIATION_ENTRY(kIPHiOSContextualPanelSampleModelFeature), + VARIATION_ENTRY(kIPHiOSContextualPanelPriceInsightsFeature), #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) VARIATION_ENTRY(kIPHBatterySaverModeFeature), VARIATION_ENTRY(kIPHCompanionSidePanelFeature), VARIATION_ENTRY(kIPHCompanionSidePanelRegionSearchFeature), -@@ -686,7 +687,8 @@ constexpr flags_ui::FeatureEntry::FeatureVariation +@@ -690,7 +691,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(kIPHAutofillExternalAccountProfileSuggestionFeature), VARIATION_ENTRY(kIPHAutofillManualFallbackFeature), -@@ -735,7 +737,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation +@@ -741,7 +743,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation VARIATION_ENTRY(kIPHScalableIphGamingFeature), #endif // BUILDFLAG(IS_CHROMEOS_ASH) diff --git a/www/chromium/files/patch-components_feed_core_v2_feed__network__impl__unittest.cc b/www/chromium/files/patch-components_feed_core_v2_feed__network__impl__unittest.cc index 311885abf56a..74f97119a280 100644 --- a/www/chromium/files/patch-components_feed_core_v2_feed__network__impl__unittest.cc +++ b/www/chromium/files/patch-components_feed_core_v2_feed__network__impl__unittest.cc @@ -1,6 +1,6 @@ ---- components/feed/core/v2/feed_network_impl_unittest.cc.orig 2024-06-17 12:56:06 UTC +--- components/feed/core/v2/feed_network_impl_unittest.cc.orig 2024-08-26 12:06:38 UTC +++ components/feed/core/v2/feed_network_impl_unittest.cc -@@ -753,8 +753,8 @@ TEST_F(FeedNetworkTest, SendApiRequest_DecodesClientIn +@@ -752,8 +752,8 @@ TEST_F(FeedNetworkTest, SendApiRequest_DecodesClientIn EXPECT_EQ(feedwire::ClientInfo::CHROME_ANDROID, client_info.app_type()); EXPECT_EQ(feedwire::Version::RELEASE, client_info.app_version().build_type()); diff --git a/www/chromium/files/patch-components_feed_core_v2_proto__util__unittest.cc b/www/chromium/files/patch-components_feed_core_v2_proto__util__unittest.cc index a73206578bde..6c41a4a82910 100644 --- a/www/chromium/files/patch-components_feed_core_v2_proto__util__unittest.cc +++ b/www/chromium/files/patch-components_feed_core_v2_proto__util__unittest.cc @@ -1,6 +1,6 @@ ---- components/feed/core/v2/proto_util_unittest.cc.orig 2023-09-13 12:11:42 UTC +--- components/feed/core/v2/proto_util_unittest.cc.orig 2024-08-26 12:06:38 UTC +++ components/feed/core/v2/proto_util_unittest.cc -@@ -44,8 +44,8 @@ TEST(ProtoUtilTest, CreateClientInfo) { +@@ -43,8 +43,8 @@ TEST(ProtoUtilTest, CreateClientInfo) { feedwire::ClientInfo result = CreateClientInfo(request_metadata); EXPECT_EQ(feedwire::ClientInfo::CHROME_ANDROID, result.app_type()); EXPECT_EQ(feedwire::Version::RELEASE, result.app_version().build_type()); @@ -10,4 +10,4 @@ + EXPECT_EQ(2, result.app_version().gminor()); EXPECT_EQ(3, result.app_version().build()); EXPECT_EQ(4, result.app_version().revision()); - EXPECT_FALSE(result.chrome_client_info().start_surface()); + diff --git a/www/chromium/files/patch-components_flags__ui_flags__state.cc b/www/chromium/files/patch-components_flags__ui_flags__state.cc index f32ea0d3fdd2..6890c015f8e5 100644 --- a/www/chromium/files/patch-components_flags__ui_flags__state.cc +++ b/www/chromium/files/patch-components_flags__ui_flags__state.cc @@ -1,6 +1,6 @@ ---- components/flags_ui/flags_state.cc.orig 2024-07-30 11:12:21 UTC +--- components/flags_ui/flags_state.cc.orig 2024-08-26 12:06:38 UTC +++ components/flags_ui/flags_state.cc -@@ -749,7 +749,7 @@ unsigned short FlagsState::GetCurrentPlatform() { +@@ -750,7 +750,7 @@ unsigned short FlagsState::GetCurrentPlatform() { return kOsCrOS; #elif BUILDFLAG(IS_CHROMEOS_LACROS) return kOsLacros; diff --git a/www/chromium/files/patch-components_os__crypt_sync_libsecret__util__linux.cc b/www/chromium/files/patch-components_os__crypt_sync_libsecret__util__linux.cc index 306bf245dfba..03bd93065212 100644 --- a/www/chromium/files/patch-components_os__crypt_sync_libsecret__util__linux.cc +++ b/www/chromium/files/patch-components_os__crypt_sync_libsecret__util__linux.cc @@ -1,6 +1,6 @@ ---- components/os_crypt/sync/libsecret_util_linux.cc.orig 2024-05-21 18:07:39 UTC +--- components/os_crypt/sync/libsecret_util_linux.cc.orig 2024-08-26 12:06:38 UTC +++ components/os_crypt/sync/libsecret_util_linux.cc -@@ -99,16 +99,22 @@ bool LibsecretLoader::EnsureLibsecretLoaded() { +@@ -96,16 +96,22 @@ bool LibsecretLoader::EnsureLibsecretLoaded() { // static bool LibsecretLoader::LoadLibsecret() { diff --git a/www/chromium/files/patch-components_paint__preview_player_player__compositor__delegate.cc b/www/chromium/files/patch-components_paint__preview_player_player__compositor__delegate.cc index ef635e281c19..428553252898 100644 --- a/www/chromium/files/patch-components_paint__preview_player_player__compositor__delegate.cc +++ b/www/chromium/files/patch-components_paint__preview_player_player__compositor__delegate.cc @@ -1,6 +1,6 @@ ---- components/paint_preview/player/player_compositor_delegate.cc.orig 2024-06-17 12:56:06 UTC +--- components/paint_preview/player/player_compositor_delegate.cc.orig 2024-08-26 12:06:38 UTC +++ components/paint_preview/player/player_compositor_delegate.cc -@@ -435,8 +435,8 @@ void PlayerCompositorDelegate::ValidateProtoAndLoadAXT +@@ -434,8 +434,8 @@ void PlayerCompositorDelegate::ValidateProtoAndLoadAXT auto chrome_version = capture_result_->proto.metadata().chrome_version(); const auto& current_chrome_version = version_info::GetVersion(); if (capture_result_->proto.metadata().has_chrome_version() && 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 0b145b63cc1f..f04769b79cbf 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,15 +1,6 @@ ---- components/password_manager/core/browser/features/password_features.cc.orig 2024-07-31 19:26:21 UTC +--- components/password_manager/core/browser/features/password_features.cc.orig 2024-08-26 12:06:38 UTC +++ components/password_manager/core/browser/features/password_features.cc -@@ -33,7 +33,7 @@ BASE_FEATURE(kBiometricTouchToFill, - #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS) // Desktop - BASE_FEATURE(kButterOnDesktopFollowup, - "ButterOnDesktopFollowup", --#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); -@@ -47,7 +47,7 @@ BASE_FEATURE(kClearUndecryptablePasswords, +@@ -41,7 +41,7 @@ BASE_FEATURE(kClearUndecryptablePasswords, BASE_FEATURE(kClearUndecryptablePasswordsOnSync, "ClearUndecryptablePasswordsInSync", #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_IOS) || \ @@ -18,7 +9,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -109,7 +109,7 @@ BASE_FEATURE(kPasswordManualFallbackAvailable, +@@ -90,7 +90,7 @@ BASE_FEATURE(kPasswordManualFallbackAvailable, "PasswordManualFallbackAvailable", base::FEATURE_DISABLED_BY_DEFAULT); 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 b9bc36e72f9b..6c87ef2f7422 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,6 +1,6 @@ ---- components/password_manager/core/browser/features/password_features.h.orig 2024-07-30 11:12:21 UTC +--- components/password_manager/core/browser/features/password_features.h.orig 2024-08-26 12:06:38 UTC +++ components/password_manager/core/browser/features/password_features.h -@@ -93,7 +93,7 @@ BASE_DECLARE_FEATURE(kPasswordManagerLogToTerminal); +@@ -90,7 +90,7 @@ BASE_DECLARE_FEATURE(kPasswordManagerLogToTerminal); // Enables triggering password suggestions through the context menu. BASE_DECLARE_FEATURE(kPasswordManualFallbackAvailable); diff --git a/www/chromium/files/patch-components_password__manager_core_browser_password__form__manager.cc b/www/chromium/files/patch-components_password__manager_core_browser_password__form__manager.cc index e16c6467075e..79bd3b68dc72 100644 --- a/www/chromium/files/patch-components_password__manager_core_browser_password__form__manager.cc +++ b/www/chromium/files/patch-components_password__manager_core_browser_password__form__manager.cc @@ -1,4 +1,4 @@ ---- components/password_manager/core/browser/password_form_manager.cc.orig 2024-07-30 11:12:21 UTC +--- components/password_manager/core/browser/password_form_manager.cc.orig 2024-08-26 12:06:38 UTC +++ components/password_manager/core/browser/password_form_manager.cc @@ -58,7 +58,7 @@ #include "components/webauthn/android/webauthn_cred_man_delegate.h" @@ -9,7 +9,7 @@ #include "components/os_crypt/sync/os_crypt.h" #endif -@@ -229,7 +229,7 @@ bool ShouldUploadCrowdsourcingVotes(const FormOrDigest +@@ -228,7 +228,7 @@ bool ShouldUploadCrowdsourcingVotes(const FormOrDigest return false; } @@ -18,7 +18,7 @@ bool ShouldShowKeychainErrorBubble( std::optional<PasswordStoreBackendError> backend_error) { if (!backend_error.has_value()) { -@@ -880,7 +880,7 @@ void PasswordFormManager::OnFetchCompleted() { +@@ -885,7 +885,7 @@ void PasswordFormManager::OnFetchCompleted() { error.value().type); } 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 0a047c118c00..8f6906136211 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-07-30 11:12:21 UTC +--- components/password_manager/core/browser/password_manager.cc.orig 2024-08-26 12:06:38 UTC +++ components/password_manager/core/browser/password_manager.cc -@@ -386,7 +386,7 @@ void PasswordManager::RegisterProfilePrefs( +@@ -425,7 +425,7 @@ void PasswordManager::RegisterProfilePrefs( prefs::kAutofillableCredentialsAccountStoreLoginDatabase, false); #endif // BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS) registry->RegisterBooleanPref(prefs::kPasswordSharingEnabled, true); @@ -9,3 +9,12 @@ registry->RegisterIntegerPref(prefs::kRelaunchChromeBubbleDismissedCounter, 0); #endif +@@ -438,7 +438,7 @@ void PasswordManager::RegisterProfilePrefs( + #endif + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_IOS) ++ BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD) + registry->RegisterBooleanPref(prefs::kDeletingUndecryptablePasswordsEnabled, + true); + #endif 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 441187c24da3..00168e17f7b7 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-07-30 11:12:21 UTC +--- components/password_manager/core/browser/password_manager_client.h.orig 2024-08-26 12:06:38 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" -@@ -517,7 +517,7 @@ class PasswordManagerClient { +@@ -520,7 +520,7 @@ class PasswordManagerClient { virtual void RefreshPasswordManagerSettingsIfNeeded() const; #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 216a6f416918..63c4e18ff66f 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,6 +1,6 @@ ---- components/password_manager/core/browser/password_manual_fallback_flow.cc.orig 2024-06-17 12:56:06 UTC +--- components/password_manager/core/browser/password_manual_fallback_flow.cc.orig 2024-08-26 12:06:38 UTC +++ components/password_manager/core/browser/password_manual_fallback_flow.cc -@@ -192,7 +192,7 @@ void PasswordManualFallbackFlow::DidAcceptSuggestion( +@@ -204,7 +204,7 @@ void PasswordManualFallbackFlow::DidAcceptSuggestion( payload.password)); #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.h b/www/chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.h index e0177f04acc8..07ee77598b9d 100644 --- a/www/chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.h +++ b/www/chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.h @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/password_manual_fallback_flow.h.orig 2024-06-17 12:56:06 UTC +--- components/password_manager/core/browser/password_manual_fallback_flow.h.orig 2024-08-26 12:06:38 UTC +++ components/password_manager/core/browser/password_manual_fallback_flow.h -@@ -18,7 +18,7 @@ +@@ -17,7 +17,7 @@ #include "components/password_manager/core/browser/ui/saved_passwords_presenter.h" #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -9,7 +9,7 @@ #include "components/password_manager/core/browser/password_cross_domain_confirmation_popup_controller.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || // BUILDFLAG(IS_CHROMEOS) -@@ -159,7 +159,7 @@ class PasswordManualFallbackFlow : public autofill::Au +@@ -161,7 +161,7 @@ class PasswordManualFallbackFlow : public autofill::Au std::unique_ptr<device_reauth::DeviceAuthenticator> authenticator_; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ diff --git a/www/chromium/files/patch-components_password__manager_core_browser_password__store_login__database.cc b/www/chromium/files/patch-components_password__manager_core_browser_password__store_login__database.cc index 43a2d1b9c0ff..7781fd3431da 100644 --- a/www/chromium/files/patch-components_password__manager_core_browser_password__store_login__database.cc +++ b/www/chromium/files/patch-components_password__manager_core_browser_password__store_login__database.cc @@ -1,15 +1,15 @@ ---- components/password_manager/core/browser/password_store/login_database.cc.orig 2024-07-30 11:12:21 UTC +--- components/password_manager/core/browser/password_store/login_database.cc.orig 2024-08-26 12:06:38 UTC +++ components/password_manager/core/browser/password_store/login_database.cc -@@ -1020,7 +1020,7 @@ void RecordShouldDeleteUndecryptablePasswordsMetric( - } - - bool ShouldDeleteUndecryptablePasswords() { +@@ -1028,7 +1028,7 @@ bool ShouldDeleteUndecryptablePasswords( + clearing_undecryptable_passwords, + bool is_user_data_dir_policy_set, + bool is_disabled_by_policy) { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) std::string user_data_dir_string; std::unique_ptr<base::Environment> environment(base::Environment::Create()); // On Linux user data directory ca be specified using an env variable. If it -@@ -1039,7 +1039,7 @@ bool ShouldDeleteUndecryptablePasswords() { +@@ -1047,7 +1047,7 @@ bool ShouldDeleteUndecryptablePasswords( return false; } diff --git a/www/chromium/files/patch-components_password__manager_core_browser_password__store_login__database__async__helper.cc b/www/chromium/files/patch-components_password__manager_core_browser_password__store_login__database__async__helper.cc index 3e4f0f6b5afa..4715e8086812 100644 --- a/www/chromium/files/patch-components_password__manager_core_browser_password__store_login__database__async__helper.cc +++ b/www/chromium/files/patch-components_password__manager_core_browser_password__store_login__database__async__helper.cc @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/password_store/login_database_async_helper.cc.orig 2024-05-21 18:07:39 UTC +--- components/password_manager/core/browser/password_store/login_database_async_helper.cc.orig 2024-08-26 12:06:38 UTC +++ components/password_manager/core/browser/password_store/login_database_async_helper.cc -@@ -149,7 +149,7 @@ LoginsResultOrError LoginDatabaseAsyncHelper::FillMatc +@@ -152,7 +152,7 @@ LoginsResultOrError LoginDatabaseAsyncHelper::FillMatc std::vector<PasswordForm> matched_forms; if (!login_db_ || !login_db_->GetLogins(form, include_psl, &matched_forms)) { diff --git a/www/chromium/files/patch-components_password__manager_core_browser_password__store_login__database__unittest.cc b/www/chromium/files/patch-components_password__manager_core_browser_password__store_login__database__unittest.cc index 547594963c54..a9e943f13a8d 100644 --- a/www/chromium/files/patch-components_password__manager_core_browser_password__store_login__database__unittest.cc +++ b/www/chromium/files/patch-components_password__manager_core_browser_password__store_login__database__unittest.cc @@ -1,7 +1,7 @@ ---- components/password_manager/core/browser/password_store/login_database_unittest.cc.orig 2024-07-30 11:12:21 UTC +--- components/password_manager/core/browser/password_store/login_database_unittest.cc.orig 2024-08-26 12:06:38 UTC +++ components/password_manager/core/browser/password_store/login_database_unittest.cc -@@ -2141,7 +2141,7 @@ INSTANTIATE_TEST_SUITE_P(MigrationToVCurrent, - testing::Values(1, 2, 3, 24)); +@@ -2207,7 +2207,7 @@ INSTANTIATE_TEST_SUITE_P(MigrationToVCurrent, + testing::Bool())); #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_IOS) || \ - BUILDFLAG(IS_WIN) diff --git a/www/chromium/files/patch-components_password__manager_core_browser_password__store_password__store__built__in__backend.cc b/www/chromium/files/patch-components_password__manager_core_browser_password__store_password__store__built__in__backend.cc new file mode 100644 index 000000000000..a2788d7983f3 --- /dev/null +++ b/www/chromium/files/patch-components_password__manager_core_browser_password__store_password__store__built__in__backend.cc @@ -0,0 +1,11 @@ +--- components/password_manager/core/browser/password_store/password_store_built_in_backend.cc.orig 2024-08-26 12:06:38 UTC ++++ components/password_manager/core/browser/password_store/password_store_built_in_backend.cc +@@ -211,7 +211,7 @@ void PasswordStoreBuiltInBackend::InitBackend( + std::move(clearing_undecryptable_passwords_cb))); + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_IOS) ++ BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD) + background_task_runner_->PostTask( + FROM_HERE, + base::BindOnce(&LoginDatabaseAsyncHelper:: 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 708006563555..a012825601fa 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-05-21 18:07:39 UTC +--- components/password_manager/core/browser/stub_password_manager_client.cc.orig 2024-08-26 12:06:38 UTC +++ components/password_manager/core/browser/stub_password_manager_client.cc -@@ -175,7 +175,7 @@ version_info::Channel StubPasswordManagerClient::GetCh +@@ -180,7 +180,7 @@ version_info::Channel StubPasswordManagerClient::GetCh } #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.h b/www/chromium/files/patch-components_password__manager_core_browser_stub__password__manager__client.h index 6b0f3983dc7b..9b038f1fc287 100644 --- a/www/chromium/files/patch-components_password__manager_core_browser_stub__password__manager__client.h +++ b/www/chromium/files/patch-components_password__manager_core_browser_stub__password__manager__client.h @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/stub_password_manager_client.h.orig 2024-05-21 18:07:39 UTC +--- components/password_manager/core/browser/stub_password_manager_client.h.orig 2024-08-26 12:06:38 UTC +++ components/password_manager/core/browser/stub_password_manager_client.h -@@ -74,7 +74,7 @@ class StubPasswordManagerClient : public PasswordManag +@@ -75,7 +75,7 @@ class StubPasswordManagerClient : public PasswordManag MockPasswordFeatureManager* GetPasswordFeatureManager(); version_info::Channel GetChannel() const override; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ diff --git a/www/chromium/files/patch-components_password__manager_core_common_password__manager__pref__names.h b/www/chromium/files/patch-components_password__manager_core_common_password__manager__pref__names.h index b5449eb3cc1a..7f03eef0b7df 100644 --- a/www/chromium/files/patch-components_password__manager_core_common_password__manager__pref__names.h +++ b/www/chromium/files/patch-components_password__manager_core_common_password__manager__pref__names.h @@ -1,6 +1,15 @@ ---- components/password_manager/core/common/password_manager_pref_names.h.orig 2024-07-30 11:12:21 UTC +--- components/password_manager/core/common/password_manager_pref_names.h.orig 2024-08-26 12:06:38 UTC +++ components/password_manager/core/common/password_manager_pref_names.h -@@ -358,7 +358,7 @@ inline constexpr char kAutofillableCredentialsAccountS +@@ -41,7 +41,7 @@ inline constexpr char kCredentialProviderEnabledOnStar + #endif + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_IOS) ++ BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD) + // Boolean pref controlled by the DeletingUndecryptablePasswordsEnabled policy. + // If set to false it blocks deleting undecryptable passwords, otherwise the + // deletion can happen. +@@ -370,7 +370,7 @@ inline constexpr char kAutofillableCredentialsAccountS inline constexpr char kPasswordSharingEnabled[] = "password_manager.password_sharing_enabled"; diff --git a/www/chromium/files/patch-components_safe__browsing_content_resources_gen__file__type__proto.py b/www/chromium/files/patch-components_safe__browsing_content_resources_gen__file__type__proto.py index d1c6f061aef3..a813c3e8087a 100644 --- a/www/chromium/files/patch-components_safe__browsing_content_resources_gen__file__type__proto.py +++ b/www/chromium/files/patch-components_safe__browsing_content_resources_gen__file__type__proto.py @@ -1,15 +1,15 @@ ---- components/safe_browsing/content/resources/gen_file_type_proto.py.orig 2023-01-11 09:17:16 UTC +--- components/safe_browsing/content/resources/gen_file_type_proto.py.orig 2024-08-26 12:06:38 UTC +++ components/safe_browsing/content/resources/gen_file_type_proto.py -@@ -38,6 +38,8 @@ def PlatformTypes(): - "fuchsia": - download_file_types_pb2.DownloadFileType.PLATFORM_TYPE_FUCHSIA, +@@ -37,6 +37,8 @@ def PlatformTypes(): + "chromeos": + download_file_types_pb2.DownloadFileType.PLATFORM_TYPE_CHROME_OS, "linux": download_file_types_pb2.DownloadFileType.PLATFORM_TYPE_LINUX, + "openbsd": download_file_types_pb2.DownloadFileType.PLATFORM_TYPE_LINUX, + "freebsd": download_file_types_pb2.DownloadFileType.PLATFORM_TYPE_LINUX, "mac": download_file_types_pb2.DownloadFileType.PLATFORM_TYPE_MAC, "win": download_file_types_pb2.DownloadFileType.PLATFORM_TYPE_WINDOWS, - } -@@ -181,7 +183,7 @@ class DownloadFileTypeProtoGenerator(BinaryProtoGenera + # LINT.ThenChange(BUILD.gn:PlatformTypes) +@@ -179,7 +181,7 @@ class DownloadFileTypeProtoGenerator(BinaryProtoGenera '-t', '--type', help='The platform type. One of android, chromeos, ' + diff --git a/www/chromium/files/patch-components_safe__browsing_core_browser_realtime_url__lookup__service__base.cc b/www/chromium/files/patch-components_safe__browsing_core_browser_realtime_url__lookup__service__base.cc index c460b66347bf..56b61fba871f 100644 --- a/www/chromium/files/patch-components_safe__browsing_core_browser_realtime_url__lookup__service__base.cc +++ b/www/chromium/files/patch-components_safe__browsing_core_browser_realtime_url__lookup__service__base.cc @@ -1,7 +1,7 @@ ---- components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc.orig 2024-07-30 11:12:21 UTC +--- components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc.orig 2024-08-26 12:06:38 UTC +++ components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc -@@ -108,7 +108,7 @@ RTLookupRequest::OSType GetRTLookupRequestOSType() { - return RTLookupRequest::OS_TYPE_FUCHSIA; +@@ -107,7 +107,7 @@ RTLookupRequest::OSType GetRTLookupRequestOSType() { + return RTLookupRequest::OS_TYPE_CHROME_OS; #elif BUILDFLAG(IS_IOS) return RTLookupRequest::OS_TYPE_IOS; -#elif BUILDFLAG(IS_LINUX) 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 456b69f3eaf2..2dd755126a3c 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-07-30 11:12:21 UTC +--- components/safe_browsing/core/common/features.cc.orig 2024-08-26 12:06:38 UTC +++ components/safe_browsing/core/common/features.cc -@@ -168,7 +168,7 @@ BASE_FEATURE(kGooglePlayProtectPrompt, +@@ -186,7 +186,7 @@ BASE_FEATURE(kGooglePlayProtectInApkTelemetry, BASE_FEATURE(kHashPrefixRealTimeLookups, "SafeBrowsingHashPrefixRealTimeLookups", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,12 +9,12 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -253,7 +253,7 @@ constexpr base::FeatureParam<int> kReferrerChainEventM +@@ -267,7 +267,7 @@ constexpr base::FeatureParam<int> kReferrerChainEventM BASE_FEATURE(kSafeBrowsingAsyncRealTimeCheck, "SafeBrowsingAsyncRealTimeCheck", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT 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 48a10067e914..1cfad1a9dcac 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-07-30 11:12:21 UTC +--- components/search_engines/search_engine_choice/search_engine_choice_service.cc.orig 2024-08-26 12:06:38 UTC +++ components/search_engines/search_engine_choice/search_engine_choice_service.cc -@@ -580,7 +580,7 @@ void SearchEngineChoiceService::ProcessPendingChoiceSc +@@ -610,7 +610,7 @@ void SearchEngineChoiceService::ProcessPendingChoiceSc 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 b289af9b4a33..f18707bbba0e 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-07-30 11:12:21 UTC +--- components/search_engines/template_url_service.cc.orig 2024-08-26 12:06:38 UTC +++ components/search_engines/template_url_service.cc -@@ -3121,7 +3121,7 @@ bool TemplateURLService::MatchesDefaultSearchProvider( +@@ -3081,7 +3081,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_signin_public_base_signin__switches.cc b/www/chromium/files/patch-components_signin_public_base_signin__switches.cc deleted file mode 100644 index 6dfc78d0e605..000000000000 --- a/www/chromium/files/patch-components_signin_public_base_signin__switches.cc +++ /dev/null @@ -1,25 +0,0 @@ ---- components/signin/public/base/signin_switches.cc.orig 2024-07-30 11:12:21 UTC -+++ components/signin/public/base/signin_switches.cc -@@ -129,11 +129,11 @@ bool IsExplicitBrowserSigninUIOnDesktopEnabled() { - } - - #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ -- BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) -+ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD) - - // Desktop and Android are being launched (enabled by default), iOS is pending. - #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ -- BUILDFLAG(IS_ANDROID) -+ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - #define MINOR_MODE_FEATURE_DEFAULT_STATUS base::FEATURE_ENABLED_BY_DEFAULT - #else - #define MINOR_MODE_FEATURE_DEFAULT_STATUS base::FEATURE_DISABLED_BY_DEFAULT -@@ -147,7 +147,7 @@ constexpr int kMinorModeRestrictionsFetchDeadlineDefau - #if BUILDFLAG(IS_ANDROID) - // Based on Signin.AccountCapabilities.UserVisibleLatency - 1000; --#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - // Based on Signin.SyncOptIn.PreSyncConfirmationLatency - 1000; - #elif BUILDFLAG(IS_IOS) diff --git a/www/chromium/files/patch-components_signin_public_base_signin__switches.h b/www/chromium/files/patch-components_signin_public_base_signin__switches.h deleted file mode 100644 index f8601d37d8fc..000000000000 --- a/www/chromium/files/patch-components_signin_public_base_signin__switches.h +++ /dev/null @@ -1,11 +0,0 @@ ---- components/signin/public/base/signin_switches.h.orig 2024-07-30 11:12:21 UTC -+++ components/signin/public/base/signin_switches.h -@@ -112,7 +112,7 @@ bool IsExplicitBrowserSigninUIOnDesktopEnabled(); - - // Controls the view mode for (history) sync screen. - #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ -- BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) -+ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD) - COMPONENT_EXPORT(SIGNIN_SWITCHES) - BASE_DECLARE_FEATURE(kMinorModeRestrictionsForHistorySyncOptIn); - diff --git a/www/chromium/files/patch-components_startup__metric__utils_common_startup__metric__utils.cc b/www/chromium/files/patch-components_startup__metric__utils_common_startup__metric__utils.cc index 2b36b6f85d94..dc5ff7946665 100644 --- a/www/chromium/files/patch-components_startup__metric__utils_common_startup__metric__utils.cc +++ b/www/chromium/files/patch-components_startup__metric__utils_common_startup__metric__utils.cc @@ -1,9 +1,9 @@ ---- components/startup_metric_utils/common/startup_metric_utils.cc.orig 2024-05-21 18:07:39 UTC +--- components/startup_metric_utils/common/startup_metric_utils.cc.orig 2024-08-26 12:06:38 UTC +++ components/startup_metric_utils/common/startup_metric_utils.cc -@@ -85,7 +85,7 @@ base::TimeTicks CommonStartupMetricRecorder::StartupTi +@@ -94,7 +94,7 @@ base::TimeTicks CommonStartupMetricRecorder::StartupTi // Enabling this logic on OS X causes a significant performance regression. - // TODO(crbug.com/40464036): Remove IS_APPLE ifdef once priority changes are - // ignored on Mac main thread. + // TODO(crbug.com/40464036): Remove IS_APPLE ifdef once utility processes + // set their desired main thread priority. -#if !BUILDFLAG(IS_APPLE) +#if !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD) static bool statics_initialized = false; diff --git a/www/chromium/files/patch-components_supervised__user_core_browser_supervised__user__preferences.cc b/www/chromium/files/patch-components_supervised__user_core_browser_supervised__user__preferences.cc index 875dc3be38db..5028af144780 100644 --- a/www/chromium/files/patch-components_supervised__user_core_browser_supervised__user__preferences.cc +++ b/www/chromium/files/patch-components_supervised__user_core_browser_supervised__user__preferences.cc @@ -1,8 +1,8 @@ ---- components/supervised_user/core/browser/supervised_user_preferences.cc.orig 2024-06-17 12:56:06 UTC +--- components/supervised_user/core/browser/supervised_user_preferences.cc.orig 2024-08-26 12:06:38 UTC +++ components/supervised_user/core/browser/supervised_user_preferences.cc -@@ -153,7 +153,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry - static_cast<int>(FirstTimeInterstitialBannerState::kUnknown)); +@@ -154,7 +154,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry registry->RegisterBooleanPref(prefs::kChildAccountStatusKnown, false); + registry->RegisterStringPref(prefs::kFamilyLinkUserMemberRole, std::string()); #if BUILDFLAG(ENABLE_EXTENSIONS) && \ - (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)) + (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) diff --git a/www/chromium/files/patch-components_supervised__user_core_browser_supervised__user__service.cc b/www/chromium/files/patch-components_supervised__user_core_browser_supervised__user__service.cc index 0436dc990832..6b7866f174a2 100644 --- a/www/chromium/files/patch-components_supervised__user_core_browser_supervised__user__service.cc +++ b/www/chromium/files/patch-components_supervised__user_core_browser_supervised__user__service.cc @@ -1,6 +1,6 @@ ---- components/supervised_user/core/browser/supervised_user_service.cc.orig 2024-05-21 18:07:39 UTC +--- components/supervised_user/core/browser/supervised_user_service.cc.orig 2024-08-26 12:06:38 UTC +++ components/supervised_user/core/browser/supervised_user_service.cc -@@ -175,7 +175,7 @@ FirstTimeInterstitialBannerState SupervisedUserService +@@ -176,7 +176,7 @@ FirstTimeInterstitialBannerState SupervisedUserService const FirstTimeInterstitialBannerState original_state) { FirstTimeInterstitialBannerState target_state = original_state; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ 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 bc763b1e555d..ed4f30d21f29 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,6 +1,6 @@ ---- components/supervised_user/core/common/features.cc.orig 2024-07-30 11:12:21 UTC +--- components/supervised_user/core/common/features.cc.orig 2024-08-26 12:06:38 UTC +++ components/supervised_user/core/common/features.cc -@@ -59,7 +59,7 @@ BASE_FEATURE(kUpdatedSupervisedUserExtensionApprovalSt +@@ -66,7 +66,7 @@ BASE_FEATURE(kUpdatedSupervisedUserExtensionApprovalSt "UpdatedSupervisedUserExtensionApprovalStrings", base::FEATURE_DISABLED_BY_DEFAULT); @@ -9,7 +9,7 @@ BASE_FEATURE(kEnableExtensionsPermissionsForSupervisedUsersOnDesktop, "EnableExtensionsPermissionsForSupervisedUsersOnDesktop", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -74,7 +74,7 @@ bool IsSupervisedUserSkipParentApprovalToInstallExtens +@@ -81,7 +81,7 @@ bool IsSupervisedUserSkipParentApprovalToInstallExtens #if BUILDFLAG(IS_CHROMEOS) return base::FeatureList::IsEnabled( kEnableSupervisedUserSkipParentApprovalToInstallExtensions); @@ -18,12 +18,28 @@ bool skipParentApprovalEnabled = base::FeatureList::IsEnabled( kEnableSupervisedUserSkipParentApprovalToInstallExtensions); bool permissionExtensionsForSupervisedUsersEnabled = -@@ -101,7 +101,7 @@ BASE_FEATURE(kCustomWebSignInInterceptForSupervisedUse - "CustomWebSignInInterceptForSupervisedUsers", +@@ -106,13 +106,13 @@ BASE_FEATURE(kCustomWebSignInInterceptForSupervisedUse + "CustomWebSignInInterceptForSupervisedUsersUi", base::FEATURE_DISABLED_BY_DEFAULT); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + BASE_FEATURE(kShowKiteForSupervisedUsers, + "ShowKiteForSupervisedUsers", + base::FEATURE_DISABLED_BY_DEFAULT); + #endif + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) BASE_FEATURE(kHideGuestModeForSupervisedUsers, "HideGuestModeForSupervisedUsers", base::FEATURE_DISABLED_BY_DEFAULT); +@@ -122,7 +122,7 @@ BASE_FEATURE(kForceSafeSearchForUnauthenticatedSupervi + "ForceSafeSearchForUnauthenticatedSupervisedUsers", + base::FEATURE_DISABLED_BY_DEFAULT); + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + BASE_FEATURE(kForceSupervisedUserReauthenticationForYouTube, + "ForceSupervisedUserReauthenticationForYouTube", + base::FEATURE_DISABLED_BY_DEFAULT); diff --git a/www/chromium/files/patch-components_supervised__user_core_common_features.h b/www/chromium/files/patch-components_supervised__user_core_common_features.h index 274b18632655..8ab1b6e8cd23 100644 --- a/www/chromium/files/patch-components_supervised__user_core_common_features.h +++ b/www/chromium/files/patch-components_supervised__user_core_common_features.h @@ -1,4 +1,4 @@ ---- components/supervised_user/core/common/features.h.orig 2024-07-30 11:12:21 UTC +--- components/supervised_user/core/common/features.h.orig 2024-08-26 12:06:38 UTC +++ components/supervised_user/core/common/features.h @@ -25,7 +25,7 @@ BASE_DECLARE_FEATURE( // Applies new informative strings during the parental extension approval flow. @@ -9,12 +9,26 @@ BASE_DECLARE_FEATURE(kEnableExtensionsPermissionsForSupervisedUsersOnDesktop); #endif -@@ -53,7 +53,7 @@ bool IsSupervisedUserSkipParentApprovalToInstallExtens - // Only affects Desktop platforms. - BASE_DECLARE_FEATURE(kCustomWebSignInInterceptForSupervisedUsers); +@@ -62,11 +62,11 @@ BASE_DECLARE_FEATURE(kCustomWebSignInInterceptForSuper + + // Displays a Family Link kite badge on the supervised user avatar in various + // surfaces. +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + BASE_DECLARE_FEATURE(kShowKiteForSupervisedUsers); + #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) // This hides the following guest mode entry points for supervised users: // // * In the Profile menu for supervised profiles +@@ -78,7 +78,7 @@ BASE_DECLARE_FEATURE(kHideGuestModeForSupervisedUsers) + // unauthenticated (e.g. signed out of the content area) account. + BASE_DECLARE_FEATURE(kForceSafeSearchForUnauthenticatedSupervisedUsers); + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + // Force re-authentication when an unauthenticated supervised user tries to + // access YouTube, so that content restrictions can be applied. + BASE_DECLARE_FEATURE(kForceSupervisedUserReauthenticationForYouTube); diff --git a/www/chromium/files/patch-components_trusted__vault_trusted__vault__connection__impl.cc b/www/chromium/files/patch-components_trusted__vault_trusted__vault__connection__impl.cc new file mode 100644 index 000000000000..312462812ef6 --- /dev/null +++ b/www/chromium/files/patch-components_trusted__vault_trusted__vault__connection__impl.cc @@ -0,0 +1,11 @@ +--- components/trusted_vault/trusted_vault_connection_impl.cc.orig 2024-08-26 12:06:38 UTC ++++ components/trusted_vault/trusted_vault_connection_impl.cc +@@ -101,7 +101,7 @@ GetLocalPhysicalDeviceType() { + // currently used or even built on all platforms. + #if BUILDFLAG(IS_CHROMEOS) + return trusted_vault_pb::PhysicalDeviceMetadata::DEVICE_TYPE_CHROMEOS; +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return trusted_vault_pb::PhysicalDeviceMetadata::DEVICE_TYPE_LINUX; + #elif BUILDFLAG(IS_ANDROID) + return trusted_vault_pb::PhysicalDeviceMetadata::DEVICE_TYPE_ANDROID; diff --git a/www/chromium/files/patch-components_user__education_views_help__bubble__view.cc b/www/chromium/files/patch-components_user__education_views_help__bubble__view.cc index 8242ecea800c..df37ad89d85f 100644 --- a/www/chromium/files/patch-components_user__education_views_help__bubble__view.cc +++ b/www/chromium/files/patch-components_user__education_views_help__bubble__view.cc @@ -1,6 +1,6 @@ ---- components/user_education/views/help_bubble_view.cc.orig 2024-07-30 11:12:21 UTC +--- components/user_education/views/help_bubble_view.cc.orig 2024-08-26 12:06:38 UTC +++ components/user_education/views/help_bubble_view.cc -@@ -997,7 +997,7 @@ gfx::Rect HelpBubbleView::GetAnchorRect() const { +@@ -856,7 +856,7 @@ gfx::Rect HelpBubbleView::GetAnchorRect() const { void HelpBubbleView::OnBeforeBubbleWidgetInit(views::Widget::InitParams* params, views::Widget* widget) const { BubbleDialogDelegateView::OnBeforeBubbleWidgetInit(params, widget); diff --git a/www/chromium/files/patch-components_visited__url__ranking_public_url__visit__util.cc b/www/chromium/files/patch-components_visited__url__ranking_public_url__visit__util.cc index bcfe39d54c8c..12695a039ea0 100644 --- a/www/chromium/files/patch-components_visited__url__ranking_public_url__visit__util.cc +++ b/www/chromium/files/patch-components_visited__url__ranking_public_url__visit__util.cc @@ -1,6 +1,6 @@ ---- components/visited_url_ranking/public/url_visit_util.cc.orig 2024-07-30 11:12:21 UTC +--- components/visited_url_ranking/public/url_visit_util.cc.orig 2024-08-26 12:06:38 UTC +++ components/visited_url_ranking/public/url_visit_util.cc -@@ -54,7 +54,7 @@ PlatformType GetPlatformInput() { +@@ -62,7 +62,7 @@ PlatformType GetPlatformInput() { return PlatformType::kWindows; #elif BUILDFLAG(IS_MAC) return PlatformType::kMac; diff --git a/www/chromium/files/patch-components_viz_common_features.cc b/www/chromium/files/patch-components_viz_common_features.cc index 9169966a9979..391101c95b8b 100644 --- a/www/chromium/files/patch-components_viz_common_features.cc +++ b/www/chromium/files/patch-components_viz_common_features.cc @@ -1,7 +1,7 @@ ---- components/viz/common/features.cc.orig 2024-07-30 11:12:21 UTC +--- components/viz/common/features.cc.orig 2024-08-26 12:06:38 UTC +++ components/viz/common/features.cc -@@ -263,7 +263,7 @@ BASE_FEATURE(kBufferQueueImageSetPurgeable, - "BufferQueueImageSetPurgeable", +@@ -234,7 +234,7 @@ BASE_FEATURE(kAllowForceMergeRenderPassWithRequireOver + "AllowForceMergeRenderPassWithRequireOverlayQuads", base::FEATURE_ENABLED_BY_DEFAULT); -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) @@ -9,7 +9,7 @@ // On platforms using SkiaOutputDeviceBufferQueue and not yet universally using // SkiaRenderer-allocated images, when this is true SkiaRenderer will allocate // and maintain a buffer queue of images for the root render pass, instead of -@@ -559,7 +559,7 @@ bool ShouldOnBeginFrameThrottleVideo() { +@@ -500,7 +500,7 @@ bool ShouldOnBeginFrameThrottleVideo() { return base::FeatureList::IsEnabled(features::kOnBeginFrameThrottleVideo); } diff --git a/www/chromium/files/patch-components_viz_common_features.h b/www/chromium/files/patch-components_viz_common_features.h index c5a909cfb7db..5c44121e755d 100644 --- a/www/chromium/files/patch-components_viz_common_features.h +++ b/www/chromium/files/patch-components_viz_common_features.h @@ -1,6 +1,6 @@ ---- components/viz/common/features.h.orig 2024-07-30 11:12:21 UTC +--- components/viz/common/features.h.orig 2024-08-26 12:06:38 UTC +++ components/viz/common/features.h -@@ -75,7 +75,7 @@ VIZ_COMMON_EXPORT BASE_DECLARE_FEATURE(kDrawPredictedI +@@ -72,7 +72,7 @@ VIZ_COMMON_EXPORT BASE_DECLARE_FEATURE(kDrawPredictedI VIZ_COMMON_EXPORT BASE_DECLARE_FEATURE(kAllowUndamagedNonrootRenderPassToSkip); VIZ_COMMON_EXPORT BASE_DECLARE_FEATURE( kAllowForceMergeRenderPassWithRequireOverlayQuads); @@ -8,9 +8,9 @@ +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) VIZ_COMMON_EXPORT BASE_DECLARE_FEATURE(kRendererAllocatesImages); #endif - VIZ_COMMON_EXPORT BASE_DECLARE_FEATURE(kBufferQueueImageSetPurgeable); -@@ -136,7 +136,7 @@ VIZ_COMMON_EXPORT std::optional<double> IsDynamicSched - VIZ_COMMON_EXPORT std::optional<double> IsDynamicSchedulerEnabledForClients(); + VIZ_COMMON_EXPORT BASE_DECLARE_FEATURE(kOnBeginFrameAcks); +@@ -129,7 +129,7 @@ VIZ_COMMON_EXPORT bool UseWebViewNewInvalidateHeuristi + VIZ_COMMON_EXPORT bool UseSurfaceLayerForVideo(); VIZ_COMMON_EXPORT int MaxOverlaysConsidered(); VIZ_COMMON_EXPORT bool ShouldOnBeginFrameThrottleVideo(); -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) diff --git a/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__device__buffer__queue.cc b/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__device__buffer__queue.cc index 83ec58f5b321..d00d8209cda6 100644 --- a/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__device__buffer__queue.cc +++ b/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__device__buffer__queue.cc @@ -1,6 +1,6 @@ ---- components/viz/service/display_embedder/skia_output_device_buffer_queue.cc.orig 2024-07-30 11:12:21 UTC +--- components/viz/service/display_embedder/skia_output_device_buffer_queue.cc.orig 2024-08-26 12:06:38 UTC +++ components/viz/service/display_embedder/skia_output_device_buffer_queue.cc -@@ -174,7 +174,7 @@ SkiaOutputDeviceBufferQueue::SkiaOutputDeviceBufferQue +@@ -175,7 +175,7 @@ SkiaOutputDeviceBufferQueue::SkiaOutputDeviceBufferQue capabilities_.only_invalidates_damage_rect = false; capabilities_.number_of_buffers = 3; diff --git a/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc b/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc index b71c19d682b7..3a2efc0763ee 100644 --- a/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc +++ b/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc @@ -1,6 +1,6 @@ ---- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2024-07-30 11:12:21 UTC +--- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2024-08-26 12:06:38 UTC +++ components/viz/service/display_embedder/skia_output_surface_impl.cc -@@ -1546,7 +1546,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor +@@ -1663,7 +1663,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor ->GetVulkanPhysicalDevice(), VK_IMAGE_TILING_OPTIMAL, vk_format, si_format, yuv_color_space, ycbcr_info); diff --git a/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc b/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc index e96833abb05a..a3a09ea2a091 100644 --- a/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc +++ b/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc @@ -1,6 +1,6 @@ ---- components/viz/service/display_embedder/software_output_surface.cc.orig 2024-06-17 12:56:06 UTC +--- components/viz/service/display_embedder/software_output_surface.cc.orig 2024-08-26 12:06:38 UTC +++ components/viz/service/display_embedder/software_output_surface.cc -@@ -124,7 +124,7 @@ void SoftwareOutputSurface::SwapBuffersCallback(base:: +@@ -119,7 +119,7 @@ void SoftwareOutputSurface::SwapBuffersCallback(base:: now.SnappedToNextTick(refresh_timebase_, refresh_interval_) - now; // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ if (needs_swap_size_notifications_) client_->DidSwapWithSize(pixel_size); #endif -@@ -153,7 +153,7 @@ gfx::OverlayTransform SoftwareOutputSurface::GetDispla +@@ -148,7 +148,7 @@ gfx::OverlayTransform SoftwareOutputSurface::GetDispla // 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_viz_service_display__embedder_software__output__surface.h b/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.h index c7b520747fac..999a0b824772 100644 --- a/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.h +++ b/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.h @@ -1,6 +1,6 @@ ---- components/viz/service/display_embedder/software_output_surface.h.orig 2024-06-17 12:56:06 UTC +--- components/viz/service/display_embedder/software_output_surface.h.orig 2024-08-26 12:06:38 UTC +++ components/viz/service/display_embedder/software_output_surface.h -@@ -47,7 +47,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi +@@ -45,7 +45,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi gfx::OverlayTransform GetDisplayTransform() override; // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ void SetNeedsSwapSizeNotifications( bool needs_swap_size_notifications) override; #endif -@@ -70,7 +70,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi +@@ -65,7 +65,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi // 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_viz_service_display_skia__renderer.cc b/www/chromium/files/patch-components_viz_service_display_skia__renderer.cc index 84b896f6ebb1..b1d886143b3a 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-07-30 11:12:21 UTC +--- components/viz/service/display/skia_renderer.cc.orig 2024-08-26 12:06:38 UTC +++ components/viz/service/display/skia_renderer.cc -@@ -1422,7 +1422,7 @@ void SkiaRenderer::ClearFramebuffer() { +@@ -1441,7 +1441,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 0171c97c3059..56c23d5f9970 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-06-17 12:56:06 UTC +--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2024-08-26 12:06:38 UTC +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc @@ -111,7 +111,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); -@@ -656,7 +656,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw +@@ -673,7 +673,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw if (display_client_ && enable_swap_completion_callback_) { display_client_->DidCompleteSwapWithSize(pixel_size); } diff --git a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h index 68f6c90f56aa..816a73d66667 100644 --- a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h +++ b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h @@ -1,6 +1,6 @@ ---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig 2024-04-19 13:02:56 UTC +--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig 2024-08-26 12:06:38 UTC +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h -@@ -209,7 +209,7 @@ class VIZ_SERVICE_EXPORT RootCompositorFrameSinkImpl +@@ -214,7 +214,7 @@ class VIZ_SERVICE_EXPORT RootCompositorFrameSinkImpl // See comments on `EvictionHandler`. EvictionHandler eviction_handler_; diff --git a/www/chromium/files/patch-components_webapps_browser_features.cc b/www/chromium/files/patch-components_webapps_browser_features.cc new file mode 100644 index 000000000000..06ed337cd789 --- /dev/null +++ b/www/chromium/files/patch-components_webapps_browser_features.cc @@ -0,0 +1,11 @@ +--- components/webapps/browser/features.cc.orig 2024-08-26 12:06:38 UTC ++++ components/webapps/browser/features.cc +@@ -59,7 +59,7 @@ extern const base::FeatureParam<int> kBannerParamsDays + BASE_FEATURE(kWebAppsEnableMLModelForPromotion, + "WebAppsEnableMLModelForPromotion", + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + base::FEATURE_ENABLED_BY_DEFAULT); + #else + base::FEATURE_DISABLED_BY_DEFAULT); diff --git a/www/chromium/files/patch-content_app_content__main.cc b/www/chromium/files/patch-content_app_content__main.cc index 35e97f17355f..223adc8976c8 100644 --- a/www/chromium/files/patch-content_app_content__main.cc +++ b/www/chromium/files/patch-content_app_content__main.cc @@ -1,11 +1,20 @@ ---- content/app/content_main.cc.orig 2024-05-21 18:07:39 UTC +--- content/app/content_main.cc.orig 2024-08-26 12:06:38 UTC +++ content/app/content_main.cc -@@ -206,7 +206,7 @@ RunContentProcess(ContentMainParams params, - #endif +@@ -207,7 +207,7 @@ RunContentProcess(ContentMainParams params, base::EnableTerminationOnOutOfMemory(); + logging::RegisterAbslAbortHook(); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // The various desktop environments set this environment variable that // allows the dbus client library to connect directly to the bus. When this // variable is not set (test environments like xvfb-run), the dbus client +@@ -293,7 +293,7 @@ RunContentProcess(ContentMainParams params, + command_line->AppendSwitch(switches::kUseMobileUserAgent); + #endif + +-#if (BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)) && !defined(COMPONENT_BUILD) ++#if (BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)) && !defined(COMPONENT_BUILD) && defined(notyet) + base::subtle::EnableFDOwnershipEnforcement(true); + #endif + diff --git a/www/chromium/files/patch-content_app_content__main__runner__impl.cc b/www/chromium/files/patch-content_app_content__main__runner__impl.cc index 098a912e4169..72b4cd32d79c 100644 --- a/www/chromium/files/patch-content_app_content__main__runner__impl.cc +++ b/www/chromium/files/patch-content_app_content__main__runner__impl.cc @@ -1,4 +1,4 @@ ---- content/app/content_main_runner_impl.cc.orig 2024-07-30 11:12:21 UTC +--- content/app/content_main_runner_impl.cc.orig 2024-08-26 12:06:38 UTC +++ content/app/content_main_runner_impl.cc @@ -149,18 +149,20 @@ #include "content/browser/posix_file_descriptor_info_impl.h" @@ -34,7 +34,7 @@ #if BUILDFLAG(IS_ANDROID) #include "base/system/sys_info.h" #include "content/browser/android/battery_metrics.h" -@@ -389,7 +395,7 @@ void InitializeZygoteSandboxForBrowserProcess( +@@ -403,7 +409,7 @@ void InitializeZygoteSandboxForBrowserProcess( } #endif // BUILDFLAG(USE_ZYGOTE) @@ -43,7 +43,7 @@ #if BUILDFLAG(ENABLE_PPAPI) // Loads the (native) libraries but does not initialize them (i.e., does not -@@ -427,7 +433,10 @@ void PreloadLibraryCdms() { +@@ -441,7 +447,10 @@ void PreloadLibraryCdms() { void PreSandboxInit() { // Ensure the /dev/urandom is opened. @@ -54,7 +54,7 @@ // May use sysinfo(), sched_getaffinity(), and open various /sys/ and /proc/ // files. -@@ -439,9 +448,16 @@ void PreSandboxInit() { +@@ -453,9 +462,16 @@ void PreSandboxInit() { // https://boringssl.googlesource.com/boringssl/+/HEAD/SANDBOXING.md CRYPTO_pre_sandbox_init(); @@ -71,7 +71,7 @@ #if BUILDFLAG(ENABLE_PPAPI) // Ensure access to the Pepper plugins before the sandbox is turned on. -@@ -889,11 +905,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -877,11 +893,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam base::GlobalDescriptors::kBaseDescriptor); #endif // !BUILDFLAG(IS_ANDROID) @@ -85,7 +85,7 @@ #endif // !BUILDFLAG(IS_WIN) -@@ -1041,8 +1056,20 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -1058,8 +1073,20 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam process_type == switches::kZygoteProcess) { PreSandboxInit(); } @@ -106,7 +106,7 @@ delegate_->SandboxInitialized(process_type); #if BUILDFLAG(USE_ZYGOTE) -@@ -1114,7 +1141,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { +@@ -1133,7 +1160,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { ->ReconfigureAfterFeatureListInit(process_type); } @@ -115,7 +115,7 @@ // If dynamic Mojo Core is being used, ensure that it's loaded very early in // the child/zygote process, before any sandbox is initialized. The library // is not fully initialized with IPC support until a ChildProcess is later -@@ -1149,6 +1176,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { +@@ -1168,6 +1195,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { content_main_params_.reset(); RegisterMainThreadFactories(); diff --git a/www/chromium/files/patch-content_browser_BUILD.gn b/www/chromium/files/patch-content_browser_BUILD.gn index 38d14935be20..3dfc71949ef4 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-07-30 11:12:21 UTC +--- content/browser/BUILD.gn.orig 2024-08-26 12:06:38 UTC +++ content/browser/BUILD.gn -@@ -2375,6 +2375,14 @@ source_set("browser") { +@@ -2396,6 +2396,14 @@ source_set("browser") { ] } @@ -15,7 +15,7 @@ if (is_linux || is_chromeos) { sources += [ "child_process_launcher_helper_linux.cc", -@@ -2411,6 +2419,15 @@ source_set("browser") { +@@ -2436,6 +2444,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_browser__child__process__host__impl.cc b/www/chromium/files/patch-content_browser_browser__child__process__host__impl.cc index 8daf9b23cecb..fc5dfefda355 100644 --- a/www/chromium/files/patch-content_browser_browser__child__process__host__impl.cc +++ b/www/chromium/files/patch-content_browser_browser__child__process__host__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/browser_child_process_host_impl.cc.orig 2024-06-17 12:56:06 UTC +--- content/browser/browser_child_process_host_impl.cc.orig 2024-08-26 12:06:38 UTC +++ content/browser/browser_child_process_host_impl.cc -@@ -330,6 +330,7 @@ void BrowserChildProcessHostImpl::LaunchWithoutExtraCo +@@ -324,6 +324,7 @@ void BrowserChildProcessHostImpl::LaunchWithoutExtraCo switches::kMojoCoreLibraryPath, switches::kPerfettoDisableInterning, switches::kTraceToConsole, @@ -8,7 +8,7 @@ }; cmd_line->CopySwitchesFrom(browser_command_line, kForwardSwitches); -@@ -658,7 +659,7 @@ void BrowserChildProcessHostImpl::OnProcessLaunched() +@@ -655,7 +656,7 @@ void BrowserChildProcessHostImpl::OnProcessLaunched() ->child_process()); #endif diff --git a/www/chromium/files/patch-content_browser_browser__child__process__host__impl.h b/www/chromium/files/patch-content_browser_browser__child__process__host__impl.h index 7e977be2de28..19c880560f61 100644 --- a/www/chromium/files/patch-content_browser_browser__child__process__host__impl.h +++ b/www/chromium/files/patch-content_browser_browser__child__process__host__impl.h @@ -1,4 +1,4 @@ ---- content/browser/browser_child_process_host_impl.h.orig 2024-05-21 18:07:39 UTC +--- content/browser/browser_child_process_host_impl.h.orig 2024-08-26 12:06:38 UTC +++ content/browser/browser_child_process_host_impl.h @@ -35,7 +35,7 @@ #include "base/win/object_watcher.h" @@ -9,7 +9,7 @@ #include "content/browser/child_thread_type_switcher_linux.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -273,7 +273,7 @@ class BrowserChildProcessHostImpl +@@ -269,7 +269,7 @@ class BrowserChildProcessHostImpl std::unique_ptr<tracing::SystemTracingService> system_tracing_service_; #endif diff --git a/www/chromium/files/patch-content_browser_browser__main__loop.cc b/www/chromium/files/patch-content_browser_browser__main__loop.cc index 19b9aac77f9e..eb6be9563497 100644 --- a/www/chromium/files/patch-content_browser_browser__main__loop.cc +++ b/www/chromium/files/patch-content_browser_browser__main__loop.cc @@ -1,6 +1,6 @@ ---- content/browser/browser_main_loop.cc.orig 2024-07-30 11:12:21 UTC +--- content/browser/browser_main_loop.cc.orig 2024-08-26 12:06:38 UTC +++ content/browser/browser_main_loop.cc -@@ -251,6 +251,12 @@ +@@ -254,6 +254,12 @@ #include "mojo/public/cpp/bindings/lib/test_random_mojo_delays.h" #endif @@ -13,7 +13,7 @@ // One of the linux specific headers defines this as a macro. #ifdef DestroyAll #undef DestroyAll -@@ -546,6 +552,12 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -549,6 +555,12 @@ int BrowserMainLoop::EarlyInitialization() { // by now since a thread to start the ServiceManager has been created // before the browser main loop starts. DCHECK(SandboxHostLinux::GetInstance()->IsInitialized()); @@ -26,7 +26,7 @@ #endif // GLib's spawning of new processes is buggy, so it's important that at this -@@ -583,7 +595,7 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -586,7 +598,7 @@ int BrowserMainLoop::EarlyInitialization() { base::PlatformThread::SetCurrentThreadType(base::ThreadType::kCompositing); #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ 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 a93872bf26ac..69d17e54cab5 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-06-17 12:56:06 UTC +--- content/browser/child_process_launcher_helper.h.orig 2024-08-26 12:06:38 UTC +++ content/browser/child_process_launcher_helper.h -@@ -297,7 +297,7 @@ class ChildProcessLauncherHelper +@@ -299,7 +299,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 223435712a2f..90227326dc66 100644 --- a/www/chromium/files/patch-content_browser_gpu_compositor__util.cc +++ b/www/chromium/files/patch-content_browser_gpu_compositor__util.cc @@ -1,6 +1,6 @@ ---- content/browser/gpu/compositor_util.cc.orig 2024-07-30 11:12:21 UTC +--- content/browser/gpu/compositor_util.cc.orig 2024-08-26 12:06:38 UTC +++ content/browser/gpu/compositor_util.cc -@@ -154,7 +154,7 @@ std::vector<GpuFeatureData> GetGpuFeatureData( +@@ -153,7 +153,7 @@ std::vector<GpuFeatureData> GetGpuFeatureData( "video_decode", SafeGetFeatureStatus( gpu_feature_info, gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE, @@ -9,7 +9,7 @@ !base::FeatureList::IsEnabled(media::kVaapiVideoDecodeLinux) || #endif // BUILDFLAG(IS_LINUX) command_line.HasSwitch(switches::kDisableAcceleratedVideoDecode)), -@@ -166,7 +166,7 @@ std::vector<GpuFeatureData> GetGpuFeatureData( +@@ -165,7 +165,7 @@ std::vector<GpuFeatureData> GetGpuFeatureData( "video_encode", SafeGetFeatureStatus( gpu_feature_info, gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_ENCODE, diff --git a/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl.cc b/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl.cc index 4fec1c50b80c..1c397bd7f66d 100644 --- a/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl.cc +++ b/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/gpu/gpu_data_manager_impl.cc.orig 2024-06-17 12:56:06 UTC +--- content/browser/gpu/gpu_data_manager_impl.cc.orig 2024-08-26 12:06:38 UTC +++ content/browser/gpu/gpu_data_manager_impl.cc -@@ -397,7 +397,7 @@ void GpuDataManagerImpl::OnDisplayMetricsChanged( +@@ -402,7 +402,7 @@ void GpuDataManagerImpl::OnDisplayMetricsChanged( private_->OnDisplayMetricsChanged(display, changed_metrics); } diff --git a/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl.h b/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl.h index 2aa84fd31c5a..7d0d9ff5c919 100644 --- a/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl.h +++ b/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl.h @@ -1,6 +1,6 @@ ---- content/browser/gpu/gpu_data_manager_impl.h.orig 2024-05-21 18:07:39 UTC +--- content/browser/gpu/gpu_data_manager_impl.h.orig 2024-08-26 12:06:38 UTC +++ content/browser/gpu/gpu_data_manager_impl.h -@@ -219,7 +219,7 @@ class CONTENT_EXPORT GpuDataManagerImpl : public GpuDa +@@ -220,7 +220,7 @@ class CONTENT_EXPORT GpuDataManagerImpl : public GpuDa void OnDisplayMetricsChanged(const display::Display& display, uint32_t changed_metrics) override; 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 b888d8263ca3..4f527fd65e01 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-07-30 11:12:21 UTC +--- content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2024-08-26 12:06:38 UTC +++ content/browser/gpu/gpu_data_manager_impl_private.cc -@@ -1697,7 +1697,7 @@ void GpuDataManagerImplPrivate::RecordCompositingMode( +@@ -1685,7 +1685,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 7295cb22cb16..be6a01f8e271 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,6 +1,6 @@ ---- content/browser/gpu/gpu_data_manager_impl_private.h.orig 2024-05-21 18:07:39 UTC +--- 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 -@@ -150,7 +150,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate { +@@ -147,7 +147,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate { void OnDisplayMetricsChanged(const display::Display& display, uint32_t changed_metrics); @@ -9,7 +9,7 @@ bool IsGpuMemoryBufferNV12Supported(); void SetGpuMemoryBufferNV12Supported(bool supported); #endif // BUILDFLAG(IS_LINUX) -@@ -302,7 +302,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate { +@@ -303,7 +303,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate { bool application_is_visible_ = true; bool disable_gpu_compositing_ = false; diff --git a/www/chromium/files/patch-content_browser_network__service__instance__impl.cc b/www/chromium/files/patch-content_browser_network__service__instance__impl.cc index 885cd16ea6ec..eaa0595f5851 100644 --- a/www/chromium/files/patch-content_browser_network__service__instance__impl.cc +++ b/www/chromium/files/patch-content_browser_network__service__instance__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/network_service_instance_impl.cc.orig 2024-05-21 18:07:39 UTC +--- content/browser/network_service_instance_impl.cc.orig 2024-08-26 12:06:38 UTC +++ content/browser/network_service_instance_impl.cc -@@ -82,7 +82,7 @@ +@@ -85,7 +85,7 @@ #include "content/browser/network/network_service_process_tracker_win.h" #endif @@ -9,7 +9,7 @@ #include "content/browser/system_dns_resolution/system_dns_resolver.h" #include "services/network/public/mojom/system_dns_resolution.mojom-forward.h" #endif -@@ -360,7 +360,7 @@ void CreateInProcessNetworkService( +@@ -363,7 +363,7 @@ void CreateInProcessNetworkService( std::move(receiver))); } @@ -18,7 +18,7 @@ // Runs a self-owned SystemDnsResolverMojoImpl. This is meant to run on a // high-priority thread pool. void RunSystemDnsResolverOnThreadPool( -@@ -429,7 +429,7 @@ network::mojom::NetworkServiceParamsPtr CreateNetworkS +@@ -432,7 +432,7 @@ network::mojom::NetworkServiceParamsPtr CreateNetworkS } #endif // BUILDFLAG(IS_POSIX) 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 index 3b11d1ce5b77..dfb60073bc7e 100644 --- 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 @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_process_host_impl.cc.orig 2024-07-30 11:12:21 UTC +--- content/browser/renderer_host/render_process_host_impl.cc.orig 2024-08-26 12:06:38 UTC +++ content/browser/renderer_host/render_process_host_impl.cc -@@ -224,7 +224,7 @@ +@@ -218,7 +218,7 @@ #include "third_party/blink/public/mojom/android_font_lookup/android_font_lookup.mojom.h" #endif @@ -9,7 +9,7 @@ #include <sys/resource.h> #include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck -@@ -965,7 +965,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = +@@ -948,7 +948,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = // to indicate failure and std::numeric_limits<size_t>::max() to indicate // unlimited. size_t GetPlatformProcessLimit() { @@ -18,34 +18,16 @@ struct rlimit limit; if (getrlimit(RLIMIT_NPROC, &limit) != 0) return kUnknownPlatformProcessLimit; -@@ -1151,7 +1151,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public - IOThreadHostImpl& operator=(const IOThreadHostImpl& other) = delete; +@@ -1121,7 +1121,7 @@ RenderProcessHostImpl::IOThreadHostImpl::~IOThreadHost - void SetPid(base::ProcessId child_pid) { + 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); + child_thread_type_switcher_.SetPid(child_pid); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) - } -@@ -1172,7 +1172,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public - return; - } - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) { - ConnectToFontService(std::move(font_receiver)); - return; -@@ -1266,7 +1266,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public - std::unique_ptr<service_manager::BinderRegistry> binders_; - mojo::Receiver<mojom::ChildProcessHost> receiver_{this}; - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - mojo::Remote<media::mojom::VideoEncodeAcceleratorProviderFactory> - video_encode_accelerator_factory_remote_; - ChildThreadTypeSwitcher child_thread_type_switcher_; -@@ -3429,7 +3429,7 @@ void RenderProcessHostImpl::AppendRendererCommandLine( + } +@@ -3131,7 +3131,7 @@ void RenderProcessHostImpl::AppendRendererCommandLine( base::TimeTicks::UnixEpoch().since_origin().InMicroseconds())); } @@ -54,7 +36,7 @@ // Append `kDisableVideoCaptureUseGpuMemoryBuffer` flag if there is no support // for NV12 GPU memory buffer. if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled() && -@@ -3487,6 +3487,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin +@@ -3188,6 +3188,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin switches::kDisableSpeechAPI, switches::kDisableThreadedCompositing, switches::kDisableTouchDragDrop, 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 528e1424af65..33b068c74976 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,6 +1,15 @@ ---- content/browser/renderer_host/render_process_host_impl.h.orig 2024-07-30 11:12:21 UTC +--- content/browser/renderer_host/render_process_host_impl.h.orig 2024-08-26 12:06:38 UTC +++ content/browser/renderer_host/render_process_host_impl.h -@@ -594,7 +594,7 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -102,7 +102,7 @@ + #include "media/fuchsia_media_codec_provider_impl.h" + #endif + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include "content/browser/child_thread_type_switcher_linux.h" + #include "media/mojo/mojom/video_encode_accelerator.mojom.h" + #endif +@@ -602,7 +602,7 @@ class CONTENT_EXPORT RenderProcessHostImpl // Sets this RenderProcessHost to be guest only. For Testing only. void SetForGuestsOnlyForTesting(); @@ -9,3 +18,12 @@ // Launch the zygote early in the browser startup. static void EarlyZygoteLaunch(); #endif // BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_MAC) +@@ -967,7 +967,7 @@ class CONTENT_EXPORT RenderProcessHostImpl + std::unique_ptr<service_manager::BinderRegistry> binders_; + mojo::Receiver<mojom::ChildProcessHost> receiver_{this}; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + mojo::Remote<media::mojom::VideoEncodeAcceleratorProviderFactory> + video_encode_accelerator_factory_remote_; + ChildThreadTypeSwitcher child_thread_type_switcher_; diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl__receiver__bindings.cc b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl__receiver__bindings.cc new file mode 100644 index 000000000000..93c05940ab43 --- /dev/null +++ b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl__receiver__bindings.cc @@ -0,0 +1,20 @@ +--- content/browser/renderer_host/render_process_host_impl_receiver_bindings.cc.orig 2024-08-26 12:06:38 UTC ++++ content/browser/renderer_host/render_process_host_impl_receiver_bindings.cc +@@ -52,7 +52,7 @@ + #include "third_party/blink/public/mojom/webdatabase/web_database.mojom.h" + #endif + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck + #include "content/browser/font_service.h" // nogncheck + #include "content/browser/media/video_encode_accelerator_provider_launcher.h" +@@ -341,7 +341,7 @@ void RenderProcessHostImpl::IOThreadHostImpl::BindHost + } + #endif + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) { + ConnectToFontService(std::move(font_receiver)); + return; 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 5e720c5e2d19..df089d80a556 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-07-30 11:12:21 UTC +--- content/browser/renderer_host/render_view_host_impl.cc.orig 2024-08-26 12:06:38 UTC +++ content/browser/renderer_host/render_view_host_impl.cc -@@ -273,7 +273,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_renderer__host_render__widget__host__view__aura.cc b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc index d3e95e1b23e1..267a4caf2085 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc @@ -1,4 +1,4 @@ ---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2024-08-07 08:11:50 UTC +--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2024-08-26 12:06:38 UTC +++ content/browser/renderer_host/render_widget_host_view_aura.cc @@ -120,7 +120,7 @@ #include "ui/gfx/gdi_util.h" @@ -9,7 +9,7 @@ #include "content/browser/accessibility/browser_accessibility_auralinux.h" #include "ui/base/ime/linux/text_edit_command_auralinux.h" #include "ui/base/ime/text_input_flags.h" -@@ -469,7 +469,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge +@@ -479,7 +479,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge return ToBrowserAccessibilityWin(manager->GetBrowserAccessibilityRoot()) ->GetCOM(); @@ -18,7 +18,7 @@ BrowserAccessibilityManager* manager = host()->GetOrCreateRootBrowserAccessibilityManager(); if (manager && manager->GetBrowserAccessibilityRoot()) -@@ -1731,7 +1731,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() { +@@ -1733,7 +1733,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() { return host() && host()->delegate() && host()->delegate()->ShouldDoLearning(); } @@ -27,7 +27,7 @@ bool RenderWidgetHostViewAura::SetCompositionFromExistingText( const gfx::Range& range, const std::vector<ui::ImeTextSpan>& ui_ime_text_spans) { -@@ -2559,7 +2559,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { +@@ -2561,7 +2561,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { } bool RenderWidgetHostViewAura::NeedsMouseCapture() { @@ -36,7 +36,7 @@ return NeedsInputGrab(); #else return false; -@@ -2743,7 +2743,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit +@@ -2745,7 +2745,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit if (!target_host) return; diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h index b8da48ab520e..6ecff4147330 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h +++ b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_widget_host_view_aura.h.orig 2024-08-07 08:11:50 UTC +--- content/browser/renderer_host/render_widget_host_view_aura.h.orig 2024-08-26 12:06:38 UTC +++ content/browser/renderer_host/render_widget_host_view_aura.h -@@ -261,7 +261,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura +@@ -260,7 +260,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura ukm::SourceId GetClientSourceForMetrics() const override; bool ShouldDoLearning() override; diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc index 2e3e7fe8d23b..c910ef23142c 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc @@ -1,7 +1,7 @@ ---- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig 2024-06-17 12:56:06 UTC +--- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig 2024-08-26 12:06:38 UTC +++ content/browser/renderer_host/render_widget_host_view_event_handler.cc -@@ -596,7 +596,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand - if (event->type() == ui::ET_MOUSE_EXITED) { +@@ -602,7 +602,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand + if (event->type() == ui::EventType::kMouseExited) { if (mouse_locked || selection_popup) return false; -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) 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 cc0620539d91..ab3b75bb1aa3 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-07-30 11:12:21 UTC +--- content/browser/utility_process_host.cc.orig 2024-08-26 12:06:38 UTC +++ content/browser/utility_process_host.cc @@ -61,7 +61,7 @@ #include "content/browser/v8_snapshot_files.h" @@ -45,7 +45,7 @@ allowed_gpu_ = true; #endif } -@@ -408,7 +408,7 @@ bool UtilityProcessHost::StartProcess() { +@@ -407,7 +407,7 @@ bool UtilityProcessHost::StartProcess() { file_data_->files_to_preload.merge(GetV8SnapshotFilesToPreload(*cmd_line)); #endif // BUILDFLAG(IS_POSIX) @@ -54,7 +54,7 @@ // The network service should have access to the parent directories // necessary for its usage. if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork) { -@@ -419,13 +419,13 @@ bool UtilityProcessHost::StartProcess() { +@@ -418,13 +418,13 @@ bool UtilityProcessHost::StartProcess() { } #endif // BUILDFLAG(IS_LINUX) 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 5bb22a51d98b..7b0bb7c8dcfc 100644 --- a/www/chromium/files/patch-content_browser_utility__sandbox__delegate.cc +++ b/www/chromium/files/patch-content_browser_utility__sandbox__delegate.cc @@ -1,6 +1,6 @@ ---- content/browser/utility_sandbox_delegate.cc.orig 2024-07-30 11:12:21 UTC +--- content/browser/utility_sandbox_delegate.cc.orig 2024-08-26 12:06:38 UTC +++ content/browser/utility_sandbox_delegate.cc -@@ -67,10 +67,10 @@ UtilitySandboxedProcessLauncherDelegate:: +@@ -76,10 +76,10 @@ UtilitySandboxedProcessLauncherDelegate:: #if BUILDFLAG(IS_FUCHSIA) sandbox_type_ == sandbox::mojom::Sandbox::kVideoCapture || #endif @@ -13,7 +13,7 @@ sandbox_type_ == sandbox::mojom::Sandbox::kHardwareVideoEncoding || #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -127,10 +127,10 @@ ZygoteCommunication* UtilitySandboxedProcessLauncherDe +@@ -136,10 +136,10 @@ ZygoteCommunication* UtilitySandboxedProcessLauncherDe // process upon startup. if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork || sandbox_type_ == sandbox::mojom::Sandbox::kOnDeviceModelExecution || 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 d753b96ac3d4..02b16dfa443f 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-06-17 12:56:06 UTC +--- content/browser/web_contents/web_contents_view_aura.cc.orig 2024-08-26 12:06:38 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. -@@ -1333,7 +1333,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent* +@@ -1319,7 +1319,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_common_BUILD.gn b/www/chromium/files/patch-content_common_BUILD.gn index db5d0e046dc6..5f27788e3ad7 100644 --- a/www/chromium/files/patch-content_common_BUILD.gn +++ b/www/chromium/files/patch-content_common_BUILD.gn @@ -1,6 +1,6 @@ ---- content/common/BUILD.gn.orig 2024-07-30 11:12:21 UTC +--- content/common/BUILD.gn.orig 2024-08-26 12:06:38 UTC +++ content/common/BUILD.gn -@@ -421,19 +421,28 @@ source_set("common") { +@@ -388,19 +388,28 @@ source_set("common") { } if (is_linux || is_chromeos) { diff --git a/www/chromium/files/patch-content_common_features.cc b/www/chromium/files/patch-content_common_features.cc index f07d5ac74ed8..acdb8304d83d 100644 --- a/www/chromium/files/patch-content_common_features.cc +++ b/www/chromium/files/patch-content_common_features.cc @@ -1,6 +1,6 @@ ---- content/common/features.cc.orig 2024-07-30 11:12:21 UTC +--- content/common/features.cc.orig 2024-08-26 12:06:38 UTC +++ content/common/features.cc -@@ -173,7 +173,7 @@ BASE_FEATURE(kEnableBackForwardCacheForOngoingSubframe +@@ -158,7 +158,7 @@ BASE_FEATURE(kEnableBackForwardCacheForOngoingSubframe base::FEATURE_ENABLED_BY_DEFAULT); // Enables error reporting for JS errors inside DevTools frontend host @@ -9,7 +9,7 @@ BASE_FEATURE(kEnableDevToolsJsErrorReporting, "EnableDevToolsJsErrorReporting", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -294,7 +294,7 @@ BASE_FEATURE(kGroupNIKByJoiningOrigin, +@@ -308,7 +308,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 667f4e33c8ec..30c9a98a41a5 100644 --- a/www/chromium/files/patch-content_common_features.h +++ b/www/chromium/files/patch-content_common_features.h @@ -1,6 +1,6 @@ ---- content/common/features.h.orig 2024-07-30 11:12:21 UTC +--- content/common/features.h.orig 2024-08-26 12:06:38 UTC +++ content/common/features.h -@@ -37,7 +37,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kDocumentPolicyNeg +@@ -35,7 +35,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kDocumentPolicyNeg CONTENT_EXPORT BASE_DECLARE_FEATURE(kEnableBackForwardCacheForScreenReader); CONTENT_EXPORT BASE_DECLARE_FEATURE( kEnableBackForwardCacheForOngoingSubframeNavigation); @@ -9,7 +9,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kEnableDevToolsJsErrorReporting); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) CONTENT_EXPORT BASE_DECLARE_FEATURE(kEmbeddingRequiresOptIn); -@@ -71,7 +71,7 @@ CONTENT_EXPORT extern const base::FeatureParam<int> +@@ -76,7 +76,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 ab84c6334c9b..4ec137df85ca 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-07-30 11:12:21 UTC +--- content/gpu/gpu_main.cc.orig 2024-08-26 12:06:38 UTC +++ content/gpu/gpu_main.cc @@ -94,10 +94,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_); -@@ -283,7 +287,7 @@ int GpuMain(MainFunctionParams parameters) { +@@ -284,7 +288,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 -@@ -305,7 +309,8 @@ int GpuMain(MainFunctionParams parameters) { +@@ -306,7 +310,8 @@ int GpuMain(MainFunctionParams parameters) { base::PlatformThread::SetName("CrGpuMain"); @@ -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. -@@ -435,7 +440,7 @@ int GpuMain(MainFunctionParams parameters) { +@@ -436,7 +441,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) { -@@ -475,7 +480,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo +@@ -476,7 +481,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 bd0bbe1c4c82..6e936ff6c2ab 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-07-30 11:12:21 UTC +--- content/public/browser/content_browser_client.cc.orig 2024-08-26 12:06:38 UTC +++ content/public/browser/content_browser_client.cc -@@ -1307,7 +1307,7 @@ bool ContentBrowserClient::ShouldRunOutOfProcessSystem +@@ -1325,7 +1325,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_common_content__features.cc b/www/chromium/files/patch-content_public_common_content__features.cc index b5c93a3fcc09..1cbe5d4abd99 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-07-30 11:12:21 UTC +--- content/public/common/content_features.cc.orig 2024-08-26 12:06:38 UTC +++ content/public/common/content_features.cc @@ -36,7 +36,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 -@@ -1090,9 +1090,9 @@ BASE_FEATURE(kWebAssemblyTiering, +@@ -1128,9 +1128,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 -@@ -1129,7 +1129,11 @@ BASE_FEATURE(kWebUICodeCache, +@@ -1167,7 +1167,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 f48fd63654c9..7bb0926d9a7b 100644 --- a/www/chromium/files/patch-content_public_common_content__switches.cc +++ b/www/chromium/files/patch-content_public_common_content__switches.cc @@ -1,6 +1,6 @@ ---- content/public/common/content_switches.cc.orig 2024-07-30 11:12:21 UTC +--- content/public/common/content_switches.cc.orig 2024-08-26 12:06:38 UTC +++ content/public/common/content_switches.cc -@@ -352,6 +352,8 @@ const char kEnableIsolatedWebAppsInRenderer[] = +@@ -349,6 +349,8 @@ const char kEnableIsolatedWebAppsInRenderer[] = // builds. const char kEnableLogging[] = "enable-logging"; @@ -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. -@@ -993,7 +995,7 @@ const char kPreventResizingContentsForTesting[] = +@@ -987,7 +989,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 d6625dc9201b..c62db4bbf35b 100644 --- a/www/chromium/files/patch-content_public_common_content__switches.h +++ b/www/chromium/files/patch-content_public_common_content__switches.h @@ -1,6 +1,6 @@ ---- content/public/common/content_switches.h.orig 2024-07-30 11:12:21 UTC +--- content/public/common/content_switches.h.orig 2024-08-26 12:06:38 UTC +++ content/public/common/content_switches.h -@@ -111,6 +111,7 @@ CONTENT_EXPORT extern const char kEnableGpuMemoryBuffe +@@ -110,6 +110,7 @@ CONTENT_EXPORT extern const char kEnableGpuMemoryBuffe CONTENT_EXPORT extern const char kEnableIsolatedWebAppsInRenderer[]; CONTENT_EXPORT extern const char kEnableLCDText[]; CONTENT_EXPORT extern const char kEnableLogging[]; @@ -8,7 +8,7 @@ CONTENT_EXPORT extern const char kEnableNetworkInformationDownlinkMax[]; CONTENT_EXPORT extern const char kEnableCanvas2DLayers[]; CONTENT_EXPORT extern const char kEnablePluginPlaceholderTesting[]; -@@ -270,7 +271,7 @@ CONTENT_EXPORT extern const char kPreventResizingConte +@@ -268,7 +269,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_media_gpu_gpu__video__accelerator__factories__impl.cc b/www/chromium/files/patch-content_renderer_media_gpu_gpu__video__accelerator__factories__impl.cc deleted file mode 100644 index 2c9bc0dff956..000000000000 --- a/www/chromium/files/patch-content_renderer_media_gpu_gpu__video__accelerator__factories__impl.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- content/renderer/media/gpu/gpu_video_accelerator_factories_impl.cc.orig 2024-06-17 12:56:06 UTC -+++ content/renderer/media/gpu/gpu_video_accelerator_factories_impl.cc -@@ -47,7 +47,7 @@ bool UseSingleNV12() { - #else - static BASE_FEATURE(kUseSingleNV12ForSoftwareGMB, - "UseSingleNV12ForSoftwareGMB", --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - base::FEATURE_ENABLED_BY_DEFAULT); - #else - base::FEATURE_DISABLED_BY_DEFAULT); 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 b38386267590..b2a15ae9672e 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-07-30 11:12:21 UTC +--- content/renderer/render_thread_impl.cc.orig 2024-08-26 12:06:38 UTC +++ content/renderer/render_thread_impl.cc -@@ -213,6 +213,8 @@ +@@ -214,6 +214,8 @@ #if BUILDFLAG(IS_APPLE) #include <malloc/malloc.h> @@ -9,7 +9,7 @@ #else #include <malloc.h> #endif -@@ -999,7 +1001,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1017,7 +1019,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: kGpuStreamIdMedia, kGpuStreamPriorityMedia); const bool enable_video_decode_accelerator = @@ -18,7 +18,7 @@ base::FeatureList::IsEnabled(media::kVaapiVideoDecodeLinux) && #endif // BUILDFLAG(IS_LINUX) !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode) && -@@ -1008,7 +1010,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1026,7 +1028,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: gpu::kGpuFeatureStatusEnabled); const bool enable_video_encode_accelerator = @@ -27,7 +27,7 @@ base::FeatureList::IsEnabled(media::kVaapiVideoEncodeLinux) && #else !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoEncode) && -@@ -1760,7 +1762,7 @@ std::unique_ptr<CodecFactory> RenderThreadImpl::Create +@@ -1801,7 +1803,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.cc b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc index ec0d51fa4b2c..79cb75bd8b33 100644 --- a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc +++ b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc @@ -1,6 +1,6 @@ ---- content/renderer/renderer_blink_platform_impl.cc.orig 2024-07-30 11:12:21 UTC +--- content/renderer/renderer_blink_platform_impl.cc.orig 2024-08-26 12:06:38 UTC +++ content/renderer/renderer_blink_platform_impl.cc -@@ -120,7 +120,7 @@ +@@ -127,7 +127,7 @@ #if BUILDFLAG(IS_MAC) #include "content/child/child_process_sandbox_support_impl_mac.h" @@ -9,7 +9,7 @@ #include "content/child/child_process_sandbox_support_impl_linux.h" #include "content/child/sandboxed_process_thread_type_handler.h" #endif -@@ -190,13 +190,13 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -197,13 +197,13 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( is_locked_to_site_(false), main_thread_scheduler_(main_thread_scheduler), next_frame_sink_id_(uint32_t{std::numeric_limits<int32_t>::max()} + 1) { @@ -25,7 +25,7 @@ mojo::PendingRemote<font_service::mojom::FontService> font_service; RenderThreadImpl::current()->BindHostReceiver( font_service.InitWithNewPipeAndPassReceiver()); -@@ -205,7 +205,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -223,7 +223,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( #endif } @@ -34,7 +34,7 @@ if (sandboxEnabled()) { #if BUILDFLAG(IS_MAC) sandbox_support_ = std::make_unique<WebSandboxSupportMac>(); -@@ -266,7 +266,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl +@@ -284,7 +284,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl #endif blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() { 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 e063d8cffe7a..25951f6e2017 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-07-30 11:12:21 UTC +--- content/renderer/renderer_blink_platform_impl.h.orig 2024-08-26 12:06:38 UTC +++ content/renderer/renderer_blink_platform_impl.h -@@ -248,7 +248,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -253,7 +253,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 dafb805259d0..711a2a82d5de 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-07-30 11:12:21 UTC +--- content/shell/BUILD.gn.orig 2024-08-26 12:06:38 UTC +++ content/shell/BUILD.gn -@@ -1099,7 +1099,7 @@ group("content_shell_crash_test") { +@@ -1084,7 +1084,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 4d860a241567..d0df0b4af78f 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-05-21 18:07:39 UTC +--- content/shell/app/shell_main_delegate.cc.orig 2024-08-26 12:06:38 UTC +++ content/shell/app/shell_main_delegate.cc -@@ -281,7 +281,7 @@ void ShellMainDelegate::PreSandboxStartup() { +@@ -276,7 +276,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_utility__main.cc b/www/chromium/files/patch-content_utility_utility__main.cc index cc6d3d7a61fe..f1cc2fde53e8 100644 --- a/www/chromium/files/patch-content_utility_utility__main.cc +++ b/www/chromium/files/patch-content_utility_utility__main.cc @@ -1,4 +1,4 @@ ---- content/utility/utility_main.cc.orig 2024-07-30 11:12:21 UTC +--- content/utility/utility_main.cc.orig 2024-08-26 12:06:38 UTC +++ content/utility/utility_main.cc @@ -36,17 +36,21 @@ #include "services/screen_ai/buildflags/buildflags.h" @@ -49,7 +49,7 @@ #include "services/screen_ai/public/cpp/utilities.h" // nogncheck #include "services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.h" // nogncheck #endif -@@ -100,7 +109,7 @@ namespace content { +@@ -101,7 +110,7 @@ namespace content { namespace { @@ -58,7 +58,7 @@ std::vector<std::string> GetNetworkContextsParentDirectories() { base::MemoryMappedFile::Region region; base::ScopedFD read_pipe_fd = base::FileDescriptorStore::GetInstance().TakeFD( -@@ -127,9 +136,10 @@ std::vector<std::string> GetNetworkContextsParentDirec +@@ -128,9 +137,10 @@ std::vector<std::string> GetNetworkContextsParentDirec return dirs; } @@ -70,7 +70,7 @@ sandbox_type == sandbox::mojom::Sandbox::kHardwareVideoDecoding || #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) sandbox_type == sandbox::mojom::Sandbox::kHardwareVideoEncoding; -@@ -144,6 +154,7 @@ bool ShouldUseAmdGpuPolicy(sandbox::mojom::Sandbox san +@@ -145,6 +155,7 @@ bool ShouldUseAmdGpuPolicy(sandbox::mojom::Sandbox san return false; } @@ -78,7 +78,7 @@ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_WIN) -@@ -241,7 +252,8 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -242,7 +253,8 @@ int UtilityMain(MainFunctionParams parameters) { CHECK(on_device_model::OnDeviceModelService::PreSandboxInit()); } @@ -88,7 +88,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 -@@ -253,7 +265,7 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -254,7 +266,7 @@ int UtilityMain(MainFunctionParams parameters) { } #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -97,7 +97,7 @@ // Initializes the sandbox before any threads are created. // TODO(jorgelo): move this after GTK initialization when we enable a strict // Seccomp-BPF policy. -@@ -291,7 +303,7 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -292,7 +304,7 @@ int UtilityMain(MainFunctionParams parameters) { screen_ai::GetBinaryPathSwitch())); break; #endif @@ -106,7 +106,7 @@ case sandbox::mojom::Sandbox::kHardwareVideoDecoding: pre_sandbox_hook = base::BindOnce(&media::HardwareVideoDecodingPreSandboxHook); -@@ -318,6 +330,7 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -319,6 +331,7 @@ int UtilityMain(MainFunctionParams parameters) { default: break; } @@ -114,7 +114,7 @@ if (!sandbox::policy::IsUnsandboxedSandboxType(sandbox_type) && (parameters.zygote_child || !pre_sandbox_hook.is_null())) { sandbox_options.use_amd_specific_policies = -@@ -325,6 +338,11 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -326,6 +339,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-device_gamepad_gamepad__provider.cc b/www/chromium/files/patch-device_gamepad_gamepad__provider.cc index 9cef1ce3c477..3d1809515e6c 100644 --- a/www/chromium/files/patch-device_gamepad_gamepad__provider.cc +++ b/www/chromium/files/patch-device_gamepad_gamepad__provider.cc @@ -1,6 +1,6 @@ ---- device/gamepad/gamepad_provider.cc.orig 2023-03-09 06:31:50 UTC +--- device/gamepad/gamepad_provider.cc.orig 2024-08-26 12:06:38 UTC +++ device/gamepad/gamepad_provider.cc -@@ -219,7 +219,7 @@ void GamepadProvider::Initialize(std::unique_ptr<Gamep +@@ -224,7 +224,7 @@ void GamepadProvider::Initialize(std::unique_ptr<Gamep if (!polling_thread_) polling_thread_ = std::make_unique<base::Thread>("Gamepad polling thread"); diff --git a/www/chromium/files/patch-extensions_browser_api_management_management__api.cc b/www/chromium/files/patch-extensions_browser_api_management_management__api.cc index 84f048583d83..45f699c74443 100644 --- a/www/chromium/files/patch-extensions_browser_api_management_management__api.cc +++ b/www/chromium/files/patch-extensions_browser_api_management_management__api.cc @@ -1,6 +1,6 @@ ---- extensions/browser/api/management/management_api.cc.orig 2024-03-22 08:19:40 UTC +--- extensions/browser/api/management/management_api.cc.orig 2024-08-26 12:06:38 UTC +++ extensions/browser/api/management/management_api.cc -@@ -280,7 +280,7 @@ bool PlatformSupportsApprovalFlowForExtensions() { +@@ -285,7 +285,7 @@ bool PlatformSupportsApprovalFlowForExtensions() { #if BUILDFLAG(IS_CHROMEOS) // ChromeOS devices have this feature already shipped. return true; diff --git a/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc b/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc index 72ae18751e3c..364b59650d23 100644 --- a/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc +++ b/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc @@ -1,6 +1,6 @@ ---- extensions/browser/api/messaging/message_service.cc.orig 2024-03-22 08:19:40 UTC +--- extensions/browser/api/messaging/message_service.cc.orig 2024-08-26 12:06:38 UTC +++ extensions/browser/api/messaging/message_service.cc -@@ -71,7 +71,7 @@ namespace { +@@ -78,7 +78,7 @@ namespace { const char kReceivingEndDoesntExistError[] = "Could not establish connection. Receiving end does not exist."; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ const char kMissingPermissionError[] = "Access to native messaging requires nativeMessaging permission."; const char kProhibitedByPoliciesError[] = -@@ -541,7 +541,7 @@ void MessageService::OpenChannelToNativeAppImpl( +@@ -551,7 +551,7 @@ void MessageService::OpenChannelToNativeAppImpl( return; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-extensions_common_command.cc b/www/chromium/files/patch-extensions_common_command.cc index d96f5fec934b..1f6d31030614 100644 --- a/www/chromium/files/patch-extensions_common_command.cc +++ b/www/chromium/files/patch-extensions_common_command.cc @@ -1,6 +1,6 @@ ---- extensions/common/command.cc.orig 2024-06-17 12:56:06 UTC +--- extensions/common/command.cc.orig 2024-08-26 12:06:38 UTC +++ extensions/common/command.cc -@@ -283,7 +283,7 @@ std::string Command::CommandPlatform() { +@@ -285,7 +285,7 @@ std::string Command::CommandPlatform() { return values::kKeybindingPlatformMac; #elif BUILDFLAG(IS_CHROMEOS) return values::kKeybindingPlatformChromeOs; diff --git a/www/chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc b/www/chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc deleted file mode 100644 index e74e66f2535d..000000000000 --- a/www/chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- gpu/command_buffer/common/gpu_memory_buffer_support.cc.orig 2024-04-19 13:02:56 UTC -+++ gpu/command_buffer/common/gpu_memory_buffer_support.cc -@@ -182,7 +182,7 @@ uint32_t GetPlatformSpecificTextureTarget() { - #if BUILDFLAG(IS_MAC) - return macos_specific_texture_target; - #elif BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - return GL_TEXTURE_EXTERNAL_OES; - #elif BUILDFLAG(IS_IOS) - return GL_TEXTURE_2D; -@@ -209,7 +209,7 @@ GPU_EXPORT bool NativeBufferNeedsPlatformSpecificTextu - gfx::BufferFormat format, - gfx::BufferPlane plane) { - #if BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ -- BUILDFLAG(IS_WIN) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - // Always use GL_TEXTURE_2D as the target for RGB textures. - // https://crbug.com/916728 - if (format == gfx::BufferFormat::R_8 || format == gfx::BufferFormat::RG_88 || 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 e8619cd131c9..38ac718f1fab 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-06-17 12:56:06 UTC +--- gpu/command_buffer/service/dawn_context_provider.cc.orig 2024-08-26 12:06:38 UTC +++ gpu/command_buffer/service/dawn_context_provider.cc -@@ -163,7 +163,7 @@ wgpu::BackendType DawnContextProvider::GetDefaultBacke +@@ -175,7 +175,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 2937f6dd12de..48d976d223ef 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-06-17 12:56:06 UTC +--- gpu/command_buffer/service/gles2_cmd_decoder.cc.orig 2024-08-26 12:06:38 UTC +++ gpu/command_buffer/service/gles2_cmd_decoder.cc -@@ -2955,7 +2955,7 @@ GLES2Decoder* GLES2Decoder::Create( +@@ -2902,7 +2902,7 @@ GLES2Decoder* GLES2Decoder::Create( } // Allow linux to run fuzzers. diff --git a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc index 373c63d6f2fb..6c610e2e30ca 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc +++ b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc @@ -1,9 +1,9 @@ ---- gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc.orig 2024-02-23 21:04:38 UTC +--- gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc.orig 2024-08-26 12:06:38 UTC +++ gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc -@@ -21,7 +21,7 @@ namespace { +@@ -20,7 +20,7 @@ namespace { // TODO(penghuang): verify the scanout is the right usage for video playback. // crbug.com/1280798 - constexpr uint32_t kSupportedUsage = + constexpr SharedImageUsageSet kSupportedUsage = -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) SHARED_IMAGE_USAGE_SCANOUT | 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 cd3e51be614d..27fb9b8a9c79 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-07-30 11:12:21 UTC +--- gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig 2024-08-26 12:06:38 UTC +++ gpu/command_buffer/service/shared_image/external_vk_image_backing.cc -@@ -51,7 +51,7 @@ +@@ -54,7 +54,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" -@@ -696,7 +696,7 @@ std::unique_ptr<DawnImageRepresentation> ExternalVkIma +@@ -734,7 +734,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 deleted file mode 100644 index e4a7a7a32ac6..000000000000 --- a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc.orig 2024-03-22 08:19:40 UTC -+++ gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc -@@ -147,7 +147,7 @@ bool IsFormatSupported(viz::SharedImageFormat format, - } // namespace - - constexpr uint32_t kSupportedUsage = --#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 | diff --git a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc index 406a6a5fd467..db8880a02a33 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc +++ b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/shared_image/shared_image_factory.cc.orig 2024-07-30 11:12:21 UTC +--- gpu/command_buffer/service/shared_image/shared_image_factory.cc.orig 2024-08-26 12:06:38 UTC +++ gpu/command_buffer/service/shared_image/shared_image_factory.cc -@@ -160,7 +160,7 @@ gfx::GpuMemoryBufferType GetNativeBufferType() { +@@ -148,7 +148,7 @@ gfx::GpuMemoryBufferType GetNativeBufferType() { return gfx::GpuMemoryBufferType::IO_SURFACE_BUFFER; #elif BUILDFLAG(IS_ANDROID) return gfx::GpuMemoryBufferType::ANDROID_HARDWARE_BUFFER; 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 6c5159eec797..062dd7ebb56c 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,6 +1,6 @@ ---- gpu/command_buffer/service/shared_image/shared_image_manager.cc.orig 2024-07-30 11:12:21 UTC +--- gpu/command_buffer/service/shared_image/shared_image_manager.cc.orig 2024-08-26 12:06:38 UTC +++ gpu/command_buffer/service/shared_image/shared_image_manager.cc -@@ -571,7 +571,7 @@ bool SharedImageManager::SupportsScanoutImages() { +@@ -572,7 +572,7 @@ bool SharedImageManager::SupportsScanoutImages() { return true; #elif BUILDFLAG(IS_ANDROID) return base::AndroidHardwareBufferCompat::IsSupportAvailable(); 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 0e5fd2b92587..8993960b6bd9 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-07-30 11:12:21 UTC +--- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2024-08-26 12:06:38 UTC +++ gpu/command_buffer/service/webgpu_decoder_impl.cc -@@ -1294,7 +1294,7 @@ WGPUFuture WebGPUDecoderImpl::RequestAdapterImpl( +@@ -1303,7 +1303,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) { -@@ -1967,7 +1967,7 @@ WebGPUDecoderImpl::AssociateMailboxDawn( +@@ -1972,7 +1972,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 10267b587c37..44bedcb06f10 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-07-30 11:12:21 UTC +--- gpu/config/gpu_control_list.cc.orig 2024-08-26 12:06:38 UTC +++ gpu/config/gpu_control_list.cc -@@ -276,7 +276,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; -@@ -810,7 +810,7 @@ GpuControlList::OsType GpuControlList::GetOsType() { +@@ -814,7 +814,7 @@ GpuControlList::OsType GpuControlList::GetOsType() { return kOsAndroid; #elif BUILDFLAG(IS_FUCHSIA) return kOsFuchsia; 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 41b6e8d15aae..cabfec3457c6 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-07-30 11:12:21 UTC +--- gpu/ipc/service/gpu_init.cc.orig 2024-08-26 12:06:38 UTC +++ gpu/ipc/service/gpu_init.cc @@ -398,7 +398,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL enable_watchdog = false; @@ -18,7 +18,7 @@ // On Chrome OS ARM Mali, GPU driver userspace creates threads when // initializing a GL context, so start the sandbox early. // TODO(zmo): Need to collect OS version before this. -@@ -542,7 +542,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -544,7 +544,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL gpu_preferences_.gr_context_type = GrContextType::kGL; } @@ -27,7 +27,7 @@ // The ContentSandboxHelper is currently the only one implementation of // GpuSandboxHelper and it has no dependency. Except on Linux where // VaapiWrapper checks the GL implementation to determine which display -@@ -624,7 +624,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -626,7 +626,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL command_line, gpu_feature_info_, gpu_preferences_.disable_software_rasterizer, false); if (gl_use_swiftshader_) { @@ -36,7 +36,7 @@ VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly " << "on Linux"; return false; -@@ -780,7 +780,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -777,7 +777,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. -@@ -835,7 +835,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -832,7 +832,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 -@@ -1023,7 +1023,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -1022,7 +1022,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 -@@ -1083,7 +1083,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -1077,7 +1077,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c } } diff --git a/www/chromium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc b/www/chromium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc index 417edffe2cf6..22009bb2bdd6 100644 --- a/www/chromium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc +++ b/www/chromium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc @@ -1,6 +1,6 @@ ---- gpu/ipc/service/gpu_memory_buffer_factory.cc.orig 2023-03-09 06:31:50 UTC +--- gpu/ipc/service/gpu_memory_buffer_factory.cc.orig 2024-08-26 12:06:38 UTC +++ gpu/ipc/service/gpu_memory_buffer_factory.cc -@@ -13,7 +13,7 @@ +@@ -14,7 +14,7 @@ #include "gpu/ipc/service/gpu_memory_buffer_factory_io_surface.h" #endif @@ -9,7 +9,7 @@ #include "gpu/ipc/service/gpu_memory_buffer_factory_native_pixmap.h" #endif -@@ -36,7 +36,7 @@ GpuMemoryBufferFactory::CreateNativeType( +@@ -37,7 +37,7 @@ GpuMemoryBufferFactory::CreateNativeType( return std::make_unique<GpuMemoryBufferFactoryIOSurface>(); #elif BUILDFLAG(IS_ANDROID) return std::make_unique<GpuMemoryBufferFactoryAndroidHardwareBuffer>(); 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 4e6a3b582d7f..963b4c8c6a75 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-07-30 11:12:21 UTC +--- headless/lib/headless_content_main_delegate.cc.orig 2024-08-26 12:06:38 UTC +++ headless/lib/headless_content_main_delegate.cc -@@ -408,7 +408,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( +@@ -409,7 +409,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 322f62776d0e..6b9ca0f01212 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-05-21 18:07:39 UTC +--- ipc/ipc_message_utils.cc.orig 2024-08-26 12:06:38 UTC +++ ipc/ipc_message_utils.cc -@@ -395,7 +395,7 @@ void ParamTraits<unsigned int>::Log(const param_type& +@@ -400,7 +400,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 e53b006a996a..725eb2b5cc0b 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-07-30 11:12:21 UTC +--- media/base/media_switches.cc.orig 2024-08-26 12:06:38 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 -@@ -677,7 +699,7 @@ BASE_FEATURE(kFallbackAfterDecodeError, +@@ -676,7 +698,7 @@ BASE_FEATURE(kFeatureManagementLiveTranslateCrOS, // 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, +@@ -704,7 +726,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, +@@ -716,7 +738,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen, BASE_FEATURE(kGlobalMediaControlsPictureInPicture, "GlobalMediaControlsPictureInPicture", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -76,7 +76,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -746,7 +768,7 @@ BASE_FEATURE(kUnifiedAutoplay, +@@ -745,7 +767,7 @@ BASE_FEATURE(kUnifiedAutoplay, "UnifiedAutoplay", base::FEATURE_ENABLED_BY_DEFAULT); @@ -85,15 +85,15 @@ // Enable vaapi video decoding on linux. This is already enabled by default on // chromeos, but needs an experiment on linux. BASE_FEATURE(kVaapiVideoDecodeLinux, -@@ -837,7 +859,7 @@ BASE_FEATURE(kVaapiVp9SModeHWEncoding, +@@ -836,7 +858,7 @@ BASE_FEATURE(kVaapiVp9SModeHWEncoding, "VaapiVp9SModeHWEncoding", base::FEATURE_ENABLED_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 V4L2 flat video decoder clients instead of V4L2VideoDecoder. + // Enables the new V4L2StatefulVideoDecoder instead of V4L2VideoDecoder. // Owners: frkoenig@chromium.org, mcasas@chromium.org - // Expiry: When flat decoders are supported on all platforms and the legacy + // Expiry: When the |V4L2FlatVideoDecoder| flag handles stateful decoding on @@ -963,7 +985,7 @@ BASE_FEATURE(kLiveCaptionUseWaitK, // Live Caption can be used in multiple languages, as opposed to just English. BASE_FEATURE(kLiveCaptionMultiLanguage, @@ -112,7 +112,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -1457,7 +1479,7 @@ BASE_FEATURE(kUseGTFOOutOfProcessVideoDecoding, +@@ -1468,7 +1490,7 @@ BASE_FEATURE(kUseGTFOOutOfProcessVideoDecoding, base::FEATURE_DISABLED_BY_DEFAULT); #endif // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER) @@ -121,7 +121,7 @@ // Spawn utility processes to perform hardware encode acceleration instead of // using the GPU process. BASE_FEATURE(kUseOutOfProcessVideoEncoding, -@@ -1537,7 +1559,7 @@ BASE_FEATURE(kRecordWebAudioEngagement, +@@ -1548,7 +1570,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 81972de20dd7..044cda64f4ff 100644 --- a/www/chromium/files/patch-media_base_media__switches.h +++ b/www/chromium/files/patch-media_base_media__switches.h @@ -1,4 +1,4 @@ ---- media/base/media_switches.h.orig 2024-07-30 11:12:21 UTC +--- media/base/media_switches.h.orig 2024-08-26 12:06:38 UTC +++ media/base/media_switches.h @@ -325,13 +325,25 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kPlatformHEVCEncoder MEDIA_EXPORT BASE_DECLARE_FEATURE(kPlaybackSpeedButton); @@ -43,10 +43,10 @@ #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(kV4L2FlatVideoDecoder); MEDIA_EXPORT BASE_DECLARE_FEATURE(kV4L2FlatStatefulVideoDecoder); #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -504,7 +516,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseOutOfProcessVide + MEDIA_EXPORT BASE_DECLARE_FEATURE(kVideoBlitColorAccuracy); +@@ -510,7 +522,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 a76e1278d40c..0de005b5eea3 100644 --- a/www/chromium/files/patch-media_base_video__frame.cc +++ b/www/chromium/files/patch-media_base_video__frame.cc @@ -1,6 +1,6 @@ ---- media/base/video_frame.cc.orig 2024-07-30 11:12:21 UTC +--- media/base/video_frame.cc.orig 2024-08-26 12:06:38 UTC +++ media/base/video_frame.cc -@@ -81,7 +81,7 @@ std::string VideoFrame::StorageTypeToString( +@@ -83,7 +83,7 @@ std::string VideoFrame::StorageTypeToString( return "OWNED_MEMORY"; case VideoFrame::STORAGE_SHMEM: return "SHMEM"; @@ -9,7 +9,7 @@ case VideoFrame::STORAGE_DMABUFS: return "DMABUFS"; #endif -@@ -96,7 +96,7 @@ std::string VideoFrame::StorageTypeToString( +@@ -98,7 +98,7 @@ std::string VideoFrame::StorageTypeToString( // static bool VideoFrame::IsStorageTypeMappable(VideoFrame::StorageType storage_type) { return @@ -18,25 +18,25 @@ // This is not strictly needed but makes explicit that, at VideoFrame // level, DmaBufs are not mappable from userspace. storage_type != VideoFrame::STORAGE_DMABUFS && -@@ -432,7 +432,7 @@ scoped_refptr<VideoFrame> VideoFrame::CreateFrameForGp - planes[i].stride = gpu_memory_buffer->stride(i); +@@ -396,7 +396,7 @@ VideoFrame::CreateFrameForGpuMemoryBufferOrMappableSII + : shared_image->GetStrideForVideoFrame(i); } uint64_t modifier = gfx::NativePixmapHandle::kNoModifier; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - if (gpu_memory_buffer->GetType() == gfx::NATIVE_PIXMAP) { - const auto gmb_handle = gpu_memory_buffer->CloneHandle(); - if (gmb_handle.is_null() || -@@ -806,7 +806,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM + bool is_native_buffer = + gpu_memory_buffer + ? (gpu_memory_buffer->GetType() != gfx::SHARED_MEMORY_BUFFER) +@@ -817,7 +817,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM return frame; } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // static - scoped_refptr<VideoFrame> VideoFrame::WrapUnownedExternalDmabufs( + scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs( const VideoFrameLayout& layout, -@@ -1555,7 +1555,7 @@ scoped_refptr<gpu::ClientSharedImage> VideoFrame::shar +@@ -1528,7 +1528,7 @@ scoped_refptr<gpu::ClientSharedImage> VideoFrame::shar : shared_images_[texture_index]; } @@ -45,12 +45,3 @@ size_t VideoFrame::NumDmabufFds() const { if (wrapped_frame_) { return wrapped_frame_->NumDmabufFds(); -@@ -1699,7 +1699,7 @@ VideoFrame::~VideoFrame() { - // Prevents dangling raw ptr, see https://docs.google.com/document/d/156O7kBZqIhe1dUcqTMcN5T-6YEAcg0yNnj5QlnZu9xU/edit?usp=sharing. - shm_region_ = nullptr; - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // Prevents dangling dmabuf fds. - dmabuf_fds_.clear(); - #endif diff --git a/www/chromium/files/patch-media_base_video__frame.h b/www/chromium/files/patch-media_base_video__frame.h index 03210cab3bce..010be0b328de 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-07-30 11:12:21 UTC +--- media/base/video_frame.h.orig 2024-08-26 12:06:38 UTC +++ media/base/video_frame.h @@ -45,7 +45,7 @@ #include "base/apple/scoped_cftyperef.h" @@ -18,7 +18,7 @@ // 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 -@@ -386,7 +386,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -402,7 +402,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte ReleaseMailboxAndGpuMemoryBufferCB mailbox_holder_and_gmb_release_cb, base::TimeDelta timestamp); @@ -26,8 +26,8 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Wraps provided dmabufs // (https://www.kernel.org/doc/html/latest/driver-api/dma-buf.html) with a - // VideoFrame. -@@ -719,7 +719,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte + // VideoFrame. The frame will take ownership of |dmabuf_fds|, and will +@@ -721,7 +721,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte scoped_refptr<gpu::ClientSharedImage> shared_image( size_t texture_index) const; @@ -36,9 +36,9 @@ // 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. -@@ -950,7 +950,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte - // For now it's set to false always until clients starts using it. - const bool is_mappable_si_enabled_ = false; +@@ -963,7 +963,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte + // GpuMemoryBuffers. Clients will set this flag while creating a VideoFrame. + bool is_mappable_si_enabled_ = false; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) 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 index 79eb0e3bd9fc..b6a822f44080 100644 --- 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 @@ -1,6 +1,6 @@ ---- media/gpu/chromeos/native_pixmap_frame_resource.cc.orig 2024-06-17 12:56:06 UTC +--- media/gpu/chromeos/native_pixmap_frame_resource.cc.orig 2024-08-26 12:06:38 UTC +++ media/gpu/chromeos/native_pixmap_frame_resource.cc -@@ -154,7 +154,7 @@ scoped_refptr<NativePixmapFrameResource> NativePixmapF +@@ -176,7 +176,7 @@ scoped_refptr<NativePixmapFrameResource> NativePixmapF const bool is_intel_media_compression_enabled = #if BUILDFLAG(IS_CHROMEOS) base::FeatureList::IsEnabled(features::kEnableIntelMediaCompression); 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 f67e5a91b2b3..d1790f2e0cb9 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-07-30 11:12:21 UTC +--- media/gpu/chromeos/video_decoder_pipeline.cc.orig 2024-08-26 12:06:38 UTC +++ media/gpu/chromeos/video_decoder_pipeline.cc -@@ -1098,7 +1098,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -1096,7 +1096,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()); -@@ -1107,7 +1107,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -1105,7 +1105,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 -@@ -1295,7 +1295,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -1287,7 +1287,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( << " VideoFrames"; auxiliary_frame_pool_->set_parent_task_runner(decoder_task_runner_); diff --git a/www/chromium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc b/www/chromium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc index 203cbf77f53f..1058e7fcdf5a 100644 --- a/www/chromium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc +++ b/www/chromium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc @@ -1,4 +1,4 @@ ---- media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc.orig 2024-06-17 12:56:06 UTC +--- media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc.orig 2024-08-26 12:06:38 UTC +++ media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc @@ -16,7 +16,9 @@ #include "media/gpu/vaapi/vaapi_wrapper.h" @@ -18,7 +18,7 @@ void AllowAccessToRenderNodes(std::vector<BrokerFilePermission>& permissions, bool include_sys_dev_char, bool read_write) { -@@ -172,6 +175,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2( +@@ -176,6 +179,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2( NOTREACHED_NORETURN(); #endif // BUILDFLAG(USE_V4L2_CODEC) } @@ -26,7 +26,7 @@ } // namespace -@@ -187,6 +191,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2( +@@ -191,6 +195,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2( // (at least). bool HardwareVideoDecodingPreSandboxHook( sandbox::policy::SandboxLinux::Options options) { @@ -34,7 +34,7 @@ using HardwareVideoDecodingProcessPolicy = sandbox::policy::HardwareVideoDecodingProcessPolicy; using PolicyType = -@@ -232,6 +237,7 @@ bool HardwareVideoDecodingPreSandboxHook( +@@ -236,6 +241,7 @@ bool HardwareVideoDecodingPreSandboxHook( // |permissions| is empty? sandbox::policy::SandboxLinux::GetInstance()->StartBrokerProcess( command_set, permissions, options); diff --git a/www/chromium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc b/www/chromium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc index 39e8e7daf174..e5bb52d6537f 100644 --- a/www/chromium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc +++ b/www/chromium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc @@ -1,6 +1,6 @@ ---- media/gpu/vaapi/vaapi_video_decoder.cc.orig 2024-06-17 12:56:06 UTC +--- media/gpu/vaapi/vaapi_video_decoder.cc.orig 2024-08-26 12:06:38 UTC +++ media/gpu/vaapi/vaapi_video_decoder.cc -@@ -775,7 +775,7 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScree +@@ -782,7 +782,7 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScree const gfx::Size decoder_natural_size = aspect_ratio_.GetNaturalSize(decoder_visible_rect); 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 716b0e5549db..9c781471cf36 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,6 +1,6 @@ ---- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2024-07-30 11:12:21 UTC +--- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2024-08-26 12:06:38 UTC +++ media/video/gpu_memory_buffer_video_frame_pool.cc -@@ -107,7 +107,7 @@ class GpuMemoryBufferVideoFramePool::PoolImpl +@@ -106,7 +106,7 @@ class GpuMemoryBufferVideoFramePool::PoolImpl gpu::SHARED_IMAGE_USAGE_RASTER_READ | gpu::SHARED_IMAGE_USAGE_DISPLAY_READ | gpu::SHARED_IMAGE_USAGE_SCANOUT; @@ -9,7 +9,7 @@ // TODO(crbug.com/40194712): Always add the flag once the // OzoneImageBacking is by default turned on. if (base::CommandLine::ForCurrentProcess()->HasSwitch( -@@ -802,7 +802,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa +@@ -795,7 +795,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa } bool is_software_backed_video_frame = !video_frame->HasTextures(); @@ -18,7 +18,7 @@ is_software_backed_video_frame &= !video_frame->HasDmaBufs(); #endif -@@ -1347,7 +1347,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo +@@ -1340,7 +1340,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo media::IOSurfaceIsWebGPUCompatible(handle.io_surface.get()); #endif 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 a81ae0833bfe..d10b300e4610 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,4 +1,4 @@ ---- media/video/video_encode_accelerator_adapter.cc.orig 2024-07-30 11:12:21 UTC +--- media/video/video_encode_accelerator_adapter.cc.orig 2024-08-26 12:06:38 UTC +++ media/video/video_encode_accelerator_adapter.cc @@ -158,7 +158,7 @@ VideoEncodeAccelerator::Config SetUpVeaConfig( if (is_rgb) @@ -9,7 +9,7 @@ if (format != PIXEL_FORMAT_I420 || !VideoFrame::IsStorageTypeMappable(storage_type)) { // ChromeOS/Linux hardware video encoders supports I420 on-memory -@@ -486,7 +486,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal +@@ -484,7 +484,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal SetUpVeaConfig(profile_, options_, format, first_frame->storage_type(), supported_rc_modes_, required_encoder_type_); diff --git a/www/chromium/files/patch-media_video_video__encode__accelerator__adapter__test.cc b/www/chromium/files/patch-media_video_video__encode__accelerator__adapter__test.cc index 33183f054a80..9e5ca5d38784 100644 --- a/www/chromium/files/patch-media_video_video__encode__accelerator__adapter__test.cc +++ b/www/chromium/files/patch-media_video_video__encode__accelerator__adapter__test.cc @@ -1,6 +1,6 @@ ---- media/video/video_encode_accelerator_adapter_test.cc.orig 2024-07-30 11:12:21 UTC +--- media/video/video_encode_accelerator_adapter_test.cc.orig 2024-08-26 12:06:38 UTC +++ media/video/video_encode_accelerator_adapter_test.cc -@@ -461,7 +461,7 @@ TEST_P(VideoEncodeAcceleratorAdapterTest, TwoFramesRes +@@ -457,7 +457,7 @@ TEST_P(VideoEncodeAcceleratorAdapterTest, TwoFramesRes CreateGreenFrame(large_size, pixel_format, base::Milliseconds(2)); VideoPixelFormat expected_input_format = PIXEL_FORMAT_I420; diff --git a/www/chromium/files/patch-mojo_core_channel.cc b/www/chromium/files/patch-mojo_core_channel.cc index 3caafa1b5a43..b06c418f40ba 100644 --- a/www/chromium/files/patch-mojo_core_channel.cc +++ b/www/chromium/files/patch-mojo_core_channel.cc @@ -1,6 +1,6 @@ ---- mojo/core/channel.cc.orig 2024-06-17 12:56:06 UTC +--- mojo/core/channel.cc.orig 2024-08-26 12:06:38 UTC +++ mojo/core/channel.cc -@@ -71,7 +71,11 @@ const size_t kMaxUnusedReadBufferCapacity = 4096; +@@ -79,7 +79,11 @@ const size_t kMaxUnusedReadBufferCapacity = 4096; // Fuchsia: The zx_channel_write() API supports up to 64 handles. const size_t kMaxAttachedHandles = 64; diff --git a/www/chromium/files/patch-mojo_public_c_system_thunks.cc b/www/chromium/files/patch-mojo_public_c_system_thunks.cc index fc8468610cda..9e80be2ca6e2 100644 --- a/www/chromium/files/patch-mojo_public_c_system_thunks.cc +++ b/www/chromium/files/patch-mojo_public_c_system_thunks.cc @@ -1,6 +1,6 @@ ---- mojo/public/c/system/thunks.cc.orig 2024-03-22 08:19:40 UTC +--- mojo/public/c/system/thunks.cc.orig 2024-08-26 12:06:38 UTC +++ mojo/public/c/system/thunks.cc -@@ -25,7 +25,7 @@ +@@ -30,7 +30,7 @@ #include "mojo/public/c/system/message_pipe.h" #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ @@ -9,7 +9,7 @@ #include "base/environment.h" #include "base/files/file_path.h" #include "base/scoped_native_library.h" -@@ -72,7 +72,7 @@ class CoreLibraryInitializer { +@@ -77,7 +77,7 @@ class CoreLibraryInitializer { MojoResult LoadLibrary(base::FilePath library_path) { #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ @@ -18,7 +18,7 @@ if (library_ && library_->is_valid()) return MOJO_RESULT_OK; -@@ -86,7 +86,7 @@ class CoreLibraryInitializer { +@@ -91,7 +91,7 @@ class CoreLibraryInitializer { if (library_path.empty()) { // Default to looking for the library in the current working directory. @@ -27,7 +27,7 @@ const base::FilePath::CharType kDefaultLibraryPathValue[] = FILE_PATH_LITERAL("./libmojo_core.so"); #elif BUILDFLAG(IS_FUCHSIA) -@@ -142,7 +142,7 @@ class CoreLibraryInitializer { +@@ -147,7 +147,7 @@ class CoreLibraryInitializer { private: #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ diff --git a/www/chromium/files/patch-mojo_public_tools_bindings_mojom.gni b/www/chromium/files/patch-mojo_public_tools_bindings_mojom.gni index db621c027216..00dc55f235f7 100644 --- a/www/chromium/files/patch-mojo_public_tools_bindings_mojom.gni +++ b/www/chromium/files/patch-mojo_public_tools_bindings_mojom.gni @@ -1,6 +1,6 @@ ---- mojo/public/tools/bindings/mojom.gni.orig 2024-07-30 11:12:21 UTC +--- mojo/public/tools/bindings/mojom.gni.orig 2024-08-26 12:06:38 UTC +++ mojo/public/tools/bindings/mojom.gni -@@ -762,6 +762,16 @@ template("mojom") { +@@ -763,6 +763,16 @@ template("mojom") { enabled_features += [ "is_apple" ] } diff --git a/www/chromium/files/patch-net_BUILD.gn b/www/chromium/files/patch-net_BUILD.gn index aea82fadef1a..3c21ae4060ea 100644 --- a/www/chromium/files/patch-net_BUILD.gn +++ b/www/chromium/files/patch-net_BUILD.gn @@ -1,4 +1,4 @@ ---- net/BUILD.gn.orig 2024-07-30 11:12:21 UTC +--- net/BUILD.gn.orig 2024-08-26 12:06:38 UTC +++ net/BUILD.gn @@ -123,7 +123,7 @@ net_configs = [ "//build/config/compiler:wexit_time_destructors", @@ -9,7 +9,7 @@ net_configs += [ "//build/config/linux:libresolv" ] } -@@ -1212,6 +1212,19 @@ component("net") { +@@ -1246,6 +1246,19 @@ component("net") { ] } @@ -29,7 +29,7 @@ if (is_mac) { sources += [ "base/network_notification_thread_mac.cc", -@@ -1371,7 +1384,7 @@ component("net") { +@@ -1407,7 +1420,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", -@@ -2860,7 +2873,7 @@ test("net_unittests") { +@@ -2883,7 +2896,7 @@ test("net_unittests") { ] } @@ -47,7 +47,7 @@ sources += [ "base/address_tracker_linux_unittest.cc", "base/network_interfaces_linux_unittest.cc", -@@ -2948,6 +2961,10 @@ test("net_unittests") { +@@ -2974,6 +2987,10 @@ test("net_unittests") { ] } @@ -58,7 +58,7 @@ if (enable_websockets) { deps += [ "//net/server:tests" ] } -@@ -3008,7 +3025,7 @@ test("net_unittests") { +@@ -3034,7 +3051,7 @@ test("net_unittests") { ] } @@ -67,7 +67,7 @@ sources += [ "tools/quic/quic_simple_server_test.cc" ] } -@@ -3147,7 +3164,7 @@ test("net_unittests") { +@@ -3173,7 +3190,7 @@ test("net_unittests") { } # Use getifaddrs() on POSIX platforms, except Linux. diff --git a/www/chromium/files/patch-net_base_features.cc b/www/chromium/files/patch-net_base_features.cc index 2e13f8223fa5..dcf903a1d08d 100644 --- a/www/chromium/files/patch-net_base_features.cc +++ b/www/chromium/files/patch-net_base_features.cc @@ -1,4 +1,4 @@ ---- net/base/features.cc.orig 2024-07-30 11:12:21 UTC +--- net/base/features.cc.orig 2024-08-26 12:06:38 UTC +++ net/base/features.cc @@ -26,7 +26,7 @@ BASE_FEATURE(kCapReferrerToOriginOnCrossOrigin, BASE_FEATURE(kAsyncDns, @@ -9,7 +9,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -505,7 +505,12 @@ BASE_FEATURE(kSpdyHeadersToHttpResponseUseBuilder, +@@ -506,7 +506,12 @@ BASE_FEATURE(kSpdyHeadersToHttpResponseUseBuilder, "SpdyHeadersToHttpResponseUseBuilder", base::FEATURE_DISABLED_BY_DEFAULT); diff --git a/www/chromium/files/patch-net_base_network__change__notifier.cc b/www/chromium/files/patch-net_base_network__change__notifier.cc index 19c31e115778..a59b9fef2902 100644 --- a/www/chromium/files/patch-net_base_network__change__notifier.cc +++ b/www/chromium/files/patch-net_base_network__change__notifier.cc @@ -1,4 +1,4 @@ ---- net/base/network_change_notifier.cc.orig 2024-07-30 11:12:21 UTC +--- net/base/network_change_notifier.cc.orig 2024-08-26 12:06:38 UTC +++ net/base/network_change_notifier.cc @@ -42,7 +42,7 @@ #include "net/base/network_change_notifier_linux.h" @@ -9,7 +9,7 @@ #include "net/base/network_change_notifier_passive.h" #elif BUILDFLAG(IS_FUCHSIA) #include "net/base/network_change_notifier_fuchsia.h" -@@ -334,6 +334,9 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo +@@ -329,6 +329,9 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo #elif BUILDFLAG(IS_FUCHSIA) return std::make_unique<NetworkChangeNotifierFuchsia>( /*require_wlan=*/false); diff --git a/www/chromium/files/patch-net_disk__cache_simple_simple__file__tracker.cc b/www/chromium/files/patch-net_disk__cache_simple_simple__file__tracker.cc index 7d8d2d5701bd..bd4091e5b2cb 100644 --- a/www/chromium/files/patch-net_disk__cache_simple_simple__file__tracker.cc +++ b/www/chromium/files/patch-net_disk__cache_simple_simple__file__tracker.cc @@ -1,6 +1,6 @@ ---- net/disk_cache/simple/simple_file_tracker.cc.orig 2024-07-30 11:12:21 UTC +--- net/disk_cache/simple/simple_file_tracker.cc.orig 2024-08-26 12:06:38 UTC +++ net/disk_cache/simple/simple_file_tracker.cc -@@ -34,7 +34,17 @@ void RecordFileDescripterLimiterOp(FileDescriptorLimit +@@ -35,7 +35,17 @@ void RecordFileDescripterLimiterOp(FileDescriptorLimit } // namespace SimpleFileTracker::SimpleFileTracker(int file_limit) diff --git a/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__comparision__tool.cc b/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__comparision__tool.cc deleted file mode 100644 index 208d02df41d7..000000000000 --- a/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__comparision__tool.cc +++ /dev/null @@ -1,29 +0,0 @@ ---- net/tools/cert_verify_tool/cert_verify_comparision_tool.cc.orig 2024-05-21 18:07:39 UTC -+++ net/tools/cert_verify_tool/cert_verify_comparision_tool.cc -@@ -36,7 +36,7 @@ - #include "net/url_request/url_request_context_builder.h" - #include "net/url_request/url_request_context_getter.h" - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #include "net/proxy_resolution/proxy_config.h" - #include "net/proxy_resolution/proxy_config_service_fixed.h" - #endif -@@ -56,7 +56,7 @@ void SetUpOnNetworkThread( - base::WaitableEvent* initialization_complete_event) { - net::URLRequestContextBuilder url_request_context_builder; - url_request_context_builder.set_user_agent(GetUserAgent()); --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // On Linux, use a fixed ProxyConfigService, since the default one - // depends on glib. - // -@@ -124,7 +124,7 @@ class CertVerifyImpl { - std::unique_ptr<CertVerifyImpl> CreateCertVerifyImplFromName( - std::string_view impl_name, - scoped_refptr<net::CertNetFetcher> cert_net_fetcher) { --#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || \ -+#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(CHROME_ROOT_STORE_ONLY)) - if (impl_name == "platform") { - return std::make_unique<CertVerifyImpl>( diff --git a/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc b/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc index 3e6349d5a2c4..1c4f5762f705 100644 --- a/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc +++ b/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc @@ -1,6 +1,6 @@ ---- net/tools/cert_verify_tool/cert_verify_tool.cc.orig 2024-07-30 11:12:21 UTC +--- net/tools/cert_verify_tool/cert_verify_tool.cc.orig 2024-08-26 12:06:38 UTC +++ net/tools/cert_verify_tool/cert_verify_tool.cc -@@ -34,7 +34,7 @@ +@@ -35,7 +35,7 @@ #include "third_party/boringssl/src/pki/trust_store.h" #include "third_party/boringssl/src/pki/trust_store_collection.h" @@ -9,7 +9,7 @@ #include "net/proxy_resolution/proxy_config.h" #include "net/proxy_resolution/proxy_config_service_fixed.h" #endif -@@ -66,7 +66,7 @@ void SetUpOnNetworkThread( +@@ -67,7 +67,7 @@ void SetUpOnNetworkThread( base::WaitableEvent* initialization_complete_event) { net::URLRequestContextBuilder url_request_context_builder; url_request_context_builder.set_user_agent(GetUserAgent()); @@ -18,7 +18,7 @@ // On Linux, use a fixed ProxyConfigService, since the default one // depends on glib. // -@@ -576,7 +576,7 @@ int main(int argc, char** argv) { +@@ -579,7 +579,7 @@ int main(int argc, char** argv) { std::string impls_str = command_line.GetSwitchValueASCII("impls"); if (impls_str.empty()) { // Default value. diff --git a/www/chromium/files/patch-net_url__request_url__request__context.h b/www/chromium/files/patch-net_url__request_url__request__context.h index 766935871f68..7e7513f3ebc4 100644 --- a/www/chromium/files/patch-net_url__request_url__request__context.h +++ b/www/chromium/files/patch-net_url__request_url__request__context.h @@ -1,6 +1,6 @@ ---- net/url_request/url_request_context.h.orig 2024-06-17 12:56:06 UTC +--- net/url_request/url_request_context.h.orig 2024-08-26 12:06:38 UTC +++ net/url_request/url_request_context.h -@@ -89,7 +89,7 @@ class NET_EXPORT URLRequestContext final { +@@ -91,7 +91,7 @@ class NET_EXPORT URLRequestContext final { // TODO(crbug.com/40118868): Revisit once build flag switch of lacros-chrome is // complete. #if !BUILDFLAG(IS_WIN) && \ diff --git a/www/chromium/files/patch-net_url__request_url__request__context__builder.cc b/www/chromium/files/patch-net_url__request_url__request__context__builder.cc index ae9597d494d1..591de4a04871 100644 --- a/www/chromium/files/patch-net_url__request_url__request__context__builder.cc +++ b/www/chromium/files/patch-net_url__request_url__request__context__builder.cc @@ -1,6 +1,6 @@ ---- net/url_request/url_request_context_builder.cc.orig 2024-05-21 18:07:39 UTC +--- net/url_request/url_request_context_builder.cc.orig 2024-08-26 12:06:38 UTC +++ net/url_request/url_request_context_builder.cc -@@ -439,7 +439,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu +@@ -441,7 +441,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu } if (!proxy_resolution_service_) { diff --git a/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc b/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc index 919edaf56b05..5460fd9b81f3 100644 --- a/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc +++ b/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc @@ -1,6 +1,6 @@ ---- pdf/pdfium/pdfium_engine.cc.orig 2024-07-30 11:12:21 UTC +--- pdf/pdfium/pdfium_engine.cc.orig 2024-08-26 12:06:38 UTC +++ pdf/pdfium/pdfium_engine.cc -@@ -92,7 +92,7 @@ +@@ -93,7 +93,7 @@ #include "gin/public/cppgc.h" #endif @@ -9,7 +9,7 @@ #include "pdf/pdfium/pdfium_font_linux.h" #endif -@@ -517,7 +517,7 @@ void InitializeSDK(bool enable_v8, +@@ -524,7 +524,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 7a4bda54a229..80fe1ae58918 100644 --- a/www/chromium/files/patch-printing_backend_print__backend__cups.cc +++ b/www/chromium/files/patch-printing_backend_print__backend__cups.cc @@ -1,6 +1,6 @@ ---- printing/backend/print_backend_cups.cc.orig 2024-07-30 11:12:21 UTC +--- printing/backend/print_backend_cups.cc.orig 2024-08-26 12:06:38 UTC +++ printing/backend/print_backend_cups.cc -@@ -27,7 +27,7 @@ +@@ -32,7 +32,7 @@ #include "printing/mojom/print.mojom.h" #include "url/gurl.h" @@ -9,7 +9,7 @@ #include "base/feature_list.h" #include "printing/backend/cups_connection.h" #include "printing/backend/print_backend_cups_ipp.h" -@@ -278,7 +278,7 @@ bool PrintBackendCUPS::IsValidPrinter(const std::strin +@@ -283,7 +283,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-remoting_host_policy__watcher.cc b/www/chromium/files/patch-remoting_host_policy__watcher.cc index b336657e2dd6..cdc4630f633f 100644 --- a/www/chromium/files/patch-remoting_host_policy__watcher.cc +++ b/www/chromium/files/patch-remoting_host_policy__watcher.cc @@ -1,6 +1,6 @@ ---- remoting/host/policy_watcher.cc.orig 2024-03-22 08:19:40 UTC +--- remoting/host/policy_watcher.cc.orig 2024-08-26 12:06:38 UTC +++ remoting/host/policy_watcher.cc -@@ -192,7 +192,7 @@ base::Value::Dict PolicyWatcher::GetDefaultPolicies() +@@ -178,7 +178,7 @@ base::Value::Dict PolicyWatcher::GetDefaultPolicies() true); result.Set(key::kRemoteAccessHostAllowEnterpriseFileTransfer, false); #endif 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 63ed0c378429..ad79c4dcdcec 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-07-30 11:12:21 UTC +--- remoting/host/remoting_me2me_host.cc.orig 2024-08-26 12:06:38 UTC +++ remoting/host/remoting_me2me_host.cc -@@ -132,7 +132,7 @@ +@@ -129,7 +129,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) -@@ -143,13 +143,13 @@ +@@ -140,13 +140,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 -@@ -162,7 +162,7 @@ +@@ -159,7 +159,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) -@@ -192,7 +192,7 @@ const char kApplicationName[] = "chromoting"; +@@ -189,7 +189,7 @@ const char kApplicationName[] = "chromoting"; const char kStdinConfigPath[] = "-"; #endif // !defined(REMOTING_MULTI_PROCESS) @@ -43,7 +43,7 @@ // The command line switch used to pass name of the pipe to capture audio on // linux. const char kAudioPipeSwitchName[] = "audio-pipe-name"; -@@ -401,7 +401,7 @@ class HostProcess : public ConfigWatcher::Delegate, +@@ -397,7 +397,7 @@ class HostProcess : public ConfigWatcher::Delegate, std::unique_ptr<ChromotingHostContext> context_; @@ -52,7 +52,7 @@ // Watch for certificate changes and kill the host when changes occur std::unique_ptr<CertificateWatcher> cert_watcher_; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -471,7 +471,7 @@ class HostProcess : public ConfigWatcher::Delegate, +@@ -466,7 +466,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_; -@@ -778,7 +778,7 @@ void HostProcess::StartOnNetworkThread() { +@@ -773,7 +773,7 @@ void HostProcess::StartOnNetworkThread() { void HostProcess::ShutdownOnNetworkThread() { DCHECK(context_->network_task_runner()->BelongsToCurrentThread()); config_watcher_.reset(); @@ -70,16 +70,16 @@ cert_watcher_.reset(); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) } -@@ -844,7 +844,7 @@ void HostProcess::CreateAuthenticatorFactory() { - DCHECK(third_party_auth_config_.token_url.is_valid()); - DCHECK(third_party_auth_config_.token_validation_url.is_valid()); - +@@ -808,7 +808,7 @@ void HostProcess::CreateAuthenticatorFactory() { + base::MakeRefCounted<CorpSessionAuthzServiceClientFactory>( + context_->url_loader_factory(), service_account_email_, + oauth_refresh_token_)); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (!cert_watcher_) { cert_watcher_ = std::make_unique<CertificateWatcher>( base::BindRepeating(&HostProcess::ShutdownHost, -@@ -970,13 +970,13 @@ void HostProcess::StartOnUiThread() { +@@ -953,13 +953,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 = -@@ -1048,7 +1048,7 @@ void HostProcess::ShutdownOnUiThread() { +@@ -1036,7 +1036,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. -@@ -1056,7 +1056,7 @@ void HostProcess::ShutdownOnUiThread() { +@@ -1044,7 +1044,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(); })); -@@ -1414,7 +1414,7 @@ bool HostProcess::OnUsernamePolicyUpdate(const base::V +@@ -1401,7 +1401,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()) { -@@ -1878,7 +1878,7 @@ void HostProcess::StartHost() { +@@ -1849,7 +1849,7 @@ void HostProcess::StartHost() { corp_host_status_logger_->StartObserving(*session_manager); } @@ -131,7 +131,7 @@ desktop_environment_options_.set_enable_remote_webauthn(is_googler_); #endif -@@ -1911,7 +1911,7 @@ void HostProcess::StartHost() { +@@ -1882,7 +1882,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_ = -@@ -1943,7 +1943,7 @@ void HostProcess::StartHost() { +@@ -1914,7 +1914,7 @@ void HostProcess::StartHost() { host_->Start(host_owner_); @@ -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(); -@@ -2077,7 +2077,7 @@ int HostProcessMain() { +@@ -2048,7 +2048,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 ...) -@@ -2126,7 +2126,7 @@ int HostProcessMain() { +@@ -2097,7 +2097,7 @@ int HostProcessMain() { std::unique_ptr<net::NetworkChangeNotifier> network_change_notifier( net::NetworkChangeNotifier::CreateIfNeeded()); diff --git a/www/chromium/files/patch-sandbox_linux_services_libc__interceptor.cc b/www/chromium/files/patch-sandbox_linux_services_libc__interceptor.cc index 8ea7fa355326..a5c167713139 100644 --- a/www/chromium/files/patch-sandbox_linux_services_libc__interceptor.cc +++ b/www/chromium/files/patch-sandbox_linux_services_libc__interceptor.cc @@ -1,6 +1,6 @@ ---- sandbox/linux/services/libc_interceptor.cc.orig 2024-05-21 18:07:39 UTC +--- sandbox/linux/services/libc_interceptor.cc.orig 2024-08-26 12:06:38 UTC +++ sandbox/linux/services/libc_interceptor.cc -@@ -12,7 +12,9 @@ +@@ -17,7 +17,9 @@ #include <stddef.h> #include <stdint.h> #include <string.h> @@ -10,7 +10,7 @@ #include <sys/socket.h> #include <sys/types.h> #include <time.h> -@@ -168,7 +170,7 @@ bool ReadTimeStruct(base::PickleIterator* iter, +@@ -173,7 +175,7 @@ bool ReadTimeStruct(base::PickleIterator* iter, } else { base::AutoLock lock(g_timezones_lock.Get()); auto ret_pair = g_timezones.Get().insert(timezone); diff --git a/www/chromium/files/patch-sandbox_policy_BUILD.gn b/www/chromium/files/patch-sandbox_policy_BUILD.gn index 08d40d1edcc8..9537d68d2ff8 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-02-23 21:04:38 UTC +--- sandbox/policy/BUILD.gn.orig 2024-08-26 12:06:38 UTC +++ sandbox/policy/BUILD.gn @@ -49,7 +49,7 @@ component("policy") { "//third_party/jni_zero", @@ -9,7 +9,7 @@ sources += [ "linux/bpf_audio_policy_linux.cc", "linux/bpf_audio_policy_linux.h", -@@ -120,6 +120,27 @@ component("policy") { +@@ -122,6 +122,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 42a090e67c05..084c6a3c243a 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-05-21 18:07:39 UTC +--- sandbox/policy/features.cc.orig 2024-08-26 12:06:38 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. -@@ -131,7 +135,7 @@ BASE_FEATURE(kForceSpectreVariant2Mitigation, +@@ -147,7 +151,7 @@ BASE_FEATURE(kForceSpectreVariant2Mitigation, base::FEATURE_DISABLED_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 769b8cb9ff73..38ad4d1b3ee4 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-05-21 18:07:39 UTC +--- sandbox/policy/features.h.orig 2024-08-26 12:06:38 UTC +++ sandbox/policy/features.h -@@ -44,7 +44,7 @@ SANDBOX_POLICY_EXPORT BASE_DECLARE_FEATURE(kSpectreVar +@@ -47,7 +47,7 @@ SANDBOX_POLICY_EXPORT BASE_DECLARE_FEATURE(kSpectreVar SANDBOX_POLICY_EXPORT BASE_DECLARE_FEATURE(kForceSpectreVariant2Mitigation); #endif // BUILDFLAG(IS_CHROMEOS_ASH) 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 new file mode 100644 index 000000000000..bb9fadf985cd --- /dev/null +++ b/www/chromium/files/patch-services_device_geolocation_location__provider__manager.cc @@ -0,0 +1,11 @@ +--- services/device/geolocation/location_provider_manager.cc.orig 2024-08-26 12:06:38 UTC ++++ services/device/geolocation/location_provider_manager.cc +@@ -51,7 +51,7 @@ LocationProviderManager::LocationProviderManager( + #if BUILDFLAG(IS_ANDROID) + // On Android, default to using the platform location provider. + provider_manager_mode_ = kPlatformOnly; +-#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // On Ash / Lacros / Linux, default to using the network location provider. + provider_manager_mode_ = kNetworkOnly; + #else diff --git a/www/chromium/files/patch-services_device_public_mojom_BUILD.gn b/www/chromium/files/patch-services_device_public_mojom_BUILD.gn index 0ac7ec78f373..657546499c56 100644 --- a/www/chromium/files/patch-services_device_public_mojom_BUILD.gn +++ b/www/chromium/files/patch-services_device_public_mojom_BUILD.gn @@ -1,6 +1,6 @@ ---- services/device/public/mojom/BUILD.gn.orig 2024-03-22 08:19:40 UTC +--- services/device/public/mojom/BUILD.gn.orig 2024-08-26 12:06:38 UTC +++ services/device/public/mojom/BUILD.gn -@@ -96,7 +96,7 @@ mojom("device_service") { +@@ -97,7 +97,7 @@ mojom("device_service") { enable_js_fuzzing = false enabled_features = [] diff --git a/www/chromium/files/patch-services_device_serial_serial__device__enumerator.cc b/www/chromium/files/patch-services_device_serial_serial__device__enumerator.cc index 9031e70940e0..251948a943c4 100644 --- a/www/chromium/files/patch-services_device_serial_serial__device__enumerator.cc +++ b/www/chromium/files/patch-services_device_serial_serial__device__enumerator.cc @@ -1,6 +1,6 @@ ---- services/device/serial/serial_device_enumerator.cc.orig 2023-03-09 06:31:50 UTC +--- services/device/serial/serial_device_enumerator.cc.orig 2024-08-26 12:06:38 UTC +++ services/device/serial/serial_device_enumerator.cc -@@ -12,7 +12,7 @@ +@@ -13,7 +13,7 @@ #include "build/build_config.h" #include "components/device_event_log/device_event_log.h" @@ -9,7 +9,7 @@ #include "services/device/serial/serial_device_enumerator_linux.h" #elif BUILDFLAG(IS_MAC) #include "services/device/serial/serial_device_enumerator_mac.h" -@@ -25,7 +25,7 @@ namespace device { +@@ -26,7 +26,7 @@ namespace device { // static std::unique_ptr<SerialDeviceEnumerator> SerialDeviceEnumerator::Create( scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) { diff --git a/www/chromium/files/patch-services_device_serial_serial__io__handler__posix.cc b/www/chromium/files/patch-services_device_serial_serial__io__handler__posix.cc index 7b908151bdef..c6e3f37fc9c4 100644 --- a/www/chromium/files/patch-services_device_serial_serial__io__handler__posix.cc +++ b/www/chromium/files/patch-services_device_serial_serial__io__handler__posix.cc @@ -1,6 +1,6 @@ ---- services/device/serial/serial_io_handler_posix.cc.orig 2023-03-09 06:31:50 UTC +--- services/device/serial/serial_io_handler_posix.cc.orig 2024-08-26 12:06:38 UTC +++ services/device/serial/serial_io_handler_posix.cc -@@ -68,7 +68,7 @@ bool BitrateToSpeedConstant(int bitrate, speed_t* spee +@@ -73,7 +73,7 @@ bool BitrateToSpeedConstant(int bitrate, speed_t* spee BITRATE_TO_SPEED_CASE(9600) BITRATE_TO_SPEED_CASE(19200) BITRATE_TO_SPEED_CASE(38400) diff --git a/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc b/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc index 69887a89893b..442d17faebeb 100644 --- a/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc +++ b/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc @@ -1,6 +1,6 @@ ---- services/device/time_zone_monitor/time_zone_monitor_linux.cc.orig 2023-09-13 12:11:42 UTC +--- services/device/time_zone_monitor/time_zone_monitor_linux.cc.orig 2024-08-26 12:06:38 UTC +++ services/device/time_zone_monitor/time_zone_monitor_linux.cc -@@ -131,7 +131,11 @@ class TimeZoneMonitorLinuxImpl +@@ -136,7 +136,11 @@ class TimeZoneMonitorLinuxImpl // false positives are harmless, assuming the false positive rate is // reasonable. const char* const kFilesToWatch[] = { diff --git a/www/chromium/files/patch-services_device_usb_BUILD.gn b/www/chromium/files/patch-services_device_usb_BUILD.gn index f367f1b9f783..196af6ff5e7c 100644 --- a/www/chromium/files/patch-services_device_usb_BUILD.gn +++ b/www/chromium/files/patch-services_device_usb_BUILD.gn @@ -1,4 +1,4 @@ ---- services/device/usb/BUILD.gn.orig 2024-06-17 12:56:06 UTC +--- services/device/usb/BUILD.gn.orig 2024-08-26 12:06:38 UTC +++ services/device/usb/BUILD.gn @@ -91,7 +91,7 @@ static_library("usb") { deps += [ "//third_party/re2" ] @@ -23,7 +23,7 @@ if (is_linux || is_chromeos) { sources += [ "usb_device_linux.cc", -@@ -131,7 +138,7 @@ static_library("usb") { +@@ -135,7 +142,7 @@ static_library("usb") { deps += [ "//device/udev_linux" ] } diff --git a/www/chromium/files/patch-services_device_usb_usb__service.cc b/www/chromium/files/patch-services_device_usb_usb__service.cc index 159fadf209a3..1281dfff81b9 100644 --- a/www/chromium/files/patch-services_device_usb_usb__service.cc +++ b/www/chromium/files/patch-services_device_usb_usb__service.cc @@ -1,6 +1,6 @@ ---- services/device/usb/usb_service.cc.orig 2024-06-17 12:56:06 UTC +--- services/device/usb/usb_service.cc.orig 2024-08-26 12:06:38 UTC +++ services/device/usb/usb_service.cc -@@ -20,12 +20,16 @@ +@@ -21,12 +21,16 @@ #if BUILDFLAG(IS_ANDROID) #include "services/device/usb/usb_service_android.h" @@ -18,7 +18,7 @@ #endif namespace device { -@@ -48,11 +52,13 @@ constexpr base::TaskTraits UsbService::kBlockingTaskTr +@@ -49,11 +53,13 @@ constexpr base::TaskTraits UsbService::kBlockingTaskTr std::unique_ptr<UsbService> UsbService::Create() { #if BUILDFLAG(IS_ANDROID) return base::WrapUnique(new UsbServiceAndroid()); diff --git a/www/chromium/files/patch-services_network_BUILD.gn b/www/chromium/files/patch-services_network_BUILD.gn index 6b6361c7e0a9..903ae31c26cd 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-07-30 11:12:21 UTC +--- services/network/BUILD.gn.orig 2024-08-26 12:06:38 UTC +++ services/network/BUILD.gn -@@ -418,7 +418,6 @@ if (is_linux || is_chromeos) { +@@ -411,7 +411,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 a9ec70b5fedc..579b164cd479 100644 --- a/www/chromium/files/patch-services_network_network__context.cc +++ b/www/chromium/files/patch-services_network_network__context.cc @@ -1,4 +1,4 @@ ---- services/network/network_context.cc.orig 2024-07-30 11:12:21 UTC +--- services/network/network_context.cc.orig 2024-08-26 12:06:38 UTC +++ services/network/network_context.cc @@ -589,7 +589,7 @@ NetworkContext::NetworkContextHttpAuthPreferences:: NetworkContext::NetworkContextHttpAuthPreferences:: @@ -9,7 +9,7 @@ bool NetworkContext::NetworkContextHttpAuthPreferences::AllowGssapiLibraryLoad() const { if (network_service_) { -@@ -2355,7 +2355,7 @@ void NetworkContext::OnHttpAuthDynamicParamsChanged( +@@ -2384,7 +2384,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 ec0cfb76e7c1..9d546cf19a1e 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-07-30 11:12:21 UTC +--- services/network/network_context.h.orig 2024-08-26 12:06:38 UTC +++ services/network/network_context.h -@@ -685,7 +685,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext +@@ -692,7 +692,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext public: explicit NetworkContextHttpAuthPreferences(NetworkService* network_service); ~NetworkContextHttpAuthPreferences() override; diff --git a/www/chromium/files/patch-services_network_network__service.cc b/www/chromium/files/patch-services_network_network__service.cc index 85a84ad3a15f..bd763b3670f3 100644 --- a/www/chromium/files/patch-services_network_network__service.cc +++ b/www/chromium/files/patch-services_network_network__service.cc @@ -1,4 +1,4 @@ ---- services/network/network_service.cc.orig 2024-05-21 18:07:39 UTC +--- services/network/network_service.cc.orig 2024-08-26 12:06:38 UTC +++ services/network/network_service.cc @@ -99,7 +99,7 @@ #include "third_party/boringssl/src/include/openssl/cpu.h" @@ -9,7 +9,7 @@ BUILDFLAG(IS_CHROMEOS_LACROS) #include "components/os_crypt/sync/key_storage_config_linux.h" -@@ -983,7 +983,7 @@ void NetworkService::SetExplicitlyAllowedPorts( +@@ -975,7 +975,7 @@ void NetworkService::SetExplicitlyAllowedPorts( net::SetExplicitlyAllowedPorts(ports); } @@ -18,7 +18,7 @@ void NetworkService::SetGssapiLibraryLoadObserver( mojo::PendingRemote<mojom::GssapiLibraryLoadObserver> gssapi_library_load_observer) { -@@ -1065,7 +1065,7 @@ NetworkService::CreateHttpAuthHandlerFactory(NetworkCo +@@ -1057,7 +1057,7 @@ NetworkService::CreateHttpAuthHandlerFactory(NetworkCo ); } diff --git a/www/chromium/files/patch-services_network_public_cpp_BUILD.gn b/www/chromium/files/patch-services_network_public_cpp_BUILD.gn index d07ed234faf7..4be03f6a6ea9 100644 --- a/www/chromium/files/patch-services_network_public_cpp_BUILD.gn +++ b/www/chromium/files/patch-services_network_public_cpp_BUILD.gn @@ -1,6 +1,6 @@ ---- services/network/public/cpp/BUILD.gn.orig 2024-06-17 12:56:06 UTC +--- services/network/public/cpp/BUILD.gn.orig 2024-08-26 12:06:38 UTC +++ services/network/public/cpp/BUILD.gn -@@ -515,7 +515,7 @@ component("cpp_base") { +@@ -497,7 +497,7 @@ component("cpp_base") { sources += [ "transferable_directory_fuchsia.cc" ] } diff --git a/www/chromium/files/patch-services_network_public_cpp_features.cc b/www/chromium/files/patch-services_network_public_cpp_features.cc index 45e43dec5a59..12dcbc63742f 100644 --- a/www/chromium/files/patch-services_network_public_cpp_features.cc +++ b/www/chromium/files/patch-services_network_public_cpp_features.cc @@ -1,6 +1,6 @@ ---- services/network/public/cpp/features.cc.orig 2024-07-30 11:12:21 UTC +--- services/network/public/cpp/features.cc.orig 2024-08-26 12:06:38 UTC +++ services/network/public/cpp/features.cc -@@ -120,7 +120,7 @@ BASE_FEATURE(kSplitAuthCacheByNetworkIsolationKey, +@@ -127,7 +127,7 @@ BASE_FEATURE(kSplitAuthCacheByNetworkIsolationKey, BASE_FEATURE(kDnsOverHttpsUpgrade, "DnsOverHttpsUpgrade", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ 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 7e381ef98166..503521551d09 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-07-30 11:12:21 UTC +--- services/network/public/mojom/BUILD.gn.orig 2024-08-26 12:06:38 UTC +++ services/network/public/mojom/BUILD.gn -@@ -529,11 +529,11 @@ mojom("url_loader_base") { +@@ -493,11 +493,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" ] -@@ -1495,7 +1495,7 @@ mojom("mojom") { +@@ -1490,7 +1490,7 @@ mojom("mojom") { } } diff --git a/www/chromium/files/patch-services_on__device__model_pre__sandbox__init.cc b/www/chromium/files/patch-services_on__device__model_pre__sandbox__init.cc index 0dc54dbc1e8d..2bd2776bd07c 100644 --- a/www/chromium/files/patch-services_on__device__model_pre__sandbox__init.cc +++ b/www/chromium/files/patch-services_on__device__model_pre__sandbox__init.cc @@ -1,4 +1,4 @@ ---- services/on_device_model/pre_sandbox_init.cc.orig 2024-06-17 12:56:06 UTC +--- services/on_device_model/pre_sandbox_init.cc.orig 2024-08-26 12:06:38 UTC +++ services/on_device_model/pre_sandbox_init.cc @@ -14,7 +14,7 @@ #include "services/on_device_model/ml/chrome_ml.h" // nogncheck @@ -9,7 +9,7 @@ #include "gpu/config/gpu_info_collector.h" // nogncheck #include "third_party/dawn/include/dawn/dawn_proc.h" // nogncheck #include "third_party/dawn/include/dawn/native/DawnNative.h" // nogncheck -@@ -31,7 +31,7 @@ namespace on_device_model { +@@ -25,7 +25,7 @@ namespace on_device_model { namespace { @@ -18,7 +18,7 @@ constexpr uint32_t kVendorIdAMD = 0x1002; constexpr uint32_t kVendorIdIntel = 0x8086; constexpr uint32_t kVendorIdNVIDIA = 0x10DE; -@@ -80,7 +80,7 @@ bool OnDeviceModelService::PreSandboxInit() { +@@ -74,7 +74,7 @@ bool OnDeviceModelService::PreSandboxInit() { } #endif @@ -27,7 +27,7 @@ // Warm any relevant drivers before attempting to bring up the sandbox. For // good measure we initialize a device instance for any adapter with an // appropriate backend on top of any integrated or discrete GPU. -@@ -116,7 +116,7 @@ bool OnDeviceModelService::PreSandboxInit() { +@@ -101,7 +101,7 @@ bool OnDeviceModelService::PreSandboxInit() { return true; } diff --git a/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h b/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h index f91b0917c11f..959606de5f25 100644 --- a/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h +++ b/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h @@ -1,6 +1,6 @@ ---- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h.orig 2022-02-28 16:54:41 UTC +--- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h.orig 2024-08-26 12:06:38 UTC +++ services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h -@@ -45,7 +45,7 @@ class COMPONENT_EXPORT( +@@ -53,7 +53,7 @@ class COMPONENT_EXPORT( mojom::RawOSMemDump*); static std::vector<mojom::VmRegionPtr> GetProcessMemoryMaps(base::ProcessId); @@ -9,7 +9,7 @@ static void SetProcSmapsForTesting(FILE*); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || // BUILDFLAG(IS_ANDROID) -@@ -62,7 +62,7 @@ class COMPONENT_EXPORT( +@@ -70,7 +70,7 @@ class COMPONENT_EXPORT( static std::vector<mojom::VmRegionPtr> GetProcessModules(base::ProcessId); #endif diff --git a/www/chromium/files/patch-services_screen__ai_public_cpp_utilities.cc b/www/chromium/files/patch-services_screen__ai_public_cpp_utilities.cc index ba2d7ddc302e..fa71ff9cd45a 100644 --- a/www/chromium/files/patch-services_screen__ai_public_cpp_utilities.cc +++ b/www/chromium/files/patch-services_screen__ai_public_cpp_utilities.cc @@ -1,6 +1,6 @@ ---- services/screen_ai/public/cpp/utilities.cc.orig 2024-04-19 13:02:56 UTC +--- services/screen_ai/public/cpp/utilities.cc.orig 2024-08-26 12:06:38 UTC +++ services/screen_ai/public/cpp/utilities.cc -@@ -19,7 +19,7 @@ namespace screen_ai { +@@ -18,7 +18,7 @@ namespace screen_ai { namespace { @@ -9,7 +9,7 @@ constexpr char kBinaryPathSwitch[] = "screen-ai-binary"; #endif -@@ -40,7 +40,7 @@ constexpr char kScreenAIDlcRootPath[] = +@@ -39,7 +39,7 @@ constexpr char kScreenAIDlcRootPath[] = #endif #if BUILDFLAG(ENABLE_SCREEN_AI_BROWSERTESTS) @@ -18,7 +18,7 @@ constexpr base::FilePath::CharType kScreenAIResourcePathForTests[] = FILE_PATH_LITERAL("third_party/screen-ai/linux/resources"); #elif BUILDFLAG(IS_MAC) -@@ -127,7 +127,7 @@ base::FilePath GetComponentBinaryPathForTests() { +@@ -128,7 +128,7 @@ base::FilePath GetComponentBinaryPathForTests() { const char* GetBinaryPathSwitch() { // This is only used on Linux and ChromeOS. 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 30a1ee32fb5e..b066d2d7e3a0 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,6 +1,6 @@ ---- services/video_capture/video_capture_service_impl.cc.orig 2024-06-17 12:56:06 UTC +--- services/video_capture/video_capture_service_impl.cc.orig 2024-08-26 12:06:38 UTC +++ services/video_capture/video_capture_service_impl.cc -@@ -41,7 +41,7 @@ +@@ -42,7 +42,7 @@ #include "services/video_capture/lacros/device_factory_adapter_lacros.h" #endif // BUILDFLAG(IS_CHROMEOS_LACROS) @@ -9,7 +9,7 @@ #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" -@@ -109,7 +109,7 @@ class VideoCaptureServiceImpl::GpuDependenciesContext +@@ -110,7 +110,7 @@ class VideoCaptureServiceImpl::GpuDependenciesContext this}; }; @@ -18,7 +18,7 @@ // 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 -@@ -311,7 +311,7 @@ void VideoCaptureServiceImpl::LazyInitializeGpuDepende +@@ -323,7 +323,7 @@ void VideoCaptureServiceImpl::LazyInitializeGpuDepende gpu_dependencies_context_ = std::make_unique<GpuDependenciesContext>(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) @@ -27,7 +27,7 @@ { #else if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled()) { -@@ -433,7 +433,7 @@ void VideoCaptureServiceImpl::OnGpuInfoUpdate(const CH +@@ -455,7 +455,7 @@ void VideoCaptureServiceImpl::OnGpuInfoUpdate(const CH } #endif 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 62fb1b9fac96..defb6de7a365 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,4 +1,4 @@ ---- services/video_capture/video_capture_service_impl.h.orig 2024-06-17 12:56:06 UTC +--- services/video_capture/video_capture_service_impl.h.orig 2024-08-26 12:06:38 UTC +++ services/video_capture/video_capture_service_impl.h @@ -27,7 +27,7 @@ #include "services/video_capture/ash/video_capture_device_factory_ash.h" @@ -9,7 +9,7 @@ #include "services/viz/public/cpp/gpu/gpu.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || // BUILDFLAG(IS_CHROMEOS_ASH) -@@ -71,7 +71,7 @@ class VideoCaptureServiceImpl : public mojom::VideoCap +@@ -75,7 +75,7 @@ class VideoCaptureServiceImpl : public mojom::VideoCap #if BUILDFLAG(IS_WIN) void OnGpuInfoUpdate(const CHROME_LUID& luid) override; #endif @@ -18,7 +18,7 @@ void SetVizGpu(std::unique_ptr<viz::Gpu> viz_gpu); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || // BUILDFLAG(IS_CHROMEOS_ASH) -@@ -112,7 +112,7 @@ class VideoCaptureServiceImpl : public mojom::VideoCap +@@ -120,7 +120,7 @@ class VideoCaptureServiceImpl : public mojom::VideoCap factory_receivers_ash_; #endif diff --git a/www/chromium/files/patch-skia_ext_skcolorspace__trfn.cc b/www/chromium/files/patch-skia_ext_skcolorspace__trfn.cc index aa190c198a0b..8abddb1ca509 100644 --- a/www/chromium/files/patch-skia_ext_skcolorspace__trfn.cc +++ b/www/chromium/files/patch-skia_ext_skcolorspace__trfn.cc @@ -1,8 +1,8 @@ ---- skia/ext/skcolorspace_trfn.cc.orig 2023-08-17 07:33:31 UTC +--- skia/ext/skcolorspace_trfn.cc.orig 2024-08-26 12:06:38 UTC +++ skia/ext/skcolorspace_trfn.cc -@@ -2,6 +2,8 @@ - // Use of this source code is governed by a BSD-style license that can be - // found in the LICENSE file. +@@ -7,6 +7,8 @@ + #pragma allow_unsafe_buffers + #endif +#include <cmath> + diff --git a/www/chromium/files/patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h b/www/chromium/files/patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h index 0508ad5bfa24..51775ce92e06 100644 --- a/www/chromium/files/patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h +++ b/www/chromium/files/patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h @@ -1,6 +1,6 @@ ---- third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.h.orig 2023-09-13 12:11:42 UTC +--- third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.h.orig 2024-08-26 12:06:38 UTC +++ third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.h -@@ -34,7 +34,7 @@ +@@ -35,7 +35,7 @@ #if defined(__ELF__) && !defined(__OpenBSD__) && !defined(__QNX__) && \ !defined(__native_client__) && !defined(__asmjs__) && \ !defined(__wasm__) && !defined(__HAIKU__) && !defined(__sun) && \ 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 c558774b5c7e..126f758438d7 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-07-30 11:12:21 UTC +--- third_party/angle/src/libANGLE/Display.cpp.orig 2024-08-26 12:06:38 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()) { -@@ -2157,7 +2157,7 @@ static ClientExtensions GenerateClientExtensions() +@@ -2158,7 +2158,7 @@ static ClientExtensions GenerateClientExtensions() extensions.x11Visual = true; #endif diff --git a/www/chromium/files/patch-third__party_blink_public_platform_platform.h b/www/chromium/files/patch-third__party_blink_public_platform_platform.h index a68528980834..ba690a910541 100644 --- a/www/chromium/files/patch-third__party_blink_public_platform_platform.h +++ b/www/chromium/files/patch-third__party_blink_public_platform_platform.h @@ -1,6 +1,6 @@ ---- third_party/blink/public/platform/platform.h.orig 2024-07-30 11:12:21 UTC +--- third_party/blink/public/platform/platform.h.orig 2024-08-26 12:06:38 UTC +++ third_party/blink/public/platform/platform.h -@@ -354,7 +354,7 @@ class BLINK_PLATFORM_EXPORT Platform { +@@ -368,7 +368,7 @@ class BLINK_PLATFORM_EXPORT Platform { return nullptr; } 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 aeb9a158b110..f46fb390340a 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-01-30 07:53:34 UTC +--- third_party/blink/public/platform/web_vector.h.orig 2024-08-26 12:06:38 UTC +++ third_party/blink/public/platform/web_vector.h -@@ -86,7 +86,7 @@ class WebVector { +@@ -91,7 +91,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_memory__usage__monitor__posix.cc b/www/chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc index acc849ff4976..9bd9ac387b44 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 2023-09-13 12:11:42 UTC +--- 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 -@@ -128,15 +128,17 @@ void MemoryUsageMonitorPosix::ResetFileDescriptors() { +@@ -133,15 +133,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_editing_editing__behavior.cc b/www/chromium/files/patch-third__party_blink_renderer_core_editing_editing__behavior.cc index 9bb9d79b6e44..9c44202bb41b 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_editing_editing__behavior.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_editing_editing__behavior.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/editing/editing_behavior.cc.orig 2023-12-10 06:10:27 UTC +--- third_party/blink/renderer/core/editing/editing_behavior.cc.orig 2024-08-26 12:06:38 UTC +++ third_party/blink/renderer/core/editing/editing_behavior.cc -@@ -324,7 +324,7 @@ bool EditingBehavior::ShouldInsertCharacter(const Keyb +@@ -304,7 +304,7 @@ bool EditingBehavior::ShouldInsertCharacter(const Keyb // unexpected behaviour if (ch < ' ') return false; 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 6a2d6feae664..c6ba8c0cc23c 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-07-30 11:12:21 UTC +--- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2024-08-26 12:06:38 UTC +++ third_party/blink/renderer/core/exported/web_view_impl.cc @@ -427,7 +427,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' -@@ -3380,7 +3380,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs +@@ -3418,7 +3418,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 bd2f795c385f..df3cff3753fa 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-07-30 11:12:21 UTC +--- third_party/blink/renderer/core/frame/web_frame_test.cc.orig 2024-08-26 12:06:38 UTC +++ third_party/blink/renderer/core/frame/web_frame_test.cc -@@ -6471,7 +6471,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) { +@@ -6477,7 +6477,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 \ -@@ -6880,7 +6880,7 @@ TEST_F(CompositedSelectionBoundsTest, LargeSelectionSc +@@ -6886,7 +6886,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_html_canvas_canvas__async__blob__creator.cc b/www/chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc index 5db1b6d2a235..9c9ab098b6f3 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig 2024-01-30 07:53:34 UTC +--- third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig 2024-08-26 12:06:38 UTC +++ third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc -@@ -50,7 +50,7 @@ constexpr base::TimeDelta kEncodeRowSlackBeforeDeadlin +@@ -55,7 +55,7 @@ constexpr base::TimeDelta kEncodeRowSlackBeforeDeadlin /* The value is based on user statistics on Nov 2017. */ #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc b/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc index 322b3a6045e3..633f55cbcc48 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/paint/paint_layer.cc.orig 2024-04-19 13:02:56 UTC +--- third_party/blink/renderer/core/paint/paint_layer.cc.orig 2024-08-26 12:06:38 UTC +++ third_party/blink/renderer/core/paint/paint_layer.cc -@@ -122,7 +122,7 @@ namespace blink { +@@ -120,7 +120,7 @@ namespace blink { namespace { diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc b/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc index 999b99c2c6f9..f3e71ae8168c 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2024-07-30 11:12:21 UTC +--- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2024-08-26 12:06:38 UTC +++ third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc @@ -149,7 +149,7 @@ bool ScrollbarThemeAura::SupportsDragSnapBack() const // is true for at least GTK and QT apps). @@ -9,7 +9,7 @@ return false; #else return true; -@@ -371,7 +371,7 @@ bool ScrollbarThemeAura::ShouldCenterOnThumb(const Scr +@@ -372,7 +372,7 @@ bool ScrollbarThemeAura::ShouldCenterOnThumb(const Scr const WebMouseEvent& event) const { // 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_xml_xslt__processor__libxslt.cc b/www/chromium/files/patch-third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc index 9e11b5e7bdcc..cf78137334dd 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc.orig 2024-02-23 21:04:38 UTC +--- third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc.orig 2024-08-26 12:06:38 UTC +++ third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc -@@ -66,7 +66,11 @@ void XSLTProcessor::GenericErrorFunc(void*, const char +@@ -71,7 +71,11 @@ void XSLTProcessor::GenericErrorFunc(void*, const char // It would be nice to do something with this error message. } diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc index e4d414563e6a..64c8f8d98c39 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig 2024-07-30 11:12:21 UTC +--- third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig 2024-08-26 12:06:38 UTC +++ third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc -@@ -301,7 +301,7 @@ TEST_F(WebRtcAudioRendererTest, DISABLED_VerifySinkPar +@@ -302,7 +302,7 @@ TEST_F(WebRtcAudioRendererTest, DISABLED_VerifySinkPar SetupRenderer(kDefaultOutputDeviceId); renderer_proxy_->Start(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \ diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc index 14c790623fd5..121a8470fec7 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc.orig 2024-04-19 13:02:56 UTC +--- third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc.orig 2024-08-26 12:06:38 UTC +++ third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc -@@ -463,7 +463,7 @@ class AudioWorkletThreadPriorityTest +@@ -468,7 +468,7 @@ class AudioWorkletThreadPriorityTest // TODO(crbug.com/1022888): The worklet thread priority is always NORMAL // on OS_LINUX and OS_CHROMEOS regardless of the thread priority setting. 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 98789bf30a16..984a788eb28c 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-07-30 11:12:21 UTC +--- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig 2024-08-26 12:06:38 UTC +++ third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -@@ -6310,7 +6310,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid +@@ -6304,7 +6304,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid constexpr bool kAllowZeroCopyImages = true; #endif diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc index ae3b76286296..5862bf94f438 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/webgpu/gpu_queue.cc.orig 2024-07-30 11:12:21 UTC +--- third_party/blink/renderer/modules/webgpu/gpu_queue.cc.orig 2024-08-26 12:06:38 UTC +++ third_party/blink/renderer/modules/webgpu/gpu_queue.cc -@@ -783,7 +783,7 @@ bool GPUQueue::CopyFromCanvasSourceImage( +@@ -788,7 +788,7 @@ bool GPUQueue::CopyFromCanvasSourceImage( // on linux platform. // TODO(crbug.com/1424119): using a webgpu mailbox texture on the OpenGLES // backend is failing for unknown reasons. 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 8653c493a0b3..f38e41385b41 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-07-30 11:12:21 UTC +--- third_party/blink/renderer/platform/BUILD.gn.orig 2024-08-26 12:06:38 UTC +++ third_party/blink/renderer/platform/BUILD.gn -@@ -1993,7 +1993,7 @@ static_library("test_support") { +@@ -2003,7 +2003,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_fonts_font__cache.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc index 5298059b7dc0..d192253c4929 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2024-03-22 08:19:40 UTC +--- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2024-08-26 12:06:38 UTC +++ third_party/blink/renderer/platform/fonts/font_cache.cc -@@ -73,7 +73,7 @@ extern const char kNotoColorEmojiCompat[] = "Noto Colo +@@ -79,7 +79,7 @@ extern const char kNotoColorEmojiCompat[] = "Noto Colo SkFontMgr* FontCache::static_font_manager_ = nullptr; @@ -9,7 +9,7 @@ float FontCache::device_scale_factor_ = 1.0; #endif -@@ -124,7 +124,7 @@ const FontPlatformData* FontCache::SystemFontPlatformD +@@ -130,7 +130,7 @@ const FontPlatformData* FontCache::SystemFontPlatformD const FontDescription& font_description) { const AtomicString& family = FontCache::SystemFontFamily(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || \ diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h index 765f6ddc2f05..6dcea81ee99a 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/platform/fonts/font_cache.h.orig 2024-03-22 08:19:40 UTC +--- third_party/blink/renderer/platform/fonts/font_cache.h.orig 2024-08-26 12:06:38 UTC +++ third_party/blink/renderer/platform/fonts/font_cache.h @@ -55,7 +55,7 @@ #include "third_party/skia/include/core/SkFontMgr.h" @@ -9,16 +9,16 @@ #include "ui/gfx/font_fallback_linux.h" #endif -@@ -163,7 +163,7 @@ class PLATFORM_EXPORT FontCache final { - static void PrewarmFamily(const AtomicString& family_name) {} - #endif +@@ -165,7 +165,7 @@ class PLATFORM_EXPORT FontCache final { + + static void MaybePreloadSystemFonts(); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // These are needed for calling QueryRenderStyleForStrike, since // gfx::GetFontRenderParams makes distinctions based on DSF. static float DeviceScaleFactor() { return device_scale_factor_; } -@@ -239,7 +239,7 @@ class PLATFORM_EXPORT FontCache final { +@@ -241,7 +241,7 @@ class PLATFORM_EXPORT FontCache final { const char* locale_family_name); #endif // BUILDFLAG(IS_ANDROID) @@ -27,7 +27,7 @@ static bool GetFontForCharacter(UChar32, const char* preferred_locale, gfx::FallbackFontData*); -@@ -312,7 +312,7 @@ class PLATFORM_EXPORT FontCache final { +@@ -314,7 +314,7 @@ class PLATFORM_EXPORT FontCache final { const FontFaceCreationParams&, std::string& name); @@ -36,7 +36,7 @@ static AtomicString GetFamilyNameForCharacter(SkFontMgr*, UChar32, const FontDescription&, -@@ -349,7 +349,7 @@ class PLATFORM_EXPORT FontCache final { +@@ -351,7 +351,7 @@ class PLATFORM_EXPORT FontCache final { bool is_test_font_mgr_ = false; #endif // BUILDFLAG(IS_WIN) diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc index 8abbd7d011dc..d47607602d5b 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/fonts/font_description.cc.orig 2024-07-30 11:12:21 UTC +--- third_party/blink/renderer/platform/fonts/font_description.cc.orig 2024-08-26 12:06:38 UTC +++ third_party/blink/renderer/platform/fonts/font_description.cc -@@ -39,7 +39,7 @@ +@@ -44,7 +44,7 @@ #include "third_party/blink/renderer/platform/wtf/text/string_hash.h" #include "third_party/blink/renderer/platform/wtf/text/string_hasher.h" @@ -9,7 +9,7 @@ #include "third_party/blink/renderer/platform/fonts/font_cache.h" #endif -@@ -277,7 +277,7 @@ FontCacheKey FontDescription::CacheKey( +@@ -282,7 +282,7 @@ FontCacheKey FontDescription::CacheKey( static_cast<unsigned>(fields_.orientation_) << 1 | // bit 2-3 static_cast<unsigned>(fields_.subpixel_text_position_); // bit 1 diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__platform__data.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__platform__data.cc index de382f90ffad..1583efb142d5 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__platform__data.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__platform__data.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/fonts/font_platform_data.cc.orig 2024-06-17 12:56:06 UTC +--- third_party/blink/renderer/platform/fonts/font_platform_data.cc.orig 2024-08-26 12:06:38 UTC +++ third_party/blink/renderer/platform/fonts/font_platform_data.cc -@@ -49,7 +49,7 @@ +@@ -54,7 +54,7 @@ namespace blink { namespace { @@ -9,7 +9,7 @@ // Getting the system font render style takes a significant amount of time on // Linux because looking up fonts using fontconfig can be very slow. We fetch // the render style for each font family and text size, while it's very -@@ -128,7 +128,7 @@ FontPlatformData::FontPlatformData(sk_sp<SkTypeface> t +@@ -133,7 +133,7 @@ FontPlatformData::FontPlatformData(sk_sp<SkTypeface> t style_ = WebFontRenderStyle::GetDefault(); #if !BUILDFLAG(IS_WIN) WebFontRenderStyle system_style; diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc index 1bfafd81a14f..46ed4d531dea 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig 2024-05-21 18:07:39 UTC +--- third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig 2024-08-26 12:06:38 UTC +++ third_party/blink/renderer/platform/graphics/video_frame_submitter.cc -@@ -407,7 +407,7 @@ void VideoFrameSubmitter::OnBeginFrame( +@@ -418,7 +418,7 @@ void VideoFrameSubmitter::OnBeginFrame( continue; auto& feedback = timing_details.find(frame_token)->value.presentation_feedback; 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 0bed292dbc4b..965afc7baf93 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-07-31 19:26:21 UTC +--- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2024-08-26 12:06:38 UTC +++ third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -324,7 +324,7 @@ +@@ -344,7 +344,7 @@ name: "AppTitle", status: "experimental", origin_trial_feature_name: "AppTitle", @@ -9,25 +9,7 @@ base_feature: "WebAppEnableAppTitle", }, { -@@ -1534,7 +1534,7 @@ - status: "test", - base_feature: "none", - origin_trial_feature_name: "FedCmContinueOnBundle", -- origin_trial_os: ["win", "mac", "linux", "chromeos"], -+ origin_trial_os: ["win", "mac", "linux", "chromeos", "openbsd", "freebsd"], - origin_trial_allows_third_party: true, - }, - { -@@ -1551,7 +1551,7 @@ - status: "test", - base_feature: "none", - origin_trial_feature_name: "FedCmButtonMode", -- origin_trial_os: ["win", "mac", "linux", "chromeos"], -+ origin_trial_os: ["win", "mac", "linux", "chromeos", "openbsd", "freebsd"], - origin_trial_allows_third_party: true, - }, - { -@@ -1596,7 +1596,7 @@ +@@ -1703,7 +1703,7 @@ base_feature: "none", public: true, origin_trial_feature_name: "FedCmMultipleIdentityProviders", @@ -36,16 +18,7 @@ origin_trial_allows_third_party: true, }, { -@@ -1934,7 +1934,7 @@ - base_feature_status: "enabled", - copied_from_base_feature_if: "overridden", - origin_trial_feature_name: "FullscreenPopupWindows", -- origin_trial_os: ["win", "mac", "linux", "chromeos"], -+ origin_trial_os: ["win", "mac", "linux", "chromeos", "openbsd", "freebsd"], - }, - { - name: "GamepadButtonAxisEvents", -@@ -3011,7 +3011,7 @@ +@@ -3105,7 +3105,7 @@ // Tracking bug for the implementation: https://crbug.com/1462930 name: "PermissionElement", origin_trial_feature_name: "PermissionElement", @@ -54,7 +27,7 @@ status: "experimental", public: true, base_feature_status: "enabled", -@@ -3146,7 +3146,7 @@ +@@ -3232,7 +3232,7 @@ { name: "PrivateNetworkAccessPermissionPrompt", origin_trial_feature_name: "PrivateNetworkAccessPermissionPrompt", @@ -63,7 +36,7 @@ status: "stable", public: true, base_feature: "none", -@@ -4122,7 +4122,7 @@ +@@ -4195,7 +4195,7 @@ name: "UnrestrictedSharedArrayBuffer", base_feature: "none", origin_trial_feature_name: "UnrestrictedSharedArrayBuffer", @@ -72,7 +45,7 @@ }, // Enables using policy-controlled feature "usb-unrestricted" to allow // isolated context to access protected USB interface classes and to -@@ -4291,7 +4291,7 @@ +@@ -4364,7 +4364,7 @@ { name: "WebAppScopeExtensions", origin_trial_feature_name: "WebAppScopeExtensions", @@ -81,7 +54,7 @@ status: "experimental", base_feature: "none", }, -@@ -4334,7 +4334,7 @@ +@@ -4407,7 +4407,7 @@ status: "experimental", base_feature: "none", origin_trial_feature_name: "WebAppUrlHandling", diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_video__capture_video__capture__impl.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_video__capture_video__capture__impl.cc deleted file mode 100644 index 6f57b5d28f52..000000000000 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_video__capture_video__capture__impl.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/blink/renderer/platform/video_capture/video_capture_impl.cc.orig 2024-07-30 11:12:21 UTC -+++ third_party/blink/renderer/platform/video_capture/video_capture_impl.cc -@@ -608,7 +608,7 @@ bool VideoCaptureImpl::BindVideoFrameOnMediaTaskRunner - } - - const unsigned texture_target = --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Explicitly set GL_TEXTURE_EXTERNAL_OES if necessary: - // `media::VideoFrame::RequiresExternalSampler()` requires it for NV12 - // format, while `ClientSharedImage::GetTextureTarget(BufferUsage, diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc index 3ac8871e0a44..8fa3e78804b9 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/wtf/stack_util.cc.orig 2024-07-30 11:12:21 UTC +--- third_party/blink/renderer/platform/wtf/stack_util.cc.orig 2024-08-26 12:06:38 UTC +++ third_party/blink/renderer/platform/wtf/stack_util.cc -@@ -19,6 +19,11 @@ +@@ -23,6 +23,11 @@ extern "C" void* __libc_stack_end; // NOLINT #endif @@ -12,7 +12,7 @@ namespace WTF { size_t GetUnderestimatedStackSize() { -@@ -63,6 +68,8 @@ size_t GetUnderestimatedStackSize() { +@@ -67,6 +72,8 @@ size_t GetUnderestimatedStackSize() { // low as 512k. // return 512 * 1024; @@ -21,7 +21,7 @@ #elif BUILDFLAG(IS_APPLE) // pthread_get_stacksize_np() returns too low a value for the main thread on // OSX 10.9, -@@ -150,6 +157,13 @@ void* GetStackStart() { +@@ -154,6 +161,13 @@ void* GetStackStart() { ::GetCurrentThreadStackLimits(&lowLimit, &highLimit); return reinterpret_cast<void*>(highLimit); #endif 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 e669c64a6aba..6e2a65389fb7 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,6 @@ ---- third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc.orig 2024-06-17 12:56:06 UTC +--- 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 -@@ -610,6 +610,7 @@ static void GbkUrlEscapedEntityCallack( +@@ -615,6 +615,7 @@ static void GbkUrlEscapedEntityCallack( code_point, reason, err); } @@ -8,7 +8,7 @@ static void GbkCallbackSubstitute(const void* context, UConverterFromUnicodeArgs* from_unicode_args, const UChar* code_units, -@@ -627,6 +628,7 @@ static void GbkCallbackSubstitute(const void* context, +@@ -632,6 +633,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_crashpad_crashpad_util_posix_symbolic__constants__posix.cc b/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_symbolic__constants__posix.cc index ade30531a9b6..d7779cb87f3e 100644 --- a/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_symbolic__constants__posix.cc +++ b/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_symbolic__constants__posix.cc @@ -1,6 +1,6 @@ ---- third_party/crashpad/crashpad/util/posix/symbolic_constants_posix.cc.orig 2022-04-21 18:48:31 UTC +--- third_party/crashpad/crashpad/util/posix/symbolic_constants_posix.cc.orig 2024-08-26 12:06:38 UTC +++ third_party/crashpad/crashpad/util/posix/symbolic_constants_posix.cc -@@ -67,7 +67,7 @@ constexpr const char* kSignalNames[] = { +@@ -68,7 +68,7 @@ constexpr const char* kSignalNames[] = { "INFO", "USR1", "USR2", @@ -9,7 +9,7 @@ #if defined(ARCH_CPU_MIPS_FAMILY) "HUP", "INT", -@@ -138,7 +138,7 @@ constexpr const char* kSignalNames[] = { +@@ -139,7 +139,7 @@ constexpr const char* kSignalNames[] = { #endif // defined(ARCH_CPU_MIPS_FAMILY) #endif }; diff --git a/www/chromium/files/patch-third__party_libc++_src_src_chrono.cpp b/www/chromium/files/patch-third__party_libc++_src_src_chrono.cpp index 74549d1bed4b..d27db0edf43a 100644 --- a/www/chromium/files/patch-third__party_libc++_src_src_chrono.cpp +++ b/www/chromium/files/patch-third__party_libc++_src_src_chrono.cpp @@ -1,11 +1,11 @@ ---- third_party/libc++/src/src/chrono.cpp.orig 2024-02-23 21:04:38 UTC +--- third_party/libc++/src/src/chrono.cpp.orig 2024-08-26 12:06:38 UTC +++ third_party/libc++/src/src/chrono.cpp -@@ -31,7 +31,7 @@ - # include <sys/time.h> // for gettimeofday and timeval - #endif +@@ -33,7 +33,7 @@ --#if defined(__APPLE__) || defined(__gnu_hurd__) || (defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0) -+#if defined(__APPLE__) || defined(__gnu_hurd__) || (defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0) || defined(__OpenBSD__) || defined(__FreeBSD__) + // OpenBSD does not have a fully conformant suite of POSIX timers, but + // it does have clock_gettime and CLOCK_MONOTONIC which is all we need. +-#if defined(__APPLE__) || defined(__gnu_hurd__) || defined(__OpenBSD__) || (defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0) ++#if defined(__APPLE__) || defined(__gnu_hurd__) || defined(__OpenBSD__) || (defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0) || defined(__FreeBSD__) # define _LIBCPP_HAS_CLOCK_GETTIME #endif diff --git a/www/chromium/files/patch-third__party_node_node.gni b/www/chromium/files/patch-third__party_node_node.gni index abe6da14ab9b..8574ecf0a7d6 100644 --- a/www/chromium/files/patch-third__party_node_node.gni +++ b/www/chromium/files/patch-third__party_node_node.gni @@ -1,6 +1,6 @@ ---- third_party/node/node.gni.orig 2024-07-30 11:12:21 UTC +--- third_party/node/node.gni.orig 2024-08-26 12:06:38 UTC +++ third_party/node/node.gni -@@ -19,7 +19,7 @@ template("node") { +@@ -22,7 +22,7 @@ template("node") { # When use_remoteexec=true, node actions may run on remote # Linux worker. So it should include linux node binary in inputs. diff --git a/www/chromium/files/patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp b/www/chromium/files/patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp index f515046ecfa7..c5fd44b3b975 100644 --- a/www/chromium/files/patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp +++ b/www/chromium/files/patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp @@ -1,4 +1,4 @@ ---- third_party/pdfium/core/fxge/linux/fx_linux_impl.cpp.orig 2024-07-30 11:12:21 UTC +--- third_party/pdfium/core/fxge/linux/fx_linux_impl.cpp.orig 2024-08-26 12:06:38 UTC +++ third_party/pdfium/core/fxge/linux/fx_linux_impl.cpp @@ -20,7 +20,7 @@ #include "core/fxge/fx_font.h" @@ -9,7 +9,7 @@ #error "Included on the wrong platform" #endif -@@ -172,9 +172,8 @@ class CLinuxPlatform : public CFX_GEModule::PlatformIf +@@ -173,9 +173,8 @@ class CLinuxPlatform : public CFX_GEModule::PlatformIf std::unique_ptr<SystemFontInfoIface> CreateDefaultSystemFontInfo() override { auto pInfo = std::make_unique<CFX_LinuxFontInfo>(); if (!pInfo->ParseFontCfg(CFX_GEModule::Get()->GetUserFontPaths())) { 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 new file mode 100644 index 000000000000..d7263e91c097 --- /dev/null +++ b/www/chromium/files/patch-third__party_perfetto_src_base_utils.cc @@ -0,0 +1,26 @@ +--- third_party/perfetto/src/base/utils.cc.orig 2024-08-26 12:06:38 UTC ++++ third_party/perfetto/src/base/utils.cc +@@ -38,8 +38,9 @@ + #include <mach/vm_page_size.h> + #endif + +-#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) + #include <linux/prctl.h> + #include <sys/prctl.h> + +@@ -338,8 +339,9 @@ void AlignedFree(void* ptr) { + } + + bool IsSyncMemoryTaggingEnabled() { +-#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) + // Compute only once per lifetime of the process. + static bool cached_value = [] { + const int res = prctl(PR_GET_TAGGED_ADDR_CTRL, 0, 0, 0, 0); diff --git a/www/chromium/files/patch-third__party_wayland_BUILD.gn b/www/chromium/files/patch-third__party_wayland_BUILD.gn index 79de827f9927..8ce30a9de459 100644 --- a/www/chromium/files/patch-third__party_wayland_BUILD.gn +++ b/www/chromium/files/patch-third__party_wayland_BUILD.gn @@ -1,14 +1,14 @@ ---- third_party/wayland/BUILD.gn.orig 2023-02-08 15:40:14 UTC +--- third_party/wayland/BUILD.gn.orig 2024-08-26 12:06:38 UTC +++ third_party/wayland/BUILD.gn -@@ -22,6 +22,11 @@ config("wayland_config") { - "src/src", - ] +@@ -24,6 +24,11 @@ if (!use_system_libwayland) { + "src/src", + ] -+ if (is_bsd) { -+ include_dirs += [ "/usr/local/include/libepoll-shim" ] -+ libs = [ "epoll-shim" ] -+ } ++ if (is_bsd) { ++ include_dirs += [ "/usr/local/include/libepoll-shim" ] ++ libs = [ "epoll-shim" ] ++ } + - # Client/Server headers are automatically generated. Though, we still need - # to pass the path where these headers are located. - include_dirs += [ "$root_gen_dir/third_party/wayland/src/protocol" ] + # Client/Server headers are automatically generated. Though, we still need + # to pass the path where these headers are located. + include_dirs += [ "$root_gen_dir/third_party/wayland/src/protocol" ] diff --git a/www/chromium/files/patch-third__party_webrtc_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_BUILD.gn index fb10505257a6..d8f29dd9e60f 100644 --- a/www/chromium/files/patch-third__party_webrtc_BUILD.gn +++ b/www/chromium/files/patch-third__party_webrtc_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/webrtc/BUILD.gn.orig 2024-06-17 12:56:06 UTC +--- third_party/webrtc/BUILD.gn.orig 2024-08-26 12:06:38 UTC +++ third_party/webrtc/BUILD.gn -@@ -219,6 +219,9 @@ config("common_inherited_config") { +@@ -215,6 +215,9 @@ config("common_inherited_config") { if (is_linux || is_chromeos) { defines += [ "WEBRTC_LINUX" ] } diff --git a/www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn b/www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn index 9a690e52a2e7..3144eed80004 100644 --- a/www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn +++ b/www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn @@ -1,4 +1,4 @@ ---- tools/perf/chrome_telemetry_build/BUILD.gn.orig 2024-02-23 21:04:38 UTC +--- tools/perf/chrome_telemetry_build/BUILD.gn.orig 2024-08-26 12:06:38 UTC +++ tools/perf/chrome_telemetry_build/BUILD.gn @@ -47,7 +47,7 @@ group("telemetry_chrome_test") { data_deps += [ "//chrome:reorder_imports" ] @@ -6,7 +6,7 @@ - if (is_linux || is_chromeos) { + if ((is_linux || is_chromeos) && !is_bsd) { - data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] + data_deps += [ "//third_party/breakpad:dump_syms" ] # CrOS currently has issues with the locally compiled version of @@ -178,7 +178,7 @@ group("telemetry_chrome_test_without_chrome") { 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 1fa66ff0867d..b57c16138192 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,15 @@ ---- ui/base/ui_base_features.cc.orig 2024-06-17 12:56:06 UTC +--- ui/base/ui_base_features.cc.orig 2024-08-26 12:06:38 UTC +++ ui/base/ui_base_features.cc -@@ -245,7 +245,7 @@ BASE_FEATURE(kExperimentalFlingAnimation, +@@ -157,7 +157,7 @@ BASE_FEATURE(kWaylandPerSurfaceScale, + base::FEATURE_DISABLED_BY_DEFAULT); + #endif // BUILDFLAG(IS_OZONE) + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // 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) +@@ -259,7 +259,7 @@ BASE_FEATURE(kExperimentalFlingAnimation, "ExperimentalFlingAnimation", // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +18,7 @@ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ !BUILDFLAG(IS_CHROMEOS_LACROS)) base::FEATURE_ENABLED_BY_DEFAULT -@@ -339,7 +339,7 @@ bool IsForcedColorsEnabled() { +@@ -363,7 +363,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 new file mode 100644 index 000000000000..bfd203322c2a --- /dev/null +++ b/www/chromium/files/patch-ui_base_ui__base__features.h @@ -0,0 +1,11 @@ +--- ui/base/ui_base_features.h.orig 2024-08-26 12:06:38 UTC ++++ ui/base/ui_base_features.h +@@ -138,7 +138,7 @@ COMPONENT_EXPORT(UI_BASE_FEATURES) + BASE_DECLARE_FEATURE(kWaylandPerSurfaceScale); + #endif // BUILDFLAG(IS_OZONE) + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + COMPONENT_EXPORT(UI_BASE_FEATURES) + BASE_DECLARE_FEATURE(kOverrideDefaultOzonePlatformHintToAuto); + #endif // BUILDFLAG(IS_LINUX) diff --git a/www/chromium/files/patch-ui_base_ui__base__switches.cc b/www/chromium/files/patch-ui_base_ui__base__switches.cc index 10cdf4702755..61a8d83fa813 100644 --- a/www/chromium/files/patch-ui_base_ui__base__switches.cc +++ b/www/chromium/files/patch-ui_base_ui__base__switches.cc @@ -1,4 +1,4 @@ ---- ui/base/ui_base_switches.cc.orig 2023-10-11 18:22:24 UTC +--- ui/base/ui_base_switches.cc.orig 2024-08-26 12:06:38 UTC +++ ui/base/ui_base_switches.cc @@ -31,13 +31,13 @@ const char kShowMacOverlayBorders[] = "show-mac-overla const char kEnableResourcesFileSharing[] = "enable-resources-file-sharing"; @@ -15,4 +15,4 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Specify the toolkit used to construct the Linux GUI. const char kUiToolkitFlag[] = "ui-toolkit"; - #endif + // Disables GTK IME integration. diff --git a/www/chromium/files/patch-ui_base_ui__base__switches.h b/www/chromium/files/patch-ui_base_ui__base__switches.h index 35466f255482..557094449f81 100644 --- a/www/chromium/files/patch-ui_base_ui__base__switches.h +++ b/www/chromium/files/patch-ui_base_ui__base__switches.h @@ -1,4 +1,4 @@ ---- ui/base/ui_base_switches.h.orig 2023-10-11 18:22:24 UTC +--- ui/base/ui_base_switches.h.orig 2024-08-26 12:06:38 UTC +++ ui/base/ui_base_switches.h @@ -27,11 +27,11 @@ COMPONENT_EXPORT(UI_BASE) extern const char kShowMacOv COMPONENT_EXPORT(UI_BASE) extern const char kEnableResourcesFileSharing[]; @@ -12,5 +12,5 @@ -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) COMPONENT_EXPORT(UI_BASE) extern const char kUiToolkitFlag[]; + COMPONENT_EXPORT(UI_BASE) extern const char kDisableGtkIme[]; #endif - diff --git a/www/chromium/files/patch-ui_base_x_x11__cursor__loader.cc b/www/chromium/files/patch-ui_base_x_x11__cursor__loader.cc index b04170f2b31b..97434c4409db 100644 --- a/www/chromium/files/patch-ui_base_x_x11__cursor__loader.cc +++ b/www/chromium/files/patch-ui_base_x_x11__cursor__loader.cc @@ -1,6 +1,6 @@ ---- ui/base/x/x11_cursor_loader.cc.orig 2024-05-21 18:07:39 UTC +--- ui/base/x/x11_cursor_loader.cc.orig 2024-08-26 12:06:38 UTC +++ ui/base/x/x11_cursor_loader.cc -@@ -33,7 +33,7 @@ +@@ -34,7 +34,7 @@ #include "ui/gfx/x/connection.h" #include "ui/gfx/x/xproto.h" @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #endif -@@ -139,7 +139,11 @@ std::string CursorPathFromLibXcursor() { +@@ -59,7 +59,11 @@ std::string CursorPathFromLibXcursor() { void operator()(void* ptr) const { dlclose(ptr); } }; @@ -21,7 +21,7 @@ if (!lib) return ""; -@@ -250,7 +254,7 @@ scoped_refptr<base::RefCountedMemory> ReadCursorFile( +@@ -170,7 +174,7 @@ scoped_refptr<base::RefCountedMemory> ReadCursorFile( const std::string& rm_xcursor_theme) { constexpr const char kDefaultTheme[] = "default"; std::string themes[] = { @@ -30,7 +30,7 @@ // The toolkit theme has the highest priority. LinuxUi::instance() ? LinuxUi::instance()->GetCursorThemeName() : std::string(), -@@ -442,7 +446,7 @@ uint32_t XCursorLoader::GetPreferredCursorSize() const +@@ -359,7 +363,7 @@ uint32_t XCursorLoader::GetPreferredCursorSize() const return size; } diff --git a/www/chromium/files/patch-ui_base_x_x11__display__util.cc b/www/chromium/files/patch-ui_base_x_x11__display__util.cc deleted file mode 100644 index 7a9b2a253de9..000000000000 --- a/www/chromium/files/patch-ui_base_x_x11__display__util.cc +++ /dev/null @@ -1,365 +0,0 @@ ---- ui/base/x/x11_display_util.cc.orig 2024-06-17 12:56:06 UTC -+++ ui/base/x/x11_display_util.cc -@@ -14,7 +14,6 @@ - - #include "base/bits.h" - #include "base/command_line.h" --#include "base/containers/flat_map.h" - #include "base/logging.h" - #include "base/numerics/clamped_math.h" - #include "base/ranges/algorithm.h" -@@ -28,7 +27,6 @@ - #include "ui/gfx/geometry/rect.h" - #include "ui/gfx/geometry/rect_conversions.h" - #include "ui/gfx/geometry/rect_f.h" --#include "ui/gfx/switches.h" - #include "ui/gfx/x/atom_cache.h" - #include "ui/gfx/x/connection.h" - #include "ui/gfx/x/randr.h" -@@ -43,89 +41,42 @@ constexpr std::pair<uint32_t, uint32_t> kMinVersionXra - - constexpr const char kRandrEdidProperty[] = "EDID"; - --std::map<x11::RandR::Output, size_t> GetMonitors( -- const x11::Response<x11::RandR::GetMonitorsReply>& reply) { -- std::map<x11::RandR::Output, size_t> output_to_monitor; -- if (!reply) { -- return output_to_monitor; -- } -- for (size_t monitor = 0; monitor < reply->monitors.size(); monitor++) { -- for (x11::RandR::Output output : reply->monitors[monitor].outputs) { -- output_to_monitor[output] = monitor; -+std::map<x11::RandR::Output, int> GetMonitors( -+ std::pair<uint32_t, uint32_t> version, -+ x11::RandR* randr, -+ x11::Window window) { -+ std::map<x11::RandR::Output, int> output_to_monitor; -+ if (version >= std::pair<uint32_t, uint32_t>{1, 5}) { -+ if (auto reply = randr->GetMonitors({window}).Sync()) { -+ for (size_t monitor = 0; monitor < reply->monitors.size(); monitor++) { -+ for (x11::RandR::Output output : reply->monitors[monitor].outputs) { -+ output_to_monitor[output] = monitor; -+ } -+ } - } - } - return output_to_monitor; - } - --x11::Future<x11::GetPropertyReply> GetWorkAreaFuture( -- x11::Connection* connection) { -- return connection->GetProperty({ -- .window = connection->default_root(), -- .property = connection->GetAtom("_NET_WORKAREA"), -- .long_length = 4, -- }); --} -- --gfx::Rect GetWorkAreaSync(x11::Future<x11::GetPropertyReply> future) { -- auto response = future.Sync(); -- if (!response || response->format != 32 || response->value_len != 4) { -- return gfx::Rect(); -- } -- const uint32_t* value = response->value->cast_to<uint32_t>(); -- return gfx::Rect(value[0], value[1], value[2], value[3]); --} -- --x11::Future<x11::GetPropertyReply> GetIccProfileFuture( -- x11::Connection* connection, -- size_t monitor) { -- std::string atom_name = monitor == 0 -- ? "_ICC_PROFILE" -- : base::StringPrintf("_ICC_PROFILE_%zu", monitor); -- auto future = connection->GetProperty({ -- .window = connection->default_root(), -- .property = x11::GetAtom(atom_name.c_str()), -- .long_length = std::numeric_limits<uint32_t>::max(), -- }); -- future.IgnoreError(); -- return future; --} -- --gfx::ICCProfile GetIccProfileSync(x11::Future<x11::GetPropertyReply> future) { -- auto response = future.Sync(); -- if (!response || !response->value_len) { -- return gfx::ICCProfile(); -- } -- return gfx::ICCProfile::FromData(response->value->bytes(), -- response->value_len * response->format / 8u); --} -- --x11::Future<x11::RandR::GetOutputPropertyReply> GetEdidFuture( -- x11::Connection* connection, -- x11::RandR::Output output) { -- auto future = connection->randr().GetOutputProperty({ -- .output = output, -- .property = x11::GetAtom(kRandrEdidProperty), -- .long_length = 128, -- }); -- future.IgnoreError(); -- return future; --} -- - // Sets the work area on a list of displays. The work area for each display - // must already be initialized to the display bounds. At most one display out - // of |displays| will be affected. - void ClipWorkArea(std::vector<display::Display>* displays, -- size_t primary_display_index, -- const gfx::Rect& net_workarea) { -- if (net_workarea.IsEmpty()) { -+ size_t primary_display_index) { -+ x11::Window x_root_window = ui::GetX11RootWindow(); -+ -+ std::vector<int32_t> value; -+ if (!x11::Connection::Get()->GetArrayProperty( -+ x_root_window, x11::GetAtom("_NET_WORKAREA"), &value) || -+ value.size() < 4) { - return; - } -- - auto get_work_area = [&](const display::Display& display) { - float scale = display::Display::HasForceDeviceScaleFactor() - ? display::Display::GetForcedDeviceScaleFactor() - : display.device_scale_factor(); -- return gfx::ScaleToEnclosingRect(net_workarea, 1.0f / scale); -+ return gfx::ScaleToEnclosingRect( -+ gfx::Rect(value[0], value[1], value[2], value[3]), 1.0f / scale); - }; - - // If the work area entirely contains exactly one display, assume it's meant -@@ -207,9 +158,14 @@ int DefaultBitsPerComponent() { - return visual.bits_per_rgb_value; - } - --// Get the EDID data from the `output` and stores to `edid`. --std::vector<uint8_t> GetEdidProperty( -- x11::Response<x11::RandR::GetOutputPropertyReply> response) { -+// Get the EDID data from the |output| and stores to |edid|. -+std::vector<uint8_t> GetEDIDProperty(x11::RandR* randr, -+ x11::RandR::Output output) { -+ auto future = randr->GetOutputProperty(x11::RandR::GetOutputPropertyRequest{ -+ .output = output, -+ .property = x11::GetAtom(kRandrEdidProperty), -+ .long_length = 128}); -+ auto response = future.Sync(); - std::vector<uint8_t> edid; - if (response && response->format == 8 && response->type != x11::Atom::None) { - edid = std::move(response->data); -@@ -261,8 +217,7 @@ gfx::PointF DisplayOriginPxToDip(const display::Displa - std::vector<display::Display> GetFallbackDisplayList( - float scale, - size_t* primary_display_index_out) { -- auto* connection = x11::Connection::Get(); -- const auto& screen = connection->default_screen(); -+ const auto& screen = x11::Connection::Get()->default_screen(); - gfx::Size physical_size(screen.width_in_millimeters, - screen.height_in_millimeters); - -@@ -289,9 +244,7 @@ std::vector<display::Display> GetFallbackDisplayList( - std::vector<display::Display> displays{gfx_display}; - *primary_display_index_out = 0; - -- ClipWorkArea(&displays, *primary_display_index_out, -- GetWorkAreaSync(GetWorkAreaFuture(connection))); -- -+ ClipWorkArea(&displays, *primary_display_index_out); - return displays; - } - -@@ -307,16 +260,7 @@ std::vector<display::Display> BuildDisplaysFromXRandRI - auto x_root_window = ui::GetX11RootWindow(); - std::vector<display::Display> displays; - -- auto resources_future = randr.GetScreenResourcesCurrent({x_root_window}); -- auto output_primary_future = randr.GetOutputPrimary({x_root_window}); -- x11::Future<x11::RandR::GetMonitorsReply> monitors_future; -- if (connection->randr_version() >= std::pair<uint32_t, uint32_t>{1, 5}) { -- monitors_future = randr.GetMonitors(x_root_window); -- } -- auto work_area_future = GetWorkAreaFuture(connection); -- connection->Flush(); -- -- auto resources = resources_future.Sync(); -+ auto resources = randr.GetScreenResourcesCurrent({x_root_window}).Sync(); - if (!resources) { - LOG(ERROR) << "XRandR returned no displays; falling back to root window"; - return GetFallbackDisplayList(primary_scale, primary_display_index_out); -@@ -325,65 +269,21 @@ std::vector<display::Display> BuildDisplaysFromXRandRI - const int depth = connection->default_screen().root_depth; - const int bits_per_component = DefaultBitsPerComponent(); - -- auto output_primary = output_primary_future.Sync(); -+ std::map<x11::RandR::Output, int> output_to_monitor = -+ GetMonitors(connection->randr_version(), &randr, x_root_window); -+ auto output_primary = randr.GetOutputPrimary({x_root_window}).Sync(); - if (!output_primary) { - return GetFallbackDisplayList(primary_scale, primary_display_index_out); - } - x11::RandR::Output primary_display_id = output_primary->output; - -- const auto monitors_reply = monitors_future.Sync(); -- const auto output_to_monitor = GetMonitors(monitors_reply); -- const size_t n_iccs = -- monitors_reply ? std::max<size_t>(1, monitors_reply->monitors.size()) : 1; -- - int explicit_primary_display_index = -1; - int monitor_order_primary_display_index = -1; - -- std::vector<x11::Future<x11::RandR::GetCrtcInfoReply>> crtc_futures{}; -- crtc_futures.reserve(resources->crtcs.size()); -- for (auto crtc : resources->crtcs) { -- crtc_futures.push_back( -- randr.GetCrtcInfo({crtc, resources->config_timestamp})); -- } -- connection->Flush(); -- -- std::vector<x11::Future<x11::GetPropertyReply>> icc_futures{n_iccs}; -- if (!base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kHeadless)) { -- for (size_t monitor = 0; monitor < n_iccs; ++monitor) { -- icc_futures[monitor] = GetIccProfileFuture(connection, monitor); -- } -- connection->Flush(); -- } -- -- std::vector<x11::Future<x11::RandR::GetOutputInfoReply>> output_futures{}; -- output_futures.reserve(resources->outputs.size()); -- for (auto output : resources->outputs) { -- output_futures.push_back( -- randr.GetOutputInfo({output, resources->config_timestamp})); -- } -- connection->Flush(); -- -- std::vector<x11::Future<x11::RandR::GetOutputPropertyReply>> edid_futures{}; -- edid_futures.reserve(resources->outputs.size()); -- for (auto output : resources->outputs) { -- edid_futures.push_back(GetEdidFuture(connection, output)); -- } -- connection->Flush(); -- -- base::flat_map<x11::RandR::Crtc, x11::RandR::GetCrtcInfoResponse> crtcs; -- for (size_t i = 0; i < resources->crtcs.size(); ++i) { -- crtcs.emplace(resources->crtcs[i], crtc_futures[i].Sync()); -- } -- -- std::vector<gfx::ICCProfile> iccs; -- iccs.reserve(n_iccs); -- for (auto& future : icc_futures) { -- iccs.push_back(GetIccProfileSync(std::move(future))); -- } -- - for (size_t i = 0; i < resources->outputs.size(); i++) { - x11::RandR::Output output_id = resources->outputs[i]; -- auto output_info = output_futures[i].Sync(); -+ auto output_info = -+ randr.GetOutputInfo({output_id, resources->config_timestamp}).Sync(); - if (!output_info) { - continue; - } -@@ -398,16 +298,15 @@ std::vector<display::Display> BuildDisplaysFromXRandRI - continue; - } - -- auto crtc_it = crtcs.find(output_info->crtc); -- if (crtc_it == crtcs.end()) { -- continue; -- } -- const auto& crtc = crtc_it->second; -+ auto crtc = -+ randr.GetCrtcInfo({output_info->crtc, resources->config_timestamp}) -+ .Sync(); - if (!crtc) { - continue; - } - -- display::EdidParser edid_parser(GetEdidProperty(edid_futures[i].Sync())); -+ display::EdidParser edid_parser( -+ GetEDIDProperty(&randr, static_cast<x11::RandR::Output>(output_id))); - auto output_32 = static_cast<uint32_t>(output_id); - int64_t display_id = - output_32 > 0xff ? 0 : edid_parser.GetIndexBasedDisplayId(output_32); -@@ -462,9 +361,8 @@ std::vector<display::Display> BuildDisplaysFromXRandRI - } - - if (!display::HasForceDisplayColorProfile()) { -- const size_t monitor = -- monitor_iter == output_to_monitor.end() ? 0 : monitor_iter->second; -- const auto& icc_profile = iccs[monitor < iccs.size() ? monitor : 0]; -+ gfx::ICCProfile icc_profile = ui::GetICCProfileForMonitor( -+ monitor_iter == output_to_monitor.end() ? 0 : monitor_iter->second); - gfx::ColorSpace color_space = icc_profile.GetPrimariesOnlyColorSpace(); - - // Most folks do not have an ICC profile set up, but we still want to -@@ -509,24 +407,63 @@ std::vector<display::Display> BuildDisplaysFromXRandRI - ConvertDisplayBoundsToDips(&displays, *primary_display_index_out); - } - -- ClipWorkArea(&displays, *primary_display_index_out, -- GetWorkAreaSync(std::move(work_area_future))); -+ ClipWorkArea(&displays, *primary_display_index_out); - return displays; - } - - base::TimeDelta GetPrimaryDisplayRefreshIntervalFromXrandr() { - constexpr base::TimeDelta kDefaultInterval = base::Seconds(1. / 60); -- -- size_t primary_display_index = 0; -- auto displays = BuildDisplaysFromXRandRInfo(display::DisplayConfig(), -- &primary_display_index); -- CHECK_LT(primary_display_index, displays.size()); -- -+ x11::RandR randr = x11::Connection::Get()->randr(); -+ auto root = ui::GetX11RootWindow(); -+ auto resources = randr.GetScreenResourcesCurrent({root}).Sync(); -+ if (!resources) { -+ return kDefaultInterval; -+ } - // TODO(crbug.com/41321728): It might make sense here to pick the output that - // the window is on. On the other hand, if compositing is enabled, all drawing - // might be synced to the primary output anyway. Needs investigation. -- auto frequency = displays[primary_display_index].display_frequency(); -- return frequency > 0 ? base::Seconds(1. / frequency) : kDefaultInterval; -+ auto output_primary = randr.GetOutputPrimary({root}).Sync(); -+ if (!output_primary) { -+ return kDefaultInterval; -+ } -+ x11::RandR::Output primary_output = output_primary->output; -+ bool disconnected_primary = false; -+ for (size_t i = 0; i < resources->outputs.size(); i++) { -+ if (!disconnected_primary && resources->outputs[i] != primary_output) { -+ continue; -+ } -+ -+ auto output_info = -+ randr.GetOutputInfo({primary_output, resources->config_timestamp}) -+ .Sync(); -+ if (!output_info) { -+ continue; -+ } -+ -+ if (output_info->connection != x11::RandR::RandRConnection::Connected) { -+ // If the primary monitor is disconnected, then start over and choose the -+ // first connected monitor instead. -+ if (!disconnected_primary) { -+ disconnected_primary = true; -+ i = -1; -+ } -+ continue; -+ } -+ auto crtc = -+ randr.GetCrtcInfo({output_info->crtc, resources->config_timestamp}) -+ .Sync(); -+ if (!crtc) { -+ continue; -+ } -+ float refresh_rate = -+ GetRefreshRateFromXRRModeInfo(resources->modes, crtc->mode); -+ if (refresh_rate == 0) { -+ continue; -+ } -+ -+ return base::Seconds(1. / refresh_rate); -+ } -+ return kDefaultInterval; - } - - int RangeDistance(int min1, int max1, int min2, int max2) { diff --git a/www/chromium/files/patch-ui_base_x_x11__util.cc b/www/chromium/files/patch-ui_base_x_x11__util.cc deleted file mode 100644 index 318730922727..000000000000 --- a/www/chromium/files/patch-ui_base_x_x11__util.cc +++ /dev/null @@ -1,23 +0,0 @@ ---- ui/base/x/x11_util.cc.orig 2024-06-17 12:56:06 UTC -+++ ui/base/x/x11_util.cc -@@ -703,4 +703,20 @@ gfx::ImageSkia GetNativeWindowIcon(intptr_t target_win - return gfx::ImageSkia::CreateFrom1xBitmap(result); - } - -+gfx::ICCProfile GetICCProfileForMonitor(int monitor) { -+ gfx::ICCProfile icc_profile; -+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kHeadless)) { -+ return icc_profile; -+ } -+ std::string atom_name = monitor == 0 -+ ? "_ICC_PROFILE" -+ : base::StringPrintf("_ICC_PROFILE_%d", monitor); -+ scoped_refptr<base::RefCountedMemory> data; -+ if (GetRawBytesOfProperty(GetX11RootWindow(), x11::GetAtom(atom_name.c_str()), -+ &data, nullptr)) { -+ icc_profile = gfx::ICCProfile::FromData(data->data(), data->size()); -+ } -+ return icc_profile; -+} -+ - } // namespace ui diff --git a/www/chromium/files/patch-ui_base_x_x11__util.h b/www/chromium/files/patch-ui_base_x_x11__util.h deleted file mode 100644 index 4431a90d1676..000000000000 --- a/www/chromium/files/patch-ui_base_x_x11__util.h +++ /dev/null @@ -1,13 +0,0 @@ ---- ui/base/x/x11_util.h.orig 2024-02-23 21:04:38 UTC -+++ ui/base/x/x11_util.h -@@ -256,6 +256,10 @@ COMPONENT_EXPORT(UI_BASE_X) bool IsVulkanSurfaceSuppor - COMPONENT_EXPORT(UI_BASE_X) - gfx::ImageSkia GetNativeWindowIcon(intptr_t target_window_id); - -+// Returns the ICCProfile corresponding to |monitor| using XGetWindowProperty. -+COMPONENT_EXPORT(UI_BASE_X) -+gfx::ICCProfile GetICCProfileForMonitor(int monitor); -+ - } // namespace ui - - #endif // UI_BASE_X_X11_UTIL_H_ diff --git a/www/chromium/files/patch-ui_color_color__id.h b/www/chromium/files/patch-ui_color_color__id.h index d396eb3d10b6..9d6a661787ad 100644 --- a/www/chromium/files/patch-ui_color_color__id.h +++ b/www/chromium/files/patch-ui_color_color__id.h @@ -1,6 +1,6 @@ ---- ui/color/color_id.h.orig 2024-07-30 11:12:21 UTC +--- ui/color/color_id.h.orig 2024-08-26 12:06:38 UTC +++ ui/color/color_id.h -@@ -624,7 +624,7 @@ +@@ -621,7 +621,7 @@ \ E_CPONLY(kColorCrosSysPositive) \ E_CPONLY(kColorCrosSysComplementVariant) diff --git a/www/chromium/files/patch-ui_color_color__provider__utils.cc b/www/chromium/files/patch-ui_color_color__provider__utils.cc index 0fac26f5fa15..4d9e68fa1fda 100644 --- a/www/chromium/files/patch-ui_color_color__provider__utils.cc +++ b/www/chromium/files/patch-ui_color_color__provider__utils.cc @@ -1,6 +1,6 @@ ---- ui/color/color_provider_utils.cc.orig 2024-06-17 12:56:06 UTC +--- ui/color/color_provider_utils.cc.orig 2024-08-26 12:06:38 UTC +++ ui/color/color_provider_utils.cc -@@ -186,7 +186,7 @@ std::string_view SystemThemeName(ui::SystemTheme syste +@@ -187,7 +187,7 @@ std::string_view SystemThemeName(ui::SystemTheme syste switch (system_theme) { case ui::SystemTheme::kDefault: return "kDefault"; diff --git a/www/chromium/files/patch-ui_compositor_compositor.cc b/www/chromium/files/patch-ui_compositor_compositor.cc index afd7aff75f13..75eafa390a5e 100644 --- a/www/chromium/files/patch-ui_compositor_compositor.cc +++ b/www/chromium/files/patch-ui_compositor_compositor.cc @@ -1,6 +1,6 @@ ---- ui/compositor/compositor.cc.orig 2024-05-21 18:07:39 UTC +--- ui/compositor/compositor.cc.orig 2024-08-26 12:06:38 UTC +++ ui/compositor/compositor.cc -@@ -922,7 +922,7 @@ void Compositor::OnResume() { +@@ -923,7 +923,7 @@ void Compositor::OnResume() { obs.ResetIfActive(); } diff --git a/www/chromium/files/patch-ui_events_event.cc b/www/chromium/files/patch-ui_events_event.cc index ef707428af2d..e54a3fc0da2e 100644 --- a/www/chromium/files/patch-ui_events_event.cc +++ b/www/chromium/files/patch-ui_events_event.cc @@ -1,6 +1,6 @@ ---- ui/events/event.cc.orig 2024-03-22 08:19:40 UTC +--- ui/events/event.cc.orig 2024-08-26 12:06:38 UTC +++ ui/events/event.cc -@@ -438,7 +438,7 @@ std::string LocatedEvent::ToString() const { +@@ -365,7 +365,7 @@ std::string LocatedEvent::ToString() const { MouseEvent::MouseEvent(const PlatformEvent& native_event) : LocatedEvent(native_event), changed_button_flags_(GetChangedMouseButtonFlagsFromNative(native_event)), @@ -9,7 +9,7 @@ movement_(GetMouseMovementFromNative(native_event)), #endif pointer_details_(GetMousePointerDetailsFromNative(native_event)) { -@@ -688,7 +688,7 @@ std::unique_ptr<Event> MouseWheelEvent::Clone() const +@@ -621,7 +621,7 @@ std::unique_ptr<Event> MouseWheelEvent::Clone() const return std::make_unique<MouseWheelEvent>(*this); } @@ -18,7 +18,7 @@ // This value matches Windows, Fuchsia WHEEL_DELTA, and (roughly) Firefox on // Linux. // static -@@ -948,7 +948,7 @@ void KeyEvent::InitializeNative() { +@@ -881,7 +881,7 @@ void KeyEvent::InitializeNative() { if (synthesize_key_repeat_enabled_ && IsRepeated(GetLastKeyEvent())) SetFlags(flags() | EF_IS_REPEAT); diff --git a/www/chromium/files/patch-ui_gfx_BUILD.gn b/www/chromium/files/patch-ui_gfx_BUILD.gn index 122f1a316587..652f2937be6b 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-05-21 18:07:39 UTC +--- ui/gfx/BUILD.gn.orig 2024-08-26 12:06:38 UTC +++ ui/gfx/BUILD.gn -@@ -663,7 +663,7 @@ source_set("memory_buffer_sources") { +@@ -664,7 +664,7 @@ source_set("memory_buffer_sources") { deps += [ "//build/config/linux/libdrm" ] } diff --git a/www/chromium/files/patch-ui_gfx_native__widget__types.h b/www/chromium/files/patch-ui_gfx_native__widget__types.h index 08b0423d57c3..8c733e6509da 100644 --- a/www/chromium/files/patch-ui_gfx_native__widget__types.h +++ b/www/chromium/files/patch-ui_gfx_native__widget__types.h @@ -1,4 +1,4 @@ ---- ui/gfx/native_widget_types.h.orig 2024-06-17 12:56:06 UTC +--- ui/gfx/native_widget_types.h.orig 2024-08-26 12:06:38 UTC +++ ui/gfx/native_widget_types.h @@ -104,7 +104,7 @@ class SkBitmap; @@ -9,7 +9,7 @@ extern "C" { struct _AtkObject; using AtkObject = struct _AtkObject; -@@ -220,7 +220,7 @@ using NativeViewAccessible = struct objc_object*; +@@ -219,7 +219,7 @@ using NativeViewAccessible = struct objc_object*; #endif // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-ui_gfx_platform__font__skia.cc b/www/chromium/files/patch-ui_gfx_platform__font__skia.cc index c7045886788e..1d867ecf3822 100644 --- a/www/chromium/files/patch-ui_gfx_platform__font__skia.cc +++ b/www/chromium/files/patch-ui_gfx_platform__font__skia.cc @@ -1,6 +1,6 @@ ---- ui/gfx/platform_font_skia.cc.orig 2024-03-22 08:19:40 UTC +--- ui/gfx/platform_font_skia.cc.orig 2024-08-26 12:06:38 UTC +++ ui/gfx/platform_font_skia.cc -@@ -30,7 +30,7 @@ +@@ -29,7 +29,7 @@ #include "ui/gfx/system_fonts_win.h" #endif @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #endif -@@ -168,7 +168,7 @@ void PlatformFontSkia::EnsuresDefaultFontIsInitialized +@@ -167,7 +167,7 @@ void PlatformFontSkia::EnsuresDefaultFontIsInitialized weight = system_font.GetWeight(); #endif // BUILDFLAG(IS_WIN) diff --git a/www/chromium/files/patch-ui_gl_BUILD.gn b/www/chromium/files/patch-ui_gl_BUILD.gn index 8de15efce1d9..9b4c81eccd06 100644 --- a/www/chromium/files/patch-ui_gl_BUILD.gn +++ b/www/chromium/files/patch-ui_gl_BUILD.gn @@ -1,15 +1,15 @@ ---- ui/gl/BUILD.gn.orig 2024-07-30 11:12:21 UTC +--- ui/gl/BUILD.gn.orig 2024-08-26 12:06:38 UTC +++ ui/gl/BUILD.gn -@@ -153,8 +153,6 @@ component("gl") { +@@ -149,8 +149,6 @@ component("gl") { defines += [ "GPU_ENABLE_SERVICE_LOGGING" ] } - include_dirs = [ "//third_party/mesa_headers" ] - - all_dependent_configs = [ ":gl_config" ] - public_configs = [ "//third_party/khronos:khronos_headers" ] -@@ -171,7 +169,6 @@ component("gl") { + + deps = [ +@@ -165,7 +163,6 @@ component("gl") { ] public_deps = [ "//base", @@ -17,7 +17,7 @@ "//ui/events/platform", "//ui/gfx", "//ui/gfx/geometry", -@@ -374,7 +371,6 @@ component("gl") { +@@ -313,7 +310,6 @@ component("gl") { data_deps += [ "//third_party/angle:libEGL", "//third_party/angle:libGLESv2", @@ -25,7 +25,7 @@ ] if (enable_swiftshader) { data_deps += [ -@@ -573,7 +569,6 @@ test("gl_unittests") { +@@ -538,7 +534,6 @@ test("gl_unittests") { data_deps = [ "//testing/buildbot/filters:gl_unittests_filters", diff --git a/www/chromium/files/patch-ui_gl_gl__bindings.h b/www/chromium/files/patch-ui_gl_gl__bindings.h deleted file mode 100644 index f6a7c31765dd..000000000000 --- a/www/chromium/files/patch-ui_gl_gl__bindings.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ui/gl/gl_bindings.h.orig 2023-04-28 17:01:32 UTC -+++ ui/gl/gl_bindings.h -@@ -36,7 +36,7 @@ - #include <GL/wglext.h> - #elif BUILDFLAG(IS_MAC) - #include <OpenGL/OpenGL.h> --#elif BUILDFLAG(IS_LINUX) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - using Display = struct _XDisplay; - using Bool = int; - using Status = int; diff --git a/www/chromium/files/patch-ui_gl_gl__context.cc b/www/chromium/files/patch-ui_gl_gl__context.cc index d1fae4e0a158..6c4a32c74541 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-02-23 21:04:38 UTC +--- ui/gl/gl_context.cc.orig 2024-08-26 12:06:38 UTC +++ ui/gl/gl_context.cc -@@ -472,7 +472,7 @@ bool GLContext::MakeVirtuallyCurrent( +@@ -509,7 +509,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_gl_gl__fence.cc b/www/chromium/files/patch-ui_gl_gl__fence.cc index eb38444ceeaf..60d5026e8ff7 100644 --- a/www/chromium/files/patch-ui_gl_gl__fence.cc +++ b/www/chromium/files/patch-ui_gl_gl__fence.cc @@ -1,9 +1,9 @@ ---- ui/gl/gl_fence.cc.orig 2023-09-13 12:11:42 UTC +--- ui/gl/gl_fence.cc.orig 2024-08-26 12:06:38 UTC +++ ui/gl/gl_fence.cc -@@ -20,7 +20,7 @@ - #endif +@@ -17,7 +17,7 @@ + #include "ui/gl/gl_surface_egl.h" + #include "ui/gl/gl_version_info.h" - #if defined(USE_EGL) -#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #define USE_GL_FENCE_ANDROID_NATIVE_FENCE_SYNC diff --git a/www/chromium/files/patch-ui_gl_gl__implementation.cc b/www/chromium/files/patch-ui_gl_gl__implementation.cc index 44e3de7cf762..09eeb514b618 100644 --- a/www/chromium/files/patch-ui_gl_gl__implementation.cc +++ b/www/chromium/files/patch-ui_gl_gl__implementation.cc @@ -1,6 +1,6 @@ ---- ui/gl/gl_implementation.cc.orig 2024-07-30 11:12:21 UTC +--- ui/gl/gl_implementation.cc.orig 2024-08-26 12:06:38 UTC +++ ui/gl/gl_implementation.cc -@@ -272,7 +272,7 @@ GetRequestedGLImplementationFromCommandLine( +@@ -254,7 +254,7 @@ GetRequestedGLImplementationFromCommandLine( *fallback_to_software_gl = false; bool overrideUseSoftwareGL = command_line->HasSwitch(switches::kOverrideUseSoftwareGLForTests); diff --git a/www/chromium/files/patch-ui_gtk_printing_print__dialog__gtk.cc b/www/chromium/files/patch-ui_gtk_printing_print__dialog__gtk.cc index b592fc8a2d7c..a9eb2bce321c 100644 --- a/www/chromium/files/patch-ui_gtk_printing_print__dialog__gtk.cc +++ b/www/chromium/files/patch-ui_gtk_printing_print__dialog__gtk.cc @@ -1,4 +1,4 @@ ---- ui/gtk/printing/print_dialog_gtk.cc.orig 2024-06-17 12:56:06 UTC +--- ui/gtk/printing/print_dialog_gtk.cc.orig 2024-08-26 12:06:38 UTC +++ ui/gtk/printing/print_dialog_gtk.cc @@ -434,7 +434,7 @@ void PrintDialogGtk::ShowDialog( GtkPrintCapabilities cap = static_cast<GtkPrintCapabilities>( @@ -6,6 +6,6 @@ GTK_PRINT_CAPABILITY_COPIES | GTK_PRINT_CAPABILITY_COLLATE | - GTK_PRINT_CAPABILITY_REVERSE); + GTK_PRINT_CAPABILITY_REVERSE | GTK_PRINT_CAPABILITY_GENERATE_PS); - gtk_print_unix_dialog_set_manual_capabilities(GTK_PRINT_UNIX_DIALOG(dialog_), - cap); - gtk_print_unix_dialog_set_embed_page_setup(GTK_PRINT_UNIX_DIALOG(dialog_), + gtk_print_unix_dialog_set_manual_capabilities( + GTK_PRINT_UNIX_DIALOG(dialog_.get()), cap); + gtk_print_unix_dialog_set_embed_page_setup( diff --git a/www/chromium/files/patch-ui_native__theme_native__theme.h b/www/chromium/files/patch-ui_native__theme_native__theme.h index c53024c98c52..e8aa8eccfbcb 100644 --- a/www/chromium/files/patch-ui_native__theme_native__theme.h +++ b/www/chromium/files/patch-ui_native__theme_native__theme.h @@ -1,6 +1,6 @@ ---- ui/native_theme/native_theme.h.orig 2024-06-17 12:56:06 UTC +--- ui/native_theme/native_theme.h.orig 2024-08-26 12:06:38 UTC +++ ui/native_theme/native_theme.h -@@ -62,7 +62,7 @@ class NATIVE_THEME_EXPORT NativeTheme { +@@ -63,7 +63,7 @@ class NATIVE_THEME_EXPORT NativeTheme { kCheckbox, // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-ui_ozone_platform_headless_headless__surface__factory.cc b/www/chromium/files/patch-ui_ozone_platform_headless_headless__surface__factory.cc index a14d129acee8..51088d3f3307 100644 --- a/www/chromium/files/patch-ui_ozone_platform_headless_headless__surface__factory.cc +++ b/www/chromium/files/patch-ui_ozone_platform_headless_headless__surface__factory.cc @@ -1,4 +1,4 @@ ---- ui/ozone/platform/headless/headless_surface_factory.cc.orig 2023-03-09 06:31:50 UTC +--- ui/ozone/platform/headless/headless_surface_factory.cc.orig 2024-08-26 12:06:38 UTC +++ ui/ozone/platform/headless/headless_surface_factory.cc @@ -34,7 +34,7 @@ #include "ui/ozone/platform/headless/headless_window_manager.h" @@ -9,7 +9,7 @@ #include "ui/ozone/platform/headless/vulkan_implementation_headless.h" #endif -@@ -281,7 +281,7 @@ std::unique_ptr<gpu::VulkanImplementation> +@@ -280,7 +280,7 @@ std::unique_ptr<gpu::VulkanImplementation> HeadlessSurfaceFactory::CreateVulkanImplementation( bool use_swiftshader, bool allow_protected_memory) { 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 5eefb0c19621..62aa414ce894 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-07-30 11:12:21 UTC +--- ui/ozone/platform/wayland/host/wayland_toplevel_window.cc.orig 2024-08-26 12:06:38 UTC +++ ui/ozone/platform/wayland/host/wayland_toplevel_window.cc -@@ -604,7 +604,7 @@ void WaylandToplevelWindow::HandleAuraToplevelConfigur +@@ -620,7 +620,7 @@ void WaylandToplevelWindow::HandleAuraToplevelConfigur 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 c416fc15d55a..79fe7d2a7b57 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-07-30 11:12:21 UTC +--- ui/ozone/platform/wayland/host/wayland_toplevel_window.h.orig 2024-08-26 12:06:38 UTC +++ ui/ozone/platform/wayland/host/wayland_toplevel_window.h -@@ -258,7 +258,7 @@ class WaylandToplevelWindow : public WaylandWindow, +@@ -259,7 +259,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 06e5df419908..f2f1756b0a97 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,15 +1,15 @@ ---- ui/ozone/platform/wayland/host/wayland_window.cc.orig 2024-07-30 11:12:21 UTC +--- ui/ozone/platform/wayland/host/wayland_window.cc.orig 2024-08-26 12:06:38 UTC +++ ui/ozone/platform/wayland/host/wayland_window.cc -@@ -295,7 +295,7 @@ void WaylandWindow::OnPointerFocusChanged(bool focused +@@ -317,7 +317,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. -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (focused && async_cursor_) { - async_cursor_->AddCursorLoadedCallback( - base::BindOnce(&WaylandWindow::OnCursorLoaded, -@@ -554,7 +554,7 @@ bool WaylandWindow::ShouldUseNativeFrame() const { + async_cursor_->AddCursorLoadedCallback(base::BindOnce( + &WaylandWindow::OnCursorLoaded, AsWeakPtr(), async_cursor_)); +@@ -575,7 +575,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) { -@@ -766,7 +766,7 @@ std::string WaylandWindow::WindowStates::ToString() co +@@ -786,7 +786,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) { -@@ -1256,12 +1256,12 @@ void WaylandWindow::UpdateCursorShape(scoped_refptr<Bi +@@ -1274,12 +1274,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 d67481dd4990..6e4eb9eab8bb 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-07-30 11:12:21 UTC +--- ui/ozone/platform/wayland/host/wayland_window.h.orig 2024-08-26 12:06:38 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 -@@ -269,7 +269,7 @@ class WaylandWindow : public PlatformWindow, +@@ -283,7 +283,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 -@@ -551,7 +551,7 @@ class WaylandWindow : public PlatformWindow, +@@ -561,7 +561,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 -@@ -620,7 +620,7 @@ class WaylandWindow : public PlatformWindow, +@@ -630,7 +630,7 @@ class WaylandWindow : public PlatformWindow, wl::Object<zaura_surface> aura_surface_; diff --git a/www/chromium/files/patch-ui_ozone_platform_wayland_host_zwp__text__input__wrapper__v1.cc b/www/chromium/files/patch-ui_ozone_platform_wayland_host_zwp__text__input__wrapper__v1.cc index 4790f9616513..efb8aa4abca1 100644 --- a/www/chromium/files/patch-ui_ozone_platform_wayland_host_zwp__text__input__wrapper__v1.cc +++ b/www/chromium/files/patch-ui_ozone_platform_wayland_host_zwp__text__input__wrapper__v1.cc @@ -1,6 +1,6 @@ ---- ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.cc.orig 2024-01-30 07:53:34 UTC +--- ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.cc.orig 2024-08-26 12:06:38 UTC +++ ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.cc -@@ -226,6 +226,10 @@ void ZWPTextInputWrapperV1::SetSurroundingText( +@@ -256,6 +256,10 @@ void ZWPTextInputWrapperV1::SetSurroundingText( // so if it exceeds 16 bits, it may be broken. static constexpr size_t kSizeLimit = 60000; if (HasAdvancedSurroundingTextSupport() && text.length() > kSizeLimit) { @@ -11,7 +11,7 @@ base::ScopedFD memfd(memfd_create("surrounding_text", MFD_CLOEXEC)); if (!memfd.get()) { PLOG(ERROR) << "Failed to create memfd"; -@@ -238,6 +242,7 @@ void ZWPTextInputWrapperV1::SetSurroundingText( +@@ -268,6 +272,7 @@ void ZWPTextInputWrapperV1::SetSurroundingText( zcr_extended_text_input_v1_set_large_surrounding_text( extended_obj_.get(), memfd.get(), text.length(), selection_range.start(), selection_range.end()); 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 d7776fd2d0d4..86847a422c43 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-06-17 12:56:06 UTC +--- ui/ozone/platform/wayland/ozone_platform_wayland.cc.orig 2024-08-26 12:06:38 UTC +++ ui/ozone/platform/wayland/ozone_platform_wayland.cc @@ -66,13 +66,13 @@ #include "ui/events/ozone/layout/stub/stub_keyboard_layout_engine.h" @@ -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 -@@ -536,7 +536,7 @@ class OzonePlatformWayland : public OzonePlatform, +@@ -538,7 +538,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 eb7ada089439..06c0d00c87c2 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-07-30 11:12:21 UTC +--- ui/ozone/platform/x11/x11_window.cc.orig 2024-08-26 12:06:38 UTC +++ ui/ozone/platform/x11/x11_window.cc -@@ -1497,7 +1497,7 @@ void X11Window::OnXWindowStateChanged() { +@@ -1499,7 +1499,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_views_controls_textfield_textfield.cc b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc index faceeb9ca626..3133d3b9f417 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-07-30 11:12:21 UTC +--- ui/views/controls/textfield/textfield.cc.orig 2024-08-26 12:06:38 UTC +++ ui/views/controls/textfield/textfield.cc -@@ -91,7 +91,7 @@ +@@ -85,7 +85,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" -@@ -189,7 +189,7 @@ bool IsControlKeyModifier(int flags) { +@@ -183,7 +183,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; -@@ -747,7 +747,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event +@@ -756,7 +756,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 && -@@ -930,7 +930,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo +@@ -939,7 +939,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; -@@ -1997,7 +1997,7 @@ bool Textfield::ShouldDoLearning() { +@@ -1999,7 +1999,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( -@@ -2501,14 +2501,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( +@@ -2505,14 +2505,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( #endif return ui::TextEditCommand::DELETE_BACKWARD; } diff --git a/www/chromium/files/patch-ui_views_focus_focus__manager.cc b/www/chromium/files/patch-ui_views_focus_focus__manager.cc index 353a480d2c9c..dc14712eff30 100644 --- a/www/chromium/files/patch-ui_views_focus_focus__manager.cc +++ b/www/chromium/files/patch-ui_views_focus_focus__manager.cc @@ -1,6 +1,6 @@ ---- ui/views/focus/focus_manager.cc.orig 2024-06-17 12:56:06 UTC +--- ui/views/focus/focus_manager.cc.orig 2024-08-26 12:06:38 UTC +++ ui/views/focus/focus_manager.cc -@@ -582,7 +582,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi +@@ -585,7 +585,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ // Processing an accelerator can delete things. Because we // need these objects afterwards on Linux, save widget_ as weak pointer and // save the close_on_deactivate property value of widget_delegate in a -@@ -599,7 +599,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi +@@ -602,7 +602,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. 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 f83a01ed1ade..4f442bbc4243 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-07-30 11:12:21 UTC +--- ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc.orig 2024-08-26 12:06:38 UTC +++ ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc -@@ -205,7 +205,7 @@ DragOperation DesktopDragDropClientOzone::StartDragAnd +@@ -197,7 +197,7 @@ DragOperation DesktopDragDropClientOzone::StartDragAnd return selected_operation_; } 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 d11cae31f94a..feeaaa3a2f27 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,4 +1,4 @@ ---- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2024-07-30 11:12:21 UTC +--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2024-08-26 12:06:38 UTC +++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc @@ -48,7 +48,7 @@ #include "ui/wm/core/window_util.h" @@ -18,7 +18,7 @@ std::make_unique<DesktopDragDropClientOzoneLinux>(window(), drag_handler); #else std::make_unique<DesktopDragDropClientOzone>(window(), drag_handler); -@@ -1162,7 +1162,7 @@ bool DesktopWindowTreeHostPlatform::RotateFocusForWidg +@@ -1174,7 +1174,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 51aa7117c617..0ee8c8949fae 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-07-30 11:12:21 UTC +--- ui/views/widget/root_view.cc.orig 2024-08-26 12:06:38 UTC +++ ui/views/widget/root_view.cc -@@ -128,7 +128,7 @@ class AnnounceTextView : public View { +@@ -129,7 +129,7 @@ class AnnounceTextView : public View { #if BUILDFLAG(IS_CHROMEOS) // On ChromeOS, kAlert role can invoke an unnecessary event on reparenting. node_data->role = 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 b26f101703eb..239cbc63f10b 100644 --- a/www/chromium/files/patch-ui_views_widget_widget.cc +++ b/www/chromium/files/patch-ui_views_widget_widget.cc @@ -1,4 +1,4 @@ ---- ui/views/widget/widget.cc.orig 2024-07-30 11:12:21 UTC +--- ui/views/widget/widget.cc.orig 2024-08-26 12:06:38 UTC +++ ui/views/widget/widget.cc @@ -57,7 +57,7 @@ #include "ui/views/window/custom_frame_view.h" @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #endif -@@ -2172,7 +2172,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const +@@ -2182,7 +2182,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const if (parent_) return parent_->GetNativeTheme(); diff --git a/www/chromium/files/patch-ui_views_window_custom__frame__view.cc b/www/chromium/files/patch-ui_views_window_custom__frame__view.cc index b275ec9823e5..8faac42230aa 100644 --- a/www/chromium/files/patch-ui_views_window_custom__frame__view.cc +++ b/www/chromium/files/patch-ui_views_window_custom__frame__view.cc @@ -1,6 +1,6 @@ ---- ui/views/window/custom_frame_view.cc.orig 2024-06-17 12:56:06 UTC +--- ui/views/window/custom_frame_view.cc.orig 2024-08-26 12:06:38 UTC +++ ui/views/window/custom_frame_view.cc -@@ -267,7 +267,7 @@ int CustomFrameView::CaptionButtonY() const { +@@ -268,7 +268,7 @@ int CustomFrameView::CaptionButtonY() const { // drawn flush with the screen edge, they still obey Fitts' Law. // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-ui_views_window_dialog__delegate.cc b/www/chromium/files/patch-ui_views_window_dialog__delegate.cc index 6e297b156d24..c3857710b494 100644 --- a/www/chromium/files/patch-ui_views_window_dialog__delegate.cc +++ b/www/chromium/files/patch-ui_views_window_dialog__delegate.cc @@ -1,6 +1,6 @@ ---- ui/views/window/dialog_delegate.cc.orig 2024-07-30 11:12:21 UTC +--- ui/views/window/dialog_delegate.cc.orig 2024-08-26 12:06:38 UTC +++ ui/views/window/dialog_delegate.cc -@@ -109,7 +109,7 @@ Widget* DialogDelegate::CreateDialogWidget( +@@ -103,7 +103,7 @@ Widget* DialogDelegate::CreateDialogWidget( // static bool DialogDelegate::CanSupportCustomFrame(gfx::NativeView parent) { diff --git a/www/chromium/files/patch-v8_BUILD.gn b/www/chromium/files/patch-v8_BUILD.gn index 46ac4dc371b9..b7afbf721854 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-07-30 11:12:21 UTC +--- v8/BUILD.gn.orig 2024-08-26 12:06:38 UTC +++ v8/BUILD.gn -@@ -876,6 +876,8 @@ external_v8_defines = [ +@@ -896,6 +896,8 @@ external_v8_defines = [ "V8_TARGET_OS_MACOS", "V8_TARGET_OS_WIN", "V8_TARGET_OS_CHROMEOS", @@ -8,8 +8,8 @@ + "V8_TARGET_OS_FREEBSD", ] - enabled_external_v8_defines = [] -@@ -948,6 +950,12 @@ if (target_os == "android") { + enabled_external_v8_defines = [ +@@ -972,6 +974,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 -@@ -2442,6 +2450,12 @@ template("run_mksnapshot") { +@@ -2477,6 +2485,12 @@ template("run_mksnapshot") { if (!v8_enable_builtins_profiling && v8_enable_builtins_reordering) { args += [ "--reorder-builtins" ] } @@ -35,7 +35,7 @@ } # This is needed to distinguish between generating code for the simulator -@@ -6490,7 +6504,7 @@ v8_component("v8_libbase") { +@@ -6559,7 +6573,7 @@ v8_component("v8_libbase") { } } @@ -44,7 +44,7 @@ sources += [ "src/base/debug/stack_trace_posix.cc", "src/base/platform/platform-linux.cc", -@@ -6501,6 +6515,18 @@ v8_component("v8_libbase") { +@@ -6570,6 +6584,18 @@ v8_component("v8_libbase") { "dl", "rt", ] diff --git a/www/chromium/files/patch-v8_include_v8config.h b/www/chromium/files/patch-v8_include_v8config.h index 194b63dbc3d9..3d6a3adc8419 100644 --- a/www/chromium/files/patch-v8_include_v8config.h +++ b/www/chromium/files/patch-v8_include_v8config.h @@ -1,6 +1,6 @@ ---- v8/include/v8config.h.orig 2024-08-07 08:11:50 UTC +--- v8/include/v8config.h.orig 2024-08-26 12:06:38 UTC +++ v8/include/v8config.h -@@ -193,6 +193,8 @@ path. Add it with -I<path> to the command line +@@ -201,6 +201,8 @@ path. Add it with -I<path> to the command line && !defined(V8_TARGET_OS_FUCHSIA) \ && !defined(V8_TARGET_OS_IOS) \ && !defined(V8_TARGET_OS_LINUX) \ @@ -9,7 +9,7 @@ && !defined(V8_TARGET_OS_MACOS) \ && !defined(V8_TARGET_OS_WIN) \ && !defined(V8_TARGET_OS_CHROMEOS) -@@ -205,6 +207,8 @@ path. Add it with -I<path> to the command line +@@ -213,6 +215,8 @@ path. Add it with -I<path> to the command line || defined(V8_TARGET_OS_FUCHSIA) \ || defined(V8_TARGET_OS_IOS) \ || defined(V8_TARGET_OS_LINUX) \ @@ -18,7 +18,7 @@ || defined(V8_TARGET_OS_MACOS) \ || defined(V8_TARGET_OS_WIN) \ || defined(V8_TARGET_OS_CHROMEOS) -@@ -228,6 +232,16 @@ path. Add it with -I<path> to the command line +@@ -236,6 +240,16 @@ path. Add it with -I<path> to the command line # define V8_TARGET_OS_LINUX #endif @@ -35,7 +35,7 @@ #ifdef V8_OS_MACOS # define V8_TARGET_OS_MACOS #endif -@@ -373,7 +387,8 @@ path. Add it with -I<path> to the command line +@@ -381,7 +395,8 @@ path. Add it with -I<path> to the command line // preserve_most in clang >= 17 (see https://reviews.llvm.org/D143425). #if (defined(_M_X64) || defined(__x86_64__) /* x64 (everywhere) */ \ || ((defined(__AARCH64EL__) || defined(_M_ARM64)) /* arm64, but ... */ \ diff --git a/www/chromium/files/patch-v8_src_api_api.cc b/www/chromium/files/patch-v8_src_api_api.cc index bf314d7a0498..effc4efaf3e0 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-07-30 11:12:21 UTC +--- v8/src/api/api.cc.orig 2024-08-26 12:06:38 UTC +++ v8/src/api/api.cc -@@ -145,7 +145,7 @@ +@@ -148,7 +148,7 @@ #include "src/wasm/wasm-serialization.h" #endif // V8_ENABLE_WEBASSEMBLY @@ -9,7 +9,7 @@ #include <signal.h> #include <unistd.h> -@@ -6452,7 +6452,7 @@ bool v8::V8::Initialize(const int build_config) { +@@ -6511,7 +6511,7 @@ bool v8::V8::Initialize(const int build_config) { return true; } diff --git a/www/chromium/files/patch-v8_src_base_platform_memory.h b/www/chromium/files/patch-v8_src_base_platform_memory.h index bdc9629bc45b..1e80422187cd 100644 --- a/www/chromium/files/patch-v8_src_base_platform_memory.h +++ b/www/chromium/files/patch-v8_src_base_platform_memory.h @@ -1,16 +1,18 @@ ---- v8/src/base/platform/memory.h.orig 2023-02-08 09:03:45 UTC +--- v8/src/base/platform/memory.h.orig 2024-08-26 12:06:38 UTC +++ v8/src/base/platform/memory.h -@@ -19,11 +19,11 @@ +@@ -19,13 +19,13 @@ #if V8_OS_DARWIN #include <malloc/malloc.h> --#else // !V8_OS_DARWIN -+#elif !V8_OS_BSD +-#elif V8_OS_ZOS ++#elif (V8_OS_ZOS || V8_OS_BSD) + #include <stdlib.h> + #else #include <malloc.h> - #endif // !V8_OS_DARWIN + #endif --#if (V8_OS_POSIX && !V8_OS_AIX && !V8_OS_SOLARIS) || V8_OS_WIN -+#if (V8_OS_POSIX && !V8_OS_AIX && !V8_OS_SOLARIS && !V8_OS_BSD) || V8_OS_WIN +-#if (V8_OS_POSIX && !V8_OS_AIX && !V8_OS_SOLARIS && !V8_OS_ZOS) || V8_OS_WIN ++#if (V8_OS_POSIX && !V8_OS_AIX && !V8_OS_SOLARIS && !V8_OS_ZOS && !V8_OS_BSD) || V8_OS_WIN #define V8_HAS_MALLOC_USABLE_SIZE 1 - #endif // (V8_OS_POSIX && !V8_OS_AIX && !V8_OS_SOLARIS) || V8_OS_WIN + #endif 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 b775762809c2..fefbf8a9b4e4 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,11 +1,11 @@ ---- v8/src/base/platform/platform-posix.cc.orig 2024-07-30 11:12:21 UTC +--- v8/src/base/platform/platform-posix.cc.orig 2024-08-26 12:06:38 UTC +++ v8/src/base/platform/platform-posix.cc @@ -54,7 +54,7 @@ #if V8_OS_DARWIN #include <mach/mach.h> #include <malloc/malloc.h> --#else -+#elif !V8_OS_BSD +-#elif !V8_OS_ZOS ++#elif !V8_OS_ZOS && !V8_OS_BSD #include <malloc.h> #endif @@ -18,7 +18,7 @@ #define MAP_ANONYMOUS MAP_ANON #endif -@@ -305,8 +305,15 @@ void OS::SetRandomMmapSeed(int64_t seed) { +@@ -311,8 +311,15 @@ void OS::SetRandomMmapSeed(int64_t seed) { } } @@ -34,7 +34,7 @@ uintptr_t raw_addr; { MutexGuard guard(rng_mutex.Pointer()); -@@ -401,6 +408,7 @@ void* OS::GetRandomMmapAddr() { +@@ -407,6 +414,7 @@ void* OS::GetRandomMmapAddr() { #endif return reinterpret_cast<void*>(raw_addr); } @@ -42,8 +42,8 @@ // TODO(bbudge) Move Cygwin and Fuchsia stuff into platform-specific files. #if !V8_OS_CYGWIN && !V8_OS_FUCHSIA -@@ -672,7 +680,7 @@ void OS::DestroySharedMemoryHandle(PlatformSharedMemor - +@@ -681,7 +689,7 @@ void OS::DestroySharedMemoryHandle(PlatformSharedMemor + #if !V8_OS_ZOS // static bool OS::HasLazyCommits() { -#if V8_OS_AIX || V8_OS_LINUX || V8_OS_DARWIN @@ -51,7 +51,7 @@ return true; #else // TODO(bbudge) Return true for all POSIX platforms. -@@ -1306,7 +1314,7 @@ void Thread::SetThreadLocal(LocalStorageKey key, void* +@@ -1326,7 +1334,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_execution_isolate.cc b/www/chromium/files/patch-v8_src_execution_isolate.cc index 628838136dc4..d6055102dae1 100644 --- a/www/chromium/files/patch-v8_src_execution_isolate.cc +++ b/www/chromium/files/patch-v8_src_execution_isolate.cc @@ -1,6 +1,6 @@ ---- v8/src/execution/isolate.cc.orig 2024-07-30 11:12:21 UTC +--- v8/src/execution/isolate.cc.orig 2024-08-26 12:06:38 UTC +++ v8/src/execution/isolate.cc -@@ -157,6 +157,10 @@ +@@ -159,6 +159,10 @@ #include "src/execution/simulator-base.h" #endif @@ -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_[]; -@@ -4540,6 +4544,13 @@ void Isolate::InitializeDefaultEmbeddedBlob() { +@@ -4785,6 +4789,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_sandbox_sandbox.cc b/www/chromium/files/patch-v8_src_sandbox_sandbox.cc index dc42872b54ce..b8521c28f3be 100644 --- a/www/chromium/files/patch-v8_src_sandbox_sandbox.cc +++ b/www/chromium/files/patch-v8_src_sandbox_sandbox.cc @@ -1,6 +1,6 @@ ---- v8/src/sandbox/sandbox.cc.orig 2024-06-17 12:56:06 UTC +--- v8/src/sandbox/sandbox.cc.orig 2024-08-26 12:06:38 UTC +++ v8/src/sandbox/sandbox.cc -@@ -47,7 +47,7 @@ static Address DetermineAddressSpaceLimit() { +@@ -48,7 +48,7 @@ static Address DetermineAddressSpaceLimit() { } #endif // V8_TARGET_ARCH_X64 diff --git a/www/chromium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.cc b/www/chromium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.cc index 149980d51c9a..b54eae551d58 100644 --- a/www/chromium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.cc +++ b/www/chromium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.cc @@ -1,9 +1,9 @@ ---- v8/src/snapshot/embedded/platform-embedded-file-writer-base.cc.orig 2023-11-03 10:09:45 UTC +--- v8/src/snapshot/embedded/platform-embedded-file-writer-base.cc.orig 2024-08-26 12:06:38 UTC +++ v8/src/snapshot/embedded/platform-embedded-file-writer-base.cc -@@ -143,6 +143,8 @@ EmbeddedTargetOs ToEmbeddedTargetOs(const char* s) { - return EmbeddedTargetOs::kWin; - } else if (string == "starboard") { +@@ -148,6 +148,8 @@ EmbeddedTargetOs ToEmbeddedTargetOs(const char* s) { return EmbeddedTargetOs::kStarboard; + } else if (string == "zos") { + return EmbeddedTargetOs::kZOS; + } else if (string == "openbsd") { + return EmbeddedTargetOs::kOpenBSD; } else { diff --git a/www/chromium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.h b/www/chromium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.h index ca28e2aa9551..426c257401f4 100644 --- a/www/chromium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.h +++ b/www/chromium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.h @@ -1,9 +1,9 @@ ---- v8/src/snapshot/embedded/platform-embedded-file-writer-base.h.orig 2023-02-08 09:03:45 UTC +--- v8/src/snapshot/embedded/platform-embedded-file-writer-base.h.orig 2024-08-26 12:06:38 UTC +++ v8/src/snapshot/embedded/platform-embedded-file-writer-base.h -@@ -31,6 +31,7 @@ enum class EmbeddedTargetOs { - kMac, +@@ -32,6 +32,7 @@ enum class EmbeddedTargetOs { kWin, kStarboard, + kZOS, + kOpenBSD, kGeneric, // Everything not covered above falls in here. }; 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 fa6b43c1bd27..6f581e43cd8a 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-06-17 12:56:06 UTC +--- v8/src/wasm/baseline/ia32/liftoff-assembler-ia32-inl.h.orig 2024-08-26 12:06:38 UTC +++ v8/src/wasm/baseline/ia32/liftoff-assembler-ia32-inl.h -@@ -492,7 +492,7 @@ void LiftoffAssembler::StoreTaggedPointer(Register dst +@@ -503,7 +503,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) { -@@ -569,7 +569,7 @@ void LiftoffAssembler::Load(LiftoffRegister dst, Regis +@@ -583,7 +583,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 */) { -@@ -645,7 +645,7 @@ void LiftoffAssembler::Store(Register dst_addr, Regist +@@ -662,7 +662,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) { -@@ -663,7 +663,7 @@ void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, +@@ -680,7 +680,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()); -@@ -733,7 +733,7 @@ enum Binop { kAdd, kSub, kAnd, kOr, kXor, kExchange }; +@@ -750,7 +750,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); -@@ -801,7 +801,7 @@ inline void AtomicAddOrSubOrExchange32(LiftoffAssemble +@@ -818,7 +818,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); -@@ -916,7 +916,7 @@ inline void AtomicBinop32(LiftoffAssembler* lasm, Bino +@@ -933,7 +933,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 -@@ -1012,7 +1012,7 @@ inline void AtomicBinop64(LiftoffAssembler* lasm, Bino +@@ -1029,7 +1029,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) { -@@ -1026,7 +1026,7 @@ void LiftoffAssembler::AtomicAdd(Register dst_addr, Re +@@ -1043,7 +1043,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) { -@@ -1039,7 +1039,7 @@ void LiftoffAssembler::AtomicSub(Register dst_addr, Re +@@ -1056,7 +1056,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) { -@@ -1053,7 +1053,7 @@ void LiftoffAssembler::AtomicAnd(Register dst_addr, Re +@@ -1070,7 +1070,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) { -@@ -1067,7 +1067,7 @@ void LiftoffAssembler::AtomicOr(Register dst_addr, Reg +@@ -1084,7 +1084,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) { -@@ -1081,7 +1081,7 @@ void LiftoffAssembler::AtomicXor(Register dst_addr, Re +@@ -1098,7 +1098,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 */) { -@@ -1096,7 +1096,7 @@ void LiftoffAssembler::AtomicExchange(Register dst_add +@@ -1113,7 +1113,7 @@ void LiftoffAssembler::AtomicExchange(Register dst_add } void LiftoffAssembler::AtomicCompareExchange( diff --git a/www/ungoogled-chromium/Makefile b/www/ungoogled-chromium/Makefile index 9bf70bfef636..c986bfe0886b 100644 --- a/www/ungoogled-chromium/Makefile +++ b/www/ungoogled-chromium/Makefile @@ -1,6 +1,5 @@ PORTNAME= ungoogled-chromium -PORTVERSION= 127.0.6533.119 -PORTREVISION= 1 +PORTVERSION= 128.0.6613.84 PULSEMV= 16 PULSEV= ${PULSEMV}.1 UGVERSION= ${DISTVERSION}-1 diff --git a/www/ungoogled-chromium/distinfo b/www/ungoogled-chromium/distinfo index caa685a33f0b..129f6d89b4df 100644 --- a/www/ungoogled-chromium/distinfo +++ b/www/ungoogled-chromium/distinfo @@ -1,11 +1,11 @@ -TIMESTAMP = 1723794980 -SHA256 (chromium-127.0.6533.119.tar.xz) = acc9e3f9fd2d180b8831865a1ac4f5cdd9ffe6211f47f467296d9ee1be2a577e -SIZE (chromium-127.0.6533.119.tar.xz) = 6621220264 -SHA256 (ungoogled-chromium-127.0.6533.119-1.tar.gz) = f268daae9f1514cdc907e5e10c500f03a14b4ec21414d7ac603919a8badba290 -SIZE (ungoogled-chromium-127.0.6533.119-1.tar.gz) = 1237565 +TIMESTAMP = 1724685133 +SHA256 (chromium-128.0.6613.84.tar.xz) = 9297c1e1dc9310534f6a48f90eacc2eac1d964ac3c827dc0798594e8a2742dc4 +SIZE (chromium-128.0.6613.84.tar.xz) = 6703104636 +SHA256 (ungoogled-chromium-128.0.6613.84-1.tar.gz) = a6898d0cf47025126a8795947397ee35a10a623fdbe0c8616c1dfcca51ebe500 +SIZE (ungoogled-chromium-128.0.6613.84-1.tar.gz) = 1238841 SHA256 (pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92 SIZE (pulseaudio-16.1.tar.gz) = 2763111 -SHA256 (chromium-127.0.6533.119-testdata.tar.xz) = a539a94ce99f6ed058db9106f56069786a911a8b39db677b3d3a78f5b582a743 -SIZE (chromium-127.0.6533.119-testdata.tar.xz) = 280109172 +SHA256 (chromium-128.0.6613.84-testdata.tar.xz) = df1f4b57d6e40f702ff37aeb3faf2a93e16635da566d0bf33a225fb2902dbbc6 +SIZE (chromium-128.0.6613.84-testdata.tar.xz) = 280248684 SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8 SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734 diff --git a/www/ungoogled-chromium/files/patch-BUILD.gn b/www/ungoogled-chromium/files/patch-BUILD.gn index 07a4b7c421fd..1c871ffa1cc0 100644 --- a/www/ungoogled-chromium/files/patch-BUILD.gn +++ b/www/ungoogled-chromium/files/patch-BUILD.gn @@ -1,4 +1,4 @@ ---- BUILD.gn.orig 2024-07-31 14:19:23 UTC +--- BUILD.gn.orig 2024-08-26 14:40:28 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", -@@ -433,7 +432,7 @@ group("gn_all") { +@@ -431,7 +430,7 @@ group("gn_all") { } } @@ -26,32 +26,32 @@ deps += [ "//third_party/breakpad:breakpad_unittests", "//third_party/breakpad:core-2-minidump", -@@ -621,6 +620,15 @@ group("gn_all") { +@@ -618,6 +617,15 @@ group("gn_all") { } } + if (is_bsd) { + deps -= [ -+ "//third_party/breakpad:dump_syms($host_toolchain)", -+ "//third_party/breakpad:microdump_stackwalk($host_toolchain)", -+ "//third_party/breakpad:minidump_dump($host_toolchain)", -+ "//third_party/breakpad:minidump_stackwalk($host_toolchain)", ++ "//third_party/breakpad:dump_syms($host_system_allocator_toolchain)", ++ "//third_party/breakpad:microdump_stackwalk($host_system_allocator_toolchain)", ++ "//third_party/breakpad:minidump_dump($host_system_allocator_toolchain)", ++ "//third_party/breakpad:minidump_stackwalk($host_system_allocator_toolchain)", + ] + } + if (is_mac) { deps += [ - "//third_party/breakpad:dump_syms", -@@ -667,7 +675,7 @@ group("gn_all") { - host_os == "win") { - deps += [ "//chrome/test/mini_installer:mini_installer_tests" ] + "//third_party/breakpad:dump_syms($host_system_allocator_toolchain)", +@@ -666,7 +674,7 @@ group("gn_all") { } -- } else if (!is_android && !is_ios && !is_fuchsia) { -+ } else if (!is_android && !is_ios && !is_fuchsia && !is_bsd) { - deps += [ "//third_party/breakpad:symupload($host_toolchain)" ] } -@@ -1093,7 +1101,7 @@ if (use_blink && !is_cronet_build) { +- if (!is_fuchsia) { ++ if (!is_fuchsia && !is_bsd) { + # 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 +@@ -1116,7 +1124,7 @@ if (use_blink && !is_cronet_build) { ] } @@ -60,30 +60,30 @@ script_test("chrome_wpt_tests") { script = "//third_party/blink/tools/run_wpt_tests.py" args = [ -@@ -1186,7 +1194,7 @@ if (use_blink && !is_cronet_build) { +@@ -1213,7 +1221,7 @@ if (use_blink && !is_cronet_build) { data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ] } - if (!is_win && !is_android) { + if (!is_win && !is_android && !is_bsd) { - data_deps += - [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] - } -@@ -1195,7 +1203,7 @@ if (use_blink && !is_cronet_build) { - data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] + # 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. +@@ -1227,7 +1235,7 @@ if (use_blink && !is_cronet_build) { + data_deps += [ "//third_party/breakpad:dump_syms" ] } - if (is_linux || is_chromeos) { + if ((is_linux && !is_bsd) || is_chromeos) { - data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] - } - -@@ -1659,7 +1667,7 @@ group("chromium_builder_perf") { + # 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. +@@ -1694,7 +1702,7 @@ group("chromium_builder_perf") { data_deps += [ "//chrome/test:performance_browser_tests" ] } - if (!is_win) { + if (!is_win && !is_bsd) { - data_deps += - [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] + data_deps += [ "//third_party/breakpad:minidump_stackwalk($host_system_allocator_toolchain)" ] } + } diff --git a/www/ungoogled-chromium/files/patch-apps_ui_views_app__window__frame__view.cc b/www/ungoogled-chromium/files/patch-apps_ui_views_app__window__frame__view.cc index e27833c448b5..61dedc75a375 100644 --- a/www/ungoogled-chromium/files/patch-apps_ui_views_app__window__frame__view.cc +++ b/www/ungoogled-chromium/files/patch-apps_ui_views_app__window__frame__view.cc @@ -1,6 +1,6 @@ ---- apps/ui/views/app_window_frame_view.cc.orig 2024-06-22 08:49:42 UTC +--- apps/ui/views/app_window_frame_view.cc.orig 2024-08-26 14:40:28 UTC +++ apps/ui/views/app_window_frame_view.cc -@@ -148,7 +148,7 @@ gfx::Rect AppWindowFrameView::GetWindowBoundsForClient +@@ -149,7 +149,7 @@ gfx::Rect AppWindowFrameView::GetWindowBoundsForClient gfx::Rect window_bounds = client_bounds; // TODO(crbug.com/40118868): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/ungoogled-chromium/files/patch-base_BUILD.gn b/www/ungoogled-chromium/files/patch-base_BUILD.gn index cf63dda7b5d7..0e95d3407df2 100644 --- a/www/ungoogled-chromium/files/patch-base_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-base_BUILD.gn @@ -1,6 +1,6 @@ ---- base/BUILD.gn.orig 2024-07-31 14:19:23 UTC +--- base/BUILD.gn.orig 2024-08-26 14:40:28 UTC +++ base/BUILD.gn -@@ -182,7 +182,7 @@ buildflag_header("ios_cronet_buildflags") { +@@ -176,7 +176,7 @@ buildflag_header("ios_cronet_buildflags") { flags = [ "CRONET_BUILD=$is_cronet_build" ] } @@ -43,7 +43,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -2110,6 +2122,22 @@ component("base") { +@@ -2121,6 +2133,22 @@ component("base") { ] } @@ -66,7 +66,7 @@ # iOS if (is_ios) { sources += [ -@@ -2255,6 +2283,33 @@ component("base") { +@@ -2266,6 +2294,33 @@ component("base") { } } @@ -100,7 +100,7 @@ if (use_blink) { sources += [ "files/file_path_watcher.cc", -@@ -2265,7 +2320,7 @@ component("base") { +@@ -2276,7 +2331,7 @@ component("base") { } if (dep_libevent) { @@ -109,7 +109,7 @@ } if (use_libevent) { -@@ -3062,7 +3117,7 @@ if (is_apple) { +@@ -3077,7 +3132,7 @@ if (is_apple) { } } @@ -118,7 +118,7 @@ # This test must compile with -fstack-protector-all source_set("stack_canary_linux_unittests") { testonly = true -@@ -3711,7 +3766,7 @@ test("base_unittests") { +@@ -3730,7 +3785,7 @@ test("base_unittests") { ] } @@ -127,7 +127,7 @@ sources += [ "debug/proc_maps_linux_unittest.cc", "files/scoped_file_linux_unittest.cc", -@@ -3738,7 +3793,7 @@ test("base_unittests") { +@@ -3757,7 +3812,7 @@ test("base_unittests") { "posix/file_descriptor_shuffle_unittest.cc", "posix/unix_domain_socket_unittest.cc", ] @@ -136,7 +136,7 @@ sources += [ "profiler/stack_base_address_posix_unittest.cc", "profiler/stack_copier_signal_unittest.cc", -@@ -3749,7 +3804,7 @@ test("base_unittests") { +@@ -3768,7 +3823,7 @@ test("base_unittests") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -145,8 +145,8 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -4017,7 +4072,7 @@ test("base_unittests") { - } +@@ -3953,7 +4008,7 @@ test("base_unittests") { + deps += [ ":base_profiler_test_support_library" ] } - if (is_fuchsia || is_linux || is_chromeos) { diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni index 8f19c276b53a..516a38b1739a 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni @@ -1,4 +1,4 @@ ---- base/allocator/partition_allocator/partition_alloc.gni.orig 2024-07-31 14:19:23 UTC +--- base/allocator/partition_allocator/partition_alloc.gni.orig 2024-08-26 14:40:28 UTC +++ base/allocator/partition_allocator/partition_alloc.gni @@ -31,7 +31,7 @@ if (is_nacl) { use_large_empty_slot_span_ring = is_mac @@ -9,7 +9,7 @@ declare_args() { # Causes all the allocations to be routed via allocator_shim.cc. Usually, -@@ -360,7 +360,7 @@ assert(!use_asan_backup_ref_ptr || use_raw_ptr_hookabl +@@ -361,7 +361,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/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn index 9729ebb977b2..fc0424842a89 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn +++ b/www/ungoogled-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-07-31 14:19:23 UTC +--- base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig 2024-08-26 14:40:28 UTC +++ base/allocator/partition_allocator/src/partition_alloc/BUILD.gn -@@ -863,7 +863,7 @@ if (is_clang_or_gcc) { +@@ -796,7 +796,7 @@ if (is_clang_or_gcc) { configs -= [ partition_alloc_enable_arc_config ] } } diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator.h b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator.h index e4dbf66eb9e7..e965dcb89b26 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator.h +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator.h @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/src/partition_alloc/page_allocator.h.orig 2024-07-31 14:19:23 UTC +--- base/allocator/partition_allocator/src/partition_alloc/page_allocator.h.orig 2024-08-26 14:40:28 UTC +++ base/allocator/partition_allocator/src/partition_alloc/page_allocator.h -@@ -259,7 +259,7 @@ bool DecommitAndZeroSystemPages(void* address, +@@ -269,7 +269,7 @@ bool DecommitAndZeroSystemPages(void* address, // recommitted. Do not assume that this will not change over time. constexpr PA_COMPONENT_EXPORT( PARTITION_ALLOC) bool DecommittedMemoryIsAlwaysZeroed() { diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__constants.h b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__constants.h index 0d5e8b1ea0fa..18570c998768 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__constants.h +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__constants.h @@ -1,11 +1,13 @@ ---- base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h.orig 2024-07-31 14:19:23 UTC +--- base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h.orig 2024-08-26 14:40:28 UTC +++ base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h -@@ -26,7 +26,7 @@ +@@ -26,8 +26,8 @@ #define PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR __attribute__((const)) #elif (PA_BUILDFLAG(IS_ANDROID) && PA_BUILDFLAG(PA_ARCH_CPU_64_BITS)) || \ -- (PA_BUILDFLAG(IS_LINUX) && PA_BUILDFLAG(PA_ARCH_CPU_ARM64)) -+ ((PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_BSD)) && PA_BUILDFLAG(PA_ARCH_CPU_ARM64)) +- (PA_BUILDFLAG(IS_LINUX) && PA_BUILDFLAG(PA_ARCH_CPU_ARM64)) || \ +- (PA_BUILDFLAG(IS_LINUX) && PA_BUILDFLAG(PA_ARCH_CPU_PPC64)) ++ ((PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_BSD)) && PA_BUILDFLAG(PA_ARCH_CPU_ARM64)) || \ ++ ((PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_BSD)) && PA_BUILDFLAG(PA_ARCH_CPU_PPC64)) // This should work for all POSIX (if needed), but currently all other // supported OS/architecture combinations use either hard-coded values // (such as x86) or have means to determine these values without needing diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.cc b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.cc new file mode 100644 index 000000000000..5fcf9c65d4dc --- /dev/null +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_page__allocator__internals__posix.cc @@ -0,0 +1,11 @@ +--- base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.cc.orig 2024-08-26 14:40:28 UTC ++++ base/allocator/partition_allocator/src/partition_alloc/page_allocator_internals_posix.cc +@@ -9,7 +9,7 @@ + #include "partition_alloc/page_allocator.h" + + #if PA_BUILDFLAG(HAS_MEMORY_TAGGING) || \ +- (defined(__ARM_FEATURE_BTI_DEFAULT) && (__ARM_FEATURE_BTI_DEFAULT == 1)) ++ (defined(__ARM_FEATURE_BTI_DEFAULT) && (__ARM_FEATURE_BTI_DEFAULT == 1) && !PA_BUILDFLAG(IS_BSD)) + struct __ifunc_arg_t; + + #include "partition_alloc/aarch64_support.h" diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_proc__maps__linux.cc b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_proc__maps__linux.cc new file mode 100644 index 000000000000..11e84f5898b5 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_debug_proc__maps__linux.cc @@ -0,0 +1,11 @@ +--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/proc_maps_linux.cc.orig 2024-08-26 14:40:28 UTC ++++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/proc_maps_linux.cc +@@ -19,7 +19,7 @@ + #include "partition_alloc/partition_alloc_check.h" + + #if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS) || \ +- PA_BUILDFLAG(IS_ANDROID) ++ PA_BUILDFLAG(IS_ANDROID) || PA_BUILDFLAG(IS_BSD) + #include <inttypes.h> + #endif + diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h index c4d1158265f4..e3f036a96a32 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h +++ b/www/ungoogled-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-07-31 14:19:23 UTC +--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h.orig 2024-08-26 14:40:28 UTC +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h -@@ -236,7 +236,7 @@ constexpr bool kUseLazyCommit = false; +@@ -168,7 +168,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 @@ // PartitionAlloc uses PartitionRootEnumerator to acquire all // PartitionRoots at BeforeFork and to release at AfterFork. -@@ -284,7 +284,7 @@ constexpr bool kUseLazyCommit = false; +@@ -216,7 +216,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/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h index 69a85ac5adde..c191deb4d84c 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h @@ -1,4 +1,4 @@ ---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h.orig 2024-07-31 14:19:23 UTC +--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h.orig 2024-08-26 14:40:28 UTC +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h @@ -329,7 +329,7 @@ PA_DEFINE_OPERATORS_FOR_FLAGS(PoolHandleMask); // 8GB for each of the glued pools). @@ -9,3 +9,12 @@ constexpr size_t kPoolMaxSize = 8 * kGiB; #else constexpr size_t kPoolMaxSize = 16 * kGiB; +@@ -458,7 +458,7 @@ PA_ALWAYS_INLINE constexpr size_t MaxDirectMapped() { + // TODO(casey.smalley@arm.com): under 64k pages we can end up in a situation + // where a normal slot span will be large enough to contain multiple items, + // but the address will go over the final partition page after being aligned. +-#if PA_BUILDFLAG(IS_LINUX) && PA_BUILDFLAG(PA_ARCH_CPU_ARM64) ++#if (PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_BSD)) && PA_BUILDFLAG(PA_ARCH_CPU_ARM64) + constexpr size_t kMaxSupportedAlignment = kSuperPageSize / 4; + #else + constexpr size_t kMaxSupportedAlignment = kSuperPageSize / 2; diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc index 50347c884eda..de863018a64c 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/src/partition_alloc/partition_root.cc.orig 2024-07-31 14:19:23 UTC +--- base/allocator/partition_allocator/src/partition_alloc/partition_root.cc.orig 2024-08-26 14:40:28 UTC +++ base/allocator/partition_allocator/src/partition_alloc/partition_root.cc -@@ -48,7 +48,7 @@ +@@ -43,7 +43,7 @@ #include "wow64apiset.h" #endif @@ -9,7 +9,7 @@ #include <pthread.h> #endif -@@ -282,7 +282,7 @@ void PartitionAllocMallocInitOnce() { +@@ -277,7 +277,7 @@ void PartitionAllocMallocInitOnce() { return; } @@ -18,12 +18,12 @@ // 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. -@@ -1079,7 +1079,7 @@ void PartitionRoot::Init(PartitionOptions opts) { +@@ -1074,7 +1074,7 @@ void PartitionRoot::Init(PartitionOptions opts) { // apple OSes. PA_CHECK((internal::SystemPageSize() == (size_t{1} << 12)) || (internal::SystemPageSize() == (size_t{1} << 14))); -#elif PA_BUILDFLAG(IS_LINUX) && PA_BUILDFLAG(PA_ARCH_CPU_ARM64) +#elif (PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_BSD)) && PA_BUILDFLAG(PA_ARCH_CPU_ARM64) // Check runtime pagesize. Though the code is currently the same, it is - // not merged with the IS_APPLE case above as a 1 << 16 case needs to be - // added here in the future, to allow 64 kiB pagesize. That is only + // not merged with the IS_APPLE case above as a 1 << 16 case is only + // supported on Linux on AArch64. diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_spinning__mutex.cc b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_spinning__mutex.cc index 6e0c280bc2bc..801a74d5d10a 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_spinning__mutex.cc +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_spinning__mutex.cc @@ -1,4 +1,4 @@ ---- base/allocator/partition_allocator/src/partition_alloc/spinning_mutex.cc.orig 2024-02-25 20:22:18 UTC +--- base/allocator/partition_allocator/src/partition_alloc/spinning_mutex.cc.orig 2024-08-26 14:40:28 UTC +++ base/allocator/partition_allocator/src/partition_alloc/spinning_mutex.cc @@ -17,7 +17,16 @@ #endif @@ -17,7 +17,7 @@ #include <sys/syscall.h> #include <unistd.h> -@@ -109,8 +118,16 @@ void SpinningMutex::FutexWait() { +@@ -106,8 +115,16 @@ void SpinningMutex::FutexWait() { // |kLockedContended| anymore. Note that even without spurious wakeups, the // value of |state_| is not guaranteed when this returns, as another thread // may get the lock before we get to run. @@ -34,7 +34,7 @@ if (err) { // These are programming error, check them. -@@ -122,8 +139,16 @@ void SpinningMutex::FutexWait() { +@@ -119,8 +136,16 @@ void SpinningMutex::FutexWait() { void SpinningMutex::FutexWake() { int saved_errno = errno; diff --git a/www/ungoogled-chromium/files/patch-base_compiler__specific.h b/www/ungoogled-chromium/files/patch-base_compiler__specific.h index 95071ee1c4c9..6f5d1d3e4ed7 100644 --- a/www/ungoogled-chromium/files/patch-base_compiler__specific.h +++ b/www/ungoogled-chromium/files/patch-base_compiler__specific.h @@ -1,6 +1,6 @@ ---- base/compiler_specific.h.orig 2024-02-25 20:22:18 UTC +--- base/compiler_specific.h.orig 2024-08-26 14:40:28 UTC +++ base/compiler_specific.h -@@ -316,7 +316,7 @@ +@@ -326,7 +326,7 @@ // // In some cases it's desirable to remove this, e.g. on hot functions, or if // we have purposely changed the reference canary. diff --git a/www/ungoogled-chromium/files/patch-base_features.cc b/www/ungoogled-chromium/files/patch-base_features.cc index e9462d06836d..40501390b27c 100644 --- a/www/ungoogled-chromium/files/patch-base_features.cc +++ b/www/ungoogled-chromium/files/patch-base_features.cc @@ -1,4 +1,4 @@ ---- base/features.cc.orig 2024-07-31 14:19:23 UTC +--- base/features.cc.orig 2024-08-26 14:40:28 UTC +++ base/features.cc @@ -9,8 +9,10 @@ #include "base/threading/platform_thread.h" @@ -12,7 +12,7 @@ #include "base/message_loop/message_pump_libevent.h" #endif -@@ -97,9 +99,11 @@ void Init(EmitThreadControllerProfilerMetadata +@@ -116,9 +118,11 @@ void Init(EmitThreadControllerProfilerMetadata sequence_manager::internal::ThreadController::InitializeFeatures( emit_thread_controller_profiler_metadata); diff --git a/www/ungoogled-chromium/files/patch-base_native__library__posix.cc b/www/ungoogled-chromium/files/patch-base_native__library__posix.cc index 7cbb17fce86a..52699dcd0b3b 100644 --- a/www/ungoogled-chromium/files/patch-base_native__library__posix.cc +++ b/www/ungoogled-chromium/files/patch-base_native__library__posix.cc @@ -1,6 +1,6 @@ ---- base/native_library_posix.cc.orig 2022-10-01 07:40:07 UTC +--- base/native_library_posix.cc.orig 2024-08-26 14:40:28 UTC +++ base/native_library_posix.cc -@@ -33,7 +33,7 @@ NativeLibrary LoadNativeLibraryWithOptions(const FileP +@@ -34,7 +34,7 @@ NativeLibrary LoadNativeLibraryWithOptions(const FileP // http://crbug.com/17943, http://crbug.com/17557, http://crbug.com/36892, // and http://crbug.com/40794. int flags = RTLD_LAZY; diff --git a/www/ungoogled-chromium/files/patch-base_process_launch.h b/www/ungoogled-chromium/files/patch-base_process_launch.h index 4d798ddb2b35..053e6bd65581 100644 --- a/www/ungoogled-chromium/files/patch-base_process_launch.h +++ b/www/ungoogled-chromium/files/patch-base_process_launch.h @@ -1,6 +1,6 @@ ---- base/process/launch.h.orig 2023-05-05 12:12:41 UTC +--- base/process/launch.h.orig 2024-08-26 14:40:28 UTC +++ base/process/launch.h -@@ -200,7 +200,7 @@ struct BASE_EXPORT LaunchOptions { +@@ -211,7 +211,7 @@ struct BASE_EXPORT LaunchOptions { bool clear_environment = false; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA) diff --git a/www/ungoogled-chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc b/www/ungoogled-chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc index 1f4081fdea25..2293e01237ee 100644 --- a/www/ungoogled-chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc +++ b/www/ungoogled-chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc @@ -1,6 +1,6 @@ ---- base/profiler/stack_sampling_profiler_unittest.cc.orig 2024-05-23 20:04:36 UTC +--- base/profiler/stack_sampling_profiler_unittest.cc.orig 2024-08-26 14:40:28 UTC +++ base/profiler/stack_sampling_profiler_unittest.cc -@@ -43,7 +43,7 @@ +@@ -45,7 +45,7 @@ #include <intrin.h> #include <malloc.h> diff --git a/www/ungoogled-chromium/files/patch-base_rand__util__posix.cc b/www/ungoogled-chromium/files/patch-base_rand__util__posix.cc index 6ccbd2f24140..31b604bd5aaa 100644 --- a/www/ungoogled-chromium/files/patch-base_rand__util__posix.cc +++ b/www/ungoogled-chromium/files/patch-base_rand__util__posix.cc @@ -1,4 +1,4 @@ ---- base/rand_util_posix.cc.orig 2024-06-22 08:49:42 UTC +--- base/rand_util_posix.cc.orig 2024-08-26 14:40:28 UTC +++ base/rand_util_posix.cc @@ -28,7 +28,7 @@ #include "base/time/time.h" @@ -9,7 +9,7 @@ #include "third_party/lss/linux_syscall_support.h" #elif BUILDFLAG(IS_MAC) // TODO(crbug.com/40641285): Waiting for this header to appear in the iOS SDK. -@@ -45,6 +45,7 @@ namespace base { +@@ -44,6 +44,7 @@ namespace base { namespace { @@ -17,7 +17,7 @@ #if BUILDFLAG(IS_AIX) // AIX has no 64-bit support for O_CLOEXEC. static constexpr int kOpenFlags = O_RDONLY; -@@ -69,10 +70,11 @@ class URandomFd { +@@ -68,10 +69,11 @@ class URandomFd { private: const int fd_; }; @@ -30,7 +30,7 @@ // TODO(pasko): Unify reading kernel version numbers in: // mojo/core/channel_linux.cc // chrome/browser/android/seccomp_support_detector.cc -@@ -182,6 +184,7 @@ bool UseBoringSSLForRandBytes() { +@@ -181,6 +183,7 @@ bool UseBoringSSLForRandBytes() { namespace { void RandBytesInternal(span<uint8_t> output, bool avoid_allocation) { @@ -38,7 +38,7 @@ #if !BUILDFLAG(IS_NACL) // The BoringSSL experiment takes priority over everything else. if (!avoid_allocation && internal::UseBoringSSLForRandBytes()) { -@@ -220,6 +223,9 @@ void RandBytesInternal(span<uint8_t> output, bool avoi +@@ -217,6 +220,9 @@ void RandBytesInternal(span<uint8_t> output, bool avoi const int urandom_fd = GetUrandomFD(); const bool success = ReadFromFD(urandom_fd, as_writable_chars(output)); CHECK(success); @@ -48,7 +48,7 @@ } } // namespace -@@ -239,9 +245,11 @@ void RandBytes(span<uint8_t> output) { +@@ -236,9 +242,11 @@ void RandBytes(span<uint8_t> output) { RandBytesInternal(output, /*avoid_allocation=*/false); } diff --git a/www/ungoogled-chromium/files/patch-base_synchronization_lock__impl.h b/www/ungoogled-chromium/files/patch-base_synchronization_lock__impl.h index d70ce056c0dd..66e88b247d66 100644 --- a/www/ungoogled-chromium/files/patch-base_synchronization_lock__impl.h +++ b/www/ungoogled-chromium/files/patch-base_synchronization_lock__impl.h @@ -1,6 +1,6 @@ ---- base/synchronization/lock_impl.h.orig 2024-05-23 20:04:36 UTC +--- base/synchronization/lock_impl.h.orig 2024-08-26 14:40:28 UTC +++ base/synchronization/lock_impl.h -@@ -106,6 +106,10 @@ void LockImpl::Unlock() { +@@ -109,6 +109,10 @@ void LockImpl::Unlock() { } #elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA) @@ -11,7 +11,7 @@ #if DCHECK_IS_ON() BASE_EXPORT void dcheck_trylock_result(int rv); -@@ -126,6 +130,9 @@ void LockImpl::Unlock() { +@@ -129,6 +133,9 @@ void LockImpl::Unlock() { dcheck_unlock_result(rv); #endif } diff --git a/www/ungoogled-chromium/files/patch-base_system_sys__info.cc b/www/ungoogled-chromium/files/patch-base_system_sys__info.cc index 1565f1241649..793776b01dd7 100644 --- a/www/ungoogled-chromium/files/patch-base_system_sys__info.cc +++ b/www/ungoogled-chromium/files/patch-base_system_sys__info.cc @@ -1,6 +1,6 @@ ---- base/system/sys_info.cc.orig 2023-12-23 12:33:28 UTC +--- base/system/sys_info.cc.orig 2024-08-26 14:40:28 UTC +++ base/system/sys_info.cc -@@ -225,7 +225,7 @@ std::string SysInfo::HardwareModelName() { +@@ -223,7 +223,7 @@ std::string SysInfo::HardwareModelName() { #endif void SysInfo::GetHardwareInfo(base::OnceCallback<void(HardwareInfo)> callback) { diff --git a/www/ungoogled-chromium/files/patch-base_system_sys__info__unittest.cc b/www/ungoogled-chromium/files/patch-base_system_sys__info__unittest.cc index f322ac2087c7..228c891be742 100644 --- a/www/ungoogled-chromium/files/patch-base_system_sys__info__unittest.cc +++ b/www/ungoogled-chromium/files/patch-base_system_sys__info__unittest.cc @@ -1,6 +1,6 @@ ---- base/system/sys_info_unittest.cc.orig 2024-04-23 07:42:17 UTC +--- base/system/sys_info_unittest.cc.orig 2024-08-26 14:40:28 UTC +++ base/system/sys_info_unittest.cc -@@ -264,12 +264,16 @@ TEST_F(SysInfoTest, GetHardwareInfo) { +@@ -265,12 +265,16 @@ TEST_F(SysInfoTest, GetHardwareInfo) { EXPECT_TRUE(IsStringUTF8(hardware_info->model)); bool empty_result_expected = #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN) || \ diff --git a/www/ungoogled-chromium/files/patch-base_trace__event_malloc__dump__provider.cc b/www/ungoogled-chromium/files/patch-base_trace__event_malloc__dump__provider.cc index a75ada518d5f..233021b8572a 100644 --- a/www/ungoogled-chromium/files/patch-base_trace__event_malloc__dump__provider.cc +++ b/www/ungoogled-chromium/files/patch-base_trace__event_malloc__dump__provider.cc @@ -1,6 +1,6 @@ ---- base/trace_event/malloc_dump_provider.cc.orig 2024-06-22 08:49:42 UTC +--- base/trace_event/malloc_dump_provider.cc.orig 2024-08-26 14:40:28 UTC +++ base/trace_event/malloc_dump_provider.cc -@@ -29,6 +29,8 @@ +@@ -28,6 +28,8 @@ #if BUILDFLAG(IS_APPLE) #include <malloc/malloc.h> @@ -9,7 +9,7 @@ #else #include <malloc.h> #endif -@@ -187,7 +189,7 @@ void ReportAppleAllocStats(size_t* total_virtual_size, +@@ -178,7 +180,7 @@ void ReportAppleAllocStats(size_t* total_virtual_size, #if (PA_BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && BUILDFLAG(IS_ANDROID)) || \ (!PA_BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && !BUILDFLAG(IS_WIN) && \ @@ -18,7 +18,7 @@ void ReportMallinfoStats(ProcessMemoryDump* pmd, size_t* total_virtual_size, size_t* resident_size, -@@ -391,6 +393,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump +@@ -368,6 +370,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump &allocated_objects_count); #elif BUILDFLAG(IS_FUCHSIA) // TODO(fuchsia): Port, see https://crbug.com/706592. diff --git a/www/ungoogled-chromium/files/patch-base_trace__event_process__memory__dump.cc b/www/ungoogled-chromium/files/patch-base_trace__event_process__memory__dump.cc index 3dda7a0eca84..8611a0be71e9 100644 --- a/www/ungoogled-chromium/files/patch-base_trace__event_process__memory__dump.cc +++ b/www/ungoogled-chromium/files/patch-base_trace__event_process__memory__dump.cc @@ -1,15 +1,15 @@ ---- base/trace_event/process_memory_dump.cc.orig 2024-06-22 08:49:42 UTC +--- base/trace_event/process_memory_dump.cc.orig 2024-08-26 14:40:28 UTC +++ base/trace_event/process_memory_dump.cc -@@ -118,7 +118,7 @@ std::optional<size_t> ProcessMemoryDump::CountResident +@@ -120,7 +120,7 @@ std::optional<size_t> ProcessMemoryDump::CountResident #if BUILDFLAG(IS_WIN) - std::unique_ptr<PSAPI_WORKING_SET_EX_INFORMATION[]> vec( - new PSAPI_WORKING_SET_EX_INFORMATION[max_vec_size]); + auto vec = + base::HeapArray<PSAPI_WORKING_SET_EX_INFORMATION>::WithSize(max_vec_size); -#elif BUILDFLAG(IS_APPLE) +#elif BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) - std::unique_ptr<char[]> vec(new char[max_vec_size]); + auto vec = base::HeapArray<char>::WithSize(max_vec_size); #elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA) - std::unique_ptr<unsigned char[]> vec(new unsigned char[max_vec_size]); -@@ -140,7 +140,7 @@ std::optional<size_t> ProcessMemoryDump::CountResident + auto vec = base::HeapArray<unsigned char>::WithSize(max_vec_size); +@@ -143,7 +143,7 @@ std::optional<size_t> ProcessMemoryDump::CountResident for (size_t i = 0; i < page_count; i++) resident_page_count += vec[i].VirtualAttributes.Valid; diff --git a/www/ungoogled-chromium/files/patch-build_config_clang_BUILD.gn b/www/ungoogled-chromium/files/patch-build_config_clang_BUILD.gn index 5eb99508fba2..77767c902fb6 100644 --- a/www/ungoogled-chromium/files/patch-build_config_clang_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-build_config_clang_BUILD.gn @@ -1,6 +1,6 @@ ---- build/config/clang/BUILD.gn.orig 2024-07-31 14:19:23 UTC +--- build/config/clang/BUILD.gn.orig 2024-08-26 14:40:28 UTC +++ build/config/clang/BUILD.gn -@@ -230,7 +230,7 @@ template("clang_lib") { +@@ -237,7 +237,7 @@ template("clang_lib") { # Adds a dependency on the Clang runtime library clang_rt.builtins. clang_lib("compiler_builtins") { diff --git a/www/ungoogled-chromium/files/patch-build_config_compiler_BUILD.gn b/www/ungoogled-chromium/files/patch-build_config_compiler_BUILD.gn index 27d53c37387a..cf2cc88adacf 100644 --- a/www/ungoogled-chromium/files/patch-build_config_compiler_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-build_config_compiler_BUILD.gn @@ -1,4 +1,4 @@ ---- build/config/compiler/BUILD.gn.orig 2024-07-31 14:19:23 UTC +--- build/config/compiler/BUILD.gn.orig 2024-08-26 16:00:29 UTC +++ build/config/compiler/BUILD.gn @@ -199,7 +199,7 @@ declare_args() { # This greatly reduces the size of debug builds, at the cost of @@ -27,7 +27,7 @@ } # compiler --------------------------------------------------------------------- -@@ -499,6 +502,10 @@ config("compiler") { +@@ -503,6 +506,10 @@ config("compiler") { } } @@ -38,16 +38,16 @@ # Linux-specific compiler flags setup. # ------------------------------------ if (use_icf && (!is_apple || use_lld)) { -@@ -552,7 +559,7 @@ config("compiler") { +@@ -556,7 +563,7 @@ config("compiler") { ldflags += [ "-Wl,-z,keep-text-section-prefix" ] } -- if (is_clang && !is_nacl && current_os != "zos") { -+ if (is_clang && !is_nacl && current_os != "zos" && !is_bsd) { +- if (is_clang && !is_nacl) { ++ if (is_clang && !is_nacl && !is_bsd) { cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ] if (save_reproducers_on_lld_crash && use_lld) { ldflags += [ -@@ -1195,7 +1202,7 @@ config("compiler_cpu_abi") { +@@ -1197,7 +1204,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" ] -@@ -1210,7 +1217,7 @@ config("compiler_cpu_abi") { +@@ -1212,7 +1219,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" ] -@@ -1545,7 +1552,7 @@ config("compiler_deterministic") { +@@ -1547,7 +1554,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,16 +74,16 @@ # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here. cflags += [ "-Xclang", -@@ -1597,7 +1604,7 @@ config("compiler_deterministic") { +@@ -1605,7 +1612,7 @@ config("compiler_deterministic") { } config("clang_revision") { -- if (is_clang && clang_base_path == default_clang_base_path) { -+ if (is_clang && !is_bsd && clang_base_path == default_clang_base_path) { +- if (is_clang && clang_base_path == default_clang_base_path && ++ if (is_clang && !is_bsd && clang_base_path == default_clang_base_path && + current_os != "zos") { update_args = [ "--print-revision", - "--verify-version=$clang_version", -@@ -1908,9 +1915,6 @@ config("default_warnings") { +@@ -1938,9 +1945,6 @@ config("default_warnings") { # TODO(crbug.com/40286317): Evaluate and possibly enable. "-Wno-vla-extension", @@ -93,7 +93,7 @@ ] cflags_cc += [ -@@ -1918,7 +1922,7 @@ config("default_warnings") { +@@ -1948,14 +1952,11 @@ config("default_warnings") { "-Wenum-compare-conditional", ] @@ -102,7 +102,14 @@ cflags_cc += [ # TODO(crbug.com/41486292): Fix and re-enable. "-Wno-c++11-narrowing-const-reference", -@@ -2640,7 +2644,7 @@ config("afdo_optimize_size") { + ] +- +- # TODO(crbug.com/344680447): Fix and re-enable. +- cflags_cc += [ "-Wno-missing-template-arg-list-after-template-kw" ] + } + } + +@@ -2676,7 +2677,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") { @@ -111,7 +118,7 @@ cflags = [] if (clang_emit_debug_info_for_profiling) { # Add the following flags to generate debug info for profiling. -@@ -2667,7 +2671,7 @@ config("afdo") { +@@ -2703,7 +2704,7 @@ config("afdo") { cflags += [ "-Wno-backend-plugin" ] inputs = [ _clang_sample_profile ] } @@ -120,13 +127,12 @@ cflags = [ "-fauto-profile=${auto_profile_path}" ] inputs = [ auto_profile_path ] } -@@ -2832,7 +2836,8 @@ config("symbols") { +@@ -2868,7 +2869,7 @@ config("symbols") { configs += [ "//build/config:compress_debug_sections" ] } -- if (is_clang && (!is_nacl || is_nacl_saigo) && current_os != "zos") { -+ if (is_clang && (!is_nacl || is_nacl_saigo) && current_os != "zos" && -+ !is_bsd) { +- if (is_clang && (!is_nacl || is_nacl_saigo)) { ++ if (is_clang && (!is_nacl || is_nacl_saigo) && !is_bsd) { if (is_apple) { # TODO(crbug.com/40117949): Investigate missing debug info on mac. # Make sure we don't use constructor homing on mac. diff --git a/www/ungoogled-chromium/files/patch-build_linux_unbundle_dav1d.gn b/www/ungoogled-chromium/files/patch-build_linux_unbundle_dav1d.gn deleted file mode 100644 index df5124cbb5ca..000000000000 --- a/www/ungoogled-chromium/files/patch-build_linux_unbundle_dav1d.gn +++ /dev/null @@ -1,25 +0,0 @@ ---- build/linux/unbundle/dav1d.gn.orig 2024-07-31 14:19:23 UTC -+++ build/linux/unbundle/dav1d.gn -@@ -1,11 +1,11 @@ - import("//build/config/linux/pkg_config.gni") - import("//build/shim_headers.gni") - --pkg_config("system_dav1d") { -+pkg_config("dav1d_config") { - packages = [ "dav1d" ] - } - --shim_headers("dav1d_shim") { -+shim_headers("dav1d_headers") { - root_path = "libdav1d/include" - headers = [ - "dav1d/common.h", -@@ -18,6 +18,6 @@ shim_headers("dav1d_shim") { - } - - source_set("dav1d") { -- deps = [ ":dav1d_shim" ] -- public_configs = [ ":system_dav1d" ] -+ deps = [ ":dav1d_headers" ] -+ public_configs = [ ":dav1d_config" ] - } diff --git a/www/ungoogled-chromium/files/patch-build_linux_unbundle_icu.gn b/www/ungoogled-chromium/files/patch-build_linux_unbundle_icu.gn index f224376e3327..993e55fbf2ca 100644 --- a/www/ungoogled-chromium/files/patch-build_linux_unbundle_icu.gn +++ b/www/ungoogled-chromium/files/patch-build_linux_unbundle_icu.gn @@ -1,4 +1,4 @@ ---- build/linux/unbundle/icu.gn.orig 2024-07-31 14:19:23 UTC +--- build/linux/unbundle/icu.gn.orig 2024-08-26 14:40:28 UTC +++ build/linux/unbundle/icu.gn @@ -17,6 +17,15 @@ config("icu_config") { "USING_SYSTEM_ICU=1", @@ -16,14 +16,3 @@ # U_EXPORT (defined in unicode/platform.h) is used to set public visibility # on classes through the U_COMMON_API and U_I18N_API macros (among others). # When linking against the system ICU library, we want its symbols to have -@@ -59,6 +68,10 @@ source_set("icuuc") { - ":icu_config", - ":system_icuuc", - ] -+} -+ -+group("icuuc_public") { -+ public_deps = [ ":icuuc" ] - } - - shim_headers("icui18n_shim") { diff --git a/www/ungoogled-chromium/files/patch-build_rust_rust__bindgen.gni b/www/ungoogled-chromium/files/patch-build_rust_rust__bindgen.gni index 92cb9517d705..54ae139bec4d 100644 --- a/www/ungoogled-chromium/files/patch-build_rust_rust__bindgen.gni +++ b/www/ungoogled-chromium/files/patch-build_rust_rust__bindgen.gni @@ -1,11 +1,11 @@ ---- build/rust/rust_bindgen.gni.orig 2024-07-31 14:19:23 UTC +--- build/rust/rust_bindgen.gni.orig 2024-08-26 14:40:28 UTC +++ build/rust/rust_bindgen.gni @@ -11,14 +11,14 @@ if (is_win) { import("//build/toolchain/win/win_toolchain_data.gni") } -_bindgen_path = "${rust_bindgen_root}/bin/bindgen" -+_bindgen_path = "${LOCALBASE}/bin/bindgen" ++_bindgen_path = "/usr/local/bin/bindgen" if (host_os == "win") { _bindgen_path = "${_bindgen_path}.exe" } @@ -13,7 +13,7 @@ # On Windows, the libclang.dll is beside the bindgen.exe, otherwise it is in # ../lib. -_libclang_path = rust_bindgen_root -+_libclang_path = "${LOCALBASE}/llvm${MODCLANG_VERSION}" ++_libclang_path = "/usr/local/llvm17" if (host_os == "win") { _libclang_path += "/bin" } else { diff --git a/www/ungoogled-chromium/files/patch-build_rust_std_BUILD.gn b/www/ungoogled-chromium/files/patch-build_rust_std_BUILD.gn index ea967f4ab6d6..5a32047d8c8b 100644 --- a/www/ungoogled-chromium/files/patch-build_rust_std_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-build_rust_std_BUILD.gn @@ -1,6 +1,6 @@ ---- build/rust/std/BUILD.gn.orig 2024-03-22 14:16:19 UTC +--- build/rust/std/BUILD.gn.orig 2024-08-26 14:40:28 UTC +++ build/rust/std/BUILD.gn -@@ -90,7 +90,6 @@ if (toolchain_has_rust) { +@@ -100,7 +100,6 @@ if (toolchain_has_rust) { # don't need to pass to the C++ linker because they're used for specialized # purposes. skip_stdlib_files = [ diff --git a/www/ungoogled-chromium/files/patch-build_toolchain_gcc__toolchain.gni b/www/ungoogled-chromium/files/patch-build_toolchain_gcc__toolchain.gni index 4c1092a1e43f..72ee30b12c3b 100644 --- a/www/ungoogled-chromium/files/patch-build_toolchain_gcc__toolchain.gni +++ b/www/ungoogled-chromium/files/patch-build_toolchain_gcc__toolchain.gni @@ -1,4 +1,4 @@ ---- build/toolchain/gcc_toolchain.gni.orig 2024-07-31 14:19:23 UTC +--- build/toolchain/gcc_toolchain.gni.orig 2024-08-26 14:40:28 UTC +++ build/toolchain/gcc_toolchain.gni @@ -56,6 +56,13 @@ if (enable_resource_allowlist_generation) { "enable_resource_allowlist_generation=true does not work for target_os=$target_os") @@ -14,7 +14,7 @@ # This template defines a toolchain for something that works like gcc # (including clang). # -@@ -864,22 +871,12 @@ template("gcc_toolchain") { +@@ -904,22 +911,12 @@ template("gcc_toolchain") { # actually just be doing a native compile. template("clang_toolchain") { gcc_toolchain(target_name) { diff --git a/www/ungoogled-chromium/files/patch-build_toolchain_toolchain.gni b/www/ungoogled-chromium/files/patch-build_toolchain_toolchain.gni index c1a7fdd342d9..5a447dd5cf54 100644 --- a/www/ungoogled-chromium/files/patch-build_toolchain_toolchain.gni +++ b/www/ungoogled-chromium/files/patch-build_toolchain_toolchain.gni @@ -1,10 +1,10 @@ ---- build/toolchain/toolchain.gni.orig 2024-03-22 14:16:19 UTC +--- build/toolchain/toolchain.gni.orig 2024-08-26 14:40:28 UTC +++ build/toolchain/toolchain.gni -@@ -68,7 +68,7 @@ if (host_os == "mac") { +@@ -72,7 +72,7 @@ if (host_os == "mac") { host_shlib_extension = ".dylib" } else if (host_os == "win") { host_shlib_extension = ".dll" --} else if (host_os == "linux" || host_os == "aix") { +-} else if (host_os == "linux" || host_os == "aix" || host_os == "zos") { +} else if (is_posix) { host_shlib_extension = ".so" } else { diff --git a/www/ungoogled-chromium/files/patch-cc_BUILD.gn b/www/ungoogled-chromium/files/patch-cc_BUILD.gn index 70f6941105aa..69b15463c1ae 100644 --- a/www/ungoogled-chromium/files/patch-cc_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-cc_BUILD.gn @@ -1,6 +1,6 @@ ---- cc/BUILD.gn.orig 2024-07-31 14:19:23 UTC +--- cc/BUILD.gn.orig 2024-08-26 14:40:28 UTC +++ cc/BUILD.gn -@@ -686,7 +686,7 @@ cc_test_static_library("test_support") { +@@ -685,7 +685,7 @@ cc_test_static_library("test_support") { if (enable_vulkan) { deps += [ "//gpu/vulkan/init" ] } @@ -9,7 +9,7 @@ data_deps = [ "//third_party/mesa_headers" ] } if (skia_use_dawn) { -@@ -945,7 +945,6 @@ cc_test("cc_unittests") { +@@ -944,7 +944,6 @@ cc_test("cc_unittests") { data = [ "//components/test/data/viz/" ] data_deps = [ "//testing/buildbot/filters:cc_unittests_filters", diff --git a/www/ungoogled-chromium/files/patch-cc_base_features.cc b/www/ungoogled-chromium/files/patch-cc_base_features.cc index 9873ad804ebb..389fd9f971f3 100644 --- a/www/ungoogled-chromium/files/patch-cc_base_features.cc +++ b/www/ungoogled-chromium/files/patch-cc_base_features.cc @@ -1,6 +1,6 @@ ---- cc/base/features.cc.orig 2024-07-31 14:19:23 UTC +--- cc/base/features.cc.orig 2024-08-26 14:40:28 UTC +++ cc/base/features.cc -@@ -86,7 +86,7 @@ BASE_FEATURE(kNormalPriorityImageDecoding, +@@ -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/ungoogled-chromium/files/patch-chrome_app_chrome__main.cc b/www/ungoogled-chromium/files/patch-chrome_app_chrome__main.cc index b7356cbd06b7..bbc15700a83a 100644 --- a/www/ungoogled-chromium/files/patch-chrome_app_chrome__main.cc +++ b/www/ungoogled-chromium/files/patch-chrome_app_chrome__main.cc @@ -1,6 +1,6 @@ ---- chrome/app/chrome_main.cc.orig 2024-03-22 14:16:19 UTC +--- chrome/app/chrome_main.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/app/chrome_main.cc -@@ -28,11 +28,11 @@ +@@ -30,11 +30,11 @@ #include "chrome/app/chrome_main_mac.h" #endif @@ -14,7 +14,16 @@ #include "chrome/app/chrome_main_linux.h" #endif -@@ -80,7 +80,7 @@ int ChromeMain(int argc, const char** argv) { +@@ -55,7 +55,7 @@ + #endif // BUILDFLAG(IS_WIN) + + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + #define ENABLE_OLD_HEADLESS + #endif + +@@ -119,7 +119,7 @@ int ChromeMain(int argc, const char** argv) { #error Unknown platform. #endif @@ -23,7 +32,7 @@ PossiblyDetermineFallbackChromeChannel(argv[0]); #endif -@@ -141,7 +141,7 @@ int ChromeMain(int argc, const char** argv) { +@@ -185,7 +185,7 @@ int ChromeMain(int argc, const char** argv) { SetUpBundleOverrides(); #endif @@ -32,12 +41,3 @@ AppendExtraArgumentsToCommandLine(command_line); #endif -@@ -170,7 +170,7 @@ int ChromeMain(int argc, const char** argv) { - headless_mode_handle = headless::InitHeadlessMode(); - } else { - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ -- BUILDFLAG(IS_WIN) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - if (headless::IsOldHeadlessMode()) { - #if BUILDFLAG(GOOGLE_CHROME_BRANDING) - command_line->AppendSwitch(::headless::switches::kEnableCrashReporter); diff --git a/www/ungoogled-chromium/files/patch-chrome_app_chrome__main__delegate.cc b/www/ungoogled-chromium/files/patch-chrome_app_chrome__main__delegate.cc index b2d46f1b0c8e..4153c297b70b 100644 --- a/www/ungoogled-chromium/files/patch-chrome_app_chrome__main__delegate.cc +++ b/www/ungoogled-chromium/files/patch-chrome_app_chrome__main__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2024-07-31 14:19:23 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/app/chrome_main_delegate.cc -@@ -138,7 +138,7 @@ +@@ -139,7 +139,7 @@ #include "components/about_ui/credit_utils.h" #endif @@ -9,7 +9,7 @@ #include "components/nacl/common/nacl_paths.h" #include "components/nacl/zygote/nacl_fork_delegate_linux.h" #endif -@@ -182,21 +182,21 @@ +@@ -183,21 +183,21 @@ #include "v8/include/v8.h" #endif @@ -35,16 +35,7 @@ #include "chrome/browser/policy/policy_path_parser.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -243,7 +243,7 @@ - #include "base/scoped_add_feature_flags.h" - #include "ui/base/ui_base_features.h" - #include "ui/ozone/public/ozone_platform.h" --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "chrome/browser/chrome_browser_main_extra_parts_linux.h" - #endif - #endif // BUILDFLAG(IS_OZONE) -@@ -343,7 +343,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty +@@ -341,7 +341,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty // and resources loaded. bool SubprocessNeedsResourceBundle(const std::string& process_type) { return @@ -53,7 +44,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 +@@ -426,7 +426,7 @@ bool HandleVersionSwitches(const base::CommandLine& co // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -62,7 +53,7 @@ // 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() { +@@ -472,7 +472,7 @@ void SetCrashpadUploadConsentPostLogin() { } #endif // BUILDFLAG(IS_CHROMEOS_LACROS) @@ -71,7 +62,7 @@ void SIGTERMProfilingShutdown(int signal) { content::Profiling::Stop(); struct sigaction sigact; -@@ -556,7 +556,7 @@ std::optional<int> AcquireProcessSingleton( +@@ -554,7 +554,7 @@ std::optional<int> AcquireProcessSingleton( // process can be exited. ChromeProcessSingleton::CreateInstance(user_data_dir); @@ -80,7 +71,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_ +@@ -638,7 +638,7 @@ void InitializeUserDataDir(base::CommandLine* command_ std::string process_type = command_line->GetSwitchValueASCII(switches::kProcessType); @@ -89,7 +80,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. -@@ -767,7 +767,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat +@@ -768,7 +768,7 @@ void RecordMainStartupMetrics(const StartupTimestamps& #endif #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ @@ -98,7 +89,7 @@ // Record the startup process creation time on supported platforms. On Android // this is recorded in ChromeMainDelegateAndroid. startup_metric_utils::GetCommon().RecordStartupProcessCreationTime( -@@ -959,7 +959,7 @@ std::optional<int> ChromeMainDelegate::PostEarlyInitia +@@ -962,7 +962,7 @@ std::optional<int> ChromeMainDelegate::PostEarlyInitia #if BUILDFLAG(IS_OZONE) // Initialize Ozone platform and add required feature flags as per platform's // properties. @@ -107,7 +98,7 @@ ui::SetOzonePlatformForLinuxIfNeeded(*base::CommandLine::ForCurrentProcess()); #endif ui::OzonePlatform::PreEarlyInitialization(); -@@ -1154,7 +1154,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv +@@ -1160,7 +1160,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) || \ @@ -116,7 +107,7 @@ is_canary_dev; #else false; -@@ -1309,7 +1309,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom +@@ -1315,7 +1315,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom // TODO(crbug.com/40118868): Revisit the macro expression once build flag // switch of lacros-chrome is complete. @@ -125,7 +116,7 @@ // This will directly exit if the user asked for help. HandleHelpSwitches(command_line); #endif -@@ -1339,7 +1339,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom +@@ -1345,7 +1345,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom #if BUILDFLAG(IS_CHROMEOS) chromeos::dbus_paths::RegisterPathProvider(); #endif @@ -134,16 +125,23 @@ nacl::RegisterPathProvider(); #endif -@@ -1726,7 +1726,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1732,7 +1732,7 @@ void ChromeMainDelegate::PreSandboxStartup() { CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale; } -#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD) // Zygote needs to call InitCrashReporter() in RunZygote(). - if (process_type != switches::kZygoteProcess) { - if (command_line.HasSwitch(switches::kPreCrashpadCrashTest)) { -@@ -1827,7 +1827,7 @@ absl::variant<int, content::MainFunctionParams> Chrome + if (process_type != switches::kZygoteProcess && + !command_line.HasSwitch(switches::kDisableCrashpadForTesting)) { +@@ -1828,13 +1828,13 @@ absl::variant<int, content::MainFunctionParams> Chrome + #else + + #if BUILDFLAG(IS_MAC) || (BUILDFLAG(ENABLE_NACL) && !BUILDFLAG(IS_LINUX) && \ +- !BUILDFLAG(IS_CHROMEOS)) ++ !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD)) + static const MainFunction kMainFunctions[] = { + #if BUILDFLAG(IS_MAC) {switches::kRelauncherProcess, mac_relauncher::internal::RelauncherMain}, {switches::kCodeSignCloneCleanupProcess, code_sign_clone_manager::internal::ChromeCodeSignCloneCleanupMain}, diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_BUILD.gn b/www/ungoogled-chromium/files/patch-chrome_browser_BUILD.gn index f2c3635507ac..dfb6477d609a 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-chrome_browser_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/browser/BUILD.gn.orig 2024-07-31 14:19:23 UTC +--- chrome/browser/BUILD.gn.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/BUILD.gn -@@ -6652,6 +6652,13 @@ static_library("browser") { +@@ -6994,6 +6994,13 @@ static_library("browser") { } } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_about__flags.cc b/www/ungoogled-chromium/files/patch-chrome_browser_about__flags.cc index 67830278415e..c719e414e314 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_about__flags.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_about__flags.cc @@ -1,4 +1,4 @@ ---- chrome/browser/about_flags.cc.orig 2024-08-16 07:52:02 UTC +--- chrome/browser/about_flags.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/about_flags.cc @@ -239,7 +239,7 @@ #include "ui/ui_features.h" @@ -27,7 +27,16 @@ #include "chrome/browser/enterprise/profile_management/profile_management_features.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -@@ -477,7 +477,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap +@@ -352,7 +352,7 @@ + #include "components/user_education/common/user_education_features.h" // nogncheck + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "chrome/browser/ui/ui_features.h" + #include "ui/base/ui_base_features.h" + #endif +@@ -494,7 +494,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap {"Max 3 Frames", &kDXGIWaitableSwapChain3Frames, 1, nullptr}}; #endif @@ -36,7 +45,7 @@ const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = { {flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""}, {flag_descriptions::kOzonePlatformHintChoiceAuto, -@@ -848,6 +848,26 @@ const FeatureEntry::FeatureVariation +@@ -894,6 +894,26 @@ const FeatureEntry::FeatureVariation std::size(kWebIdentityDigitalIdentityCredentialHighRiskDialogParam), nullptr}}; @@ -63,7 +72,7 @@ const FeatureEntry::FeatureParam kClipboardMaximumAge60Seconds[] = { {"UIClipboardMaximumAge", "60"}}; const FeatureEntry::FeatureParam kClipboardMaximumAge90Seconds[] = { -@@ -1261,7 +1281,7 @@ const FeatureEntry::FeatureVariation kPageContentAnnot +@@ -1307,7 +1327,7 @@ const FeatureEntry::FeatureVariation kPageContentAnnot }; #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -72,7 +81,7 @@ const FeatureEntry::FeatureParam kHistoryEmbeddingsAtKeywordAcceleration[]{ {"AtKeywordAcceleration", "true"}, }; -@@ -1324,7 +1344,7 @@ const FeatureEntry::FeatureVariation +@@ -1351,7 +1371,7 @@ const FeatureEntry::FeatureVariation }; #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -81,16 +90,16 @@ const FeatureEntry::FeatureParam kShortcutBoostSingleUrl[] = { {"ShortcutBoostSearchScore", "0"}, {"ShortcutBoostNonTopHitThreshold", "0"}, -@@ -3828,7 +3848,7 @@ const flags_ui::FeatureEntry::FeatureVariation - std::size(kParcelTrackingTestDataOutForDelivery), nullptr}, +@@ -3780,7 +3800,7 @@ const flags_ui::FeatureEntry::FeatureVariation }; --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - const flags_ui::FeatureEntry::FeatureParam - kDesktopPWAsLinkCapturingDefaultOn[] = {{"on_by_default", "true"}}; + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) const flags_ui::FeatureEntry::FeatureParam -@@ -4809,7 +4829,7 @@ const FeatureEntry kFeatureEntries[] = { + kDesktopPWAsLinkCapturingDefaultOn[] = { + {"link_capturing_state", "on_by_default"}}; +@@ -4867,7 +4887,7 @@ const FeatureEntry kFeatureEntries[] = { }, #endif // BUILDFLAG(IS_ANDROID) @@ -99,7 +108,7 @@ { "fluent-overlay-scrollbars", flag_descriptions::kFluentOverlayScrollbarsName, -@@ -5225,7 +5245,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5286,7 +5306,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kWebAppUniversalInstallDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kWebAppUniversalInstall)}, #endif // !BUILDFLAG(IS_ANDROID) @@ -108,7 +117,7 @@ {"shortcuts-not-apps", flag_descriptions::kShortcutsNotAppsName, flag_descriptions::kShortcutsNotAppsDescription, kOsMac | kOsWin | kOsLinux, -@@ -5357,7 +5377,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5422,7 +5442,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kWebShare)}, #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -117,10 +126,10 @@ {"pulseaudio-loopback-for-cast", flag_descriptions::kPulseaudioLoopbackForCastName, flag_descriptions::kPulseaudioLoopbackForCastDescription, kOsLinux, -@@ -5371,9 +5391,19 @@ const FeatureEntry kFeatureEntries[] = { - {"ozone-platform-hint", flag_descriptions::kOzonePlatformHintName, - flag_descriptions::kOzonePlatformHintDescription, kOsLinux, - MULTI_VALUE_TYPE(kOzonePlatformHintRuntimeChoices)}, +@@ -5445,9 +5465,19 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kWaylandPerWindowScalingName, + flag_descriptions::kWaylandPerWindowScalingDescription, kOsLinux, + FEATURE_VALUE_TYPE(features::kWaylandPerSurfaceScale)}, + +#if BUILDFLAG(IS_BSD) + {"audio-backend", @@ -138,8 +147,8 @@ {"skip-undecryptable-passwords", flag_descriptions::kSkipUndecryptablePasswordsName, flag_descriptions::kSkipUndecryptablePasswordsDescription, -@@ -6313,7 +6343,7 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(omnibox::kZeroSuggestInMemoryCaching)}, +@@ -6442,7 +6472,7 @@ const FeatureEntry kFeatureEntries[] = { + "MlUrlScoring")}, #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) @@ -147,7 +156,7 @@ {"omnibox-domain-suggestions", flag_descriptions::kOmniboxDomainSuggestionsName, flag_descriptions::kOmniboxDomainSuggestionsDescription, kOsDesktop, -@@ -6647,7 +6677,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6737,7 +6767,7 @@ const FeatureEntry kFeatureEntries[] = { "OrganicRepeatableQueries")}, #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -156,7 +165,7 @@ {"history-embeddings", flag_descriptions::kHistoryEmbeddingsName, flag_descriptions::kHistoryEmbeddingsDescription, kOsDesktop, FEATURE_WITH_PARAMS_VALUE_TYPE(history_embeddings::kHistoryEmbeddings, -@@ -7337,7 +7367,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7406,7 +7436,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(printing::features::kAddPrinterViaPrintscanmgr)}, #endif // BUILDFLAG(IS_CHROMEOS) @@ -165,7 +174,7 @@ {"cups-ipp-printing-backend", flag_descriptions::kCupsIppPrintingBackendName, flag_descriptions::kCupsIppPrintingBackendDescription, kOsDesktop, -@@ -8336,7 +8366,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8426,7 +8456,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kCooperativeSchedulingDescription, kOsAll, FEATURE_VALUE_TYPE(features::kCooperativeScheduling)}, @@ -174,7 +183,7 @@ {"enable-network-service-sandbox", flag_descriptions::kEnableNetworkServiceSandboxName, flag_descriptions::kEnableNetworkServiceSandboxDescription, -@@ -8360,7 +8390,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8450,7 +8480,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(media::kV4L2FlatStatefulVideoDecoder)}, #endif @@ -183,7 +192,7 @@ {"enable-family-link-extensions-permissions", flag_descriptions:: kEnableExtensionsPermissionsForSupervisedUsersOnDesktopName, -@@ -9222,7 +9252,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9301,7 +9331,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(ash::features::kWallpaperPerDesk)}, #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -192,7 +201,7 @@ {"enable-get-all-screens-media", flag_descriptions::kGetAllScreensMediaName, flag_descriptions::kGetAllScreensMediaDescription, kOsCrOS | kOsLacros | kOsLinux, -@@ -9261,7 +9291,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9340,7 +9370,7 @@ const FeatureEntry kFeatureEntries[] = { #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -201,7 +210,7 @@ { "ui-debug-tools", flag_descriptions::kUIDebugToolsName, -@@ -9503,7 +9533,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9565,7 +9595,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -210,7 +219,7 @@ {"policy-indication-for-managed-default-search", flag_descriptions::kPolicyIndicationForManagedDefaultSearchName, flag_descriptions::kPolicyIndicationForManagedDefaultSearchDescription, -@@ -9816,7 +9846,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9905,7 +9935,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -219,7 +228,7 @@ {"media-session-enter-picture-in-picture", flag_descriptions::kMediaSessionEnterPictureInPictureName, flag_descriptions::kMediaSessionEnterPictureInPictureDescription, -@@ -10711,7 +10741,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10805,7 +10835,7 @@ const FeatureEntry kFeatureEntries[] = { kOsDesktop | kOsAndroid, FEATURE_VALUE_TYPE(features::kProcessPerSiteUpToMainFrameThreshold)}, @@ -228,7 +237,7 @@ {"camera-mic-effects", flag_descriptions::kCameraMicEffectsName, flag_descriptions::kCameraMicEffectsDescription, static_cast<unsigned short>(kOsMac | kOsWin | kOsLinux), -@@ -10749,7 +10779,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10843,7 +10873,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kSiteInstanceGroupsForDataUrls)}, #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -237,7 +246,7 @@ {"site-search-settings-policy", flag_descriptions::kSiteSearchSettingsPolicyName, flag_descriptions::kSiteSearchSettingsPolicyDescription, kOsAll, -@@ -10873,7 +10903,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10968,7 +10998,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kHideIncognitoMediaMetadataDescription, kOsAll, FEATURE_VALUE_TYPE(media::kHideIncognitoMediaMetadata)}, @@ -246,7 +255,16 @@ {"third-party-profile-management", flag_descriptions::kThirdPartyProfileManagementName, flag_descriptions::kThirdPartyProfileManagementDescription, -@@ -11209,7 +11239,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -11011,7 +11041,7 @@ const FeatureEntry kFeatureEntries[] = { + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) + + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + {"enable-user-link-capturing-pwa", + flag_descriptions::kDesktopPWAsUserLinkCapturingName, + flag_descriptions::kDesktopPWAsUserLinkCapturingDescription, +@@ -11327,7 +11357,7 @@ const FeatureEntry kFeatureEntries[] = { trusted_vault::kTrustedVaultFrequentDegradedRecoverabilityPolling)}, #endif @@ -255,12 +273,21 @@ {"restart-to-gain-access-to-keychain", flag_descriptions::kRestartToGainAccessToKeychainName, flag_descriptions::kRestartToGainAccessToKeychainDescription, -@@ -11496,7 +11526,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -11990,7 +12020,7 @@ const FeatureEntry kFeatureEntries[] = { + kAuthenticateUsingUserConsentVerifierInteropApi)}, + #endif + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + {"sync-enable-bookmarks-in-transport-mode", + flag_descriptions::kSyncEnableBookmarksInTransportModeName, + flag_descriptions::kSyncEnableBookmarksInTransportModeDescription, +@@ -12016,7 +12046,7 @@ const FeatureEntry kFeatureEntries[] = { + "AutofillUploadCardRequestTimeout")}, - // Controls the view mode for (history) sync screen. - #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ -- BUILDFLAG(IS_ANDROID) -+ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - {"minor-mode-restrictions-for-history-sync-opt-in", - flag_descriptions::kMinorModeRestrictionsForHistorySyncOptInName, - flag_descriptions::kMinorModeRestrictionsForHistorySyncOptInDescription, + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + {"autofill-enable-amount-extraction-desktop", + flag_descriptions::kAutofillEnableAmountExtractionDesktopName, + flag_descriptions::kAutofillEnableAmountExtractionDesktopDescription, diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_accessibility_page__colors.cc b/www/ungoogled-chromium/files/patch-chrome_browser_accessibility_page__colors.cc new file mode 100644 index 000000000000..eb30abb2864b --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_accessibility_page__colors.cc @@ -0,0 +1,20 @@ +--- chrome/browser/accessibility/page_colors.cc.orig 2024-08-26 14:40:28 UTC ++++ chrome/browser/accessibility/page_colors.cc +@@ -12,7 +12,7 @@ + #include "components/sync_preferences/pref_service_syncable.h" + #include "ui/native_theme/native_theme.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "ui/linux/linux_ui.h" + #include "ui/linux/linux_ui_factory.h" + #endif // BUILDFLAG(IS_LINUX) +@@ -55,7 +55,7 @@ void PageColors::Init() { + + void PageColors::OnPageColorsChanged() { + auto* native_theme = ui::NativeTheme::GetInstanceForNativeUi(); +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Allow the Linux native theme to update its state for page colors. + if (auto* linux_ui_theme = ui::GetDefaultLinuxUiTheme()) { + if (auto* linux_native_theme = linux_ui_theme->GetNativeTheme()) { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_browser__features.cc b/www/ungoogled-chromium/files/patch-chrome_browser_browser__features.cc index 0a640e41e0f9..692603803f17 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_browser__features.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_browser__features.cc @@ -1,6 +1,6 @@ ---- chrome/browser/browser_features.cc.orig 2024-07-31 14:19:23 UTC +--- chrome/browser/browser_features.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/browser_features.cc -@@ -61,7 +61,7 @@ BASE_FEATURE(kClosedTabCache, +@@ -69,7 +69,7 @@ BASE_FEATURE(kClosedTabCache, BASE_FEATURE(kDestroyProfileOnBrowserClose, "DestroyProfileOnBrowserClose", #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -9,7 +9,7 @@ base::FEATURE_ENABLED_BY_DEFAULT); #else base::FEATURE_DISABLED_BY_DEFAULT); -@@ -330,7 +330,7 @@ BASE_FEATURE(kSandboxExternalProtocolBlockedWarning, +@@ -316,7 +316,7 @@ BASE_FEATURE(kSandboxExternalProtocolBlockedWarning, BASE_FEATURE(kSupportSearchSuggestionForPrerender2, "SupportSearchSuggestionForPrerender2", #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_browser__process__impl.cc b/www/ungoogled-chromium/files/patch-chrome_browser_browser__process__impl.cc index 67fcb6923312..a5f09e3d6252 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_browser__process__impl.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_browser__process__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/browser_process_impl.cc.orig 2024-07-31 14:19:23 UTC +--- chrome/browser/browser_process_impl.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/browser_process_impl.cc -@@ -231,7 +231,7 @@ +@@ -230,7 +230,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 -@@ -1287,7 +1287,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { +@@ -1282,7 +1282,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { ApplyMetricsReportingPolicy(); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__field__trials.cc b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__field__trials.cc new file mode 100644 index 000000000000..f3e5313c2dc9 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__field__trials.cc @@ -0,0 +1,20 @@ +--- chrome/browser/chrome_browser_field_trials.cc.orig 2024-08-26 14:40:28 UTC ++++ chrome/browser/chrome_browser_field_trials.cc +@@ -48,7 +48,7 @@ + #include "chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_trial.h" + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "base/nix/xdg_util.h" + #include "ui/base/ui_base_features.h" + #endif // BUILDFLAG(IS_LINUX) +@@ -155,7 +155,7 @@ void ChromeBrowserFieldTrials::RegisterSyntheticTrials + #endif + } + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // On Linux/Desktop platform variants, such as ozone/wayland, some features + // might need to be disabled as per OzonePlatform's runtime properties. + // OzonePlatform selection and initialization, in turn, depend on Chrome flags diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__field__trials.h b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__field__trials.h new file mode 100644 index 000000000000..8c6661db7236 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__field__trials.h @@ -0,0 +1,11 @@ +--- chrome/browser/chrome_browser_field_trials.h.orig 2024-08-26 14:40:28 UTC ++++ chrome/browser/chrome_browser_field_trials.h +@@ -34,7 +34,7 @@ class ChromeBrowserFieldTrials : public variations::Pl + const variations::EntropyProviders& entropy_providers, + base::FeatureList* feature_list) override; + void RegisterSyntheticTrials() override; +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void RegisterFeatureOverrides(base::FeatureList* feature_list) override; + #endif + diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc index 709b0a9161fd..77075f8b92af 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_interface_binders.cc.orig 2024-07-31 14:19:23 UTC +--- chrome/browser/chrome_browser_interface_binders.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/chrome_browser_interface_binders.cc -@@ -134,12 +134,12 @@ +@@ -133,12 +133,12 @@ #endif // BUILDFLAG(FULL_SAFE_BROWSING) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -15,7 +15,7 @@ #include "chrome/browser/ui/webui/app_settings/web_app_settings_ui.h" #include "ui/webui/resources/cr_components/app_management/app_management.mojom.h" #endif -@@ -230,7 +230,7 @@ +@@ -226,7 +226,7 @@ #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -24,7 +24,7 @@ #include "chrome/browser/companion/visual_query/visual_query_suggestions_service_factory.h" #include "chrome/browser/ui/web_applications/sub_apps_service_impl.h" #include "chrome/browser/ui/webui/discards/discards.mojom.h" -@@ -241,7 +241,7 @@ +@@ -237,7 +237,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) -@@ -865,7 +865,7 @@ void BindScreen2xMainContentExtractor( +@@ -864,7 +864,7 @@ void BindScreen2xMainContentExtractor( #endif #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -42,7 +42,7 @@ void BindVisualSuggestionsModelProvider( content::RenderFrameHost* frame_host, mojo::PendingReceiver< -@@ -1061,7 +1061,7 @@ void PopulateChromeFrameBinders( +@@ -1060,7 +1060,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 -@@ -1152,7 +1152,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -1158,7 +1158,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); -@@ -1163,7 +1163,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -1169,7 +1169,7 @@ void PopulateChromeWebUIFrameBinders( policy::DlpInternalsUI>(map); #endif @@ -69,7 +69,7 @@ RegisterWebUIControllerInterfaceBinder< app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map); #endif -@@ -1256,7 +1256,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -1261,7 +1261,7 @@ void PopulateChromeWebUIFrameBinders( RegisterWebUIControllerInterfaceBinder< browser_command::mojom::CommandHandlerFactory, @@ -78,7 +78,7 @@ WhatsNewUI, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) NewTabPageUI>(map); -@@ -1797,7 +1797,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -1753,7 +1753,7 @@ void PopulateChromeWebUIFrameBinders( #endif // BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main.cc b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main.cc index ed3157e39ba5..01c26ca5fcb0 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_main.cc.orig 2024-07-31 14:19:23 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/chrome_browser_main.cc -@@ -247,15 +247,15 @@ +@@ -251,15 +251,15 @@ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -19,7 +19,7 @@ #include "base/nix/xdg_util.h" #endif -@@ -288,14 +288,14 @@ +@@ -292,14 +292,14 @@ // 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) || \ @@ -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" -@@ -367,14 +367,14 @@ +@@ -371,14 +371,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"); -@@ -539,7 +539,7 @@ void ProcessSingletonNotificationCallbackImpl( +@@ -543,7 +543,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. -@@ -1102,7 +1102,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1110,7 +1110,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 . -@@ -1150,7 +1150,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1158,7 +1158,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( -@@ -1337,7 +1337,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* +@@ -1345,7 +1345,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( -@@ -1386,7 +1386,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* +@@ -1394,7 +1394,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* *UrlLanguageHistogramFactory::GetForBrowserContext(profile)); #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -98,7 +98,7 @@ if (headless::IsHeadlessMode()) { headless::ReportHeadlessActionMetrics(); } -@@ -1496,7 +1496,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl( +@@ -1506,7 +1506,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(); } -@@ -2042,7 +2042,7 @@ bool ChromeBrowserMainParts::ProcessSingletonNotificat +@@ -2052,7 +2052,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/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc index b19120111513..fe9ce36d357b 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc @@ -1,4 +1,4 @@ ---- chrome/browser/chrome_browser_main_linux.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/chrome_browser_main_linux.cc.orig 2024-08-26 14:40:28 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 -@@ -72,7 +72,9 @@ void ChromeBrowserMainPartsLinux::PostCreateMainMessag +@@ -84,7 +84,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 -@@ -98,7 +100,7 @@ void ChromeBrowserMainPartsLinux::PostCreateMainMessag +@@ -110,7 +112,7 @@ void ChromeBrowserMainPartsLinux::PostCreateMainMessag ChromeBrowserMainPartsPosix::PostCreateMainMessageLoop(); } @@ -28,8 +28,8 @@ void ChromeBrowserMainPartsLinux::PostMainMessageLoopRun() { ChromeBrowserMainPartsPosix::PostMainMessageLoopRun(); ui::OzonePlatform::GetInstance()->PostMainMessageLoopRun(); -@@ -137,7 +139,7 @@ void ChromeBrowserMainPartsLinux::PostBrowserStart() { - #endif // defined(USE_DBUS) && !BUILDFLAG(IS_CHROMEOS) +@@ -169,7 +171,7 @@ void ChromeBrowserMainPartsLinux::CheckIfSanitizeCompl + #endif // BUILDFLAG(IS_CHROMEOS_ASH) void ChromeBrowserMainPartsLinux::PostDestroyThreads() { -#if BUILDFLAG(IS_CHROMEOS) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__content__browser__client.cc b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__content__browser__client.cc index dfe42bdd745d..3714d53110e1 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__content__browser__client.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__content__browser__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_content_browser_client.cc.orig 2024-07-31 14:19:23 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -468,7 +468,7 @@ +@@ -476,7 +476,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) -@@ -584,12 +584,12 @@ +@@ -592,12 +592,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 -@@ -600,7 +600,7 @@ +@@ -608,7 +608,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" -@@ -608,7 +608,7 @@ +@@ -616,7 +616,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) -@@ -623,7 +623,7 @@ +@@ -631,7 +631,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" -@@ -1541,7 +1541,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre +@@ -1575,7 +1575,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) -@@ -1672,7 +1672,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1775,7 +1775,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) -@@ -1706,7 +1706,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1809,7 +1809,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 -@@ -1727,7 +1727,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1830,7 +1830,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>()); -@@ -1746,7 +1746,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1849,7 +1849,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo chrome::AddMetricsExtraParts(main_parts.get()); @@ -96,7 +96,7 @@ main_parts->AddParts( std::make_unique< chrome::enterprise_util::ChromeBrowserMainExtraPartsEnterprise>()); -@@ -2908,7 +2908,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -3045,7 +3045,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin } } @@ -105,7 +105,7 @@ // Opt into a hardened stack canary mitigation if it hasn't already been // force-disabled. if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) { -@@ -4683,7 +4683,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst +@@ -4873,7 +4873,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst } } @@ -114,7 +114,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -5247,7 +5247,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5460,7 +5460,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati &throttles); } @@ -123,7 +123,7 @@ MaybeAddThrottle( WebAppSettingsNavigationThrottle::MaybeCreateThrottleFor(handle), &throttles); -@@ -5261,7 +5261,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5474,7 +5474,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -132,7 +132,7 @@ MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle:: MaybeCreateThrottleFor(handle), &throttles); -@@ -5292,7 +5292,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5505,7 +5505,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati } #endif @@ -141,7 +141,7 @@ MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle:: MaybeCreateThrottleFor(handle), &throttles); -@@ -7214,7 +7214,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS +@@ -7364,7 +7364,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/ungoogled-chromium/files/patch-chrome_browser_chrome__content__browser__client.h b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__content__browser__client.h index cd2d3e89bb35..b5a4aa5495c2 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__content__browser__client.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__content__browser__client.h @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_content_browser_client.h.orig 2024-07-31 14:19:23 UTC +--- chrome/browser/chrome_content_browser_client.h.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/chrome_content_browser_client.h -@@ -513,7 +513,7 @@ class ChromeContentBrowserClient : public content::Con +@@ -523,7 +523,7 @@ class ChromeContentBrowserClient : public content::Con bool IsPluginAllowedToUseDevChannelAPIs( content::BrowserContext* browser_context, const GURL& url) override; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc b/www/ungoogled-chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc index 127ccb375016..1108e4cf0b75 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc +++ b/www/ungoogled-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-07-31 14:19:23 UTC +--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/download/chrome_download_manager_delegate.cc -@@ -1700,7 +1700,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1724,7 +1724,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(); } -@@ -1799,7 +1799,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow +@@ -1825,7 +1825,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) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_download_download__item__model.cc b/www/ungoogled-chromium/files/patch-chrome_browser_download_download__item__model.cc index d2b1f2b544d1..d18672616aed 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_download_download__item__model.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_download_download__item__model.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_item_model.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/download/download_item_model.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/download/download_item_model.cc -@@ -796,7 +796,7 @@ bool DownloadItemModel::IsCommandChecked( +@@ -811,7 +811,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(); -@@ -844,7 +844,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand +@@ -859,7 +859,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); -@@ -1192,7 +1192,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe +@@ -1207,7 +1207,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe return; } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_browser__management_browser__management__service.cc b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_browser__management_browser__management__service.cc deleted file mode 100644 index fb9628d756c5..000000000000 --- a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_browser__management_browser__management__service.cc +++ /dev/null @@ -1,29 +0,0 @@ ---- chrome/browser/enterprise/browser_management/browser_management_service.cc.orig 2024-04-23 07:42:17 UTC -+++ chrome/browser/enterprise/browser_management/browser_management_service.cc -@@ -21,7 +21,7 @@ namespace policy { - - namespace { - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - void UpdateEnterpriseLogo( - Profile* profile, - base::OnceCallback<void(const gfx::Image&, -@@ -98,7 +98,7 @@ GetManagementStatusProviders(Profile* profile) { - } // namespace - - BrowserManagementMetadata::BrowserManagementMetadata(Profile* profile) { --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - UpdateManagementLogo(profile); - pref_change_registrar_.Init(profile->GetPrefs()); - pref_change_registrar_.Add( -@@ -114,7 +114,7 @@ const gfx::Image& BrowserManagementMetadata::GetManage - return management_logo_; - } - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - void BrowserManagementMetadata::UpdateManagementLogo(Profile* profile) { - UpdateEnterpriseLogo( - profile, base::BindOnce(&BrowserManagementMetadata::SetManagementLogo, diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_browser__management_browser__management__service.h b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_browser__management_browser__management__service.h deleted file mode 100644 index c2693b395b37..000000000000 --- a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_browser__management_browser__management__service.h +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/enterprise/browser_management/browser_management_service.h.orig 2024-04-23 07:42:17 UTC -+++ chrome/browser/enterprise/browser_management/browser_management_service.h -@@ -28,7 +28,7 @@ class BrowserManagementMetadata { - - const gfx::Image& GetManagementLogo() const; - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - private: - void UpdateManagementLogo(Profile* profile); - void SetManagementLogo( diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc index 69c42d6a1dd0..425c571847ce 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/enterprise/connectors/connectors_service.cc.orig 2024-07-31 14:19:23 UTC +--- chrome/browser/enterprise/connectors/connectors_service.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/enterprise/connectors/connectors_service.cc -@@ -523,7 +523,7 @@ bool ConnectorsService::ConnectorsEnabled() const { +@@ -525,7 +525,7 @@ bool ConnectorsService::ConnectorsEnabled() const { Profile* profile = Profile::FromBrowserContext(context_); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc index eab5649000b8..b249cfe75865 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc @@ -1,4 +1,4 @@ ---- chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc.orig 2023-12-23 12:33:28 UTC +--- chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc @@ -10,7 +10,7 @@ #include "chrome/browser/profiles/profile.h" @@ -18,7 +18,7 @@ return true; #else return false; -@@ -79,7 +79,7 @@ DeviceTrustConnectorServiceFactory::BuildServiceInstan +@@ -84,7 +84,7 @@ DeviceTrustConnectorServiceFactory::BuildServiceInstan std::unique_ptr<DeviceTrustConnectorService> service = std::make_unique<DeviceTrustConnectorService>(profile->GetPrefs()); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc index c94f9ad69fb0..674aa0257f62 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc @@ -1,4 +1,4 @@ ---- chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc @@ -23,7 +23,7 @@ #include "components/policy/core/common/management/management_service.h" @@ -18,7 +18,7 @@ policy::CloudPolicyStore* GetUserCloudPolicyStore(Profile* profile) { policy::CloudPolicyManager* user_policy_manager = profile->GetCloudPolicyManager(); -@@ -101,7 +101,7 @@ DeviceTrustServiceFactory::DeviceTrustServiceFactory() +@@ -106,7 +106,7 @@ DeviceTrustServiceFactory::DeviceTrustServiceFactory() DependsOn(DeviceTrustConnectorServiceFactory::GetInstance()); DependsOn(policy::ManagementServiceFactory::GetInstance()); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc index b42f0eb0d857..62f877d36159 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc @@ -1,4 +1,4 @@ ---- chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc.orig 2023-08-18 10:26:52 UTC +--- chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc @@ -21,7 +21,7 @@ #include "chrome/browser/profiles/profile.h" @@ -8,7 +8,7 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) #include "base/check.h" #include "chrome/browser/enterprise/connectors/device_trust/signals/decorators/browser/browser_signals_decorator.h" - #include "chrome/browser/enterprise/connectors/device_trust/signals/dependency_factory.h" + #include "chrome/browser/enterprise/core/dependency_factory_impl.h" @@ -58,7 +58,7 @@ std::unique_ptr<SignalsService> CreateSignalsService(P enterprise_signals::ContextInfoFetcher::CreateInstance( profile, ConnectorsServiceFactory::GetForBrowserContext(profile)))); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc index 8934f43f28c4..99fb13f5a14b 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc @@ -1,6 +1,6 @@ ---- chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.cc -@@ -11,7 +11,7 @@ namespace enterprise_connectors { +@@ -13,7 +13,7 @@ namespace enterprise_connectors { BrowserCrashEventRouter::BrowserCrashEventRouter( content::BrowserContext* context) { @@ -9,7 +9,7 @@ CrashReportingContext* crash_reporting_context = CrashReportingContext::GetInstance(); Profile* profile = Profile::FromBrowserContext(context); -@@ -21,7 +21,7 @@ BrowserCrashEventRouter::BrowserCrashEventRouter( +@@ -23,7 +23,7 @@ BrowserCrashEventRouter::BrowserCrashEventRouter( } BrowserCrashEventRouter::~BrowserCrashEventRouter() { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_crash__reporting__context.cc b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_crash__reporting__context.cc index c214f7625b8a..8c616424ad1d 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_crash__reporting__context.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_crash__reporting__context.cc @@ -1,6 +1,6 @@ ---- chrome/browser/enterprise/connectors/reporting/crash_reporting_context.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/enterprise/connectors/reporting/crash_reporting_context.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/enterprise/connectors/reporting/crash_reporting_context.cc -@@ -18,7 +18,7 @@ +@@ -19,7 +19,7 @@ namespace enterprise_connectors { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_signin_enterprise__signin__service.h b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_signin_enterprise__signin__service.h new file mode 100644 index 000000000000..4c3c1dabf349 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_signin_enterprise__signin__service.h @@ -0,0 +1,11 @@ +--- chrome/browser/enterprise/signin/enterprise_signin_service.h.orig 2024-08-26 14:40:28 UTC ++++ chrome/browser/enterprise/signin/enterprise_signin_service.h +@@ -9,7 +9,7 @@ + + #include "build/build_config.h" + +-#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)) ++#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)) + #error EnterpriseSigninService should only be built on desktop platforms. + #endif // !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)) + diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_BUILD.gn b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_BUILD.gn index 990f4b3007c8..390cb29ea4ec 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/BUILD.gn.orig 2024-07-31 14:19:23 UTC +--- chrome/browser/extensions/BUILD.gn.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/extensions/BUILD.gn -@@ -1410,6 +1410,10 @@ source_set("extensions") { +@@ -1508,6 +1508,10 @@ source_set("extensions") { deps += [ "//chrome/services/printing/public/mojom" ] } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_management_chrome__management__api__delegate.cc b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_management_chrome__management__api__delegate.cc index ac6ef068eb1f..63603a255510 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_management_chrome__management__api__delegate.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_management_chrome__management__api__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/management/chrome_management_api_delegate.cc.orig 2024-07-31 14:19:23 UTC +--- chrome/browser/extensions/api/management/chrome_management_api_delegate.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/extensions/api/management/chrome_management_api_delegate.cc -@@ -414,7 +414,7 @@ bool ChromeManagementAPIDelegate::LaunchAppFunctionDel +@@ -417,7 +417,7 @@ bool ChromeManagementAPIDelegate::LaunchAppFunctionDel apps::LaunchContainer launch_container = GetLaunchContainer(extensions::ExtensionPrefs::Get(context), extension); Profile* profile = Profile::FromBrowserContext(context); diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_messaging_native__process__launcher__posix.cc b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_messaging_launch__context__posix.cc index a022ae90883f..30bbcf9e848e 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_messaging_native__process__launcher__posix.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_messaging_launch__context__posix.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/messaging/native_process_launcher_posix.cc.orig 2024-06-17 12:56:06 UTC -+++ chrome/browser/extensions/api/messaging/native_process_launcher_posix.cc -@@ -84,7 +84,7 @@ bool NativeProcessLauncher::LaunchNativeProcess( +--- chrome/browser/extensions/api/messaging/launch_context_posix.cc.orig 2024-08-26 14:40:28 UTC ++++ chrome/browser/extensions/api/messaging/launch_context_posix.cc +@@ -86,7 +86,7 @@ std::optional<LaunchContext::ProcessState> LaunchConte // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc index 8e1b9540e853..cbe84ad6d612 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc +++ b/www/ungoogled-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-07-31 14:19:23 UTC +--- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc -@@ -611,7 +611,7 @@ void PasswordsPrivateDelegateImpl::OnFetchingFamilyMem +@@ -630,7 +630,7 @@ void PasswordsPrivateDelegateImpl::OnFetchingFamilyMem } void PasswordsPrivateDelegateImpl::OsReauthTimeoutCall() { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc index 3f107919ba2f..87a78088204a 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc +++ b/www/ungoogled-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-07-31 14:19:23 UTC +--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -200,7 +200,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -203,7 +203,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist (*s_allowlist)[tab_groups::prefs::kAutoPinNewTabGroups] = settings_api::PrefType::kBoolean; @@ -9,9 +9,9 @@ (*s_allowlist)[::prefs::kUseCustomChromeFrame] = settings_api::PrefType::kBoolean; #endif -@@ -211,7 +211,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist - // Appearance settings. +@@ -215,7 +215,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; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc index 5201fec9ccaf..03afa4456d9f 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc +++ b/www/ungoogled-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-07-31 14:19:23 UTC +--- chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/extensions/api/webstore_private/webstore_private_api.cc -@@ -895,7 +895,7 @@ void WebstorePrivateBeginInstallWithManifest3Function: +@@ -898,7 +898,7 @@ void WebstorePrivateBeginInstallWithManifest3Function: #if BUILDFLAG(IS_CHROMEOS) RequestExtensionApproval(contents); return; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.cc b/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.cc index fc5a4b96a0bd..d420126cee8d 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.cc @@ -1,6 +1,24 @@ ---- chrome/browser/flag_descriptions.cc.orig 2024-08-16 07:52:02 UTC +--- chrome/browser/flag_descriptions.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/flag_descriptions.cc -@@ -2973,7 +2973,7 @@ const char kCbdTimeframeRequiredDescription[] = +@@ -419,7 +419,7 @@ const char kIsolatedSandboxedIframesDescription[] = + "grouping when enabled is per-site."; + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + const char kAutofillEnableAmountExtractionDesktopName[] = + "Enable checkout amount extraction on Chrome desktop"; + const char kAutofillEnableAmountExtractionDesktopDescription[] = +@@ -856,7 +856,7 @@ const char kDevicePostureDescription[] = + "Enables Device Posture API (foldable devices)"; + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + const char kDocumentPictureInPictureAnimateResizeName[] = + "Document Picture-in-Picture Animate Resize"; + const char kDocumentPictureInPictureAnimateResizeDescription[] = +@@ -3054,7 +3054,7 @@ const char kCbdTimeframeRequiredDescription[] = "value to the list."; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +27,7 @@ const char kPolicyIndicationForManagedDefaultSearchName[] = "Enable policy indication for managed Default Search provider"; const char kPolicyIndicationForManagedDefaultSearchDescription[] = -@@ -3291,7 +3291,7 @@ const char kShowAutofillTypePredictionsDescription[] = +@@ -3389,7 +3389,7 @@ const char kShowAutofillTypePredictionsDescription[] = "text."; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -18,7 +36,7 @@ const char kShowFeaturedEnterpriseSiteSearchName[] = "Show featured Enterprise site search engines in Omnibox"; const char kShowFeaturedEnterpriseSiteSearchDescription[] = -@@ -3328,7 +3328,7 @@ const char kSiteInstanceGroupsForDataUrlsDescription[] +@@ -3426,7 +3426,7 @@ const char kSiteInstanceGroupsForDataUrlsDescription[] "but in the same SiteInstanceGroup, and thus the same process."; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -27,7 +45,7 @@ const char kSiteSearchSettingsPolicyName[] = "Enable SiteSearchSettings policy"; const char kSiteSearchSettingsPolicyDescription[] = "Allow site search engines to be defined by the SiteSearchSettings policy."; -@@ -7729,7 +7729,7 @@ const char kLacrosMergeIcuDataFileDescription[] = +@@ -7873,7 +7873,7 @@ const char kLacrosMergeIcuDataFileDescription[] = "Enables sharing common areas of icudtl.dat between Ash and Lacros."; #endif // #if BUILDFLAG(IS_CHROMEOS_LACROS) @@ -36,7 +54,7 @@ const char kGetAllScreensMediaName[] = "GetAllScreensMedia API"; const char kGetAllScreensMediaDescription[] = "When enabled, the getAllScreensMedia API for capturing multiple screens " -@@ -7980,7 +7980,7 @@ const char kV4L2FlatStatefulVideoDecoderDescription[] +@@ -8130,7 +8130,7 @@ const char kV4L2FlatStatefulVideoDecoderDescription[] // Linux ----------------------------------------------------------------------- @@ -45,10 +63,11 @@ const char kOzonePlatformHintChoiceDefault[] = "Default"; const char kOzonePlatformHintChoiceAuto[] = "Auto"; const char kOzonePlatformHintChoiceX11[] = "X11"; -@@ -8002,6 +8002,17 @@ const char kPulseaudioLoopbackForScreenShareName[] = - const char kPulseaudioLoopbackForScreenShareDescription[] = - "Enable system audio sharing when screen sharing on Linux with pulseaudio."; - +@@ -8160,6 +8160,18 @@ const char kSimplifiedTabDragUIDescription[] = + const char kWaylandPerWindowScalingName[] = "Wayland per-window scaling"; + const char kWaylandPerWindowScalingDescription[] = + "Enable Wayland's per-window scaling experimental support."; ++ +#if BUILDFLAG(IS_BSD) +const char kAudioBackendName[] = + "Audio Backend"; @@ -63,7 +82,7 @@ #endif // BUILDFLAG(IS_LINUX) // All views-based platforms -------------------------------------------------- -@@ -8028,14 +8039,14 @@ const char kZeroCopyVideoCaptureDescription[] = +@@ -8186,14 +8198,14 @@ const char kZeroCopyVideoCaptureDescription[] = #endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -80,7 +99,7 @@ const char kEnableNetworkServiceSandboxName[] = "Enable the network service sandbox."; const char kEnableNetworkServiceSandboxDescription[] = -@@ -8067,7 +8078,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti +@@ -8225,7 +8237,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti "Bluetooth"; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) @@ -89,7 +108,7 @@ const char kSkipUndecryptablePasswordsName[] = "Skip undecryptable passwords to use the available decryptable " "passwords."; -@@ -8217,7 +8228,7 @@ const char kElementCaptureDescription[] = +@@ -8379,7 +8391,7 @@ const char kElementCaptureDescription[] = #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -98,8 +117,8 @@ const char kUIDebugToolsName[] = "Debugging tools for UI"; const char kUIDebugToolsDescription[] = "Enables additional keyboard shortcuts to help debugging."; -@@ -8284,7 +8295,7 @@ const char kComposePoliteNudgeDescription[] = - "available to interact with."; +@@ -8453,7 +8465,7 @@ const char kAutofillCaretExtractionDescription[] = + "Enables passing caret position via Autofill"; #endif // BUILDFLAG(ENABLE_COMPOSE) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.h b/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.h index c120a970cfa7..948d7aa3b65f 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.h @@ -1,6 +1,24 @@ ---- chrome/browser/flag_descriptions.h.orig 2024-08-16 07:52:02 UTC +--- chrome/browser/flag_descriptions.h.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/flag_descriptions.h -@@ -1725,7 +1725,7 @@ extern const char kCbdTimeframeRequiredName[]; +@@ -273,7 +273,7 @@ extern const char kImageDescriptionsAlternateRoutingNa + extern const char kImageDescriptionsAlternateRoutingDescription[]; + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + extern const char kAutofillEnableAmountExtractionDesktopName[]; + extern const char kAutofillEnableAmountExtractionDesktopDescription[]; + #endif +@@ -660,7 +660,7 @@ extern const char kDevicePostureName[]; + extern const char kDevicePostureDescription[]; + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + extern const char kDocumentPictureInPictureAnimateResizeName[]; + extern const char kDocumentPictureInPictureAnimateResizeDescription[]; + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || +@@ -1767,7 +1767,7 @@ extern const char kCbdTimeframeRequiredName[]; extern const char kCbdTimeframeRequiredDescription[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +27,7 @@ extern const char kPolicyIndicationForManagedDefaultSearchName[]; extern const char kPolicyIndicationForManagedDefaultSearchDescription[]; #endif -@@ -1909,7 +1909,7 @@ extern const char kShowAutofillTypePredictionsName[]; +@@ -1961,7 +1961,7 @@ extern const char kShowAutofillTypePredictionsName[]; extern const char kShowAutofillTypePredictionsDescription[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -18,7 +36,7 @@ extern const char kShowFeaturedEnterpriseSiteSearchName[]; extern const char kShowFeaturedEnterpriseSiteSearchDescription[]; -@@ -1931,7 +1931,7 @@ extern const char kSiteInstanceGroupsForDataUrlsName[] +@@ -1983,7 +1983,7 @@ extern const char kSiteInstanceGroupsForDataUrlsName[] extern const char kSiteInstanceGroupsForDataUrlsDescription[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -26,8 +44,8 @@ + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) extern const char kSiteSearchSettingsPolicyName[]; extern const char kSiteSearchSettingsPolicyDescription[]; - #endif -@@ -4490,7 +4490,7 @@ extern const char kLacrosMergeIcuDataFileName[]; + +@@ -4560,7 +4560,7 @@ extern const char kLacrosMergeIcuDataFileName[]; extern const char kLacrosMergeIcuDataFileDescription[]; #endif // #if BUILDFLAG(IS_CHROMEOS_LACROS) @@ -36,7 +54,7 @@ extern const char kGetAllScreensMediaName[]; extern const char kGetAllScreensMediaDescription[]; #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -4636,7 +4636,7 @@ extern const char kV4L2FlatStatefulVideoDecoderDescrip +@@ -4708,7 +4708,7 @@ extern const char kV4L2FlatStatefulVideoDecoderDescrip // Linux --------------------------------------------------------------------- @@ -45,17 +63,17 @@ extern const char kOzonePlatformHintChoiceDefault[]; extern const char kOzonePlatformHintChoiceAuto[]; extern const char kOzonePlatformHintChoiceX11[]; -@@ -4649,6 +4649,9 @@ extern const char kPulseaudioLoopbackForCastName[]; - extern const char kPulseaudioLoopbackForCastDescription[]; - extern const char kPulseaudioLoopbackForScreenShareName[]; - extern const char kPulseaudioLoopbackForScreenShareDescription[]; +@@ -4727,6 +4727,9 @@ extern const char kSimplifiedTabDragUIDescription[]; + + extern const char kWaylandPerWindowScalingName[]; + extern const char kWaylandPerWindowScalingDescription[]; + +extern const char kAudioBackendName[]; +extern const char kAudioBackendDescription[]; #endif // BUILDFLAG(IS_LINUX) // All views-based platforms -------------------------------------------------- -@@ -4678,7 +4681,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa +@@ -4756,7 +4759,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa extern const char kWebBluetoothConfirmPairingSupportDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) @@ -64,7 +82,7 @@ extern const char kSkipUndecryptablePasswordsName[]; extern const char kSkipUndecryptablePasswordsDescription[]; -@@ -4697,13 +4700,13 @@ extern const char kScreenlockReauthPromoCardDescriptio +@@ -4775,13 +4778,13 @@ extern const char kScreenlockReauthPromoCardDescriptio #endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -80,7 +98,7 @@ extern const char kEnableNetworkServiceSandboxName[]; extern const char kEnableNetworkServiceSandboxDescription[]; -@@ -4799,7 +4802,7 @@ extern const char kElementCaptureDescription[]; +@@ -4880,7 +4883,7 @@ extern const char kElementCaptureDescription[]; #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -89,8 +107,8 @@ extern const char kUIDebugToolsName[]; extern const char kUIDebugToolsDescription[]; #endif -@@ -4847,7 +4850,7 @@ extern const char kComposePoliteNudgeName[]; - extern const char kComposePoliteNudgeDescription[]; +@@ -4934,7 +4937,7 @@ extern const char kAutofillCaretExtractionName[]; + extern const char kAutofillCaretExtractionDescription[]; #endif // BUILDFLAG(ENABLE_COMPOSE) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_gcm_gcm__profile__service__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_gcm_gcm__profile__service__factory.cc index dff3f8733807..9dbdf7a086d3 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_gcm_gcm__profile__service__factory.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_gcm_gcm__profile__service__factory.cc @@ -1,4 +1,4 @@ ---- chrome/browser/gcm/gcm_profile_service_factory.cc.orig 2023-09-17 07:59:53 UTC +--- chrome/browser/gcm/gcm_profile_service_factory.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/gcm/gcm_profile_service_factory.cc @@ -89,7 +89,7 @@ GCMProfileServiceFactory::ScopedTestingFactoryInstalle // static @@ -9,7 +9,7 @@ // On desktop, incognito profiles are checked with IsIncognitoProfile(). // It's possible for non-incognito profiles to also be off-the-record. bool is_profile_supported = -@@ -129,7 +129,7 @@ GCMProfileServiceFactory::~GCMProfileServiceFactory() +@@ -132,7 +132,7 @@ GCMProfileServiceFactory::~GCMProfileServiceFactory() KeyedService* GCMProfileServiceFactory::BuildServiceInstanceFor( content::BrowserContext* context) const { Profile* profile = Profile::FromBrowserContext(context); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_gcm_instance__id_instance__id__profile__service__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_gcm_instance__id_instance__id__profile__service__factory.cc index 0fe1cb8dfe68..d03c60a0144e 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_gcm_instance__id_instance__id__profile__service__factory.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_gcm_instance__id_instance__id__profile__service__factory.cc @@ -1,4 +1,4 @@ ---- chrome/browser/gcm/instance_id/instance_id_profile_service_factory.cc.orig 2023-09-17 07:59:53 UTC +--- chrome/browser/gcm/instance_id/instance_id_profile_service_factory.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/gcm/instance_id/instance_id_profile_service_factory.cc @@ -16,7 +16,7 @@ namespace instance_id { // static @@ -9,7 +9,7 @@ // On desktop, the guest profile is actually the primary OTR profile of // the "regular" guest profile. The regular guest profile is never used // directly by users. Also, user are not able to create child OTR profiles -@@ -61,7 +61,7 @@ InstanceIDProfileServiceFactory::~InstanceIDProfileSer +@@ -64,7 +64,7 @@ InstanceIDProfileServiceFactory::~InstanceIDProfileSer KeyedService* InstanceIDProfileServiceFactory::BuildServiceInstanceFor( content::BrowserContext* context) const { Profile* profile = Profile::FromBrowserContext(context); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_global__desktop__features.cc b/www/ungoogled-chromium/files/patch-chrome_browser_global__desktop__features.cc new file mode 100644 index 000000000000..627965aa4c03 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_global__desktop__features.cc @@ -0,0 +1,19 @@ +--- chrome/browser/global_desktop_features.cc.orig 2024-08-26 14:40:28 UTC ++++ chrome/browser/global_desktop_features.cc +@@ -45,14 +45,14 @@ void GlobalDesktopFeatures::ReplaceGlobalDesktopFeatur + } + + void GlobalDesktopFeatures::Init() { +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (user_education::features::IsWhatsNewV2()) { + whats_new_registry_ = CreateWhatsNewRegistry(); + } + #endif + } + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + std::unique_ptr<whats_new::WhatsNewRegistry> + GlobalDesktopFeatures::CreateWhatsNewRegistry() { + return whats_new::CreateWhatsNewRegistry(); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_global__desktop__features.h b/www/ungoogled-chromium/files/patch-chrome_browser_global__desktop__features.h new file mode 100644 index 000000000000..1ffec98183e9 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_global__desktop__features.h @@ -0,0 +1,38 @@ +--- chrome/browser/global_desktop_features.h.orig 2024-08-26 14:40:28 UTC ++++ chrome/browser/global_desktop_features.h +@@ -9,7 +9,7 @@ + #include "build/build_config.h" + + namespace whats_new { +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + class WhatsNewRegistry; + #endif + } // namespace whats_new +@@ -37,7 +37,7 @@ class GlobalDesktopFeatures { + // Public accessors for features, e.g. + // FooFeature* foo_feature() { return foo_feature_.get(); } + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + whats_new::WhatsNewRegistry* whats_new_registry() { + return whats_new_registry_.get(); + } +@@ -50,7 +50,7 @@ class GlobalDesktopFeatures { + // testing. e.g. + // virtual std::unique_ptr<FooFeature> CreateFooFeature(); + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + virtual std::unique_ptr<whats_new::WhatsNewRegistry> CreateWhatsNewRegistry(); + #endif + +@@ -58,7 +58,7 @@ class GlobalDesktopFeatures { + // Features will each have a controller. e.g. + // std::unique_ptr<FooFeature> foo_feature_; + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + std::unique_ptr<whats_new::WhatsNewRegistry> whats_new_registry_; + #endif + }; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc b/www/ungoogled-chromium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc index c05c59841f26..e11a5c261c37 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig 2023-09-17 07:59:53 UTC +--- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc -@@ -39,10 +39,12 @@ void MTPDeviceMapService::RegisterMTPFileSystem( +@@ -40,10 +40,12 @@ void MTPDeviceMapService::RegisterMTPFileSystem( // Note that this initializes the delegate asynchronously, but since // the delegate will only be used from the IO thread, it is guaranteed // to be created before use of it expects it to be there. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc b/www/ungoogled-chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc index 7b34614eaebf..ea94721d9bb3 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc @@ -1,6 +1,6 @@ ---- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2024-02-03 15:42:55 UTC +--- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/media_galleries/media_file_system_registry.cc -@@ -584,7 +584,12 @@ class MediaFileSystemRegistry::MediaFileSystemContextI +@@ -585,7 +585,12 @@ class MediaFileSystemRegistry::MediaFileSystemContextI // Constructor in 'private' section because depends on private class definition. MediaFileSystemRegistry::MediaFileSystemRegistry() : file_system_context_(new MediaFileSystemContextImpl) { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc b/www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc index 8a60c96ec3dd..74eac91c4ff8 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc +++ b/www/ungoogled-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-07-31 14:19:23 UTC +--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2024-08-26 14:40:28 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 -@@ -212,7 +212,7 @@ +@@ -213,7 +213,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) -@@ -534,7 +534,7 @@ void ChromeMetricsServiceClient::RegisterPrefs(PrefReg +@@ -535,7 +535,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) -@@ -706,7 +706,7 @@ void ChromeMetricsServiceClient::Initialize() { +@@ -707,7 +707,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 -@@ -757,7 +757,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -758,7 +758,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 -@@ -842,7 +842,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -843,7 +843,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) || -@@ -944,7 +944,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -950,7 +950,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) -@@ -1131,7 +1131,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve +@@ -1137,7 +1137,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,9 +77,9 @@ // This creates the DesktopProfileSessionDurationsServices if it didn't exist // already. metrics::DesktopProfileSessionDurationsServiceFactory::GetForBrowserContext( -@@ -1465,7 +1465,7 @@ void ChromeMetricsServiceClient::CreateStructuredMetri +@@ -1471,7 +1471,7 @@ void ChromeMetricsServiceClient::CreateStructuredMetri recorder = - std::make_unique<metrics::structured::AshStructuredMetricsRecorder>( + base::MakeRefCounted<metrics::structured::AshStructuredMetricsRecorder>( cros_system_profile_provider_.get()); -#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) +#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_metrics_power_process__monitor.cc b/www/ungoogled-chromium/files/patch-chrome_browser_metrics_power_process__monitor.cc index c45eb7018c81..b1dc68eb069d 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_metrics_power_process__monitor.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_metrics_power_process__monitor.cc @@ -1,6 +1,6 @@ ---- chrome/browser/metrics/power/process_monitor.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/metrics/power/process_monitor.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/metrics/power/process_monitor.cc -@@ -64,7 +64,7 @@ ProcessMonitor::Metrics SampleMetrics(base::ProcessMet +@@ -65,7 +65,7 @@ ProcessMonitor::Metrics SampleMetrics(base::ProcessMet process_metrics.GetPlatformIndependentCPUUsage()); #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -9,7 +9,7 @@ metrics.idle_wakeups = process_metrics.GetIdleWakeupsPerSecond(); #endif #if BUILDFLAG(IS_MAC) -@@ -82,7 +82,7 @@ void ScaleMetrics(ProcessMonitor::Metrics* metrics, do +@@ -83,7 +83,7 @@ void ScaleMetrics(ProcessMonitor::Metrics* metrics, do } #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -18,7 +18,7 @@ metrics->idle_wakeups *= factor; #endif -@@ -157,7 +157,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me +@@ -158,7 +158,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me } #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_net_profile__network__context__service.cc b/www/ungoogled-chromium/files/patch-chrome_browser_net_profile__network__context__service.cc new file mode 100644 index 000000000000..0a4a5f5beb9a --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_net_profile__network__context__service.cc @@ -0,0 +1,29 @@ +--- chrome/browser/net/profile_network_context_service.cc.orig 2024-08-26 14:40:28 UTC ++++ chrome/browser/net/profile_network_context_service.cc +@@ -139,7 +139,7 @@ + #include "chromeos/startup/browser_params_proxy.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/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" +@@ -259,7 +259,7 @@ void UpdateCookieSettings(Profile* profile, ContentSet + }); + } + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + std::unique_ptr<net::ClientCertStore> GetWrappedCertStore( + Profile* profile, + std::unique_ptr<net::ClientCertStore> platform_store) { +@@ -938,7 +938,7 @@ ProfileNetworkContextService::CreateClientCertStore() + store = std::make_unique<ClientCertStoreLacros>( + std::move(certificate_provider), cert_db_initializer, std::move(store)); + #endif // BUILDFLAG(IS_CHROMEOS_LACROS) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return GetWrappedCertStore(profile_, std::move(store)); + #else + return store; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_net_system__network__context__manager.cc b/www/ungoogled-chromium/files/patch-chrome_browser_net_system__network__context__manager.cc index cbcf08dd4867..3a8b8c54fb1e 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_net_system__network__context__manager.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_net_system__network__context__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/net/system_network_context_manager.cc.orig 2024-07-31 14:19:23 UTC +--- chrome/browser/net/system_network_context_manager.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/net/system_network_context_manager.cc -@@ -97,7 +97,7 @@ +@@ -96,7 +96,7 @@ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ #include "chrome/common/chrome_paths_internal.h" #include "chrome/grit/branded_strings.h" #include "ui/base/l10n/l10n_util.h" -@@ -141,7 +141,7 @@ SystemNetworkContextManager* g_system_network_context_ +@@ -140,7 +140,7 @@ SystemNetworkContextManager* g_system_network_context_ // received a failed launch for a sandboxed network service. bool g_previously_failed_to_launch_sandboxed_service = false; @@ -18,7 +18,7 @@ // Whether kerberos library loading will work in the network service due to the // sandbox. bool g_network_service_will_allow_gssapi_library_load = false; -@@ -149,7 +149,7 @@ bool g_network_service_will_allow_gssapi_library_load +@@ -148,7 +148,7 @@ bool g_network_service_will_allow_gssapi_library_load const char* kGssapiDesiredPref = #if BUILDFLAG(IS_CHROMEOS) prefs::kKerberosEnabled; @@ -27,7 +27,7 @@ prefs::kReceivedHttpAuthNegotiateHeader; #endif #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -195,7 +195,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut +@@ -194,7 +194,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut auth_dynamic_params->basic_over_http_enabled = local_state->GetBoolean(prefs::kBasicAuthOverHttpEnabled); @@ -36,7 +36,7 @@ auth_dynamic_params->delegate_by_kdc_policy = local_state->GetBoolean(prefs::kAuthNegotiateDelegateByKdcPolicy); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -210,7 +210,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut +@@ -209,7 +209,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut local_state->GetString(prefs::kAuthAndroidNegotiateAccountType); #endif // BUILDFLAG(IS_ANDROID) @@ -45,7 +45,7 @@ auth_dynamic_params->allow_gssapi_library_load = local_state->GetBoolean(kGssapiDesiredPref); #endif // BUILDFLAG(IS_CHROMEOS) -@@ -220,7 +220,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut +@@ -219,7 +219,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut void OnNewHttpAuthDynamicParams( network::mojom::HttpAuthDynamicParamsPtr& params) { @@ -54,7 +54,7 @@ // The kerberos library is incompatible with the network service sandbox, so // if library loading is now enabled, the network service needs to be // restarted. It will be restarted unsandboxed because is -@@ -262,11 +262,11 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() +@@ -261,11 +261,11 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() if (g_previously_failed_to_launch_sandboxed_service) { return NetworkSandboxState::kDisabledBecauseOfFailedLaunch; } @@ -68,7 +68,7 @@ // The network service sandbox and the kerberos library are incompatible. // If kerberos is enabled by policy, disable the network service sandbox. if (g_network_service_will_allow_gssapi_library_load || -@@ -282,7 +282,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() +@@ -281,7 +281,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() } #endif // BUILDFLAG(IS_WIN) @@ -77,7 +77,7 @@ if (local_state && local_state->HasPrefPath(prefs::kNetworkServiceSandboxEnabled)) { return local_state->GetBoolean(prefs::kNetworkServiceSandboxEnabled) -@@ -512,7 +512,7 @@ void SystemNetworkContextManager::DeleteInstance() { +@@ -511,7 +511,7 @@ void SystemNetworkContextManager::DeleteInstance() { g_system_network_context_manager = nullptr; } @@ -86,7 +86,7 @@ SystemNetworkContextManager::GssapiLibraryLoadObserver:: GssapiLibraryLoadObserver(SystemNetworkContextManager* owner) : owner_(owner) {} -@@ -570,7 +570,7 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -569,7 +569,7 @@ SystemNetworkContextManager::SystemNetworkContextManag pref_change_registrar_.Add(prefs::kAllHttpAuthSchemesAllowedForOrigins, auth_pref_callback); @@ -95,7 +95,7 @@ pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy, auth_pref_callback); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -584,7 +584,7 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -583,7 +583,7 @@ SystemNetworkContextManager::SystemNetworkContextManag auth_pref_callback); #endif // BUILDFLAG(IS_ANDROID) @@ -104,16 +104,7 @@ pref_change_registrar_.Add(kGssapiDesiredPref, auth_pref_callback); #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -610,7 +610,7 @@ SystemNetworkContextManager::SystemNetworkContextManag - #endif - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - pref_change_registrar_.Add( - prefs::kEnforceLocalAnchorConstraintsEnabled, - base::BindRepeating(&SystemNetworkContextManager:: -@@ -665,7 +665,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -653,7 +653,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe registry->RegisterBooleanPref(prefs::kKerberosEnabled, false); #endif // BUILDFLAG(IS_CHROMEOS_LACROS) @@ -122,16 +113,7 @@ registry->RegisterBooleanPref(prefs::kAuthNegotiateDelegateByKdcPolicy, false); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -689,7 +689,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe - registry->RegisterIntegerPref(prefs::kMaxConnectionsPerProxy, -1); - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - // Note that the default value is not relevant because the pref is only - // evaluated when it is managed. - registry->RegisterBooleanPref(prefs::kEnforceLocalAnchorConstraintsEnabled, -@@ -698,11 +698,11 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -678,11 +678,11 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe registry->RegisterListPref(prefs::kExplicitlyAllowedNetworkPorts); @@ -145,7 +127,7 @@ registry->RegisterBooleanPref(prefs::kReceivedHttpAuthNegotiateHeader, false); #endif // BUILDFLAG(IS_LINUX) -@@ -755,7 +755,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea +@@ -735,7 +735,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea OnNewHttpAuthDynamicParams(http_auth_dynamic_params); network_service->ConfigureHttpAuthPrefs(std::move(http_auth_dynamic_params)); @@ -154,7 +136,7 @@ gssapi_library_loader_observer_.Install(network_service); #endif // BUILDFLAG(IS_LINUX) -@@ -970,7 +970,7 @@ bool SystemNetworkContextManager::IsNetworkSandboxEnab +@@ -950,7 +950,7 @@ bool SystemNetworkContextManager::IsNetworkSandboxEnab break; } @@ -163,12 +145,3 @@ if (!enabled) { g_network_service_will_allow_gssapi_library_load = true; } -@@ -1057,7 +1057,7 @@ void SystemNetworkContextManager::UpdateExplicitlyAllo - } - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - void SystemNetworkContextManager::UpdateEnforceLocalAnchorConstraintsEnabled() { - const PrefService::Preference* enforce_local_anchor_constraints_enabled_pref = - local_state_->FindPreference( diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_net_system__network__context__manager.h b/www/ungoogled-chromium/files/patch-chrome_browser_net_system__network__context__manager.h index 55c0b120f083..6767089b95c0 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_net_system__network__context__manager.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_net_system__network__context__manager.h @@ -1,4 +1,4 @@ ---- chrome/browser/net/system_network_context_manager.h.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/net/system_network_context_manager.h.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/net/system_network_context_manager.h @@ -197,7 +197,7 @@ class SystemNetworkContextManager { class URLLoaderFactoryForSystem; @@ -9,16 +9,7 @@ class GssapiLibraryLoadObserver : public network::mojom::GssapiLibraryLoadObserver { public: -@@ -233,7 +233,7 @@ class SystemNetworkContextManager { - void UpdateExplicitlyAllowedNetworkPorts(); - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - // Applies the current value of the kEnforceLocalAnchorConstraintsEnabled - // pref to the enforcement state. - void UpdateEnforceLocalAnchorConstraintsEnabled(); -@@ -285,7 +285,7 @@ class SystemNetworkContextManager { +@@ -278,7 +278,7 @@ class SystemNetworkContextManager { std::unique_ptr<NetworkAnnotationMonitor> network_annotation_monitor_; #endif // BUILDFLAG(IS_CHROMEOS) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc b/www/ungoogled-chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc index 25f3f1cf84bd..8ac641d0ecc3 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc @@ -1,15 +1,15 @@ ---- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2024-07-31 14:19:23 UTC +--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/password_manager/chrome_password_manager_client.cc @@ -559,7 +559,7 @@ void ChromePasswordManagerClient:: - bool ChromePasswordManagerClient::CanUseBiometricAuthForFilling( + bool ChromePasswordManagerClient::IsReauthBeforeFillingRequired( device_reauth::DeviceAuthenticator* authenticator) { -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (!GetLocalStatePrefs() || !GetPrefs() || !authenticator) { return false; } -@@ -785,7 +785,7 @@ void ChromePasswordManagerClient::NotifyUserCredential +@@ -797,7 +797,7 @@ void ChromePasswordManagerClient::NotifyUserCredential } void ChromePasswordManagerClient::NotifyKeychainError() { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc index a28f0a9f6c7e..1a27765f8407 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/password_manager/password_reuse_manager_factory.cc.orig 2024-07-31 14:19:23 UTC +--- chrome/browser/password_manager/password_reuse_manager_factory.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/password_manager/password_reuse_manager_factory.cc -@@ -138,7 +138,7 @@ PasswordReuseManagerFactory::BuildServiceInstanceForBr +@@ -141,7 +141,7 @@ PasswordReuseManagerFactory::BuildServiceInstanceForBr // 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) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc index af1359065519..1d745fc723fc 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2024-08-16 07:52:02 UTC +--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -233,19 +233,19 @@ +@@ -234,19 +234,19 @@ #include "components/spellcheck/browser/pref_names.h" #endif // BUILDFLAG(ENABLE_SPELLCHECK) @@ -23,7 +23,7 @@ #include "chrome/browser/privacy_sandbox/privacy_sandbox_policy_handler.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -@@ -259,13 +259,13 @@ +@@ -260,13 +260,13 @@ #endif // BUILDFLAG(ENTERPRISE_CLIENT_CERTIFICATES) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -39,7 +39,16 @@ #include "components/search_engines/site_search_policy_handler.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) -@@ -843,13 +843,13 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -528,7 +528,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + { key::kDefaultDirectSocketsSetting, + prefs::kManagedDefaultDirectSocketsSetting, + base::Value::Type::INTEGER }, +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + { key::kDeletingUndecryptablePasswordsEnabled, + password_manager::prefs::kDeletingUndecryptablePasswordsEnabled, + base::Value::Type::BOOLEAN }, +@@ -855,13 +855,13 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kManagedDefaultGeolocationSetting, base::Value::Type::INTEGER }, #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \ @@ -55,8 +64,8 @@ { key::kFullscreenAllowed, prefs::kFullscreenAllowed, base::Value::Type::BOOLEAN }, -@@ -1663,7 +1663,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = - base::Value::Type::STRING }, +@@ -1689,7 +1689,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + base::Value::Type::LIST }, #endif // BUILDFLAG(IS_CHROMEOS_ASH) -#if BUILDFLAG(IS_LINUX) @@ -64,7 +73,7 @@ { key::kGSSAPILibraryName, prefs::kGSSAPILibraryName, base::Value::Type::STRING }, -@@ -1717,7 +1717,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1746,7 +1746,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_WIN) @@ -73,7 +82,7 @@ { key::kNetworkServiceSandboxEnabled, prefs::kNetworkServiceSandboxEnabled, base::Value::Type::BOOLEAN }, -@@ -1743,17 +1743,17 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1772,17 +1772,17 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kTotalMemoryLimitMb, base::Value::Type::INTEGER }, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -94,7 +103,7 @@ { key::kDefaultBrowserSettingEnabled, prefs::kDefaultBrowserSettingEnabled, base::Value::Type::BOOLEAN }, -@@ -1765,7 +1765,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1794,7 +1794,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) \ @@ -103,7 +112,7 @@ { key::kAutoplayAllowed, prefs::kAutoplayAllowed, base::Value::Type::BOOLEAN }, -@@ -1863,7 +1863,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1892,7 +1892,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS) @@ -112,7 +121,7 @@ { key::kAlternativeBrowserPath, browser_switcher::prefs::kAlternativeBrowserPath, base::Value::Type::STRING }, -@@ -1968,7 +1968,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2003,7 +2003,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::LIST }, #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -121,16 +130,7 @@ { key::kAuthNegotiateDelegateByKdcPolicy, prefs::kAuthNegotiateDelegateByKdcPolicy, base::Value::Type::BOOLEAN }, -@@ -1993,7 +1993,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = - #endif // BUILDFLAG(ENABLE_EXTENSIONS) - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - { key::kEnforceLocalAnchorConstraintsEnabled, - prefs::kEnforceLocalAnchorConstraintsEnabled, - base::Value::Type::BOOLEAN }, -@@ -2051,7 +2051,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2082,7 +2082,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = ash::prefs::kUrlParameterToAutofillSAMLUsername, base::Value::Type::STRING }, #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -139,7 +139,7 @@ { key::kTabDiscardingExceptions, performance_manager::user_tuning::prefs::kManagedTabDiscardingExceptions, base::Value::Type::LIST }, -@@ -2080,7 +2080,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2111,7 +2111,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kUiAutomationProviderEnabled, base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_WIN) @@ -148,7 +148,7 @@ { key::kOutOfProcessSystemDnsResolutionEnabled, prefs::kOutOfProcessSystemDnsResolutionEnabled, base::Value::Type::BOOLEAN }, -@@ -2117,7 +2117,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2151,7 +2151,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::INTEGER }, #endif #if BUILDFLAG(ENABLE_EXTENSIONS) @@ -157,16 +157,16 @@ { key::kExtensionInstallTypeBlocklist, extensions::pref_names::kExtensionInstallTypeBlocklist, base::Value::Type::LIST}, -@@ -2138,7 +2138,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = - optimization_guide::model_execution::prefs::kWallpaperSearchEnterprisePolicyAllowed, +@@ -2171,7 +2171,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + optimization_guide::model_execution::prefs::kHistorySearchEnterprisePolicyAllowed, base::Value::Type::INTEGER}, #endif --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) { key::kChromeForTestingAllowed, prefs::kChromeForTestingAllowed, base::Value::Type::BOOLEAN }, -@@ -2264,7 +2264,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2303,7 +2303,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH // Policies for all platforms - End #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -175,7 +175,7 @@ handlers->AddHandler(std::make_unique<IntRangePolicyHandler>( key::kMemorySaverModeSavings, performance_manager::user_tuning::prefs::kMemorySaverModeAggressiveness, -@@ -2280,7 +2280,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2319,7 +2319,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH // BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -184,7 +184,7 @@ handlers->AddHandler( std::make_unique<SiteSearchPolicyHandler>(chrome_schema)); -@@ -2466,7 +2466,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2512,7 +2512,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -193,7 +193,7 @@ handlers->AddHandler( std::make_unique<enterprise_idle::IdleTimeoutPolicyHandler>()); handlers->AddHandler( -@@ -2524,7 +2524,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2564,7 +2564,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime, chrome_schema)); @@ -202,7 +202,7 @@ handlers->AddHandler(std::make_unique<LocalSyncPolicyHandler>()); handlers->AddHandler(std::make_unique<ThemeColorPolicyHandler>()); handlers->AddHandler( -@@ -2963,7 +2963,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2975,7 +2975,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif #if BUILDFLAG(ENABLE_SPELLCHECK) @@ -211,7 +211,7 @@ handlers->AddHandler(std::make_unique<SpellcheckLanguagePolicyHandler>()); handlers->AddHandler( std::make_unique<SpellcheckLanguageBlocklistPolicyHandler>( -@@ -2971,7 +2971,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2983,7 +2983,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) #endif // BUILDFLAG(ENABLE_SPELLCHECK) @@ -220,7 +220,7 @@ handlers->AddHandler(std::make_unique<SimplePolicyHandler>( key::kAllowSystemNotifications, prefs::kAllowSystemNotifications, base::Value::Type::BOOLEAN)); -@@ -2989,7 +2989,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -3001,7 +3001,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH first_party_sets::FirstPartySetsOverridesPolicyHandler>( key::kRelatedWebsiteSetsOverrides, chrome_schema))); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -229,7 +229,7 @@ handlers->AddHandler(std::make_unique<PrivacySandboxPolicyHandler>()); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -@@ -3012,7 +3012,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -3024,7 +3024,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH base::Value::Type::BOOLEAN))); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_prefs_browser__prefs.cc b/www/ungoogled-chromium/files/patch-chrome_browser_prefs_browser__prefs.cc index 3d04bda0d391..f993a2526241 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_prefs_browser__prefs.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_prefs_browser__prefs.cc @@ -1,6 +1,15 @@ ---- chrome/browser/prefs/browser_prefs.cc.orig 2024-07-31 14:19:23 UTC +--- chrome/browser/prefs/browser_prefs.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/prefs/browser_prefs.cc -@@ -486,18 +486,18 @@ +@@ -311,7 +311,7 @@ + #include "components/user_notes/user_notes_prefs.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/ui/webui/whats_new/whats_new_ui.h" + #endif + +@@ -493,18 +493,18 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -22,7 +31,7 @@ #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h" #endif -@@ -532,7 +532,7 @@ +@@ -539,7 +539,7 @@ #include "chrome/browser/sessions/session_service_log.h" #endif @@ -31,16 +40,25 @@ #include "ui/color/system_theme.h" #endif -@@ -1949,7 +1949,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) - true); +@@ -1558,7 +1558,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) + registry->RegisterIntegerPref(prefs::kLastWhatsNewVersion, 0); + #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) + WhatsNewUI::RegisterLocalStatePrefs(registry); + #endif + +@@ -1731,7 +1731,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) #endif // BUILDFLAG(ENABLE_PDF) --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ +- BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) registry->RegisterBooleanPref(prefs::kChromeForTestingAllowed, true); #endif -@@ -2302,12 +2302,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync +@@ -2087,12 +2087,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc b/www/ungoogled-chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc index a98317594d1d..d5e95f25cd9c 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc +++ b/www/ungoogled-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-07-31 14:19:23 UTC +--- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/prefs/pref_service_incognito_allowlist.cc -@@ -186,7 +186,7 @@ const char* const kPersistentPrefNames[] = { +@@ -188,7 +188,7 @@ const char* const kPersistentPrefNames[] = { prefs::kShowFullscreenToolbar, #endif diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_printing_print__backend__service__manager.cc b/www/ungoogled-chromium/files/patch-chrome_browser_printing_print__backend__service__manager.cc index f57ecb6e3d50..d0e9bb86a6d8 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_printing_print__backend__service__manager.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_printing_print__backend__service__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/printing/print_backend_service_manager.cc.orig 2024-05-23 20:04:36 UTC +--- chrome/browser/printing/print_backend_service_manager.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/printing/print_backend_service_manager.cc -@@ -35,7 +35,7 @@ +@@ -36,7 +36,7 @@ #include "printing/printing_context.h" #include "printing/printing_features.h" @@ -9,7 +9,7 @@ #include "content/public/common/content_switches.h" #endif -@@ -862,7 +862,7 @@ PrintBackendServiceManager::GetServiceFromBundle( +@@ -877,7 +877,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()); -@@ -1039,7 +1039,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate +@@ -1054,7 +1054,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate return kNoClientsRegisteredResetOnIdleTimeout; case ClientType::kQueryWithUi: diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc b/www/ungoogled-chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc index 4b8f2bafd55d..95b4f7b11417 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc @@ -1,6 +1,6 @@ ---- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2024-07-31 14:19:23 UTC +--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -334,7 +334,7 @@ +@@ -341,7 +341,7 @@ #include "chromeos/constants/chromeos_features.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/policy/messaging_layer/util/manual_test_heartbeat_event_factory.h" #endif -@@ -419,18 +419,18 @@ +@@ -427,18 +427,18 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -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" -@@ -670,7 +670,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -680,7 +680,7 @@ void ChromeBrowserMainExtraPartsProfiles:: DiceBoundSessionCookieServiceFactory::GetInstance(); #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) #endif // BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS) @@ -40,7 +40,7 @@ browser_switcher::BrowserSwitcherServiceFactory::GetInstance(); #endif browser_sync::UserEventServiceFactory::GetInstance(); -@@ -798,7 +798,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -809,7 +809,7 @@ void ChromeBrowserMainExtraPartsProfiles:: enterprise_connectors::ConnectorsServiceFactory::GetInstance(); #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -49,8 +49,8 @@ enterprise_connectors::DeviceTrustConnectorServiceFactory::GetInstance(); enterprise_connectors::DeviceTrustServiceFactory::GetInstance(); #endif -@@ -806,21 +806,21 @@ void ChromeBrowserMainExtraPartsProfiles:: - enterprise_connectors::ExtensionInstallEventRouterFactory::GetInstance(); +@@ -818,21 +818,21 @@ void ChromeBrowserMainExtraPartsProfiles:: + enterprise_connectors::ExtensionTelemetryEventRouterFactory::GetInstance(); #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_ANDROID) @@ -75,7 +75,7 @@ enterprise_signin::EnterpriseSigninServiceFactory::GetInstance(); #endif #if BUILDFLAG(ENABLE_SESSION_SERVICE) -@@ -948,7 +948,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -965,7 +965,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #endif // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -84,7 +84,7 @@ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance(); #endif -@@ -1050,7 +1050,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -1067,7 +1067,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #if BUILDFLAG(IS_CHROMEOS) policy::PolicyCertServiceFactory::GetInstance(); #endif @@ -93,7 +93,7 @@ policy::ProfileTokenPolicyWebSigninServiceFactory::GetInstance(); policy::UserPolicyOidcSigninServiceFactory::GetInstance(); #endif -@@ -1093,7 +1093,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -1111,7 +1111,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #if !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_ANDROID) ProfileStatisticsFactory::GetInstance(); #endif @@ -102,7 +102,7 @@ ProfileTokenWebSigninInterceptorFactory::GetInstance(); OidcAuthenticationSigninInterceptorFactory::GetInstance(); #endif -@@ -1112,7 +1112,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -1127,7 +1127,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #endif ReduceAcceptLanguageFactory::GetInstance(); RendererUpdaterFactory::GetInstance(); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_profiles_profile__impl.cc b/www/ungoogled-chromium/files/patch-chrome_browser_profiles_profile__impl.cc index 7bd1e9d26df3..b6ef7717f345 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_profiles_profile__impl.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_profiles_profile__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/profiles/profile_impl.cc.orig 2024-07-31 14:19:23 UTC +--- chrome/browser/profiles/profile_impl.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/profiles/profile_impl.cc -@@ -263,6 +263,10 @@ +@@ -264,6 +264,10 @@ #include "chrome/browser/spellchecker/spellcheck_service.h" #endif diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc b/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc index 718e3bafe705..ad3878fb614b 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig 2023-12-23 12:33:28 UTC +--- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc -@@ -696,7 +696,7 @@ void IncidentReportingService::OnEnvironmentDataCollec +@@ -697,7 +697,7 @@ void IncidentReportingService::OnEnvironmentDataCollec // Process::Current().CreationTime() is missing on some platforms. #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_screen__ai_screen__ai__service__router.cc b/www/ungoogled-chromium/files/patch-chrome_browser_screen__ai_screen__ai__service__router.cc index a0bb8095ffa4..869172082191 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_screen__ai_screen__ai__service__router.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_screen__ai_screen__ai__service__router.cc @@ -1,6 +1,6 @@ ---- chrome/browser/screen_ai/screen_ai_service_router.cc.orig 2024-07-31 14:19:23 UTC +--- chrome/browser/screen_ai/screen_ai_service_router.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/screen_ai/screen_ai_service_router.cc -@@ -284,7 +284,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() { +@@ -293,7 +293,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() { base::FilePath binary_path = state_instance->get_component_binary_path(); #if BUILDFLAG(IS_WIN) std::vector<base::FilePath> preload_libraries = {binary_path}; @@ -9,7 +9,7 @@ std::vector<std::string> extra_switches = { base::StringPrintf("--%s=%s", screen_ai::GetBinaryPathSwitch(), binary_path.MaybeAsASCII().c_str())}; -@@ -298,7 +298,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() { +@@ -307,7 +307,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() { .WithPreloadedLibraries( preload_libraries, content::ServiceProcessHostPreloadLibraries::GetPassKey()) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_sessions_session__restore.cc b/www/ungoogled-chromium/files/patch-chrome_browser_sessions_session__restore.cc index 6182299ed655..27ed1eadfd9b 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_sessions_session__restore.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_sessions_session__restore.cc @@ -1,4 +1,4 @@ ---- chrome/browser/sessions/session_restore.cc.orig 2024-07-31 14:19:23 UTC +--- chrome/browser/sessions/session_restore.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/sessions/session_restore.cc @@ -99,7 +99,7 @@ #include "chrome/browser/web_applications/web_app_registrar.h" @@ -9,7 +9,7 @@ #include "chrome/browser/ui/webui/whats_new/whats_new_fetcher.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -1040,7 +1040,7 @@ class SessionRestoreImpl : public BrowserListObserver +@@ -1049,7 +1049,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/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc b/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc new file mode 100644 index 000000000000..0554e40df218 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc @@ -0,0 +1,20 @@ +--- chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.cc.orig 2024-08-26 14:40:28 UTC ++++ chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.cc +@@ -25,7 +25,7 @@ + + #if BUILDFLAG(IS_ANDROID) + #include "chrome/browser/supervised_user/child_accounts/child_account_service_android.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 +@@ -139,7 +139,7 @@ SupervisedUserGoogleAuthNavigationThrottle::ShouldProc + return content::NavigationThrottle::DEFER; + } + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + // When an unauthenticated supervised user tries to access YouTube, we force + // re-authentication with an interstitial so that YouTube can be subject to + // content restrictions. This interstitial is only available on Desktop diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__metrics__service__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__metrics__service__factory.cc index 35cfc6d495e3..1dda4fe5e765 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__metrics__service__factory.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__metrics__service__factory.cc @@ -1,4 +1,4 @@ ---- chrome/browser/supervised_user/supervised_user_metrics_service_factory.cc.orig 2024-07-31 14:19:23 UTC +--- chrome/browser/supervised_user/supervised_user_metrics_service_factory.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/supervised_user/supervised_user_metrics_service_factory.cc @@ -14,7 +14,7 @@ #include "components/supervised_user/core/browser/supervised_user_service.h" @@ -9,7 +9,7 @@ #include "chrome/browser/supervised_user/linux_mac_windows/supervised_user_extensions_metrics_delegate_impl.h" #endif -@@ -55,7 +55,7 @@ KeyedService* SupervisedUserMetricsServiceFactory::Bui +@@ -61,7 +61,7 @@ KeyedService* SupervisedUserMetricsServiceFactory::Bui std::unique_ptr<supervised_user::SupervisedUserMetricsService :: SupervisedUserMetricsServiceExtensionDelegate> extensions_metrics_delegate = nullptr; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc b/www/ungoogled-chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc index 057874a2f562..4b0b02c0530c 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/sync/chrome_sync_client.cc.orig 2024-07-31 14:19:23 UTC +--- chrome/browser/sync/chrome_sync_client.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/sync/chrome_sync_client.cc -@@ -116,7 +116,7 @@ +@@ -119,7 +119,7 @@ #endif // BUILDFLAG(ENABLE_SPELLCHECK) #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -9,7 +9,25 @@ #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" #elif BUILDFLAG(IS_ANDROID) -@@ -475,7 +475,7 @@ ChromeSyncClient::CreateModelTypeControllers( +@@ -233,7 +233,7 @@ bool ShouldSyncAppsTypesInTransportMode() { + syncer::ModelTypeControllerDelegate* GetSavedTabGroupControllerDelegate( + Profile* profile) { + #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + auto* keyed_service = + tab_groups::SavedTabGroupServiceFactory::GetForProfile(profile); + CHECK(keyed_service); +@@ -251,7 +251,7 @@ syncer::ModelTypeControllerDelegate* GetSavedTabGroupC + syncer::ModelTypeControllerDelegate* GetSharedTabGroupControllerDelegate( + Profile* profile) { + #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + tab_groups::SavedTabGroupKeyedService* keyed_service = + tab_groups::SavedTabGroupServiceFactory::GetForProfile(profile); + CHECK(keyed_service); +@@ -545,7 +545,7 @@ ChromeSyncClient::CreateModelTypeControllers( // platforms. bool enable_tab_group_sync = false; #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -18,7 +36,7 @@ enable_tab_group_sync = true; #elif BUILDFLAG(IS_ANDROID) enable_tab_group_sync = -@@ -514,7 +514,7 @@ ChromeSyncClient::CreateModelTypeControllers( +@@ -586,7 +586,7 @@ ChromeSyncClient::CreateModelTypeControllers( // Chrome prefers OS provided spell checkers where they exist. So only sync the // custom dictionary on platforms that typically don't provide one. @@ -27,12 +45,3 @@ // Dictionary sync is enabled by default. if (GetPrefService()->GetBoolean(spellcheck::prefs::kSpellCheckEnable)) { controllers.push_back( -@@ -671,7 +671,7 @@ ChromeSyncClient::GetControllerDelegateForModelType(sy - switch (type) { - case syncer::SAVED_TAB_GROUP: { - #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ -- BUILDFLAG(IS_WIN) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - auto* keyed_service = - tab_groups::SavedTabGroupServiceFactory::GetForProfile(profile_); - CHECK(keyed_service); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_sync_sync__service__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_sync_sync__service__factory.cc index 3c2dace04027..70ffe4514296 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_sync_sync__service__factory.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_sync_sync__service__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/sync/sync_service_factory.cc.orig 2024-07-31 14:19:23 UTC +--- chrome/browser/sync/sync_service_factory.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/sync/sync_service_factory.cc -@@ -84,7 +84,7 @@ +@@ -85,7 +85,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_service_factory.h" #elif BUILDFLAG(IS_ANDROID) #include "chrome/browser/tab_group_sync/tab_group_sync_service_factory.h" -@@ -135,7 +135,7 @@ std::unique_ptr<KeyedService> BuildSyncService( +@@ -134,7 +134,7 @@ std::unique_ptr<KeyedService> BuildSyncService( // TODO(crbug.com/40118868): Reassess whether the following block needs to be // included in lacros-chrome once build flag switch of lacros-chrome is // complete. @@ -18,7 +18,7 @@ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) syncer::SyncPrefs prefs(profile->GetPrefs()); local_sync_backend_enabled = prefs.IsLocalSyncEnabled(); -@@ -274,7 +274,7 @@ SyncServiceFactory::SyncServiceFactory() +@@ -271,7 +271,7 @@ SyncServiceFactory::SyncServiceFactory() DependsOn(ProfilePasswordStoreFactory::GetInstance()); DependsOn(PowerBookmarkServiceFactory::GetInstance()); #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_sync_sync__service__util.cc b/www/ungoogled-chromium/files/patch-chrome_browser_sync_sync__service__util.cc deleted file mode 100644 index 36fad2422657..000000000000 --- a/www/ungoogled-chromium/files/patch-chrome_browser_sync_sync__service__util.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- chrome/browser/sync/sync_service_util.cc.orig 2024-05-23 20:04:36 UTC -+++ chrome/browser/sync/sync_service_util.cc -@@ -9,7 +9,7 @@ - #include "components/sync/base/features.h" - - #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ -- BUILDFLAG(IS_WIN) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - #include "components/variations/service/variations_service.h" - #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || - // BUILDFLAG(IS_WIN) -@@ -21,7 +21,7 @@ bool IsDesktopEnUSLocaleOnlySyncPollFeatureEnabled() { - } - - #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ -- BUILDFLAG(IS_WIN) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - std::string country_code; - auto* variations_service = g_browser_process->variations_service(); - if (variations_service) { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_tab__group__sync_tab__group__sync__service__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_tab__group__sync_tab__group__sync__service__factory.cc new file mode 100644 index 000000000000..239a684a63d4 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_tab__group__sync_tab__group__sync__service__factory.cc @@ -0,0 +1,11 @@ +--- chrome/browser/tab_group_sync/tab_group_sync_service_factory.cc.orig 2024-08-26 14:40:28 UTC ++++ chrome/browser/tab_group_sync/tab_group_sync_service_factory.cc +@@ -110,7 +110,7 @@ TabGroupSyncServiceFactory::BuildServiceInstanceForBro + + std::unique_ptr<TabGroupSyncDelegate> delegate; + #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + delegate = + std::make_unique<TabGroupSyncDelegateDesktop>(service.get(), profile); + #else diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc b/www/ungoogled-chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc index 8b8345a09e99..f5d47bfbfc0e 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig 2024-02-25 20:22:18 UTC +--- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/task_manager/sampling/task_manager_impl.cc -@@ -218,7 +218,7 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id, +@@ -219,7 +219,7 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id, } int TaskManagerImpl::GetOpenFdCount(TaskId task_id) const { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_themes_theme__service__aura__linux.cc b/www/ungoogled-chromium/files/patch-chrome_browser_themes_theme__service__aura__linux.cc index 20f7872b465a..1339820d81c4 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_themes_theme__service__aura__linux.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_themes_theme__service__aura__linux.cc @@ -1,6 +1,6 @@ ---- chrome/browser/themes/theme_service_aura_linux.cc.orig 2022-12-02 17:56:32 UTC +--- chrome/browser/themes/theme_service_aura_linux.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/themes/theme_service_aura_linux.cc -@@ -24,7 +24,7 @@ namespace { +@@ -23,7 +23,7 @@ namespace { ui::SystemTheme ValidateSystemTheme(ui::SystemTheme system_theme) { switch (system_theme) { case ui::SystemTheme::kDefault: diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_themes_theme__service__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_themes_theme__service__factory.cc index 6af0d1634137..afadbff6dd01 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_themes_theme__service__factory.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_themes_theme__service__factory.cc @@ -1,4 +1,4 @@ ---- chrome/browser/themes/theme_service_factory.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/themes/theme_service_factory.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/themes/theme_service_factory.cc @@ -27,11 +27,11 @@ @@ -14,7 +14,7 @@ #include "ui/linux/linux_ui_factory.h" #endif -@@ -103,7 +103,7 @@ ThemeServiceFactory::~ThemeServiceFactory() = default; +@@ -106,7 +106,7 @@ ThemeServiceFactory::~ThemeServiceFactory() = default; KeyedService* ThemeServiceFactory::BuildServiceInstanceFor( content::BrowserContext* profile) const { @@ -23,7 +23,7 @@ using ThemeService = ThemeServiceAuraLinux; #endif -@@ -117,9 +117,9 @@ void ThemeServiceFactory::RegisterProfilePrefs( +@@ -120,9 +120,9 @@ void ThemeServiceFactory::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_actions_chrome__action__id.h b/www/ungoogled-chromium/files/patch-chrome_browser_ui_actions_chrome__action__id.h index cbafedb28243..1ecfce4bf98c 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_actions_chrome__action__id.h +++ b/www/ungoogled-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-07-31 14:19:23 UTC +--- chrome/browser/ui/actions/chrome_action_id.h.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/ui/actions/chrome_action_id.h -@@ -515,7 +515,7 @@ +@@ -510,7 +510,7 @@ IDC_CONTENT_CONTEXT_QUICK_ANSWERS_INLINE_ANSWER) \ E(kActionContentContextQuickAnswersInlineQuery, \ IDC_CONTENT_CONTEXT_QUICK_ANSWERS_INLINE_QUERY) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser.h b/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser.h index bfb19d21420d..474f2e876868 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/browser.h.orig 2024-07-31 14:19:23 UTC +--- chrome/browser/ui/browser.h.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/ui/browser.h -@@ -340,7 +340,7 @@ class Browser : public TabStripModelObserver, +@@ -339,7 +339,7 @@ class Browser : public TabStripModelObserver, std::optional<int64_t> display_id; #endif diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__command__controller.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__command__controller.cc index c20447a1574d..d0c879d5bfc7 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__command__controller.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__command__controller.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/browser_command_controller.cc.orig 2024-07-31 14:19:23 UTC +--- chrome/browser/ui/browser_command_controller.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/ui/browser_command_controller.cc @@ -128,7 +128,7 @@ #include "components/user_manager/user_manager.h" @@ -54,7 +54,7 @@ if (base::FeatureList::IsEnabled(features::kShortcutsNotApps)) { chrome::CreateDesktopShortcutForActiveWebContents(browser_); } else { -@@ -1281,12 +1281,12 @@ void BrowserCommandController::InitCommandState() { +@@ -1271,12 +1271,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() -@@ -1602,7 +1602,7 @@ void BrowserCommandController::UpdateCommandsForTabSta +@@ -1592,7 +1592,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/ungoogled-chromium/files/patch-chrome_browser_ui_browser__commands.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__commands.cc index 32ba824c3ad5..79f218e8e291 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__commands.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__commands.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/browser_commands.cc.orig 2024-07-31 14:19:23 UTC +--- chrome/browser/ui/browser_commands.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/ui/browser_commands.cc -@@ -1995,7 +1995,7 @@ void OpenUpdateChromeDialog(Browser* browser) { +@@ -2000,7 +2000,7 @@ void OpenUpdateChromeDialog(Browser* browser) { } else if (UpgradeDetector::GetInstance()->is_outdated_install_no_au()) { UpgradeDetector::GetInstance()->NotifyOutdatedInstallNoAutoUpdate(); } else { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__ui__prefs.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__ui__prefs.cc index 17768e0f8f88..2356d549eb65 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__ui__prefs.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__ui__prefs.cc @@ -1,11 +1,20 @@ ---- chrome/browser/ui/browser_ui_prefs.cc.orig 2024-05-23 20:04:36 UTC +--- chrome/browser/ui/browser_ui_prefs.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/ui/browser_ui_prefs.cc -@@ -175,7 +175,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistry +@@ -72,7 +72,7 @@ void RegisterBrowserPrefs(PrefRegistrySimple* registry + registry->RegisterIntegerPref(prefs::kDefaultBrowserDeclinedCount, 0); + registry->RegisterTimePref(prefs::kDefaultBrowserFirstShownTime, + base::Time()); +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + registry->RegisterStringPref(prefs::kEnterpriseCustomLabel, std::string()); + registry->RegisterStringPref(prefs::kEnterpriseLogoUrl, std::string()); + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +@@ -179,7 +179,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistry registry->RegisterDictionaryPref(prefs::kHttpsUpgradeFallbacks); registry->RegisterDictionaryPref(prefs::kHttpsUpgradeNavigations); registry->RegisterBooleanPref(prefs::kHttpsOnlyModeAutoEnabled, false); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#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) - } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_chrome__pages.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_chrome__pages.cc index d610a922eded..f8507cb60015 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_chrome__pages.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_chrome__pages.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/chrome_pages.cc.orig 2024-07-31 14:19:23 UTC +--- chrome/browser/ui/chrome_pages.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/ui/chrome_pages.cc -@@ -85,7 +85,7 @@ +@@ -86,7 +86,7 @@ #include "components/signin/public/identity_manager/identity_manager.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/web_applications/web_app_utils.h" #endif -@@ -378,7 +378,7 @@ void ShowChromeTips(Browser* browser) { +@@ -379,7 +379,7 @@ void ShowChromeTips(Browser* browser) { ShowSingletonTab(browser, GURL(kChromeTipsURL)); } @@ -18,7 +18,7 @@ void ShowChromeWhatsNew(Browser* browser) { ShowSingletonTab(browser, GURL(kChromeUIWhatsNewURL)); } -@@ -720,7 +720,7 @@ void ShowShortcutCustomizationApp(Profile* profile, +@@ -721,7 +721,7 @@ void ShowShortcutCustomizationApp(Profile* profile, #endif // BUILDFLAG(IS_CHROMEOS_ASH) } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc index 49068d3836df..72fb6e6b0bb5 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc -@@ -1978,7 +1978,7 @@ const gfx::VectorIcon& GetSharingHubVectorIcon() { +@@ -1976,7 +1976,7 @@ const gfx::VectorIcon& GetSharingHubVectorIcon() { return omnibox::kShareMacChromeRefreshIcon; #elif BUILDFLAG(IS_WIN) return omnibox::kShareWinChromeRefreshIcon; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc index 20992ea1fedc..9106795528b6 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/passwords/manage_passwords_ui_controller.cc.orig 2024-07-31 14:19:23 UTC +--- chrome/browser/ui/passwords/manage_passwords_ui_controller.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/ui/passwords/manage_passwords_ui_controller.cc @@ -97,7 +97,7 @@ namespace { @@ -9,7 +9,7 @@ // Should be kept in sync with constant declared in // bubble_controllers/relaunch_chrome_bubble_controller.cc. constexpr int kMaxNumberOfTimesKeychainErrorBubbleIsShown = 3; -@@ -504,7 +504,7 @@ void ManagePasswordsUIController::OnBiometricAuthBefor +@@ -502,7 +502,7 @@ void ManagePasswordsUIController::OnBiometricAuthBefor } void ManagePasswordsUIController::OnKeychainError() { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_signin_signin__view__controller.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_signin_signin__view__controller.cc index 5567ab6f304e..11f35c5c5105 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_signin_signin__view__controller.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_signin_signin__view__controller.cc @@ -1,7 +1,7 @@ ---- chrome/browser/ui/signin/signin_view_controller.cc.orig 2024-07-31 14:19:23 UTC +--- chrome/browser/ui/signin/signin_view_controller.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/ui/signin/signin_view_controller.cc @@ -482,7 +482,7 @@ void SigninViewController::ShowModalManagedUserNoticeD - signin::SigninChoiceCallback process_user_choice_callback, + signin::SigninChoiceCallbackVariant process_user_choice_callback, base::OnceClosure done_callback) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS_LACROS) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc index defe35344ac8..81da5c505365 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc +++ b/www/ungoogled-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-07-31 14:19:23 UTC +--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/ui/startup/startup_browser_creator.cc -@@ -137,7 +137,7 @@ +@@ -138,7 +138,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" -@@ -966,7 +966,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -967,7 +967,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())) { -@@ -1079,7 +1079,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -1084,7 +1084,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) && -@@ -1289,7 +1289,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -1294,7 +1294,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/ungoogled-chromium/files/patch-chrome_browser_ui_tab__helpers.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_tab__helpers.cc index 16a7aecbc6fa..85dffce6e609 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_tab__helpers.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_tab__helpers.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/tab_helpers.cc.orig 2024-07-31 14:19:23 UTC +--- chrome/browser/ui/tab_helpers.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/ui/tab_helpers.cc -@@ -243,7 +243,7 @@ +@@ -241,7 +241,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" -@@ -696,12 +696,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con +@@ -694,12 +694,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/ungoogled-chromium/files/patch-chrome_browser_ui_tabs_features.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_tabs_features.cc index 9704df36754f..191d5244619b 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_tabs_features.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_tabs_features.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/tabs/features.cc.orig 2024-07-31 14:19:23 UTC +--- chrome/browser/ui/tabs/features.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/ui/tabs/features.cc -@@ -16,7 +16,7 @@ BASE_FEATURE(kTabSearchPositionSetting, +@@ -48,7 +48,7 @@ BASE_FEATURE(kTabStripCollectionStorage, bool CanShowTabSearchPositionSetting() { // Mac and other platforms will always have the tab search position in the // correct location, cros/linux/win git the user the option to change. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_ui__features.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_ui__features.cc index d796e5610d54..801b5e9a5d9b 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_ui__features.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_ui__features.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/ui_features.cc.orig 2024-07-31 14:19:23 UTC +--- chrome/browser/ui/ui_features.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/ui/ui_features.cc -@@ -120,7 +120,7 @@ BASE_FEATURE(kEvDetailsInPageInfo, +@@ -108,7 +108,7 @@ BASE_FEATURE(kEvDetailsInPageInfo, "EvDetailsInPageInfo", base::FEATURE_ENABLED_BY_DEFAULT); @@ -9,7 +9,7 @@ // Enables the feature to remove the last confirmation dialog when relaunching // to update Chrome. BASE_FEATURE(kFewerUpdateConfirmations, -@@ -426,7 +426,7 @@ BASE_FEATURE(kTopChromeWebUIUsesSpareRenderer, +@@ -381,7 +381,7 @@ BASE_FEATURE(kTopChromeWebUIUsesSpareRenderer, "TopChromeWebUIUsesSpareRenderer", base::FEATURE_ENABLED_BY_DEFAULT); @@ -18,3 +18,12 @@ // Enables alternate update-related text to be displayed in browser app menu // button, menu item and confirmation dialog. BASE_FEATURE(kUpdateTextOptions, +@@ -457,7 +457,7 @@ BASE_FEATURE(kStopLoadingAnimationForHiddenWindow, + "StopLoadingAnimationForHiddenWindow", + base::FEATURE_ENABLED_BY_DEFAULT); + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + BASE_FEATURE(kUsePortalAccentColor, + "UsePortalAccentColor", + base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_ui__features.h b/www/ungoogled-chromium/files/patch-chrome_browser_ui_ui__features.h index 9c5a9fadbcb6..d11d0380cd53 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_ui__features.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_ui__features.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/ui_features.h.orig 2024-07-31 14:19:23 UTC +--- chrome/browser/ui/ui_features.h.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/ui/ui_features.h -@@ -85,7 +85,7 @@ BASE_DECLARE_FEATURE(kAccessCodeCastUI); +@@ -80,7 +80,7 @@ BASE_DECLARE_FEATURE(kAccessCodeCastUI); BASE_DECLARE_FEATURE(kEvDetailsInPageInfo); @@ -9,7 +9,7 @@ BASE_DECLARE_FEATURE(kFewerUpdateConfirmations); #endif -@@ -256,7 +256,7 @@ bool IsToolbarPinningEnabled(); +@@ -239,7 +239,7 @@ bool IsToolbarPinningEnabled(); BASE_DECLARE_FEATURE(kTopChromeWebUIUsesSpareRenderer); @@ -18,3 +18,12 @@ BASE_DECLARE_FEATURE(kUpdateTextOptions); extern const base::FeatureParam<int> kUpdateTextOptionNumber; #endif +@@ -266,7 +266,7 @@ BASE_DECLARE_FEATURE(kViewsJSAppModalDialog); + + BASE_DECLARE_FEATURE(kStopLoadingAnimationForHiddenWindow); + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + BASE_DECLARE_FEATURE(kUsePortalAccentColor); + #endif + diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc index 03b3bd5008f5..329137c75297 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/accelerator_table.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/ui/views/accelerator_table.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/ui/views/accelerator_table.cc @@ -72,11 +72,11 @@ const AcceleratorMapping kAcceleratorMap[] = { {ui::VKEY_S, ui::EF_PLATFORM_ACCELERATOR, IDC_SAVE_PAGE}, @@ -23,7 +23,7 @@ {ui::VKEY_1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0}, {ui::VKEY_NUMPAD1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0}, {ui::VKEY_2, ui::EF_ALT_DOWN, IDC_SELECT_TAB_1}, -@@ -154,7 +154,7 @@ const AcceleratorMapping kAcceleratorMap[] = { +@@ -156,7 +156,7 @@ const AcceleratorMapping kAcceleratorMap[] = { IDC_SHOW_AVATAR_MENU}, // Platform-specific key maps. @@ -32,12 +32,3 @@ {ui::VKEY_BROWSER_BACK, ui::EF_NONE, IDC_BACK}, {ui::VKEY_BROWSER_FORWARD, ui::EF_NONE, IDC_FORWARD}, {ui::VKEY_BROWSER_HOME, ui::EF_NONE, IDC_HOME}, -@@ -249,7 +249,7 @@ const AcceleratorMapping kAcceleratorMap[] = { - #endif // !BUILDFLAG(IS_CHROMEOS) - #endif // !BUILDFLAG(IS_MAC) - #if BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) && \ -- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) -+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) - {ui::VKEY_S, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, - IDC_CONTENT_CONTEXT_RUN_LAYOUT_EXTRACTION}, - #endif diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc index 42d04e04949e..e7a9bd491d9a 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc +++ b/www/ungoogled-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-07-31 14:19:23 UTC +--- chrome/browser/ui/views/frame/browser_view.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/ui/views/frame/browser_view.cc -@@ -2244,7 +2244,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra +@@ -2262,7 +2262,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/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h index fcd99a167aa9..9e02700ba08d 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h @@ -1,15 +1,15 @@ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view.h.orig 2024-02-25 20:22:18 UTC +--- chrome/browser/ui/views/frame/opaque_browser_frame_view.h.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/ui/views/frame/opaque_browser_frame_view.h -@@ -115,7 +115,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient - void UpdateWindowControlsOverlay( - const gfx::Rect& bounding_rect) const override; +@@ -114,7 +114,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient + FrameButtonStyle GetFrameButtonStyle() const override; + void UpdateWindowControlsOverlay(const gfx::Rect& bounding_rect) override; bool ShouldDrawRestoredFrameShadow() const override; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) bool IsTiled() const override; #endif int WebAppButtonHeight() const override; -@@ -232,7 +232,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient +@@ -231,7 +231,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient // Background painter for the window frame. std::unique_ptr<views::FrameBackground> frame_background_; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout__delegate.h b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout__delegate.h index 2d2a735bcbb1..dcca5c1b535c 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout__delegate.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout__delegate.h @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_delegate.h.orig 2024-02-25 20:22:18 UTC +--- chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_delegate.h.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_delegate.h @@ -10,7 +10,7 @@ #include "build/build_config.h" @@ -9,7 +9,7 @@ #include "ui/base/ui_base_types.h" #endif -@@ -94,7 +94,7 @@ class OpaqueBrowserFrameViewLayoutDelegate { +@@ -93,7 +93,7 @@ class OpaqueBrowserFrameViewLayoutDelegate { // Returns true if a client-side shadow should be drawn for restored windows. virtual bool ShouldDrawRestoredFrameShadow() const = 0; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc index c3a6f949a041..1fd5d6564822 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig 2024-07-31 14:19:23 UTC +--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc -@@ -58,7 +58,7 @@ +@@ -61,7 +61,7 @@ #include "ui/aura/window.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" #include "chrome/browser/ui/views/frame/browser_frame_view_paint_utils_linux.h" -@@ -90,7 +90,7 @@ constexpr int kContentSettingIconSize = 16; +@@ -93,7 +93,7 @@ constexpr int kContentSettingIconSize = 16; // The height of the controls bar at the top of the window. constexpr int kTopControlsHeight = 34; @@ -18,7 +18,7 @@ // Frame border when window shadow is not drawn. constexpr int kFrameBorderThickness = 4; #endif -@@ -182,7 +182,7 @@ class WindowEventObserver : public ui::EventObserver { +@@ -185,7 +185,7 @@ class WindowEventObserver : public ui::EventObserver { gfx::Rect input_bounds = pip_browser_frame_view_->GetLocalBounds(); @@ -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()) { -@@ -578,7 +578,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow +@@ -581,7 +581,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); -@@ -800,7 +800,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged( +@@ -803,7 +803,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))); -@@ -882,7 +882,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg +@@ -885,7 +885,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg BrowserNonClientFrameView::RemovedFromWidget(); } @@ -54,7 +54,7 @@ gfx::Insets PictureInPictureBrowserFrameView::MirroredFrameBorderInsets() const { auto border = FrameBorderInsets(); -@@ -1138,7 +1138,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre +@@ -1153,7 +1153,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_) { -@@ -1272,7 +1272,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie +@@ -1287,7 +1287,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(); -@@ -1290,7 +1290,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor +@@ -1305,7 +1305,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); -@@ -1311,7 +1311,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie +@@ -1326,7 +1326,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie top_height + border_thickness.bottom()); } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h index 19d44fa9ea63..5d39b1f110d7 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig 2024-04-23 07:42:17 UTC +--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h @@ -27,7 +27,7 @@ #include "ui/views/layout/flex_layout_view.h" @@ -18,7 +18,7 @@ #define RESIZE_DOCUMENT_PICTURE_IN_PICTURE_TO_DIALOG 1 #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || // BUILDFLAG(IS_CHROMEOS_LACROS) -@@ -101,7 +101,7 @@ class PictureInPictureBrowserFrameView +@@ -103,7 +103,7 @@ class PictureInPictureBrowserFrameView void Layout(PassKey) override; void AddedToWidget() override; void RemovedFromWidget() override; @@ -27,7 +27,7 @@ gfx::Insets MirroredFrameBorderInsets() const override; gfx::Insets GetInputInsets() const override; SkRRect GetRestoredClipRegion() const override; -@@ -192,7 +192,7 @@ class PictureInPictureBrowserFrameView +@@ -195,7 +195,7 @@ class PictureInPictureBrowserFrameView // Returns true if there's an overlay view that's currently shown. bool IsOverlayViewVisible() const; @@ -36,7 +36,7 @@ // Returns whether a client-side shadow should be drawn for the window. bool ShouldDrawFrameShadow() const; -@@ -368,7 +368,7 @@ class PictureInPictureBrowserFrameView +@@ -371,7 +371,7 @@ class PictureInPictureBrowserFrameView // `top_bar_color_animation_`. std::optional<SkColor> current_foreground_color_; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc index b8d807072b79..ec9c53097a1c 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/ui/views/frame/system_menu_model_builder.cc @@ -75,7 +75,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser ui::SimpleMenuModel* model) { @@ -18,7 +18,7 @@ model->AddSeparator(ui::NORMAL_SEPARATOR); bool supports_server_side_decorations = true; #if BUILDFLAG(IS_OZONE) && !BUILDFLAG(IS_CHROMEOS) -@@ -147,7 +147,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo +@@ -155,7 +155,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo model->AddSeparator(ui::NORMAL_SEPARATOR); model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc index 830f04358dd2..79211dc2437a 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc +++ b/www/ungoogled-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-07-31 14:19:23 UTC +--- chrome/browser/ui/views/omnibox/omnibox_view_views.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/ui/views/omnibox/omnibox_view_views.cc -@@ -1962,7 +1962,7 @@ void OmniboxViewViews::MaybeAddSendTabToSelfItem( +@@ -1972,7 +1972,7 @@ void OmniboxViewViews::MaybeAddSendTabToSelfItem( } void OmniboxViewViews::OnPopupOpened() { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_passwords_password__bubble__view__base.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_passwords_password__bubble__view__base.cc index 8ac6e07bc146..b0e4ef18dc7e 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_passwords_password__bubble__view__base.cc +++ b/www/ungoogled-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-07-31 14:19:23 UTC +--- chrome/browser/ui/views/passwords/password_bubble_view_base.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/ui/views/passwords/password_bubble_view_base.cc -@@ -34,7 +34,7 @@ +@@ -37,7 +37,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 -@@ -133,7 +133,7 @@ PasswordBubbleViewBase* PasswordBubbleViewBase::Create +@@ -141,7 +141,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/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view.cc new file mode 100644 index 000000000000..6fe2db7a2bc3 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view.cc @@ -0,0 +1,11 @@ +--- chrome/browser/ui/views/profiles/profile_menu_view.cc.orig 2024-08-26 14:40:28 UTC ++++ chrome/browser/ui/views/profiles/profile_menu_view.cc +@@ -82,7 +82,7 @@ + #include "ui/strings/grit/ui_strings.h" + #include "ui/views/accessibility/view_accessibility.h" + +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h" + #endif + diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_profile__picker__view.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_profile__picker__view.cc new file mode 100644 index 000000000000..943ddfe75cbc --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_profile__picker__view.cc @@ -0,0 +1,20 @@ +--- chrome/browser/ui/views/profiles/profile_picker_view.cc.orig 2024-08-26 14:40:28 UTC ++++ chrome/browser/ui/views/profiles/profile_picker_view.cc +@@ -87,7 +87,7 @@ + #include "chrome/browser/ui/views/profiles/first_run_flow_controller_lacros.h" + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "chrome/browser/shell_integration_linux.h" + #endif + +@@ -117,7 +117,7 @@ class ProfilePickerWidget : public views::Widget { + views::Widget::InitParams params( + views::Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET); + params.delegate = profile_picker_view_; +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + params.wm_class_name = shell_integration_linux::GetProgramClassName(); + params.wm_class_class = shell_integration_linux::GetProgramClassClass(); + params.wayland_app_id = params.wm_class_class; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc index 0b21b767b7b6..ac594813c0d8 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig 2024-07-31 14:19:23 UTC +--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc -@@ -58,7 +58,7 @@ namespace { +@@ -55,7 +55,7 @@ namespace { const int kModalDialogWidth = 448; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ const int kManagedUserNoticeConfirmationDialogWidth = 512; const int kManagedUserNoticeConfirmationDialogHeight = 576; const int kManagedUserNoticeConfirmationUpdatedDialogWidth = 900; -@@ -184,7 +184,7 @@ SigninViewControllerDelegateViews::CreateProfileCustom +@@ -173,7 +173,7 @@ SigninViewControllerDelegateViews::CreateProfileCustom #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -18,7 +18,7 @@ // static std::unique_ptr<views::WebView> SigninViewControllerDelegateViews::CreateManagedUserNoticeConfirmationWebView( -@@ -346,7 +346,7 @@ SigninViewControllerDelegateViews::SigninViewControlle +@@ -335,7 +335,7 @@ SigninViewControllerDelegateViews::SigninViewControlle SetButtons(ui::DIALOG_BUTTON_NONE); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -27,7 +27,7 @@ // On the local profile creation dialog, cancelling the dialog (for instance // through the VKEY_ESCAPE accelerator) should delete the profile. if (delete_profile_on_cancel) { -@@ -436,7 +436,7 @@ void SigninViewControllerDelegateViews::DisplayModal() +@@ -425,7 +425,7 @@ void SigninViewControllerDelegateViews::DisplayModal() } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -36,7 +36,7 @@ void SigninViewControllerDelegateViews::DeleteProfileOnCancel() { ProfileAttributesEntry* entry = g_browser_process->profile_manager() -@@ -510,7 +510,7 @@ SigninViewControllerDelegate::CreateProfileCustomizati +@@ -499,7 +499,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/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc index e35830f79720..e52f88390cf6 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/tabs/tab.cc.orig 2024-07-31 14:19:23 UTC +--- chrome/browser/ui/views/tabs/tab.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/ui/views/tabs/tab.cc -@@ -612,7 +612,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& +@@ -617,7 +617,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& return; } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc index 9f6bf3c98cdf..a070ff8d3098 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc +++ b/www/ungoogled-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-07-31 14:19:23 UTC +--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/ui/views/tabs/tab_drag_controller.cc -@@ -95,7 +95,7 @@ +@@ -98,7 +98,7 @@ #include "components/remote_cocoa/browser/window.h" #endif @@ -9,7 +9,7 @@ #include "ui/aura/client/drag_drop_client.h" #endif -@@ -215,7 +215,7 @@ bool IsWindowDragUsingSystemDragDropAllowed() { +@@ -218,7 +218,7 @@ bool IsWindowDragUsingSystemDragDropAllowed() { void UpdateSystemDnDDragImage(TabDragContext* attached_context, const gfx::ImageSkia& image) { @@ -18,7 +18,7 @@ aura::Window* root_window = attached_context->GetWidget()->GetNativeWindow()->GetRootWindow(); if (aura::client::GetDragDropClient(root_window)) { -@@ -405,7 +405,7 @@ TabDragController::Liveness TabDragController::Init( +@@ -416,7 +416,7 @@ TabDragController::Liveness TabDragController::Init( // synchronous on desktop Linux, so use that. // - ChromeOS Ash // Releasing capture on Ash cancels gestures so avoid it. @@ -27,7 +27,7 @@ ref->can_release_capture_ = false; #endif ref->start_point_in_screen_ = -@@ -1070,7 +1070,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon +@@ -1065,7 +1065,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -36,7 +36,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. -@@ -2179,7 +2179,7 @@ void TabDragController::CompleteDrag() { +@@ -2151,7 +2151,7 @@ void TabDragController::CompleteDrag() { } // If source window was maximized - maximize the new window as well. @@ -45,7 +45,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 -@@ -2608,7 +2608,7 @@ TabDragController::Liveness TabDragController::GetLoca +@@ -2597,7 +2597,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/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__style__views.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__style__views.cc index 0a02c3bec655..cb634dee8a09 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__style__views.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__style__views.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/tabs/tab_style_views.cc.orig 2024-07-31 14:19:23 UTC +--- chrome/browser/ui/views/tabs/tab_style_views.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/ui/views/tabs/tab_style_views.cc -@@ -502,7 +502,7 @@ float GM2TabStyleViews::GetCurrentActiveOpacity() cons +@@ -550,7 +550,7 @@ float TabStyleViewsImpl::GetCurrentActiveOpacity() con if (!IsHoverAnimationActive()) { return base_opacity; } @@ -8,4 +8,4 @@ + return std::lerp(base_opacity, GetHoverOpacity(), static_cast<float>(GetHoverAnimationValue())); } - TabActive GM2TabStyleViews::GetApparentActiveState() const { + TabActive TabStyleViewsImpl::GetApparentActiveState() const { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc index 072954d29189..23cd7ddb8da3 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc +++ b/www/ungoogled-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-07-31 14:19:23 UTC +--- chrome/browser/ui/views/user_education/browser_user_education_service.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/ui/views/user_education/browser_user_education_service.cc -@@ -996,7 +996,7 @@ void MaybeRegisterChromeFeaturePromos( +@@ -997,7 +997,7 @@ void MaybeRegisterChromeFeaturePromos( FeaturePromoSpecification::AcceleratorInfo()) .SetBubbleArrow(HelpBubbleArrow::kTopLeft))); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc index 39c91e5bdf10..d522eacc1e25 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc.orig 2024-07-31 14:19:23 UTC +--- chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc -@@ -515,7 +515,7 @@ std::string GetFileExtension(FileExtension file_extens +@@ -516,7 +516,7 @@ std::string GetFileExtension(FileExtension file_extens } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ SiteConfig GetSiteConfigurationFromAppName(const std::string& app_name) { SiteConfig config; bool is_app_found = false; -@@ -2103,7 +2103,7 @@ void WebAppIntegrationTestDriver::DeletePlatformShortc +@@ -2104,7 +2104,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( -@@ -3433,7 +3433,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginEna +@@ -3431,7 +3431,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 -@@ -3448,7 +3448,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis +@@ -3446,7 +3446,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 -@@ -3458,7 +3458,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis +@@ -3456,7 +3456,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis void WebAppIntegrationTestDriver::CheckSiteHandlesFile( Site site, FileExtension file_extension) { @@ -45,7 +45,7 @@ if (!BeforeStateCheckAction(__FUNCTION__)) { return; } -@@ -3474,7 +3474,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile +@@ -3472,7 +3472,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile void WebAppIntegrationTestDriver::CheckSiteNotHandlesFile( Site site, FileExtension file_extension) { @@ -54,7 +54,7 @@ if (!BeforeStateCheckAction(__FUNCTION__)) { return; } -@@ -4288,7 +4288,7 @@ base::FilePath WebAppIntegrationTestDriver::GetShortcu +@@ -4289,7 +4289,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 -@@ -4488,7 +4488,7 @@ bool WebAppIntegrationTestDriver::IsShortcutAndIconCre +@@ -4489,7 +4489,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); -@@ -4532,7 +4532,7 @@ bool WebAppIntegrationTestDriver::DoIconColorsMatch(Pr +@@ -4533,7 +4533,7 @@ bool WebAppIntegrationTestDriver::DoIconColorsMatch(Pr do_icon_colors_match = (expected_icon_pixel_color == shortcut_pixel_color_apps_folder.value()); } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_about_about__ui.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_about_about__ui.cc index 5ef54fc98623..09e01d1f45a6 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_about_about__ui.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_about_about__ui.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/about/about_ui.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/ui/webui/about/about_ui.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/ui/webui/about/about_ui.cc -@@ -593,7 +593,7 @@ std::string ChromeURLs(content::BrowserContext* browse +@@ -596,7 +596,7 @@ std::string ChromeURLs(content::BrowserContext* browse return html; } @@ -9,7 +9,7 @@ std::string AboutLinuxProxyConfig() { std::string data; AppendHeader(&data, -@@ -648,7 +648,7 @@ void AboutUIHTMLSource::StartDataRequest( +@@ -651,7 +651,7 @@ void AboutUIHTMLSource::StartDataRequest( response = ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(idr); } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_certificate__manager_certificate__manager__handler.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_certificate__manager_certificate__manager__handler.cc new file mode 100644 index 000000000000..26c6a5258f43 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_certificate__manager_certificate__manager__handler.cc @@ -0,0 +1,11 @@ +--- chrome/browser/ui/webui/certificate_manager/certificate_manager_handler.cc.orig 2024-08-26 14:40:28 UTC ++++ chrome/browser/ui/webui/certificate_manager/certificate_manager_handler.cc +@@ -147,7 +147,7 @@ CertificateManagerPageHandler::GetCertSource( + "distrusted_certs", + cert_verifier::mojom::CertificateTrust::kDistrusted); + break; +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + case certificate_manager_v2::mojom::CertificateSource:: + kProvisionedClientCert: + source_ptr = CreateProvisionedClientCertSource(profile_); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc new file mode 100644 index 000000000000..45ca39746e4b --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc @@ -0,0 +1,29 @@ +--- chrome/browser/ui/webui/certificate_manager/client_cert_sources.cc.orig 2024-08-26 14:40:28 UTC ++++ chrome/browser/ui/webui/certificate_manager/client_cert_sources.cc +@@ -36,7 +36,7 @@ + #include "net/ssl/client_cert_store_mac.h" + #endif // BUILDFLAG(IS_MAC) + +-#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/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" +@@ -98,7 +98,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 +@@ -373,7 +373,7 @@ CreatePlatformClientCertSource() { + #endif + } + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + std::unique_ptr<CertificateManagerPageHandler::CertSource> + CreateProvisionedClientCertSource(Profile* profile) { + return std::make_unique<ClientCertSource>( diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.h b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.h new file mode 100644 index 000000000000..f2cf6c55dc92 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.h @@ -0,0 +1,11 @@ +--- chrome/browser/ui/webui/certificate_manager/client_cert_sources.h.orig 2024-08-26 14:40:28 UTC ++++ chrome/browser/ui/webui/certificate_manager/client_cert_sources.h +@@ -15,7 +15,7 @@ class Profile; + std::unique_ptr<CertificateManagerPageHandler::CertSource> + CreatePlatformClientCertSource(); + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + std::unique_ptr<CertificateManagerPageHandler::CertSource> + CreateProvisionedClientCertSource(Profile* profile); + #endif diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc index bb9dbc8cc23b..4916c84b96d9 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2024-07-31 14:19:23 UTC +--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -192,7 +192,7 @@ +@@ -190,7 +190,7 @@ #include "chrome/browser/ui/webui/chromeos/chrome_url_disabled/chrome_url_disabled_ui.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/ui/webui/webui_js_error/webui_js_error_ui.h" #endif -@@ -217,21 +217,21 @@ +@@ -215,21 +215,21 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -35,7 +35,7 @@ #include "chrome/browser/ui/webui/whats_new/whats_new_ui.h" #include "chrome/browser/ui/webui/whats_new/whats_new_util.h" #endif -@@ -385,7 +385,7 @@ bool IsAboutUI(const GURL& url) { +@@ -379,7 +379,7 @@ bool IsAboutUI(const GURL& url) { #if !BUILDFLAG(IS_ANDROID) || url.host_piece() == chrome::kChromeUITermsHost #endif @@ -44,7 +44,7 @@ || url.host_piece() == chrome::kChromeUILinuxProxyConfigHost #endif #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -589,7 +589,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -570,7 +570,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we if (url.host_piece() == chrome::kChromeUIMobileSetupHost) return &NewWebUI<ash::cellular_setup::MobileSetupUI>; #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -53,7 +53,7 @@ if (url.host_piece() == chrome::kChromeUIWebUIJsErrorHost) return &NewWebUI<WebUIJsErrorUI>; #endif -@@ -645,7 +645,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -626,7 +626,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we if (url.host_piece() == chrome::kChromeUINaClHost) return &NewWebUI<NaClUI>; #endif @@ -62,7 +62,7 @@ defined(TOOLKIT_VIEWS)) || \ defined(USE_AURA) if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost) -@@ -676,7 +676,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -657,7 +657,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we if (url.host_piece() == chrome::kChromeUIWebuiGalleryHost) { return &NewWebUI<WebuiGalleryUI>; } @@ -71,7 +71,7 @@ if (url.host_piece() == chrome::kChromeUIWhatsNewHost && whats_new::IsEnabled()) { return &NewWebUI<WhatsNewUI>; -@@ -695,26 +695,26 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -676,26 +676,26 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we } #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -103,7 +103,7 @@ if (url.host_piece() == chrome::kChromeUIWebAppSettingsHost) return &NewWebUI<WebAppSettingsUI>; #endif -@@ -955,7 +955,7 @@ base::RefCountedMemory* ChromeWebUIControllerFactory:: +@@ -936,7 +936,7 @@ base::RefCountedMemory* ChromeWebUIControllerFactory:: if (page_url.host_piece() == chrome::kChromeUINewTabPageHost) return NewTabPageUI::GetFaviconResourceBytes(scale_factor); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_interstitials_interstitial__ui.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_interstitials_interstitial__ui.cc new file mode 100644 index 000000000000..c87968bd374a --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_interstitials_interstitial__ui.cc @@ -0,0 +1,29 @@ +--- chrome/browser/ui/webui/interstitials/interstitial_ui.cc.orig 2024-08-26 14:40:28 UTC ++++ chrome/browser/ui/webui/interstitials/interstitial_ui.cc +@@ -70,7 +70,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 +@@ -289,7 +289,7 @@ std::unique_ptr<EnterpriseBlockPage> CreateEnterpriseB + 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) { + const GURL kRequestUrl("https://supervised-user-verification.example.net"); +@@ -424,7 +424,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(web_contents); + #endif diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_management_management__ui__constants.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_management_management__ui__constants.cc index 7094a7c6db6e..95f68456410b 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_management_management__ui__constants.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_management_management__ui__constants.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/management/management_ui_constants.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/ui/webui/management/management_ui_constants.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/ui/webui/management/management_ui_constants.cc -@@ -78,12 +78,12 @@ const char kProfileReportingBrowser[] = "profileReport +@@ -82,12 +82,12 @@ const char kProfileReportingBrowser[] = "profileReport const char kProfileReportingExtension[] = "profileReportingExtension"; const char kProfileReportingPolicy[] = "profileReportingPolicy"; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc index 1d26df7f4f24..5762c9b35573 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc +++ b/www/ungoogled-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-06-22 08:49:42 UTC +--- chrome/browser/ui/webui/management/management_ui_handler.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/ui/webui/management/management_ui_handler.cc @@ -57,7 +57,7 @@ #include "ui/base/l10n/l10n_util.h" @@ -9,7 +9,7 @@ #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) -@@ -353,7 +353,7 @@ void ManagementUIHandler::AddReportingInfo(base::Value +@@ -361,7 +361,7 @@ void ManagementUIHandler::AddReportingInfo(base::Value report_sources->Append(std::move(data)); } } @@ -18,7 +18,7 @@ // Insert the device signals consent disclosure at the end of browser // reporting section. auto* user_permission_service = GetUserPermissionService(); -@@ -525,7 +525,7 @@ policy::PolicyService* ManagementUIHandler::GetPolicyS +@@ -533,7 +533,7 @@ policy::PolicyService* ManagementUIHandler::GetPolicyS ->policy_service(); } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_password__manager_promo__cards__handler.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_password__manager_promo__cards__handler.cc index bf57bcc63fe5..9206460b67b6 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_password__manager_promo__cards__handler.cc +++ b/www/ungoogled-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-02-25 20:22:18 UTC +--- chrome/browser/ui/webui/password_manager/promo_cards_handler.cc.orig 2024-08-26 14:40:28 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 -@@ -71,7 +71,7 @@ std::vector<std::unique_ptr<PasswordPromoCardBase>> Ge +@@ -75,7 +75,7 @@ std::vector<std::unique_ptr<PasswordPromoCardBase>> Ge .get())); #endif diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_searchbox_searchbox__handler.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_searchbox_searchbox__handler.cc index c1efe95069b8..42ebf09c8baf 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_searchbox_searchbox__handler.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_searchbox_searchbox__handler.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/searchbox/searchbox_handler.cc.orig 2024-07-31 14:19:23 UTC +--- chrome/browser/ui/webui/searchbox/searchbox_handler.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/ui/webui/searchbox/searchbox_handler.cc -@@ -105,7 +105,7 @@ const char* kMacShareIconResourceName = +@@ -108,7 +108,7 @@ const char* kMacShareIconResourceName = #elif BUILDFLAG(IS_WIN) const char* kWinShareIconResourceName = "//resources/cr_components/searchbox/icons/win_share.svg"; @@ -9,7 +9,7 @@ const char* kLinuxShareIconResourceName = "//resources/cr_components/searchbox/icons/share.svg"; #else -@@ -165,7 +165,7 @@ static void DefineChromeRefreshRealboxIcons() { +@@ -168,7 +168,7 @@ static void DefineChromeRefreshRealboxIcons() { #elif BUILDFLAG(IS_WIN) kWinShareIconResourceName = "//resources/cr_components/searchbox/icons/win_share_cr23.svg"; @@ -18,7 +18,7 @@ kLinuxShareIconResourceName = "//resources/cr_components/searchbox/icons/share_cr23.svg"; #else -@@ -671,7 +671,7 @@ std::string SearchboxHandler::ActionVectorIconToResour +@@ -675,7 +675,7 @@ std::string SearchboxHandler::ActionVectorIconToResour icon.name == omnibox::kShareWinChromeRefreshIcon.name) { return kWinShareIconResourceName; } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_settings_accessibility__main__handler.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_settings_accessibility__main__handler.cc deleted file mode 100644 index db52a151d90e..000000000000 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_settings_accessibility__main__handler.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/ui/webui/settings/accessibility_main_handler.cc.orig 2024-03-22 14:16:19 UTC -+++ chrome/browser/ui/webui/settings/accessibility_main_handler.cc -@@ -19,7 +19,7 @@ - #include "content/public/browser/web_contents.h" - #include "content/public/browser/web_ui.h" - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - #include "ui/accessibility/accessibility_features.h" - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) - diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_settings_accessibility__main__handler.h b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_settings_accessibility__main__handler.h deleted file mode 100644 index a497b4009bb1..000000000000 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_settings_accessibility__main__handler.h +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/ui/webui/settings/accessibility_main_handler.h.orig 2024-03-22 14:16:19 UTC -+++ chrome/browser/ui/webui/settings/accessibility_main_handler.h -@@ -37,7 +37,7 @@ class AccessibilityMainHandler - void HandleGetScreenReaderState(const base::Value::List& args); - void HandleCheckAccessibilityImageLabels(const base::Value::List& args); - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - void HandleGetScreenAIInstallState(const base::Value::List& args); - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) - diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc index 46043b7262dd..8d6c174634da 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/settings/appearance_handler.cc.orig 2022-10-29 17:50:56 UTC +--- chrome/browser/ui/webui/settings/appearance_handler.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/ui/webui/settings/appearance_handler.cc -@@ -28,7 +28,7 @@ void AppearanceHandler::RegisterMessages() { +@@ -34,7 +34,7 @@ void AppearanceHandler::RegisterMessages() { "useDefaultTheme", base::BindRepeating(&AppearanceHandler::HandleUseTheme, base::Unretained(this), ui::SystemTheme::kDefault)); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc index 4ac24bac89c4..e68a86f949a1 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc +++ b/www/ungoogled-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-07-31 14:19:23 UTC +--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -141,7 +141,7 @@ +@@ -140,7 +140,7 @@ #include "chrome/browser/ui/chrome_pages.h" #endif @@ -9,7 +9,7 @@ #include "ui/display/screen.h" #endif -@@ -160,7 +160,7 @@ +@@ -159,7 +159,7 @@ #include "chrome/browser/ui/webui/certificate_manager_localized_strings_provider.h" #endif @@ -27,34 +27,25 @@ {"overscrollHistoryNavigationTitle", IDS_SETTINGS_OVERSCROLL_HISTORY_NAVIGATION_TITLE}, {"overscrollHistoryNavigationSubtitle", -@@ -299,7 +299,7 @@ void AddA11yStrings(content::WebUIDataSource* html_sou - }; - html_source->AddLocalizedStrings(kLocalizedStrings); - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - html_source->AddBoolean( - "mainNodeAnnotationsEnabled", - base::FeatureList::IsEnabled(features::kMainNodeAnnotations)); -@@ -418,7 +418,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht - {"huge", IDS_SETTINGS_HUGE_FONT_SIZE}, +@@ -404,7 +404,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}, -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) {"gtkTheme", IDS_SETTINGS_GTK_THEME}, {"useGtkTheme", IDS_SETTINGS_USE_GTK_THEME}, {"qtTheme", IDS_SETTINGS_QT_THEME}, -@@ -428,7 +428,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht - #else - {"resetToDefaultTheme", IDS_SETTINGS_RESET_TO_DEFAULT_THEME}, +@@ -412,7 +412,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht + {"classicTheme", IDS_SETTINGS_CLASSIC_THEME}, + {"useClassicTheme", IDS_SETTINGS_USE_CLASSIC_THEME}, #endif -#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_LACROS) {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS}, #endif #if BUILDFLAG(IS_MAC) -@@ -454,7 +454,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -440,7 +440,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/ungoogled-chromium/files/patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc new file mode 100644 index 000000000000..fcfa72dc5fe6 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc @@ -0,0 +1,11 @@ +--- chrome/browser/ui/webui/signin/profile_picker_handler.cc.orig 2024-08-26 14:40:28 UTC ++++ chrome/browser/ui/webui/signin/profile_picker_handler.cc +@@ -203,7 +203,7 @@ base::Value::Dict CreateProfileEntry(const ProfileAttr + + if (AccountInfo::IsManaged(entry->GetHostedDomain())) { + profile_entry.Set("avatarBadge", "cr:domain"); +-#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 (base::FeatureList::IsEnabled( + supervised_user::kShowKiteForSupervisedUsers) && + entry->IsSupervised()) { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_visited__url__ranking_visited__url__ranking__service__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_visited__url__ranking_visited__url__ranking__service__factory.cc index cc8b6965b72b..824e9e5d7978 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_visited__url__ranking_visited__url__ranking__service__factory.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_visited__url__ranking_visited__url__ranking__service__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/visited_url_ranking/visited_url_ranking_service_factory.cc.orig 2024-07-31 14:19:23 UTC +--- chrome/browser/visited_url_ranking/visited_url_ranking_service_factory.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/visited_url_ranking/visited_url_ranking_service_factory.cc -@@ -39,7 +39,7 @@ +@@ -41,7 +41,7 @@ #include "components/visited_url_ranking/public/visited_url_ranking_service.h" #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ #include "chrome/browser/visited_url_ranking/desktop_tab_model_url_visit_data_fetcher.h" #elif BUILDFLAG(IS_ANDROID) #include "chrome/browser/visited_url_ranking/android_tab_model_url_visit_data_fetcher.h" -@@ -99,7 +99,7 @@ VisitedURLRankingServiceFactory::BuildServiceInstanceF +@@ -114,7 +114,7 @@ VisitedURLRankingServiceFactory::BuildServiceInstanceF std::map<Fetcher, std::unique_ptr<URLVisitDataFetcher>> data_fetchers; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_commands_launch__web__app__command.cc b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_commands_launch__web__app__command.cc new file mode 100644 index 000000000000..d6e822590429 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_commands_launch__web__app__command.cc @@ -0,0 +1,11 @@ +--- chrome/browser/web_applications/commands/launch_web_app_command.cc.orig 2024-08-26 14:40:28 UTC ++++ chrome/browser/web_applications/commands/launch_web_app_command.cc +@@ -98,7 +98,7 @@ void LaunchWebAppCommand::StartWithLock(std::unique_pt + // OsIntegrationTestOverride can use the xdg install command to detect + // install. + SynchronizeOsOptions options; +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + options.add_shortcut_to_desktop = true; + #endif + lock_->os_integration_manager().Synchronize( diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_commands_set__user__display__mode__command.cc b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_commands_set__user__display__mode__command.cc new file mode 100644 index 000000000000..c0e1556a7613 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_commands_set__user__display__mode__command.cc @@ -0,0 +1,11 @@ +--- chrome/browser/web_applications/commands/set_user_display_mode_command.cc.orig 2024-08-26 14:40:28 UTC ++++ chrome/browser/web_applications/commands/set_user_display_mode_command.cc +@@ -57,7 +57,7 @@ void SetUserDisplayModeCommand::StartWithLock( + // OsIntegrationTestOverride can use the xdg install command to detect + // install. + SynchronizeOsOptions options; +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + options.add_shortcut_to_desktop = true; + #endif + app_lock_->os_integration_manager().Synchronize( diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_os__integration__manager.cc b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_os__integration__manager.cc index f9ef4880653a..f81ce61c591d 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_os__integration__manager.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_os__integration__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/os_integration/os_integration_manager.cc.orig 2024-07-31 14:19:23 UTC +--- chrome/browser/web_applications/os_integration/os_integration_manager.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/web_applications/os_integration/os_integration_manager.cc -@@ -651,7 +651,7 @@ std::unique_ptr<ShortcutInfo> OsIntegrationManager::Bu +@@ -649,7 +649,7 @@ std::unique_ptr<ShortcutInfo> OsIntegrationManager::Bu } } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_shortcut__sub__manager.cc b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_shortcut__sub__manager.cc index 14cf85d6046a..eb5286c386ce 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_shortcut__sub__manager.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_shortcut__sub__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/os_integration/shortcut_sub_manager.cc.orig 2024-07-31 14:19:23 UTC +--- chrome/browser/web_applications/os_integration/shortcut_sub_manager.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/web_applications/os_integration/shortcut_sub_manager.cc -@@ -186,7 +186,7 @@ void ShortcutSubManager::Execute( +@@ -191,7 +191,7 @@ void ShortcutSubManager::Execute( return; } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc index ce99102b8a26..ae72a3b88848 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc @@ -1,4 +1,4 @@ ---- chrome/browser/web_applications/test/os_integration_test_override_impl.cc.orig 2024-05-23 20:04:36 UTC +--- chrome/browser/web_applications/test/os_integration_test_override_impl.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/web_applications/test/os_integration_test_override_impl.cc @@ -46,7 +46,7 @@ #include "third_party/skia/include/core/SkBitmap.h" @@ -27,7 +27,7 @@ base::FilePath desktop_shortcut_path = GetShortcutPath(profile, desktop(), app_id, app_name); LOG(INFO) << desktop_shortcut_path; -@@ -306,7 +306,7 @@ bool OsIntegrationTestOverrideImpl::DeleteApplicationM +@@ -314,7 +314,7 @@ bool OsIntegrationTestOverrideImpl::DeleteApplicationM } #endif // BUILDFLAG(IS_WIN) @@ -36,7 +36,7 @@ bool OsIntegrationTestOverrideImpl::DeleteDesktopDirOnLinux() { if (desktop_.IsValid()) { return desktop_.Delete(); -@@ -320,7 +320,7 @@ bool OsIntegrationTestOverrideImpl::IsRunOnOsLoginEnab +@@ -328,7 +328,7 @@ bool OsIntegrationTestOverrideImpl::IsRunOnOsLoginEnab Profile* profile, const webapps::AppId& app_id, const std::string& app_name) { @@ -45,7 +45,7 @@ std::string shortcut_filename = "chrome-" + app_id + "-" + profile->GetBaseName().value() + ".desktop"; return base::PathExists(startup().Append(shortcut_filename)); -@@ -376,7 +376,7 @@ bool OsIntegrationTestOverrideImpl::IsFileExtensionHan +@@ -384,7 +384,7 @@ bool OsIntegrationTestOverrideImpl::IsFileExtensionHan is_file_handled = shell_integration::CanApplicationHandleURL(app_path, test_file_url); base::DeleteFile(test_file_path); @@ -54,7 +54,7 @@ base::FilePath user_applications_dir = applications(); bool database_update_called = false; for (const LinuxFileRegistration& command : linux_file_registration_) { -@@ -419,7 +419,7 @@ OsIntegrationTestOverrideImpl::GetShortcutIconTopLeftC +@@ -427,7 +427,7 @@ OsIntegrationTestOverrideImpl::GetShortcutIconTopLeftC return std::nullopt; } return GetIconTopLeftColorFromShortcutFile(shortcut_path); @@ -63,7 +63,7 @@ WebAppProvider* provider = WebAppProvider::GetForLocalAppsUnchecked(profile); if (!provider) { return std::nullopt; -@@ -469,7 +469,7 @@ base::FilePath OsIntegrationTestOverrideImpl::GetShort +@@ -477,7 +477,7 @@ base::FilePath OsIntegrationTestOverrideImpl::GetShort app_installed_profiles.end()) { return shortcut_path; } @@ -72,7 +72,7 @@ std::string shortcut_filename = "chrome-" + app_id + "-" + profile->GetBaseName().value() + ".desktop"; base::FilePath shortcut_path = shortcut_dir.Append(shortcut_filename); -@@ -495,7 +495,7 @@ bool OsIntegrationTestOverrideImpl::IsShortcutCreated( +@@ -502,7 +502,7 @@ bool OsIntegrationTestOverrideImpl::IsShortcutCreated( base::FilePath app_shortcut_path = GetShortcutPath(profile, chrome_apps_folder(), app_id, app_name); return base::PathExists(app_shortcut_path); @@ -81,7 +81,7 @@ base::FilePath desktop_shortcut_path = GetShortcutPath(profile, desktop(), app_id, app_name); return base::PathExists(desktop_shortcut_path); -@@ -683,7 +683,7 @@ void OsIntegrationTestOverrideImpl::EnableOrDisablePat +@@ -690,7 +690,7 @@ void OsIntegrationTestOverrideImpl::EnableOrDisablePat } #endif // BUILDFLAG(IS_MAC) @@ -90,7 +90,7 @@ base::FilePath OsIntegrationTestOverrideImpl::desktop() { return desktop_.GetPath(); } -@@ -734,7 +734,7 @@ OsIntegrationTestOverrideImpl::OsIntegrationTestOverri +@@ -741,7 +741,7 @@ OsIntegrationTestOverrideImpl::OsIntegrationTestOverri success = chrome_apps_folder_.CreateUniqueTempDirUnderPath( outer_temp_dir_.GetPath()); CHECK(success); @@ -99,7 +99,7 @@ success = desktop_.CreateUniqueTempDirUnderPath(outer_temp_dir_.GetPath()); CHECK(success); success = startup_.CreateUniqueTempDirUnderPath(outer_temp_dir_.GetPath()); -@@ -747,7 +747,7 @@ OsIntegrationTestOverrideImpl::OsIntegrationTestOverri +@@ -754,7 +754,7 @@ OsIntegrationTestOverrideImpl::OsIntegrationTestOverri CHECK(success); #endif @@ -108,10 +108,10 @@ auto callback = base::BindRepeating([](base::FilePath filename_in, std::string xdg_command, std::string file_contents) { -@@ -819,7 +819,7 @@ OsIntegrationTestOverrideImpl::~OsIntegrationTestOverr +@@ -826,7 +826,7 @@ OsIntegrationTestOverrideImpl::~OsIntegrationTestOverr EXPECT_TRUE(!startup_.IsValid() || startup_.Delete()); #elif BUILDFLAG(IS_MAC) - EXPECT_TRUE(!chrome_apps_folder_.IsValid() || chrome_apps_folder_.Delete()); + EXPECT_TRUE(!chrome_apps_folder_.IsValid() || DeleteChromeAppsDir()); -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) EXPECT_TRUE(!desktop_.IsValid() || desktop_.Delete()); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc b/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc index 78ef983220c5..434dd6b3d2ba 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc +++ b/www/ungoogled-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-07-31 14:19:23 UTC +--- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/webauthn/chrome_authenticator_request_delegate.cc -@@ -972,7 +972,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureDisc +@@ -1095,7 +1095,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureDisc g_observer->ConfiguringCable(request_type); } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_enclave__manager.cc b/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_enclave__manager.cc index 26f8b22298eb..b5cae7db8625 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_enclave__manager.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_enclave__manager.cc @@ -1,20 +1,20 @@ ---- chrome/browser/webauthn/enclave_manager.cc.orig 2024-07-31 14:19:23 UTC +--- chrome/browser/webauthn/enclave_manager.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/browser/webauthn/enclave_manager.cc -@@ -646,7 +646,7 @@ base::flat_set<std::string> GetGaiaIDs( - } +@@ -686,7 +686,7 @@ base::flat_set<std::string> GetGaiaIDs( std::string UserVerifyingLabelToString(crypto::UserVerifyingKeyLabel label) { --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS_ASH) ++ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) return label; #else return std::string("placeholder"); -@@ -655,7 +655,7 @@ std::string UserVerifyingLabelToString(crypto::UserVer - +@@ -696,7 +696,7 @@ std::string UserVerifyingLabelToString(crypto::UserVer std::optional<crypto::UserVerifyingKeyLabel> UserVerifyingKeyLabelFromString( std::string saved_label) { --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS_ASH) ++ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) return saved_label; #else return std::nullopt; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_gpm__user__verification__policy.cc b/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_gpm__user__verification__policy.cc new file mode 100644 index 000000000000..e9bdfa67c5b4 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_gpm__user__verification__policy.cc @@ -0,0 +1,11 @@ +--- chrome/browser/webauthn/gpm_user_verification_policy.cc.orig 2024-08-26 14:40:28 UTC ++++ chrome/browser/webauthn/gpm_user_verification_policy.cc +@@ -17,7 +17,7 @@ bool GpmWillDoUserVerification(device::UserVerificatio + return platform_has_biometrics; + #elif BUILDFLAG(IS_MAC) + return platform_has_biometrics; +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return false; + #else + // This default is for unit tests. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_unexportable__key__utils.cc b/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_unexportable__key__utils.cc new file mode 100644 index 000000000000..57770e80faed --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_unexportable__key__utils.cc @@ -0,0 +1,11 @@ +--- chrome/browser/webauthn/unexportable_key_utils.cc.orig 2024-08-26 14:40:28 UTC ++++ chrome/browser/webauthn/unexportable_key_utils.cc +@@ -33,7 +33,7 @@ GetWebAuthnUnexportableKeyProvider() { + // If there is a scoped UnexportableKeyProvider configured, we always use + // that so that tests can still override the key provider. + const bool use_software_provider = +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + !crypto::internal::HasScopedUnexportableKeyProvider(); + #else + false; diff --git a/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.cc b/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.cc index da9d8b791380..add44da14ccf 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.cc +++ b/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.cc @@ -1,6 +1,6 @@ ---- chrome/common/chrome_features.cc.orig 2024-07-31 14:19:23 UTC +--- chrome/common/chrome_features.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/common/chrome_features.cc -@@ -81,7 +81,7 @@ BASE_FEATURE(kUseAdHocSigningForWebAppShims, +@@ -75,7 +75,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, -@@ -99,7 +99,7 @@ BASE_FEATURE(kAutofillPasswordSurvey, +@@ -93,7 +93,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. -@@ -277,7 +277,7 @@ BASE_FEATURE(kDesktopPWAsElidedExtensionsMenu, +@@ -260,7 +260,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 -@@ -319,7 +319,7 @@ BASE_FEATURE(kDesktopPWAsTabStripSettings, +@@ -309,7 +309,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. -@@ -876,7 +876,7 @@ BASE_FEATURE(kKAnonymityServiceStorage, +@@ -897,7 +897,7 @@ BASE_FEATURE(kKAnonymityServiceStorage, "KAnonymityServiceStorage", base::FEATURE_ENABLED_BY_DEFAULT); @@ -45,7 +45,7 @@ BASE_FEATURE(kLinuxLowMemoryMonitor, "LinuxLowMemoryMonitor", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -889,7 +889,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit +@@ -910,7 +910,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit &kLinuxLowMemoryMonitor, "critical_level", 255}; #endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) diff --git a/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.h b/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.h index c0b0dc9718cc..a3ae83a15cb3 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.h +++ b/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.h @@ -1,6 +1,6 @@ ---- chrome/common/chrome_features.h.orig 2024-07-31 14:19:23 UTC +--- chrome/common/chrome_features.h.orig 2024-08-26 14:40:28 UTC +++ chrome/common/chrome_features.h -@@ -60,13 +60,13 @@ BASE_DECLARE_FEATURE(kUseAdHocSigningForWebAppShims); +@@ -55,13 +55,13 @@ BASE_DECLARE_FEATURE(kUseAdHocSigningForWebAppShims); #endif // BUILDFLAG(IS_MAC) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -16,7 +16,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kBackgroundModeAllowRestart); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -193,7 +193,7 @@ BASE_DECLARE_FEATURE(kDesktopPWAsPreventClose); +@@ -192,7 +192,7 @@ BASE_DECLARE_FEATURE(kDesktopPWAsPreventClose); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kDesktopPWAsTabStripSettings); @@ -25,7 +25,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kChromeAppsDeprecation); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kShortcutsNotApps); -@@ -529,7 +529,7 @@ BASE_DECLARE_FEATURE(kKAnonymityServiceOHTTPRequests); +@@ -545,7 +545,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; -@@ -537,7 +537,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) +@@ -553,7 +553,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::FeatureParam<int> kLinuxLowMemoryMonitorCriticalLevel; #endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) diff --git a/www/ungoogled-chromium/files/patch-chrome_common_chrome__switches.cc b/www/ungoogled-chromium/files/patch-chrome_common_chrome__switches.cc index fdef86a29e62..67c53bcfd2c9 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_chrome__switches.cc +++ b/www/ungoogled-chromium/files/patch-chrome_common_chrome__switches.cc @@ -1,6 +1,6 @@ ---- chrome/common/chrome_switches.cc.orig 2024-07-31 14:19:23 UTC +--- chrome/common/chrome_switches.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/common/chrome_switches.cc -@@ -867,14 +867,14 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket- +@@ -898,14 +898,14 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket- #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_common_chrome__switches.h b/www/ungoogled-chromium/files/patch-chrome_common_chrome__switches.h index ee659d70b720..f8946bdab0f1 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_chrome__switches.h +++ b/www/ungoogled-chromium/files/patch-chrome_common_chrome__switches.h @@ -1,6 +1,6 @@ ---- chrome/common/chrome_switches.h.orig 2024-07-31 14:19:23 UTC +--- chrome/common/chrome_switches.h.orig 2024-08-26 14:40:28 UTC +++ chrome/common/chrome_switches.h -@@ -274,12 +274,12 @@ extern const char kAllowNaClSocketAPI[]; +@@ -279,12 +279,12 @@ extern const char kAllowNaClSocketAPI[]; #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_common_pref__names.h b/www/ungoogled-chromium/files/patch-chrome_common_pref__names.h index cb62f1a73319..35792be44e23 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_pref__names.h +++ b/www/ungoogled-chromium/files/patch-chrome_common_pref__names.h @@ -1,6 +1,6 @@ ---- chrome/common/pref_names.h.orig 2024-07-31 14:19:23 UTC +--- chrome/common/pref_names.h.orig 2024-08-26 14:40:28 UTC +++ chrome/common/pref_names.h -@@ -1340,7 +1340,7 @@ inline constexpr char kUseAshProxy[] = "lacros.proxy.u +@@ -1364,7 +1364,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 -@@ -1483,7 +1483,7 @@ inline constexpr char kShowUpdatePromotionInfoBar[] = +@@ -1507,7 +1507,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"; -@@ -2088,7 +2088,7 @@ inline constexpr char kDownloadDefaultDirectory[] = +@@ -2112,7 +2112,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 -@@ -2528,14 +2528,14 @@ inline constexpr char kMediaStorageIdSalt[] = "media.s +@@ -2549,14 +2549,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"; -@@ -2613,7 +2613,7 @@ inline constexpr char kAmbientAuthenticationInPrivateM +@@ -2634,7 +2634,7 @@ inline constexpr char kAmbientAuthenticationInPrivateM inline constexpr char kBasicAuthOverHttpEnabled[] = "auth.basic_over_http_enabled"; @@ -53,16 +53,16 @@ // Boolean that specifies whether OK-AS-DELEGATE flag from KDC is respected // along with kAuthNegotiateDelegateAllowlist. inline constexpr char kAuthNegotiateDelegateByKdcPolicy[] = -@@ -3133,7 +3133,7 @@ inline constexpr char kDeviceWeeklyScheduledSuspend[] - +@@ -3164,7 +3164,7 @@ inline constexpr char kDeviceWeeklyScheduledSuspend[] #endif // BUILDFLAG(IS_CHROMEOS) --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ +- BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) // Defines administrator-set availability of Chrome for Testing. inline constexpr char kChromeForTestingAllowed[] = "chrome_for_testing.allowed"; #endif -@@ -3706,7 +3706,7 @@ inline constexpr char kFileOrDirectoryPickerWithoutGes +@@ -3760,7 +3760,7 @@ inline constexpr char kFileOrDirectoryPickerWithoutGes inline constexpr char kSandboxExternalProtocolBlocked[] = "profile.sandbox_external_protocol_blocked"; @@ -71,16 +71,16 @@ // Boolean that indicates if system notifications are allowed to be used in // place of Chrome notifications. inline constexpr char kAllowSystemNotifications[] = -@@ -3755,7 +3755,7 @@ inline constexpr char kCACertificateManagementAllowed[ +@@ -4034,7 +4034,7 @@ inline constexpr char kLensDesktopNTPSearchEnabled[] = + "policy.lens_desktop_ntp_search_enabled"; #endif - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - inline constexpr char kEnforceLocalAnchorConstraintsEnabled[] = - "enforce_local_anchor_constraints_enabled"; - #endif -@@ -4063,7 +4063,7 @@ inline constexpr char kPrintingOAuth2AuthorizationServ +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + // 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 +@@ -4128,7 +4128,7 @@ inline constexpr char kPrintingOAuth2AuthorizationServ "printing.oauth2_authorization_servers"; #endif diff --git a/www/ungoogled-chromium/files/patch-chrome_common_url__constants.h b/www/ungoogled-chromium/files/patch-chrome_common_url__constants.h index 40e5052a2a23..6276ca17c061 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_url__constants.h +++ b/www/ungoogled-chromium/files/patch-chrome_common_url__constants.h @@ -1,6 +1,6 @@ ---- chrome/common/url_constants.h.orig 2024-07-31 14:19:23 UTC +--- chrome/common/url_constants.h.orig 2024-08-26 14:40:28 UTC +++ chrome/common/url_constants.h -@@ -907,7 +907,7 @@ inline constexpr char kOutdatedPluginLearnMoreURL[] = +@@ -927,7 +927,7 @@ inline constexpr char kOutdatedPluginLearnMoreURL[] = inline constexpr char kPhoneHubPermissionLearnMoreURL[] = "https://support.9oo91e.qjz9zk/chromebook?p=multidevice"; diff --git a/www/ungoogled-chromium/files/patch-chrome_common_webui__url__constants.cc b/www/ungoogled-chromium/files/patch-chrome_common_webui__url__constants.cc index dc1a96878e92..8019f8ea5d4a 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_webui__url__constants.cc +++ b/www/ungoogled-chromium/files/patch-chrome_common_webui__url__constants.cc @@ -1,103 +1,37 @@ ---- chrome/common/webui_url_constants.cc.orig 2024-07-31 14:19:23 UTC +--- chrome/common/webui_url_constants.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/common/webui_url_constants.cc -@@ -259,7 +259,7 @@ const char kChromeUIVersionURL[] = "chrome://version/" - const char kChromeUIWelcomeHost[] = "welcome"; - const char kChromeUIWelcomeURL[] = "chrome://welcome/"; - --#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 kChromeUIWhatsNewHost[] = "whats-new"; - const char kChromeUIWhatsNewURL[] = "chrome://whats-new/"; - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -523,18 +523,18 @@ const char kOsUISystemURL[] = "os://system"; - const char kOsUIVersionURL[] = "os://version"; - #endif - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - const char kChromeUIWebUIJsErrorHost[] = "webuijserror"; - const char kChromeUIWebUIJsErrorURL[] = "chrome://webuijserror/"; - #endif - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS_ASH) -+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) - const char kChromeUIConnectorsInternalsHost[] = "connectors-internals"; - #endif - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - const char kChromeUIDiscardsHost[] = "discards"; - const char kChromeUIDiscardsURL[] = "chrome://discards/"; - #endif -@@ -549,14 +549,14 @@ const char kChromeUILinuxProxyConfigHost[] = "linux-pr - #endif - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ -- BUILDFLAG(IS_ANDROID) -+ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - const char kChromeUISandboxHost[] = "sandbox"; - #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) || \ -- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) - const char kChromeUIBrowserSwitchHost[] = "browser-switch"; - const char kChromeUIBrowserSwitchURL[] = "chrome://browser-switch/"; - const char kChromeUIIntroHost[] = "intro"; -@@ -575,7 +575,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro - const char kChromeUIProfilePickerStartupQuery[] = "startup"; - #endif - --#if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \ -+#if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && \ - defined(TOOLKIT_VIEWS)) || \ - defined(USE_AURA) - const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog"; -@@ -654,7 +654,7 @@ const char kTrackingProtectionSubPagePath[] = "/tracki - const char kCookiesSubPagePath[] = "/cookies"; - #endif - --#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 kChromeUIWebAppSettingsURL[] = "chrome://app-settings/"; - const char kChromeUIWebAppSettingsHost[] = "app-settings"; - #endif -@@ -802,21 +802,21 @@ const char* const kChromeHostURLs[] = { - kChromeUIAssistantOptInHost, +@@ -197,21 +197,21 @@ base::span<const base::cstring_view> ChromeURLHosts() + kChromeUIAssistantOptInHost, #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS_ASH) + BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) - kChromeUIConnectorsInternalsHost, + kChromeUIConnectorsInternalsHost, #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - kChromeUIDiscardsHost, + kChromeUIDiscardsHost, #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - kChromeUIWebAppSettingsHost, + kChromeUIWebAppSettingsHost, #endif #if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_ANDROID) - kChromeUILinuxProxyConfigHost, + kChromeUILinuxProxyConfigHost, #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_ANDROID) + BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - kChromeUISandboxHost, + kChromeUISandboxHost, #endif #if BUILDFLAG(IS_WIN) -@@ -883,7 +883,7 @@ const char* const kChromeDebugURLs[] = { - blink::kChromeUIGpuJavaCrashURL, - kChromeUIJavaCrashURL, +@@ -284,7 +284,7 @@ base::span<const base::cstring_view> ChromeDebugURLs() + blink::kChromeUIGpuJavaCrashURL, + kChromeUIJavaCrashURL, #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - kChromeUIWebUIJsErrorURL, + kChromeUIWebUIJsErrorURL, #endif - kChromeUIQuitURL, + kChromeUIQuitURL, diff --git a/www/ungoogled-chromium/files/patch-chrome_common_webui__url__constants.h b/www/ungoogled-chromium/files/patch-chrome_common_webui__url__constants.h index a9e138aa092a..b4e3162da497 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_webui__url__constants.h +++ b/www/ungoogled-chromium/files/patch-chrome_common_webui__url__constants.h @@ -1,56 +1,56 @@ ---- chrome/common/webui_url_constants.h.orig 2024-07-31 14:19:23 UTC +--- chrome/common/webui_url_constants.h.orig 2024-08-26 14:40:28 UTC +++ chrome/common/webui_url_constants.h -@@ -438,23 +438,23 @@ extern const char kOsUISystemURL[]; - extern const char kOsUIVersionURL[]; +@@ -564,24 +564,24 @@ inline constexpr char16_t kOsUISystemURL[] = u"os://sy + inline constexpr char kOsUIVersionURL[] = "os://version"; #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - extern const char kChromeUIWebUIJsErrorHost[]; - extern const char kChromeUIWebUIJsErrorURL[]; + inline constexpr char kChromeUIWebUIJsErrorHost[] = "webuijserror"; + inline constexpr char kChromeUIWebUIJsErrorURL[] = "chrome://webuijserror/"; #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS_ASH) + BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) - extern const char kChromeUIConnectorsInternalsHost[]; + inline constexpr char kChromeUIConnectorsInternalsHost[] = + "connectors-internals"; #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - extern const char kChromeUIDiscardsHost[]; - extern const char kChromeUIDiscardsURL[]; + inline constexpr char kChromeUIDiscardsHost[] = "discards"; + inline constexpr char kChromeUIDiscardsURL[] = "chrome://discards/"; #endif -#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 kChromeUIWebAppSettingsURL[]; - extern const char kChromeUIWebAppSettingsHost[]; - extern const char kChromeUIWhatsNewHost[]; -@@ -471,14 +471,14 @@ extern const char kChromeUILinuxProxyConfigHost[]; + inline constexpr char kChromeUIWebAppSettingsHost[] = "app-settings"; + inline constexpr char kChromeUIWebAppSettingsURL[] = "chrome://app-settings/"; + inline constexpr char kChromeUIWhatsNewHost[] = "whats-new"; +@@ -593,13 +593,13 @@ inline constexpr char kChromeUILinuxProxyConfigHost[] #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_ANDROID) + BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - extern const char kChromeUISandboxHost[]; + inline constexpr char kChromeUISandboxHost[] = "sandbox"; #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) || \ -- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) - extern const char kChromeUIBrowserSwitchHost[]; - extern const char kChromeUIBrowserSwitchURL[]; - extern const char kChromeUIIntroHost[]; -@@ -494,7 +494,7 @@ extern const char kChromeUIProfilePickerUrl[]; - extern const char kChromeUIProfilePickerStartupQuery[]; +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ + (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) + inline constexpr char kChromeUIBrowserSwitchHost[] = "browser-switch"; + inline constexpr char kChromeUIBrowserSwitchURL[] = "chrome://browser-switch/"; +@@ -621,7 +621,7 @@ inline constexpr char kChromeUIProfilePickerStartupQue + inline constexpr char kChromeUIProfilePickerUrl[] = "chrome://profile-picker/"; #endif -#if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \ +#if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && \ defined(TOOLKIT_VIEWS)) || \ defined(USE_AURA) - extern const char kChromeUITabModalConfirmDialogHost[]; + inline constexpr char kChromeUITabModalConfirmDialogHost[] = diff --git a/www/ungoogled-chromium/files/patch-chrome_enterprise__companion_enterprise__companion__client.cc b/www/ungoogled-chromium/files/patch-chrome_enterprise__companion_enterprise__companion__client.cc index 6aae9bf88895..51a1743a5015 100644 --- a/www/ungoogled-chromium/files/patch-chrome_enterprise__companion_enterprise__companion__client.cc +++ b/www/ungoogled-chromium/files/patch-chrome_enterprise__companion_enterprise__companion__client.cc @@ -1,11 +1,11 @@ ---- chrome/enterprise_companion/enterprise_companion_client.cc.orig 2024-07-31 14:19:23 UTC +--- chrome/enterprise_companion/enterprise_companion_client.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/enterprise_companion/enterprise_companion_client.cc -@@ -9,7 +9,7 @@ namespace enterprise_companion { - mojo::NamedPlatformChannel::ServerName GetServerName() { +@@ -33,7 +33,7 @@ namespace { + #if BUILDFLAG(IS_MAC) - return "org.chromium.ChromeEnterpriseCompanion.service"; + constexpr char kServerName[] = MAC_BUNDLE_IDENTIFIER_STRING ".service"; -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - return "/run/Chromium/ChromeEnterpriseCompanion/service.sk"; + constexpr char kServerName[] = + "/run/" COMPANY_SHORTNAME_STRING "/" PRODUCT_FULLNAME_STRING "/service.sk"; #elif BUILDFLAG(IS_WIN) - return L"ChromeEnterpriseCompanionService"; diff --git a/www/ungoogled-chromium/files/patch-chrome_enterprise__companion_lock.cc b/www/ungoogled-chromium/files/patch-chrome_enterprise__companion_lock.cc index dc2557e5bb15..96e64d96b2e9 100644 --- a/www/ungoogled-chromium/files/patch-chrome_enterprise__companion_lock.cc +++ b/www/ungoogled-chromium/files/patch-chrome_enterprise__companion_lock.cc @@ -1,20 +1,20 @@ ---- chrome/enterprise_companion/lock.cc.orig 2024-07-31 14:19:23 UTC +--- chrome/enterprise_companion/lock.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/enterprise_companion/lock.cc -@@ -16,7 +16,7 @@ +@@ -17,7 +17,7 @@ namespace { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - constexpr char kLockName[] = "/ChromeEnterpriseCompanion.lock"; + constexpr char kLockName[] = "/" PRODUCT_FULLNAME_STRING ".lock"; #elif BUILDFLAG(IS_MAC) - constexpr char kLockName[] = "org.chromium.ChromeEnterpriseCompanion.lock"; -@@ -41,7 +41,7 @@ CSecurityDesc GetAdminDaclSecurityDescriptor() { + constexpr char kLockName[] = MAC_BUNDLE_IDENTIFIER_STRING ".lock"; +@@ -42,7 +42,7 @@ CSecurityDesc GetAdminDaclSecurityDescriptor() { namespace enterprise_companion { - std::unique_ptr<ScopedLock> CreateScopedLock() { + std::unique_ptr<ScopedLock> CreateScopedLock(base::TimeDelta timeout) { -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - return named_system_lock::ScopedLock::Create(kLockName, base::Seconds(0)); + return named_system_lock::ScopedLock::Create(kLockName, timeout); #elif BUILDFLAG(IS_WIN) CSecurityAttributes sa = diff --git a/www/ungoogled-chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc b/www/ungoogled-chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc index ca9a4c8493f2..b1daae653103 100644 --- a/www/ungoogled-chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc +++ b/www/ungoogled-chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc @@ -1,6 +1,6 @@ ---- chrome/services/printing/print_backend_service_impl.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/services/printing/print_backend_service_impl.cc.orig 2024-08-26 14:40:28 UTC +++ chrome/services/printing/print_backend_service_impl.cc -@@ -49,7 +49,7 @@ +@@ -50,7 +50,7 @@ #include "printing/backend/cups_connection_pool.h" #endif @@ -9,7 +9,7 @@ #include "base/no_destructor.h" #include "ui/linux/linux_ui.h" #include "ui/linux/linux_ui_delegate_stub.h" -@@ -76,7 +76,7 @@ namespace printing { +@@ -77,7 +77,7 @@ namespace printing { namespace { @@ -18,7 +18,7 @@ void InstantiateLinuxUiDelegate() { // TODO(crbug.com/40561724) Until a real UI can be used in a utility process, // need to use the stub version. -@@ -85,7 +85,7 @@ void InstantiateLinuxUiDelegate() { +@@ -86,7 +86,7 @@ void InstantiateLinuxUiDelegate() { #endif scoped_refptr<base::SequencedTaskRunner> GetPrintingTaskRunner() { @@ -27,7 +27,7 @@ // Use task runner associated with equivalent of UI thread. Needed for calls // made through `PrintDialogLinuxInterface` to properly execute. CHECK(base::SequencedTaskRunner::HasCurrentDefault()); -@@ -469,7 +469,7 @@ void PrintBackendServiceImpl::Init( +@@ -470,7 +470,7 @@ void PrintBackendServiceImpl::Init( // `InitCommon()`. InitializeProcessForPrinting(); print_backend_ = PrintBackend::CreateInstance(locale); @@ -36,7 +36,7 @@ // Test framework already initializes the UI, so this should not go in // `InitCommon()`. Additionally, low-level Linux UI is not needed when tests // are using `TestPrintingContext`. -@@ -690,7 +690,7 @@ void PrintBackendServiceImpl::UpdatePrintSettings( +@@ -691,7 +691,7 @@ void PrintBackendServiceImpl::UpdatePrintSettings( crash_keys_ = std::make_unique<crash_keys::ScopedPrinterInfo>( *printer_name, print_backend_->GetPrinterDriverInfo(*printer_name)); diff --git a/www/ungoogled-chromium/files/patch-components_autofill_core_browser_payments__data__manager.cc b/www/ungoogled-chromium/files/patch-components_autofill_core_browser_payments__data__manager.cc index e5eb08a9cb0d..461f84c7444b 100644 --- a/www/ungoogled-chromium/files/patch-components_autofill_core_browser_payments__data__manager.cc +++ b/www/ungoogled-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-07-31 14:19:23 UTC +--- components/autofill/core/browser/payments_data_manager.cc.orig 2024-08-26 14:40:28 UTC +++ components/autofill/core/browser/payments_data_manager.cc -@@ -1065,7 +1065,7 @@ bool PaymentsDataManager::ShouldShowCardsFromAccountOp +@@ -1055,7 +1055,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/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__features.cc b/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__features.cc index 66546f97c7cd..9ee4126177b2 100644 --- a/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__features.cc +++ b/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__features.cc @@ -1,6 +1,6 @@ ---- components/autofill/core/common/autofill_features.cc.orig 2024-07-31 14:19:23 UTC +--- components/autofill/core/common/autofill_features.cc.orig 2024-08-26 14:40:28 UTC +++ components/autofill/core/common/autofill_features.cc -@@ -661,7 +661,7 @@ BASE_FEATURE(kAutofillTextAreaChangeEvents, +@@ -673,7 +673,7 @@ BASE_FEATURE(kAutofillSilentProfileUpdateForInsufficie // Enabled by default for Mac and Windows platforms. BASE_FEATURE(kAutofillContentEditableChangeEvents, "AutofillContentEditableChangeEvents", diff --git a/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc b/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc index 2ffc7e6c05f4..629258c79f09 100644 --- a/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc +++ b/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc @@ -1,6 +1,15 @@ ---- components/autofill/core/common/autofill_payments_features.cc.orig 2024-07-31 14:19:23 UTC +--- components/autofill/core/common/autofill_payments_features.cc.orig 2024-08-26 14:40:28 UTC +++ components/autofill/core/common/autofill_payments_features.cc -@@ -248,7 +248,7 @@ BASE_FEATURE(kAutofillSyncEwalletAccounts, +@@ -8,7 +8,7 @@ + + namespace autofill::features { + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ + (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) + // When enabled, Chrome will extract the checkout amount from the checkout page + // of the allowlisted merchant websites. +@@ -272,7 +272,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/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__payments__features.h b/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__payments__features.h new file mode 100644 index 000000000000..e169f55fde74 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__payments__features.h @@ -0,0 +1,11 @@ +--- components/autofill/core/common/autofill_payments_features.h.orig 2024-08-26 14:40:28 UTC ++++ components/autofill/core/common/autofill_payments_features.h +@@ -14,7 +14,7 @@ namespace autofill::features { + + // All features in alphabetical order. + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + COMPONENT_EXPORT(AUTOFILL) + BASE_DECLARE_FEATURE(kAutofillEnableAmountExtractionDesktop); + #endif diff --git a/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__util.cc b/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__util.cc deleted file mode 100644 index 61755c1f0b84..000000000000 --- a/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__util.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- components/autofill/core/common/autofill_util.cc.orig 2024-06-22 08:49:42 UTC -+++ components/autofill/core/common/autofill_util.cc -@@ -132,7 +132,7 @@ bool SanitizedFieldIsEmpty(const std::u16string& value - - bool ShouldAutoselectFirstSuggestionOnArrowDown() { - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - return true; - #else - return false; diff --git a/www/ungoogled-chromium/files/patch-components_commerce_core_commerce__feature__list.cc b/www/ungoogled-chromium/files/patch-components_commerce_core_commerce__feature__list.cc index 424a4841414e..6e8957f87a96 100644 --- a/www/ungoogled-chromium/files/patch-components_commerce_core_commerce__feature__list.cc +++ b/www/ungoogled-chromium/files/patch-components_commerce_core_commerce__feature__list.cc @@ -1,4 +1,4 @@ ---- components/commerce/core/commerce_feature_list.cc.orig 2024-07-31 14:19:23 UTC +--- components/commerce/core/commerce_feature_list.cc.orig 2024-08-26 14:40:28 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); -@@ -244,7 +244,7 @@ const base::FeatureParam<bool> kDeleteAllMerchantsOnCl +@@ -261,7 +261,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/ungoogled-chromium/files/patch-components_constrained__window_constrained__window__views.cc b/www/ungoogled-chromium/files/patch-components_constrained__window_constrained__window__views.cc index 6778e901e513..5870f85efada 100644 --- a/www/ungoogled-chromium/files/patch-components_constrained__window_constrained__window__views.cc +++ b/www/ungoogled-chromium/files/patch-components_constrained__window_constrained__window__views.cc @@ -1,6 +1,6 @@ ---- components/constrained_window/constrained_window_views.cc.orig 2024-07-31 14:19:23 UTC +--- components/constrained_window/constrained_window_views.cc.orig 2024-08-26 14:40:28 UTC +++ components/constrained_window/constrained_window_views.cc -@@ -360,7 +360,7 @@ bool SupportsGlobalScreenCoordinates() { +@@ -369,7 +369,7 @@ bool SupportsGlobalScreenCoordinates() { } bool PlatformClipsChildrenToViewport() { diff --git a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__configurations.cc b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__configurations.cc index 1c2f7211f023..7fdb9c153ccd 100644 --- a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__configurations.cc +++ b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__configurations.cc @@ -1,4 +1,4 @@ ---- components/feature_engagement/public/feature_configurations.cc.orig 2024-07-31 14:19:23 UTC +--- components/feature_engagement/public/feature_configurations.cc.orig 2024-08-26 14:40:28 UTC +++ components/feature_engagement/public/feature_configurations.cc @@ -99,7 +99,7 @@ std::optional<FeatureConfig> CreateNewUserGestureInPro @@ -15,15 +15,16 @@ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - if (kIPHPasswordsAccountStorageFeature.name == feature->name) { + if (kIPHPasswordsManagementBubbleAfterSaveFeature.name == feature->name) { std::optional<FeatureConfig> config = FeatureConfig(); config->valid = true; -@@ -1607,7 +1607,7 @@ std::optional<FeatureConfig> GetClientSideFeatureConfi - +@@ -1599,7 +1599,8 @@ std::optional<FeatureConfig> GetClientSideFeatureConfi #endif // BUILDFLAG(IS_ANDROID) --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ ++ BUILDFLAG(IS_BSD) if (kIPHAutofillCreditCardBenefitFeature.name == feature->name) { + // Credit card benefit IPH is shown: diff --git a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__constants.cc b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__constants.cc index 2680ba45b9d8..2ecec3fcbba7 100644 --- a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__constants.cc +++ b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__constants.cc @@ -1,4 +1,4 @@ ---- components/feature_engagement/public/feature_constants.cc.orig 2024-07-31 14:19:23 UTC +--- components/feature_engagement/public/feature_constants.cc.orig 2024-08-26 14:40:28 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); @@ -6,10 +6,10 @@ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(GOOGLE_CHROME_BRANDING) BASE_FEATURE(kEsbDownloadRowPromoFeature, "EsbDownloadRowPromo", - base::FEATURE_DISABLED_BY_DEFAULT); -@@ -626,7 +626,8 @@ BASE_FEATURE(kDefaultBrowserTriggerCriteriaExperiment, +@@ -637,7 +637,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); -@@ -757,7 +758,7 @@ BASE_FEATURE(kIPHScalableIphGamingFeature, +@@ -771,7 +772,7 @@ BASE_FEATURE(kIPHScalableIphGamingFeature, base::FEATURE_DISABLED_BY_DEFAULT); #endif diff --git a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__constants.h b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__constants.h index 6958de2879ba..6154b1786821 100644 --- a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__constants.h +++ b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__constants.h @@ -1,4 +1,4 @@ ---- components/feature_engagement/public/feature_constants.h.orig 2024-07-31 14:19:23 UTC +--- components/feature_engagement/public/feature_constants.h.orig 2024-08-26 14:40:28 UTC +++ components/feature_engagement/public/feature_constants.h @@ -20,7 +20,7 @@ BASE_DECLARE_FEATURE(kIPHDemoMode); BASE_DECLARE_FEATURE(kIPHDummyFeature); @@ -6,10 +6,10 @@ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(GOOGLE_CHROME_BRANDING) BASE_DECLARE_FEATURE(kEsbDownloadRowPromoFeature); - BASE_DECLARE_FEATURE(kIPHBatterySaverModeFeature); - BASE_DECLARE_FEATURE(kIPHCompanionSidePanelFeature); -@@ -259,7 +259,8 @@ BASE_DECLARE_FEATURE(kDefaultBrowserTriggerCriteriaExp + #endif +@@ -264,7 +264,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(kIPHAutofillExternalAccountProfileSuggestionFeature); BASE_DECLARE_FEATURE(kIPHAutofillManualFallbackFeature); -@@ -308,7 +309,7 @@ BASE_DECLARE_FEATURE(kIPHScalableIphHelpAppBasedTenFea +@@ -314,7 +315,7 @@ BASE_DECLARE_FEATURE(kIPHScalableIphHelpAppBasedTenFea BASE_DECLARE_FEATURE(kIPHScalableIphGamingFeature); #endif diff --git a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__list.cc b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__list.cc index 5c408765025a..dc75d40a2aa6 100644 --- a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__list.cc +++ b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__list.cc @@ -1,15 +1,15 @@ ---- components/feature_engagement/public/feature_list.cc.orig 2024-07-31 14:19:23 UTC +--- components/feature_engagement/public/feature_list.cc.orig 2024-08-26 14:40:28 UTC +++ components/feature_engagement/public/feature_list.cc -@@ -152,7 +152,7 @@ const base::Feature* const kAllFeatures[] = { - &kIPHiOSSavedTabGroupClosed, +@@ -155,7 +155,7 @@ const base::Feature* const kAllFeatures[] = { + &kIPHiOSContextualPanelPriceInsightsFeature, #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(GOOGLE_CHROME_BRANDING) &kEsbDownloadRowPromoFeature, - &kIPHBatterySaverModeFeature, - &kIPHCompanionSidePanelFeature, -@@ -218,7 +218,8 @@ const base::Feature* const kAllFeatures[] = { + #endif +@@ -223,7 +223,8 @@ const base::Feature* const kAllFeatures[] = { // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -19,7 +19,7 @@ &kIPHAutofillCreditCardBenefitFeature, &kIPHAutofillExternalAccountProfileSuggestionFeature, &kIPHAutofillManualFallbackFeature, -@@ -267,7 +268,7 @@ const base::Feature* const kAllFeatures[] = { +@@ -273,7 +274,7 @@ const base::Feature* const kAllFeatures[] = { &kIPHScalableIphGamingFeature, #endif // BUILDFLAG(IS_CHROMEOS_ASH) diff --git a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__list.h b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__list.h index 03fcdd74505e..c5d8031e1005 100644 --- a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__list.h +++ b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__list.h @@ -1,15 +1,15 @@ ---- components/feature_engagement/public/feature_list.h.orig 2024-07-31 14:19:23 UTC +--- components/feature_engagement/public/feature_list.h.orig 2024-08-26 14:40:28 UTC +++ components/feature_engagement/public/feature_list.h -@@ -273,7 +273,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSSavedTabGroupClosed, +@@ -278,7 +278,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSContextualPanelPriceInsi #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(GOOGLE_CHROME_BRANDING) DEFINE_VARIATION_PARAM(kEsbDownloadRowPromoFeature, "EsbDownloadRowPromo"); - DEFINE_VARIATION_PARAM(kIPHBatterySaverModeFeature, "IPH_BatterySaverMode"); - DEFINE_VARIATION_PARAM(kIPHCompanionSidePanelFeature, "IPH_CompanionSidePanel"); -@@ -383,7 +383,8 @@ DEFINE_VARIATION_PARAM(kIPHTabGroupsSaveV2CloseGroupFe + #endif +@@ -385,7 +385,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"); DEFINE_VARIATION_PARAM(kIPHAutofillExternalAccountProfileSuggestionFeature, -@@ -470,7 +471,7 @@ DEFINE_VARIATION_PARAM(kIPHScalableIphHelpAppBasedTenF +@@ -474,7 +475,7 @@ DEFINE_VARIATION_PARAM(kIPHScalableIphHelpAppBasedTenF DEFINE_VARIATION_PARAM(kIPHScalableIphGamingFeature, "IPH_ScalableIphGaming"); #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -28,16 +28,16 @@ DEFINE_VARIATION_PARAM(kIPHDesktopPWAsLinkCapturingLaunch, "IPH_DesktopPWAsLinkCapturingLaunch"); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -626,7 +627,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation - VARIATION_ENTRY(kIPHiOSOverflowMenuCustomizationFeature), - VARIATION_ENTRY(kIPHiOSSavedTabGroupClosed), +@@ -632,7 +633,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation + VARIATION_ENTRY(kIPHiOSContextualPanelSampleModelFeature), + VARIATION_ENTRY(kIPHiOSContextualPanelPriceInsightsFeature), #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) VARIATION_ENTRY(kIPHBatterySaverModeFeature), VARIATION_ENTRY(kIPHCompanionSidePanelFeature), VARIATION_ENTRY(kIPHCompanionSidePanelRegionSearchFeature), -@@ -686,7 +687,8 @@ constexpr flags_ui::FeatureEntry::FeatureVariation +@@ -690,7 +691,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(kIPHAutofillExternalAccountProfileSuggestionFeature), VARIATION_ENTRY(kIPHAutofillManualFallbackFeature), -@@ -735,7 +737,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation +@@ -741,7 +743,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation VARIATION_ENTRY(kIPHScalableIphGamingFeature), #endif // BUILDFLAG(IS_CHROMEOS_ASH) diff --git a/www/ungoogled-chromium/files/patch-components_feed_core_v2_feed__network__impl__unittest.cc b/www/ungoogled-chromium/files/patch-components_feed_core_v2_feed__network__impl__unittest.cc index 92d0bc480417..0c94b1bc6171 100644 --- a/www/ungoogled-chromium/files/patch-components_feed_core_v2_feed__network__impl__unittest.cc +++ b/www/ungoogled-chromium/files/patch-components_feed_core_v2_feed__network__impl__unittest.cc @@ -1,6 +1,6 @@ ---- components/feed/core/v2/feed_network_impl_unittest.cc.orig 2024-06-22 08:49:42 UTC +--- components/feed/core/v2/feed_network_impl_unittest.cc.orig 2024-08-26 14:40:28 UTC +++ components/feed/core/v2/feed_network_impl_unittest.cc -@@ -753,8 +753,8 @@ TEST_F(FeedNetworkTest, SendApiRequest_DecodesClientIn +@@ -752,8 +752,8 @@ TEST_F(FeedNetworkTest, SendApiRequest_DecodesClientIn EXPECT_EQ(feedwire::ClientInfo::CHROME_ANDROID, client_info.app_type()); EXPECT_EQ(feedwire::Version::RELEASE, client_info.app_version().build_type()); diff --git a/www/ungoogled-chromium/files/patch-components_feed_core_v2_proto__util__unittest.cc b/www/ungoogled-chromium/files/patch-components_feed_core_v2_proto__util__unittest.cc index 93ce0b74052f..29fb009ffd31 100644 --- a/www/ungoogled-chromium/files/patch-components_feed_core_v2_proto__util__unittest.cc +++ b/www/ungoogled-chromium/files/patch-components_feed_core_v2_proto__util__unittest.cc @@ -1,6 +1,6 @@ ---- components/feed/core/v2/proto_util_unittest.cc.orig 2023-09-17 07:59:53 UTC +--- components/feed/core/v2/proto_util_unittest.cc.orig 2024-08-26 14:40:28 UTC +++ components/feed/core/v2/proto_util_unittest.cc -@@ -44,8 +44,8 @@ TEST(ProtoUtilTest, CreateClientInfo) { +@@ -43,8 +43,8 @@ TEST(ProtoUtilTest, CreateClientInfo) { feedwire::ClientInfo result = CreateClientInfo(request_metadata); EXPECT_EQ(feedwire::ClientInfo::CHROME_ANDROID, result.app_type()); EXPECT_EQ(feedwire::Version::RELEASE, result.app_version().build_type()); @@ -10,4 +10,4 @@ + EXPECT_EQ(2, result.app_version().gminor()); EXPECT_EQ(3, result.app_version().build()); EXPECT_EQ(4, result.app_version().revision()); - EXPECT_FALSE(result.chrome_client_info().start_surface()); + diff --git a/www/ungoogled-chromium/files/patch-components_flags__ui_flags__state.cc b/www/ungoogled-chromium/files/patch-components_flags__ui_flags__state.cc index 3ad4e9d8f824..55da3914c08c 100644 --- a/www/ungoogled-chromium/files/patch-components_flags__ui_flags__state.cc +++ b/www/ungoogled-chromium/files/patch-components_flags__ui_flags__state.cc @@ -1,6 +1,6 @@ ---- components/flags_ui/flags_state.cc.orig 2024-07-31 14:19:23 UTC +--- components/flags_ui/flags_state.cc.orig 2024-08-26 14:40:28 UTC +++ components/flags_ui/flags_state.cc -@@ -758,7 +758,7 @@ unsigned short FlagsState::GetCurrentPlatform() { +@@ -759,7 +759,7 @@ unsigned short FlagsState::GetCurrentPlatform() { return kOsCrOS; #elif BUILDFLAG(IS_CHROMEOS_LACROS) return kOsLacros; diff --git a/www/ungoogled-chromium/files/patch-components_os__crypt_sync_libsecret__util__linux.cc b/www/ungoogled-chromium/files/patch-components_os__crypt_sync_libsecret__util__linux.cc index 620845344f2d..f1952515e78f 100644 --- a/www/ungoogled-chromium/files/patch-components_os__crypt_sync_libsecret__util__linux.cc +++ b/www/ungoogled-chromium/files/patch-components_os__crypt_sync_libsecret__util__linux.cc @@ -1,6 +1,6 @@ ---- components/os_crypt/sync/libsecret_util_linux.cc.orig 2024-05-23 20:04:36 UTC +--- components/os_crypt/sync/libsecret_util_linux.cc.orig 2024-08-26 14:40:28 UTC +++ components/os_crypt/sync/libsecret_util_linux.cc -@@ -99,16 +99,22 @@ bool LibsecretLoader::EnsureLibsecretLoaded() { +@@ -96,16 +96,22 @@ bool LibsecretLoader::EnsureLibsecretLoaded() { // static bool LibsecretLoader::LoadLibsecret() { diff --git a/www/ungoogled-chromium/files/patch-components_paint__preview_player_player__compositor__delegate.cc b/www/ungoogled-chromium/files/patch-components_paint__preview_player_player__compositor__delegate.cc index 36e1c6ad2b23..4b4f71aec03f 100644 --- a/www/ungoogled-chromium/files/patch-components_paint__preview_player_player__compositor__delegate.cc +++ b/www/ungoogled-chromium/files/patch-components_paint__preview_player_player__compositor__delegate.cc @@ -1,6 +1,6 @@ ---- components/paint_preview/player/player_compositor_delegate.cc.orig 2024-06-22 08:49:42 UTC +--- components/paint_preview/player/player_compositor_delegate.cc.orig 2024-08-26 14:40:28 UTC +++ components/paint_preview/player/player_compositor_delegate.cc -@@ -435,8 +435,8 @@ void PlayerCompositorDelegate::ValidateProtoAndLoadAXT +@@ -434,8 +434,8 @@ void PlayerCompositorDelegate::ValidateProtoAndLoadAXT auto chrome_version = capture_result_->proto.metadata().chrome_version(); const auto& current_chrome_version = version_info::GetVersion(); if (capture_result_->proto.metadata().has_chrome_version() && diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_features_password__features.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_features_password__features.cc index d14e4993dbdc..53d0c1e77000 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_features_password__features.cc +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_features_password__features.cc @@ -1,15 +1,6 @@ ---- components/password_manager/core/browser/features/password_features.cc.orig 2024-07-31 14:19:23 UTC +--- components/password_manager/core/browser/features/password_features.cc.orig 2024-08-26 14:40:28 UTC +++ components/password_manager/core/browser/features/password_features.cc -@@ -33,7 +33,7 @@ BASE_FEATURE(kBiometricTouchToFill, - #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS) // Desktop - BASE_FEATURE(kButterOnDesktopFollowup, - "ButterOnDesktopFollowup", --#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); -@@ -47,7 +47,7 @@ BASE_FEATURE(kClearUndecryptablePasswords, +@@ -41,7 +41,7 @@ BASE_FEATURE(kClearUndecryptablePasswords, BASE_FEATURE(kClearUndecryptablePasswordsOnSync, "ClearUndecryptablePasswordsInSync", #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_IOS) || \ @@ -18,7 +9,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -109,7 +109,7 @@ BASE_FEATURE(kPasswordManualFallbackAvailable, +@@ -90,7 +90,7 @@ BASE_FEATURE(kPasswordManualFallbackAvailable, "PasswordManualFallbackAvailable", base::FEATURE_DISABLED_BY_DEFAULT); diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_features_password__features.h b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_features_password__features.h index 9ec92a883917..982eaff721b1 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_features_password__features.h +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_features_password__features.h @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/features/password_features.h.orig 2024-07-31 14:19:23 UTC +--- components/password_manager/core/browser/features/password_features.h.orig 2024-08-26 14:40:28 UTC +++ components/password_manager/core/browser/features/password_features.h -@@ -93,7 +93,7 @@ BASE_DECLARE_FEATURE(kPasswordManagerLogToTerminal); +@@ -90,7 +90,7 @@ BASE_DECLARE_FEATURE(kPasswordManagerLogToTerminal); // Enables triggering password suggestions through the context menu. BASE_DECLARE_FEATURE(kPasswordManualFallbackAvailable); diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__form__manager.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__form__manager.cc index c8e4f570060c..6a84b98dd22d 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__form__manager.cc +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__form__manager.cc @@ -1,4 +1,4 @@ ---- components/password_manager/core/browser/password_form_manager.cc.orig 2024-07-31 14:19:23 UTC +--- components/password_manager/core/browser/password_form_manager.cc.orig 2024-08-26 14:40:28 UTC +++ components/password_manager/core/browser/password_form_manager.cc @@ -58,7 +58,7 @@ #include "components/webauthn/android/webauthn_cred_man_delegate.h" @@ -9,7 +9,7 @@ #include "components/os_crypt/sync/os_crypt.h" #endif -@@ -229,7 +229,7 @@ bool ShouldUploadCrowdsourcingVotes(const FormOrDigest +@@ -228,7 +228,7 @@ bool ShouldUploadCrowdsourcingVotes(const FormOrDigest return false; } @@ -18,7 +18,7 @@ bool ShouldShowKeychainErrorBubble( std::optional<PasswordStoreBackendError> backend_error) { if (!backend_error.has_value()) { -@@ -880,7 +880,7 @@ void PasswordFormManager::OnFetchCompleted() { +@@ -885,7 +885,7 @@ void PasswordFormManager::OnFetchCompleted() { error.value().type); } diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manager.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manager.cc index 5cbfc64cb7fc..edb803658f78 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manager.cc +++ b/www/ungoogled-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-07-31 14:19:23 UTC +--- components/password_manager/core/browser/password_manager.cc.orig 2024-08-26 14:40:28 UTC +++ components/password_manager/core/browser/password_manager.cc -@@ -386,7 +386,7 @@ void PasswordManager::RegisterProfilePrefs( +@@ -425,7 +425,7 @@ void PasswordManager::RegisterProfilePrefs( prefs::kAutofillableCredentialsAccountStoreLoginDatabase, false); #endif // BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS) registry->RegisterBooleanPref(prefs::kPasswordSharingEnabled, true); @@ -9,3 +9,12 @@ registry->RegisterIntegerPref(prefs::kRelaunchChromeBubbleDismissedCounter, 0); #endif +@@ -438,7 +438,7 @@ void PasswordManager::RegisterProfilePrefs( + #endif + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_IOS) ++ BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD) + registry->RegisterBooleanPref(prefs::kDeletingUndecryptablePasswordsEnabled, + true); + #endif diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manager__client.h b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manager__client.h index 1a6954580451..f981d15645fa 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manager__client.h +++ b/www/ungoogled-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-07-31 14:19:23 UTC +--- components/password_manager/core/browser/password_manager_client.h.orig 2024-08-26 14:40:28 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" -@@ -507,7 +507,7 @@ class PasswordManagerClient { +@@ -510,7 +510,7 @@ class PasswordManagerClient { virtual void RefreshPasswordManagerSettingsIfNeeded() const; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.cc index b772acf2ba86..43a4bf5bfd58 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.cc +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.cc @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/password_manual_fallback_flow.cc.orig 2024-06-22 08:49:42 UTC +--- components/password_manager/core/browser/password_manual_fallback_flow.cc.orig 2024-08-26 14:40:28 UTC +++ components/password_manager/core/browser/password_manual_fallback_flow.cc -@@ -192,7 +192,7 @@ void PasswordManualFallbackFlow::DidAcceptSuggestion( +@@ -204,7 +204,7 @@ void PasswordManualFallbackFlow::DidAcceptSuggestion( payload.password)); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.h b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.h index adb9866cbde5..1cbf4d8ba15e 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.h +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.h @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/password_manual_fallback_flow.h.orig 2024-06-22 08:49:42 UTC +--- components/password_manager/core/browser/password_manual_fallback_flow.h.orig 2024-08-26 14:40:28 UTC +++ components/password_manager/core/browser/password_manual_fallback_flow.h -@@ -18,7 +18,7 @@ +@@ -17,7 +17,7 @@ #include "components/password_manager/core/browser/ui/saved_passwords_presenter.h" #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -9,7 +9,7 @@ #include "components/password_manager/core/browser/password_cross_domain_confirmation_popup_controller.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || // BUILDFLAG(IS_CHROMEOS) -@@ -159,7 +159,7 @@ class PasswordManualFallbackFlow : public autofill::Au +@@ -161,7 +161,7 @@ class PasswordManualFallbackFlow : public autofill::Au std::unique_ptr<device_reauth::DeviceAuthenticator> authenticator_; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store_login__database.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store_login__database.cc index 9437d636080f..6fb06b4a8fbe 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store_login__database.cc +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store_login__database.cc @@ -1,15 +1,15 @@ ---- components/password_manager/core/browser/password_store/login_database.cc.orig 2024-07-31 14:19:23 UTC +--- components/password_manager/core/browser/password_store/login_database.cc.orig 2024-08-26 14:40:28 UTC +++ components/password_manager/core/browser/password_store/login_database.cc -@@ -1020,7 +1020,7 @@ void RecordShouldDeleteUndecryptablePasswordsMetric( - } - - bool ShouldDeleteUndecryptablePasswords() { +@@ -1028,7 +1028,7 @@ bool ShouldDeleteUndecryptablePasswords( + clearing_undecryptable_passwords, + bool is_user_data_dir_policy_set, + bool is_disabled_by_policy) { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) std::string user_data_dir_string; std::unique_ptr<base::Environment> environment(base::Environment::Create()); // On Linux user data directory ca be specified using an env variable. If it -@@ -1039,7 +1039,7 @@ bool ShouldDeleteUndecryptablePasswords() { +@@ -1047,7 +1047,7 @@ bool ShouldDeleteUndecryptablePasswords( return false; } diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store_login__database__async__helper.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store_login__database__async__helper.cc index de600c4721ab..38a065ed5bae 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store_login__database__async__helper.cc +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store_login__database__async__helper.cc @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/password_store/login_database_async_helper.cc.orig 2024-05-23 20:04:36 UTC +--- components/password_manager/core/browser/password_store/login_database_async_helper.cc.orig 2024-08-26 14:40:28 UTC +++ components/password_manager/core/browser/password_store/login_database_async_helper.cc -@@ -149,7 +149,7 @@ LoginsResultOrError LoginDatabaseAsyncHelper::FillMatc +@@ -152,7 +152,7 @@ LoginsResultOrError LoginDatabaseAsyncHelper::FillMatc std::vector<PasswordForm> matched_forms; if (!login_db_ || !login_db_->GetLogins(form, include_psl, &matched_forms)) { diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store_login__database__unittest.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store_login__database__unittest.cc index b16ba9632eaf..e39778d79a55 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store_login__database__unittest.cc +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store_login__database__unittest.cc @@ -1,7 +1,7 @@ ---- components/password_manager/core/browser/password_store/login_database_unittest.cc.orig 2024-07-31 14:19:23 UTC +--- components/password_manager/core/browser/password_store/login_database_unittest.cc.orig 2024-08-26 14:40:28 UTC +++ components/password_manager/core/browser/password_store/login_database_unittest.cc -@@ -2141,7 +2141,7 @@ INSTANTIATE_TEST_SUITE_P(MigrationToVCurrent, - testing::Values(1, 2, 3, 24)); +@@ -2207,7 +2207,7 @@ INSTANTIATE_TEST_SUITE_P(MigrationToVCurrent, + testing::Bool())); #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_IOS) || \ - BUILDFLAG(IS_WIN) diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store_password__store__built__in__backend.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store_password__store__built__in__backend.cc new file mode 100644 index 000000000000..659dabf03b02 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store_password__store__built__in__backend.cc @@ -0,0 +1,11 @@ +--- components/password_manager/core/browser/password_store/password_store_built_in_backend.cc.orig 2024-08-26 14:40:28 UTC ++++ components/password_manager/core/browser/password_store/password_store_built_in_backend.cc +@@ -211,7 +211,7 @@ void PasswordStoreBuiltInBackend::InitBackend( + std::move(clearing_undecryptable_passwords_cb))); + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_IOS) ++ BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD) + background_task_runner_->PostTask( + FROM_HERE, + base::BindOnce(&LoginDatabaseAsyncHelper:: diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_stub__password__manager__client.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_stub__password__manager__client.cc index ea3cd3c2fe2c..ab5e0444bb9f 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_stub__password__manager__client.cc +++ b/www/ungoogled-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-05-23 20:04:36 UTC +--- components/password_manager/core/browser/stub_password_manager_client.cc.orig 2024-08-26 14:40:28 UTC +++ components/password_manager/core/browser/stub_password_manager_client.cc -@@ -175,7 +175,7 @@ version_info::Channel StubPasswordManagerClient::GetCh +@@ -180,7 +180,7 @@ version_info::Channel StubPasswordManagerClient::GetCh } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_stub__password__manager__client.h b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_stub__password__manager__client.h index c791501effb8..1f64ff35c378 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_stub__password__manager__client.h +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_stub__password__manager__client.h @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/stub_password_manager_client.h.orig 2024-05-23 20:04:36 UTC +--- components/password_manager/core/browser/stub_password_manager_client.h.orig 2024-08-26 14:40:28 UTC +++ components/password_manager/core/browser/stub_password_manager_client.h -@@ -74,7 +74,7 @@ class StubPasswordManagerClient : public PasswordManag +@@ -75,7 +75,7 @@ class StubPasswordManagerClient : public PasswordManag MockPasswordFeatureManager* GetPasswordFeatureManager(); version_info::Channel GetChannel() const override; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_common_password__manager__pref__names.h b/www/ungoogled-chromium/files/patch-components_password__manager_core_common_password__manager__pref__names.h index ef5963a09575..4d2d5ee521fa 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_common_password__manager__pref__names.h +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_common_password__manager__pref__names.h @@ -1,6 +1,15 @@ ---- components/password_manager/core/common/password_manager_pref_names.h.orig 2024-07-31 14:19:23 UTC +--- components/password_manager/core/common/password_manager_pref_names.h.orig 2024-08-26 14:40:28 UTC +++ components/password_manager/core/common/password_manager_pref_names.h -@@ -358,7 +358,7 @@ inline constexpr char kAutofillableCredentialsAccountS +@@ -41,7 +41,7 @@ inline constexpr char kCredentialProviderEnabledOnStar + #endif + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_IOS) ++ BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD) + // Boolean pref controlled by the DeletingUndecryptablePasswordsEnabled policy. + // If set to false it blocks deleting undecryptable passwords, otherwise the + // deletion can happen. +@@ -370,7 +370,7 @@ inline constexpr char kAutofillableCredentialsAccountS inline constexpr char kPasswordSharingEnabled[] = "password_manager.password_sharing_enabled"; diff --git a/www/ungoogled-chromium/files/patch-components_safe__browsing_content_resources_gen__file__type__proto.py b/www/ungoogled-chromium/files/patch-components_safe__browsing_content_resources_gen__file__type__proto.py index 823e0d1ae2be..d0215264a8a1 100644 --- a/www/ungoogled-chromium/files/patch-components_safe__browsing_content_resources_gen__file__type__proto.py +++ b/www/ungoogled-chromium/files/patch-components_safe__browsing_content_resources_gen__file__type__proto.py @@ -1,15 +1,15 @@ ---- components/safe_browsing/content/resources/gen_file_type_proto.py.orig 2023-01-13 08:56:02 UTC +--- components/safe_browsing/content/resources/gen_file_type_proto.py.orig 2024-08-26 14:40:28 UTC +++ components/safe_browsing/content/resources/gen_file_type_proto.py -@@ -38,6 +38,8 @@ def PlatformTypes(): - "fuchsia": - download_file_types_pb2.DownloadFileType.PLATFORM_TYPE_FUCHSIA, +@@ -37,6 +37,8 @@ def PlatformTypes(): + "chromeos": + download_file_types_pb2.DownloadFileType.PLATFORM_TYPE_CHROME_OS, "linux": download_file_types_pb2.DownloadFileType.PLATFORM_TYPE_LINUX, + "openbsd": download_file_types_pb2.DownloadFileType.PLATFORM_TYPE_LINUX, + "freebsd": download_file_types_pb2.DownloadFileType.PLATFORM_TYPE_LINUX, "mac": download_file_types_pb2.DownloadFileType.PLATFORM_TYPE_MAC, "win": download_file_types_pb2.DownloadFileType.PLATFORM_TYPE_WINDOWS, - } -@@ -181,7 +183,7 @@ class DownloadFileTypeProtoGenerator(BinaryProtoGenera + # LINT.ThenChange(BUILD.gn:PlatformTypes) +@@ -179,7 +181,7 @@ class DownloadFileTypeProtoGenerator(BinaryProtoGenera '-t', '--type', help='The platform type. One of android, chromeos, ' + diff --git a/www/ungoogled-chromium/files/patch-components_safe__browsing_core_browser_realtime_url__lookup__service__base.cc b/www/ungoogled-chromium/files/patch-components_safe__browsing_core_browser_realtime_url__lookup__service__base.cc index 43975bc56a53..c21f90ccd5bf 100644 --- a/www/ungoogled-chromium/files/patch-components_safe__browsing_core_browser_realtime_url__lookup__service__base.cc +++ b/www/ungoogled-chromium/files/patch-components_safe__browsing_core_browser_realtime_url__lookup__service__base.cc @@ -1,7 +1,7 @@ ---- components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc.orig 2024-07-31 14:19:23 UTC +--- components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc.orig 2024-08-26 14:40:28 UTC +++ components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc -@@ -107,7 +107,7 @@ RTLookupRequest::OSType GetRTLookupRequestOSType() { - return RTLookupRequest::OS_TYPE_FUCHSIA; +@@ -106,7 +106,7 @@ RTLookupRequest::OSType GetRTLookupRequestOSType() { + return RTLookupRequest::OS_TYPE_CHROME_OS; #elif BUILDFLAG(IS_IOS) return RTLookupRequest::OS_TYPE_IOS; -#elif BUILDFLAG(IS_LINUX) diff --git a/www/ungoogled-chromium/files/patch-components_safe__browsing_core_common_features.cc b/www/ungoogled-chromium/files/patch-components_safe__browsing_core_common_features.cc index 4b536c77b870..566c9339a0e7 100644 --- a/www/ungoogled-chromium/files/patch-components_safe__browsing_core_common_features.cc +++ b/www/ungoogled-chromium/files/patch-components_safe__browsing_core_common_features.cc @@ -1,6 +1,6 @@ ---- components/safe_browsing/core/common/features.cc.orig 2024-07-31 14:19:23 UTC +--- components/safe_browsing/core/common/features.cc.orig 2024-08-26 14:40:28 UTC +++ components/safe_browsing/core/common/features.cc -@@ -168,7 +168,7 @@ BASE_FEATURE(kGooglePlayProtectPrompt, +@@ -186,7 +186,7 @@ BASE_FEATURE(kGooglePlayProtectInApkTelemetry, BASE_FEATURE(kHashPrefixRealTimeLookups, "SafeBrowsingHashPrefixRealTimeLookups", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,12 +9,12 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -253,7 +253,7 @@ constexpr base::FeatureParam<int> kReferrerChainEventM +@@ -267,7 +267,7 @@ constexpr base::FeatureParam<int> kReferrerChainEventM BASE_FEATURE(kSafeBrowsingAsyncRealTimeCheck, "SafeBrowsingAsyncRealTimeCheck", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT diff --git a/www/ungoogled-chromium/files/patch-components_search__engines_search__engine__choice_search__engine__choice__service.cc b/www/ungoogled-chromium/files/patch-components_search__engines_search__engine__choice_search__engine__choice__service.cc index b31d6c87e11a..cd3f47193ed4 100644 --- a/www/ungoogled-chromium/files/patch-components_search__engines_search__engine__choice_search__engine__choice__service.cc +++ b/www/ungoogled-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-07-31 14:19:23 UTC +--- components/search_engines/search_engine_choice/search_engine_choice_service.cc.orig 2024-08-26 14:40:28 UTC +++ components/search_engines/search_engine_choice/search_engine_choice_service.cc -@@ -580,7 +580,7 @@ void SearchEngineChoiceService::ProcessPendingChoiceSc +@@ -610,7 +610,7 @@ void SearchEngineChoiceService::ProcessPendingChoiceSc int SearchEngineChoiceService::GetCountryIdInternal() { // `country_codes::kCountryIDAtInstall` may not be set yet. diff --git a/www/ungoogled-chromium/files/patch-components_search__engines_template__url__service.cc b/www/ungoogled-chromium/files/patch-components_search__engines_template__url__service.cc index 556965a40526..e36b245b7d00 100644 --- a/www/ungoogled-chromium/files/patch-components_search__engines_template__url__service.cc +++ b/www/ungoogled-chromium/files/patch-components_search__engines_template__url__service.cc @@ -1,6 +1,6 @@ ---- components/search_engines/template_url_service.cc.orig 2024-07-31 14:19:23 UTC +--- components/search_engines/template_url_service.cc.orig 2024-08-26 14:40:28 UTC +++ components/search_engines/template_url_service.cc -@@ -3136,7 +3136,7 @@ bool TemplateURLService::MatchesDefaultSearchProvider( +@@ -3096,7 +3096,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/ungoogled-chromium/files/patch-components_signin_public_base_signin__switches.cc b/www/ungoogled-chromium/files/patch-components_signin_public_base_signin__switches.cc deleted file mode 100644 index 50799d16b181..000000000000 --- a/www/ungoogled-chromium/files/patch-components_signin_public_base_signin__switches.cc +++ /dev/null @@ -1,25 +0,0 @@ ---- components/signin/public/base/signin_switches.cc.orig 2024-07-31 14:19:23 UTC -+++ components/signin/public/base/signin_switches.cc -@@ -123,11 +123,11 @@ bool IsExplicitBrowserSigninUIOnDesktopEnabled() { - } - - #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ -- BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) -+ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD) - - // Desktop and Android are being launched (enabled by default), iOS is pending. - #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ -- BUILDFLAG(IS_ANDROID) -+ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - #define MINOR_MODE_FEATURE_DEFAULT_STATUS base::FEATURE_ENABLED_BY_DEFAULT - #else - #define MINOR_MODE_FEATURE_DEFAULT_STATUS base::FEATURE_DISABLED_BY_DEFAULT -@@ -141,7 +141,7 @@ constexpr int kMinorModeRestrictionsFetchDeadlineDefau - #if BUILDFLAG(IS_ANDROID) - // Based on Signin.AccountCapabilities.UserVisibleLatency - 1000; --#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - // Based on Signin.SyncOptIn.PreSyncConfirmationLatency - 1000; - #elif BUILDFLAG(IS_IOS) diff --git a/www/ungoogled-chromium/files/patch-components_signin_public_base_signin__switches.h b/www/ungoogled-chromium/files/patch-components_signin_public_base_signin__switches.h deleted file mode 100644 index eceef098df7e..000000000000 --- a/www/ungoogled-chromium/files/patch-components_signin_public_base_signin__switches.h +++ /dev/null @@ -1,11 +0,0 @@ ---- components/signin/public/base/signin_switches.h.orig 2024-07-31 14:19:23 UTC -+++ components/signin/public/base/signin_switches.h -@@ -112,7 +112,7 @@ bool IsExplicitBrowserSigninUIOnDesktopEnabled(); - - // Controls the view mode for (history) sync screen. - #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ -- BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) -+ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD) - COMPONENT_EXPORT(SIGNIN_SWITCHES) - BASE_DECLARE_FEATURE(kMinorModeRestrictionsForHistorySyncOptIn); - diff --git a/www/ungoogled-chromium/files/patch-components_startup__metric__utils_common_startup__metric__utils.cc b/www/ungoogled-chromium/files/patch-components_startup__metric__utils_common_startup__metric__utils.cc index 38bcb7aa5009..9982d73f4793 100644 --- a/www/ungoogled-chromium/files/patch-components_startup__metric__utils_common_startup__metric__utils.cc +++ b/www/ungoogled-chromium/files/patch-components_startup__metric__utils_common_startup__metric__utils.cc @@ -1,9 +1,9 @@ ---- components/startup_metric_utils/common/startup_metric_utils.cc.orig 2024-05-23 20:04:36 UTC +--- components/startup_metric_utils/common/startup_metric_utils.cc.orig 2024-08-26 14:40:28 UTC +++ components/startup_metric_utils/common/startup_metric_utils.cc -@@ -85,7 +85,7 @@ base::TimeTicks CommonStartupMetricRecorder::StartupTi +@@ -94,7 +94,7 @@ base::TimeTicks CommonStartupMetricRecorder::StartupTi // Enabling this logic on OS X causes a significant performance regression. - // TODO(crbug.com/40464036): Remove IS_APPLE ifdef once priority changes are - // ignored on Mac main thread. + // TODO(crbug.com/40464036): Remove IS_APPLE ifdef once utility processes + // set their desired main thread priority. -#if !BUILDFLAG(IS_APPLE) +#if !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD) static bool statics_initialized = false; diff --git a/www/ungoogled-chromium/files/patch-components_supervised__user_core_browser_supervised__user__preferences.cc b/www/ungoogled-chromium/files/patch-components_supervised__user_core_browser_supervised__user__preferences.cc index 28ddb64e45b8..913ad436cd35 100644 --- a/www/ungoogled-chromium/files/patch-components_supervised__user_core_browser_supervised__user__preferences.cc +++ b/www/ungoogled-chromium/files/patch-components_supervised__user_core_browser_supervised__user__preferences.cc @@ -1,8 +1,8 @@ ---- components/supervised_user/core/browser/supervised_user_preferences.cc.orig 2024-06-22 08:49:42 UTC +--- components/supervised_user/core/browser/supervised_user_preferences.cc.orig 2024-08-26 14:40:28 UTC +++ components/supervised_user/core/browser/supervised_user_preferences.cc -@@ -153,7 +153,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry - static_cast<int>(FirstTimeInterstitialBannerState::kUnknown)); +@@ -154,7 +154,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry registry->RegisterBooleanPref(prefs::kChildAccountStatusKnown, false); + registry->RegisterStringPref(prefs::kFamilyLinkUserMemberRole, std::string()); #if BUILDFLAG(ENABLE_EXTENSIONS) && \ - (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)) + (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) diff --git a/www/ungoogled-chromium/files/patch-components_supervised__user_core_browser_supervised__user__service.cc b/www/ungoogled-chromium/files/patch-components_supervised__user_core_browser_supervised__user__service.cc index cadbec426149..f1b6b00508ff 100644 --- a/www/ungoogled-chromium/files/patch-components_supervised__user_core_browser_supervised__user__service.cc +++ b/www/ungoogled-chromium/files/patch-components_supervised__user_core_browser_supervised__user__service.cc @@ -1,6 +1,6 @@ ---- components/supervised_user/core/browser/supervised_user_service.cc.orig 2024-05-23 20:04:36 UTC +--- components/supervised_user/core/browser/supervised_user_service.cc.orig 2024-08-26 14:40:28 UTC +++ components/supervised_user/core/browser/supervised_user_service.cc -@@ -175,7 +175,7 @@ FirstTimeInterstitialBannerState SupervisedUserService +@@ -176,7 +176,7 @@ FirstTimeInterstitialBannerState SupervisedUserService const FirstTimeInterstitialBannerState original_state) { FirstTimeInterstitialBannerState target_state = original_state; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-components_supervised__user_core_common_features.cc b/www/ungoogled-chromium/files/patch-components_supervised__user_core_common_features.cc index c9a80549a93a..4b2816b9f713 100644 --- a/www/ungoogled-chromium/files/patch-components_supervised__user_core_common_features.cc +++ b/www/ungoogled-chromium/files/patch-components_supervised__user_core_common_features.cc @@ -1,6 +1,6 @@ ---- components/supervised_user/core/common/features.cc.orig 2024-07-31 14:19:23 UTC +--- components/supervised_user/core/common/features.cc.orig 2024-08-26 14:40:28 UTC +++ components/supervised_user/core/common/features.cc -@@ -59,7 +59,7 @@ BASE_FEATURE(kUpdatedSupervisedUserExtensionApprovalSt +@@ -66,7 +66,7 @@ BASE_FEATURE(kUpdatedSupervisedUserExtensionApprovalSt "UpdatedSupervisedUserExtensionApprovalStrings", base::FEATURE_DISABLED_BY_DEFAULT); @@ -9,7 +9,7 @@ BASE_FEATURE(kEnableExtensionsPermissionsForSupervisedUsersOnDesktop, "EnableExtensionsPermissionsForSupervisedUsersOnDesktop", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -74,7 +74,7 @@ bool IsSupervisedUserSkipParentApprovalToInstallExtens +@@ -81,7 +81,7 @@ bool IsSupervisedUserSkipParentApprovalToInstallExtens #if BUILDFLAG(IS_CHROMEOS) return base::FeatureList::IsEnabled( kEnableSupervisedUserSkipParentApprovalToInstallExtensions); @@ -18,12 +18,28 @@ bool skipParentApprovalEnabled = base::FeatureList::IsEnabled( kEnableSupervisedUserSkipParentApprovalToInstallExtensions); bool permissionExtensionsForSupervisedUsersEnabled = -@@ -101,7 +101,7 @@ BASE_FEATURE(kCustomWebSignInInterceptForSupervisedUse - "CustomWebSignInInterceptForSupervisedUsers", +@@ -106,13 +106,13 @@ BASE_FEATURE(kCustomWebSignInInterceptForSupervisedUse + "CustomWebSignInInterceptForSupervisedUsersUi", base::FEATURE_DISABLED_BY_DEFAULT); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + BASE_FEATURE(kShowKiteForSupervisedUsers, + "ShowKiteForSupervisedUsers", + base::FEATURE_DISABLED_BY_DEFAULT); + #endif + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) BASE_FEATURE(kHideGuestModeForSupervisedUsers, "HideGuestModeForSupervisedUsers", base::FEATURE_DISABLED_BY_DEFAULT); +@@ -122,7 +122,7 @@ BASE_FEATURE(kForceSafeSearchForUnauthenticatedSupervi + "ForceSafeSearchForUnauthenticatedSupervisedUsers", + base::FEATURE_DISABLED_BY_DEFAULT); + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + BASE_FEATURE(kForceSupervisedUserReauthenticationForYouTube, + "ForceSupervisedUserReauthenticationForYouTube", + base::FEATURE_DISABLED_BY_DEFAULT); diff --git a/www/ungoogled-chromium/files/patch-components_supervised__user_core_common_features.h b/www/ungoogled-chromium/files/patch-components_supervised__user_core_common_features.h index 7177850661c8..942a0d5b5731 100644 --- a/www/ungoogled-chromium/files/patch-components_supervised__user_core_common_features.h +++ b/www/ungoogled-chromium/files/patch-components_supervised__user_core_common_features.h @@ -1,4 +1,4 @@ ---- components/supervised_user/core/common/features.h.orig 2024-07-31 14:19:23 UTC +--- components/supervised_user/core/common/features.h.orig 2024-08-26 14:40:28 UTC +++ components/supervised_user/core/common/features.h @@ -25,7 +25,7 @@ BASE_DECLARE_FEATURE( // Applies new informative strings during the parental extension approval flow. @@ -9,12 +9,26 @@ BASE_DECLARE_FEATURE(kEnableExtensionsPermissionsForSupervisedUsersOnDesktop); #endif -@@ -53,7 +53,7 @@ bool IsSupervisedUserSkipParentApprovalToInstallExtens - // Only affects Desktop platforms. - BASE_DECLARE_FEATURE(kCustomWebSignInInterceptForSupervisedUsers); +@@ -62,11 +62,11 @@ BASE_DECLARE_FEATURE(kCustomWebSignInInterceptForSuper + + // Displays a Family Link kite badge on the supervised user avatar in various + // surfaces. +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + BASE_DECLARE_FEATURE(kShowKiteForSupervisedUsers); + #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) // This hides the following guest mode entry points for supervised users: // // * In the Profile menu for supervised profiles +@@ -78,7 +78,7 @@ BASE_DECLARE_FEATURE(kHideGuestModeForSupervisedUsers) + // unauthenticated (e.g. signed out of the content area) account. + BASE_DECLARE_FEATURE(kForceSafeSearchForUnauthenticatedSupervisedUsers); + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + // Force re-authentication when an unauthenticated supervised user tries to + // access YouTube, so that content restrictions can be applied. + BASE_DECLARE_FEATURE(kForceSupervisedUserReauthenticationForYouTube); diff --git a/www/ungoogled-chromium/files/patch-components_trusted__vault_trusted__vault__connection__impl.cc b/www/ungoogled-chromium/files/patch-components_trusted__vault_trusted__vault__connection__impl.cc new file mode 100644 index 000000000000..8f9b9b4fdae0 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_trusted__vault_trusted__vault__connection__impl.cc @@ -0,0 +1,11 @@ +--- components/trusted_vault/trusted_vault_connection_impl.cc.orig 2024-08-26 14:40:28 UTC ++++ components/trusted_vault/trusted_vault_connection_impl.cc +@@ -101,7 +101,7 @@ GetLocalPhysicalDeviceType() { + // currently used or even built on all platforms. + #if BUILDFLAG(IS_CHROMEOS) + return trusted_vault_pb::PhysicalDeviceMetadata::DEVICE_TYPE_CHROMEOS; +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return trusted_vault_pb::PhysicalDeviceMetadata::DEVICE_TYPE_LINUX; + #elif BUILDFLAG(IS_ANDROID) + return trusted_vault_pb::PhysicalDeviceMetadata::DEVICE_TYPE_ANDROID; diff --git a/www/ungoogled-chromium/files/patch-components_user__education_views_help__bubble__view.cc b/www/ungoogled-chromium/files/patch-components_user__education_views_help__bubble__view.cc index c6d06e233398..1d136f488c8d 100644 --- a/www/ungoogled-chromium/files/patch-components_user__education_views_help__bubble__view.cc +++ b/www/ungoogled-chromium/files/patch-components_user__education_views_help__bubble__view.cc @@ -1,6 +1,6 @@ ---- components/user_education/views/help_bubble_view.cc.orig 2024-07-31 14:19:23 UTC +--- components/user_education/views/help_bubble_view.cc.orig 2024-08-26 14:40:28 UTC +++ components/user_education/views/help_bubble_view.cc -@@ -997,7 +997,7 @@ gfx::Rect HelpBubbleView::GetAnchorRect() const { +@@ -856,7 +856,7 @@ gfx::Rect HelpBubbleView::GetAnchorRect() const { void HelpBubbleView::OnBeforeBubbleWidgetInit(views::Widget::InitParams* params, views::Widget* widget) const { BubbleDialogDelegateView::OnBeforeBubbleWidgetInit(params, widget); diff --git a/www/ungoogled-chromium/files/patch-components_visited__url__ranking_public_url__visit__util.cc b/www/ungoogled-chromium/files/patch-components_visited__url__ranking_public_url__visit__util.cc index 5d992decee70..dc59d67bfa93 100644 --- a/www/ungoogled-chromium/files/patch-components_visited__url__ranking_public_url__visit__util.cc +++ b/www/ungoogled-chromium/files/patch-components_visited__url__ranking_public_url__visit__util.cc @@ -1,6 +1,6 @@ ---- components/visited_url_ranking/public/url_visit_util.cc.orig 2024-07-31 14:19:23 UTC +--- components/visited_url_ranking/public/url_visit_util.cc.orig 2024-08-26 14:40:28 UTC +++ components/visited_url_ranking/public/url_visit_util.cc -@@ -54,7 +54,7 @@ PlatformType GetPlatformInput() { +@@ -62,7 +62,7 @@ PlatformType GetPlatformInput() { return PlatformType::kWindows; #elif BUILDFLAG(IS_MAC) return PlatformType::kMac; diff --git a/www/ungoogled-chromium/files/patch-components_viz_common_features.cc b/www/ungoogled-chromium/files/patch-components_viz_common_features.cc index 6383ce075985..60c39847d017 100644 --- a/www/ungoogled-chromium/files/patch-components_viz_common_features.cc +++ b/www/ungoogled-chromium/files/patch-components_viz_common_features.cc @@ -1,7 +1,7 @@ ---- components/viz/common/features.cc.orig 2024-07-31 14:19:23 UTC +--- components/viz/common/features.cc.orig 2024-08-26 14:40:28 UTC +++ components/viz/common/features.cc -@@ -263,7 +263,7 @@ BASE_FEATURE(kBufferQueueImageSetPurgeable, - "BufferQueueImageSetPurgeable", +@@ -234,7 +234,7 @@ BASE_FEATURE(kAllowForceMergeRenderPassWithRequireOver + "AllowForceMergeRenderPassWithRequireOverlayQuads", base::FEATURE_ENABLED_BY_DEFAULT); -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) @@ -9,7 +9,7 @@ // On platforms using SkiaOutputDeviceBufferQueue and not yet universally using // SkiaRenderer-allocated images, when this is true SkiaRenderer will allocate // and maintain a buffer queue of images for the root render pass, instead of -@@ -559,7 +559,7 @@ bool ShouldOnBeginFrameThrottleVideo() { +@@ -500,7 +500,7 @@ bool ShouldOnBeginFrameThrottleVideo() { return base::FeatureList::IsEnabled(features::kOnBeginFrameThrottleVideo); } diff --git a/www/ungoogled-chromium/files/patch-components_viz_common_features.h b/www/ungoogled-chromium/files/patch-components_viz_common_features.h index a7de8c7ded18..0a397d5f029a 100644 --- a/www/ungoogled-chromium/files/patch-components_viz_common_features.h +++ b/www/ungoogled-chromium/files/patch-components_viz_common_features.h @@ -1,6 +1,6 @@ ---- components/viz/common/features.h.orig 2024-07-31 14:19:23 UTC +--- components/viz/common/features.h.orig 2024-08-26 14:40:28 UTC +++ components/viz/common/features.h -@@ -75,7 +75,7 @@ VIZ_COMMON_EXPORT BASE_DECLARE_FEATURE(kDrawPredictedI +@@ -72,7 +72,7 @@ VIZ_COMMON_EXPORT BASE_DECLARE_FEATURE(kDrawPredictedI VIZ_COMMON_EXPORT BASE_DECLARE_FEATURE(kAllowUndamagedNonrootRenderPassToSkip); VIZ_COMMON_EXPORT BASE_DECLARE_FEATURE( kAllowForceMergeRenderPassWithRequireOverlayQuads); @@ -8,9 +8,9 @@ +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) VIZ_COMMON_EXPORT BASE_DECLARE_FEATURE(kRendererAllocatesImages); #endif - VIZ_COMMON_EXPORT BASE_DECLARE_FEATURE(kBufferQueueImageSetPurgeable); -@@ -136,7 +136,7 @@ VIZ_COMMON_EXPORT std::optional<double> IsDynamicSched - VIZ_COMMON_EXPORT std::optional<double> IsDynamicSchedulerEnabledForClients(); + VIZ_COMMON_EXPORT BASE_DECLARE_FEATURE(kOnBeginFrameAcks); +@@ -129,7 +129,7 @@ VIZ_COMMON_EXPORT bool UseWebViewNewInvalidateHeuristi + VIZ_COMMON_EXPORT bool UseSurfaceLayerForVideo(); VIZ_COMMON_EXPORT int MaxOverlaysConsidered(); VIZ_COMMON_EXPORT bool ShouldOnBeginFrameThrottleVideo(); -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) diff --git a/www/ungoogled-chromium/files/patch-components_viz_service_display__embedder_skia__output__device__buffer__queue.cc b/www/ungoogled-chromium/files/patch-components_viz_service_display__embedder_skia__output__device__buffer__queue.cc index 17c748a7d902..fa254177fc8c 100644 --- a/www/ungoogled-chromium/files/patch-components_viz_service_display__embedder_skia__output__device__buffer__queue.cc +++ b/www/ungoogled-chromium/files/patch-components_viz_service_display__embedder_skia__output__device__buffer__queue.cc @@ -1,6 +1,6 @@ ---- components/viz/service/display_embedder/skia_output_device_buffer_queue.cc.orig 2024-07-31 14:19:23 UTC +--- components/viz/service/display_embedder/skia_output_device_buffer_queue.cc.orig 2024-08-26 14:40:28 UTC +++ components/viz/service/display_embedder/skia_output_device_buffer_queue.cc -@@ -174,7 +174,7 @@ SkiaOutputDeviceBufferQueue::SkiaOutputDeviceBufferQue +@@ -175,7 +175,7 @@ SkiaOutputDeviceBufferQueue::SkiaOutputDeviceBufferQue capabilities_.only_invalidates_damage_rect = false; capabilities_.number_of_buffers = 3; diff --git a/www/ungoogled-chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc b/www/ungoogled-chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc index e6fbfec905a4..f32bc00f5619 100644 --- a/www/ungoogled-chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc +++ b/www/ungoogled-chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc @@ -1,6 +1,6 @@ ---- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2024-07-31 14:19:23 UTC +--- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2024-08-26 14:40:28 UTC +++ components/viz/service/display_embedder/skia_output_surface_impl.cc -@@ -1546,7 +1546,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor +@@ -1663,7 +1663,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor ->GetVulkanPhysicalDevice(), VK_IMAGE_TILING_OPTIMAL, vk_format, si_format, yuv_color_space, ycbcr_info); diff --git a/www/ungoogled-chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc b/www/ungoogled-chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc index f567bde9a669..aaed7f800b5e 100644 --- a/www/ungoogled-chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc +++ b/www/ungoogled-chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc @@ -1,6 +1,6 @@ ---- components/viz/service/display_embedder/software_output_surface.cc.orig 2024-06-22 08:49:42 UTC +--- components/viz/service/display_embedder/software_output_surface.cc.orig 2024-08-26 14:40:28 UTC +++ components/viz/service/display_embedder/software_output_surface.cc -@@ -124,7 +124,7 @@ void SoftwareOutputSurface::SwapBuffersCallback(base:: +@@ -119,7 +119,7 @@ void SoftwareOutputSurface::SwapBuffersCallback(base:: now.SnappedToNextTick(refresh_timebase_, refresh_interval_) - now; // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ if (needs_swap_size_notifications_) client_->DidSwapWithSize(pixel_size); #endif -@@ -153,7 +153,7 @@ gfx::OverlayTransform SoftwareOutputSurface::GetDispla +@@ -148,7 +148,7 @@ gfx::OverlayTransform SoftwareOutputSurface::GetDispla // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/files/patch-components_viz_service_display__embedder_software__output__surface.h b/www/ungoogled-chromium/files/patch-components_viz_service_display__embedder_software__output__surface.h index a1ce891568ce..3d1ab4cb1c4c 100644 --- a/www/ungoogled-chromium/files/patch-components_viz_service_display__embedder_software__output__surface.h +++ b/www/ungoogled-chromium/files/patch-components_viz_service_display__embedder_software__output__surface.h @@ -1,6 +1,6 @@ ---- components/viz/service/display_embedder/software_output_surface.h.orig 2024-06-22 08:49:42 UTC +--- components/viz/service/display_embedder/software_output_surface.h.orig 2024-08-26 14:40:28 UTC +++ components/viz/service/display_embedder/software_output_surface.h -@@ -47,7 +47,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi +@@ -45,7 +45,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi gfx::OverlayTransform GetDisplayTransform() override; // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ void SetNeedsSwapSizeNotifications( bool needs_swap_size_notifications) override; #endif -@@ -70,7 +70,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi +@@ -65,7 +65,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/files/patch-components_viz_service_display_skia__renderer.cc b/www/ungoogled-chromium/files/patch-components_viz_service_display_skia__renderer.cc index 2c4723580b3c..a6ce9c601a7a 100644 --- a/www/ungoogled-chromium/files/patch-components_viz_service_display_skia__renderer.cc +++ b/www/ungoogled-chromium/files/patch-components_viz_service_display_skia__renderer.cc @@ -1,6 +1,6 @@ ---- components/viz/service/display/skia_renderer.cc.orig 2024-07-31 14:19:23 UTC +--- components/viz/service/display/skia_renderer.cc.orig 2024-08-26 14:40:28 UTC +++ components/viz/service/display/skia_renderer.cc -@@ -1422,7 +1422,7 @@ void SkiaRenderer::ClearFramebuffer() { +@@ -1441,7 +1441,7 @@ void SkiaRenderer::ClearFramebuffer() { if (current_frame()->current_render_pass->has_transparent_background) { ClearCanvas(SkColors::kTransparent); } else { diff --git a/www/ungoogled-chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc b/www/ungoogled-chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc index d7c8eca86da6..8c95bbd7d0b7 100644 --- a/www/ungoogled-chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc +++ b/www/ungoogled-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-06-22 08:49:42 UTC +--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2024-08-26 14:40:28 UTC +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc @@ -111,7 +111,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); -@@ -656,7 +656,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw +@@ -673,7 +673,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw if (display_client_ && enable_swap_completion_callback_) { display_client_->DidCompleteSwapWithSize(pixel_size); } diff --git a/www/ungoogled-chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h b/www/ungoogled-chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h index 6805e78bfa84..0852388b54c1 100644 --- a/www/ungoogled-chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h +++ b/www/ungoogled-chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h @@ -1,6 +1,6 @@ ---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig 2024-04-23 07:42:17 UTC +--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig 2024-08-26 14:40:28 UTC +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h -@@ -209,7 +209,7 @@ class VIZ_SERVICE_EXPORT RootCompositorFrameSinkImpl +@@ -214,7 +214,7 @@ class VIZ_SERVICE_EXPORT RootCompositorFrameSinkImpl // See comments on `EvictionHandler`. EvictionHandler eviction_handler_; diff --git a/www/ungoogled-chromium/files/patch-components_webapps_browser_features.cc b/www/ungoogled-chromium/files/patch-components_webapps_browser_features.cc new file mode 100644 index 000000000000..4dbe6e47276a --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_webapps_browser_features.cc @@ -0,0 +1,11 @@ +--- components/webapps/browser/features.cc.orig 2024-08-26 14:40:28 UTC ++++ components/webapps/browser/features.cc +@@ -59,7 +59,7 @@ extern const base::FeatureParam<int> kBannerParamsDays + BASE_FEATURE(kWebAppsEnableMLModelForPromotion, + "WebAppsEnableMLModelForPromotion", + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + base::FEATURE_ENABLED_BY_DEFAULT); + #else + base::FEATURE_DISABLED_BY_DEFAULT); diff --git a/www/ungoogled-chromium/files/patch-content_app_content__main.cc b/www/ungoogled-chromium/files/patch-content_app_content__main.cc index 59cb94318a53..c41137fda771 100644 --- a/www/ungoogled-chromium/files/patch-content_app_content__main.cc +++ b/www/ungoogled-chromium/files/patch-content_app_content__main.cc @@ -1,11 +1,20 @@ ---- content/app/content_main.cc.orig 2024-05-23 20:04:36 UTC +--- content/app/content_main.cc.orig 2024-08-26 14:40:28 UTC +++ content/app/content_main.cc -@@ -206,7 +206,7 @@ RunContentProcess(ContentMainParams params, - #endif +@@ -207,7 +207,7 @@ RunContentProcess(ContentMainParams params, base::EnableTerminationOnOutOfMemory(); + logging::RegisterAbslAbortHook(); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // The various desktop environments set this environment variable that // allows the dbus client library to connect directly to the bus. When this // variable is not set (test environments like xvfb-run), the dbus client +@@ -293,7 +293,7 @@ RunContentProcess(ContentMainParams params, + command_line->AppendSwitch(switches::kUseMobileUserAgent); + #endif + +-#if (BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)) && !defined(COMPONENT_BUILD) ++#if (BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)) && !defined(COMPONENT_BUILD) && defined(notyet) + base::subtle::EnableFDOwnershipEnforcement(true); + #endif + diff --git a/www/ungoogled-chromium/files/patch-content_app_content__main__runner__impl.cc b/www/ungoogled-chromium/files/patch-content_app_content__main__runner__impl.cc index b73b4a2cd02c..c84d083504d3 100644 --- a/www/ungoogled-chromium/files/patch-content_app_content__main__runner__impl.cc +++ b/www/ungoogled-chromium/files/patch-content_app_content__main__runner__impl.cc @@ -1,4 +1,4 @@ ---- content/app/content_main_runner_impl.cc.orig 2024-07-31 14:19:23 UTC +--- content/app/content_main_runner_impl.cc.orig 2024-08-26 14:40:28 UTC +++ content/app/content_main_runner_impl.cc @@ -149,18 +149,20 @@ #include "content/browser/posix_file_descriptor_info_impl.h" @@ -34,7 +34,7 @@ #if BUILDFLAG(IS_ANDROID) #include "base/system/sys_info.h" #include "content/browser/android/battery_metrics.h" -@@ -389,7 +395,7 @@ void InitializeZygoteSandboxForBrowserProcess( +@@ -403,7 +409,7 @@ void InitializeZygoteSandboxForBrowserProcess( } #endif // BUILDFLAG(USE_ZYGOTE) @@ -43,7 +43,7 @@ #if BUILDFLAG(ENABLE_PPAPI) // Loads the (native) libraries but does not initialize them (i.e., does not -@@ -427,7 +433,10 @@ void PreloadLibraryCdms() { +@@ -441,7 +447,10 @@ void PreloadLibraryCdms() { void PreSandboxInit() { // Ensure the /dev/urandom is opened. @@ -54,7 +54,7 @@ // May use sysinfo(), sched_getaffinity(), and open various /sys/ and /proc/ // files. -@@ -439,9 +448,16 @@ void PreSandboxInit() { +@@ -453,9 +462,16 @@ void PreSandboxInit() { // https://boringssl.9oo91esource.qjz9zk/boringssl/+/HEAD/SANDBOXING.md CRYPTO_pre_sandbox_init(); @@ -71,7 +71,7 @@ #if BUILDFLAG(ENABLE_PPAPI) // Ensure access to the Pepper plugins before the sandbox is turned on. -@@ -889,11 +905,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -877,11 +893,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam base::GlobalDescriptors::kBaseDescriptor); #endif // !BUILDFLAG(IS_ANDROID) @@ -85,7 +85,7 @@ #endif // !BUILDFLAG(IS_WIN) -@@ -1041,8 +1056,20 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -1058,8 +1073,20 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam process_type == switches::kZygoteProcess) { PreSandboxInit(); } @@ -106,7 +106,7 @@ delegate_->SandboxInitialized(process_type); #if BUILDFLAG(USE_ZYGOTE) -@@ -1114,7 +1141,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { +@@ -1133,7 +1160,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { ->ReconfigureAfterFeatureListInit(process_type); } @@ -115,7 +115,7 @@ // If dynamic Mojo Core is being used, ensure that it's loaded very early in // the child/zygote process, before any sandbox is initialized. The library // is not fully initialized with IPC support until a ChildProcess is later -@@ -1149,6 +1176,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { +@@ -1168,6 +1195,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { content_main_params_.reset(); RegisterMainThreadFactories(); diff --git a/www/ungoogled-chromium/files/patch-content_browser_BUILD.gn b/www/ungoogled-chromium/files/patch-content_browser_BUILD.gn index 4162a44004c2..d12c1c776872 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-content_browser_BUILD.gn @@ -1,6 +1,6 @@ ---- content/browser/BUILD.gn.orig 2024-07-31 14:19:23 UTC +--- content/browser/BUILD.gn.orig 2024-08-26 14:40:28 UTC +++ content/browser/BUILD.gn -@@ -2377,6 +2377,14 @@ source_set("browser") { +@@ -2398,6 +2398,14 @@ source_set("browser") { ] } @@ -15,7 +15,7 @@ if (is_linux || is_chromeos) { sources += [ "child_process_launcher_helper_linux.cc", -@@ -2413,6 +2421,15 @@ source_set("browser") { +@@ -2438,6 +2446,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/ungoogled-chromium/files/patch-content_browser_browser__child__process__host__impl.cc b/www/ungoogled-chromium/files/patch-content_browser_browser__child__process__host__impl.cc index 4147a88c26a6..909990229788 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_browser__child__process__host__impl.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_browser__child__process__host__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/browser_child_process_host_impl.cc.orig 2024-06-22 08:49:42 UTC +--- content/browser/browser_child_process_host_impl.cc.orig 2024-08-26 14:40:28 UTC +++ content/browser/browser_child_process_host_impl.cc -@@ -330,6 +330,7 @@ void BrowserChildProcessHostImpl::LaunchWithoutExtraCo +@@ -324,6 +324,7 @@ void BrowserChildProcessHostImpl::LaunchWithoutExtraCo switches::kMojoCoreLibraryPath, switches::kPerfettoDisableInterning, switches::kTraceToConsole, @@ -8,7 +8,7 @@ }; cmd_line->CopySwitchesFrom(browser_command_line, kForwardSwitches); -@@ -658,7 +659,7 @@ void BrowserChildProcessHostImpl::OnProcessLaunched() +@@ -655,7 +656,7 @@ void BrowserChildProcessHostImpl::OnProcessLaunched() ->child_process()); #endif diff --git a/www/ungoogled-chromium/files/patch-content_browser_browser__child__process__host__impl.h b/www/ungoogled-chromium/files/patch-content_browser_browser__child__process__host__impl.h index 382b148e5aa1..30d6e1b9c058 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_browser__child__process__host__impl.h +++ b/www/ungoogled-chromium/files/patch-content_browser_browser__child__process__host__impl.h @@ -1,4 +1,4 @@ ---- content/browser/browser_child_process_host_impl.h.orig 2024-05-23 20:04:36 UTC +--- content/browser/browser_child_process_host_impl.h.orig 2024-08-26 14:40:28 UTC +++ content/browser/browser_child_process_host_impl.h @@ -35,7 +35,7 @@ #include "base/win/object_watcher.h" @@ -9,7 +9,7 @@ #include "content/browser/child_thread_type_switcher_linux.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -273,7 +273,7 @@ class BrowserChildProcessHostImpl +@@ -269,7 +269,7 @@ class BrowserChildProcessHostImpl std::unique_ptr<tracing::SystemTracingService> system_tracing_service_; #endif diff --git a/www/ungoogled-chromium/files/patch-content_browser_browser__main__loop.cc b/www/ungoogled-chromium/files/patch-content_browser_browser__main__loop.cc index 285635059e15..15eb5cefccf8 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_browser__main__loop.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_browser__main__loop.cc @@ -1,6 +1,6 @@ ---- content/browser/browser_main_loop.cc.orig 2024-07-31 14:19:23 UTC +--- content/browser/browser_main_loop.cc.orig 2024-08-26 14:40:28 UTC +++ content/browser/browser_main_loop.cc -@@ -251,6 +251,12 @@ +@@ -254,6 +254,12 @@ #include "mojo/public/cpp/bindings/lib/test_random_mojo_delays.h" #endif @@ -13,7 +13,7 @@ // One of the linux specific headers defines this as a macro. #ifdef DestroyAll #undef DestroyAll -@@ -546,6 +552,12 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -549,6 +555,12 @@ int BrowserMainLoop::EarlyInitialization() { // by now since a thread to start the ServiceManager has been created // before the browser main loop starts. DCHECK(SandboxHostLinux::GetInstance()->IsInitialized()); @@ -26,7 +26,7 @@ #endif // GLib's spawning of new processes is buggy, so it's important that at this -@@ -583,7 +595,7 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -586,7 +598,7 @@ int BrowserMainLoop::EarlyInitialization() { base::PlatformThread::SetCurrentThreadType(base::ThreadType::kCompositing); #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/ungoogled-chromium/files/patch-content_browser_child__process__launcher__helper.h b/www/ungoogled-chromium/files/patch-content_browser_child__process__launcher__helper.h index 2e3f3e233ca8..264bcf16a04b 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_child__process__launcher__helper.h +++ b/www/ungoogled-chromium/files/patch-content_browser_child__process__launcher__helper.h @@ -1,6 +1,6 @@ ---- content/browser/child_process_launcher_helper.h.orig 2024-06-22 08:49:42 UTC +--- content/browser/child_process_launcher_helper.h.orig 2024-08-26 14:40:28 UTC +++ content/browser/child_process_launcher_helper.h -@@ -297,7 +297,7 @@ class ChildProcessLauncherHelper +@@ -299,7 +299,7 @@ class ChildProcessLauncherHelper std::optional<base::ProcessId> process_id_ = std::nullopt; #endif // BUILDFLAG(IS_CHROMEOS) diff --git a/www/ungoogled-chromium/files/patch-content_browser_gpu_compositor__util.cc b/www/ungoogled-chromium/files/patch-content_browser_gpu_compositor__util.cc index d439e686e70e..0645c3ca4b51 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_gpu_compositor__util.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_gpu_compositor__util.cc @@ -1,6 +1,6 @@ ---- content/browser/gpu/compositor_util.cc.orig 2024-07-31 14:19:23 UTC +--- content/browser/gpu/compositor_util.cc.orig 2024-08-26 14:40:28 UTC +++ content/browser/gpu/compositor_util.cc -@@ -154,7 +154,7 @@ std::vector<GpuFeatureData> GetGpuFeatureData( +@@ -153,7 +153,7 @@ std::vector<GpuFeatureData> GetGpuFeatureData( "video_decode", SafeGetFeatureStatus( gpu_feature_info, gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE, @@ -9,7 +9,7 @@ !base::FeatureList::IsEnabled(media::kVaapiVideoDecodeLinux) || #endif // BUILDFLAG(IS_LINUX) command_line.HasSwitch(switches::kDisableAcceleratedVideoDecode)), -@@ -166,7 +166,7 @@ std::vector<GpuFeatureData> GetGpuFeatureData( +@@ -165,7 +165,7 @@ std::vector<GpuFeatureData> GetGpuFeatureData( "video_encode", SafeGetFeatureStatus( gpu_feature_info, gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_ENCODE, diff --git a/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl.cc b/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl.cc index 74980ef0639d..5da1a9643438 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/gpu/gpu_data_manager_impl.cc.orig 2024-06-22 08:49:42 UTC +--- content/browser/gpu/gpu_data_manager_impl.cc.orig 2024-08-26 14:40:28 UTC +++ content/browser/gpu/gpu_data_manager_impl.cc -@@ -397,7 +397,7 @@ void GpuDataManagerImpl::OnDisplayMetricsChanged( +@@ -402,7 +402,7 @@ void GpuDataManagerImpl::OnDisplayMetricsChanged( private_->OnDisplayMetricsChanged(display, changed_metrics); } diff --git a/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl.h b/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl.h index 3b95d414a8aa..e7ffbeb7b39e 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl.h +++ b/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl.h @@ -1,6 +1,6 @@ ---- content/browser/gpu/gpu_data_manager_impl.h.orig 2024-05-23 20:04:36 UTC +--- content/browser/gpu/gpu_data_manager_impl.h.orig 2024-08-26 14:40:28 UTC +++ content/browser/gpu/gpu_data_manager_impl.h -@@ -219,7 +219,7 @@ class CONTENT_EXPORT GpuDataManagerImpl : public GpuDa +@@ -220,7 +220,7 @@ class CONTENT_EXPORT GpuDataManagerImpl : public GpuDa void OnDisplayMetricsChanged(const display::Display& display, uint32_t changed_metrics) override; diff --git a/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc b/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc index 1e5aa4c35c9f..f1b7f9682c33 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc +++ b/www/ungoogled-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-07-31 14:19:23 UTC +--- content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2024-08-26 14:40:28 UTC +++ content/browser/gpu/gpu_data_manager_impl_private.cc -@@ -1697,7 +1697,7 @@ void GpuDataManagerImplPrivate::RecordCompositingMode( +@@ -1685,7 +1685,7 @@ void GpuDataManagerImplPrivate::RecordCompositingMode( UMA_HISTOGRAM_ENUMERATION("GPU.CompositingMode", compositing_mode); } diff --git a/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h b/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h index b0540daac5df..16cf0f26b644 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h +++ b/www/ungoogled-chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h @@ -1,6 +1,6 @@ ---- content/browser/gpu/gpu_data_manager_impl_private.h.orig 2024-05-23 20:04:36 UTC +--- content/browser/gpu/gpu_data_manager_impl_private.h.orig 2024-08-26 14:40:28 UTC +++ content/browser/gpu/gpu_data_manager_impl_private.h -@@ -150,7 +150,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate { +@@ -147,7 +147,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate { void OnDisplayMetricsChanged(const display::Display& display, uint32_t changed_metrics); @@ -9,7 +9,7 @@ bool IsGpuMemoryBufferNV12Supported(); void SetGpuMemoryBufferNV12Supported(bool supported); #endif // BUILDFLAG(IS_LINUX) -@@ -302,7 +302,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate { +@@ -303,7 +303,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate { bool application_is_visible_ = true; bool disable_gpu_compositing_ = false; diff --git a/www/ungoogled-chromium/files/patch-content_browser_network__service__instance__impl.cc b/www/ungoogled-chromium/files/patch-content_browser_network__service__instance__impl.cc index 942bed869368..aba9bcc20f3b 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_network__service__instance__impl.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_network__service__instance__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/network_service_instance_impl.cc.orig 2024-05-23 20:04:36 UTC +--- content/browser/network_service_instance_impl.cc.orig 2024-08-26 14:40:28 UTC +++ content/browser/network_service_instance_impl.cc -@@ -82,7 +82,7 @@ +@@ -85,7 +85,7 @@ #include "content/browser/network/network_service_process_tracker_win.h" #endif @@ -9,7 +9,7 @@ #include "content/browser/system_dns_resolution/system_dns_resolver.h" #include "services/network/public/mojom/system_dns_resolution.mojom-forward.h" #endif -@@ -360,7 +360,7 @@ void CreateInProcessNetworkService( +@@ -363,7 +363,7 @@ void CreateInProcessNetworkService( std::move(receiver))); } @@ -18,7 +18,7 @@ // Runs a self-owned SystemDnsResolverMojoImpl. This is meant to run on a // high-priority thread pool. void RunSystemDnsResolverOnThreadPool( -@@ -429,7 +429,7 @@ network::mojom::NetworkServiceParamsPtr CreateNetworkS +@@ -432,7 +432,7 @@ network::mojom::NetworkServiceParamsPtr CreateNetworkS } #endif // BUILDFLAG(IS_POSIX) diff --git a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc index c97ba4dca37c..9b1dacc22a33 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_process_host_impl.cc.orig 2024-07-31 14:19:23 UTC +--- content/browser/renderer_host/render_process_host_impl.cc.orig 2024-08-26 14:40:28 UTC +++ content/browser/renderer_host/render_process_host_impl.cc -@@ -225,7 +225,7 @@ +@@ -219,7 +219,7 @@ #include "third_party/blink/public/mojom/android_font_lookup/android_font_lookup.mojom.h" #endif @@ -9,7 +9,7 @@ #include <sys/resource.h> #include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck -@@ -966,7 +966,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = +@@ -949,7 +949,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = // to indicate failure and std::numeric_limits<size_t>::max() to indicate // unlimited. size_t GetPlatformProcessLimit() { @@ -18,34 +18,16 @@ struct rlimit limit; if (getrlimit(RLIMIT_NPROC, &limit) != 0) return kUnknownPlatformProcessLimit; -@@ -1152,7 +1152,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public - IOThreadHostImpl& operator=(const IOThreadHostImpl& other) = delete; +@@ -1122,7 +1122,7 @@ RenderProcessHostImpl::IOThreadHostImpl::~IOThreadHost - void SetPid(base::ProcessId child_pid) { + 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); + child_thread_type_switcher_.SetPid(child_pid); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) - } -@@ -1173,7 +1173,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public - return; - } - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) { - ConnectToFontService(std::move(font_receiver)); - return; -@@ -1267,7 +1267,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public - std::unique_ptr<service_manager::BinderRegistry> binders_; - mojo::Receiver<mojom::ChildProcessHost> receiver_{this}; - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - mojo::Remote<media::mojom::VideoEncodeAcceleratorProviderFactory> - video_encode_accelerator_factory_remote_; - ChildThreadTypeSwitcher child_thread_type_switcher_; -@@ -3430,7 +3430,7 @@ void RenderProcessHostImpl::AppendRendererCommandLine( + } +@@ -3132,7 +3132,7 @@ void RenderProcessHostImpl::AppendRendererCommandLine( base::TimeTicks::UnixEpoch().since_origin().InMicroseconds())); } @@ -54,7 +36,7 @@ // Append `kDisableVideoCaptureUseGpuMemoryBuffer` flag if there is no support // for NV12 GPU memory buffer. if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled() && -@@ -3488,6 +3488,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin +@@ -3189,6 +3189,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin switches::kDisableSpeechAPI, switches::kDisableThreadedCompositing, switches::kDisableTouchDragDrop, diff --git a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h index 0029cf5ebd75..d4afc0e58bba 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h +++ b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h @@ -1,6 +1,15 @@ ---- content/browser/renderer_host/render_process_host_impl.h.orig 2024-07-31 14:19:23 UTC +--- content/browser/renderer_host/render_process_host_impl.h.orig 2024-08-26 14:40:28 UTC +++ content/browser/renderer_host/render_process_host_impl.h -@@ -594,7 +594,7 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -102,7 +102,7 @@ + #include "media/fuchsia_media_codec_provider_impl.h" + #endif + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include "content/browser/child_thread_type_switcher_linux.h" + #include "media/mojo/mojom/video_encode_accelerator.mojom.h" + #endif +@@ -602,7 +602,7 @@ class CONTENT_EXPORT RenderProcessHostImpl // Sets this RenderProcessHost to be guest only. For Testing only. void SetForGuestsOnlyForTesting(); @@ -9,3 +18,12 @@ // Launch the zygote early in the browser startup. static void EarlyZygoteLaunch(); #endif // BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_MAC) +@@ -967,7 +967,7 @@ class CONTENT_EXPORT RenderProcessHostImpl + std::unique_ptr<service_manager::BinderRegistry> binders_; + mojo::Receiver<mojom::ChildProcessHost> receiver_{this}; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + mojo::Remote<media::mojom::VideoEncodeAcceleratorProviderFactory> + video_encode_accelerator_factory_remote_; + ChildThreadTypeSwitcher child_thread_type_switcher_; diff --git a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl__receiver__bindings.cc b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl__receiver__bindings.cc new file mode 100644 index 000000000000..271abe553252 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl__receiver__bindings.cc @@ -0,0 +1,20 @@ +--- content/browser/renderer_host/render_process_host_impl_receiver_bindings.cc.orig 2024-08-26 14:40:28 UTC ++++ content/browser/renderer_host/render_process_host_impl_receiver_bindings.cc +@@ -52,7 +52,7 @@ + #include "third_party/blink/public/mojom/webdatabase/web_database.mojom.h" + #endif + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck + #include "content/browser/font_service.h" // nogncheck + #include "content/browser/media/video_encode_accelerator_provider_launcher.h" +@@ -341,7 +341,7 @@ void RenderProcessHostImpl::IOThreadHostImpl::BindHost + } + #endif + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) { + ConnectToFontService(std::move(font_receiver)); + return; diff --git a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc index 4009673604f4..978d7566fe09 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc +++ b/www/ungoogled-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-07-31 14:19:23 UTC +--- content/browser/renderer_host/render_view_host_impl.cc.orig 2024-08-26 14:40:28 UTC +++ content/browser/renderer_host/render_view_host_impl.cc -@@ -273,7 +273,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/ungoogled-chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc index 38e6fff925ea..95d7714c377c 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc @@ -1,4 +1,4 @@ ---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2024-08-16 07:52:02 UTC +--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2024-08-26 14:40:28 UTC +++ content/browser/renderer_host/render_widget_host_view_aura.cc @@ -120,7 +120,7 @@ #include "ui/gfx/gdi_util.h" @@ -9,7 +9,7 @@ #include "content/browser/accessibility/browser_accessibility_auralinux.h" #include "ui/base/ime/linux/text_edit_command_auralinux.h" #include "ui/base/ime/text_input_flags.h" -@@ -469,7 +469,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge +@@ -479,7 +479,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge return ToBrowserAccessibilityWin(manager->GetBrowserAccessibilityRoot()) ->GetCOM(); @@ -18,7 +18,7 @@ BrowserAccessibilityManager* manager = host()->GetOrCreateRootBrowserAccessibilityManager(); if (manager && manager->GetBrowserAccessibilityRoot()) -@@ -1731,7 +1731,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() { +@@ -1733,7 +1733,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() { return host() && host()->delegate() && host()->delegate()->ShouldDoLearning(); } @@ -27,7 +27,7 @@ bool RenderWidgetHostViewAura::SetCompositionFromExistingText( const gfx::Range& range, const std::vector<ui::ImeTextSpan>& ui_ime_text_spans) { -@@ -2559,7 +2559,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { +@@ -2561,7 +2561,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { } bool RenderWidgetHostViewAura::NeedsMouseCapture() { @@ -36,7 +36,7 @@ return NeedsInputGrab(); #else return false; -@@ -2743,7 +2743,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit +@@ -2745,7 +2745,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit if (!target_host) return; diff --git a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h index 3930862e1f3a..8da7852efcf4 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h +++ b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_widget_host_view_aura.h.orig 2024-08-16 07:52:02 UTC +--- content/browser/renderer_host/render_widget_host_view_aura.h.orig 2024-08-26 14:40:28 UTC +++ content/browser/renderer_host/render_widget_host_view_aura.h -@@ -261,7 +261,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura +@@ -260,7 +260,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura ukm::SourceId GetClientSourceForMetrics() const override; bool ShouldDoLearning() override; diff --git a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc index 60456b32342f..5922176c8e1e 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc @@ -1,7 +1,7 @@ ---- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig 2024-06-22 08:49:42 UTC +--- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig 2024-08-26 14:40:28 UTC +++ content/browser/renderer_host/render_widget_host_view_event_handler.cc -@@ -596,7 +596,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand - if (event->type() == ui::ET_MOUSE_EXITED) { +@@ -602,7 +602,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand + if (event->type() == ui::EventType::kMouseExited) { if (mouse_locked || selection_popup) return false; -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/ungoogled-chromium/files/patch-content_browser_utility__process__host.cc b/www/ungoogled-chromium/files/patch-content_browser_utility__process__host.cc index f7f3cee40a90..2645d37c8ebe 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_utility__process__host.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_utility__process__host.cc @@ -1,4 +1,4 @@ ---- content/browser/utility_process_host.cc.orig 2024-07-31 14:19:23 UTC +--- content/browser/utility_process_host.cc.orig 2024-08-26 14:40:28 UTC +++ content/browser/utility_process_host.cc @@ -61,7 +61,7 @@ #include "content/browser/v8_snapshot_files.h" @@ -45,7 +45,7 @@ allowed_gpu_ = true; #endif } -@@ -408,7 +408,7 @@ bool UtilityProcessHost::StartProcess() { +@@ -407,7 +407,7 @@ bool UtilityProcessHost::StartProcess() { file_data_->files_to_preload.merge(GetV8SnapshotFilesToPreload(*cmd_line)); #endif // BUILDFLAG(IS_POSIX) @@ -54,7 +54,7 @@ // The network service should have access to the parent directories // necessary for its usage. if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork) { -@@ -419,13 +419,13 @@ bool UtilityProcessHost::StartProcess() { +@@ -418,13 +418,13 @@ bool UtilityProcessHost::StartProcess() { } #endif // BUILDFLAG(IS_LINUX) diff --git a/www/ungoogled-chromium/files/patch-content_browser_utility__sandbox__delegate.cc b/www/ungoogled-chromium/files/patch-content_browser_utility__sandbox__delegate.cc index 7a52662c6c63..593310164630 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_utility__sandbox__delegate.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_utility__sandbox__delegate.cc @@ -1,6 +1,6 @@ ---- content/browser/utility_sandbox_delegate.cc.orig 2024-07-31 14:19:23 UTC +--- content/browser/utility_sandbox_delegate.cc.orig 2024-08-26 14:40:28 UTC +++ content/browser/utility_sandbox_delegate.cc -@@ -67,10 +67,10 @@ UtilitySandboxedProcessLauncherDelegate:: +@@ -76,10 +76,10 @@ UtilitySandboxedProcessLauncherDelegate:: #if BUILDFLAG(IS_FUCHSIA) sandbox_type_ == sandbox::mojom::Sandbox::kVideoCapture || #endif @@ -13,7 +13,7 @@ sandbox_type_ == sandbox::mojom::Sandbox::kHardwareVideoEncoding || #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -127,10 +127,10 @@ ZygoteCommunication* UtilitySandboxedProcessLauncherDe +@@ -136,10 +136,10 @@ ZygoteCommunication* UtilitySandboxedProcessLauncherDe // process upon startup. if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork || sandbox_type_ == sandbox::mojom::Sandbox::kOnDeviceModelExecution || diff --git a/www/ungoogled-chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc b/www/ungoogled-chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc index 013af0e77451..aa23ddf939d7 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc +++ b/www/ungoogled-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-06-22 08:49:42 UTC +--- content/browser/web_contents/web_contents_view_aura.cc.orig 2024-08-26 14:40:28 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. -@@ -1333,7 +1333,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent* +@@ -1319,7 +1319,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/ungoogled-chromium/files/patch-content_common_BUILD.gn b/www/ungoogled-chromium/files/patch-content_common_BUILD.gn index 21097a9806bf..f681cb996915 100644 --- a/www/ungoogled-chromium/files/patch-content_common_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-content_common_BUILD.gn @@ -1,6 +1,6 @@ ---- content/common/BUILD.gn.orig 2024-07-31 14:19:23 UTC +--- content/common/BUILD.gn.orig 2024-08-26 14:40:28 UTC +++ content/common/BUILD.gn -@@ -421,19 +421,28 @@ source_set("common") { +@@ -388,19 +388,28 @@ source_set("common") { } if (is_linux || is_chromeos) { diff --git a/www/ungoogled-chromium/files/patch-content_common_features.cc b/www/ungoogled-chromium/files/patch-content_common_features.cc index 1d52f51b15e1..073526da9f24 100644 --- a/www/ungoogled-chromium/files/patch-content_common_features.cc +++ b/www/ungoogled-chromium/files/patch-content_common_features.cc @@ -1,6 +1,6 @@ ---- content/common/features.cc.orig 2024-07-31 14:19:23 UTC +--- content/common/features.cc.orig 2024-08-26 14:40:28 UTC +++ content/common/features.cc -@@ -173,7 +173,7 @@ BASE_FEATURE(kEnableBackForwardCacheForOngoingSubframe +@@ -158,7 +158,7 @@ BASE_FEATURE(kEnableBackForwardCacheForOngoingSubframe base::FEATURE_ENABLED_BY_DEFAULT); // Enables error reporting for JS errors inside DevTools frontend host @@ -9,7 +9,7 @@ BASE_FEATURE(kEnableDevToolsJsErrorReporting, "EnableDevToolsJsErrorReporting", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -294,7 +294,7 @@ BASE_FEATURE(kGroupNIKByJoiningOrigin, +@@ -308,7 +308,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/ungoogled-chromium/files/patch-content_common_features.h b/www/ungoogled-chromium/files/patch-content_common_features.h index a2ffcdd4293a..7c6c32bc22d6 100644 --- a/www/ungoogled-chromium/files/patch-content_common_features.h +++ b/www/ungoogled-chromium/files/patch-content_common_features.h @@ -1,6 +1,6 @@ ---- content/common/features.h.orig 2024-07-31 14:19:23 UTC +--- content/common/features.h.orig 2024-08-26 14:40:28 UTC +++ content/common/features.h -@@ -37,7 +37,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kDocumentPolicyNeg +@@ -35,7 +35,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kDocumentPolicyNeg CONTENT_EXPORT BASE_DECLARE_FEATURE(kEnableBackForwardCacheForScreenReader); CONTENT_EXPORT BASE_DECLARE_FEATURE( kEnableBackForwardCacheForOngoingSubframeNavigation); @@ -9,7 +9,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kEnableDevToolsJsErrorReporting); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) CONTENT_EXPORT BASE_DECLARE_FEATURE(kEmbeddingRequiresOptIn); -@@ -71,7 +71,7 @@ CONTENT_EXPORT extern const base::FeatureParam<int> +@@ -76,7 +76,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/ungoogled-chromium/files/patch-content_gpu_gpu__main.cc b/www/ungoogled-chromium/files/patch-content_gpu_gpu__main.cc index c60181f25ab2..d29779072d8f 100644 --- a/www/ungoogled-chromium/files/patch-content_gpu_gpu__main.cc +++ b/www/ungoogled-chromium/files/patch-content_gpu_gpu__main.cc @@ -1,4 +1,4 @@ ---- content/gpu/gpu_main.cc.orig 2024-07-31 14:19:23 UTC +--- content/gpu/gpu_main.cc.orig 2024-08-26 14:40:28 UTC +++ content/gpu/gpu_main.cc @@ -94,10 +94,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_); -@@ -283,7 +287,7 @@ int GpuMain(MainFunctionParams parameters) { +@@ -284,7 +288,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 -@@ -305,7 +309,8 @@ int GpuMain(MainFunctionParams parameters) { +@@ -306,7 +310,8 @@ int GpuMain(MainFunctionParams parameters) { base::PlatformThread::SetName("CrGpuMain"); @@ -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. -@@ -435,7 +440,7 @@ int GpuMain(MainFunctionParams parameters) { +@@ -436,7 +441,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) { -@@ -475,7 +480,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo +@@ -476,7 +481,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo sandbox_options.accelerated_video_encode_enabled = !gpu_prefs.disable_accelerated_video_encode; diff --git a/www/ungoogled-chromium/files/patch-content_public_browser_content__browser__client.cc b/www/ungoogled-chromium/files/patch-content_public_browser_content__browser__client.cc index 3e0f587a484a..e706d232e038 100644 --- a/www/ungoogled-chromium/files/patch-content_public_browser_content__browser__client.cc +++ b/www/ungoogled-chromium/files/patch-content_public_browser_content__browser__client.cc @@ -1,6 +1,6 @@ ---- content/public/browser/content_browser_client.cc.orig 2024-07-31 14:19:23 UTC +--- content/public/browser/content_browser_client.cc.orig 2024-08-26 14:40:28 UTC +++ content/public/browser/content_browser_client.cc -@@ -1307,7 +1307,7 @@ bool ContentBrowserClient::ShouldRunOutOfProcessSystem +@@ -1325,7 +1325,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/ungoogled-chromium/files/patch-content_public_common_content__features.cc b/www/ungoogled-chromium/files/patch-content_public_common_content__features.cc index 953c3a3d0820..c8a3aca586a7 100644 --- a/www/ungoogled-chromium/files/patch-content_public_common_content__features.cc +++ b/www/ungoogled-chromium/files/patch-content_public_common_content__features.cc @@ -1,4 +1,4 @@ ---- content/public/common/content_features.cc.orig 2024-07-31 14:19:23 UTC +--- content/public/common/content_features.cc.orig 2024-08-26 14:40:28 UTC +++ content/public/common/content_features.cc @@ -36,7 +36,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 -@@ -1090,9 +1090,9 @@ BASE_FEATURE(kWebAssemblyTiering, +@@ -1128,9 +1128,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 -@@ -1129,7 +1129,11 @@ BASE_FEATURE(kWebUICodeCache, +@@ -1167,7 +1167,11 @@ BASE_FEATURE(kWebUICodeCache, // Controls whether the WebUSB API is enabled: // https://wicg.github.io/webusb diff --git a/www/ungoogled-chromium/files/patch-content_public_common_content__switches.cc b/www/ungoogled-chromium/files/patch-content_public_common_content__switches.cc index 025e5880ce03..2a26119da828 100644 --- a/www/ungoogled-chromium/files/patch-content_public_common_content__switches.cc +++ b/www/ungoogled-chromium/files/patch-content_public_common_content__switches.cc @@ -1,6 +1,6 @@ ---- content/public/common/content_switches.cc.orig 2024-07-31 14:19:23 UTC +--- content/public/common/content_switches.cc.orig 2024-08-26 14:40:28 UTC +++ content/public/common/content_switches.cc -@@ -352,6 +352,8 @@ const char kEnableIsolatedWebAppsInRenderer[] = +@@ -349,6 +349,8 @@ const char kEnableIsolatedWebAppsInRenderer[] = // builds. const char kEnableLogging[] = "enable-logging"; @@ -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. -@@ -993,7 +995,7 @@ const char kPreventResizingContentsForTesting[] = +@@ -987,7 +989,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/ungoogled-chromium/files/patch-content_public_common_content__switches.h b/www/ungoogled-chromium/files/patch-content_public_common_content__switches.h index e9e15447d60e..bfe54ea74b72 100644 --- a/www/ungoogled-chromium/files/patch-content_public_common_content__switches.h +++ b/www/ungoogled-chromium/files/patch-content_public_common_content__switches.h @@ -1,6 +1,6 @@ ---- content/public/common/content_switches.h.orig 2024-07-31 14:19:23 UTC +--- content/public/common/content_switches.h.orig 2024-08-26 14:40:28 UTC +++ content/public/common/content_switches.h -@@ -111,6 +111,7 @@ CONTENT_EXPORT extern const char kEnableGpuMemoryBuffe +@@ -110,6 +110,7 @@ CONTENT_EXPORT extern const char kEnableGpuMemoryBuffe CONTENT_EXPORT extern const char kEnableIsolatedWebAppsInRenderer[]; CONTENT_EXPORT extern const char kEnableLCDText[]; CONTENT_EXPORT extern const char kEnableLogging[]; @@ -8,7 +8,7 @@ CONTENT_EXPORT extern const char kEnableNetworkInformationDownlinkMax[]; CONTENT_EXPORT extern const char kEnableCanvas2DLayers[]; CONTENT_EXPORT extern const char kEnablePluginPlaceholderTesting[]; -@@ -270,7 +271,7 @@ CONTENT_EXPORT extern const char kPreventResizingConte +@@ -268,7 +269,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/ungoogled-chromium/files/patch-content_renderer_media_gpu_gpu__video__accelerator__factories__impl.cc b/www/ungoogled-chromium/files/patch-content_renderer_media_gpu_gpu__video__accelerator__factories__impl.cc deleted file mode 100644 index 501b736e812c..000000000000 --- a/www/ungoogled-chromium/files/patch-content_renderer_media_gpu_gpu__video__accelerator__factories__impl.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- content/renderer/media/gpu/gpu_video_accelerator_factories_impl.cc.orig 2024-06-22 08:49:42 UTC -+++ content/renderer/media/gpu/gpu_video_accelerator_factories_impl.cc -@@ -47,7 +47,7 @@ bool UseSingleNV12() { - #else - static BASE_FEATURE(kUseSingleNV12ForSoftwareGMB, - "UseSingleNV12ForSoftwareGMB", --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - base::FEATURE_ENABLED_BY_DEFAULT); - #else - base::FEATURE_DISABLED_BY_DEFAULT); diff --git a/www/ungoogled-chromium/files/patch-content_renderer_render__thread__impl.cc b/www/ungoogled-chromium/files/patch-content_renderer_render__thread__impl.cc index 52c49dbefdaa..1e82b8c60f4b 100644 --- a/www/ungoogled-chromium/files/patch-content_renderer_render__thread__impl.cc +++ b/www/ungoogled-chromium/files/patch-content_renderer_render__thread__impl.cc @@ -1,6 +1,6 @@ ---- content/renderer/render_thread_impl.cc.orig 2024-07-31 14:19:23 UTC +--- content/renderer/render_thread_impl.cc.orig 2024-08-26 14:40:28 UTC +++ content/renderer/render_thread_impl.cc -@@ -213,6 +213,8 @@ +@@ -214,6 +214,8 @@ #if BUILDFLAG(IS_APPLE) #include <malloc/malloc.h> @@ -9,7 +9,7 @@ #else #include <malloc.h> #endif -@@ -999,7 +1001,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1017,7 +1019,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: kGpuStreamIdMedia, kGpuStreamPriorityMedia); const bool enable_video_decode_accelerator = @@ -18,7 +18,7 @@ base::FeatureList::IsEnabled(media::kVaapiVideoDecodeLinux) && #endif // BUILDFLAG(IS_LINUX) !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode) && -@@ -1008,7 +1010,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1026,7 +1028,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: gpu::kGpuFeatureStatusEnabled); const bool enable_video_encode_accelerator = @@ -27,7 +27,7 @@ base::FeatureList::IsEnabled(media::kVaapiVideoEncodeLinux) && #else !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoEncode) && -@@ -1760,7 +1762,7 @@ std::unique_ptr<CodecFactory> RenderThreadImpl::Create +@@ -1801,7 +1803,7 @@ std::unique_ptr<CodecFactory> RenderThreadImpl::Create bool enable_video_encode_accelerator) { mojo::PendingRemote<media::mojom::VideoEncodeAcceleratorProvider> vea_provider; diff --git a/www/ungoogled-chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc b/www/ungoogled-chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc index 3ac4a9a3a1e5..9d1a244da52e 100644 --- a/www/ungoogled-chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc +++ b/www/ungoogled-chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc @@ -1,6 +1,6 @@ ---- content/renderer/renderer_blink_platform_impl.cc.orig 2024-07-31 14:19:23 UTC +--- content/renderer/renderer_blink_platform_impl.cc.orig 2024-08-26 14:40:28 UTC +++ content/renderer/renderer_blink_platform_impl.cc -@@ -120,7 +120,7 @@ +@@ -127,7 +127,7 @@ #if BUILDFLAG(IS_MAC) #include "content/child/child_process_sandbox_support_impl_mac.h" @@ -9,7 +9,7 @@ #include "content/child/child_process_sandbox_support_impl_linux.h" #include "content/child/sandboxed_process_thread_type_handler.h" #endif -@@ -190,13 +190,13 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -197,13 +197,13 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( is_locked_to_site_(false), main_thread_scheduler_(main_thread_scheduler), next_frame_sink_id_(uint32_t{std::numeric_limits<int32_t>::max()} + 1) { @@ -25,7 +25,7 @@ mojo::PendingRemote<font_service::mojom::FontService> font_service; RenderThreadImpl::current()->BindHostReceiver( font_service.InitWithNewPipeAndPassReceiver()); -@@ -205,7 +205,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -223,7 +223,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( #endif } @@ -34,7 +34,7 @@ if (sandboxEnabled()) { #if BUILDFLAG(IS_MAC) sandbox_support_ = std::make_unique<WebSandboxSupportMac>(); -@@ -266,7 +266,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl +@@ -284,7 +284,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl #endif blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() { diff --git a/www/ungoogled-chromium/files/patch-content_renderer_renderer__blink__platform__impl.h b/www/ungoogled-chromium/files/patch-content_renderer_renderer__blink__platform__impl.h index b98332be7c33..318d48878fad 100644 --- a/www/ungoogled-chromium/files/patch-content_renderer_renderer__blink__platform__impl.h +++ b/www/ungoogled-chromium/files/patch-content_renderer_renderer__blink__platform__impl.h @@ -1,6 +1,6 @@ ---- content/renderer/renderer_blink_platform_impl.h.orig 2024-07-31 14:19:23 UTC +--- content/renderer/renderer_blink_platform_impl.h.orig 2024-08-26 14:40:28 UTC +++ content/renderer/renderer_blink_platform_impl.h -@@ -248,7 +248,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -253,7 +253,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi void Collect3DContextInformation(blink::Platform::GraphicsInfo* gl_info, const gpu::GPUInfo& gpu_info) const; diff --git a/www/ungoogled-chromium/files/patch-content_shell_BUILD.gn b/www/ungoogled-chromium/files/patch-content_shell_BUILD.gn index 17524c80e023..e30bc9548343 100644 --- a/www/ungoogled-chromium/files/patch-content_shell_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-content_shell_BUILD.gn @@ -1,6 +1,6 @@ ---- content/shell/BUILD.gn.orig 2024-07-31 14:19:23 UTC +--- content/shell/BUILD.gn.orig 2024-08-26 14:40:28 UTC +++ content/shell/BUILD.gn -@@ -1096,7 +1096,7 @@ group("content_shell_crash_test") { +@@ -1081,7 +1081,7 @@ group("content_shell_crash_test") { if (is_win) { data_deps += [ "//build/win:copy_cdb_to_output" ] } diff --git a/www/ungoogled-chromium/files/patch-content_shell_app_shell__main__delegate.cc b/www/ungoogled-chromium/files/patch-content_shell_app_shell__main__delegate.cc index 9fb18448e54b..d3e0b01044e8 100644 --- a/www/ungoogled-chromium/files/patch-content_shell_app_shell__main__delegate.cc +++ b/www/ungoogled-chromium/files/patch-content_shell_app_shell__main__delegate.cc @@ -1,6 +1,6 @@ ---- content/shell/app/shell_main_delegate.cc.orig 2024-05-23 20:04:36 UTC +--- content/shell/app/shell_main_delegate.cc.orig 2024-08-26 14:40:28 UTC +++ content/shell/app/shell_main_delegate.cc -@@ -281,7 +281,7 @@ void ShellMainDelegate::PreSandboxStartup() { +@@ -276,7 +276,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/ungoogled-chromium/files/patch-content_utility_utility__main.cc b/www/ungoogled-chromium/files/patch-content_utility_utility__main.cc index 378cac36ab4b..d93d16bcbb68 100644 --- a/www/ungoogled-chromium/files/patch-content_utility_utility__main.cc +++ b/www/ungoogled-chromium/files/patch-content_utility_utility__main.cc @@ -1,4 +1,4 @@ ---- content/utility/utility_main.cc.orig 2024-07-31 14:19:23 UTC +--- content/utility/utility_main.cc.orig 2024-08-26 14:40:28 UTC +++ content/utility/utility_main.cc @@ -36,17 +36,21 @@ #include "services/screen_ai/buildflags/buildflags.h" @@ -49,7 +49,7 @@ #include "services/screen_ai/public/cpp/utilities.h" // nogncheck #include "services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.h" // nogncheck #endif -@@ -100,7 +109,7 @@ namespace content { +@@ -101,7 +110,7 @@ namespace content { namespace { @@ -58,7 +58,7 @@ std::vector<std::string> GetNetworkContextsParentDirectories() { base::MemoryMappedFile::Region region; base::ScopedFD read_pipe_fd = base::FileDescriptorStore::GetInstance().TakeFD( -@@ -127,9 +136,10 @@ std::vector<std::string> GetNetworkContextsParentDirec +@@ -128,9 +137,10 @@ std::vector<std::string> GetNetworkContextsParentDirec return dirs; } @@ -70,7 +70,7 @@ sandbox_type == sandbox::mojom::Sandbox::kHardwareVideoDecoding || #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) sandbox_type == sandbox::mojom::Sandbox::kHardwareVideoEncoding; -@@ -144,6 +154,7 @@ bool ShouldUseAmdGpuPolicy(sandbox::mojom::Sandbox san +@@ -145,6 +155,7 @@ bool ShouldUseAmdGpuPolicy(sandbox::mojom::Sandbox san return false; } @@ -78,7 +78,7 @@ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_WIN) -@@ -241,7 +252,8 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -242,7 +253,8 @@ int UtilityMain(MainFunctionParams parameters) { CHECK(on_device_model::OnDeviceModelService::PreSandboxInit()); } @@ -88,7 +88,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 -@@ -253,7 +265,7 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -254,7 +266,7 @@ int UtilityMain(MainFunctionParams parameters) { } #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -97,7 +97,7 @@ // Initializes the sandbox before any threads are created. // TODO(jorgelo): move this after GTK initialization when we enable a strict // Seccomp-BPF policy. -@@ -291,7 +303,7 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -292,7 +304,7 @@ int UtilityMain(MainFunctionParams parameters) { screen_ai::GetBinaryPathSwitch())); break; #endif @@ -106,7 +106,7 @@ case sandbox::mojom::Sandbox::kHardwareVideoDecoding: pre_sandbox_hook = base::BindOnce(&media::HardwareVideoDecodingPreSandboxHook); -@@ -318,6 +330,7 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -319,6 +331,7 @@ int UtilityMain(MainFunctionParams parameters) { default: break; } @@ -114,7 +114,7 @@ if (!sandbox::policy::IsUnsandboxedSandboxType(sandbox_type) && (parameters.zygote_child || !pre_sandbox_hook.is_null())) { sandbox_options.use_amd_specific_policies = -@@ -325,6 +338,11 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -326,6 +339,11 @@ int UtilityMain(MainFunctionParams parameters) { sandbox::policy::Sandbox::Initialize( sandbox_type, std::move(pre_sandbox_hook), sandbox_options); } diff --git a/www/ungoogled-chromium/files/patch-device_gamepad_gamepad__provider.cc b/www/ungoogled-chromium/files/patch-device_gamepad_gamepad__provider.cc index 7d107dd16f30..9b67e055c524 100644 --- a/www/ungoogled-chromium/files/patch-device_gamepad_gamepad__provider.cc +++ b/www/ungoogled-chromium/files/patch-device_gamepad_gamepad__provider.cc @@ -1,6 +1,6 @@ ---- device/gamepad/gamepad_provider.cc.orig 2023-03-10 11:01:21 UTC +--- device/gamepad/gamepad_provider.cc.orig 2024-08-26 14:40:28 UTC +++ device/gamepad/gamepad_provider.cc -@@ -219,7 +219,7 @@ void GamepadProvider::Initialize(std::unique_ptr<Gamep +@@ -224,7 +224,7 @@ void GamepadProvider::Initialize(std::unique_ptr<Gamep if (!polling_thread_) polling_thread_ = std::make_unique<base::Thread>("Gamepad polling thread"); diff --git a/www/ungoogled-chromium/files/patch-extensions_browser_api_management_management__api.cc b/www/ungoogled-chromium/files/patch-extensions_browser_api_management_management__api.cc index cfd926932e59..c3e284d8c150 100644 --- a/www/ungoogled-chromium/files/patch-extensions_browser_api_management_management__api.cc +++ b/www/ungoogled-chromium/files/patch-extensions_browser_api_management_management__api.cc @@ -1,6 +1,6 @@ ---- extensions/browser/api/management/management_api.cc.orig 2024-03-22 14:16:19 UTC +--- extensions/browser/api/management/management_api.cc.orig 2024-08-26 14:40:28 UTC +++ extensions/browser/api/management/management_api.cc -@@ -280,7 +280,7 @@ bool PlatformSupportsApprovalFlowForExtensions() { +@@ -285,7 +285,7 @@ bool PlatformSupportsApprovalFlowForExtensions() { #if BUILDFLAG(IS_CHROMEOS) // ChromeOS devices have this feature already shipped. return true; diff --git a/www/ungoogled-chromium/files/patch-extensions_browser_api_messaging_message__service.cc b/www/ungoogled-chromium/files/patch-extensions_browser_api_messaging_message__service.cc index b980183b4db8..e094b689624a 100644 --- a/www/ungoogled-chromium/files/patch-extensions_browser_api_messaging_message__service.cc +++ b/www/ungoogled-chromium/files/patch-extensions_browser_api_messaging_message__service.cc @@ -1,6 +1,6 @@ ---- extensions/browser/api/messaging/message_service.cc.orig 2024-03-22 14:16:19 UTC +--- extensions/browser/api/messaging/message_service.cc.orig 2024-08-26 14:40:28 UTC +++ extensions/browser/api/messaging/message_service.cc -@@ -71,7 +71,7 @@ namespace { +@@ -78,7 +78,7 @@ namespace { const char kReceivingEndDoesntExistError[] = "Could not establish connection. Receiving end does not exist."; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ const char kMissingPermissionError[] = "Access to native messaging requires nativeMessaging permission."; const char kProhibitedByPoliciesError[] = -@@ -541,7 +541,7 @@ void MessageService::OpenChannelToNativeAppImpl( +@@ -551,7 +551,7 @@ void MessageService::OpenChannelToNativeAppImpl( return; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-extensions_common_command.cc b/www/ungoogled-chromium/files/patch-extensions_common_command.cc index c1d7e2a9cc1f..4a7bd12e5b24 100644 --- a/www/ungoogled-chromium/files/patch-extensions_common_command.cc +++ b/www/ungoogled-chromium/files/patch-extensions_common_command.cc @@ -1,6 +1,6 @@ ---- extensions/common/command.cc.orig 2024-06-22 08:49:42 UTC +--- extensions/common/command.cc.orig 2024-08-26 14:40:28 UTC +++ extensions/common/command.cc -@@ -283,7 +283,7 @@ std::string Command::CommandPlatform() { +@@ -285,7 +285,7 @@ std::string Command::CommandPlatform() { return values::kKeybindingPlatformMac; #elif BUILDFLAG(IS_CHROMEOS) return values::kKeybindingPlatformChromeOs; diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc deleted file mode 100644 index 54f0f96a2533..000000000000 --- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- gpu/command_buffer/common/gpu_memory_buffer_support.cc.orig 2024-04-23 07:42:17 UTC -+++ gpu/command_buffer/common/gpu_memory_buffer_support.cc -@@ -182,7 +182,7 @@ uint32_t GetPlatformSpecificTextureTarget() { - #if BUILDFLAG(IS_MAC) - return macos_specific_texture_target; - #elif BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - return GL_TEXTURE_EXTERNAL_OES; - #elif BUILDFLAG(IS_IOS) - return GL_TEXTURE_2D; -@@ -209,7 +209,7 @@ GPU_EXPORT bool NativeBufferNeedsPlatformSpecificTextu - gfx::BufferFormat format, - gfx::BufferPlane plane) { - #if BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ -- BUILDFLAG(IS_WIN) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - // Always use GL_TEXTURE_2D as the target for RGB textures. - // https://crbug.com/916728 - if (format == gfx::BufferFormat::R_8 || format == gfx::BufferFormat::RG_88 || diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_dawn__context__provider.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_dawn__context__provider.cc index 48880e14edf2..03d2e1e79288 100644 --- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_dawn__context__provider.cc +++ b/www/ungoogled-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-06-22 08:49:42 UTC +--- gpu/command_buffer/service/dawn_context_provider.cc.orig 2024-08-26 14:40:28 UTC +++ gpu/command_buffer/service/dawn_context_provider.cc -@@ -163,7 +163,7 @@ wgpu::BackendType DawnContextProvider::GetDefaultBacke +@@ -175,7 +175,7 @@ wgpu::BackendType DawnContextProvider::GetDefaultBacke return base::FeatureList::IsEnabled(features::kSkiaGraphiteDawnUseD3D12) ? wgpu::BackendType::D3D12 : wgpu::BackendType::D3D11; diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc index 758e1ecbbac9..8e65c75da226 100644 --- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc +++ b/www/ungoogled-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-06-22 08:49:42 UTC +--- gpu/command_buffer/service/gles2_cmd_decoder.cc.orig 2024-08-26 14:40:28 UTC +++ gpu/command_buffer/service/gles2_cmd_decoder.cc -@@ -2955,7 +2955,7 @@ GLES2Decoder* GLES2Decoder::Create( +@@ -2902,7 +2902,7 @@ GLES2Decoder* GLES2Decoder::Create( } // Allow linux to run fuzzers. diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc index d2b3a5bbfd8b..eba5e3a7e0e9 100644 --- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc +++ b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc @@ -1,9 +1,9 @@ ---- gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc.orig 2024-02-25 20:22:18 UTC +--- gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc.orig 2024-08-26 14:40:28 UTC +++ gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc -@@ -21,7 +21,7 @@ namespace { +@@ -20,7 +20,7 @@ namespace { // TODO(penghuang): verify the scanout is the right usage for video playback. // crbug.com/1280798 - constexpr uint32_t kSupportedUsage = + constexpr SharedImageUsageSet kSupportedUsage = -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) SHARED_IMAGE_USAGE_SCANOUT | diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc index 1bc7894ef11a..711bb08da994 100644 --- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc +++ b/www/ungoogled-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-07-31 14:19:23 UTC +--- gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig 2024-08-26 14:40:28 UTC +++ gpu/command_buffer/service/shared_image/external_vk_image_backing.cc -@@ -51,7 +51,7 @@ +@@ -54,7 +54,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" -@@ -696,7 +696,7 @@ std::unique_ptr<DawnImageRepresentation> ExternalVkIma +@@ -734,7 +734,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/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc deleted file mode 100644 index d5ee2917faa7..000000000000 --- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc.orig 2024-03-22 14:16:19 UTC -+++ gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc -@@ -147,7 +147,7 @@ bool IsFormatSupported(viz::SharedImageFormat format, - } // namespace - - constexpr uint32_t kSupportedUsage = --#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 | diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc index 224d5371b9be..5d61343a5e0c 100644 --- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc +++ b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/shared_image/shared_image_factory.cc.orig 2024-07-31 14:19:23 UTC +--- gpu/command_buffer/service/shared_image/shared_image_factory.cc.orig 2024-08-26 14:40:28 UTC +++ gpu/command_buffer/service/shared_image/shared_image_factory.cc -@@ -160,7 +160,7 @@ gfx::GpuMemoryBufferType GetNativeBufferType() { +@@ -148,7 +148,7 @@ gfx::GpuMemoryBufferType GetNativeBufferType() { return gfx::GpuMemoryBufferType::IO_SURFACE_BUFFER; #elif BUILDFLAG(IS_ANDROID) return gfx::GpuMemoryBufferType::ANDROID_HARDWARE_BUFFER; diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc index 1b39f6ade8d3..38ee93dc422f 100644 --- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc +++ b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/shared_image/shared_image_manager.cc.orig 2024-07-31 14:19:23 UTC +--- gpu/command_buffer/service/shared_image/shared_image_manager.cc.orig 2024-08-26 14:40:28 UTC +++ gpu/command_buffer/service/shared_image/shared_image_manager.cc -@@ -571,7 +571,7 @@ bool SharedImageManager::SupportsScanoutImages() { +@@ -572,7 +572,7 @@ bool SharedImageManager::SupportsScanoutImages() { return true; #elif BUILDFLAG(IS_ANDROID) return base::AndroidHardwareBufferCompat::IsSupportAvailable(); diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc index bbc98394886d..ebc53422c60f 100644 --- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc +++ b/www/ungoogled-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-07-31 14:19:23 UTC +--- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2024-08-26 14:40:28 UTC +++ gpu/command_buffer/service/webgpu_decoder_impl.cc -@@ -1294,7 +1294,7 @@ WGPUFuture WebGPUDecoderImpl::RequestAdapterImpl( +@@ -1303,7 +1303,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) { -@@ -1967,7 +1967,7 @@ WebGPUDecoderImpl::AssociateMailboxDawn( +@@ -1972,7 +1972,7 @@ WebGPUDecoderImpl::AssociateMailboxDawn( } #if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_APPLE) && \ diff --git a/www/ungoogled-chromium/files/patch-gpu_config_gpu__control__list.cc b/www/ungoogled-chromium/files/patch-gpu_config_gpu__control__list.cc index 34c16cd444da..20228f70aac9 100644 --- a/www/ungoogled-chromium/files/patch-gpu_config_gpu__control__list.cc +++ b/www/ungoogled-chromium/files/patch-gpu_config_gpu__control__list.cc @@ -1,6 +1,6 @@ ---- gpu/config/gpu_control_list.cc.orig 2024-07-31 14:19:23 UTC +--- gpu/config/gpu_control_list.cc.orig 2024-08-26 14:40:28 UTC +++ gpu/config/gpu_control_list.cc -@@ -276,7 +276,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; -@@ -810,7 +810,7 @@ GpuControlList::OsType GpuControlList::GetOsType() { +@@ -814,7 +814,7 @@ GpuControlList::OsType GpuControlList::GetOsType() { return kOsAndroid; #elif BUILDFLAG(IS_FUCHSIA) return kOsFuchsia; diff --git a/www/ungoogled-chromium/files/patch-gpu_ipc_service_gpu__init.cc b/www/ungoogled-chromium/files/patch-gpu_ipc_service_gpu__init.cc index 56acf2b731eb..93f5373600e2 100644 --- a/www/ungoogled-chromium/files/patch-gpu_ipc_service_gpu__init.cc +++ b/www/ungoogled-chromium/files/patch-gpu_ipc_service_gpu__init.cc @@ -1,4 +1,4 @@ ---- gpu/ipc/service/gpu_init.cc.orig 2024-07-31 14:19:23 UTC +--- gpu/ipc/service/gpu_init.cc.orig 2024-08-26 14:40:28 UTC +++ gpu/ipc/service/gpu_init.cc @@ -398,7 +398,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL enable_watchdog = false; @@ -18,7 +18,7 @@ // On Chrome OS ARM Mali, GPU driver userspace creates threads when // initializing a GL context, so start the sandbox early. // TODO(zmo): Need to collect OS version before this. -@@ -542,7 +542,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -544,7 +544,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL gpu_preferences_.gr_context_type = GrContextType::kGL; } @@ -27,7 +27,7 @@ // The ContentSandboxHelper is currently the only one implementation of // GpuSandboxHelper and it has no dependency. Except on Linux where // VaapiWrapper checks the GL implementation to determine which display -@@ -624,7 +624,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -626,7 +626,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL command_line, gpu_feature_info_, gpu_preferences_.disable_software_rasterizer, false); if (gl_use_swiftshader_) { @@ -36,7 +36,7 @@ VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly " << "on Linux"; return false; -@@ -780,7 +780,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -777,7 +777,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. -@@ -835,7 +835,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -832,7 +832,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 -@@ -1023,7 +1023,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -1022,7 +1022,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 -@@ -1083,7 +1083,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -1077,7 +1077,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c } } diff --git a/www/ungoogled-chromium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc b/www/ungoogled-chromium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc index ce8fba2ca193..6ac45e3f4ef7 100644 --- a/www/ungoogled-chromium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc +++ b/www/ungoogled-chromium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc @@ -1,6 +1,6 @@ ---- gpu/ipc/service/gpu_memory_buffer_factory.cc.orig 2023-03-10 11:01:21 UTC +--- gpu/ipc/service/gpu_memory_buffer_factory.cc.orig 2024-08-26 14:40:28 UTC +++ gpu/ipc/service/gpu_memory_buffer_factory.cc -@@ -13,7 +13,7 @@ +@@ -14,7 +14,7 @@ #include "gpu/ipc/service/gpu_memory_buffer_factory_io_surface.h" #endif @@ -9,7 +9,7 @@ #include "gpu/ipc/service/gpu_memory_buffer_factory_native_pixmap.h" #endif -@@ -36,7 +36,7 @@ GpuMemoryBufferFactory::CreateNativeType( +@@ -37,7 +37,7 @@ GpuMemoryBufferFactory::CreateNativeType( return std::make_unique<GpuMemoryBufferFactoryIOSurface>(); #elif BUILDFLAG(IS_ANDROID) return std::make_unique<GpuMemoryBufferFactoryAndroidHardwareBuffer>(); diff --git a/www/ungoogled-chromium/files/patch-headless_lib_headless__content__main__delegate.cc b/www/ungoogled-chromium/files/patch-headless_lib_headless__content__main__delegate.cc index 05bad739f9eb..85a2a8d81289 100644 --- a/www/ungoogled-chromium/files/patch-headless_lib_headless__content__main__delegate.cc +++ b/www/ungoogled-chromium/files/patch-headless_lib_headless__content__main__delegate.cc @@ -1,6 +1,6 @@ ---- headless/lib/headless_content_main_delegate.cc.orig 2024-07-31 14:19:23 UTC +--- headless/lib/headless_content_main_delegate.cc.orig 2024-08-26 14:40:28 UTC +++ headless/lib/headless_content_main_delegate.cc -@@ -408,7 +408,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( +@@ -409,7 +409,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/ungoogled-chromium/files/patch-ipc_ipc__message__utils.cc b/www/ungoogled-chromium/files/patch-ipc_ipc__message__utils.cc index 1962c97713c7..21aa492bd87c 100644 --- a/www/ungoogled-chromium/files/patch-ipc_ipc__message__utils.cc +++ b/www/ungoogled-chromium/files/patch-ipc_ipc__message__utils.cc @@ -1,6 +1,6 @@ ---- ipc/ipc_message_utils.cc.orig 2024-05-23 20:04:36 UTC +--- ipc/ipc_message_utils.cc.orig 2024-08-26 14:40:28 UTC +++ ipc/ipc_message_utils.cc -@@ -395,7 +395,7 @@ void ParamTraits<unsigned int>::Log(const param_type& +@@ -400,7 +400,7 @@ void ParamTraits<unsigned int>::Log(const param_type& } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/ungoogled-chromium/files/patch-media_base_media__switches.cc b/www/ungoogled-chromium/files/patch-media_base_media__switches.cc index 1eebb173a28e..9356a9da3eab 100644 --- a/www/ungoogled-chromium/files/patch-media_base_media__switches.cc +++ b/www/ungoogled-chromium/files/patch-media_base_media__switches.cc @@ -1,4 +1,4 @@ ---- media/base/media_switches.cc.orig 2024-07-31 14:19:23 UTC +--- media/base/media_switches.cc.orig 2024-08-26 14:40:28 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 -@@ -677,7 +699,7 @@ BASE_FEATURE(kFallbackAfterDecodeError, +@@ -676,7 +698,7 @@ BASE_FEATURE(kFeatureManagementLiveTranslateCrOS, // 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, +@@ -704,7 +726,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, +@@ -716,7 +738,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen, BASE_FEATURE(kGlobalMediaControlsPictureInPicture, "GlobalMediaControlsPictureInPicture", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -76,7 +76,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -746,7 +768,7 @@ BASE_FEATURE(kUnifiedAutoplay, +@@ -745,7 +767,7 @@ BASE_FEATURE(kUnifiedAutoplay, "UnifiedAutoplay", base::FEATURE_ENABLED_BY_DEFAULT); @@ -85,15 +85,15 @@ // Enable vaapi video decoding on linux. This is already enabled by default on // chromeos, but needs an experiment on linux. BASE_FEATURE(kVaapiVideoDecodeLinux, -@@ -837,7 +859,7 @@ BASE_FEATURE(kVaapiVp9SModeHWEncoding, +@@ -836,7 +858,7 @@ BASE_FEATURE(kVaapiVp9SModeHWEncoding, "VaapiVp9SModeHWEncoding", base::FEATURE_ENABLED_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 V4L2 flat video decoder clients instead of V4L2VideoDecoder. + // Enables the new V4L2StatefulVideoDecoder instead of V4L2VideoDecoder. // Owners: frkoenig@ch40m1um.qjz9zk, mcasas@ch40m1um.qjz9zk - // Expiry: When flat decoders are supported on all platforms and the legacy + // Expiry: When the |V4L2FlatVideoDecoder| flag handles stateful decoding on @@ -963,7 +985,7 @@ BASE_FEATURE(kLiveCaptionUseWaitK, // Live Caption can be used in multiple languages, as opposed to just English. BASE_FEATURE(kLiveCaptionMultiLanguage, @@ -112,7 +112,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -1457,7 +1479,7 @@ BASE_FEATURE(kUseGTFOOutOfProcessVideoDecoding, +@@ -1468,7 +1490,7 @@ BASE_FEATURE(kUseGTFOOutOfProcessVideoDecoding, base::FEATURE_DISABLED_BY_DEFAULT); #endif // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER) @@ -121,7 +121,7 @@ // Spawn utility processes to perform hardware encode acceleration instead of // using the GPU process. BASE_FEATURE(kUseOutOfProcessVideoEncoding, -@@ -1537,7 +1559,7 @@ BASE_FEATURE(kRecordWebAudioEngagement, +@@ -1548,7 +1570,7 @@ BASE_FEATURE(kRecordWebAudioEngagement, "RecordWebAudioEngagement", base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/www/ungoogled-chromium/files/patch-media_base_media__switches.h b/www/ungoogled-chromium/files/patch-media_base_media__switches.h index 273e82e9449c..3639537f5153 100644 --- a/www/ungoogled-chromium/files/patch-media_base_media__switches.h +++ b/www/ungoogled-chromium/files/patch-media_base_media__switches.h @@ -1,4 +1,4 @@ ---- media/base/media_switches.h.orig 2024-07-31 14:19:23 UTC +--- media/base/media_switches.h.orig 2024-08-26 14:40:28 UTC +++ media/base/media_switches.h @@ -325,13 +325,25 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kPlatformHEVCEncoder MEDIA_EXPORT BASE_DECLARE_FEATURE(kPlaybackSpeedButton); @@ -43,10 +43,10 @@ #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(kV4L2FlatVideoDecoder); MEDIA_EXPORT BASE_DECLARE_FEATURE(kV4L2FlatStatefulVideoDecoder); #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -504,7 +516,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseOutOfProcessVide + MEDIA_EXPORT BASE_DECLARE_FEATURE(kVideoBlitColorAccuracy); +@@ -510,7 +522,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseOutOfProcessVide MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseGTFOOutOfProcessVideoDecoding); #endif // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER) diff --git a/www/ungoogled-chromium/files/patch-media_base_video__frame.cc b/www/ungoogled-chromium/files/patch-media_base_video__frame.cc index 5614890a4c4d..712bf73498f0 100644 --- a/www/ungoogled-chromium/files/patch-media_base_video__frame.cc +++ b/www/ungoogled-chromium/files/patch-media_base_video__frame.cc @@ -1,6 +1,6 @@ ---- media/base/video_frame.cc.orig 2024-07-31 14:19:23 UTC +--- media/base/video_frame.cc.orig 2024-08-26 14:40:28 UTC +++ media/base/video_frame.cc -@@ -81,7 +81,7 @@ std::string VideoFrame::StorageTypeToString( +@@ -83,7 +83,7 @@ std::string VideoFrame::StorageTypeToString( return "OWNED_MEMORY"; case VideoFrame::STORAGE_SHMEM: return "SHMEM"; @@ -9,7 +9,7 @@ case VideoFrame::STORAGE_DMABUFS: return "DMABUFS"; #endif -@@ -96,7 +96,7 @@ std::string VideoFrame::StorageTypeToString( +@@ -98,7 +98,7 @@ std::string VideoFrame::StorageTypeToString( // static bool VideoFrame::IsStorageTypeMappable(VideoFrame::StorageType storage_type) { return @@ -18,25 +18,25 @@ // This is not strictly needed but makes explicit that, at VideoFrame // level, DmaBufs are not mappable from userspace. storage_type != VideoFrame::STORAGE_DMABUFS && -@@ -432,7 +432,7 @@ scoped_refptr<VideoFrame> VideoFrame::CreateFrameForGp - planes[i].stride = gpu_memory_buffer->stride(i); +@@ -396,7 +396,7 @@ VideoFrame::CreateFrameForGpuMemoryBufferOrMappableSII + : shared_image->GetStrideForVideoFrame(i); } uint64_t modifier = gfx::NativePixmapHandle::kNoModifier; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - if (gpu_memory_buffer->GetType() == gfx::NATIVE_PIXMAP) { - const auto gmb_handle = gpu_memory_buffer->CloneHandle(); - if (gmb_handle.is_null() || -@@ -806,7 +806,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM + bool is_native_buffer = + gpu_memory_buffer + ? (gpu_memory_buffer->GetType() != gfx::SHARED_MEMORY_BUFFER) +@@ -817,7 +817,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM return frame; } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // static - scoped_refptr<VideoFrame> VideoFrame::WrapUnownedExternalDmabufs( + scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs( const VideoFrameLayout& layout, -@@ -1555,7 +1555,7 @@ scoped_refptr<gpu::ClientSharedImage> VideoFrame::shar +@@ -1528,7 +1528,7 @@ scoped_refptr<gpu::ClientSharedImage> VideoFrame::shar : shared_images_[texture_index]; } @@ -45,12 +45,3 @@ size_t VideoFrame::NumDmabufFds() const { if (wrapped_frame_) { return wrapped_frame_->NumDmabufFds(); -@@ -1699,7 +1699,7 @@ VideoFrame::~VideoFrame() { - // Prevents dangling raw ptr, see https://docs.9oo91e.qjz9zk/document/d/156O7kBZqIhe1dUcqTMcN5T-6YEAcg0yNnj5QlnZu9xU/edit?usp=sharing. - shm_region_ = nullptr; - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // Prevents dangling dmabuf fds. - dmabuf_fds_.clear(); - #endif diff --git a/www/ungoogled-chromium/files/patch-media_base_video__frame.h b/www/ungoogled-chromium/files/patch-media_base_video__frame.h index 9aede75290a4..37f28170de86 100644 --- a/www/ungoogled-chromium/files/patch-media_base_video__frame.h +++ b/www/ungoogled-chromium/files/patch-media_base_video__frame.h @@ -1,4 +1,4 @@ ---- media/base/video_frame.h.orig 2024-07-31 14:19:23 UTC +--- media/base/video_frame.h.orig 2024-08-26 14:40:28 UTC +++ media/base/video_frame.h @@ -45,7 +45,7 @@ #include "base/apple/scoped_cftyperef.h" @@ -18,7 +18,7 @@ // 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 -@@ -386,7 +386,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -402,7 +402,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte ReleaseMailboxAndGpuMemoryBufferCB mailbox_holder_and_gmb_release_cb, base::TimeDelta timestamp); @@ -26,8 +26,8 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Wraps provided dmabufs // (https://www.kernel.org/doc/html/latest/driver-api/dma-buf.html) with a - // VideoFrame. -@@ -719,7 +719,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte + // VideoFrame. The frame will take ownership of |dmabuf_fds|, and will +@@ -721,7 +721,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte scoped_refptr<gpu::ClientSharedImage> shared_image( size_t texture_index) const; @@ -36,9 +36,9 @@ // 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. -@@ -950,7 +950,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte - // For now it's set to false always until clients starts using it. - const bool is_mappable_si_enabled_ = false; +@@ -963,7 +963,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte + // GpuMemoryBuffers. Clients will set this flag while creating a VideoFrame. + bool is_mappable_si_enabled_ = false; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) diff --git a/www/ungoogled-chromium/files/patch-media_gpu_chromeos_native__pixmap__frame__resource.cc b/www/ungoogled-chromium/files/patch-media_gpu_chromeos_native__pixmap__frame__resource.cc index 8c539c6d901b..1483e6743c75 100644 --- a/www/ungoogled-chromium/files/patch-media_gpu_chromeos_native__pixmap__frame__resource.cc +++ b/www/ungoogled-chromium/files/patch-media_gpu_chromeos_native__pixmap__frame__resource.cc @@ -1,6 +1,6 @@ ---- media/gpu/chromeos/native_pixmap_frame_resource.cc.orig 2024-06-22 08:49:42 UTC +--- media/gpu/chromeos/native_pixmap_frame_resource.cc.orig 2024-08-26 14:40:28 UTC +++ media/gpu/chromeos/native_pixmap_frame_resource.cc -@@ -154,7 +154,7 @@ scoped_refptr<NativePixmapFrameResource> NativePixmapF +@@ -176,7 +176,7 @@ scoped_refptr<NativePixmapFrameResource> NativePixmapF const bool is_intel_media_compression_enabled = #if BUILDFLAG(IS_CHROMEOS) base::FeatureList::IsEnabled(features::kEnableIntelMediaCompression); diff --git a/www/ungoogled-chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc b/www/ungoogled-chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc index 7be959c293a9..b598381a2d3a 100644 --- a/www/ungoogled-chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc +++ b/www/ungoogled-chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc @@ -1,6 +1,6 @@ ---- media/gpu/chromeos/video_decoder_pipeline.cc.orig 2024-07-31 14:19:23 UTC +--- media/gpu/chromeos/video_decoder_pipeline.cc.orig 2024-08-26 14:40:28 UTC +++ media/gpu/chromeos/video_decoder_pipeline.cc -@@ -1098,7 +1098,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -1096,7 +1096,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()); -@@ -1107,7 +1107,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -1105,7 +1105,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 -@@ -1295,7 +1295,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -1287,7 +1287,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( << " VideoFrames"; auxiliary_frame_pool_->set_parent_task_runner(decoder_task_runner_); diff --git a/www/ungoogled-chromium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc b/www/ungoogled-chromium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc index db9c7dfb867c..deb6b0abdeef 100644 --- a/www/ungoogled-chromium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc +++ b/www/ungoogled-chromium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc @@ -1,4 +1,4 @@ ---- media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc.orig 2024-06-22 08:49:42 UTC +--- media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc.orig 2024-08-26 14:40:28 UTC +++ media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc @@ -16,7 +16,9 @@ #include "media/gpu/vaapi/vaapi_wrapper.h" @@ -18,7 +18,7 @@ void AllowAccessToRenderNodes(std::vector<BrokerFilePermission>& permissions, bool include_sys_dev_char, bool read_write) { -@@ -172,6 +175,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2( +@@ -176,6 +179,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2( NOTREACHED_NORETURN(); #endif // BUILDFLAG(USE_V4L2_CODEC) } @@ -26,7 +26,7 @@ } // namespace -@@ -187,6 +191,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2( +@@ -191,6 +195,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2( // (at least). bool HardwareVideoDecodingPreSandboxHook( sandbox::policy::SandboxLinux::Options options) { @@ -34,7 +34,7 @@ using HardwareVideoDecodingProcessPolicy = sandbox::policy::HardwareVideoDecodingProcessPolicy; using PolicyType = -@@ -232,6 +237,7 @@ bool HardwareVideoDecodingPreSandboxHook( +@@ -236,6 +241,7 @@ bool HardwareVideoDecodingPreSandboxHook( // |permissions| is empty? sandbox::policy::SandboxLinux::GetInstance()->StartBrokerProcess( command_set, permissions, options); diff --git a/www/ungoogled-chromium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc b/www/ungoogled-chromium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc index c06beb036bf2..0a5d3c4da553 100644 --- a/www/ungoogled-chromium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc +++ b/www/ungoogled-chromium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc @@ -1,6 +1,6 @@ ---- media/gpu/vaapi/vaapi_video_decoder.cc.orig 2024-06-22 08:49:42 UTC +--- media/gpu/vaapi/vaapi_video_decoder.cc.orig 2024-08-26 14:40:28 UTC +++ media/gpu/vaapi/vaapi_video_decoder.cc -@@ -775,7 +775,7 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScree +@@ -782,7 +782,7 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScree const gfx::Size decoder_natural_size = aspect_ratio_.GetNaturalSize(decoder_visible_rect); diff --git a/www/ungoogled-chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc b/www/ungoogled-chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc index cf3ff89b2ee8..902c543ac925 100644 --- a/www/ungoogled-chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc +++ b/www/ungoogled-chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc @@ -1,6 +1,6 @@ ---- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2024-07-31 14:19:23 UTC +--- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2024-08-26 14:40:28 UTC +++ media/video/gpu_memory_buffer_video_frame_pool.cc -@@ -107,7 +107,7 @@ class GpuMemoryBufferVideoFramePool::PoolImpl +@@ -106,7 +106,7 @@ class GpuMemoryBufferVideoFramePool::PoolImpl gpu::SHARED_IMAGE_USAGE_RASTER_READ | gpu::SHARED_IMAGE_USAGE_DISPLAY_READ | gpu::SHARED_IMAGE_USAGE_SCANOUT; @@ -9,7 +9,7 @@ // TODO(crbug.com/40194712): Always add the flag once the // OzoneImageBacking is by default turned on. if (base::CommandLine::ForCurrentProcess()->HasSwitch( -@@ -802,7 +802,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa +@@ -795,7 +795,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa } bool is_software_backed_video_frame = !video_frame->HasTextures(); @@ -18,7 +18,7 @@ is_software_backed_video_frame &= !video_frame->HasDmaBufs(); #endif -@@ -1347,7 +1347,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo +@@ -1340,7 +1340,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo media::IOSurfaceIsWebGPUCompatible(handle.io_surface.get()); #endif diff --git a/www/ungoogled-chromium/files/patch-media_video_video__encode__accelerator__adapter.cc b/www/ungoogled-chromium/files/patch-media_video_video__encode__accelerator__adapter.cc index c6f2cb60b739..c2d13b8cbedf 100644 --- a/www/ungoogled-chromium/files/patch-media_video_video__encode__accelerator__adapter.cc +++ b/www/ungoogled-chromium/files/patch-media_video_video__encode__accelerator__adapter.cc @@ -1,4 +1,4 @@ ---- media/video/video_encode_accelerator_adapter.cc.orig 2024-07-31 14:19:23 UTC +--- media/video/video_encode_accelerator_adapter.cc.orig 2024-08-26 14:40:28 UTC +++ media/video/video_encode_accelerator_adapter.cc @@ -158,7 +158,7 @@ VideoEncodeAccelerator::Config SetUpVeaConfig( if (is_rgb) @@ -9,7 +9,7 @@ if (format != PIXEL_FORMAT_I420 || !VideoFrame::IsStorageTypeMappable(storage_type)) { // ChromeOS/Linux hardware video encoders supports I420 on-memory -@@ -486,7 +486,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal +@@ -484,7 +484,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal SetUpVeaConfig(profile_, options_, format, first_frame->storage_type(), supported_rc_modes_, required_encoder_type_); diff --git a/www/ungoogled-chromium/files/patch-media_video_video__encode__accelerator__adapter__test.cc b/www/ungoogled-chromium/files/patch-media_video_video__encode__accelerator__adapter__test.cc index fc7fcf7e284a..37946a927c16 100644 --- a/www/ungoogled-chromium/files/patch-media_video_video__encode__accelerator__adapter__test.cc +++ b/www/ungoogled-chromium/files/patch-media_video_video__encode__accelerator__adapter__test.cc @@ -1,6 +1,6 @@ ---- media/video/video_encode_accelerator_adapter_test.cc.orig 2024-07-31 14:19:23 UTC +--- media/video/video_encode_accelerator_adapter_test.cc.orig 2024-08-26 14:40:28 UTC +++ media/video/video_encode_accelerator_adapter_test.cc -@@ -461,7 +461,7 @@ TEST_P(VideoEncodeAcceleratorAdapterTest, TwoFramesRes +@@ -457,7 +457,7 @@ TEST_P(VideoEncodeAcceleratorAdapterTest, TwoFramesRes CreateGreenFrame(large_size, pixel_format, base::Milliseconds(2)); VideoPixelFormat expected_input_format = PIXEL_FORMAT_I420; diff --git a/www/ungoogled-chromium/files/patch-mojo_core_channel.cc b/www/ungoogled-chromium/files/patch-mojo_core_channel.cc index 9cde3795391f..b18a82604ccd 100644 --- a/www/ungoogled-chromium/files/patch-mojo_core_channel.cc +++ b/www/ungoogled-chromium/files/patch-mojo_core_channel.cc @@ -1,6 +1,6 @@ ---- mojo/core/channel.cc.orig 2024-06-22 08:49:42 UTC +--- mojo/core/channel.cc.orig 2024-08-26 14:40:28 UTC +++ mojo/core/channel.cc -@@ -71,7 +71,11 @@ const size_t kMaxUnusedReadBufferCapacity = 4096; +@@ -79,7 +79,11 @@ const size_t kMaxUnusedReadBufferCapacity = 4096; // Fuchsia: The zx_channel_write() API supports up to 64 handles. const size_t kMaxAttachedHandles = 64; diff --git a/www/ungoogled-chromium/files/patch-mojo_public_c_system_thunks.cc b/www/ungoogled-chromium/files/patch-mojo_public_c_system_thunks.cc index f4e06b36fbf4..1300ba7cd929 100644 --- a/www/ungoogled-chromium/files/patch-mojo_public_c_system_thunks.cc +++ b/www/ungoogled-chromium/files/patch-mojo_public_c_system_thunks.cc @@ -1,6 +1,6 @@ ---- mojo/public/c/system/thunks.cc.orig 2024-03-22 14:16:19 UTC +--- mojo/public/c/system/thunks.cc.orig 2024-08-26 14:40:28 UTC +++ mojo/public/c/system/thunks.cc -@@ -25,7 +25,7 @@ +@@ -30,7 +30,7 @@ #include "mojo/public/c/system/message_pipe.h" #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ @@ -9,7 +9,7 @@ #include "base/environment.h" #include "base/files/file_path.h" #include "base/scoped_native_library.h" -@@ -72,7 +72,7 @@ class CoreLibraryInitializer { +@@ -77,7 +77,7 @@ class CoreLibraryInitializer { MojoResult LoadLibrary(base::FilePath library_path) { #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ @@ -18,7 +18,7 @@ if (library_ && library_->is_valid()) return MOJO_RESULT_OK; -@@ -86,7 +86,7 @@ class CoreLibraryInitializer { +@@ -91,7 +91,7 @@ class CoreLibraryInitializer { if (library_path.empty()) { // Default to looking for the library in the current working directory. @@ -27,7 +27,7 @@ const base::FilePath::CharType kDefaultLibraryPathValue[] = FILE_PATH_LITERAL("./libmojo_core.so"); #elif BUILDFLAG(IS_FUCHSIA) -@@ -142,7 +142,7 @@ class CoreLibraryInitializer { +@@ -147,7 +147,7 @@ class CoreLibraryInitializer { private: #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ diff --git a/www/ungoogled-chromium/files/patch-mojo_public_tools_bindings_mojom.gni b/www/ungoogled-chromium/files/patch-mojo_public_tools_bindings_mojom.gni index fa03cf26801e..df2b6c1bf9e2 100644 --- a/www/ungoogled-chromium/files/patch-mojo_public_tools_bindings_mojom.gni +++ b/www/ungoogled-chromium/files/patch-mojo_public_tools_bindings_mojom.gni @@ -1,6 +1,6 @@ ---- mojo/public/tools/bindings/mojom.gni.orig 2024-07-31 14:19:23 UTC +--- mojo/public/tools/bindings/mojom.gni.orig 2024-08-26 14:40:28 UTC +++ mojo/public/tools/bindings/mojom.gni -@@ -762,6 +762,16 @@ template("mojom") { +@@ -763,6 +763,16 @@ template("mojom") { enabled_features += [ "is_apple" ] } diff --git a/www/ungoogled-chromium/files/patch-net_BUILD.gn b/www/ungoogled-chromium/files/patch-net_BUILD.gn index 62e3f8996b54..8c3914b6e6ef 100644 --- a/www/ungoogled-chromium/files/patch-net_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-net_BUILD.gn @@ -1,4 +1,4 @@ ---- net/BUILD.gn.orig 2024-07-31 14:19:23 UTC +--- net/BUILD.gn.orig 2024-08-26 14:40:28 UTC +++ net/BUILD.gn @@ -123,7 +123,7 @@ net_configs = [ "//build/config/compiler:wexit_time_destructors", @@ -9,7 +9,7 @@ net_configs += [ "//build/config/linux:libresolv" ] } -@@ -1214,6 +1214,19 @@ component("net") { +@@ -1248,6 +1248,19 @@ component("net") { ] } @@ -29,7 +29,7 @@ if (is_mac) { sources += [ "base/network_notification_thread_mac.cc", -@@ -1373,7 +1386,7 @@ component("net") { +@@ -1409,7 +1422,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", -@@ -2862,7 +2875,7 @@ test("net_unittests") { +@@ -2885,7 +2898,7 @@ test("net_unittests") { ] } @@ -47,7 +47,7 @@ sources += [ "base/address_tracker_linux_unittest.cc", "base/network_interfaces_linux_unittest.cc", -@@ -2950,6 +2963,10 @@ test("net_unittests") { +@@ -2976,6 +2989,10 @@ test("net_unittests") { ] } @@ -58,7 +58,7 @@ if (enable_websockets) { deps += [ "//net/server:tests" ] } -@@ -3010,7 +3027,7 @@ test("net_unittests") { +@@ -3036,7 +3053,7 @@ test("net_unittests") { ] } @@ -67,7 +67,7 @@ sources += [ "tools/quic/quic_simple_server_test.cc" ] } -@@ -3149,7 +3166,7 @@ test("net_unittests") { +@@ -3175,7 +3192,7 @@ test("net_unittests") { } # Use getifaddrs() on POSIX platforms, except Linux. diff --git a/www/ungoogled-chromium/files/patch-net_base_features.cc b/www/ungoogled-chromium/files/patch-net_base_features.cc index 7d7f49b91253..b3b0596e3a09 100644 --- a/www/ungoogled-chromium/files/patch-net_base_features.cc +++ b/www/ungoogled-chromium/files/patch-net_base_features.cc @@ -1,4 +1,4 @@ ---- net/base/features.cc.orig 2024-07-31 14:19:23 UTC +--- net/base/features.cc.orig 2024-08-26 14:40:28 UTC +++ net/base/features.cc @@ -28,7 +28,7 @@ BASE_FEATURE(kCapReferrerToOriginOnCrossOrigin, BASE_FEATURE(kAsyncDns, @@ -9,7 +9,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -507,7 +507,12 @@ BASE_FEATURE(kSpdyHeadersToHttpResponseUseBuilder, +@@ -508,7 +508,12 @@ BASE_FEATURE(kSpdyHeadersToHttpResponseUseBuilder, "SpdyHeadersToHttpResponseUseBuilder", base::FEATURE_DISABLED_BY_DEFAULT); diff --git a/www/ungoogled-chromium/files/patch-net_base_network__change__notifier.cc b/www/ungoogled-chromium/files/patch-net_base_network__change__notifier.cc index e8a0723b4416..1b678fc0450b 100644 --- a/www/ungoogled-chromium/files/patch-net_base_network__change__notifier.cc +++ b/www/ungoogled-chromium/files/patch-net_base_network__change__notifier.cc @@ -1,4 +1,4 @@ ---- net/base/network_change_notifier.cc.orig 2024-07-31 14:19:23 UTC +--- net/base/network_change_notifier.cc.orig 2024-08-26 14:40:28 UTC +++ net/base/network_change_notifier.cc @@ -42,7 +42,7 @@ #include "net/base/network_change_notifier_linux.h" @@ -9,7 +9,7 @@ #include "net/base/network_change_notifier_passive.h" #elif BUILDFLAG(IS_FUCHSIA) #include "net/base/network_change_notifier_fuchsia.h" -@@ -334,6 +334,9 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo +@@ -329,6 +329,9 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo #elif BUILDFLAG(IS_FUCHSIA) return std::make_unique<NetworkChangeNotifierFuchsia>( /*require_wlan=*/false); diff --git a/www/ungoogled-chromium/files/patch-net_disk__cache_simple_simple__file__tracker.cc b/www/ungoogled-chromium/files/patch-net_disk__cache_simple_simple__file__tracker.cc index 8a64441719c8..a09919faff07 100644 --- a/www/ungoogled-chromium/files/patch-net_disk__cache_simple_simple__file__tracker.cc +++ b/www/ungoogled-chromium/files/patch-net_disk__cache_simple_simple__file__tracker.cc @@ -1,6 +1,6 @@ ---- net/disk_cache/simple/simple_file_tracker.cc.orig 2024-07-31 14:19:23 UTC +--- net/disk_cache/simple/simple_file_tracker.cc.orig 2024-08-26 14:40:28 UTC +++ net/disk_cache/simple/simple_file_tracker.cc -@@ -34,7 +34,17 @@ void RecordFileDescripterLimiterOp(FileDescriptorLimit +@@ -35,7 +35,17 @@ void RecordFileDescripterLimiterOp(FileDescriptorLimit } // namespace SimpleFileTracker::SimpleFileTracker(int file_limit) diff --git a/www/ungoogled-chromium/files/patch-net_tools_cert__verify__tool_cert__verify__comparision__tool.cc b/www/ungoogled-chromium/files/patch-net_tools_cert__verify__tool_cert__verify__comparision__tool.cc deleted file mode 100644 index cc74e72a2604..000000000000 --- a/www/ungoogled-chromium/files/patch-net_tools_cert__verify__tool_cert__verify__comparision__tool.cc +++ /dev/null @@ -1,29 +0,0 @@ ---- net/tools/cert_verify_tool/cert_verify_comparision_tool.cc.orig 2024-05-23 20:04:36 UTC -+++ net/tools/cert_verify_tool/cert_verify_comparision_tool.cc -@@ -36,7 +36,7 @@ - #include "net/url_request/url_request_context_builder.h" - #include "net/url_request/url_request_context_getter.h" - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #include "net/proxy_resolution/proxy_config.h" - #include "net/proxy_resolution/proxy_config_service_fixed.h" - #endif -@@ -56,7 +56,7 @@ void SetUpOnNetworkThread( - base::WaitableEvent* initialization_complete_event) { - net::URLRequestContextBuilder url_request_context_builder; - url_request_context_builder.set_user_agent(GetUserAgent()); --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // On Linux, use a fixed ProxyConfigService, since the default one - // depends on glib. - // -@@ -124,7 +124,7 @@ class CertVerifyImpl { - std::unique_ptr<CertVerifyImpl> CreateCertVerifyImplFromName( - std::string_view impl_name, - scoped_refptr<net::CertNetFetcher> cert_net_fetcher) { --#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || \ -+#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(CHROME_ROOT_STORE_ONLY)) - if (impl_name == "platform") { - return std::make_unique<CertVerifyImpl>( diff --git a/www/ungoogled-chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc b/www/ungoogled-chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc index 00bc5f70ff98..8285371217d4 100644 --- a/www/ungoogled-chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc +++ b/www/ungoogled-chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc @@ -1,6 +1,6 @@ ---- net/tools/cert_verify_tool/cert_verify_tool.cc.orig 2024-07-31 14:19:23 UTC +--- net/tools/cert_verify_tool/cert_verify_tool.cc.orig 2024-08-26 14:40:28 UTC +++ net/tools/cert_verify_tool/cert_verify_tool.cc -@@ -34,7 +34,7 @@ +@@ -35,7 +35,7 @@ #include "third_party/boringssl/src/pki/trust_store.h" #include "third_party/boringssl/src/pki/trust_store_collection.h" @@ -9,7 +9,7 @@ #include "net/proxy_resolution/proxy_config.h" #include "net/proxy_resolution/proxy_config_service_fixed.h" #endif -@@ -66,7 +66,7 @@ void SetUpOnNetworkThread( +@@ -67,7 +67,7 @@ void SetUpOnNetworkThread( base::WaitableEvent* initialization_complete_event) { net::URLRequestContextBuilder url_request_context_builder; url_request_context_builder.set_user_agent(GetUserAgent()); @@ -18,7 +18,7 @@ // On Linux, use a fixed ProxyConfigService, since the default one // depends on glib. // -@@ -576,7 +576,7 @@ int main(int argc, char** argv) { +@@ -579,7 +579,7 @@ int main(int argc, char** argv) { std::string impls_str = command_line.GetSwitchValueASCII("impls"); if (impls_str.empty()) { // Default value. diff --git a/www/ungoogled-chromium/files/patch-net_url__request_url__request__context.h b/www/ungoogled-chromium/files/patch-net_url__request_url__request__context.h index 94e37534b7d1..c9e9e2e9c84d 100644 --- a/www/ungoogled-chromium/files/patch-net_url__request_url__request__context.h +++ b/www/ungoogled-chromium/files/patch-net_url__request_url__request__context.h @@ -1,6 +1,6 @@ ---- net/url_request/url_request_context.h.orig 2024-06-22 08:49:42 UTC +--- net/url_request/url_request_context.h.orig 2024-08-26 14:40:28 UTC +++ net/url_request/url_request_context.h -@@ -89,7 +89,7 @@ class NET_EXPORT URLRequestContext final { +@@ -91,7 +91,7 @@ class NET_EXPORT URLRequestContext final { // TODO(crbug.com/40118868): Revisit once build flag switch of lacros-chrome is // complete. #if !BUILDFLAG(IS_WIN) && \ diff --git a/www/ungoogled-chromium/files/patch-net_url__request_url__request__context__builder.cc b/www/ungoogled-chromium/files/patch-net_url__request_url__request__context__builder.cc index 6c84624930c5..d3b4d198a24d 100644 --- a/www/ungoogled-chromium/files/patch-net_url__request_url__request__context__builder.cc +++ b/www/ungoogled-chromium/files/patch-net_url__request_url__request__context__builder.cc @@ -1,6 +1,6 @@ ---- net/url_request/url_request_context_builder.cc.orig 2024-05-23 20:04:36 UTC +--- net/url_request/url_request_context_builder.cc.orig 2024-08-26 14:40:28 UTC +++ net/url_request/url_request_context_builder.cc -@@ -440,7 +440,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu +@@ -442,7 +442,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu } if (!proxy_resolution_service_) { diff --git a/www/ungoogled-chromium/files/patch-pdf_pdfium_pdfium__engine.cc b/www/ungoogled-chromium/files/patch-pdf_pdfium_pdfium__engine.cc index 34599a013120..89314b31467a 100644 --- a/www/ungoogled-chromium/files/patch-pdf_pdfium_pdfium__engine.cc +++ b/www/ungoogled-chromium/files/patch-pdf_pdfium_pdfium__engine.cc @@ -1,6 +1,6 @@ ---- pdf/pdfium/pdfium_engine.cc.orig 2024-07-31 14:19:23 UTC +--- pdf/pdfium/pdfium_engine.cc.orig 2024-08-26 14:40:28 UTC +++ pdf/pdfium/pdfium_engine.cc -@@ -92,7 +92,7 @@ +@@ -93,7 +93,7 @@ #include "gin/public/cppgc.h" #endif @@ -9,7 +9,7 @@ #include "pdf/pdfium/pdfium_font_linux.h" #endif -@@ -517,7 +517,7 @@ void InitializeSDK(bool enable_v8, +@@ -524,7 +524,7 @@ void InitializeSDK(bool enable_v8, FPDF_InitLibraryWithConfig(&config); diff --git a/www/ungoogled-chromium/files/patch-printing_backend_print__backend__cups.cc b/www/ungoogled-chromium/files/patch-printing_backend_print__backend__cups.cc index 26f10e2d9e4a..336acbc82a0d 100644 --- a/www/ungoogled-chromium/files/patch-printing_backend_print__backend__cups.cc +++ b/www/ungoogled-chromium/files/patch-printing_backend_print__backend__cups.cc @@ -1,6 +1,6 @@ ---- printing/backend/print_backend_cups.cc.orig 2024-07-31 14:19:23 UTC +--- printing/backend/print_backend_cups.cc.orig 2024-08-26 14:40:28 UTC +++ printing/backend/print_backend_cups.cc -@@ -27,7 +27,7 @@ +@@ -32,7 +32,7 @@ #include "printing/mojom/print.mojom.h" #include "url/gurl.h" @@ -9,7 +9,7 @@ #include "base/feature_list.h" #include "printing/backend/cups_connection.h" #include "printing/backend/print_backend_cups_ipp.h" -@@ -278,7 +278,7 @@ bool PrintBackendCUPS::IsValidPrinter(const std::strin +@@ -283,7 +283,7 @@ bool PrintBackendCUPS::IsValidPrinter(const std::strin #if !BUILDFLAG(IS_CHROMEOS) scoped_refptr<PrintBackend> PrintBackend::CreateInstanceImpl( const std::string& locale) { diff --git a/www/ungoogled-chromium/files/patch-remoting_host_policy__watcher.cc b/www/ungoogled-chromium/files/patch-remoting_host_policy__watcher.cc index 8a0655fba534..99dd71858aaa 100644 --- a/www/ungoogled-chromium/files/patch-remoting_host_policy__watcher.cc +++ b/www/ungoogled-chromium/files/patch-remoting_host_policy__watcher.cc @@ -1,6 +1,6 @@ ---- remoting/host/policy_watcher.cc.orig 2024-03-22 14:16:19 UTC +--- remoting/host/policy_watcher.cc.orig 2024-08-26 14:40:28 UTC +++ remoting/host/policy_watcher.cc -@@ -192,7 +192,7 @@ base::Value::Dict PolicyWatcher::GetDefaultPolicies() +@@ -178,7 +178,7 @@ base::Value::Dict PolicyWatcher::GetDefaultPolicies() true); result.Set(key::kRemoteAccessHostAllowEnterpriseFileTransfer, false); #endif diff --git a/www/ungoogled-chromium/files/patch-remoting_host_remoting__me2me__host.cc b/www/ungoogled-chromium/files/patch-remoting_host_remoting__me2me__host.cc index c90e63031f94..87f17f64e5e0 100644 --- a/www/ungoogled-chromium/files/patch-remoting_host_remoting__me2me__host.cc +++ b/www/ungoogled-chromium/files/patch-remoting_host_remoting__me2me__host.cc @@ -1,6 +1,6 @@ ---- remoting/host/remoting_me2me_host.cc.orig 2024-07-31 14:19:23 UTC +--- remoting/host/remoting_me2me_host.cc.orig 2024-08-26 14:40:28 UTC +++ remoting/host/remoting_me2me_host.cc -@@ -132,7 +132,7 @@ +@@ -129,7 +129,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) -@@ -143,13 +143,13 @@ +@@ -140,13 +140,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 -@@ -162,7 +162,7 @@ +@@ -159,7 +159,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) -@@ -192,7 +192,7 @@ const char kApplicationName[] = "chromoting"; +@@ -189,7 +189,7 @@ const char kApplicationName[] = "chromoting"; const char kStdinConfigPath[] = "-"; #endif // !defined(REMOTING_MULTI_PROCESS) @@ -43,7 +43,7 @@ // The command line switch used to pass name of the pipe to capture audio on // linux. const char kAudioPipeSwitchName[] = "audio-pipe-name"; -@@ -401,7 +401,7 @@ class HostProcess : public ConfigWatcher::Delegate, +@@ -397,7 +397,7 @@ class HostProcess : public ConfigWatcher::Delegate, std::unique_ptr<ChromotingHostContext> context_; @@ -52,7 +52,7 @@ // Watch for certificate changes and kill the host when changes occur std::unique_ptr<CertificateWatcher> cert_watcher_; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -471,7 +471,7 @@ class HostProcess : public ConfigWatcher::Delegate, +@@ -466,7 +466,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_; -@@ -778,7 +778,7 @@ void HostProcess::StartOnNetworkThread() { +@@ -773,7 +773,7 @@ void HostProcess::StartOnNetworkThread() { void HostProcess::ShutdownOnNetworkThread() { DCHECK(context_->network_task_runner()->BelongsToCurrentThread()); config_watcher_.reset(); @@ -70,16 +70,16 @@ cert_watcher_.reset(); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) } -@@ -844,7 +844,7 @@ void HostProcess::CreateAuthenticatorFactory() { - DCHECK(third_party_auth_config_.token_url.is_valid()); - DCHECK(third_party_auth_config_.token_validation_url.is_valid()); - +@@ -808,7 +808,7 @@ void HostProcess::CreateAuthenticatorFactory() { + base::MakeRefCounted<CorpSessionAuthzServiceClientFactory>( + context_->url_loader_factory(), service_account_email_, + oauth_refresh_token_)); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (!cert_watcher_) { cert_watcher_ = std::make_unique<CertificateWatcher>( base::BindRepeating(&HostProcess::ShutdownHost, -@@ -970,13 +970,13 @@ void HostProcess::StartOnUiThread() { +@@ -953,13 +953,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 = -@@ -1048,7 +1048,7 @@ void HostProcess::ShutdownOnUiThread() { +@@ -1036,7 +1036,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. -@@ -1056,7 +1056,7 @@ void HostProcess::ShutdownOnUiThread() { +@@ -1044,7 +1044,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(); })); -@@ -1414,7 +1414,7 @@ bool HostProcess::OnUsernamePolicyUpdate(const base::V +@@ -1401,7 +1401,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()) { -@@ -1878,7 +1878,7 @@ void HostProcess::StartHost() { +@@ -1849,7 +1849,7 @@ void HostProcess::StartHost() { corp_host_status_logger_->StartObserving(*session_manager); } @@ -131,7 +131,7 @@ desktop_environment_options_.set_enable_remote_webauthn(is_googler_); #endif -@@ -1911,7 +1911,7 @@ void HostProcess::StartHost() { +@@ -1882,7 +1882,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_ = -@@ -1943,7 +1943,7 @@ void HostProcess::StartHost() { +@@ -1914,7 +1914,7 @@ void HostProcess::StartHost() { host_->Start(host_owner_); @@ -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(); -@@ -2077,7 +2077,7 @@ int HostProcessMain() { +@@ -2048,7 +2048,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 ...) -@@ -2126,7 +2126,7 @@ int HostProcessMain() { +@@ -2097,7 +2097,7 @@ int HostProcessMain() { std::unique_ptr<net::NetworkChangeNotifier> network_change_notifier( net::NetworkChangeNotifier::CreateIfNeeded()); diff --git a/www/ungoogled-chromium/files/patch-sandbox_linux_services_libc__interceptor.cc b/www/ungoogled-chromium/files/patch-sandbox_linux_services_libc__interceptor.cc index 53a54bdd00ae..c5be6b5a888f 100644 --- a/www/ungoogled-chromium/files/patch-sandbox_linux_services_libc__interceptor.cc +++ b/www/ungoogled-chromium/files/patch-sandbox_linux_services_libc__interceptor.cc @@ -1,6 +1,6 @@ ---- sandbox/linux/services/libc_interceptor.cc.orig 2024-05-23 20:04:36 UTC +--- sandbox/linux/services/libc_interceptor.cc.orig 2024-08-26 14:40:28 UTC +++ sandbox/linux/services/libc_interceptor.cc -@@ -12,7 +12,9 @@ +@@ -17,7 +17,9 @@ #include <stddef.h> #include <stdint.h> #include <string.h> @@ -10,7 +10,7 @@ #include <sys/socket.h> #include <sys/types.h> #include <time.h> -@@ -168,7 +170,7 @@ bool ReadTimeStruct(base::PickleIterator* iter, +@@ -173,7 +175,7 @@ bool ReadTimeStruct(base::PickleIterator* iter, } else { base::AutoLock lock(g_timezones_lock.Get()); auto ret_pair = g_timezones.Get().insert(timezone); diff --git a/www/ungoogled-chromium/files/patch-sandbox_policy_BUILD.gn b/www/ungoogled-chromium/files/patch-sandbox_policy_BUILD.gn index 89d86ec1fb19..83445665d19b 100644 --- a/www/ungoogled-chromium/files/patch-sandbox_policy_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-sandbox_policy_BUILD.gn @@ -1,4 +1,4 @@ ---- sandbox/policy/BUILD.gn.orig 2024-02-25 20:22:18 UTC +--- sandbox/policy/BUILD.gn.orig 2024-08-26 14:40:28 UTC +++ sandbox/policy/BUILD.gn @@ -49,7 +49,7 @@ component("policy") { "//third_party/jni_zero", @@ -9,7 +9,7 @@ sources += [ "linux/bpf_audio_policy_linux.cc", "linux/bpf_audio_policy_linux.h", -@@ -120,6 +120,27 @@ component("policy") { +@@ -122,6 +122,27 @@ component("policy") { "//sandbox/linux:sandbox_services", "//sandbox/linux:seccomp_bpf", "//sandbox/linux:suid_sandbox_client", diff --git a/www/ungoogled-chromium/files/patch-sandbox_policy_features.cc b/www/ungoogled-chromium/files/patch-sandbox_policy_features.cc index cc9f18b9204e..d50d93abc067 100644 --- a/www/ungoogled-chromium/files/patch-sandbox_policy_features.cc +++ b/www/ungoogled-chromium/files/patch-sandbox_policy_features.cc @@ -1,4 +1,4 @@ ---- sandbox/policy/features.cc.orig 2024-05-23 20:04:36 UTC +--- sandbox/policy/features.cc.orig 2024-08-26 14:40:28 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. -@@ -131,7 +135,7 @@ BASE_FEATURE(kForceSpectreVariant2Mitigation, +@@ -147,7 +151,7 @@ BASE_FEATURE(kForceSpectreVariant2Mitigation, base::FEATURE_DISABLED_BY_DEFAULT); #endif // BUILDFLAG(IS_CHROMEOS_ASH) diff --git a/www/ungoogled-chromium/files/patch-sandbox_policy_features.h b/www/ungoogled-chromium/files/patch-sandbox_policy_features.h index e32367588168..6aa04de088ed 100644 --- a/www/ungoogled-chromium/files/patch-sandbox_policy_features.h +++ b/www/ungoogled-chromium/files/patch-sandbox_policy_features.h @@ -1,6 +1,6 @@ ---- sandbox/policy/features.h.orig 2024-05-23 20:04:36 UTC +--- sandbox/policy/features.h.orig 2024-08-26 14:40:28 UTC +++ sandbox/policy/features.h -@@ -44,7 +44,7 @@ SANDBOX_POLICY_EXPORT BASE_DECLARE_FEATURE(kSpectreVar +@@ -47,7 +47,7 @@ SANDBOX_POLICY_EXPORT BASE_DECLARE_FEATURE(kSpectreVar SANDBOX_POLICY_EXPORT BASE_DECLARE_FEATURE(kForceSpectreVariant2Mitigation); #endif // BUILDFLAG(IS_CHROMEOS_ASH) diff --git a/www/ungoogled-chromium/files/patch-services_device_geolocation_location__provider__manager.cc b/www/ungoogled-chromium/files/patch-services_device_geolocation_location__provider__manager.cc new file mode 100644 index 000000000000..9d932403cd29 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-services_device_geolocation_location__provider__manager.cc @@ -0,0 +1,11 @@ +--- services/device/geolocation/location_provider_manager.cc.orig 2024-08-26 14:40:28 UTC ++++ services/device/geolocation/location_provider_manager.cc +@@ -51,7 +51,7 @@ LocationProviderManager::LocationProviderManager( + #if BUILDFLAG(IS_ANDROID) + // On Android, default to using the platform location provider. + provider_manager_mode_ = kPlatformOnly; +-#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // On Ash / Lacros / Linux, default to using the network location provider. + provider_manager_mode_ = kNetworkOnly; + #else diff --git a/www/ungoogled-chromium/files/patch-services_device_public_mojom_BUILD.gn b/www/ungoogled-chromium/files/patch-services_device_public_mojom_BUILD.gn index ed8e7ff1e4c2..bb1845fb57a8 100644 --- a/www/ungoogled-chromium/files/patch-services_device_public_mojom_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-services_device_public_mojom_BUILD.gn @@ -1,6 +1,6 @@ ---- services/device/public/mojom/BUILD.gn.orig 2024-03-22 14:16:19 UTC +--- services/device/public/mojom/BUILD.gn.orig 2024-08-26 14:40:28 UTC +++ services/device/public/mojom/BUILD.gn -@@ -96,7 +96,7 @@ mojom("device_service") { +@@ -97,7 +97,7 @@ mojom("device_service") { enable_js_fuzzing = false enabled_features = [] diff --git a/www/ungoogled-chromium/files/patch-services_device_serial_serial__device__enumerator.cc b/www/ungoogled-chromium/files/patch-services_device_serial_serial__device__enumerator.cc index 31b89649ddae..d25cce144290 100644 --- a/www/ungoogled-chromium/files/patch-services_device_serial_serial__device__enumerator.cc +++ b/www/ungoogled-chromium/files/patch-services_device_serial_serial__device__enumerator.cc @@ -1,6 +1,6 @@ ---- services/device/serial/serial_device_enumerator.cc.orig 2023-03-10 11:01:21 UTC +--- services/device/serial/serial_device_enumerator.cc.orig 2024-08-26 14:40:28 UTC +++ services/device/serial/serial_device_enumerator.cc -@@ -12,7 +12,7 @@ +@@ -13,7 +13,7 @@ #include "build/build_config.h" #include "components/device_event_log/device_event_log.h" @@ -9,7 +9,7 @@ #include "services/device/serial/serial_device_enumerator_linux.h" #elif BUILDFLAG(IS_MAC) #include "services/device/serial/serial_device_enumerator_mac.h" -@@ -25,7 +25,7 @@ namespace device { +@@ -26,7 +26,7 @@ namespace device { // static std::unique_ptr<SerialDeviceEnumerator> SerialDeviceEnumerator::Create( scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) { diff --git a/www/ungoogled-chromium/files/patch-services_device_serial_serial__io__handler__posix.cc b/www/ungoogled-chromium/files/patch-services_device_serial_serial__io__handler__posix.cc index 2469d6018c21..85862cb79856 100644 --- a/www/ungoogled-chromium/files/patch-services_device_serial_serial__io__handler__posix.cc +++ b/www/ungoogled-chromium/files/patch-services_device_serial_serial__io__handler__posix.cc @@ -1,6 +1,6 @@ ---- services/device/serial/serial_io_handler_posix.cc.orig 2023-03-10 11:01:21 UTC +--- services/device/serial/serial_io_handler_posix.cc.orig 2024-08-26 14:40:28 UTC +++ services/device/serial/serial_io_handler_posix.cc -@@ -68,7 +68,7 @@ bool BitrateToSpeedConstant(int bitrate, speed_t* spee +@@ -73,7 +73,7 @@ bool BitrateToSpeedConstant(int bitrate, speed_t* spee BITRATE_TO_SPEED_CASE(9600) BITRATE_TO_SPEED_CASE(19200) BITRATE_TO_SPEED_CASE(38400) diff --git a/www/ungoogled-chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc b/www/ungoogled-chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc index 84ac3f1f7bdc..b6d1d9d824bd 100644 --- a/www/ungoogled-chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc +++ b/www/ungoogled-chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc @@ -1,6 +1,6 @@ ---- services/device/time_zone_monitor/time_zone_monitor_linux.cc.orig 2023-09-17 07:59:53 UTC +--- services/device/time_zone_monitor/time_zone_monitor_linux.cc.orig 2024-08-26 14:40:28 UTC +++ services/device/time_zone_monitor/time_zone_monitor_linux.cc -@@ -131,7 +131,11 @@ class TimeZoneMonitorLinuxImpl +@@ -136,7 +136,11 @@ class TimeZoneMonitorLinuxImpl // false positives are harmless, assuming the false positive rate is // reasonable. const char* const kFilesToWatch[] = { diff --git a/www/ungoogled-chromium/files/patch-services_device_usb_BUILD.gn b/www/ungoogled-chromium/files/patch-services_device_usb_BUILD.gn index 15fb01818971..cf63c76da561 100644 --- a/www/ungoogled-chromium/files/patch-services_device_usb_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-services_device_usb_BUILD.gn @@ -1,4 +1,4 @@ ---- services/device/usb/BUILD.gn.orig 2024-06-22 08:49:42 UTC +--- services/device/usb/BUILD.gn.orig 2024-08-26 14:40:28 UTC +++ services/device/usb/BUILD.gn @@ -91,7 +91,7 @@ static_library("usb") { deps += [ "//third_party/re2" ] @@ -23,7 +23,7 @@ if (is_linux || is_chromeos) { sources += [ "usb_device_linux.cc", -@@ -131,7 +138,7 @@ static_library("usb") { +@@ -135,7 +142,7 @@ static_library("usb") { deps += [ "//device/udev_linux" ] } diff --git a/www/ungoogled-chromium/files/patch-services_device_usb_usb__service.cc b/www/ungoogled-chromium/files/patch-services_device_usb_usb__service.cc index 022218e945d0..b5b45f581e09 100644 --- a/www/ungoogled-chromium/files/patch-services_device_usb_usb__service.cc +++ b/www/ungoogled-chromium/files/patch-services_device_usb_usb__service.cc @@ -1,6 +1,6 @@ ---- services/device/usb/usb_service.cc.orig 2024-06-22 08:49:42 UTC +--- services/device/usb/usb_service.cc.orig 2024-08-26 14:40:28 UTC +++ services/device/usb/usb_service.cc -@@ -20,12 +20,16 @@ +@@ -21,12 +21,16 @@ #if BUILDFLAG(IS_ANDROID) #include "services/device/usb/usb_service_android.h" @@ -18,7 +18,7 @@ #endif namespace device { -@@ -48,11 +52,13 @@ constexpr base::TaskTraits UsbService::kBlockingTaskTr +@@ -49,11 +53,13 @@ constexpr base::TaskTraits UsbService::kBlockingTaskTr std::unique_ptr<UsbService> UsbService::Create() { #if BUILDFLAG(IS_ANDROID) return base::WrapUnique(new UsbServiceAndroid()); diff --git a/www/ungoogled-chromium/files/patch-services_network_BUILD.gn b/www/ungoogled-chromium/files/patch-services_network_BUILD.gn index 7abf0c658abc..48533a560238 100644 --- a/www/ungoogled-chromium/files/patch-services_network_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-services_network_BUILD.gn @@ -1,6 +1,6 @@ ---- services/network/BUILD.gn.orig 2024-07-31 14:19:23 UTC +--- services/network/BUILD.gn.orig 2024-08-26 14:40:28 UTC +++ services/network/BUILD.gn -@@ -418,7 +418,6 @@ if (is_linux || is_chromeos) { +@@ -411,7 +411,6 @@ if (is_linux || is_chromeos) { ] deps = [ "//base:base", diff --git a/www/ungoogled-chromium/files/patch-services_network_network__context.cc b/www/ungoogled-chromium/files/patch-services_network_network__context.cc index 001f30349880..bf16725df4ee 100644 --- a/www/ungoogled-chromium/files/patch-services_network_network__context.cc +++ b/www/ungoogled-chromium/files/patch-services_network_network__context.cc @@ -1,4 +1,4 @@ ---- services/network/network_context.cc.orig 2024-07-31 14:19:23 UTC +--- services/network/network_context.cc.orig 2024-08-26 14:40:28 UTC +++ services/network/network_context.cc @@ -589,7 +589,7 @@ NetworkContext::NetworkContextHttpAuthPreferences:: NetworkContext::NetworkContextHttpAuthPreferences:: @@ -9,7 +9,7 @@ bool NetworkContext::NetworkContextHttpAuthPreferences::AllowGssapiLibraryLoad() const { if (network_service_) { -@@ -2355,7 +2355,7 @@ void NetworkContext::OnHttpAuthDynamicParamsChanged( +@@ -2384,7 +2384,7 @@ void NetworkContext::OnHttpAuthDynamicParamsChanged( http_auth_dynamic_network_service_params->android_negotiate_account_type); #endif // BUILDFLAG(IS_ANDROID) diff --git a/www/ungoogled-chromium/files/patch-services_network_network__context.h b/www/ungoogled-chromium/files/patch-services_network_network__context.h index 26399a392da8..94add3a69acb 100644 --- a/www/ungoogled-chromium/files/patch-services_network_network__context.h +++ b/www/ungoogled-chromium/files/patch-services_network_network__context.h @@ -1,6 +1,6 @@ ---- services/network/network_context.h.orig 2024-07-31 14:19:23 UTC +--- services/network/network_context.h.orig 2024-08-26 14:40:28 UTC +++ services/network/network_context.h -@@ -685,7 +685,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext +@@ -692,7 +692,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext public: explicit NetworkContextHttpAuthPreferences(NetworkService* network_service); ~NetworkContextHttpAuthPreferences() override; diff --git a/www/ungoogled-chromium/files/patch-services_network_network__service.cc b/www/ungoogled-chromium/files/patch-services_network_network__service.cc index 0ff11260eaea..5d35adbdd7c1 100644 --- a/www/ungoogled-chromium/files/patch-services_network_network__service.cc +++ b/www/ungoogled-chromium/files/patch-services_network_network__service.cc @@ -1,4 +1,4 @@ ---- services/network/network_service.cc.orig 2024-05-23 20:04:36 UTC +--- services/network/network_service.cc.orig 2024-08-26 14:40:28 UTC +++ services/network/network_service.cc @@ -99,7 +99,7 @@ #include "third_party/boringssl/src/include/openssl/cpu.h" @@ -9,7 +9,7 @@ BUILDFLAG(IS_CHROMEOS_LACROS) #include "components/os_crypt/sync/key_storage_config_linux.h" -@@ -983,7 +983,7 @@ void NetworkService::SetExplicitlyAllowedPorts( +@@ -975,7 +975,7 @@ void NetworkService::SetExplicitlyAllowedPorts( net::SetExplicitlyAllowedPorts(ports); } @@ -18,7 +18,7 @@ void NetworkService::SetGssapiLibraryLoadObserver( mojo::PendingRemote<mojom::GssapiLibraryLoadObserver> gssapi_library_load_observer) { -@@ -1065,7 +1065,7 @@ NetworkService::CreateHttpAuthHandlerFactory(NetworkCo +@@ -1057,7 +1057,7 @@ NetworkService::CreateHttpAuthHandlerFactory(NetworkCo ); } diff --git a/www/ungoogled-chromium/files/patch-services_network_public_cpp_BUILD.gn b/www/ungoogled-chromium/files/patch-services_network_public_cpp_BUILD.gn index fd2bac34badc..1e5bd99061e2 100644 --- a/www/ungoogled-chromium/files/patch-services_network_public_cpp_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-services_network_public_cpp_BUILD.gn @@ -1,6 +1,6 @@ ---- services/network/public/cpp/BUILD.gn.orig 2024-06-22 08:49:42 UTC +--- services/network/public/cpp/BUILD.gn.orig 2024-08-26 14:40:28 UTC +++ services/network/public/cpp/BUILD.gn -@@ -515,7 +515,7 @@ component("cpp_base") { +@@ -497,7 +497,7 @@ component("cpp_base") { sources += [ "transferable_directory_fuchsia.cc" ] } diff --git a/www/ungoogled-chromium/files/patch-services_network_public_mojom_BUILD.gn b/www/ungoogled-chromium/files/patch-services_network_public_mojom_BUILD.gn index 8735abb856bb..84fa4b1a2d8f 100644 --- a/www/ungoogled-chromium/files/patch-services_network_public_mojom_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-services_network_public_mojom_BUILD.gn @@ -1,6 +1,6 @@ ---- services/network/public/mojom/BUILD.gn.orig 2024-07-31 14:19:23 UTC +--- services/network/public/mojom/BUILD.gn.orig 2024-08-26 14:40:28 UTC +++ services/network/public/mojom/BUILD.gn -@@ -529,11 +529,11 @@ mojom("url_loader_base") { +@@ -493,11 +493,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" ] -@@ -1495,7 +1495,7 @@ mojom("mojom") { +@@ -1490,7 +1490,7 @@ mojom("mojom") { } } diff --git a/www/ungoogled-chromium/files/patch-services_on__device__model_pre__sandbox__init.cc b/www/ungoogled-chromium/files/patch-services_on__device__model_pre__sandbox__init.cc index fb191febc4a1..c7ef47768e31 100644 --- a/www/ungoogled-chromium/files/patch-services_on__device__model_pre__sandbox__init.cc +++ b/www/ungoogled-chromium/files/patch-services_on__device__model_pre__sandbox__init.cc @@ -1,4 +1,4 @@ ---- services/on_device_model/pre_sandbox_init.cc.orig 2024-06-22 08:49:42 UTC +--- services/on_device_model/pre_sandbox_init.cc.orig 2024-08-26 14:40:28 UTC +++ services/on_device_model/pre_sandbox_init.cc @@ -14,7 +14,7 @@ #include "services/on_device_model/ml/chrome_ml.h" // nogncheck @@ -9,7 +9,7 @@ #include "gpu/config/gpu_info_collector.h" // nogncheck #include "third_party/dawn/include/dawn/dawn_proc.h" // nogncheck #include "third_party/dawn/include/dawn/native/DawnNative.h" // nogncheck -@@ -31,7 +31,7 @@ namespace on_device_model { +@@ -25,7 +25,7 @@ namespace on_device_model { namespace { @@ -18,7 +18,7 @@ constexpr uint32_t kVendorIdAMD = 0x1002; constexpr uint32_t kVendorIdIntel = 0x8086; constexpr uint32_t kVendorIdNVIDIA = 0x10DE; -@@ -80,7 +80,7 @@ bool OnDeviceModelService::PreSandboxInit() { +@@ -74,7 +74,7 @@ bool OnDeviceModelService::PreSandboxInit() { } #endif @@ -27,7 +27,7 @@ // Warm any relevant drivers before attempting to bring up the sandbox. For // good measure we initialize a device instance for any adapter with an // appropriate backend on top of any integrated or discrete GPU. -@@ -116,7 +116,7 @@ bool OnDeviceModelService::PreSandboxInit() { +@@ -101,7 +101,7 @@ bool OnDeviceModelService::PreSandboxInit() { return true; } diff --git a/www/ungoogled-chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h b/www/ungoogled-chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h index 7e2a7662e2c0..9505ed51c799 100644 --- a/www/ungoogled-chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h +++ b/www/ungoogled-chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h @@ -1,6 +1,6 @@ ---- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h.orig 2022-10-01 07:40:07 UTC +--- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h.orig 2024-08-26 14:40:28 UTC +++ services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h -@@ -45,7 +45,7 @@ class COMPONENT_EXPORT( +@@ -53,7 +53,7 @@ class COMPONENT_EXPORT( mojom::RawOSMemDump*); static std::vector<mojom::VmRegionPtr> GetProcessMemoryMaps(base::ProcessId); @@ -9,7 +9,7 @@ static void SetProcSmapsForTesting(FILE*); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || // BUILDFLAG(IS_ANDROID) -@@ -62,7 +62,7 @@ class COMPONENT_EXPORT( +@@ -70,7 +70,7 @@ class COMPONENT_EXPORT( static std::vector<mojom::VmRegionPtr> GetProcessModules(base::ProcessId); #endif diff --git a/www/ungoogled-chromium/files/patch-services_screen__ai_public_cpp_utilities.cc b/www/ungoogled-chromium/files/patch-services_screen__ai_public_cpp_utilities.cc index aacc8523e4fb..3538ed75dd55 100644 --- a/www/ungoogled-chromium/files/patch-services_screen__ai_public_cpp_utilities.cc +++ b/www/ungoogled-chromium/files/patch-services_screen__ai_public_cpp_utilities.cc @@ -1,6 +1,6 @@ ---- services/screen_ai/public/cpp/utilities.cc.orig 2024-04-23 07:42:17 UTC +--- services/screen_ai/public/cpp/utilities.cc.orig 2024-08-26 14:40:28 UTC +++ services/screen_ai/public/cpp/utilities.cc -@@ -19,7 +19,7 @@ namespace screen_ai { +@@ -18,7 +18,7 @@ namespace screen_ai { namespace { @@ -9,7 +9,7 @@ constexpr char kBinaryPathSwitch[] = "screen-ai-binary"; #endif -@@ -40,7 +40,7 @@ constexpr char kScreenAIDlcRootPath[] = +@@ -39,7 +39,7 @@ constexpr char kScreenAIDlcRootPath[] = #endif #if BUILDFLAG(ENABLE_SCREEN_AI_BROWSERTESTS) @@ -18,7 +18,7 @@ constexpr base::FilePath::CharType kScreenAIResourcePathForTests[] = FILE_PATH_LITERAL("third_party/screen-ai/linux/resources"); #elif BUILDFLAG(IS_MAC) -@@ -127,7 +127,7 @@ base::FilePath GetComponentBinaryPathForTests() { +@@ -128,7 +128,7 @@ base::FilePath GetComponentBinaryPathForTests() { const char* GetBinaryPathSwitch() { // This is only used on Linux and ChromeOS. diff --git a/www/ungoogled-chromium/files/patch-services_video__capture_video__capture__service__impl.cc b/www/ungoogled-chromium/files/patch-services_video__capture_video__capture__service__impl.cc index 46d00e0397ae..f1820ffa7a79 100644 --- a/www/ungoogled-chromium/files/patch-services_video__capture_video__capture__service__impl.cc +++ b/www/ungoogled-chromium/files/patch-services_video__capture_video__capture__service__impl.cc @@ -1,6 +1,6 @@ ---- services/video_capture/video_capture_service_impl.cc.orig 2024-06-22 08:49:42 UTC +--- services/video_capture/video_capture_service_impl.cc.orig 2024-08-26 14:40:28 UTC +++ services/video_capture/video_capture_service_impl.cc -@@ -41,7 +41,7 @@ +@@ -42,7 +42,7 @@ #include "services/video_capture/lacros/device_factory_adapter_lacros.h" #endif // BUILDFLAG(IS_CHROMEOS_LACROS) @@ -9,7 +9,7 @@ #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" -@@ -109,7 +109,7 @@ class VideoCaptureServiceImpl::GpuDependenciesContext +@@ -110,7 +110,7 @@ class VideoCaptureServiceImpl::GpuDependenciesContext this}; }; @@ -18,7 +18,7 @@ // 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 -@@ -311,7 +311,7 @@ void VideoCaptureServiceImpl::LazyInitializeGpuDepende +@@ -323,7 +323,7 @@ void VideoCaptureServiceImpl::LazyInitializeGpuDepende gpu_dependencies_context_ = std::make_unique<GpuDependenciesContext>(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) @@ -27,7 +27,7 @@ { #else if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled()) { -@@ -433,7 +433,7 @@ void VideoCaptureServiceImpl::OnGpuInfoUpdate(const CH +@@ -455,7 +455,7 @@ void VideoCaptureServiceImpl::OnGpuInfoUpdate(const CH } #endif diff --git a/www/ungoogled-chromium/files/patch-services_video__capture_video__capture__service__impl.h b/www/ungoogled-chromium/files/patch-services_video__capture_video__capture__service__impl.h index 4a86c8f860db..8671391e5cdd 100644 --- a/www/ungoogled-chromium/files/patch-services_video__capture_video__capture__service__impl.h +++ b/www/ungoogled-chromium/files/patch-services_video__capture_video__capture__service__impl.h @@ -1,4 +1,4 @@ ---- services/video_capture/video_capture_service_impl.h.orig 2024-06-22 08:49:42 UTC +--- services/video_capture/video_capture_service_impl.h.orig 2024-08-26 14:40:28 UTC +++ services/video_capture/video_capture_service_impl.h @@ -27,7 +27,7 @@ #include "services/video_capture/ash/video_capture_device_factory_ash.h" @@ -9,7 +9,7 @@ #include "services/viz/public/cpp/gpu/gpu.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || // BUILDFLAG(IS_CHROMEOS_ASH) -@@ -71,7 +71,7 @@ class VideoCaptureServiceImpl : public mojom::VideoCap +@@ -75,7 +75,7 @@ class VideoCaptureServiceImpl : public mojom::VideoCap #if BUILDFLAG(IS_WIN) void OnGpuInfoUpdate(const CHROME_LUID& luid) override; #endif @@ -18,7 +18,7 @@ void SetVizGpu(std::unique_ptr<viz::Gpu> viz_gpu); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || // BUILDFLAG(IS_CHROMEOS_ASH) -@@ -112,7 +112,7 @@ class VideoCaptureServiceImpl : public mojom::VideoCap +@@ -120,7 +120,7 @@ class VideoCaptureServiceImpl : public mojom::VideoCap factory_receivers_ash_; #endif diff --git a/www/ungoogled-chromium/files/patch-skia_ext_skcolorspace__trfn.cc b/www/ungoogled-chromium/files/patch-skia_ext_skcolorspace__trfn.cc index a9e7816a5825..41b57a2566f7 100644 --- a/www/ungoogled-chromium/files/patch-skia_ext_skcolorspace__trfn.cc +++ b/www/ungoogled-chromium/files/patch-skia_ext_skcolorspace__trfn.cc @@ -1,8 +1,8 @@ ---- skia/ext/skcolorspace_trfn.cc.orig 2023-08-18 10:26:52 UTC +--- skia/ext/skcolorspace_trfn.cc.orig 2024-08-26 14:40:28 UTC +++ skia/ext/skcolorspace_trfn.cc -@@ -2,6 +2,8 @@ - // Use of this source code is governed by a BSD-style license that can be - // found in the LICENSE file. +@@ -7,6 +7,8 @@ + #pragma allow_unsafe_buffers + #endif +#include <cmath> + diff --git a/www/ungoogled-chromium/files/patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h b/www/ungoogled-chromium/files/patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h index 5f0f65772714..2bfb14624130 100644 --- a/www/ungoogled-chromium/files/patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h +++ b/www/ungoogled-chromium/files/patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h @@ -1,6 +1,6 @@ ---- third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.h.orig 2023-09-17 07:59:53 UTC +--- third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.h.orig 2024-08-26 14:40:28 UTC +++ third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.h -@@ -34,7 +34,7 @@ +@@ -35,7 +35,7 @@ #if defined(__ELF__) && !defined(__OpenBSD__) && !defined(__QNX__) && \ !defined(__native_client__) && !defined(__asmjs__) && \ !defined(__wasm__) && !defined(__HAIKU__) && !defined(__sun) && \ diff --git a/www/ungoogled-chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp b/www/ungoogled-chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp index 00ca7c32a16c..3397ef26be22 100644 --- a/www/ungoogled-chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp +++ b/www/ungoogled-chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp @@ -1,4 +1,4 @@ ---- third_party/angle/src/libANGLE/Display.cpp.orig 2024-07-31 14:19:23 UTC +--- third_party/angle/src/libANGLE/Display.cpp.orig 2024-08-26 14:40:28 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()) { -@@ -2157,7 +2157,7 @@ static ClientExtensions GenerateClientExtensions() +@@ -2158,7 +2158,7 @@ static ClientExtensions GenerateClientExtensions() extensions.x11Visual = true; #endif diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_public_platform_platform.h b/www/ungoogled-chromium/files/patch-third__party_blink_public_platform_platform.h index 872f830c4a9f..15a23c657129 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_public_platform_platform.h +++ b/www/ungoogled-chromium/files/patch-third__party_blink_public_platform_platform.h @@ -1,6 +1,6 @@ ---- third_party/blink/public/platform/platform.h.orig 2024-07-31 14:19:23 UTC +--- third_party/blink/public/platform/platform.h.orig 2024-08-26 14:40:28 UTC +++ third_party/blink/public/platform/platform.h -@@ -354,7 +354,7 @@ class BLINK_PLATFORM_EXPORT Platform { +@@ -368,7 +368,7 @@ class BLINK_PLATFORM_EXPORT Platform { return nullptr; } diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_public_platform_web__vector.h b/www/ungoogled-chromium/files/patch-third__party_blink_public_platform_web__vector.h index 9297af44a15d..724df7471651 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_public_platform_web__vector.h +++ b/www/ungoogled-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-02-03 15:42:55 UTC +--- third_party/blink/public/platform/web_vector.h.orig 2024-08-26 14:40:28 UTC +++ third_party/blink/public/platform/web_vector.h -@@ -86,7 +86,7 @@ class WebVector { +@@ -91,7 +91,7 @@ class WebVector { // The vector can be populated using reserve() and emplace_back(). WebVector() = default; diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc index 05e90b892d6c..6824d5cb8392 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc +++ b/www/ungoogled-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 2023-09-17 07:59:53 UTC +--- third_party/blink/renderer/controller/memory_usage_monitor_posix.cc.orig 2024-08-26 14:40:28 UTC +++ third_party/blink/renderer/controller/memory_usage_monitor_posix.cc -@@ -128,15 +128,17 @@ void MemoryUsageMonitorPosix::ResetFileDescriptors() { +@@ -133,15 +133,17 @@ void MemoryUsageMonitorPosix::ResetFileDescriptors() { void MemoryUsageMonitorPosix::SetProcFiles(base::File statm_file, base::File status_file) { diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_editing_editing__behavior.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_editing_editing__behavior.cc index 300f66b29bde..acce54b5ad21 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_editing_editing__behavior.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_editing_editing__behavior.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/editing/editing_behavior.cc.orig 2023-12-23 12:33:28 UTC +--- third_party/blink/renderer/core/editing/editing_behavior.cc.orig 2024-08-26 14:40:28 UTC +++ third_party/blink/renderer/core/editing/editing_behavior.cc -@@ -324,7 +324,7 @@ bool EditingBehavior::ShouldInsertCharacter(const Keyb +@@ -304,7 +304,7 @@ bool EditingBehavior::ShouldInsertCharacter(const Keyb // unexpected behaviour if (ch < ' ') return false; diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc index 950fa11fd97f..e4c294c1e781 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc +++ b/www/ungoogled-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-07-31 14:19:23 UTC +--- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2024-08-26 14:40:28 UTC +++ third_party/blink/renderer/core/exported/web_view_impl.cc @@ -427,7 +427,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' -@@ -3380,7 +3380,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs +@@ -3418,7 +3418,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/ungoogled-chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc index 2c8afa890b45..ce77dbcc4500 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc +++ b/www/ungoogled-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-07-31 14:19:23 UTC +--- third_party/blink/renderer/core/frame/web_frame_test.cc.orig 2024-08-26 14:40:28 UTC +++ third_party/blink/renderer/core/frame/web_frame_test.cc -@@ -6471,7 +6471,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) { +@@ -6477,7 +6477,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 \ -@@ -6880,7 +6880,7 @@ TEST_F(CompositedSelectionBoundsTest, LargeSelectionSc +@@ -6886,7 +6886,7 @@ TEST_F(CompositedSelectionBoundsTest, LargeSelectionSc TEST_F(CompositedSelectionBoundsTest, LargeSelectionNoScroll) { RunTest("composited_selection_bounds_large_selection_noscroll.html"); } diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc index 8b3648e02a6c..d838a453df6e 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig 2024-02-03 15:42:55 UTC +--- third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig 2024-08-26 14:40:28 UTC +++ third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc -@@ -50,7 +50,7 @@ constexpr base::TimeDelta kEncodeRowSlackBeforeDeadlin +@@ -55,7 +55,7 @@ constexpr base::TimeDelta kEncodeRowSlackBeforeDeadlin /* The value is based on user statistics on Nov 2017. */ #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc index 7d27e2d388b4..b5d5dd794b49 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/paint/paint_layer.cc.orig 2024-04-23 07:42:17 UTC +--- third_party/blink/renderer/core/paint/paint_layer.cc.orig 2024-08-26 14:40:28 UTC +++ third_party/blink/renderer/core/paint/paint_layer.cc -@@ -122,7 +122,7 @@ namespace blink { +@@ -120,7 +120,7 @@ namespace blink { namespace { diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc index 39894d210a6e..fcf5be652d8b 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2024-07-31 14:19:23 UTC +--- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2024-08-26 14:40:28 UTC +++ third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc @@ -149,7 +149,7 @@ bool ScrollbarThemeAura::SupportsDragSnapBack() const // is true for at least GTK and QT apps). @@ -9,7 +9,7 @@ return false; #else return true; -@@ -371,7 +371,7 @@ bool ScrollbarThemeAura::ShouldCenterOnThumb(const Scr +@@ -372,7 +372,7 @@ bool ScrollbarThemeAura::ShouldCenterOnThumb(const Scr const WebMouseEvent& event) const { // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc index e7186fa96e7c..750afd2df97f 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc.orig 2024-02-03 15:42:55 UTC +--- third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc.orig 2024-08-26 14:40:28 UTC +++ third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc -@@ -66,7 +66,11 @@ void XSLTProcessor::GenericErrorFunc(void*, const char +@@ -71,7 +71,11 @@ void XSLTProcessor::GenericErrorFunc(void*, const char // It would be nice to do something with this error message. } diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc index 006968f87627..d6c27cc8a12c 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig 2024-07-31 14:19:23 UTC +--- third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig 2024-08-26 14:40:28 UTC +++ third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc -@@ -301,7 +301,7 @@ TEST_F(WebRtcAudioRendererTest, DISABLED_VerifySinkPar +@@ -302,7 +302,7 @@ TEST_F(WebRtcAudioRendererTest, DISABLED_VerifySinkPar SetupRenderer(kDefaultOutputDeviceId); renderer_proxy_->Start(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \ diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc index 39c80d18d720..29debe6930d0 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc.orig 2024-04-23 07:42:17 UTC +--- third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc.orig 2024-08-26 14:40:28 UTC +++ third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc -@@ -463,7 +463,7 @@ class AudioWorkletThreadPriorityTest +@@ -468,7 +468,7 @@ class AudioWorkletThreadPriorityTest // TODO(crbug.com/1022888): The worklet thread priority is always NORMAL // on OS_LINUX and OS_CHROMEOS regardless of the thread priority setting. diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc index 1897f1d387ed..e5867273e911 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc +++ b/www/ungoogled-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-07-31 14:19:23 UTC +--- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig 2024-08-26 14:40:28 UTC +++ third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -@@ -6308,7 +6308,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid +@@ -6302,7 +6302,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid constexpr bool kAllowZeroCopyImages = true; #endif diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc index 218c348794c3..e023941bf4de 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/webgpu/gpu_queue.cc.orig 2024-07-31 14:19:23 UTC +--- third_party/blink/renderer/modules/webgpu/gpu_queue.cc.orig 2024-08-26 14:40:28 UTC +++ third_party/blink/renderer/modules/webgpu/gpu_queue.cc -@@ -783,7 +783,7 @@ bool GPUQueue::CopyFromCanvasSourceImage( +@@ -788,7 +788,7 @@ bool GPUQueue::CopyFromCanvasSourceImage( // on linux platform. // TODO(crbug.com/1424119): using a webgpu mailbox texture on the OpenGLES // backend is failing for unknown reasons. diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn index 9c53286c661c..4ce5e0fd33c9 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/BUILD.gn.orig 2024-07-31 14:19:23 UTC +--- third_party/blink/renderer/platform/BUILD.gn.orig 2024-08-26 14:40:28 UTC +++ third_party/blink/renderer/platform/BUILD.gn -@@ -1996,7 +1996,7 @@ static_library("test_support") { +@@ -2006,7 +2006,7 @@ static_library("test_support") { ] # fuzzed_data_provider may not work with a custom toolchain. diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc index d58a8bc057c7..c0606eddd2f9 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2024-03-22 14:16:19 UTC +--- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2024-08-26 14:40:28 UTC +++ third_party/blink/renderer/platform/fonts/font_cache.cc -@@ -73,7 +73,7 @@ extern const char kNotoColorEmojiCompat[] = "Noto Colo +@@ -79,7 +79,7 @@ extern const char kNotoColorEmojiCompat[] = "Noto Colo SkFontMgr* FontCache::static_font_manager_ = nullptr; @@ -9,7 +9,7 @@ float FontCache::device_scale_factor_ = 1.0; #endif -@@ -124,7 +124,7 @@ const FontPlatformData* FontCache::SystemFontPlatformD +@@ -130,7 +130,7 @@ const FontPlatformData* FontCache::SystemFontPlatformD const FontDescription& font_description) { const AtomicString& family = FontCache::SystemFontFamily(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || \ diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h index 0e1030a1c043..8eab1e04a44d 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/platform/fonts/font_cache.h.orig 2024-03-22 14:16:19 UTC +--- third_party/blink/renderer/platform/fonts/font_cache.h.orig 2024-08-26 14:40:28 UTC +++ third_party/blink/renderer/platform/fonts/font_cache.h @@ -55,7 +55,7 @@ #include "third_party/skia/include/core/SkFontMgr.h" @@ -9,16 +9,16 @@ #include "ui/gfx/font_fallback_linux.h" #endif -@@ -163,7 +163,7 @@ class PLATFORM_EXPORT FontCache final { - static void PrewarmFamily(const AtomicString& family_name) {} - #endif +@@ -165,7 +165,7 @@ class PLATFORM_EXPORT FontCache final { + + static void MaybePreloadSystemFonts(); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // These are needed for calling QueryRenderStyleForStrike, since // gfx::GetFontRenderParams makes distinctions based on DSF. static float DeviceScaleFactor() { return device_scale_factor_; } -@@ -239,7 +239,7 @@ class PLATFORM_EXPORT FontCache final { +@@ -241,7 +241,7 @@ class PLATFORM_EXPORT FontCache final { const char* locale_family_name); #endif // BUILDFLAG(IS_ANDROID) @@ -27,7 +27,7 @@ static bool GetFontForCharacter(UChar32, const char* preferred_locale, gfx::FallbackFontData*); -@@ -312,7 +312,7 @@ class PLATFORM_EXPORT FontCache final { +@@ -314,7 +314,7 @@ class PLATFORM_EXPORT FontCache final { const FontFaceCreationParams&, std::string& name); @@ -36,7 +36,7 @@ static AtomicString GetFamilyNameForCharacter(SkFontMgr*, UChar32, const FontDescription&, -@@ -349,7 +349,7 @@ class PLATFORM_EXPORT FontCache final { +@@ -351,7 +351,7 @@ class PLATFORM_EXPORT FontCache final { bool is_test_font_mgr_ = false; #endif // BUILDFLAG(IS_WIN) diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc index 8d874f72c0dd..2b140a7183d1 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/fonts/font_description.cc.orig 2024-07-31 14:19:23 UTC +--- third_party/blink/renderer/platform/fonts/font_description.cc.orig 2024-08-26 14:40:28 UTC +++ third_party/blink/renderer/platform/fonts/font_description.cc -@@ -39,7 +39,7 @@ +@@ -44,7 +44,7 @@ #include "third_party/blink/renderer/platform/wtf/text/string_hash.h" #include "third_party/blink/renderer/platform/wtf/text/string_hasher.h" @@ -9,7 +9,7 @@ #include "third_party/blink/renderer/platform/fonts/font_cache.h" #endif -@@ -277,7 +277,7 @@ FontCacheKey FontDescription::CacheKey( +@@ -282,7 +282,7 @@ FontCacheKey FontDescription::CacheKey( static_cast<unsigned>(fields_.orientation_) << 1 | // bit 2-3 static_cast<unsigned>(fields_.subpixel_text_position_); // bit 1 diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__platform__data.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__platform__data.cc index 371900dbd649..ef4cd48232de 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__platform__data.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__platform__data.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/fonts/font_platform_data.cc.orig 2024-06-22 08:49:42 UTC +--- third_party/blink/renderer/platform/fonts/font_platform_data.cc.orig 2024-08-26 14:40:28 UTC +++ third_party/blink/renderer/platform/fonts/font_platform_data.cc -@@ -49,7 +49,7 @@ +@@ -54,7 +54,7 @@ namespace blink { namespace { @@ -9,7 +9,7 @@ // Getting the system font render style takes a significant amount of time on // Linux because looking up fonts using fontconfig can be very slow. We fetch // the render style for each font family and text size, while it's very -@@ -128,7 +128,7 @@ FontPlatformData::FontPlatformData(sk_sp<SkTypeface> t +@@ -133,7 +133,7 @@ FontPlatformData::FontPlatformData(sk_sp<SkTypeface> t style_ = WebFontRenderStyle::GetDefault(); #if !BUILDFLAG(IS_WIN) WebFontRenderStyle system_style; diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc index deb44ebf8bed..09efb0a442d5 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig 2024-05-23 20:04:36 UTC +--- third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig 2024-08-26 14:40:28 UTC +++ third_party/blink/renderer/platform/graphics/video_frame_submitter.cc -@@ -407,7 +407,7 @@ void VideoFrameSubmitter::OnBeginFrame( +@@ -418,7 +418,7 @@ void VideoFrameSubmitter::OnBeginFrame( continue; auto& feedback = timing_details.find(frame_token)->value.presentation_feedback; diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 index 49836e3db510..3cf917c8dae6 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 +++ b/www/ungoogled-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-07-31 14:19:23 UTC +--- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2024-08-26 14:40:28 UTC +++ third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -324,7 +324,7 @@ +@@ -344,7 +344,7 @@ name: "AppTitle", status: "experimental", origin_trial_feature_name: "AppTitle", @@ -9,25 +9,7 @@ base_feature: "WebAppEnableAppTitle", }, { -@@ -1534,7 +1534,7 @@ - status: "test", - base_feature: "none", - origin_trial_feature_name: "FedCmContinueOnBundle", -- origin_trial_os: ["win", "mac", "linux", "chromeos"], -+ origin_trial_os: ["win", "mac", "linux", "chromeos", "openbsd", "freebsd"], - origin_trial_allows_third_party: true, - }, - { -@@ -1551,7 +1551,7 @@ - status: "test", - base_feature: "none", - origin_trial_feature_name: "FedCmButtonMode", -- origin_trial_os: ["win", "mac", "linux", "chromeos"], -+ origin_trial_os: ["win", "mac", "linux", "chromeos", "openbsd", "freebsd"], - origin_trial_allows_third_party: true, - }, - { -@@ -1596,7 +1596,7 @@ +@@ -1703,7 +1703,7 @@ base_feature: "none", public: true, origin_trial_feature_name: "FedCmMultipleIdentityProviders", @@ -36,16 +18,7 @@ origin_trial_allows_third_party: true, }, { -@@ -1934,7 +1934,7 @@ - base_feature_status: "enabled", - copied_from_base_feature_if: "overridden", - origin_trial_feature_name: "FullscreenPopupWindows", -- origin_trial_os: ["win", "mac", "linux", "chromeos"], -+ origin_trial_os: ["win", "mac", "linux", "chromeos", "openbsd", "freebsd"], - }, - { - name: "GamepadButtonAxisEvents", -@@ -3011,7 +3011,7 @@ +@@ -3114,7 +3114,7 @@ // Tracking bug for the implementation: https://crbug.com/1462930 name: "PermissionElement", origin_trial_feature_name: "PermissionElement", @@ -54,7 +27,7 @@ status: "experimental", public: true, base_feature_status: "enabled", -@@ -3146,7 +3146,7 @@ +@@ -3241,7 +3241,7 @@ { name: "PrivateNetworkAccessPermissionPrompt", origin_trial_feature_name: "PrivateNetworkAccessPermissionPrompt", @@ -63,7 +36,7 @@ status: "stable", public: true, base_feature: "none", -@@ -4122,7 +4122,7 @@ +@@ -4204,7 +4204,7 @@ name: "UnrestrictedSharedArrayBuffer", base_feature: "none", origin_trial_feature_name: "UnrestrictedSharedArrayBuffer", @@ -72,7 +45,7 @@ }, // Enables using policy-controlled feature "usb-unrestricted" to allow // isolated context to access protected USB interface classes and to -@@ -4291,7 +4291,7 @@ +@@ -4373,7 +4373,7 @@ { name: "WebAppScopeExtensions", origin_trial_feature_name: "WebAppScopeExtensions", @@ -81,7 +54,7 @@ status: "experimental", base_feature: "none", }, -@@ -4334,7 +4334,7 @@ +@@ -4416,7 +4416,7 @@ status: "experimental", base_feature: "none", origin_trial_feature_name: "WebAppUrlHandling", diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_video__capture_video__capture__impl.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_video__capture_video__capture__impl.cc deleted file mode 100644 index 841ebcc75e30..000000000000 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_video__capture_video__capture__impl.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/blink/renderer/platform/video_capture/video_capture_impl.cc.orig 2024-07-31 14:19:23 UTC -+++ third_party/blink/renderer/platform/video_capture/video_capture_impl.cc -@@ -608,7 +608,7 @@ bool VideoCaptureImpl::BindVideoFrameOnMediaTaskRunner - } - - const unsigned texture_target = --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Explicitly set GL_TEXTURE_EXTERNAL_OES if necessary: - // `media::VideoFrame::RequiresExternalSampler()` requires it for NV12 - // format, while `ClientSharedImage::GetTextureTarget(BufferUsage, diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc index d773ad737982..023bb6be0e05 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/wtf/stack_util.cc.orig 2024-07-31 14:19:23 UTC +--- third_party/blink/renderer/platform/wtf/stack_util.cc.orig 2024-08-26 14:40:28 UTC +++ third_party/blink/renderer/platform/wtf/stack_util.cc -@@ -19,6 +19,11 @@ +@@ -23,6 +23,11 @@ extern "C" void* __libc_stack_end; // NOLINT #endif @@ -12,7 +12,7 @@ namespace WTF { size_t GetUnderestimatedStackSize() { -@@ -63,6 +68,8 @@ size_t GetUnderestimatedStackSize() { +@@ -67,6 +72,8 @@ size_t GetUnderestimatedStackSize() { // low as 512k. // return 512 * 1024; @@ -21,7 +21,7 @@ #elif BUILDFLAG(IS_APPLE) // pthread_get_stacksize_np() returns too low a value for the main thread on // OSX 10.9, -@@ -150,6 +157,13 @@ void* GetStackStart() { +@@ -154,6 +161,13 @@ void* GetStackStart() { ::GetCurrentThreadStackLimits(&lowLimit, &highLimit); return reinterpret_cast<void*>(highLimit); #endif diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_wtf_text_text__codec__icu.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_wtf_text_text__codec__icu.cc index bbf2e9599a51..8b091da1cc17 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_wtf_text_text__codec__icu.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_wtf_text_text__codec__icu.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc.orig 2024-06-22 08:49:42 UTC +--- third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc.orig 2024-08-26 14:40:28 UTC +++ third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc -@@ -610,6 +610,7 @@ static void GbkUrlEscapedEntityCallack( +@@ -615,6 +615,7 @@ static void GbkUrlEscapedEntityCallack( code_point, reason, err); } @@ -8,7 +8,7 @@ static void GbkCallbackSubstitute(const void* context, UConverterFromUnicodeArgs* from_unicode_args, const UChar* code_units, -@@ -627,6 +628,7 @@ static void GbkCallbackSubstitute(const void* context, +@@ -632,6 +633,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/ungoogled-chromium/files/patch-third__party_crashpad_crashpad_util_posix_symbolic__constants__posix.cc b/www/ungoogled-chromium/files/patch-third__party_crashpad_crashpad_util_posix_symbolic__constants__posix.cc index 5ab689a3ce36..b0c4fa5de7dc 100644 --- a/www/ungoogled-chromium/files/patch-third__party_crashpad_crashpad_util_posix_symbolic__constants__posix.cc +++ b/www/ungoogled-chromium/files/patch-third__party_crashpad_crashpad_util_posix_symbolic__constants__posix.cc @@ -1,6 +1,6 @@ ---- third_party/crashpad/crashpad/util/posix/symbolic_constants_posix.cc.orig 2022-10-01 07:40:07 UTC +--- third_party/crashpad/crashpad/util/posix/symbolic_constants_posix.cc.orig 2024-08-26 14:40:28 UTC +++ third_party/crashpad/crashpad/util/posix/symbolic_constants_posix.cc -@@ -67,7 +67,7 @@ constexpr const char* kSignalNames[] = { +@@ -68,7 +68,7 @@ constexpr const char* kSignalNames[] = { "INFO", "USR1", "USR2", @@ -9,7 +9,7 @@ #if defined(ARCH_CPU_MIPS_FAMILY) "HUP", "INT", -@@ -138,7 +138,7 @@ constexpr const char* kSignalNames[] = { +@@ -139,7 +139,7 @@ constexpr const char* kSignalNames[] = { #endif // defined(ARCH_CPU_MIPS_FAMILY) #endif }; diff --git a/www/ungoogled-chromium/files/patch-third__party_libc++_src_src_chrono.cpp b/www/ungoogled-chromium/files/patch-third__party_libc++_src_src_chrono.cpp index e11f0e4d7db9..eef4c04585fe 100644 --- a/www/ungoogled-chromium/files/patch-third__party_libc++_src_src_chrono.cpp +++ b/www/ungoogled-chromium/files/patch-third__party_libc++_src_src_chrono.cpp @@ -1,11 +1,11 @@ ---- third_party/libc++/src/src/chrono.cpp.orig 2024-02-25 20:22:18 UTC +--- third_party/libc++/src/src/chrono.cpp.orig 2024-08-26 14:40:28 UTC +++ third_party/libc++/src/src/chrono.cpp -@@ -31,7 +31,7 @@ - # include <sys/time.h> // for gettimeofday and timeval - #endif +@@ -33,7 +33,7 @@ --#if defined(__APPLE__) || defined(__gnu_hurd__) || (defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0) -+#if defined(__APPLE__) || defined(__gnu_hurd__) || (defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0) || defined(__OpenBSD__) || defined(__FreeBSD__) + // OpenBSD does not have a fully conformant suite of POSIX timers, but + // it does have clock_gettime and CLOCK_MONOTONIC which is all we need. +-#if defined(__APPLE__) || defined(__gnu_hurd__) || defined(__OpenBSD__) || (defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0) ++#if defined(__APPLE__) || defined(__gnu_hurd__) || defined(__OpenBSD__) || (defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0) || defined(__FreeBSD__) # define _LIBCPP_HAS_CLOCK_GETTIME #endif diff --git a/www/ungoogled-chromium/files/patch-third__party_node_node.gni b/www/ungoogled-chromium/files/patch-third__party_node_node.gni index 88f078a34246..d5338b0d33da 100644 --- a/www/ungoogled-chromium/files/patch-third__party_node_node.gni +++ b/www/ungoogled-chromium/files/patch-third__party_node_node.gni @@ -1,6 +1,6 @@ ---- third_party/node/node.gni.orig 2024-07-31 14:19:23 UTC +--- third_party/node/node.gni.orig 2024-08-26 14:40:28 UTC +++ third_party/node/node.gni -@@ -19,7 +19,7 @@ template("node") { +@@ -22,7 +22,7 @@ template("node") { # When use_remoteexec=true, node actions may run on remote # Linux worker. So it should include linux node binary in inputs. diff --git a/www/ungoogled-chromium/files/patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp b/www/ungoogled-chromium/files/patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp index ee1e6b98c78f..d8c6cc517a76 100644 --- a/www/ungoogled-chromium/files/patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp +++ b/www/ungoogled-chromium/files/patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp @@ -1,4 +1,4 @@ ---- third_party/pdfium/core/fxge/linux/fx_linux_impl.cpp.orig 2024-07-31 14:19:23 UTC +--- third_party/pdfium/core/fxge/linux/fx_linux_impl.cpp.orig 2024-08-26 14:40:28 UTC +++ third_party/pdfium/core/fxge/linux/fx_linux_impl.cpp @@ -20,7 +20,7 @@ #include "core/fxge/fx_font.h" @@ -9,7 +9,7 @@ #error "Included on the wrong platform" #endif -@@ -172,9 +172,8 @@ class CLinuxPlatform : public CFX_GEModule::PlatformIf +@@ -173,9 +173,8 @@ class CLinuxPlatform : public CFX_GEModule::PlatformIf std::unique_ptr<SystemFontInfoIface> CreateDefaultSystemFontInfo() override { auto pInfo = std::make_unique<CFX_LinuxFontInfo>(); if (!pInfo->ParseFontCfg(CFX_GEModule::Get()->GetUserFontPaths())) { diff --git a/www/ungoogled-chromium/files/patch-third__party_perfetto_src_base_utils.cc b/www/ungoogled-chromium/files/patch-third__party_perfetto_src_base_utils.cc new file mode 100644 index 000000000000..b2570eae5ba9 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-third__party_perfetto_src_base_utils.cc @@ -0,0 +1,26 @@ +--- third_party/perfetto/src/base/utils.cc.orig 2024-08-26 14:40:28 UTC ++++ third_party/perfetto/src/base/utils.cc +@@ -38,8 +38,9 @@ + #include <mach/vm_page_size.h> + #endif + +-#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) + #include <linux/prctl.h> + #include <sys/prctl.h> + +@@ -338,8 +339,9 @@ void AlignedFree(void* ptr) { + } + + bool IsSyncMemoryTaggingEnabled() { +-#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) + // Compute only once per lifetime of the process. + static bool cached_value = [] { + const int res = prctl(PR_GET_TAGGED_ADDR_CTRL, 0, 0, 0, 0); diff --git a/www/ungoogled-chromium/files/patch-third__party_speech-dispatcher_libspeechd__version.h b/www/ungoogled-chromium/files/patch-third__party_speech-dispatcher_libspeechd__version.h index 69d659c7a22b..5da04c1c48d4 100644 --- a/www/ungoogled-chromium/files/patch-third__party_speech-dispatcher_libspeechd__version.h +++ b/www/ungoogled-chromium/files/patch-third__party_speech-dispatcher_libspeechd__version.h @@ -1,4 +1,4 @@ ---- third_party/speech-dispatcher/libspeechd_version.h.orig 2024-07-31 14:19:23 UTC +--- third_party/speech-dispatcher/libspeechd_version.h.orig 2024-08-26 14:40:28 UTC +++ third_party/speech-dispatcher/libspeechd_version.h @@ -0,0 +1,29 @@ +/* @@ -19,7 +19,7 @@ + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see <https://www.gnu.org/licenses/>. + * -+ * $Id: patch-third_party_speech-dispatcher_libspeechd_version_h,v 1.8 2024/07/29 16:20:10 robert Exp $ ++ * $Id: patch-third_party_speech-dispatcher_libspeechd_version_h,v 1.9 2024/08/25 14:47:17 robert Exp $ + */ + +#ifndef _LIBSPEECHD_VERSION_H diff --git a/www/ungoogled-chromium/files/patch-third__party_wayland_BUILD.gn b/www/ungoogled-chromium/files/patch-third__party_wayland_BUILD.gn index dc8a7f1f553b..58c322304288 100644 --- a/www/ungoogled-chromium/files/patch-third__party_wayland_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-third__party_wayland_BUILD.gn @@ -1,14 +1,14 @@ ---- third_party/wayland/BUILD.gn.orig 2023-02-11 09:11:04 UTC +--- third_party/wayland/BUILD.gn.orig 2024-08-26 14:40:28 UTC +++ third_party/wayland/BUILD.gn -@@ -22,6 +22,11 @@ config("wayland_config") { - "src/src", - ] +@@ -24,6 +24,11 @@ if (!use_system_libwayland) { + "src/src", + ] -+ if (is_bsd) { -+ include_dirs += [ "/usr/local/include/libepoll-shim" ] -+ libs = [ "epoll-shim" ] -+ } ++ if (is_bsd) { ++ include_dirs += [ "/usr/local/include/libepoll-shim" ] ++ libs = [ "epoll-shim" ] ++ } + - # Client/Server headers are automatically generated. Though, we still need - # to pass the path where these headers are located. - include_dirs += [ "$root_gen_dir/third_party/wayland/src/protocol" ] + # Client/Server headers are automatically generated. Though, we still need + # to pass the path where these headers are located. + include_dirs += [ "$root_gen_dir/third_party/wayland/src/protocol" ] diff --git a/www/ungoogled-chromium/files/patch-third__party_webrtc_BUILD.gn b/www/ungoogled-chromium/files/patch-third__party_webrtc_BUILD.gn index d1c05f84126f..876cb5e5441e 100644 --- a/www/ungoogled-chromium/files/patch-third__party_webrtc_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-third__party_webrtc_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/webrtc/BUILD.gn.orig 2024-06-22 08:49:42 UTC +--- third_party/webrtc/BUILD.gn.orig 2024-08-26 14:40:28 UTC +++ third_party/webrtc/BUILD.gn -@@ -219,6 +219,9 @@ config("common_inherited_config") { +@@ -215,6 +215,9 @@ config("common_inherited_config") { if (is_linux || is_chromeos) { defines += [ "WEBRTC_LINUX" ] } diff --git a/www/ungoogled-chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn b/www/ungoogled-chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn index 4598f976e706..45b90c336a98 100644 --- a/www/ungoogled-chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn @@ -1,4 +1,4 @@ ---- tools/perf/chrome_telemetry_build/BUILD.gn.orig 2024-02-25 20:22:18 UTC +--- tools/perf/chrome_telemetry_build/BUILD.gn.orig 2024-08-26 14:40:28 UTC +++ tools/perf/chrome_telemetry_build/BUILD.gn @@ -47,7 +47,7 @@ group("telemetry_chrome_test") { data_deps += [ "//chrome:reorder_imports" ] @@ -6,7 +6,7 @@ - if (is_linux || is_chromeos) { + if ((is_linux || is_chromeos) && !is_bsd) { - data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] + data_deps += [ "//third_party/breakpad:dump_syms" ] # CrOS currently has issues with the locally compiled version of @@ -178,7 +178,7 @@ group("telemetry_chrome_test_without_chrome") { diff --git a/www/ungoogled-chromium/files/patch-ui_base_ui__base__features.cc b/www/ungoogled-chromium/files/patch-ui_base_ui__base__features.cc index c5f5c881a554..599ef2ac9af4 100644 --- a/www/ungoogled-chromium/files/patch-ui_base_ui__base__features.cc +++ b/www/ungoogled-chromium/files/patch-ui_base_ui__base__features.cc @@ -1,6 +1,15 @@ ---- ui/base/ui_base_features.cc.orig 2024-06-22 08:49:42 UTC +--- ui/base/ui_base_features.cc.orig 2024-08-26 14:40:28 UTC +++ ui/base/ui_base_features.cc -@@ -245,7 +245,7 @@ BASE_FEATURE(kExperimentalFlingAnimation, +@@ -157,7 +157,7 @@ BASE_FEATURE(kWaylandPerSurfaceScale, + base::FEATURE_DISABLED_BY_DEFAULT); + #endif // BUILDFLAG(IS_OZONE) + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // 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) +@@ -259,7 +259,7 @@ BASE_FEATURE(kExperimentalFlingAnimation, "ExperimentalFlingAnimation", // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +18,7 @@ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ !BUILDFLAG(IS_CHROMEOS_LACROS)) base::FEATURE_ENABLED_BY_DEFAULT -@@ -339,7 +339,7 @@ bool IsForcedColorsEnabled() { +@@ -363,7 +363,7 @@ bool IsForcedColorsEnabled() { BASE_FEATURE(kEyeDropper, "EyeDropper", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-ui_base_ui__base__features.h b/www/ungoogled-chromium/files/patch-ui_base_ui__base__features.h new file mode 100644 index 000000000000..cf6d30556d0c --- /dev/null +++ b/www/ungoogled-chromium/files/patch-ui_base_ui__base__features.h @@ -0,0 +1,11 @@ +--- ui/base/ui_base_features.h.orig 2024-08-26 14:40:28 UTC ++++ ui/base/ui_base_features.h +@@ -138,7 +138,7 @@ COMPONENT_EXPORT(UI_BASE_FEATURES) + BASE_DECLARE_FEATURE(kWaylandPerSurfaceScale); + #endif // BUILDFLAG(IS_OZONE) + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + COMPONENT_EXPORT(UI_BASE_FEATURES) + BASE_DECLARE_FEATURE(kOverrideDefaultOzonePlatformHintToAuto); + #endif // BUILDFLAG(IS_LINUX) diff --git a/www/ungoogled-chromium/files/patch-ui_base_ui__base__switches.cc b/www/ungoogled-chromium/files/patch-ui_base_ui__base__switches.cc index 61756cf2970b..5fadfe20a8cb 100644 --- a/www/ungoogled-chromium/files/patch-ui_base_ui__base__switches.cc +++ b/www/ungoogled-chromium/files/patch-ui_base_ui__base__switches.cc @@ -1,4 +1,4 @@ ---- ui/base/ui_base_switches.cc.orig 2023-10-13 13:20:35 UTC +--- ui/base/ui_base_switches.cc.orig 2024-08-26 14:40:28 UTC +++ ui/base/ui_base_switches.cc @@ -31,13 +31,13 @@ const char kShowMacOverlayBorders[] = "show-mac-overla const char kEnableResourcesFileSharing[] = "enable-resources-file-sharing"; @@ -15,4 +15,4 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Specify the toolkit used to construct the Linux GUI. const char kUiToolkitFlag[] = "ui-toolkit"; - #endif + // Disables GTK IME integration. diff --git a/www/ungoogled-chromium/files/patch-ui_base_ui__base__switches.h b/www/ungoogled-chromium/files/patch-ui_base_ui__base__switches.h index 3df019306512..821e2111d1e5 100644 --- a/www/ungoogled-chromium/files/patch-ui_base_ui__base__switches.h +++ b/www/ungoogled-chromium/files/patch-ui_base_ui__base__switches.h @@ -1,4 +1,4 @@ ---- ui/base/ui_base_switches.h.orig 2023-10-13 13:20:35 UTC +--- ui/base/ui_base_switches.h.orig 2024-08-26 14:40:28 UTC +++ ui/base/ui_base_switches.h @@ -27,11 +27,11 @@ COMPONENT_EXPORT(UI_BASE) extern const char kShowMacOv COMPONENT_EXPORT(UI_BASE) extern const char kEnableResourcesFileSharing[]; @@ -12,5 +12,5 @@ -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) COMPONENT_EXPORT(UI_BASE) extern const char kUiToolkitFlag[]; + COMPONENT_EXPORT(UI_BASE) extern const char kDisableGtkIme[]; #endif - diff --git a/www/ungoogled-chromium/files/patch-ui_base_x_x11__cursor__loader.cc b/www/ungoogled-chromium/files/patch-ui_base_x_x11__cursor__loader.cc index 7c4f49bc107f..d25968b1ee65 100644 --- a/www/ungoogled-chromium/files/patch-ui_base_x_x11__cursor__loader.cc +++ b/www/ungoogled-chromium/files/patch-ui_base_x_x11__cursor__loader.cc @@ -1,6 +1,6 @@ ---- ui/base/x/x11_cursor_loader.cc.orig 2024-05-23 20:04:36 UTC +--- ui/base/x/x11_cursor_loader.cc.orig 2024-08-26 14:40:28 UTC +++ ui/base/x/x11_cursor_loader.cc -@@ -33,7 +33,7 @@ +@@ -34,7 +34,7 @@ #include "ui/gfx/x/connection.h" #include "ui/gfx/x/xproto.h" @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #endif -@@ -139,7 +139,11 @@ std::string CursorPathFromLibXcursor() { +@@ -59,7 +59,11 @@ std::string CursorPathFromLibXcursor() { void operator()(void* ptr) const { dlclose(ptr); } }; @@ -21,7 +21,7 @@ if (!lib) return ""; -@@ -250,7 +254,7 @@ scoped_refptr<base::RefCountedMemory> ReadCursorFile( +@@ -170,7 +174,7 @@ scoped_refptr<base::RefCountedMemory> ReadCursorFile( const std::string& rm_xcursor_theme) { constexpr const char kDefaultTheme[] = "default"; std::string themes[] = { @@ -30,7 +30,7 @@ // The toolkit theme has the highest priority. LinuxUi::instance() ? LinuxUi::instance()->GetCursorThemeName() : std::string(), -@@ -442,7 +446,7 @@ uint32_t XCursorLoader::GetPreferredCursorSize() const +@@ -359,7 +363,7 @@ uint32_t XCursorLoader::GetPreferredCursorSize() const return size; } diff --git a/www/ungoogled-chromium/files/patch-ui_base_x_x11__display__util.cc b/www/ungoogled-chromium/files/patch-ui_base_x_x11__display__util.cc deleted file mode 100644 index 82b0170d536c..000000000000 --- a/www/ungoogled-chromium/files/patch-ui_base_x_x11__display__util.cc +++ /dev/null @@ -1,365 +0,0 @@ ---- ui/base/x/x11_display_util.cc.orig 2024-06-22 08:49:42 UTC -+++ ui/base/x/x11_display_util.cc -@@ -14,7 +14,6 @@ - - #include "base/bits.h" - #include "base/command_line.h" --#include "base/containers/flat_map.h" - #include "base/logging.h" - #include "base/numerics/clamped_math.h" - #include "base/ranges/algorithm.h" -@@ -28,7 +27,6 @@ - #include "ui/gfx/geometry/rect.h" - #include "ui/gfx/geometry/rect_conversions.h" - #include "ui/gfx/geometry/rect_f.h" --#include "ui/gfx/switches.h" - #include "ui/gfx/x/atom_cache.h" - #include "ui/gfx/x/connection.h" - #include "ui/gfx/x/randr.h" -@@ -43,89 +41,42 @@ constexpr std::pair<uint32_t, uint32_t> kMinVersionXra - - constexpr const char kRandrEdidProperty[] = "EDID"; - --std::map<x11::RandR::Output, size_t> GetMonitors( -- const x11::Response<x11::RandR::GetMonitorsReply>& reply) { -- std::map<x11::RandR::Output, size_t> output_to_monitor; -- if (!reply) { -- return output_to_monitor; -- } -- for (size_t monitor = 0; monitor < reply->monitors.size(); monitor++) { -- for (x11::RandR::Output output : reply->monitors[monitor].outputs) { -- output_to_monitor[output] = monitor; -+std::map<x11::RandR::Output, int> GetMonitors( -+ std::pair<uint32_t, uint32_t> version, -+ x11::RandR* randr, -+ x11::Window window) { -+ std::map<x11::RandR::Output, int> output_to_monitor; -+ if (version >= std::pair<uint32_t, uint32_t>{1, 5}) { -+ if (auto reply = randr->GetMonitors({window}).Sync()) { -+ for (size_t monitor = 0; monitor < reply->monitors.size(); monitor++) { -+ for (x11::RandR::Output output : reply->monitors[monitor].outputs) { -+ output_to_monitor[output] = monitor; -+ } -+ } - } - } - return output_to_monitor; - } - --x11::Future<x11::GetPropertyReply> GetWorkAreaFuture( -- x11::Connection* connection) { -- return connection->GetProperty({ -- .window = connection->default_root(), -- .property = connection->GetAtom("_NET_WORKAREA"), -- .long_length = 4, -- }); --} -- --gfx::Rect GetWorkAreaSync(x11::Future<x11::GetPropertyReply> future) { -- auto response = future.Sync(); -- if (!response || response->format != 32 || response->value_len != 4) { -- return gfx::Rect(); -- } -- const uint32_t* value = response->value->cast_to<uint32_t>(); -- return gfx::Rect(value[0], value[1], value[2], value[3]); --} -- --x11::Future<x11::GetPropertyReply> GetIccProfileFuture( -- x11::Connection* connection, -- size_t monitor) { -- std::string atom_name = monitor == 0 -- ? "_ICC_PROFILE" -- : base::StringPrintf("_ICC_PROFILE_%zu", monitor); -- auto future = connection->GetProperty({ -- .window = connection->default_root(), -- .property = x11::GetAtom(atom_name.c_str()), -- .long_length = std::numeric_limits<uint32_t>::max(), -- }); -- future.IgnoreError(); -- return future; --} -- --gfx::ICCProfile GetIccProfileSync(x11::Future<x11::GetPropertyReply> future) { -- auto response = future.Sync(); -- if (!response || !response->value_len) { -- return gfx::ICCProfile(); -- } -- return gfx::ICCProfile::FromData(response->value->bytes(), -- response->value_len * response->format / 8u); --} -- --x11::Future<x11::RandR::GetOutputPropertyReply> GetEdidFuture( -- x11::Connection* connection, -- x11::RandR::Output output) { -- auto future = connection->randr().GetOutputProperty({ -- .output = output, -- .property = x11::GetAtom(kRandrEdidProperty), -- .long_length = 128, -- }); -- future.IgnoreError(); -- return future; --} -- - // Sets the work area on a list of displays. The work area for each display - // must already be initialized to the display bounds. At most one display out - // of |displays| will be affected. - void ClipWorkArea(std::vector<display::Display>* displays, -- size_t primary_display_index, -- const gfx::Rect& net_workarea) { -- if (net_workarea.IsEmpty()) { -+ size_t primary_display_index) { -+ x11::Window x_root_window = ui::GetX11RootWindow(); -+ -+ std::vector<int32_t> value; -+ if (!x11::Connection::Get()->GetArrayProperty( -+ x_root_window, x11::GetAtom("_NET_WORKAREA"), &value) || -+ value.size() < 4) { - return; - } -- - auto get_work_area = [&](const display::Display& display) { - float scale = display::Display::HasForceDeviceScaleFactor() - ? display::Display::GetForcedDeviceScaleFactor() - : display.device_scale_factor(); -- return gfx::ScaleToEnclosingRect(net_workarea, 1.0f / scale); -+ return gfx::ScaleToEnclosingRect( -+ gfx::Rect(value[0], value[1], value[2], value[3]), 1.0f / scale); - }; - - // If the work area entirely contains exactly one display, assume it's meant -@@ -207,9 +158,14 @@ int DefaultBitsPerComponent() { - return visual.bits_per_rgb_value; - } - --// Get the EDID data from the `output` and stores to `edid`. --std::vector<uint8_t> GetEdidProperty( -- x11::Response<x11::RandR::GetOutputPropertyReply> response) { -+// Get the EDID data from the |output| and stores to |edid|. -+std::vector<uint8_t> GetEDIDProperty(x11::RandR* randr, -+ x11::RandR::Output output) { -+ auto future = randr->GetOutputProperty(x11::RandR::GetOutputPropertyRequest{ -+ .output = output, -+ .property = x11::GetAtom(kRandrEdidProperty), -+ .long_length = 128}); -+ auto response = future.Sync(); - std::vector<uint8_t> edid; - if (response && response->format == 8 && response->type != x11::Atom::None) { - edid = std::move(response->data); -@@ -261,8 +217,7 @@ gfx::PointF DisplayOriginPxToDip(const display::Displa - std::vector<display::Display> GetFallbackDisplayList( - float scale, - size_t* primary_display_index_out) { -- auto* connection = x11::Connection::Get(); -- const auto& screen = connection->default_screen(); -+ const auto& screen = x11::Connection::Get()->default_screen(); - gfx::Size physical_size(screen.width_in_millimeters, - screen.height_in_millimeters); - -@@ -289,9 +244,7 @@ std::vector<display::Display> GetFallbackDisplayList( - std::vector<display::Display> displays{gfx_display}; - *primary_display_index_out = 0; - -- ClipWorkArea(&displays, *primary_display_index_out, -- GetWorkAreaSync(GetWorkAreaFuture(connection))); -- -+ ClipWorkArea(&displays, *primary_display_index_out); - return displays; - } - -@@ -307,16 +260,7 @@ std::vector<display::Display> BuildDisplaysFromXRandRI - auto x_root_window = ui::GetX11RootWindow(); - std::vector<display::Display> displays; - -- auto resources_future = randr.GetScreenResourcesCurrent({x_root_window}); -- auto output_primary_future = randr.GetOutputPrimary({x_root_window}); -- x11::Future<x11::RandR::GetMonitorsReply> monitors_future; -- if (connection->randr_version() >= std::pair<uint32_t, uint32_t>{1, 5}) { -- monitors_future = randr.GetMonitors(x_root_window); -- } -- auto work_area_future = GetWorkAreaFuture(connection); -- connection->Flush(); -- -- auto resources = resources_future.Sync(); -+ auto resources = randr.GetScreenResourcesCurrent({x_root_window}).Sync(); - if (!resources) { - LOG(ERROR) << "XRandR returned no displays; falling back to root window"; - return GetFallbackDisplayList(primary_scale, primary_display_index_out); -@@ -325,65 +269,21 @@ std::vector<display::Display> BuildDisplaysFromXRandRI - const int depth = connection->default_screen().root_depth; - const int bits_per_component = DefaultBitsPerComponent(); - -- auto output_primary = output_primary_future.Sync(); -+ std::map<x11::RandR::Output, int> output_to_monitor = -+ GetMonitors(connection->randr_version(), &randr, x_root_window); -+ auto output_primary = randr.GetOutputPrimary({x_root_window}).Sync(); - if (!output_primary) { - return GetFallbackDisplayList(primary_scale, primary_display_index_out); - } - x11::RandR::Output primary_display_id = output_primary->output; - -- const auto monitors_reply = monitors_future.Sync(); -- const auto output_to_monitor = GetMonitors(monitors_reply); -- const size_t n_iccs = -- monitors_reply ? std::max<size_t>(1, monitors_reply->monitors.size()) : 1; -- - int explicit_primary_display_index = -1; - int monitor_order_primary_display_index = -1; - -- std::vector<x11::Future<x11::RandR::GetCrtcInfoReply>> crtc_futures{}; -- crtc_futures.reserve(resources->crtcs.size()); -- for (auto crtc : resources->crtcs) { -- crtc_futures.push_back( -- randr.GetCrtcInfo({crtc, resources->config_timestamp})); -- } -- connection->Flush(); -- -- std::vector<x11::Future<x11::GetPropertyReply>> icc_futures{n_iccs}; -- if (!base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kHeadless)) { -- for (size_t monitor = 0; monitor < n_iccs; ++monitor) { -- icc_futures[monitor] = GetIccProfileFuture(connection, monitor); -- } -- connection->Flush(); -- } -- -- std::vector<x11::Future<x11::RandR::GetOutputInfoReply>> output_futures{}; -- output_futures.reserve(resources->outputs.size()); -- for (auto output : resources->outputs) { -- output_futures.push_back( -- randr.GetOutputInfo({output, resources->config_timestamp})); -- } -- connection->Flush(); -- -- std::vector<x11::Future<x11::RandR::GetOutputPropertyReply>> edid_futures{}; -- edid_futures.reserve(resources->outputs.size()); -- for (auto output : resources->outputs) { -- edid_futures.push_back(GetEdidFuture(connection, output)); -- } -- connection->Flush(); -- -- base::flat_map<x11::RandR::Crtc, x11::RandR::GetCrtcInfoResponse> crtcs; -- for (size_t i = 0; i < resources->crtcs.size(); ++i) { -- crtcs.emplace(resources->crtcs[i], crtc_futures[i].Sync()); -- } -- -- std::vector<gfx::ICCProfile> iccs; -- iccs.reserve(n_iccs); -- for (auto& future : icc_futures) { -- iccs.push_back(GetIccProfileSync(std::move(future))); -- } -- - for (size_t i = 0; i < resources->outputs.size(); i++) { - x11::RandR::Output output_id = resources->outputs[i]; -- auto output_info = output_futures[i].Sync(); -+ auto output_info = -+ randr.GetOutputInfo({output_id, resources->config_timestamp}).Sync(); - if (!output_info) { - continue; - } -@@ -398,16 +298,15 @@ std::vector<display::Display> BuildDisplaysFromXRandRI - continue; - } - -- auto crtc_it = crtcs.find(output_info->crtc); -- if (crtc_it == crtcs.end()) { -- continue; -- } -- const auto& crtc = crtc_it->second; -+ auto crtc = -+ randr.GetCrtcInfo({output_info->crtc, resources->config_timestamp}) -+ .Sync(); - if (!crtc) { - continue; - } - -- display::EdidParser edid_parser(GetEdidProperty(edid_futures[i].Sync())); -+ display::EdidParser edid_parser( -+ GetEDIDProperty(&randr, static_cast<x11::RandR::Output>(output_id))); - auto output_32 = static_cast<uint32_t>(output_id); - int64_t display_id = - output_32 > 0xff ? 0 : edid_parser.GetIndexBasedDisplayId(output_32); -@@ -462,9 +361,8 @@ std::vector<display::Display> BuildDisplaysFromXRandRI - } - - if (!display::HasForceDisplayColorProfile()) { -- const size_t monitor = -- monitor_iter == output_to_monitor.end() ? 0 : monitor_iter->second; -- const auto& icc_profile = iccs[monitor < iccs.size() ? monitor : 0]; -+ gfx::ICCProfile icc_profile = ui::GetICCProfileForMonitor( -+ monitor_iter == output_to_monitor.end() ? 0 : monitor_iter->second); - gfx::ColorSpace color_space = icc_profile.GetPrimariesOnlyColorSpace(); - - // Most folks do not have an ICC profile set up, but we still want to -@@ -509,24 +407,63 @@ std::vector<display::Display> BuildDisplaysFromXRandRI - ConvertDisplayBoundsToDips(&displays, *primary_display_index_out); - } - -- ClipWorkArea(&displays, *primary_display_index_out, -- GetWorkAreaSync(std::move(work_area_future))); -+ ClipWorkArea(&displays, *primary_display_index_out); - return displays; - } - - base::TimeDelta GetPrimaryDisplayRefreshIntervalFromXrandr() { - constexpr base::TimeDelta kDefaultInterval = base::Seconds(1. / 60); -- -- size_t primary_display_index = 0; -- auto displays = BuildDisplaysFromXRandRInfo(display::DisplayConfig(), -- &primary_display_index); -- CHECK_LT(primary_display_index, displays.size()); -- -+ x11::RandR randr = x11::Connection::Get()->randr(); -+ auto root = ui::GetX11RootWindow(); -+ auto resources = randr.GetScreenResourcesCurrent({root}).Sync(); -+ if (!resources) { -+ return kDefaultInterval; -+ } - // TODO(crbug.com/41321728): It might make sense here to pick the output that - // the window is on. On the other hand, if compositing is enabled, all drawing - // might be synced to the primary output anyway. Needs investigation. -- auto frequency = displays[primary_display_index].display_frequency(); -- return frequency > 0 ? base::Seconds(1. / frequency) : kDefaultInterval; -+ auto output_primary = randr.GetOutputPrimary({root}).Sync(); -+ if (!output_primary) { -+ return kDefaultInterval; -+ } -+ x11::RandR::Output primary_output = output_primary->output; -+ bool disconnected_primary = false; -+ for (size_t i = 0; i < resources->outputs.size(); i++) { -+ if (!disconnected_primary && resources->outputs[i] != primary_output) { -+ continue; -+ } -+ -+ auto output_info = -+ randr.GetOutputInfo({primary_output, resources->config_timestamp}) -+ .Sync(); -+ if (!output_info) { -+ continue; -+ } -+ -+ if (output_info->connection != x11::RandR::RandRConnection::Connected) { -+ // If the primary monitor is disconnected, then start over and choose the -+ // first connected monitor instead. -+ if (!disconnected_primary) { -+ disconnected_primary = true; -+ i = -1; -+ } -+ continue; -+ } -+ auto crtc = -+ randr.GetCrtcInfo({output_info->crtc, resources->config_timestamp}) -+ .Sync(); -+ if (!crtc) { -+ continue; -+ } -+ float refresh_rate = -+ GetRefreshRateFromXRRModeInfo(resources->modes, crtc->mode); -+ if (refresh_rate == 0) { -+ continue; -+ } -+ -+ return base::Seconds(1. / refresh_rate); -+ } -+ return kDefaultInterval; - } - - int RangeDistance(int min1, int max1, int min2, int max2) { diff --git a/www/ungoogled-chromium/files/patch-ui_base_x_x11__util.cc b/www/ungoogled-chromium/files/patch-ui_base_x_x11__util.cc deleted file mode 100644 index 79f0c313aa34..000000000000 --- a/www/ungoogled-chromium/files/patch-ui_base_x_x11__util.cc +++ /dev/null @@ -1,23 +0,0 @@ ---- ui/base/x/x11_util.cc.orig 2024-06-22 08:49:42 UTC -+++ ui/base/x/x11_util.cc -@@ -703,4 +703,20 @@ gfx::ImageSkia GetNativeWindowIcon(intptr_t target_win - return gfx::ImageSkia::CreateFrom1xBitmap(result); - } - -+gfx::ICCProfile GetICCProfileForMonitor(int monitor) { -+ gfx::ICCProfile icc_profile; -+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kHeadless)) { -+ return icc_profile; -+ } -+ std::string atom_name = monitor == 0 -+ ? "_ICC_PROFILE" -+ : base::StringPrintf("_ICC_PROFILE_%d", monitor); -+ scoped_refptr<base::RefCountedMemory> data; -+ if (GetRawBytesOfProperty(GetX11RootWindow(), x11::GetAtom(atom_name.c_str()), -+ &data, nullptr)) { -+ icc_profile = gfx::ICCProfile::FromData(data->data(), data->size()); -+ } -+ return icc_profile; -+} -+ - } // namespace ui diff --git a/www/ungoogled-chromium/files/patch-ui_base_x_x11__util.h b/www/ungoogled-chromium/files/patch-ui_base_x_x11__util.h deleted file mode 100644 index 49786e33077a..000000000000 --- a/www/ungoogled-chromium/files/patch-ui_base_x_x11__util.h +++ /dev/null @@ -1,13 +0,0 @@ ---- ui/base/x/x11_util.h.orig 2024-02-25 20:22:18 UTC -+++ ui/base/x/x11_util.h -@@ -256,6 +256,10 @@ COMPONENT_EXPORT(UI_BASE_X) bool IsVulkanSurfaceSuppor - COMPONENT_EXPORT(UI_BASE_X) - gfx::ImageSkia GetNativeWindowIcon(intptr_t target_window_id); - -+// Returns the ICCProfile corresponding to |monitor| using XGetWindowProperty. -+COMPONENT_EXPORT(UI_BASE_X) -+gfx::ICCProfile GetICCProfileForMonitor(int monitor); -+ - } // namespace ui - - #endif // UI_BASE_X_X11_UTIL_H_ diff --git a/www/ungoogled-chromium/files/patch-ui_color_color__id.h b/www/ungoogled-chromium/files/patch-ui_color_color__id.h index 1c14a926e95c..4428c973d2e0 100644 --- a/www/ungoogled-chromium/files/patch-ui_color_color__id.h +++ b/www/ungoogled-chromium/files/patch-ui_color_color__id.h @@ -1,6 +1,6 @@ ---- ui/color/color_id.h.orig 2024-07-31 14:19:23 UTC +--- ui/color/color_id.h.orig 2024-08-26 14:40:28 UTC +++ ui/color/color_id.h -@@ -624,7 +624,7 @@ +@@ -621,7 +621,7 @@ \ E_CPONLY(kColorCrosSysPositive) \ E_CPONLY(kColorCrosSysComplementVariant) diff --git a/www/ungoogled-chromium/files/patch-ui_color_color__provider__utils.cc b/www/ungoogled-chromium/files/patch-ui_color_color__provider__utils.cc index ce605c36bc10..0724fb5c61c3 100644 --- a/www/ungoogled-chromium/files/patch-ui_color_color__provider__utils.cc +++ b/www/ungoogled-chromium/files/patch-ui_color_color__provider__utils.cc @@ -1,6 +1,6 @@ ---- ui/color/color_provider_utils.cc.orig 2024-06-22 08:49:42 UTC +--- ui/color/color_provider_utils.cc.orig 2024-08-26 14:40:28 UTC +++ ui/color/color_provider_utils.cc -@@ -186,7 +186,7 @@ std::string_view SystemThemeName(ui::SystemTheme syste +@@ -187,7 +187,7 @@ std::string_view SystemThemeName(ui::SystemTheme syste switch (system_theme) { case ui::SystemTheme::kDefault: return "kDefault"; diff --git a/www/ungoogled-chromium/files/patch-ui_compositor_compositor.cc b/www/ungoogled-chromium/files/patch-ui_compositor_compositor.cc index 194a20c7afab..a0678c732b9f 100644 --- a/www/ungoogled-chromium/files/patch-ui_compositor_compositor.cc +++ b/www/ungoogled-chromium/files/patch-ui_compositor_compositor.cc @@ -1,6 +1,6 @@ ---- ui/compositor/compositor.cc.orig 2024-05-23 20:04:36 UTC +--- ui/compositor/compositor.cc.orig 2024-08-26 14:40:28 UTC +++ ui/compositor/compositor.cc -@@ -922,7 +922,7 @@ void Compositor::OnResume() { +@@ -923,7 +923,7 @@ void Compositor::OnResume() { obs.ResetIfActive(); } diff --git a/www/ungoogled-chromium/files/patch-ui_events_event.cc b/www/ungoogled-chromium/files/patch-ui_events_event.cc index dc86431cc2e2..55112052da5b 100644 --- a/www/ungoogled-chromium/files/patch-ui_events_event.cc +++ b/www/ungoogled-chromium/files/patch-ui_events_event.cc @@ -1,6 +1,6 @@ ---- ui/events/event.cc.orig 2024-03-22 14:16:19 UTC +--- ui/events/event.cc.orig 2024-08-26 14:40:28 UTC +++ ui/events/event.cc -@@ -438,7 +438,7 @@ std::string LocatedEvent::ToString() const { +@@ -365,7 +365,7 @@ std::string LocatedEvent::ToString() const { MouseEvent::MouseEvent(const PlatformEvent& native_event) : LocatedEvent(native_event), changed_button_flags_(GetChangedMouseButtonFlagsFromNative(native_event)), @@ -9,7 +9,7 @@ movement_(GetMouseMovementFromNative(native_event)), #endif pointer_details_(GetMousePointerDetailsFromNative(native_event)) { -@@ -688,7 +688,7 @@ std::unique_ptr<Event> MouseWheelEvent::Clone() const +@@ -621,7 +621,7 @@ std::unique_ptr<Event> MouseWheelEvent::Clone() const return std::make_unique<MouseWheelEvent>(*this); } @@ -18,7 +18,7 @@ // This value matches Windows, Fuchsia WHEEL_DELTA, and (roughly) Firefox on // Linux. // static -@@ -948,7 +948,7 @@ void KeyEvent::InitializeNative() { +@@ -881,7 +881,7 @@ void KeyEvent::InitializeNative() { if (synthesize_key_repeat_enabled_ && IsRepeated(GetLastKeyEvent())) SetFlags(flags() | EF_IS_REPEAT); diff --git a/www/ungoogled-chromium/files/patch-ui_gfx_BUILD.gn b/www/ungoogled-chromium/files/patch-ui_gfx_BUILD.gn index 260db56537f4..ffe21c6a2b17 100644 --- a/www/ungoogled-chromium/files/patch-ui_gfx_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-ui_gfx_BUILD.gn @@ -1,6 +1,6 @@ ---- ui/gfx/BUILD.gn.orig 2024-05-23 20:04:36 UTC +--- ui/gfx/BUILD.gn.orig 2024-08-26 14:40:28 UTC +++ ui/gfx/BUILD.gn -@@ -663,7 +663,7 @@ source_set("memory_buffer_sources") { +@@ -664,7 +664,7 @@ source_set("memory_buffer_sources") { deps += [ "//build/config/linux/libdrm" ] } diff --git a/www/ungoogled-chromium/files/patch-ui_gfx_native__widget__types.h b/www/ungoogled-chromium/files/patch-ui_gfx_native__widget__types.h index 8f88ebd3444b..72b6d022214d 100644 --- a/www/ungoogled-chromium/files/patch-ui_gfx_native__widget__types.h +++ b/www/ungoogled-chromium/files/patch-ui_gfx_native__widget__types.h @@ -1,4 +1,4 @@ ---- ui/gfx/native_widget_types.h.orig 2024-06-22 08:49:42 UTC +--- ui/gfx/native_widget_types.h.orig 2024-08-26 14:40:28 UTC +++ ui/gfx/native_widget_types.h @@ -104,7 +104,7 @@ class SkBitmap; @@ -9,7 +9,7 @@ extern "C" { struct _AtkObject; using AtkObject = struct _AtkObject; -@@ -220,7 +220,7 @@ using NativeViewAccessible = struct objc_object*; +@@ -219,7 +219,7 @@ using NativeViewAccessible = struct objc_object*; #endif // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/files/patch-ui_gfx_platform__font__skia.cc b/www/ungoogled-chromium/files/patch-ui_gfx_platform__font__skia.cc index b8a713996873..5a37f6de4597 100644 --- a/www/ungoogled-chromium/files/patch-ui_gfx_platform__font__skia.cc +++ b/www/ungoogled-chromium/files/patch-ui_gfx_platform__font__skia.cc @@ -1,6 +1,6 @@ ---- ui/gfx/platform_font_skia.cc.orig 2024-03-22 14:16:19 UTC +--- ui/gfx/platform_font_skia.cc.orig 2024-08-26 14:40:28 UTC +++ ui/gfx/platform_font_skia.cc -@@ -30,7 +30,7 @@ +@@ -29,7 +29,7 @@ #include "ui/gfx/system_fonts_win.h" #endif @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #endif -@@ -168,7 +168,7 @@ void PlatformFontSkia::EnsuresDefaultFontIsInitialized +@@ -167,7 +167,7 @@ void PlatformFontSkia::EnsuresDefaultFontIsInitialized weight = system_font.GetWeight(); #endif // BUILDFLAG(IS_WIN) diff --git a/www/ungoogled-chromium/files/patch-ui_gl_BUILD.gn b/www/ungoogled-chromium/files/patch-ui_gl_BUILD.gn index ee6ebef495f4..f621e32faa85 100644 --- a/www/ungoogled-chromium/files/patch-ui_gl_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-ui_gl_BUILD.gn @@ -1,15 +1,15 @@ ---- ui/gl/BUILD.gn.orig 2024-07-31 14:19:23 UTC +--- ui/gl/BUILD.gn.orig 2024-08-26 14:40:28 UTC +++ ui/gl/BUILD.gn -@@ -153,8 +153,6 @@ component("gl") { +@@ -149,8 +149,6 @@ component("gl") { defines += [ "GPU_ENABLE_SERVICE_LOGGING" ] } - include_dirs = [ "//third_party/mesa_headers" ] - - all_dependent_configs = [ ":gl_config" ] - public_configs = [ "//third_party/khronos:khronos_headers" ] -@@ -171,7 +169,6 @@ component("gl") { + + deps = [ +@@ -165,7 +163,6 @@ component("gl") { ] public_deps = [ "//base", @@ -17,7 +17,7 @@ "//ui/events/platform", "//ui/gfx", "//ui/gfx/geometry", -@@ -374,7 +371,6 @@ component("gl") { +@@ -313,7 +310,6 @@ component("gl") { data_deps += [ "//third_party/angle:libEGL", "//third_party/angle:libGLESv2", @@ -25,7 +25,7 @@ ] if (enable_swiftshader) { data_deps += [ -@@ -573,7 +569,6 @@ test("gl_unittests") { +@@ -538,7 +534,6 @@ test("gl_unittests") { data_deps = [ "//testing/buildbot/filters:gl_unittests_filters", diff --git a/www/ungoogled-chromium/files/patch-ui_gl_gl__bindings.h b/www/ungoogled-chromium/files/patch-ui_gl_gl__bindings.h deleted file mode 100644 index 0b97aa1ed8ab..000000000000 --- a/www/ungoogled-chromium/files/patch-ui_gl_gl__bindings.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ui/gl/gl_bindings.h.orig 2023-05-05 12:12:41 UTC -+++ ui/gl/gl_bindings.h -@@ -36,7 +36,7 @@ - #include <GL/wglext.h> - #elif BUILDFLAG(IS_MAC) - #include <OpenGL/OpenGL.h> --#elif BUILDFLAG(IS_LINUX) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - using Display = struct _XDisplay; - using Bool = int; - using Status = int; diff --git a/www/ungoogled-chromium/files/patch-ui_gl_gl__context.cc b/www/ungoogled-chromium/files/patch-ui_gl_gl__context.cc index 30d1d4a3f286..af2290410c13 100644 --- a/www/ungoogled-chromium/files/patch-ui_gl_gl__context.cc +++ b/www/ungoogled-chromium/files/patch-ui_gl_gl__context.cc @@ -1,6 +1,6 @@ ---- ui/gl/gl_context.cc.orig 2024-02-25 20:22:18 UTC +--- ui/gl/gl_context.cc.orig 2024-08-26 14:40:28 UTC +++ ui/gl/gl_context.cc -@@ -472,7 +472,7 @@ bool GLContext::MakeVirtuallyCurrent( +@@ -509,7 +509,7 @@ bool GLContext::MakeVirtuallyCurrent( DCHECK(virtual_context->IsCurrent(surface)); if (switched_real_contexts || virtual_context != current_virtual_context_) { diff --git a/www/ungoogled-chromium/files/patch-ui_gl_gl__fence.cc b/www/ungoogled-chromium/files/patch-ui_gl_gl__fence.cc index ff9166f43405..04f0979293c1 100644 --- a/www/ungoogled-chromium/files/patch-ui_gl_gl__fence.cc +++ b/www/ungoogled-chromium/files/patch-ui_gl_gl__fence.cc @@ -1,9 +1,9 @@ ---- ui/gl/gl_fence.cc.orig 2023-09-17 07:59:53 UTC +--- ui/gl/gl_fence.cc.orig 2024-08-26 14:40:28 UTC +++ ui/gl/gl_fence.cc -@@ -20,7 +20,7 @@ - #endif +@@ -17,7 +17,7 @@ + #include "ui/gl/gl_surface_egl.h" + #include "ui/gl/gl_version_info.h" - #if defined(USE_EGL) -#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #define USE_GL_FENCE_ANDROID_NATIVE_FENCE_SYNC diff --git a/www/ungoogled-chromium/files/patch-ui_gl_gl__implementation.cc b/www/ungoogled-chromium/files/patch-ui_gl_gl__implementation.cc index 7a89cfb531f7..6246cfe44e49 100644 --- a/www/ungoogled-chromium/files/patch-ui_gl_gl__implementation.cc +++ b/www/ungoogled-chromium/files/patch-ui_gl_gl__implementation.cc @@ -1,6 +1,6 @@ ---- ui/gl/gl_implementation.cc.orig 2024-07-31 14:19:23 UTC +--- ui/gl/gl_implementation.cc.orig 2024-08-26 14:40:28 UTC +++ ui/gl/gl_implementation.cc -@@ -272,7 +272,7 @@ GetRequestedGLImplementationFromCommandLine( +@@ -254,7 +254,7 @@ GetRequestedGLImplementationFromCommandLine( *fallback_to_software_gl = false; bool overrideUseSoftwareGL = command_line->HasSwitch(switches::kOverrideUseSoftwareGLForTests); diff --git a/www/ungoogled-chromium/files/patch-ui_gtk_printing_print__dialog__gtk.cc b/www/ungoogled-chromium/files/patch-ui_gtk_printing_print__dialog__gtk.cc index bc419004202c..c01003cf3f8c 100644 --- a/www/ungoogled-chromium/files/patch-ui_gtk_printing_print__dialog__gtk.cc +++ b/www/ungoogled-chromium/files/patch-ui_gtk_printing_print__dialog__gtk.cc @@ -1,4 +1,4 @@ ---- ui/gtk/printing/print_dialog_gtk.cc.orig 2024-06-22 08:49:42 UTC +--- ui/gtk/printing/print_dialog_gtk.cc.orig 2024-08-26 14:40:28 UTC +++ ui/gtk/printing/print_dialog_gtk.cc @@ -434,7 +434,7 @@ void PrintDialogGtk::ShowDialog( GtkPrintCapabilities cap = static_cast<GtkPrintCapabilities>( @@ -6,6 +6,6 @@ GTK_PRINT_CAPABILITY_COPIES | GTK_PRINT_CAPABILITY_COLLATE | - GTK_PRINT_CAPABILITY_REVERSE); + GTK_PRINT_CAPABILITY_REVERSE | GTK_PRINT_CAPABILITY_GENERATE_PS); - gtk_print_unix_dialog_set_manual_capabilities(GTK_PRINT_UNIX_DIALOG(dialog_), - cap); - gtk_print_unix_dialog_set_embed_page_setup(GTK_PRINT_UNIX_DIALOG(dialog_), + gtk_print_unix_dialog_set_manual_capabilities( + GTK_PRINT_UNIX_DIALOG(dialog_.get()), cap); + gtk_print_unix_dialog_set_embed_page_setup( diff --git a/www/ungoogled-chromium/files/patch-ui_native__theme_native__theme.h b/www/ungoogled-chromium/files/patch-ui_native__theme_native__theme.h index d8275ae1dbde..a571ed622c08 100644 --- a/www/ungoogled-chromium/files/patch-ui_native__theme_native__theme.h +++ b/www/ungoogled-chromium/files/patch-ui_native__theme_native__theme.h @@ -1,6 +1,6 @@ ---- ui/native_theme/native_theme.h.orig 2024-06-22 08:49:42 UTC +--- ui/native_theme/native_theme.h.orig 2024-08-26 14:40:28 UTC +++ ui/native_theme/native_theme.h -@@ -62,7 +62,7 @@ class NATIVE_THEME_EXPORT NativeTheme { +@@ -63,7 +63,7 @@ class NATIVE_THEME_EXPORT NativeTheme { kCheckbox, // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/files/patch-ui_ozone_platform_headless_headless__surface__factory.cc b/www/ungoogled-chromium/files/patch-ui_ozone_platform_headless_headless__surface__factory.cc index 041e27c17c2b..4cfb08d8b718 100644 --- a/www/ungoogled-chromium/files/patch-ui_ozone_platform_headless_headless__surface__factory.cc +++ b/www/ungoogled-chromium/files/patch-ui_ozone_platform_headless_headless__surface__factory.cc @@ -1,4 +1,4 @@ ---- ui/ozone/platform/headless/headless_surface_factory.cc.orig 2023-03-10 11:01:21 UTC +--- ui/ozone/platform/headless/headless_surface_factory.cc.orig 2024-08-26 14:40:28 UTC +++ ui/ozone/platform/headless/headless_surface_factory.cc @@ -34,7 +34,7 @@ #include "ui/ozone/platform/headless/headless_window_manager.h" @@ -9,7 +9,7 @@ #include "ui/ozone/platform/headless/vulkan_implementation_headless.h" #endif -@@ -281,7 +281,7 @@ std::unique_ptr<gpu::VulkanImplementation> +@@ -280,7 +280,7 @@ std::unique_ptr<gpu::VulkanImplementation> HeadlessSurfaceFactory::CreateVulkanImplementation( bool use_swiftshader, bool allow_protected_memory) { diff --git a/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.cc b/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.cc index 04c46480343b..64f00a63523c 100644 --- a/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.cc +++ b/www/ungoogled-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-07-31 14:19:23 UTC +--- ui/ozone/platform/wayland/host/wayland_toplevel_window.cc.orig 2024-08-26 14:40:28 UTC +++ ui/ozone/platform/wayland/host/wayland_toplevel_window.cc -@@ -604,7 +604,7 @@ void WaylandToplevelWindow::HandleAuraToplevelConfigur +@@ -620,7 +620,7 @@ void WaylandToplevelWindow::HandleAuraToplevelConfigur const bool did_active_change = is_active_ != window_states.is_activated; is_active_ = window_states.is_activated; diff --git a/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.h b/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.h index b059821b8db2..e4e3262051de 100644 --- a/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.h +++ b/www/ungoogled-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-07-31 14:19:23 UTC +--- ui/ozone/platform/wayland/host/wayland_toplevel_window.h.orig 2024-08-26 14:40:28 UTC +++ ui/ozone/platform/wayland/host/wayland_toplevel_window.h -@@ -258,7 +258,7 @@ class WaylandToplevelWindow : public WaylandWindow, +@@ -259,7 +259,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/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__window.cc b/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__window.cc index 436242ce88d5..3b29a9880133 100644 --- a/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__window.cc +++ b/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__window.cc @@ -1,15 +1,15 @@ ---- ui/ozone/platform/wayland/host/wayland_window.cc.orig 2024-07-31 14:19:23 UTC +--- ui/ozone/platform/wayland/host/wayland_window.cc.orig 2024-08-26 14:40:28 UTC +++ ui/ozone/platform/wayland/host/wayland_window.cc -@@ -295,7 +295,7 @@ void WaylandWindow::OnPointerFocusChanged(bool focused +@@ -317,7 +317,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. -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (focused && async_cursor_) { - async_cursor_->AddCursorLoadedCallback( - base::BindOnce(&WaylandWindow::OnCursorLoaded, -@@ -554,7 +554,7 @@ bool WaylandWindow::ShouldUseNativeFrame() const { + async_cursor_->AddCursorLoadedCallback(base::BindOnce( + &WaylandWindow::OnCursorLoaded, AsWeakPtr(), async_cursor_)); +@@ -575,7 +575,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) { -@@ -766,7 +766,7 @@ std::string WaylandWindow::WindowStates::ToString() co +@@ -786,7 +786,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) { -@@ -1256,12 +1256,12 @@ void WaylandWindow::UpdateCursorShape(scoped_refptr<Bi +@@ -1274,12 +1274,12 @@ void WaylandWindow::UpdateCursorShape(scoped_refptr<Bi cursor->bitmaps(), hotspot_in_dips, std::ceil(cursor->cursor_image_scale_factor())); } diff --git a/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__window.h b/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__window.h index 3aad9dd90b44..e5206c00c34b 100644 --- a/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__window.h +++ b/www/ungoogled-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-07-31 14:19:23 UTC +--- ui/ozone/platform/wayland/host/wayland_window.h.orig 2024-08-26 14:40:28 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 -@@ -269,7 +269,7 @@ class WaylandWindow : public PlatformWindow, +@@ -283,7 +283,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 -@@ -551,7 +551,7 @@ class WaylandWindow : public PlatformWindow, +@@ -561,7 +561,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 -@@ -620,7 +620,7 @@ class WaylandWindow : public PlatformWindow, +@@ -630,7 +630,7 @@ class WaylandWindow : public PlatformWindow, wl::Object<zaura_surface> aura_surface_; diff --git a/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_zwp__text__input__wrapper__v1.cc b/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_zwp__text__input__wrapper__v1.cc index 3adfb0722c3b..0ae63a47030b 100644 --- a/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_zwp__text__input__wrapper__v1.cc +++ b/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_zwp__text__input__wrapper__v1.cc @@ -1,6 +1,6 @@ ---- ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.cc.orig 2024-02-03 15:42:55 UTC +--- ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.cc.orig 2024-08-26 14:40:28 UTC +++ ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.cc -@@ -226,6 +226,10 @@ void ZWPTextInputWrapperV1::SetSurroundingText( +@@ -256,6 +256,10 @@ void ZWPTextInputWrapperV1::SetSurroundingText( // so if it exceeds 16 bits, it may be broken. static constexpr size_t kSizeLimit = 60000; if (HasAdvancedSurroundingTextSupport() && text.length() > kSizeLimit) { @@ -11,7 +11,7 @@ base::ScopedFD memfd(memfd_create("surrounding_text", MFD_CLOEXEC)); if (!memfd.get()) { PLOG(ERROR) << "Failed to create memfd"; -@@ -238,6 +242,7 @@ void ZWPTextInputWrapperV1::SetSurroundingText( +@@ -268,6 +272,7 @@ void ZWPTextInputWrapperV1::SetSurroundingText( zcr_extended_text_input_v1_set_large_surrounding_text( extended_obj_.get(), memfd.get(), text.length(), selection_range.start(), selection_range.end()); diff --git a/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_ozone__platform__wayland.cc b/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_ozone__platform__wayland.cc index 927d4381a10b..dc371a1601b0 100644 --- a/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_ozone__platform__wayland.cc +++ b/www/ungoogled-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-06-22 08:49:42 UTC +--- ui/ozone/platform/wayland/ozone_platform_wayland.cc.orig 2024-08-26 14:40:28 UTC +++ ui/ozone/platform/wayland/ozone_platform_wayland.cc @@ -66,13 +66,13 @@ #include "ui/events/ozone/layout/stub/stub_keyboard_layout_engine.h" @@ -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 -@@ -536,7 +536,7 @@ class OzonePlatformWayland : public OzonePlatform, +@@ -538,7 +538,7 @@ class OzonePlatformWayland : public OzonePlatform, DrmRenderNodePathFinder path_finder_; #endif diff --git a/www/ungoogled-chromium/files/patch-ui_ozone_platform_x11_x11__window.cc b/www/ungoogled-chromium/files/patch-ui_ozone_platform_x11_x11__window.cc index 993ae24309e4..1451b42ee0b5 100644 --- a/www/ungoogled-chromium/files/patch-ui_ozone_platform_x11_x11__window.cc +++ b/www/ungoogled-chromium/files/patch-ui_ozone_platform_x11_x11__window.cc @@ -1,6 +1,6 @@ ---- ui/ozone/platform/x11/x11_window.cc.orig 2024-07-31 14:19:23 UTC +--- ui/ozone/platform/x11/x11_window.cc.orig 2024-08-26 14:40:28 UTC +++ ui/ozone/platform/x11/x11_window.cc -@@ -1497,7 +1497,7 @@ void X11Window::OnXWindowStateChanged() { +@@ -1499,7 +1499,7 @@ void X11Window::OnXWindowStateChanged() { WindowTiledEdges tiled_state = GetTiledState(); if (tiled_state != tiled_state_) { tiled_state_ = tiled_state; diff --git a/www/ungoogled-chromium/files/patch-ui_views_controls_textfield_textfield.cc b/www/ungoogled-chromium/files/patch-ui_views_controls_textfield_textfield.cc index be2b583892a5..46fc876e2657 100644 --- a/www/ungoogled-chromium/files/patch-ui_views_controls_textfield_textfield.cc +++ b/www/ungoogled-chromium/files/patch-ui_views_controls_textfield_textfield.cc @@ -1,6 +1,6 @@ ---- ui/views/controls/textfield/textfield.cc.orig 2024-07-31 14:19:23 UTC +--- ui/views/controls/textfield/textfield.cc.orig 2024-08-26 14:40:28 UTC +++ ui/views/controls/textfield/textfield.cc -@@ -91,7 +91,7 @@ +@@ -85,7 +85,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" -@@ -189,7 +189,7 @@ bool IsControlKeyModifier(int flags) { +@@ -183,7 +183,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; -@@ -747,7 +747,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event +@@ -756,7 +756,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 && -@@ -930,7 +930,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo +@@ -939,7 +939,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; -@@ -1997,7 +1997,7 @@ bool Textfield::ShouldDoLearning() { +@@ -1999,7 +1999,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( -@@ -2501,14 +2501,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( +@@ -2505,14 +2505,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( #endif return ui::TextEditCommand::DELETE_BACKWARD; } diff --git a/www/ungoogled-chromium/files/patch-ui_views_focus_focus__manager.cc b/www/ungoogled-chromium/files/patch-ui_views_focus_focus__manager.cc index 067bd02065c4..9f9d00d98e54 100644 --- a/www/ungoogled-chromium/files/patch-ui_views_focus_focus__manager.cc +++ b/www/ungoogled-chromium/files/patch-ui_views_focus_focus__manager.cc @@ -1,6 +1,6 @@ ---- ui/views/focus/focus_manager.cc.orig 2024-06-22 08:49:42 UTC +--- ui/views/focus/focus_manager.cc.orig 2024-08-26 14:40:28 UTC +++ ui/views/focus/focus_manager.cc -@@ -582,7 +582,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi +@@ -585,7 +585,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ // Processing an accelerator can delete things. Because we // need these objects afterwards on Linux, save widget_ as weak pointer and // save the close_on_deactivate property value of widget_delegate in a -@@ -599,7 +599,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi +@@ -602,7 +602,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc b/www/ungoogled-chromium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc index bed59190c85c..e88e9da5bae5 100644 --- a/www/ungoogled-chromium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc +++ b/www/ungoogled-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-07-31 14:19:23 UTC +--- ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc.orig 2024-08-26 14:40:28 UTC +++ ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc -@@ -205,7 +205,7 @@ DragOperation DesktopDragDropClientOzone::StartDragAnd +@@ -197,7 +197,7 @@ DragOperation DesktopDragDropClientOzone::StartDragAnd return selected_operation_; } diff --git a/www/ungoogled-chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc b/www/ungoogled-chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc index 45fa630332f6..41f1c3558ad3 100644 --- a/www/ungoogled-chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc +++ b/www/ungoogled-chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc @@ -1,4 +1,4 @@ ---- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2024-07-31 14:19:23 UTC +--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2024-08-26 14:40:28 UTC +++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc @@ -48,7 +48,7 @@ #include "ui/wm/core/window_util.h" @@ -18,7 +18,7 @@ std::make_unique<DesktopDragDropClientOzoneLinux>(window(), drag_handler); #else std::make_unique<DesktopDragDropClientOzone>(window(), drag_handler); -@@ -1162,7 +1162,7 @@ bool DesktopWindowTreeHostPlatform::RotateFocusForWidg +@@ -1174,7 +1174,7 @@ bool DesktopWindowTreeHostPlatform::RotateFocusForWidg // DesktopWindowTreeHost: // Linux subclasses this host and adds some Linux specific bits. diff --git a/www/ungoogled-chromium/files/patch-ui_views_widget_root__view.cc b/www/ungoogled-chromium/files/patch-ui_views_widget_root__view.cc index 2761ab50df09..20a17257d627 100644 --- a/www/ungoogled-chromium/files/patch-ui_views_widget_root__view.cc +++ b/www/ungoogled-chromium/files/patch-ui_views_widget_root__view.cc @@ -1,6 +1,6 @@ ---- ui/views/widget/root_view.cc.orig 2024-07-31 14:19:23 UTC +--- ui/views/widget/root_view.cc.orig 2024-08-26 14:40:28 UTC +++ ui/views/widget/root_view.cc -@@ -128,7 +128,7 @@ class AnnounceTextView : public View { +@@ -129,7 +129,7 @@ class AnnounceTextView : public View { #if BUILDFLAG(IS_CHROMEOS) // On ChromeOS, kAlert role can invoke an unnecessary event on reparenting. node_data->role = ax::mojom::Role::kStaticText; diff --git a/www/ungoogled-chromium/files/patch-ui_views_widget_widget.cc b/www/ungoogled-chromium/files/patch-ui_views_widget_widget.cc index 886e4ea59ca8..9a7064b4e7c5 100644 --- a/www/ungoogled-chromium/files/patch-ui_views_widget_widget.cc +++ b/www/ungoogled-chromium/files/patch-ui_views_widget_widget.cc @@ -1,4 +1,4 @@ ---- ui/views/widget/widget.cc.orig 2024-07-31 14:19:23 UTC +--- ui/views/widget/widget.cc.orig 2024-08-26 14:40:28 UTC +++ ui/views/widget/widget.cc @@ -57,7 +57,7 @@ #include "ui/views/window/custom_frame_view.h" @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #endif -@@ -2172,7 +2172,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const +@@ -2182,7 +2182,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const if (parent_) return parent_->GetNativeTheme(); diff --git a/www/ungoogled-chromium/files/patch-ui_views_window_custom__frame__view.cc b/www/ungoogled-chromium/files/patch-ui_views_window_custom__frame__view.cc index 6427141af331..922e96e0e89b 100644 --- a/www/ungoogled-chromium/files/patch-ui_views_window_custom__frame__view.cc +++ b/www/ungoogled-chromium/files/patch-ui_views_window_custom__frame__view.cc @@ -1,6 +1,6 @@ ---- ui/views/window/custom_frame_view.cc.orig 2024-06-22 08:49:42 UTC +--- ui/views/window/custom_frame_view.cc.orig 2024-08-26 14:40:28 UTC +++ ui/views/window/custom_frame_view.cc -@@ -267,7 +267,7 @@ int CustomFrameView::CaptionButtonY() const { +@@ -268,7 +268,7 @@ int CustomFrameView::CaptionButtonY() const { // drawn flush with the screen edge, they still obey Fitts' Law. // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/files/patch-ui_views_window_dialog__delegate.cc b/www/ungoogled-chromium/files/patch-ui_views_window_dialog__delegate.cc index a4ed309c956c..a68e9d73a34e 100644 --- a/www/ungoogled-chromium/files/patch-ui_views_window_dialog__delegate.cc +++ b/www/ungoogled-chromium/files/patch-ui_views_window_dialog__delegate.cc @@ -1,6 +1,6 @@ ---- ui/views/window/dialog_delegate.cc.orig 2024-07-31 14:19:23 UTC +--- ui/views/window/dialog_delegate.cc.orig 2024-08-26 14:40:28 UTC +++ ui/views/window/dialog_delegate.cc -@@ -109,7 +109,7 @@ Widget* DialogDelegate::CreateDialogWidget( +@@ -103,7 +103,7 @@ Widget* DialogDelegate::CreateDialogWidget( // static bool DialogDelegate::CanSupportCustomFrame(gfx::NativeView parent) { diff --git a/www/ungoogled-chromium/files/patch-v8_BUILD.gn b/www/ungoogled-chromium/files/patch-v8_BUILD.gn index ca6a9865d626..6c5f33463507 100644 --- a/www/ungoogled-chromium/files/patch-v8_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-v8_BUILD.gn @@ -1,6 +1,6 @@ ---- v8/BUILD.gn.orig 2024-07-31 14:19:23 UTC +--- v8/BUILD.gn.orig 2024-08-26 14:40:28 UTC +++ v8/BUILD.gn -@@ -876,6 +876,8 @@ external_v8_defines = [ +@@ -896,6 +896,8 @@ external_v8_defines = [ "V8_TARGET_OS_MACOS", "V8_TARGET_OS_WIN", "V8_TARGET_OS_CHROMEOS", @@ -8,8 +8,8 @@ + "V8_TARGET_OS_FREEBSD", ] - enabled_external_v8_defines = [] -@@ -948,6 +950,12 @@ if (target_os == "android") { + enabled_external_v8_defines = [ +@@ -972,6 +974,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 -@@ -2442,6 +2450,12 @@ template("run_mksnapshot") { +@@ -2477,6 +2485,12 @@ template("run_mksnapshot") { if (!v8_enable_builtins_profiling && v8_enable_builtins_reordering) { args += [ "--reorder-builtins" ] } @@ -35,7 +35,7 @@ } # This is needed to distinguish between generating code for the simulator -@@ -6490,7 +6504,7 @@ v8_component("v8_libbase") { +@@ -6559,7 +6573,7 @@ v8_component("v8_libbase") { } } @@ -44,7 +44,7 @@ sources += [ "src/base/debug/stack_trace_posix.cc", "src/base/platform/platform-linux.cc", -@@ -6501,6 +6515,18 @@ v8_component("v8_libbase") { +@@ -6570,6 +6584,18 @@ v8_component("v8_libbase") { "dl", "rt", ] diff --git a/www/ungoogled-chromium/files/patch-v8_include_v8config.h b/www/ungoogled-chromium/files/patch-v8_include_v8config.h index 4bcce5d3f405..140e0c343446 100644 --- a/www/ungoogled-chromium/files/patch-v8_include_v8config.h +++ b/www/ungoogled-chromium/files/patch-v8_include_v8config.h @@ -1,6 +1,6 @@ ---- v8/include/v8config.h.orig 2024-07-31 14:19:23 UTC +--- v8/include/v8config.h.orig 2024-08-26 14:40:28 UTC +++ v8/include/v8config.h -@@ -193,6 +193,8 @@ path. Add it with -I<path> to the command line +@@ -201,6 +201,8 @@ path. Add it with -I<path> to the command line && !defined(V8_TARGET_OS_FUCHSIA) \ && !defined(V8_TARGET_OS_IOS) \ && !defined(V8_TARGET_OS_LINUX) \ @@ -9,7 +9,7 @@ && !defined(V8_TARGET_OS_MACOS) \ && !defined(V8_TARGET_OS_WIN) \ && !defined(V8_TARGET_OS_CHROMEOS) -@@ -205,6 +207,8 @@ path. Add it with -I<path> to the command line +@@ -213,6 +215,8 @@ path. Add it with -I<path> to the command line || defined(V8_TARGET_OS_FUCHSIA) \ || defined(V8_TARGET_OS_IOS) \ || defined(V8_TARGET_OS_LINUX) \ @@ -18,12 +18,10 @@ || defined(V8_TARGET_OS_MACOS) \ || defined(V8_TARGET_OS_WIN) \ || defined(V8_TARGET_OS_CHROMEOS) -@@ -226,6 +230,16 @@ path. Add it with -I<path> to the command line - - #ifdef V8_OS_LINUX +@@ -236,6 +240,16 @@ path. Add it with -I<path> to the command line # define V8_TARGET_OS_LINUX -+#endif -+ + #endif + +#ifdef V8_OS_OPENBSD +# define V8_TARGET_OS_OPENBSD +# define V8_TARGET_OS_BSD @@ -32,6 +30,18 @@ +#ifdef V8_OS_FREEBSD +# define V8_TARGET_OS_OPENBSD +# define V8_TARGET_OS_BSD - #endif - ++#endif ++ #ifdef V8_OS_MACOS + # define V8_TARGET_OS_MACOS + #endif +@@ -381,7 +395,8 @@ path. Add it with -I<path> to the command line + // preserve_most in clang >= 17 (see https://reviews.llvm.org/D143425). + #if (defined(_M_X64) || defined(__x86_64__) /* x64 (everywhere) */ \ + || ((defined(__AARCH64EL__) || defined(_M_ARM64)) /* arm64, but ... */ \ +- && !defined(_WIN32))) /* not on windows */ \ ++ && !defined(_WIN32) /* not on windows */ \ ++ && !defined(__OpenBSD__))) /* not on OpenBSD */ \ + && !defined(COMPONENT_BUILD) /* no component build */\ + && __clang_major__ >= 17 /* clang >= 17 */ + # define V8_HAS_ATTRIBUTE_PRESERVE_MOST (__has_attribute(preserve_most)) diff --git a/www/ungoogled-chromium/files/patch-v8_src_api_api.cc b/www/ungoogled-chromium/files/patch-v8_src_api_api.cc index cb4dc39d691f..c9e1a837e8bd 100644 --- a/www/ungoogled-chromium/files/patch-v8_src_api_api.cc +++ b/www/ungoogled-chromium/files/patch-v8_src_api_api.cc @@ -1,6 +1,6 @@ ---- v8/src/api/api.cc.orig 2024-07-31 14:19:23 UTC +--- v8/src/api/api.cc.orig 2024-08-26 14:40:28 UTC +++ v8/src/api/api.cc -@@ -145,7 +145,7 @@ +@@ -148,7 +148,7 @@ #include "src/wasm/wasm-serialization.h" #endif // V8_ENABLE_WEBASSEMBLY @@ -9,7 +9,7 @@ #include <signal.h> #include <unistd.h> -@@ -6452,7 +6452,7 @@ bool v8::V8::Initialize(const int build_config) { +@@ -6511,7 +6511,7 @@ bool v8::V8::Initialize(const int build_config) { return true; } diff --git a/www/ungoogled-chromium/files/patch-v8_src_base_platform_memory.h b/www/ungoogled-chromium/files/patch-v8_src_base_platform_memory.h index eb9e93745266..73d02be18594 100644 --- a/www/ungoogled-chromium/files/patch-v8_src_base_platform_memory.h +++ b/www/ungoogled-chromium/files/patch-v8_src_base_platform_memory.h @@ -1,16 +1,18 @@ ---- v8/src/base/platform/memory.h.orig 2023-02-11 09:11:04 UTC +--- v8/src/base/platform/memory.h.orig 2024-08-26 14:40:28 UTC +++ v8/src/base/platform/memory.h -@@ -19,11 +19,11 @@ +@@ -19,13 +19,13 @@ #if V8_OS_DARWIN #include <malloc/malloc.h> --#else // !V8_OS_DARWIN -+#elif !V8_OS_BSD +-#elif V8_OS_ZOS ++#elif (V8_OS_ZOS || V8_OS_BSD) + #include <stdlib.h> + #else #include <malloc.h> - #endif // !V8_OS_DARWIN + #endif --#if (V8_OS_POSIX && !V8_OS_AIX && !V8_OS_SOLARIS) || V8_OS_WIN -+#if (V8_OS_POSIX && !V8_OS_AIX && !V8_OS_SOLARIS && !V8_OS_BSD) || V8_OS_WIN +-#if (V8_OS_POSIX && !V8_OS_AIX && !V8_OS_SOLARIS && !V8_OS_ZOS) || V8_OS_WIN ++#if (V8_OS_POSIX && !V8_OS_AIX && !V8_OS_SOLARIS && !V8_OS_ZOS && !V8_OS_BSD) || V8_OS_WIN #define V8_HAS_MALLOC_USABLE_SIZE 1 - #endif // (V8_OS_POSIX && !V8_OS_AIX && !V8_OS_SOLARIS) || V8_OS_WIN + #endif diff --git a/www/ungoogled-chromium/files/patch-v8_src_base_platform_platform-posix.cc b/www/ungoogled-chromium/files/patch-v8_src_base_platform_platform-posix.cc index 8a41046cbcf5..602202bccf71 100644 --- a/www/ungoogled-chromium/files/patch-v8_src_base_platform_platform-posix.cc +++ b/www/ungoogled-chromium/files/patch-v8_src_base_platform_platform-posix.cc @@ -1,11 +1,11 @@ ---- v8/src/base/platform/platform-posix.cc.orig 2024-07-31 14:19:23 UTC +--- v8/src/base/platform/platform-posix.cc.orig 2024-08-26 14:40:28 UTC +++ v8/src/base/platform/platform-posix.cc @@ -54,7 +54,7 @@ #if V8_OS_DARWIN #include <mach/mach.h> #include <malloc/malloc.h> --#else -+#elif !V8_OS_BSD +-#elif !V8_OS_ZOS ++#elif !V8_OS_ZOS && !V8_OS_BSD #include <malloc.h> #endif @@ -18,7 +18,7 @@ #define MAP_ANONYMOUS MAP_ANON #endif -@@ -305,8 +305,15 @@ void OS::SetRandomMmapSeed(int64_t seed) { +@@ -311,8 +311,15 @@ void OS::SetRandomMmapSeed(int64_t seed) { } } @@ -34,7 +34,7 @@ uintptr_t raw_addr; { MutexGuard guard(rng_mutex.Pointer()); -@@ -401,6 +408,7 @@ void* OS::GetRandomMmapAddr() { +@@ -407,6 +414,7 @@ void* OS::GetRandomMmapAddr() { #endif return reinterpret_cast<void*>(raw_addr); } @@ -42,8 +42,8 @@ // TODO(bbudge) Move Cygwin and Fuchsia stuff into platform-specific files. #if !V8_OS_CYGWIN && !V8_OS_FUCHSIA -@@ -672,7 +680,7 @@ void OS::DestroySharedMemoryHandle(PlatformSharedMemor - +@@ -681,7 +689,7 @@ void OS::DestroySharedMemoryHandle(PlatformSharedMemor + #if !V8_OS_ZOS // static bool OS::HasLazyCommits() { -#if V8_OS_AIX || V8_OS_LINUX || V8_OS_DARWIN @@ -51,7 +51,7 @@ return true; #else // TODO(bbudge) Return true for all POSIX platforms. -@@ -1306,7 +1314,7 @@ void Thread::SetThreadLocal(LocalStorageKey key, void* +@@ -1326,7 +1334,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/ungoogled-chromium/files/patch-v8_src_execution_isolate.cc b/www/ungoogled-chromium/files/patch-v8_src_execution_isolate.cc index 0e80196fe522..695e802ecef4 100644 --- a/www/ungoogled-chromium/files/patch-v8_src_execution_isolate.cc +++ b/www/ungoogled-chromium/files/patch-v8_src_execution_isolate.cc @@ -1,6 +1,6 @@ ---- v8/src/execution/isolate.cc.orig 2024-07-31 14:19:23 UTC +--- v8/src/execution/isolate.cc.orig 2024-08-26 14:40:28 UTC +++ v8/src/execution/isolate.cc -@@ -157,6 +157,10 @@ +@@ -159,6 +159,10 @@ #include "src/execution/simulator-base.h" #endif @@ -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_[]; -@@ -4540,6 +4544,13 @@ void Isolate::InitializeDefaultEmbeddedBlob() { +@@ -4785,6 +4789,13 @@ void Isolate::InitializeDefaultEmbeddedBlob() { uint32_t code_size = DefaultEmbeddedBlobCodeSize(); const uint8_t* data = DefaultEmbeddedBlobData(); uint32_t data_size = DefaultEmbeddedBlobDataSize(); diff --git a/www/ungoogled-chromium/files/patch-v8_src_sandbox_sandbox.cc b/www/ungoogled-chromium/files/patch-v8_src_sandbox_sandbox.cc index 50a60f027a6e..0c01d6f75e95 100644 --- a/www/ungoogled-chromium/files/patch-v8_src_sandbox_sandbox.cc +++ b/www/ungoogled-chromium/files/patch-v8_src_sandbox_sandbox.cc @@ -1,6 +1,6 @@ ---- v8/src/sandbox/sandbox.cc.orig 2024-06-22 08:49:42 UTC +--- v8/src/sandbox/sandbox.cc.orig 2024-08-26 14:40:28 UTC +++ v8/src/sandbox/sandbox.cc -@@ -47,7 +47,7 @@ static Address DetermineAddressSpaceLimit() { +@@ -48,7 +48,7 @@ static Address DetermineAddressSpaceLimit() { } #endif // V8_TARGET_ARCH_X64 diff --git a/www/ungoogled-chromium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.cc b/www/ungoogled-chromium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.cc index 4c3b0376ce63..a93cfa020434 100644 --- a/www/ungoogled-chromium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.cc +++ b/www/ungoogled-chromium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.cc @@ -1,9 +1,9 @@ ---- v8/src/snapshot/embedded/platform-embedded-file-writer-base.cc.orig 2023-11-04 07:08:51 UTC +--- v8/src/snapshot/embedded/platform-embedded-file-writer-base.cc.orig 2024-08-26 14:40:28 UTC +++ v8/src/snapshot/embedded/platform-embedded-file-writer-base.cc -@@ -143,6 +143,8 @@ EmbeddedTargetOs ToEmbeddedTargetOs(const char* s) { - return EmbeddedTargetOs::kWin; - } else if (string == "starboard") { +@@ -148,6 +148,8 @@ EmbeddedTargetOs ToEmbeddedTargetOs(const char* s) { return EmbeddedTargetOs::kStarboard; + } else if (string == "zos") { + return EmbeddedTargetOs::kZOS; + } else if (string == "openbsd") { + return EmbeddedTargetOs::kOpenBSD; } else { diff --git a/www/ungoogled-chromium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.h b/www/ungoogled-chromium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.h index 2a5727bf1380..ae9c0151f5fe 100644 --- a/www/ungoogled-chromium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.h +++ b/www/ungoogled-chromium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.h @@ -1,9 +1,9 @@ ---- v8/src/snapshot/embedded/platform-embedded-file-writer-base.h.orig 2023-02-11 09:11:04 UTC +--- v8/src/snapshot/embedded/platform-embedded-file-writer-base.h.orig 2024-08-26 14:40:28 UTC +++ v8/src/snapshot/embedded/platform-embedded-file-writer-base.h -@@ -31,6 +31,7 @@ enum class EmbeddedTargetOs { - kMac, +@@ -32,6 +32,7 @@ enum class EmbeddedTargetOs { kWin, kStarboard, + kZOS, + kOpenBSD, kGeneric, // Everything not covered above falls in here. }; diff --git a/www/ungoogled-chromium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl.h b/www/ungoogled-chromium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl.h index c6cff79ab84c..7357490bb038 100644 --- a/www/ungoogled-chromium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl.h +++ b/www/ungoogled-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-06-22 08:49:42 UTC +--- v8/src/wasm/baseline/ia32/liftoff-assembler-ia32-inl.h.orig 2024-08-26 14:40:28 UTC +++ v8/src/wasm/baseline/ia32/liftoff-assembler-ia32-inl.h -@@ -492,7 +492,7 @@ void LiftoffAssembler::StoreTaggedPointer(Register dst +@@ -503,7 +503,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) { -@@ -569,7 +569,7 @@ void LiftoffAssembler::Load(LiftoffRegister dst, Regis +@@ -583,7 +583,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 */) { -@@ -645,7 +645,7 @@ void LiftoffAssembler::Store(Register dst_addr, Regist +@@ -662,7 +662,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) { -@@ -663,7 +663,7 @@ void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, +@@ -680,7 +680,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()); -@@ -733,7 +733,7 @@ enum Binop { kAdd, kSub, kAnd, kOr, kXor, kExchange }; +@@ -750,7 +750,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); -@@ -801,7 +801,7 @@ inline void AtomicAddOrSubOrExchange32(LiftoffAssemble +@@ -818,7 +818,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); -@@ -916,7 +916,7 @@ inline void AtomicBinop32(LiftoffAssembler* lasm, Bino +@@ -933,7 +933,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 -@@ -1012,7 +1012,7 @@ inline void AtomicBinop64(LiftoffAssembler* lasm, Bino +@@ -1029,7 +1029,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) { -@@ -1026,7 +1026,7 @@ void LiftoffAssembler::AtomicAdd(Register dst_addr, Re +@@ -1043,7 +1043,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) { -@@ -1039,7 +1039,7 @@ void LiftoffAssembler::AtomicSub(Register dst_addr, Re +@@ -1056,7 +1056,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) { -@@ -1053,7 +1053,7 @@ void LiftoffAssembler::AtomicAnd(Register dst_addr, Re +@@ -1070,7 +1070,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) { -@@ -1067,7 +1067,7 @@ void LiftoffAssembler::AtomicOr(Register dst_addr, Reg +@@ -1084,7 +1084,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) { -@@ -1081,7 +1081,7 @@ void LiftoffAssembler::AtomicXor(Register dst_addr, Re +@@ -1098,7 +1098,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 */) { -@@ -1096,7 +1096,7 @@ void LiftoffAssembler::AtomicExchange(Register dst_add +@@ -1113,7 +1113,7 @@ void LiftoffAssembler::AtomicExchange(Register dst_add } void LiftoffAssembler::AtomicCompareExchange( |