diff options
| author | Robert Nagy <rnagy@FreeBSD.org> | 2023-11-23 12:10:48 +0000 |
|---|---|---|
| committer | Robert Nagy <rnagy@FreeBSD.org> | 2023-11-23 12:11:13 +0000 |
| commit | e6d90349a768f3d740b38d9eb4f4fa7ee1a4456d (patch) | |
| tree | b01aa4ecc2676aba857381568bff78e288864a15 | |
| parent | 03eac77c103b637b316d6a73df7cae01986402cf (diff) | |
| download | ports-e6d90349a768f3d740b38d9eb4f4fa7ee1a4456d.tar.gz ports-e6d90349a768f3d740b38d9eb4f4fa7ee1a4456d.zip | |
www/iridium: update to 2023.11.119
332 files changed, 1741 insertions, 1664 deletions
diff --git a/www/iridium/Makefile b/www/iridium/Makefile index a27baf958fb5..d1254ebc5ea3 100644 --- a/www/iridium/Makefile +++ b/www/iridium/Makefile @@ -1,6 +1,5 @@ PORTNAME= iridium -PORTVERSION= 2023.10.118 -PORTREVISION= 1 +PORTVERSION= 2023.11.119 CATEGORIES= www wayland MASTER_SITES= https://downloads.iridiumbrowser.de/source/ PKGNAMESUFFIX= -browser @@ -16,7 +15,7 @@ LICENSE_COMB= multi ONLY_FOR_ARCHS= aarch64 amd64 i386 PATCH_SITES= https://nerd.hu/distfiles/ -PATCHFILES+= disable-privacy-sandbox-891b80bbfcdb15e8292143efd1715fa3f30662c4.patch:-p1 +PATCHFILES+= disable-privacy-sandbox-13fc15e4ec454e3397f11bdc1bf2627c121a37e8.patch:-p1 BUILD_DEPENDS= bash:shells/bash \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ diff --git a/www/iridium/distinfo b/www/iridium/distinfo index 6261ab687236..61342d1b26be 100644 --- a/www/iridium/distinfo +++ b/www/iridium/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1697953114 -SHA256 (iridium-browser-2023.10.118.tar.xz) = da3d10fae3e674731cdb0e186a469e4bc333b2d40fb79fcda186aa4db0c48385 -SIZE (iridium-browser-2023.10.118.tar.xz) = 1779967504 -SHA256 (disable-privacy-sandbox-891b80bbfcdb15e8292143efd1715fa3f30662c4.patch) = ea4bfcac8636c65d8933236b89429699a51c77837fa04863cb40f8c7add833b4 -SIZE (disable-privacy-sandbox-891b80bbfcdb15e8292143efd1715fa3f30662c4.patch) = 3559 +TIMESTAMP = 1700662814 +SHA256 (iridium-browser-2023.11.119.tar.xz) = 80ed8669c9538120382aa8da81bb33ac9b346ababb6490838d6dc1a107615026 +SIZE (iridium-browser-2023.11.119.tar.xz) = 1807223844 +SHA256 (disable-privacy-sandbox-13fc15e4ec454e3397f11bdc1bf2627c121a37e8.patch) = 0565deb50e1206c2fa6d0476474ec9504893fc86b3589467ee2406ad10c915fc +SIZE (disable-privacy-sandbox-13fc15e4ec454e3397f11bdc1bf2627c121a37e8.patch) = 3437 diff --git a/www/iridium/files/patch-BUILD.gn b/www/iridium/files/patch-BUILD.gn index 3552d9764c08..43355be5d6a6 100644 --- a/www/iridium/files/patch-BUILD.gn +++ b/www/iridium/files/patch-BUILD.gn @@ -1,4 +1,4 @@ ---- BUILD.gn.orig 2023-10-21 11:51:27 UTC +--- BUILD.gn.orig 2023-11-22 14:00:11 UTC +++ BUILD.gn @@ -61,7 +61,7 @@ declare_args() { root_extra_deps = [] @@ -57,10 +57,10 @@ - if (!is_chromeos_ash && !is_ios && !is_fuchsia && !is_android && !is_castos) { + if (!is_chromeos_ash && !is_ios && !is_fuchsia && !is_android && !is_castos && !is_bsd) { - script_test("webdriver_wpt_tests") { + script_test("chrome_wpt_tests") { script = "//third_party/blink/tools/run_wpt_tests.py" args = [ -@@ -1184,7 +1192,7 @@ if (use_blink && !is_cronet_build) { +@@ -1167,7 +1175,7 @@ if (use_blink && !is_cronet_build) { data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ] } @@ -69,7 +69,7 @@ data_deps += [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } -@@ -1193,7 +1201,7 @@ if (use_blink && !is_cronet_build) { +@@ -1176,7 +1184,7 @@ if (use_blink && !is_cronet_build) { data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } @@ -78,7 +78,7 @@ data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } -@@ -1653,7 +1661,7 @@ group("chromium_builder_perf") { +@@ -1637,7 +1645,7 @@ group("chromium_builder_perf") { data_deps += [ "//chrome/test:performance_browser_tests" ] } diff --git a/www/iridium/files/patch-base_BUILD.gn b/www/iridium/files/patch-base_BUILD.gn index 8c3a2219ca21..ee955c1346c1 100644 --- a/www/iridium/files/patch-base_BUILD.gn +++ b/www/iridium/files/patch-base_BUILD.gn @@ -1,6 +1,6 @@ ---- base/BUILD.gn.orig 2023-10-21 11:51:27 UTC +--- base/BUILD.gn.orig 2023-11-22 14:00:11 UTC +++ base/BUILD.gn -@@ -198,7 +198,7 @@ buildflag_header("ios_cronet_buildflags") { +@@ -186,7 +186,7 @@ buildflag_header("ios_cronet_buildflags") { flags = [ "CRONET_BUILD=$is_cronet_build" ] } @@ -9,7 +9,7 @@ buildflag_header("message_pump_buildflags") { header = "message_pump_buildflags.h" header_dir = "base/message_loop" -@@ -1111,11 +1111,23 @@ component("base") { +@@ -1101,11 +1101,23 @@ component("base") { # Needed for <atomic> if using newer C++ library than sysroot, except if # building inside the cros_sdk environment - use host_toolchain as a # more robust check for this. @@ -34,7 +34,7 @@ if (use_allocator_shim) { if (is_apple) { sources += [ "allocator/early_zone_registration_apple.h" ] -@@ -1135,7 +1147,7 @@ component("base") { +@@ -1125,7 +1137,7 @@ component("base") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -43,7 +43,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -2080,6 +2092,22 @@ component("base") { +@@ -2077,6 +2089,22 @@ component("base") { ] } @@ -66,7 +66,7 @@ # iOS if (is_ios) { sources += [ -@@ -2212,6 +2240,29 @@ component("base") { +@@ -2209,6 +2237,29 @@ component("base") { } } @@ -96,7 +96,7 @@ if (use_blink) { sources += [ "files/file_path_watcher.cc", -@@ -2222,7 +2273,7 @@ component("base") { +@@ -2219,7 +2270,7 @@ component("base") { } if (dep_libevent) { @@ -105,7 +105,7 @@ } if (use_libevent) { -@@ -3596,7 +3647,7 @@ test("base_unittests") { +@@ -3599,7 +3650,7 @@ test("base_unittests") { ] } @@ -114,7 +114,7 @@ sources += [ "debug/proc_maps_linux_unittest.cc", "files/scoped_file_linux_unittest.cc", -@@ -3617,7 +3668,7 @@ test("base_unittests") { +@@ -3620,7 +3671,7 @@ test("base_unittests") { "posix/file_descriptor_shuffle_unittest.cc", "posix/unix_domain_socket_unittest.cc", ] @@ -123,7 +123,7 @@ sources += [ "profiler/stack_base_address_posix_unittest.cc", "profiler/stack_copier_signal_unittest.cc", -@@ -3628,7 +3679,7 @@ test("base_unittests") { +@@ -3631,7 +3682,7 @@ test("base_unittests") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -132,7 +132,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -3884,7 +3935,7 @@ test("base_unittests") { +@@ -3892,7 +3943,7 @@ test("base_unittests") { } } diff --git a/www/iridium/files/patch-base_allocator_dispatcher_tls.h b/www/iridium/files/patch-base_allocator_dispatcher_tls.h index 9b04ab4b38ee..639bf65b9f20 100644 --- a/www/iridium/files/patch-base_allocator_dispatcher_tls.h +++ b/www/iridium/files/patch-base_allocator_dispatcher_tls.h @@ -1,6 +1,6 @@ ---- base/allocator/dispatcher/tls.h.orig 2023-07-24 14:27:53 UTC +--- base/allocator/dispatcher/tls.h.orig 2023-11-22 14:00:11 UTC +++ base/allocator/dispatcher/tls.h -@@ -50,7 +50,7 @@ struct BASE_EXPORT MMapAllocator { +@@ -74,7 +74,7 @@ struct BASE_EXPORT MMapAllocator { partition_alloc::PartitionPageSize(); #elif BUILDFLAG(IS_APPLE) constexpr static size_t AllocationChunkSize = 16384; diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_BUILD.gn b/www/iridium/files/patch-base_allocator_partition__allocator_BUILD.gn index 5ceb80bf660a..110229487653 100644 --- a/www/iridium/files/patch-base_allocator_partition__allocator_BUILD.gn +++ b/www/iridium/files/patch-base_allocator_partition__allocator_BUILD.gn @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/BUILD.gn.orig 2023-10-21 11:51:27 UTC +--- base/allocator/partition_allocator/BUILD.gn.orig 2023-11-22 14:00:11 UTC +++ base/allocator/partition_allocator/BUILD.gn -@@ -562,7 +562,7 @@ source_set("allocator_shim") { +@@ -569,7 +569,7 @@ source_set("allocator_shim") { ] configs += [ ":mac_no_default_new_delete_symbols" ] } diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc.gni b/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc.gni index 533e99011fd2..9f74a77c14d5 100644 --- a/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc.gni +++ b/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc.gni @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/partition_alloc.gni.orig 2023-10-21 11:51:27 UTC +--- base/allocator/partition_allocator/partition_alloc.gni.orig 2023-11-22 14:00:11 UTC +++ base/allocator/partition_allocator/partition_alloc.gni -@@ -328,7 +328,7 @@ declare_args() { +@@ -319,7 +319,7 @@ declare_args() { # pkeys support is explicitly disabled in all Cronet builds, as some test # dependencies that use partition_allocator are compiled in AOSP against a # version of glibc that does not include pkeys syscall numbers. diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__base_debug_stack__trace__posix.cc b/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__base_debug_stack__trace__posix.cc index c2e5cc8557c8..d86f03833754 100644 --- a/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__base_debug_stack__trace__posix.cc +++ b/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__base_debug_stack__trace__posix.cc @@ -1,4 +1,4 @@ ---- base/allocator/partition_allocator/partition_alloc_base/debug/stack_trace_posix.cc.orig 2023-10-21 11:51:27 UTC +--- base/allocator/partition_allocator/partition_alloc_base/debug/stack_trace_posix.cc.orig 2023-11-22 14:00:11 UTC +++ base/allocator/partition_allocator/partition_alloc_base/debug/stack_trace_posix.cc @@ -12,11 +12,11 @@ #include <string.h> @@ -23,7 +23,7 @@ constexpr size_t kBufferSize = 4096u; -@@ -359,7 +359,7 @@ void PrintStackTraceInternal(void* const* trace, size_ +@@ -359,7 +359,7 @@ void PrintStackTraceInternal(const void** trace, size_ } #endif // !BUILDFLAG(IS_APPLE) @@ -31,4 +31,4 @@ +#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) // Since /proc/self/maps is not available, use dladdr() to obtain module // names and offsets inside the modules from the given addresses. - void PrintStackTraceInternal(void* const* trace, size_t size) { + void PrintStackTraceInternal(const void* const* trace, size_t size) { diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h b/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h index e1391cd9e1c9..cfd16d3ed5f1 100644 --- a/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h +++ b/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2023-10-21 11:51:27 UTC +--- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2023-11-22 14:00:11 UTC +++ base/allocator/partition_allocator/partition_alloc_constants.h -@@ -95,7 +95,7 @@ PartitionPageShift() { +@@ -107,7 +107,7 @@ PartitionPageShift() { return 18; // 256 KiB } #elif (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)) || \ @@ -9,7 +9,7 @@ PA_ALWAYS_INLINE PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR size_t PartitionPageShift() { return PageAllocationGranularityShift() + 2; -@@ -297,7 +297,8 @@ constexpr size_t kNumPools = kMaxPoolHandle - 1; +@@ -309,7 +309,8 @@ constexpr size_t kNumPools = kMaxPoolHandle - 1; // 8GB for each of the glued pools). #if BUILDFLAG(HAS_64_BIT_POINTERS) #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || \ diff --git a/www/iridium/files/patch-base_base__paths__posix.cc b/www/iridium/files/patch-base_base__paths__posix.cc index 685f852f9b76..342ba8212e95 100644 --- a/www/iridium/files/patch-base_base__paths__posix.cc +++ b/www/iridium/files/patch-base_base__paths__posix.cc @@ -1,4 +1,4 @@ ---- base/base_paths_posix.cc.orig 2022-12-01 10:35:46 UTC +--- base/base_paths_posix.cc.orig 2023-11-22 14:00:11 UTC +++ base/base_paths_posix.cc @@ -15,6 +15,7 @@ #include <ostream> @@ -8,7 +8,7 @@ #include "base/environment.h" #include "base/files/file_path.h" #include "base/files/file_util.h" -@@ -25,9 +26,13 @@ +@@ -26,9 +27,13 @@ #include "base/process/process_metrics.h" #include "build/build_config.h" @@ -23,7 +23,17 @@ #elif BUILDFLAG(IS_SOLARIS) || BUILDFLAG(IS_AIX) #include <stdlib.h> #endif -@@ -68,13 +73,65 @@ bool PathProviderPosix(int key, FilePath* result) { +@@ -48,8 +53,7 @@ bool PathProviderPosix(int key, FilePath* result) { + *result = bin_dir; + return true; + #elif BUILDFLAG(IS_FREEBSD) +- int name[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; +- absl::optional<std::string> bin_dir = StringSysctl(name, std::size(name)); ++ absl::optional<std::string> bin_dir = StringSysctl({ CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }); + if (!bin_dir.has_value() || bin_dir.value().length() <= 1) { + NOTREACHED() << "Unable to resolve path."; + return false; +@@ -65,13 +69,65 @@ bool PathProviderPosix(int key, FilePath* result) { *result = FilePath(bin_dir); return true; #elif BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_AIX) diff --git a/www/iridium/files/patch-base_debug_stack__trace__posix.cc b/www/iridium/files/patch-base_debug_stack__trace__posix.cc index 510facc92342..74c64bda5671 100644 --- a/www/iridium/files/patch-base_debug_stack__trace__posix.cc +++ b/www/iridium/files/patch-base_debug_stack__trace__posix.cc @@ -1,4 +1,4 @@ ---- base/debug/stack_trace_posix.cc.orig 2023-10-21 11:51:27 UTC +--- base/debug/stack_trace_posix.cc.orig 2023-11-22 14:00:11 UTC +++ base/debug/stack_trace_posix.cc @@ -41,7 +41,7 @@ // execinfo.h and backtrace(3) are really only present in glibc and in macOS @@ -9,16 +9,19 @@ #define HAVE_BACKTRACE #include <execinfo.h> #endif -@@ -59,7 +59,7 @@ +@@ -59,8 +59,10 @@ #include <AvailabilityMacros.h> #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) ++#if !BUILDFLAG(IS_BSD) + #include <sys/prctl.h> ++#endif + #include "base/debug/proc_maps_linux.h" #endif - -@@ -300,7 +300,7 @@ void PrintToStderr(const char* output) { +@@ -302,7 +304,7 @@ void PrintToStderr(const char* output) { std::ignore = HANDLE_EINTR(write(STDERR_FILENO, output, strlen(output))); } @@ -27,7 +30,7 @@ void AlarmSignalHandler(int signal, siginfo_t* info, void* void_context) { // We have seen rare cases on AMD linux where the default signal handler // either does not run or a thread (Probably an AMD driver thread) prevents -@@ -317,7 +317,11 @@ void AlarmSignalHandler(int signal, siginfo_t* info, v +@@ -319,7 +321,11 @@ void AlarmSignalHandler(int signal, siginfo_t* info, v "Warning: Default signal handler failed to terminate process.\n"); PrintToStderr("Calling exit_group() directly to prevent timeout.\n"); // See: https://man7.org/linux/man-pages/man2/exit_group.2.html @@ -39,7 +42,7 @@ } #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || // BUILDFLAG(IS_CHROMEOS) -@@ -534,7 +538,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf +@@ -536,7 +542,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf _exit(EXIT_FAILURE); } @@ -48,7 +51,7 @@ // Set an alarm to trigger in case the default handler does not terminate // the process. See 'AlarmSignalHandler' for more details. struct sigaction action; -@@ -559,6 +563,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf +@@ -561,6 +567,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf // signals that do not re-raise autonomously), such as signals delivered via // kill() and asynchronous hardware faults such as SEGV_MTEAERR, which would // otherwise be lost when re-raising the signal via raise(). @@ -56,7 +59,7 @@ long retval = syscall(SYS_rt_tgsigqueueinfo, getpid(), syscall(SYS_gettid), info->si_signo, info); if (retval == 0) { -@@ -573,6 +578,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf +@@ -575,6 +582,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf if (errno != EPERM) { _exit(EXIT_FAILURE); } @@ -64,7 +67,21 @@ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || // BUILDFLAG(IS_CHROMEOS) -@@ -821,6 +827,9 @@ class SandboxSymbolizeHelper { +@@ -764,6 +772,7 @@ class SandboxSymbolizeHelper { + return -1; + } + ++#if !BUILDFLAG(IS_BSD) + // This class is copied from + // third_party/crashpad/crashpad/util/linux/scoped_pr_set_dumpable.h. + // It aims at ensuring the process is dumpable before opening /proc/self/mem. +@@ -856,11 +865,15 @@ class SandboxSymbolizeHelper { + r.base = cur_base; + } + } ++#endif + + // Parses /proc/self/maps in order to compile a list of all object file names // for the modules that are loaded in the current process. // Returns true on success. bool CacheMemoryRegions() { @@ -74,7 +91,7 @@ // Reads /proc/self/maps. std::string contents; if (!ReadProcMaps(&contents)) { -@@ -838,6 +847,7 @@ class SandboxSymbolizeHelper { +@@ -878,6 +891,7 @@ class SandboxSymbolizeHelper { is_initialized_ = true; return true; diff --git a/www/iridium/files/patch-base_files_file__path__watcher__unittest.cc b/www/iridium/files/patch-base_files_file__path__watcher__unittest.cc index 803b49442aeb..28e00b6b1e2f 100644 --- a/www/iridium/files/patch-base_files_file__path__watcher__unittest.cc +++ b/www/iridium/files/patch-base_files_file__path__watcher__unittest.cc @@ -1,6 +1,6 @@ ---- base/files/file_path_watcher_unittest.cc.orig 2023-10-21 11:51:27 UTC +--- base/files/file_path_watcher_unittest.cc.orig 2023-11-22 14:00:11 UTC +++ base/files/file_path_watcher_unittest.cc -@@ -586,7 +586,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) { +@@ -705,7 +705,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) { } delegate.RunUntilEventsMatch(event_expecter); @@ -9,7 +9,7 @@ ASSERT_TRUE(WriteFile(file1, "content v2")); // Mac implementation does not detect files modified in a directory. // TODO(https://crbug.com/1432064): Expect that no events are fired on Mac. -@@ -1525,7 +1525,7 @@ namespace { +@@ -1641,7 +1641,7 @@ namespace { enum Permission { Read, Write, Execute }; @@ -18,7 +18,7 @@ bool ChangeFilePermissions(const FilePath& path, Permission perm, bool allow) { struct stat stat_buf; -@@ -1559,7 +1559,7 @@ bool ChangeFilePermissions(const FilePath& path, Permi +@@ -1675,7 +1675,7 @@ bool ChangeFilePermissions(const FilePath& path, Permi } // namespace diff --git a/www/iridium/files/patch-base_files_file__util__posix.cc b/www/iridium/files/patch-base_files_file__util__posix.cc index 9ee141cee36e..cd7bd14bde7e 100644 --- a/www/iridium/files/patch-base_files_file__util__posix.cc +++ b/www/iridium/files/patch-base_files_file__util__posix.cc @@ -1,6 +1,6 @@ ---- base/files/file_util_posix.cc.orig 2023-07-24 14:27:53 UTC +--- base/files/file_util_posix.cc.orig 2023-11-22 14:00:11 UTC +++ base/files/file_util_posix.cc -@@ -756,32 +756,34 @@ bool CreateDirectoryAndGetError(const FilePath& full_p +@@ -756,33 +756,34 @@ bool CreateDirectoryAndGetError(const FilePath& full_p File::Error* error) { ScopedBlockingCall scoped_blocking_call( FROM_HERE, BlockingType::MAY_BLOCK); // For call to mkdir(). @@ -34,11 +34,12 @@ - if (!DirectoryExists(subpath)) { - if (error) - *error = File::OSErrorToFileError(saved_errno); +- errno = saved_errno; - return false; + if (!PathExists(subpath)) { + if ((mkdir(subpath.value().c_str(), 0700) == -1) && + ((full_path != subpath) ? (errno != ENOENT) : (-1))) { -+ int saved_errno = errno; ++ int saved_errno = errno; + if (error) + *error = File::OSErrorToFileError(saved_errno); + return false; diff --git a/www/iridium/files/patch-base_process_process__handle__freebsd.cc b/www/iridium/files/patch-base_process_process__handle__freebsd.cc index be6873bb2492..dd603706da74 100644 --- a/www/iridium/files/patch-base_process_process__handle__freebsd.cc +++ b/www/iridium/files/patch-base_process_process__handle__freebsd.cc @@ -1,4 +1,4 @@ ---- base/process/process_handle_freebsd.cc.orig 2022-10-05 07:34:01 UTC +--- base/process/process_handle_freebsd.cc.orig 2023-11-22 14:00:11 UTC +++ base/process/process_handle_freebsd.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. @@ -8,7 +8,7 @@ #include <limits.h> #include <stddef.h> -@@ -15,10 +16,13 @@ namespace base { +@@ -19,10 +20,13 @@ namespace base { ProcessId GetParentProcessId(ProcessHandle process) { struct kinfo_proc info; diff --git a/www/iridium/files/patch-base_process_process__unittest.cc b/www/iridium/files/patch-base_process_process__unittest.cc index 1ae2a46d8e52..6df6891400b2 100644 --- a/www/iridium/files/patch-base_process_process__unittest.cc +++ b/www/iridium/files/patch-base_process_process__unittest.cc @@ -1,6 +1,6 @@ ---- base/process/process_unittest.cc.orig 2023-07-24 14:27:53 UTC +--- base/process/process_unittest.cc.orig 2023-11-22 14:00:11 UTC +++ base/process/process_unittest.cc -@@ -195,7 +195,7 @@ TEST_F(ProcessTest, CreationTimeOtherProcess) { +@@ -198,7 +198,7 @@ TEST_F(ProcessTest, CreationTimeOtherProcess) { // was spawned and a time recorded after it was spawned. However, since the // base::Time and process creation clocks don't match, tolerate some error. constexpr base::TimeDelta kTolerance = diff --git a/www/iridium/files/patch-base_rand__util__posix.cc b/www/iridium/files/patch-base_rand__util__posix.cc index c18905a1867b..ba6e34af5213 100644 --- a/www/iridium/files/patch-base_rand__util__posix.cc +++ b/www/iridium/files/patch-base_rand__util__posix.cc @@ -1,4 +1,4 @@ ---- base/rand_util_posix.cc.orig 2022-12-06 08:09:13 UTC +--- base/rand_util_posix.cc.orig 2023-11-22 14:00:11 UTC +++ base/rand_util_posix.cc @@ -22,7 +22,7 @@ #include "base/time/time.h" @@ -9,14 +9,14 @@ #include "third_party/lss/linux_syscall_support.h" #elif BUILDFLAG(IS_MAC) // TODO(crbug.com/995996): Waiting for this header to appear in the iOS SDK. -@@ -46,6 +46,7 @@ static constexpr int kOpenFlags = O_RDONLY; - static constexpr int kOpenFlags = O_RDONLY | O_CLOEXEC; - #endif +@@ -39,6 +39,7 @@ namespace base { + + namespace { +#if !BUILDFLAG(IS_BSD) - // We keep the file descriptor for /dev/urandom around so we don't need to - // reopen it (which is expensive), and since we may not even be able to reopen - // it if we are later put in a sandbox. This class wraps the file descriptor so + #if BUILDFLAG(IS_AIX) + // AIX has no 64-bit support for O_CLOEXEC. + static constexpr int kOpenFlags = O_RDONLY; @@ -63,10 +64,11 @@ class URandomFd { private: const int fd_; diff --git a/www/iridium/files/patch-base_system_sys__info.h b/www/iridium/files/patch-base_system_sys__info.h index 553c015f9f82..a716613e135d 100644 --- a/www/iridium/files/patch-base_system_sys__info.h +++ b/www/iridium/files/patch-base_system_sys__info.h @@ -1,6 +1,6 @@ ---- base/system/sys_info.h.orig 2023-10-21 11:51:27 UTC +--- base/system/sys_info.h.orig 2023-11-22 14:00:11 UTC +++ base/system/sys_info.h -@@ -266,6 +266,8 @@ class BASE_EXPORT SysInfo { +@@ -304,6 +304,8 @@ class BASE_EXPORT SysInfo { static void ResetCpuSecurityMitigationsEnabledForTesting(); #endif @@ -9,7 +9,7 @@ private: friend class test::ScopedAmountOfPhysicalMemoryOverride; FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory); -@@ -278,7 +280,7 @@ class BASE_EXPORT SysInfo { +@@ -316,7 +318,7 @@ class BASE_EXPORT SysInfo { static HardwareInfo GetHardwareInfoSync(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ diff --git a/www/iridium/files/patch-base_system_sys__info__openbsd.cc b/www/iridium/files/patch-base_system_sys__info__openbsd.cc index 2173b6657c69..e3854185bddd 100644 --- a/www/iridium/files/patch-base_system_sys__info__openbsd.cc +++ b/www/iridium/files/patch-base_system_sys__info__openbsd.cc @@ -1,14 +1,14 @@ ---- base/system/sys_info_openbsd.cc.orig 2022-10-05 07:34:01 UTC +--- base/system/sys_info_openbsd.cc.orig 2023-11-22 14:00:11 UTC +++ base/system/sys_info_openbsd.cc -@@ -11,6 +11,7 @@ - #include <sys/sysctl.h> +@@ -12,6 +12,7 @@ #include "base/notreached.h" + #include "base/posix/sysctl.h" +#include "base/strings/string_util.h" namespace { -@@ -26,9 +27,15 @@ uint64_t AmountOfMemory(int pages_name) { +@@ -27,9 +28,15 @@ uint64_t AmountOfMemory(int pages_name) { namespace base { @@ -25,7 +25,7 @@ int ncpu; size_t size = sizeof(ncpu); if (sysctl(mib, std::size(mib), &ncpu, &size, NULL, 0) < 0) { -@@ -40,10 +47,26 @@ int SysInfo::NumberOfProcessors() { +@@ -41,10 +48,26 @@ int SysInfo::NumberOfProcessors() { // static uint64_t SysInfo::AmountOfPhysicalMemoryImpl() { @@ -53,7 +53,7 @@ uint64_t SysInfo::AmountOfAvailablePhysicalMemoryImpl() { // We should add inactive file-backed memory also but there is no such // information from OpenBSD unfortunately. -@@ -55,23 +78,28 @@ uint64_t SysInfo::MaxSharedMemorySize() { +@@ -56,16 +79,28 @@ uint64_t SysInfo::MaxSharedMemorySize() { int mib[] = {CTL_KERN, KERN_SHMINFO, KERN_SHMINFO_SHMMAX}; size_t limit; size_t size = sizeof(limit); @@ -72,14 +72,7 @@ // static -std::string SysInfo::CPUModelName() { -- int mib[] = {CTL_HW, HW_MODEL}; -- char name[256]; -- size_t len = std::size(name); -- if (sysctl(mib, std::size(mib), name, &len, NULL, 0) < 0) { -- NOTREACHED(); -- return std::string(); -- } -- return name; +- return StringSysctl({CTL_HW, HW_MODEL}).value(); +SysInfo::HardwareInfo SysInfo::GetHardwareInfoSync() { + HardwareInfo info; + // Set the manufacturer to "OpenBSD" and the model to diff --git a/www/iridium/files/patch-base_test_launcher_test__launcher.cc b/www/iridium/files/patch-base_test_launcher_test__launcher.cc index 2a451a43c787..69f98fd9888b 100644 --- a/www/iridium/files/patch-base_test_launcher_test__launcher.cc +++ b/www/iridium/files/patch-base_test_launcher_test__launcher.cc @@ -1,6 +1,6 @@ ---- base/test/launcher/test_launcher.cc.orig 2023-10-21 11:51:27 UTC +--- base/test/launcher/test_launcher.cc.orig 2023-11-22 14:00:11 UTC +++ base/test/launcher/test_launcher.cc -@@ -68,6 +68,7 @@ +@@ -70,6 +70,7 @@ #include "testing/gtest/include/gtest/gtest.h" #if BUILDFLAG(IS_POSIX) diff --git a/www/iridium/files/patch-base_threading_platform__thread__unittest.cc b/www/iridium/files/patch-base_threading_platform__thread__unittest.cc index 6d7cf6a5abac..18ac2c8380f9 100644 --- a/www/iridium/files/patch-base_threading_platform__thread__unittest.cc +++ b/www/iridium/files/patch-base_threading_platform__thread__unittest.cc @@ -1,4 +1,4 @@ ---- base/threading/platform_thread_unittest.cc.orig 2023-10-21 11:51:27 UTC +--- base/threading/platform_thread_unittest.cc.orig 2023-11-22 14:00:11 UTC +++ base/threading/platform_thread_unittest.cc @@ -32,7 +32,7 @@ #include "base/time/time.h" @@ -16,9 +16,9 @@ -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // On Ubuntu, RLIMIT_NICE and RLIMIT_RTPRIO are 0 by default, so we won't be - // able to increase priority to any level. - constexpr bool kCanIncreasePriority = false; -@@ -695,12 +695,16 @@ INSTANTIATE_TEST_SUITE_P( + // able to increase priority to any level unless we are root (euid == 0). + bool kCanIncreasePriority = false; +@@ -706,12 +706,16 @@ INSTANTIATE_TEST_SUITE_P( #endif // BUILDFLAG(IS_APPLE) diff --git a/www/iridium/files/patch-build_config_compiler_BUILD.gn b/www/iridium/files/patch-build_config_compiler_BUILD.gn index 850c80d8b127..cb46b6e1bfc4 100644 --- a/www/iridium/files/patch-build_config_compiler_BUILD.gn +++ b/www/iridium/files/patch-build_config_compiler_BUILD.gn @@ -1,6 +1,6 @@ ---- build/config/compiler/BUILD.gn.orig 2023-10-21 11:51:27 UTC +--- build/config/compiler/BUILD.gn.orig 2023-11-22 14:00:11 UTC +++ build/config/compiler/BUILD.gn -@@ -192,7 +192,7 @@ declare_args() { +@@ -196,7 +196,7 @@ declare_args() { # This greatly reduces the size of debug builds, at the cost of # debugging information which is required by some specialized # debugging tools. @@ -9,7 +9,7 @@ } declare_args() { -@@ -256,13 +256,16 @@ config("default_include_dirs") { +@@ -260,13 +260,16 @@ config("default_include_dirs") { # Compiler instrumentation can introduce dependencies in DSOs to symbols in # the executable they are loaded into, so they are unresolved at link-time. config("no_unresolved_symbols") { @@ -27,17 +27,7 @@ } # compiler --------------------------------------------------------------------- -@@ -310,7 +313,9 @@ config("compiler") { - - configs += [ - # See the definitions below. -+ ":clang_revision", - ":rustc_revision", -+ ":compiler_cpu_abi", - ":compiler_codegen", - ":compiler_deterministic", - ] -@@ -505,6 +510,10 @@ config("compiler") { +@@ -505,6 +508,10 @@ config("compiler") { } } @@ -48,7 +38,7 @@ # Linux-specific compiler flags setup. # ------------------------------------ if (use_gold) { -@@ -1070,7 +1079,7 @@ config("compiler_cpu_abi") { +@@ -1091,7 +1098,7 @@ config("compiler_cpu_abi") { ] } } else if (current_cpu == "arm") { @@ -57,7 +47,7 @@ !(is_chromeos_lacros && is_chromeos_device)) { cflags += [ "--target=arm-linux-gnueabihf" ] ldflags += [ "--target=arm-linux-gnueabihf" ] -@@ -1085,7 +1094,7 @@ config("compiler_cpu_abi") { +@@ -1106,7 +1113,7 @@ config("compiler_cpu_abi") { cflags += [ "-mtune=$arm_tune" ] } } else if (current_cpu == "arm64") { @@ -66,7 +56,7 @@ !(is_chromeos_lacros && is_chromeos_device)) { cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] -@@ -1431,6 +1440,27 @@ config("compiler_deterministic") { +@@ -1452,6 +1459,27 @@ config("compiler_deterministic") { } } @@ -94,16 +84,16 @@ config("rustc_revision") { if (rustc_revision != "") { # Similar to the above config, this is here so that all files get recompiled -@@ -1675,7 +1705,7 @@ config("default_warnings") { - "-Wno-ignored-pragma-optimize", - ] +@@ -1725,7 +1753,7 @@ config("default_warnings") { + ] + } - if (!is_nacl) { + if (!is_nacl && !is_bsd) { cflags += [ # TODO(crbug.com/1343975) Evaluate and possibly enable. "-Wno-deprecated-builtins", -@@ -1867,7 +1897,7 @@ config("no_chromium_code") { +@@ -1897,7 +1925,7 @@ config("no_chromium_code") { # third-party libraries. "-Wno-c++11-narrowing", ] @@ -112,7 +102,7 @@ cflags += [ # Disabled for similar reasons as -Wunused-variable. "-Wno-unused-but-set-variable", -@@ -2151,8 +2181,7 @@ config("default_stack_frames") { +@@ -2200,8 +2228,7 @@ config("default_stack_frames") { } # Default "optimization on" config. @@ -122,7 +112,7 @@ if (is_win) { if (chrome_pgo_phase != 2) { # Favor size over speed, /O1 must be before the common flags. -@@ -2211,8 +2240,7 @@ config("xoptimize") { +@@ -2260,8 +2287,7 @@ config("xoptimize") { } # Turn off optimizations. @@ -132,7 +122,7 @@ if (is_win) { cflags = [ "/Od", # Disable optimization. -@@ -2252,8 +2280,7 @@ config("xno_optimize") { +@@ -2301,8 +2327,7 @@ config("xno_optimize") { # Turns up the optimization level. On Windows, this implies whole program # optimization and link-time code generation which is very expensive and should # be used sparingly. @@ -142,7 +132,7 @@ if (is_nacl && is_nacl_irt) { # The NaCl IRT is a special case and always wants its own config. # Various components do: -@@ -2286,8 +2313,7 @@ config("xoptimize_max") { +@@ -2335,8 +2360,7 @@ config("xoptimize_max") { # # TODO(crbug.com/621335) - rework how all of these configs are related # so that we don't need this disclaimer. @@ -152,7 +142,7 @@ if (is_nacl && is_nacl_irt) { # The NaCl IRT is a special case and always wants its own config. # Various components do: -@@ -2313,8 +2339,7 @@ config("xoptimize_speed") { +@@ -2362,8 +2386,7 @@ config("xoptimize_speed") { } } @@ -162,7 +152,7 @@ cflags = [ "-O1" ] + common_optimize_on_cflags rustflags = [ "-Copt-level=1" ] ldflags = common_optimize_on_ldflags -@@ -2382,7 +2407,7 @@ config("afdo_optimize_size") { +@@ -2431,7 +2454,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") { @@ -171,7 +161,7 @@ cflags = [] if (clang_emit_debug_info_for_profiling) { # Add the following flags to generate debug info for profiling. -@@ -2409,7 +2434,7 @@ config("afdo") { +@@ -2458,7 +2481,7 @@ config("afdo") { cflags += [ "-Wno-backend-plugin" ] inputs = [ _clang_sample_profile ] } @@ -180,7 +170,7 @@ cflags = [ "-fauto-profile=${auto_profile_path}" ] inputs = [ auto_profile_path ] } -@@ -2447,8 +2472,7 @@ config("win_pdbaltpath") { +@@ -2496,8 +2519,7 @@ config("win_pdbaltpath") { } # Full symbols. @@ -190,7 +180,7 @@ rustflags = [] if (is_win) { if (is_clang) { -@@ -2574,7 +2598,8 @@ config("xsymbols") { +@@ -2623,7 +2645,8 @@ config("xsymbols") { configs += [ "//build/config:compress_debug_sections" ] } @@ -200,7 +190,7 @@ if (is_apple) { # TODO(https://crbug.com/1050118): Investigate missing debug info on mac. # Make sure we don't use constructor homing on mac. -@@ -2597,8 +2622,7 @@ config("xsymbols") { +@@ -2646,8 +2669,7 @@ config("xsymbols") { # Minimal symbols. # This config guarantees to hold symbol for stack trace which are shown to user # when crash happens in unittests running on buildbot. @@ -210,7 +200,7 @@ rustflags = [] if (is_win) { # Functions, files, and line tables only. -@@ -2683,8 +2707,7 @@ config("xminimal_symbols") { +@@ -2732,8 +2754,7 @@ config("xminimal_symbols") { # This configuration contains function names only. That is, the compiler is # told to not generate debug information and the linker then just puts function # names in the final debug information. diff --git a/www/iridium/files/patch-build_config_compiler_pgo_BUILD.gn b/www/iridium/files/patch-build_config_compiler_pgo_BUILD.gn index 813c39c0aa1d..057d28b9fc28 100644 --- a/www/iridium/files/patch-build_config_compiler_pgo_BUILD.gn +++ b/www/iridium/files/patch-build_config_compiler_pgo_BUILD.gn @@ -1,6 +1,6 @@ ---- build/config/compiler/pgo/BUILD.gn.orig 2023-10-21 11:51:27 UTC +--- build/config/compiler/pgo/BUILD.gn.orig 2023-11-22 14:00:11 UTC +++ build/config/compiler/pgo/BUILD.gn -@@ -143,13 +143,14 @@ config("pgo_optimization_flags") { +@@ -139,13 +139,14 @@ config("pgo_optimization_flags") { # Enable basic block layout based on the extended TSP problem. This aims to # improve icache utilization and reduce the binary size. diff --git a/www/iridium/files/patch-build_toolchain_gcc__toolchain.gni b/www/iridium/files/patch-build_toolchain_gcc__toolchain.gni index 89a97c637229..d4b310e02c83 100644 --- a/www/iridium/files/patch-build_toolchain_gcc__toolchain.gni +++ b/www/iridium/files/patch-build_toolchain_gcc__toolchain.gni @@ -1,4 +1,4 @@ ---- build/toolchain/gcc_toolchain.gni.orig 2023-10-21 11:51:27 UTC +--- build/toolchain/gcc_toolchain.gni.orig 2023-11-22 14:00:11 UTC +++ build/toolchain/gcc_toolchain.gni @@ -53,6 +53,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). # -@@ -874,22 +881,12 @@ template("gcc_toolchain") { +@@ -875,22 +882,12 @@ template("gcc_toolchain") { # use_gold too. template("clang_toolchain") { gcc_toolchain(target_name) { @@ -40,5 +40,5 @@ + ar = "ar" + nm = "nm" - forward_variables_from(invoker, - [ + forward_variables_from(invoker, "*", [ "toolchain_args" ]) + diff --git a/www/iridium/files/patch-build_toolchain_toolchain.gni b/www/iridium/files/patch-build_toolchain_toolchain.gni index 9dd8b20cb077..b618a315da68 100644 --- a/www/iridium/files/patch-build_toolchain_toolchain.gni +++ b/www/iridium/files/patch-build_toolchain_toolchain.gni @@ -1,6 +1,6 @@ ---- build/toolchain/toolchain.gni.orig 2023-10-21 11:51:27 UTC +--- build/toolchain/toolchain.gni.orig 2023-11-22 14:00:11 UTC +++ build/toolchain/toolchain.gni -@@ -67,7 +67,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" diff --git a/www/iridium/files/patch-cc_BUILD.gn b/www/iridium/files/patch-cc_BUILD.gn index b7be9e5f9cb9..b80d083b898d 100644 --- a/www/iridium/files/patch-cc_BUILD.gn +++ b/www/iridium/files/patch-cc_BUILD.gn @@ -1,6 +1,6 @@ ---- cc/BUILD.gn.orig 2023-10-21 11:51:27 UTC +--- cc/BUILD.gn.orig 2023-11-22 14:00:11 UTC +++ cc/BUILD.gn -@@ -674,7 +674,7 @@ cc_test_static_library("test_support") { +@@ -675,7 +675,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) { -@@ -929,7 +929,6 @@ cc_test("cc_unittests") { +@@ -930,7 +930,6 @@ cc_test("cc_unittests") { data = [ "//components/test/data/viz/" ] data_deps = [ "//testing/buildbot/filters:cc_unittests_filters", diff --git a/www/iridium/files/patch-cc_base_features.cc b/www/iridium/files/patch-cc_base_features.cc index 0714e6d0afe6..f8efa7d28188 100644 --- a/www/iridium/files/patch-cc_base_features.cc +++ b/www/iridium/files/patch-cc_base_features.cc @@ -1,6 +1,6 @@ ---- cc/base/features.cc.orig 2023-10-21 11:51:27 UTC +--- cc/base/features.cc.orig 2023-11-22 14:00:11 UTC +++ cc/base/features.cc -@@ -85,7 +85,7 @@ BASE_FEATURE(kNormalPriorityImageDecoding, +@@ -84,7 +84,7 @@ BASE_FEATURE(kNormalPriorityImageDecoding, // be using a separate flag to control the launch on GL. BASE_FEATURE(kUseDMSAAForTiles, "UseDMSAAForTiles", diff --git a/www/iridium/files/patch-chrome_app_chrome__main.cc b/www/iridium/files/patch-chrome_app_chrome__main.cc index 7356c70dafb2..e2195e983f46 100644 --- a/www/iridium/files/patch-chrome_app_chrome__main.cc +++ b/www/iridium/files/patch-chrome_app_chrome__main.cc @@ -1,6 +1,6 @@ ---- chrome/app/chrome_main.cc.orig 2023-07-24 14:27:53 UTC +--- chrome/app/chrome_main.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/app/chrome_main.cc -@@ -27,11 +27,11 @@ +@@ -29,11 +29,11 @@ #include "chrome/app/notification_metrics.h" #endif @@ -14,7 +14,7 @@ #include "chrome/app/chrome_main_linux.h" #endif -@@ -136,7 +136,7 @@ int ChromeMain(int argc, const char** argv) { +@@ -138,7 +138,7 @@ int ChromeMain(int argc, const char** argv) { SetUpBundleOverrides(); #endif @@ -23,8 +23,8 @@ AppendExtraArgumentsToCommandLine(command_line); #endif -@@ -164,7 +164,7 @@ int ChromeMain(int argc, const char** argv) { - headless::SetUpCommandLine(command_line); +@@ -167,7 +167,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) diff --git a/www/iridium/files/patch-chrome_app_chrome__main__delegate.cc b/www/iridium/files/patch-chrome_app_chrome__main__delegate.cc index 96630afb148d..f6fa5beee5be 100644 --- a/www/iridium/files/patch-chrome_app_chrome__main__delegate.cc +++ b/www/iridium/files/patch-chrome_app_chrome__main__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/app/chrome_main_delegate.cc -@@ -143,7 +143,7 @@ +@@ -145,7 +145,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 -@@ -186,16 +186,16 @@ +@@ -188,16 +188,16 @@ #include "v8/include/v8.h" #endif @@ -29,7 +29,7 @@ #include "chrome/browser/policy/policy_path_parser.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -334,7 +334,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty +@@ -336,7 +336,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty // and resources loaded. bool SubprocessNeedsResourceBundle(const std::string& process_type) { return @@ -38,7 +38,7 @@ // The zygote process opens the resources for the renderers. process_type == switches::kZygoteProcess || #endif -@@ -419,7 +419,7 @@ bool HandleVersionSwitches(const base::CommandLine& co +@@ -421,7 +421,7 @@ bool HandleVersionSwitches(const base::CommandLine& co // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -47,7 +47,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) || -@@ -546,7 +546,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -593,7 +593,7 @@ void InitializeUserDataDir(base::CommandLine* command_ std::string process_type = command_line->GetSwitchValueASCII(switches::kProcessType); @@ -56,7 +56,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. -@@ -636,7 +636,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat +@@ -683,7 +683,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat #endif #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ @@ -65,7 +65,7 @@ // Record the startup process creation time on supported platforms. On Android // this is recorded in ChromeMainDelegateAndroid. startup_metric_utils::GetCommon().RecordStartupProcessCreationTime( -@@ -994,7 +994,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv +@@ -1012,7 +1012,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv base::InitializeCpuReductionExperiment(); base::sequence_manager::internal::SequenceManagerImpl::InitializeFeatures(); base::sequence_manager::internal::ThreadController::InitializeFeatures(); @@ -74,7 +74,7 @@ base::MessagePumpLibevent::InitializeFeatures(); #elif BUILDFLAG(IS_MAC) base::PlatformThread::InitFeaturesPostFieldTrial(); -@@ -1141,7 +1141,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo +@@ -1159,7 +1159,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo // TODO(crbug.com/1052397): Revisit the macro expression once build flag // switch of lacros-chrome is complete. @@ -83,7 +83,7 @@ // This will directly exit if the user asked for help. HandleHelpSwitches(command_line); #endif -@@ -1171,7 +1171,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo +@@ -1189,7 +1189,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo #if BUILDFLAG(IS_CHROMEOS) chromeos::dbus_paths::RegisterPathProvider(); #endif @@ -92,7 +92,7 @@ nacl::RegisterPathProvider(); #endif -@@ -1561,7 +1561,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1589,7 +1589,7 @@ void ChromeMainDelegate::PreSandboxStartup() { CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale; } @@ -101,7 +101,7 @@ // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess) { if (command_line.HasSwitch(switches::kPreCrashpadCrashTest)) { -@@ -1663,7 +1663,7 @@ absl::variant<int, content::MainFunctionParams> Chrome +@@ -1691,7 +1691,7 @@ absl::variant<int, content::MainFunctionParams> Chrome // This entry is not needed on Linux, where the NaCl loader // process is launched via nacl_helper instead. diff --git a/www/iridium/files/patch-chrome_app_chromium__strings.grd b/www/iridium/files/patch-chrome_app_chromium__strings.grd index 0b54428c94b4..64545718cf71 100644 --- a/www/iridium/files/patch-chrome_app_chromium__strings.grd +++ b/www/iridium/files/patch-chrome_app_chromium__strings.grd @@ -1,4 +1,4 @@ ---- chrome/app/chromium_strings.grd.orig 2023-10-21 11:51:27 UTC +--- chrome/app/chromium_strings.grd.orig 2023-11-22 14:00:11 UTC +++ chrome/app/chromium_strings.grd @@ -315,7 +315,7 @@ If you update this file, be sure also to update google Welcome to Iridium; new browser window opened @@ -18,7 +18,7 @@ <message name="IDS_LINUX_OBSOLETE" desc="A message displayed on an at-launch infobar and about:help warning the user that the OS version they are using is no longer supported."> The browser may not function correctly because it is no longer supported on this Linux distribution </message> -@@ -870,7 +870,7 @@ Permissions you've already given to websites and apps +@@ -896,7 +896,7 @@ Permissions you've already given to websites and apps </message> </if> @@ -27,7 +27,7 @@ <message name="IDS_RELAUNCH_TO_UPDATE_ALT" desc="Alternate text label of the relaunch to update Chrome menu item" translateable="false"> Not used in Chromium. Placeholder to keep resource maps in sync. </message> -@@ -1247,7 +1247,7 @@ Permissions you've already given to websites and apps +@@ -1264,7 +1264,7 @@ Permissions you've already given to websites and apps </message> </if> diff --git a/www/iridium/files/patch-chrome_app_generated__resources.grd b/www/iridium/files/patch-chrome_app_generated__resources.grd index b3320f3719aa..d917f49b37c7 100644 --- a/www/iridium/files/patch-chrome_app_generated__resources.grd +++ b/www/iridium/files/patch-chrome_app_generated__resources.grd @@ -1,4 +1,4 @@ ---- chrome/app/generated_resources.grd.orig 2023-10-21 11:51:27 UTC +--- chrome/app/generated_resources.grd.orig 2023-11-22 14:00:11 UTC +++ chrome/app/generated_resources.grd @@ -2,7 +2,7 @@ @@ -9,7 +9,7 @@ for making strings OS specific. Other platform defines such as use_titlecase are declared in tools/grit/grit_rule.gni. --> -@@ -3601,7 +3601,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -3605,7 +3605,7 @@ are declared in tools/grit/grit_rule.gni. </if> <!-- Bluetooth Device Credentials (i.e. PIN/Passkey) dialog --> @@ -18,7 +18,7 @@ <message name="IDS_BLUETOOTH_DEVICE_CREDENTIALS_TITLE" desc="Title of the Bluetooth device credentials prompt dialog."> Device Credentials </message> -@@ -5432,7 +5432,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -5445,7 +5445,7 @@ are declared in tools/grit/grit_rule.gni. Read information about your browser, OS, device, installed software, registry values and files </message> </if> @@ -27,7 +27,7 @@ <message name="IDS_EXTENSION_PROMPT_WARNING_ENTERPRISE_REPORTING_PRIVATE_ENABLED_LINUX_AND_MACOS" desc="Permission string for enterprise private reporting permission on Linux and MacOS."> Read information about your browser, OS, device, installed software and files </message> -@@ -6145,7 +6145,7 @@ Keep your key file in a safe place. You will need it t +@@ -6158,7 +6158,7 @@ Keep your key file in a safe place. You will need it t Old versions of Chrome Apps won't open on Windows devices after December 2022. Contact your administrator to update to a new version or remove this app. </message> </if> @@ -36,7 +36,7 @@ <message name="IDS_FORCE_INSTALLED_DEPRECATED_APPS_CONTENT" desc="Content of the force installed deprecated app dialog"> Old versions of Chrome Apps won't open on Linux devices after December 2022. Contact your administrator to update to a new version or remove this app. </message> -@@ -6191,7 +6191,7 @@ Keep your key file in a safe place. You will need it t +@@ -6204,7 +6204,7 @@ Keep your key file in a safe place. You will need it t Old versions of Chrome apps won't open on Windows devices after December 2022. You can check if there's a new version available. </message> </if> @@ -63,7 +63,7 @@ <message name="IDS_SHOW_WINDOW_DECORATIONS" desc="The label of a radio button in the options dialog for using the system title bar and borders."> Use system title bar and borders </message> -@@ -11728,7 +11728,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW +@@ -11734,7 +11734,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW </message> <!-- Device Trust Consent dialog --> @@ -72,7 +72,7 @@ <message name="IDS_DEVICE_SIGNALS_CONSENT_DIALOG_TITLE" desc="Title of the dialog shown when user consent is required to share device signals."> Share information about your device? </message> -@@ -12136,7 +12136,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -12142,7 +12142,7 @@ Please help our engineers fix this problem. Tell us wh Set as default </message> @@ -81,7 +81,7 @@ <message name="IDS_MINIMIZE_WINDOW_MENU" desc="The Linux browser window menu item text for minimizing the window."> Minimize </message> -@@ -14346,7 +14346,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -14349,7 +14349,7 @@ Please help our engineers fix this problem. Tell us wh Open Anyway </message> diff --git a/www/iridium/files/patch-chrome_app_google__chrome__strings.grd b/www/iridium/files/patch-chrome_app_google__chrome__strings.grd index 94bf9579b3f6..79bd3af8a242 100644 --- a/www/iridium/files/patch-chrome_app_google__chrome__strings.grd +++ b/www/iridium/files/patch-chrome_app_google__chrome__strings.grd @@ -1,4 +1,4 @@ ---- chrome/app/google_chrome_strings.grd.orig 2023-10-21 11:51:27 UTC +--- chrome/app/google_chrome_strings.grd.orig 2023-11-22 14:00:11 UTC +++ chrome/app/google_chrome_strings.grd @@ -301,7 +301,7 @@ chromium_strings.grd. --> Welcome to Chrome; new browser window opened @@ -18,7 +18,7 @@ <message name="IDS_LINUX_OBSOLETE" desc="A message displayed on an at-launch infobar and about:help warning the user that the OS version they are using is no longer supported."> Google Chrome may not function correctly because it is no longer supported on this Linux distribution </message> -@@ -855,7 +855,7 @@ Permissions you've already given to websites and apps +@@ -881,7 +881,7 @@ Permissions you've already given to websites and apps </if> </if> @@ -27,7 +27,7 @@ <if expr="use_titlecase"> <message name="IDS_RELAUNCH_TO_UPDATE_ALT" desc="Alternate text label of the relaunch to update Chrome menu item"> Relaunch to Update - Your tabs will reopen -@@ -1278,7 +1278,7 @@ Permissions you've already given to websites and apps +@@ -1297,7 +1297,7 @@ Permissions you've already given to websites and apps </message> </if> diff --git a/www/iridium/files/patch-chrome_app_settings__strings.grdp b/www/iridium/files/patch-chrome_app_settings__strings.grdp index 82f5d84d4fa2..5fc5b158c851 100644 --- a/www/iridium/files/patch-chrome_app_settings__strings.grdp +++ b/www/iridium/files/patch-chrome_app_settings__strings.grdp @@ -1,4 +1,4 @@ ---- chrome/app/settings_strings.grdp.orig 2023-10-21 11:51:27 UTC +--- chrome/app/settings_strings.grdp.orig 2023-11-22 14:00:11 UTC +++ chrome/app/settings_strings.grdp @@ -183,12 +183,12 @@ Manage accessibility features @@ -13,7 +13,7 @@ - <if expr="is_win or is_linux"> + <if expr="is_win or is_posix"> <message name="IDS_SETTINGS_OVERSCROLL_HISTORY_NAVIGATION_SUBTITLE" desc="Subtitle for the overscroll history navigation setting, which allows you to navigate back and forward by swiping left or right with a touch device."> - Navigate back and forward with swipe gesture + Navigate back and forward with a swipe gesture </message> @@ -222,7 +222,7 @@ Theme diff --git a/www/iridium/files/patch-chrome_browser_BUILD.gn b/www/iridium/files/patch-chrome_browser_BUILD.gn index d9321838d319..892b300bb5e8 100644 --- a/www/iridium/files/patch-chrome_browser_BUILD.gn +++ b/www/iridium/files/patch-chrome_browser_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/browser/BUILD.gn.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/BUILD.gn.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/BUILD.gn -@@ -6390,6 +6390,13 @@ static_library("browser") { +@@ -6486,6 +6486,13 @@ static_library("browser") { } } diff --git a/www/iridium/files/patch-chrome_browser_about__flags.cc b/www/iridium/files/patch-chrome_browser_about__flags.cc index 6413c46505bd..34348d078f84 100644 --- a/www/iridium/files/patch-chrome_browser_about__flags.cc +++ b/www/iridium/files/patch-chrome_browser_about__flags.cc @@ -1,6 +1,6 @@ ---- chrome/browser/about_flags.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/about_flags.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/about_flags.cc -@@ -225,7 +225,7 @@ +@@ -226,7 +226,7 @@ #include "ui/ui_features.h" #include "url/url_features.h" @@ -9,7 +9,7 @@ #include "base/allocator/buildflags.h" #endif -@@ -324,7 +324,7 @@ +@@ -326,7 +326,7 @@ #include "device/vr/public/cpp/features.h" #endif @@ -18,7 +18,7 @@ #include "ui/ozone/buildflags.h" #include "ui/ozone/public/ozone_switches.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) -@@ -338,7 +338,7 @@ +@@ -340,7 +340,7 @@ #include "chrome/browser/win/titlebar_config.h" #endif @@ -27,7 +27,7 @@ #include "chrome/browser/enterprise/profile_management/profile_management_features.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -@@ -438,7 +438,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap +@@ -470,7 +470,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap {"Max 3 Frames", &kDXGIWaitableSwapChain3Frames, 1, nullptr}}; #endif @@ -36,8 +36,8 @@ const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = { {flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""}, {flag_descriptions::kOzonePlatformHintChoiceAuto, -@@ -1475,7 +1475,7 @@ const FeatureEntry::FeatureVariation kChromeRefresh202 - std::size(kChromeRefresh2023Level1), nullptr}}; +@@ -1562,7 +1562,7 @@ const FeatureEntry::FeatureVariation kChromeRefresh202 + nullptr}}; #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) @@ -45,7 +45,7 @@ const FeatureEntry::FeatureParam kShortcutBoostSearchAndUrl1414[] = { {"ShortcutBoostSearchScore", "1414"}, {"ShortcutBoostUrlScore", "1414"}}; -@@ -5039,13 +5039,13 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5312,13 +5312,13 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kWebShare)}, #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -61,7 +61,7 @@ {"skip-undecryptable-passwords", flag_descriptions::kSkipUndecryptablePasswordsName, flag_descriptions::kSkipUndecryptablePasswordsDescription, -@@ -5347,7 +5347,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5629,7 +5629,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(feed::kFeedSportsCard)}, #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -70,8 +70,8 @@ {"following-feed-sidepanel", flag_descriptions::kFollowingFeedSidepanelName, flag_descriptions::kFollowingFeedSidepanelDescription, kOsDesktop, FEATURE_VALUE_TYPE(feed::kWebUiFeed)}, -@@ -6025,7 +6025,7 @@ const FeatureEntry kFeatureEntries[] = { - kOsAll, FEATURE_VALUE_TYPE(omnibox::kUseExistingAutocompleteClient)}, +@@ -6296,7 +6296,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(omnibox::kZeroSuggestInMemoryCaching)}, #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) @@ -79,7 +79,7 @@ {"omnibox-actions-ui-simplification", flag_descriptions::kOmniboxActionsUISimplificationName, flag_descriptions::kOmniboxActionsUISimplificationDescription, kOsDesktop, -@@ -6853,7 +6853,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7131,7 +7131,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kParallelDownloadingDescription, kOsAll, FEATURE_VALUE_TYPE(download::features::kParallelDownloading)}, @@ -88,7 +88,7 @@ {"enable-async-dns", flag_descriptions::kAsyncDnsName, flag_descriptions::kAsyncDnsDescription, kOsWin | kOsLinux, FEATURE_VALUE_TYPE(features::kAsyncDns)}, -@@ -7848,7 +7848,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8143,7 +8143,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(supervised_user::kEnableProtoApiForClassifyUrl)}, #endif // BUILDFLAG(ENABLE_SUPERVISED_USERS) @@ -97,7 +97,7 @@ {"enable-network-service-sandbox", flag_descriptions::kEnableNetworkServiceSandboxName, flag_descriptions::kEnableNetworkServiceSandboxDescription, -@@ -8553,7 +8553,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8836,7 +8836,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -106,7 +106,7 @@ {"quick-commands", flag_descriptions::kQuickCommandsName, flag_descriptions::kQuickCommandsDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kQuickCommands)}, -@@ -8844,7 +8844,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9140,7 +9140,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(ash::features::kWallpaperRefreshRevamp)}, #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -115,7 +115,7 @@ {"enable-get-all-screens-media", flag_descriptions::kGetAllScreensMediaName, flag_descriptions::kGetAllScreensMediaDescription, kOsCrOS | kOsLacros | kOsLinux, -@@ -8900,7 +8900,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9196,7 +9196,7 @@ const FeatureEntry kFeatureEntries[] = { #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -124,7 +124,7 @@ { "ui-debug-tools", flag_descriptions::kUIDebugToolsName, -@@ -9443,7 +9443,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9760,7 +9760,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -133,7 +133,7 @@ {"document-picture-in-picture-api", flag_descriptions::kDocumentPictureInPictureApiName, flag_descriptions::kDocumentPictureInPictureApiDescription, -@@ -10060,7 +10060,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10359,7 +10359,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kWebUIOmniboxPopupDescription, kOsDesktop, FEATURE_VALUE_TYPE(omnibox::kWebUIOmniboxPopup)}, @@ -142,7 +142,7 @@ {"webui-system-font", flag_descriptions::kWebUiSystemFontName, flag_descriptions::kWebUiSystemFontDescription, kOsAll, FEATURE_VALUE_TYPE(features::kWebUiSystemFont)}, -@@ -10263,7 +10263,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10560,7 +10560,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \ @@ -151,16 +151,16 @@ {"data-retention-policies-disable-sync-types-needed", flag_descriptions::kDataRetentionPoliciesDisableSyncTypesNeededName, flag_descriptions::kDataRetentionPoliciesDisableSyncTypesNeededDescription, -@@ -10657,7 +10657,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10966,7 +10966,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kProcessPerSiteUpToMainFrameThreshold)}, #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - {"camera-mic-preview", flag_descriptions::kCameraMicPreviewName, - flag_descriptions::kCameraMicPreviewDescription, + {"camera-mic-effects", flag_descriptions::kCameraMicEffectsName, + flag_descriptions::kCameraMicEffectsDescription, static_cast<unsigned short>(kOsMac | kOsWin | kOsLinux | kOsFuchsia), -@@ -10834,7 +10834,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -11153,7 +11153,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kDigestAuthEnableSecureAlgorithmsDescription, kOsAll, FEATURE_VALUE_TYPE(net::features::kDigestAuthEnableSecureAlgorithms)}, diff --git a/www/iridium/files/patch-chrome_browser_browser__process__impl.cc b/www/iridium/files/patch-chrome_browser_browser__process__impl.cc index 09a0e57255a5..784e11fef950 100644 --- a/www/iridium/files/patch-chrome_browser_browser__process__impl.cc +++ b/www/iridium/files/patch-chrome_browser_browser__process__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/browser_process_impl.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/browser_process_impl.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/browser_process_impl.cc -@@ -215,7 +215,7 @@ +@@ -216,7 +216,7 @@ #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/error_reporting/chrome_js_error_report_processor.h" // nogncheck #endif -@@ -1206,7 +1206,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { +@@ -1208,7 +1208,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { ApplyMetricsReportingPolicy(); @@ -18,7 +18,7 @@ ChromeJsErrorReportProcessor::Create(); #endif -@@ -1460,7 +1460,7 @@ void BrowserProcessImpl::Unpin() { +@@ -1462,7 +1462,7 @@ void BrowserProcessImpl::Unpin() { // Mac is currently not supported. // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/iridium/files/patch-chrome_browser_chrome__browser__interface__binders.cc b/www/iridium/files/patch-chrome_browser_chrome__browser__interface__binders.cc index d3ac5712f3ae..5dd0f3fc0c89 100644 --- a/www/iridium/files/patch-chrome_browser_chrome__browser__interface__binders.cc +++ b/www/iridium/files/patch-chrome_browser_chrome__browser__interface__binders.cc @@ -1,4 +1,4 @@ ---- chrome/browser/chrome_browser_interface_binders.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/chrome_browser_interface_binders.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/chrome_browser_interface_binders.cc @@ -129,13 +129,13 @@ #endif // BUILDFLAG(FULL_SAFE_BROWSING) @@ -16,16 +16,16 @@ #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 -@@ -217,7 +217,7 @@ +@@ -218,7 +218,7 @@ #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "chrome/browser/companion/visual_search/visual_search_suggestions_service_factory.h" + #include "chrome/browser/ui/web_applications/sub_apps_service_impl.h" #include "chrome/browser/ui/webui/discards/discards.mojom.h" - #include "chrome/browser/ui/webui/discards/discards_ui.h" -@@ -831,7 +831,7 @@ void BindScreen2xMainContentExtractor( +@@ -841,7 +841,7 @@ void BindScreen2xMainContentExtractor( #endif #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -34,7 +34,7 @@ void BindVisualSuggestionsModelProvider( content::RenderFrameHost* frame_host, mojo::PendingReceiver< -@@ -977,7 +977,7 @@ void PopulateChromeFrameBinders( +@@ -988,7 +988,7 @@ void PopulateChromeFrameBinders( #endif // BUILDFLAG(ENABLE_SPEECH_SERVICE) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -43,16 +43,16 @@ if (!render_frame_host->GetParent()) { map->Add<chrome::mojom::DraggableRegions>( base::BindRepeating(&DraggableRegionsHostImpl::CreateIfAllowed)); -@@ -985,7 +985,7 @@ void PopulateChromeFrameBinders( +@@ -996,7 +996,7 @@ void PopulateChromeFrameBinders( #endif - #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ -- BUILDFLAG(IS_WIN) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (base::FeatureList::IsEnabled(blink::features::kDesktopPWAsSubApps) && !render_frame_host->GetParentOrOuterDocument()) { // The service binder will reject non-primary main frames, but we still need -@@ -1065,7 +1065,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -1076,7 +1076,7 @@ void PopulateChromeWebUIFrameBinders( commerce::CommerceInternalsUI>(map); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -61,7 +61,7 @@ RegisterWebUIControllerInterfaceBinder< connectors_internals::mojom::PageHandler, enterprise_connectors::ConnectorsInternalsUI>(map); -@@ -1080,7 +1080,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -1092,7 +1092,7 @@ void PopulateChromeWebUIFrameBinders( #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -70,7 +70,7 @@ RegisterWebUIControllerInterfaceBinder< app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map); #endif -@@ -1578,7 +1578,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -1601,7 +1601,7 @@ void PopulateChromeWebUIFrameBinders( #endif // BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-chrome_browser_chrome__browser__main.cc b/www/iridium/files/patch-chrome_browser_chrome__browser__main.cc index 971a0bf07b1a..7aa13198f209 100644 --- a/www/iridium/files/patch-chrome_browser_chrome__browser__main.cc +++ b/www/iridium/files/patch-chrome_browser_chrome__browser__main.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_main.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/chrome_browser_main.cc -@@ -247,11 +247,11 @@ +@@ -248,11 +248,11 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -14,7 +14,7 @@ #include "components/crash/core/app/crashpad.h" #endif -@@ -286,14 +286,14 @@ +@@ -287,14 +287,14 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -31,7 +31,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" -@@ -1033,7 +1033,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1040,7 +1040,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { browser_creator_->AddFirstRunTabs(master_prefs_->new_tabs); } @@ -40,7 +40,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 . -@@ -1089,7 +1089,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1096,7 +1096,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -49,7 +49,7 @@ metrics::DesktopSessionDurationTracker::Initialize(); ProfileActivityMetricsRecorder::Initialize(); TouchModeStatsTracker::Initialize( -@@ -1325,7 +1325,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* +@@ -1332,7 +1332,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* *UrlLanguageHistogramFactory::GetForBrowserContext(profile)); #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -58,7 +58,7 @@ if (headless::IsHeadlessMode()) { headless::ReportHeadlessActionMetrics(); } -@@ -1431,7 +1431,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl( +@@ -1438,7 +1438,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl( // In headless mode provide alternate SelectFileDialog factory overriding // any platform specific SelectFileDialog implementation that may have been // set. @@ -67,3 +67,12 @@ if (headless::IsHeadlessMode()) { headless::HeadlessSelectFileDialogFactory::SetUp(); } +@@ -2026,7 +2026,7 @@ bool ChromeBrowserMainParts::ProcessSingletonNotificat + + // Drop the request if headless mode is in effect or the request is from + // a headless Chrome process. +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + if (headless::IsHeadlessMode() || + command_line.HasSwitch(switches::kHeadless)) { + return false; diff --git a/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.cc b/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.cc index c5f3c4d197a1..590014204608 100644 --- a/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.cc +++ b/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.cc @@ -1,15 +1,15 @@ ---- chrome/browser/chrome_content_browser_client.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -436,7 +436,7 @@ - #include "components/user_manager/user_manager.h" - #include "services/service_manager/public/mojom/interface_provider_spec.mojom.h" +@@ -443,7 +443,7 @@ #include "storage/browser/file_system/external_mount_points.h" + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) #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) - #include "base/android/application_status_listener.h" -@@ -530,12 +530,12 @@ +@@ -543,12 +543,12 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -24,8 +24,8 @@ #include "components/crash/core/app/crash_switches.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -544,14 +544,14 @@ - #include "components/crash/content/browser/crash_handler_host_linux.h" +@@ -559,14 +559,14 @@ + #include "chrome/browser/apps/link_capturing/web_app_link_capturing_delegate.h" #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) @@ -41,13 +41,8 @@ #include "chrome/browser/enterprise/connectors/device_trust/navigation_throttle.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || // BUILDFLAG(IS_CHROMEOS_ASH) -@@ -580,11 +580,11 @@ - - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) - #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h" +@@ -582,7 +582,7 @@ + #include "components/lens/lens_features.h" #endif -#if BUILDFLAG(IS_LINUX) @@ -56,9 +51,9 @@ #elif BUILDFLAG(IS_OZONE) #include "chrome/browser/chrome_browser_main_extra_parts_ozone.h" @@ -1598,7 +1598,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre - registry->RegisterBooleanPref(prefs::kNewBaseUrlInheritanceBehaviorAllowed, - true); registry->RegisterBooleanPref(prefs::kNativeClientForceAllowed, false); + registry->RegisterBooleanPref( + policy::policy_prefs::kPPAPISharedImagesForVideoDecoderAllowed, true); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) registry->RegisterBooleanPref(prefs::kOutOfProcessSystemDnsResolutionEnabled, @@ -73,7 +68,7 @@ main_parts = std::make_unique<ChromeBrowserMainPartsLinux>( is_integration_test, &startup_data_); #elif BUILDFLAG(IS_ANDROID) -@@ -1759,7 +1759,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1757,7 +1757,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo std::make_unique<ChromeBrowserMainExtraPartsViewsLacros>()); // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -82,7 +77,7 @@ main_parts->AddParts( std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>()); #else -@@ -1780,7 +1780,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1778,7 +1778,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLacros>()); #endif @@ -91,7 +86,7 @@ main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>()); #elif BUILDFLAG(IS_OZONE) main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>()); -@@ -1799,7 +1799,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1797,7 +1797,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo chrome::AddMetricsExtraParts(main_parts.get()); @@ -100,7 +95,7 @@ main_parts->AddParts( std::make_unique< chrome::enterprise_util::ChromeBrowserMainExtraPartsEnterprise>()); -@@ -2629,6 +2629,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2627,6 +2627,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin #elif BUILDFLAG(IS_POSIX) #if BUILDFLAG(IS_ANDROID) bool enable_crash_reporter = true; @@ -109,7 +104,7 @@ #elif BUILDFLAG(IS_CHROMEOS) bool enable_crash_reporter = false; if (crash_reporter::IsCrashpadEnabled()) { -@@ -3006,7 +3008,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -3010,7 +3012,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin ThreadProfilerConfiguration::Get()->AppendCommandLineSwitchForChildProcess( command_line); @@ -118,7 +113,7 @@ // Opt into a hardened stack canary mitigation if it hasn't already been // force-disabled. if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) { -@@ -4614,7 +4616,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst +@@ -4641,7 +4643,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst } } @@ -127,7 +122,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -5161,7 +5163,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5188,7 +5190,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati &throttles); } @@ -136,7 +131,7 @@ MaybeAddThrottle( WebAppSettingsNavigationThrottle::MaybeCreateThrottleFor(handle), &throttles); -@@ -5171,7 +5173,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5198,7 +5200,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -145,7 +140,7 @@ MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle:: MaybeCreateThrottleFor(handle), &throttles); -@@ -5210,7 +5212,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5237,7 +5239,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati handle)); } @@ -154,7 +149,7 @@ MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle:: MaybeCreateThrottleFor(handle), &throttles); -@@ -7054,7 +7056,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS +@@ -7124,7 +7126,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS } bool ChromeContentBrowserClient::ShouldRunOutOfProcessSystemDnsResolution() { diff --git a/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.h b/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.h index 97f0c13fc541..20545b309ba7 100644 --- a/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.h +++ b/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.h @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_content_browser_client.h.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/chrome_content_browser_client.h.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/chrome_content_browser_client.h -@@ -478,7 +478,7 @@ class ChromeContentBrowserClient : public content::Con +@@ -482,7 +482,7 @@ class ChromeContentBrowserClient : public content::Con void OverridePageVisibilityState( content::RenderFrameHost* render_frame_host, content::PageVisibilityState* visibility_state) override; diff --git a/www/iridium/files/patch-chrome_browser_download_download__commands.h b/www/iridium/files/patch-chrome_browser_download_download__commands.h index e4be9bbfae48..601bf4cca768 100644 --- a/www/iridium/files/patch-chrome_browser_download_download__commands.h +++ b/www/iridium/files/patch-chrome_browser_download_download__commands.h @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_commands.h.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/download/download_commands.h.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/download/download_commands.h -@@ -60,7 +60,7 @@ class DownloadCommands { +@@ -62,7 +62,7 @@ class DownloadCommands { void ExecuteCommand(Command command); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/iridium/files/patch-chrome_browser_download_download__item__model.cc b/www/iridium/files/patch-chrome_browser_download_download__item__model.cc index f950a54b023c..b49a7f80f8a5 100644 --- a/www/iridium/files/patch-chrome_browser_download_download__item__model.cc +++ b/www/iridium/files/patch-chrome_browser_download_download__item__model.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_item_model.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/download/download_item_model.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/download/download_item_model.cc -@@ -769,7 +769,7 @@ bool DownloadItemModel::IsCommandChecked( +@@ -757,7 +757,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,8 +9,8 @@ if (download_commands->CanOpenPdfInSystemViewer()) { DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile()); return prefs->ShouldOpenPdfInSystemReader(); -@@ -815,7 +815,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand - base::UmaHistogramBoolean("Download.SetAlwaysOpenTo", !is_checked); +@@ -803,7 +803,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand + DownloadCommands::ALWAYS_OPEN_TYPE); DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile()); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_MAC) @@ -18,7 +18,7 @@ if (download_commands->CanOpenPdfInSystemViewer()) { prefs->SetShouldOpenPdfInSystemReader(!is_checked); SetShouldPreferOpeningInBrowser(is_checked); -@@ -1200,7 +1200,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe +@@ -1174,7 +1174,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe return; } diff --git a/www/iridium/files/patch-chrome_browser_download_download__prefs.cc b/www/iridium/files/patch-chrome_browser_download_download__prefs.cc index 73a44d26eaa5..cfc8c700b9df 100644 --- a/www/iridium/files/patch-chrome_browser_download_download__prefs.cc +++ b/www/iridium/files/patch-chrome_browser_download_download__prefs.cc @@ -1,4 +1,4 @@ ---- chrome/browser/download/download_prefs.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/download/download_prefs.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/download/download_prefs.cc @@ -11,6 +11,7 @@ #include <vector> @@ -37,7 +37,7 @@ should_open_pdf_in_system_reader_ = prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader); #endif -@@ -314,7 +319,7 @@ void DownloadPrefs::RegisterProfilePrefs( +@@ -312,7 +317,7 @@ void DownloadPrefs::RegisterProfilePrefs( registry->RegisterTimePref(prefs::kDownloadLastCompleteTime, /*default_value=*/base::Time()); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -46,7 +46,7 @@ registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false); #endif #if BUILDFLAG(IS_ANDROID) -@@ -487,7 +492,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens +@@ -485,7 +490,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -55,7 +55,7 @@ void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) { if (should_open_pdf_in_system_reader_ == should_open) return; -@@ -519,7 +524,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons +@@ -517,7 +522,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons void DownloadPrefs::ResetAutoOpenByUser() { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -64,7 +64,7 @@ SetShouldOpenPdfInSystemReader(false); #endif auto_open_by_user_.clear(); -@@ -550,7 +555,7 @@ void DownloadPrefs::SaveAutoOpenState() { +@@ -548,7 +553,7 @@ void DownloadPrefs::SaveAutoOpenState() { bool DownloadPrefs::CanPlatformEnableAutoOpenForPdf() const { #if BUILDFLAG(IS_CHROMEOS) return false; // There is no UI for auto-open on ChromeOS. @@ -73,7 +73,7 @@ return ShouldOpenPdfInSystemReader(); #else return false; -@@ -674,7 +679,14 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa +@@ -672,7 +677,14 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa #else // If the stored download directory is an absolute path, we presume it's // correct; there's not really much more validation we can do here. diff --git a/www/iridium/files/patch-chrome_browser_download_download__prefs.h b/www/iridium/files/patch-chrome_browser_download_download__prefs.h index f43c065126f5..666e9ed856b7 100644 --- a/www/iridium/files/patch-chrome_browser_download_download__prefs.h +++ b/www/iridium/files/patch-chrome_browser_download_download__prefs.h @@ -1,4 +1,4 @@ ---- chrome/browser/download/download_prefs.h.orig 2023-04-22 17:45:15 UTC +--- chrome/browser/download/download_prefs.h.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/download/download_prefs.h @@ -118,7 +118,7 @@ class DownloadPrefs { void DisableAutoOpenByUserBasedOnExtension(const base::FilePath& file_name); @@ -9,7 +9,7 @@ // Store the user preference to disk. If |should_open| is true, also disable // the built-in PDF plugin. If |should_open| is false, enable the PDF plugin. void SetShouldOpenPdfInSystemReader(bool should_open); -@@ -183,7 +183,7 @@ class DownloadPrefs { +@@ -182,7 +182,7 @@ class DownloadPrefs { std::unique_ptr<policy::URLBlocklist> auto_open_allowed_by_urls_; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/iridium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc b/www/iridium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc index ee2f40f608da..820a6c08707f 100644 --- a/www/iridium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc +++ b/www/iridium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/enterprise/connectors/connectors_service.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/enterprise/connectors/connectors_service.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/enterprise/connectors/connectors_service.cc -@@ -543,7 +543,7 @@ bool ConnectorsService::ConnectorsEnabled() const { +@@ -548,7 +548,7 @@ bool ConnectorsService::ConnectorsEnabled() const { Profile* profile = Profile::FromBrowserContext(context_); diff --git a/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc b/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc index c48a82398c6b..39f22ec1441c 100644 --- a/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc +++ b/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc @@ -1,4 +1,4 @@ ---- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc @@ -55,7 +55,7 @@ #include "base/strings/utf_string_conversions.h" @@ -9,7 +9,7 @@ #include "chrome/browser/enterprise/signals/signals_aggregator_factory.h" #include "components/device_signals/core/browser/signals_aggregator.h" #include "components/device_signals/core/common/signals_constants.h" -@@ -140,7 +140,7 @@ void UploadSecurityEventReport(base::Value::Dict event +@@ -129,7 +129,7 @@ void UploadSecurityEventReport(base::Value::Dict event std::move(upload_callback)); } @@ -18,7 +18,7 @@ void PopulateSignals(base::Value::Dict event, policy::CloudPolicyClient* client, std::string name, -@@ -427,7 +427,7 @@ void RealtimeReportingClient::ReportPastEvent(const st +@@ -416,7 +416,7 @@ void RealtimeReportingClient::ReportPastEvent(const st /*include_profile_user_name=*/false); } @@ -27,7 +27,7 @@ void AddCrowdstrikeSignalsToEvent( base::Value::Dict& event, -@@ -486,7 +486,7 @@ void RealtimeReportingClient::ReportEventWithTimestamp +@@ -475,7 +475,7 @@ void RealtimeReportingClient::ReportEventWithTimestamp if (include_profile_user_name) { event.Set(kKeyProfileUserName, GetProfileUserName()); } diff --git a/www/iridium/files/patch-chrome_browser_extensions_BUILD.gn b/www/iridium/files/patch-chrome_browser_extensions_BUILD.gn index 2865d3b8fb20..8de79f5448f6 100644 --- a/www/iridium/files/patch-chrome_browser_extensions_BUILD.gn +++ b/www/iridium/files/patch-chrome_browser_extensions_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/BUILD.gn.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/extensions/BUILD.gn.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/extensions/BUILD.gn -@@ -1372,6 +1372,10 @@ static_library("extensions") { +@@ -1375,6 +1375,10 @@ static_library("extensions") { deps += [ "//chrome/services/printing/public/mojom" ] } diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_api__browser__context__keyed__service__factories.cc b/www/iridium/files/patch-chrome_browser_extensions_api_api__browser__context__keyed__service__factories.cc index 35186ff664d7..b1ee644c6776 100644 --- a/www/iridium/files/patch-chrome_browser_extensions_api_api__browser__context__keyed__service__factories.cc +++ b/www/iridium/files/patch-chrome_browser_extensions_api_api__browser__context__keyed__service__factories.cc @@ -1,4 +1,4 @@ ---- chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc @@ -43,7 +43,7 @@ #include "extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_api.h" @@ -9,7 +9,7 @@ #include "chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.h" #endif -@@ -108,7 +108,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt +@@ -115,7 +115,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt extensions::SettingsPrivateEventRouterFactory::GetInstance(); extensions::SettingsOverridesAPI::GetFactoryInstance(); extensions::SidePanelService::GetFactoryInstance(); diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc b/www/iridium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc index 61763c3f1910..c9d5fd3bff67 100644 --- a/www/iridium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc +++ b/www/iridium/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 2023-10-21 11:51:27 UTC +--- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc -@@ -603,7 +603,7 @@ void PasswordsPrivateDelegateImpl::OnFetchingFamilyMem +@@ -605,7 +605,7 @@ void PasswordsPrivateDelegateImpl::OnFetchingFamilyMem } void PasswordsPrivateDelegateImpl::OsReauthTimeoutCall() { diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc b/www/iridium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc index 5e799f792bae..9f176d32af64 100644 --- a/www/iridium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc +++ b/www/iridium/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 2023-10-21 11:51:27 UTC +--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -199,7 +199,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -195,7 +195,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist (*s_allowlist)[::prefs::kSidePanelHorizontalAlignment] = settings_api::PrefType::PREF_TYPE_BOOLEAN; @@ -9,7 +9,7 @@ (*s_allowlist)[::prefs::kUseCustomChromeFrame] = settings_api::PrefType::PREF_TYPE_BOOLEAN; #endif -@@ -211,7 +211,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -207,7 +207,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist settings_api::PrefType::PREF_TYPE_STRING; (*s_allowlist)[::prefs::kPolicyThemeColor] = settings_api::PrefType::PREF_TYPE_NUMBER; diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_tabs_tabs__api.cc b/www/iridium/files/patch-chrome_browser_extensions_api_tabs_tabs__api.cc index f1a7225fa6cc..03ffd781a982 100644 --- a/www/iridium/files/patch-chrome_browser_extensions_api_tabs_tabs__api.cc +++ b/www/iridium/files/patch-chrome_browser_extensions_api_tabs_tabs__api.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/tabs/tabs_api.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/extensions/api/tabs/tabs_api.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/extensions/api/tabs/tabs_api.cc -@@ -860,7 +860,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio +@@ -861,7 +861,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio // ui::SHOW_STATE_MINIMIZED above, on Linux the window is not created as // minimized. // TODO(crbug.com/1410400): Remove this workaround when linux is fixed. diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc b/www/iridium/files/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc index db8561ff244b..23fc64ab5af6 100644 --- a/www/iridium/files/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc +++ b/www/iridium/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 2023-10-21 11:51:27 UTC +--- chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/extensions/api/webstore_private/webstore_private_api.cc -@@ -924,7 +924,7 @@ void WebstorePrivateBeginInstallWithManifest3Function: +@@ -919,7 +919,7 @@ void WebstorePrivateBeginInstallWithManifest3Function: RequestExtensionApproval(contents); return; } diff --git a/www/iridium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc b/www/iridium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc index cc9305882e9e..423ddb18f6d4 100644 --- a/www/iridium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc +++ b/www/iridium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc @@ -1,6 +1,6 @@ ---- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc -@@ -314,7 +314,7 @@ const struct { +@@ -324,7 +324,7 @@ const struct { FILE_PATH_LITERAL("Library/Mobile Documents/com~apple~CloudDocs"), kDontBlockChildren}, #endif diff --git a/www/iridium/files/patch-chrome_browser_flag__descriptions.cc b/www/iridium/files/patch-chrome_browser_flag__descriptions.cc index b66fb089f756..d63652f12091 100644 --- a/www/iridium/files/patch-chrome_browser_flag__descriptions.cc +++ b/www/iridium/files/patch-chrome_browser_flag__descriptions.cc @@ -1,6 +1,6 @@ ---- chrome/browser/flag_descriptions.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/flag_descriptions.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/flag_descriptions.cc -@@ -2588,7 +2588,7 @@ const char kWebUIOmniboxPopupName[] = "WebUI Omnibox P +@@ -2599,7 +2599,7 @@ const char kWebUIOmniboxPopupName[] = "WebUI Omnibox P const char kWebUIOmniboxPopupDescription[] = "If enabled, shows the omnibox suggestions popup in WebUI."; @@ -9,7 +9,7 @@ const char kWebUiSystemFontName[] = "WebUI System font"; const char kWebUiSystemFontDescription[] = "If enabled, all WebUI surfaces will use the default UI font of the " -@@ -7151,7 +7151,7 @@ const char kLacrosMergeIcuDataFileDescription[] = +@@ -7264,7 +7264,7 @@ const char kLacrosMergeIcuDataFileDescription[] = "Enables sharing common areas of icudtl.dat between Ash and Lacros."; #endif // #if BUILDFLAG(IS_CHROMEOS_LACROS) @@ -18,7 +18,7 @@ const char kGetAllScreensMediaName[] = "GetAllScreensMedia API"; const char kGetAllScreensMediaDescription[] = "When enabled, the getAllScreensMedia API for capturing multiple screens " -@@ -7366,7 +7366,7 @@ const char kSearchWebInSidePanelDescription[] = +@@ -7481,7 +7481,7 @@ const char kSearchWebInSidePanelDescription[] = // Random platform combinations ----------------------------------------------- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -27,7 +27,7 @@ const char kQuickCommandsName[] = "Quick Commands"; const char kQuickCommandsDescription[] = "Enable a text interface to browser features. Invoke with Ctrl-Space."; -@@ -7375,7 +7375,7 @@ const char kQuickCommandsDescription[] = +@@ -7490,7 +7490,7 @@ const char kQuickCommandsDescription[] = // BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -36,7 +36,7 @@ const char kFollowingFeedSidepanelName[] = "Following feed in the sidepanel"; const char kFollowingFeedSidepanelDescription[] = "Enables the following feed in the sidepanel."; -@@ -7390,7 +7390,7 @@ const char kEnableProtoApiForClassifyUrlDescription[] +@@ -7505,7 +7505,7 @@ const char kEnableProtoApiForClassifyUrlDescription[] "instead of JSON."; #endif @@ -45,7 +45,7 @@ const char kEnableNetworkServiceSandboxName[] = "Enable the network service sandbox."; const char kEnableNetworkServiceSandboxDescription[] = -@@ -7414,7 +7414,7 @@ const char kWebShareDescription[] = +@@ -7529,7 +7529,7 @@ const char kWebShareDescription[] = "platforms."; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) @@ -54,7 +54,7 @@ const char kOzonePlatformHintChoiceDefault[] = "Default"; const char kOzonePlatformHintChoiceAuto[] = "Auto"; const char kOzonePlatformHintChoiceX11[] = "X11"; -@@ -7434,7 +7434,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti +@@ -7549,7 +7549,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti "Bluetooth"; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) @@ -63,7 +63,7 @@ const char kSkipUndecryptablePasswordsName[] = "Skip undecryptable passwords to use the available decryptable " "passwords."; -@@ -7448,7 +7448,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail +@@ -7563,7 +7563,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail "storage and requests initial sync."; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) @@ -72,7 +72,7 @@ const char kAsyncDnsName[] = "Async DNS resolver"; const char kAsyncDnsDescription[] = "Enables the built-in DNS resolver."; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) -@@ -7555,7 +7555,7 @@ const char kElasticOverscrollDescription[] = +@@ -7662,7 +7662,7 @@ const char kElasticOverscrollDescription[] = #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -81,7 +81,7 @@ const char kUIDebugToolsName[] = "Debugging tools for UI"; const char kUIDebugToolsDescription[] = "Enables additional keyboard shortcuts to help debugging."; -@@ -7567,7 +7567,7 @@ const char kSyncPollImmediatelyOnEveryStartupDescripti +@@ -7674,7 +7674,7 @@ const char kSyncPollImmediatelyOnEveryStartupDescripti #endif #if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \ @@ -90,7 +90,7 @@ const char kDataRetentionPoliciesDisableSyncTypesNeededName[] = "Data Retention Policies Disable Sync Types"; const char kDataRetentionPoliciesDisableSyncTypesNeededDescription[] = -@@ -7612,7 +7612,7 @@ const char kEnableAudioFocusEnforcementDescription[] = +@@ -7719,7 +7719,7 @@ const char kEnableAudioFocusEnforcementDescription[] = "any one time. Requires #enable-media-session-service to be enabled too."; #endif // BUILDFLAG(IS_CHROMEOS_ASH) diff --git a/www/iridium/files/patch-chrome_browser_flag__descriptions.h b/www/iridium/files/patch-chrome_browser_flag__descriptions.h index 3f6ee013aa61..42bd6c6d4288 100644 --- a/www/iridium/files/patch-chrome_browser_flag__descriptions.h +++ b/www/iridium/files/patch-chrome_browser_flag__descriptions.h @@ -1,6 +1,6 @@ ---- chrome/browser/flag_descriptions.h.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/flag_descriptions.h.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/flag_descriptions.h -@@ -1472,7 +1472,7 @@ extern const char kOmnibox2023RefreshConnectionSecurit +@@ -1485,7 +1485,7 @@ extern const char kOmnibox2023RefreshConnectionSecurit extern const char kWebUIOmniboxPopupName[]; extern const char kWebUIOmniboxPopupDescription[]; @@ -9,7 +9,7 @@ extern const char kWebUiSystemFontName[]; extern const char kWebUiSystemFontDescription[]; #endif -@@ -4103,7 +4103,7 @@ extern const char kLacrosMergeIcuDataFileName[]; +@@ -4172,7 +4172,7 @@ extern const char kLacrosMergeIcuDataFileName[]; extern const char kLacrosMergeIcuDataFileDescription[]; #endif // #if BUILDFLAG(IS_CHROMEOS_LACROS) @@ -18,7 +18,7 @@ extern const char kGetAllScreensMediaName[]; extern const char kGetAllScreensMediaDescription[]; #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -4233,14 +4233,14 @@ extern const char kSearchWebInSidePanelDescription[]; +@@ -4302,14 +4302,14 @@ extern const char kSearchWebInSidePanelDescription[]; // Random platform combinations ----------------------------------------------- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -35,7 +35,7 @@ extern const char kWebShareName[]; extern const char kWebShareDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) -@@ -4250,7 +4250,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa +@@ -4319,7 +4319,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa extern const char kWebBluetoothConfirmPairingSupportDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) @@ -44,7 +44,7 @@ extern const char kOzonePlatformHintChoiceDefault[]; extern const char kOzonePlatformHintChoiceAuto[]; extern const char kOzonePlatformHintChoiceX11[]; -@@ -4260,7 +4260,7 @@ extern const char kOzonePlatformHintName[]; +@@ -4329,7 +4329,7 @@ extern const char kOzonePlatformHintName[]; extern const char kOzonePlatformHintDescription[]; #endif // BUILDFLAG(IS_LINUX) @@ -53,7 +53,7 @@ extern const char kSkipUndecryptablePasswordsName[]; extern const char kSkipUndecryptablePasswordsDescription[]; -@@ -4268,13 +4268,13 @@ extern const char kForcePasswordInitialSyncWhenDecrypt +@@ -4337,13 +4337,13 @@ extern const char kForcePasswordInitialSyncWhenDecrypt extern const char kForcePasswordInitialSyncWhenDecryptionFailsDescription[]; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) @@ -69,7 +69,7 @@ extern const char kFollowingFeedSidepanelName[]; extern const char kFollowingFeedSidepanelDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || -@@ -4285,7 +4285,7 @@ extern const char kEnableProtoApiForClassifyUrlName[]; +@@ -4354,7 +4354,7 @@ extern const char kEnableProtoApiForClassifyUrlName[]; extern const char kEnableProtoApiForClassifyUrlDescription[]; #endif // BUILDFLAG(ENABLE_SUPERVISED_USERS) @@ -78,7 +78,7 @@ extern const char kEnableNetworkServiceSandboxName[]; extern const char kEnableNetworkServiceSandboxDescription[]; -@@ -4367,7 +4367,7 @@ extern const char kElasticOverscrollDescription[]; +@@ -4431,7 +4431,7 @@ extern const char kElasticOverscrollDescription[]; #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -87,7 +87,7 @@ extern const char kUIDebugToolsName[]; extern const char kUIDebugToolsDescription[]; -@@ -4376,7 +4376,7 @@ extern const char kSyncPollImmediatelyOnEveryStartupDe +@@ -4440,7 +4440,7 @@ extern const char kSyncPollImmediatelyOnEveryStartupDe #endif #if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \ @@ -96,7 +96,7 @@ extern const char kDataRetentionPoliciesDisableSyncTypesNeededName[]; extern const char kDataRetentionPoliciesDisableSyncTypesNeededDescription[]; #endif -@@ -4403,7 +4403,7 @@ extern const char kEnableAudioFocusEnforcementName[]; +@@ -4467,7 +4467,7 @@ extern const char kEnableAudioFocusEnforcementName[]; extern const char kEnableAudioFocusEnforcementDescription[]; #endif // BUILDFLAG(IS_CHROMEOS_ASH) diff --git a/www/iridium/files/patch-chrome_browser_headless_headless__mode__util.cc b/www/iridium/files/patch-chrome_browser_headless_headless__mode__util.cc index eda4089abdfe..94ed143d25ac 100644 --- a/www/iridium/files/patch-chrome_browser_headless_headless__mode__util.cc +++ b/www/iridium/files/patch-chrome_browser_headless_headless__mode__util.cc @@ -1,26 +1,20 @@ ---- chrome/browser/headless/headless_mode_util.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/headless/headless_mode_util.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/headless/headless_mode_util.cc -@@ -10,12 +10,12 @@ - // New headless mode is available on Linux, Windows and Mac platforms. - // More platforms will be added later, so avoid function level clutter - // by providing stub implementations at the end of the file. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - - #include "base/base_switches.h" +@@ -18,7 +18,7 @@ #include "chrome/common/chrome_switches.h" + #include "content/public/common/content_switches.h" -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "ui/gl/gl_switches.h" // nogncheck #include "ui/ozone/public/ozone_switches.h" // nogncheck #endif // BUILDFLAG(IS_LINUX) -@@ -73,7 +73,7 @@ void SetUpCommandLine(const base::CommandLine* command - ::switches::kNoErrorDialogs); - } +@@ -81,7 +81,7 @@ class HeadlessModeHandleImpl : public HeadlessModeHand + command_line->AppendSwitchPath(switches::kUserDataDir, GetUserDataDir()); + } -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Headless mode on Linux relies on ozone/headless platform. - base::CommandLine::ForCurrentProcess()->AppendSwitchASCII( - ::switches::kOzonePlatform, switches::kHeadless); + command_line->AppendSwitchASCII(::switches::kOzonePlatform, + switches::kHeadless); diff --git a/www/iridium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.cc b/www/iridium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.cc index 3f34a6fc3b4d..b4f7f3f2eb8f 100644 --- a/www/iridium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.cc +++ b/www/iridium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.cc @@ -1,4 +1,4 @@ ---- chrome/browser/media/webrtc/chrome_screen_enumerator.cc.orig 2023-07-24 14:27:53 UTC +--- chrome/browser/media/webrtc/chrome_screen_enumerator.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/media/webrtc/chrome_screen_enumerator.cc @@ -21,7 +21,7 @@ #if BUILDFLAG(IS_CHROMEOS_ASH) @@ -36,9 +36,9 @@ void ChromeScreenEnumerator::SetDesktopCapturerForTesting( std::unique_ptr<webrtc::DesktopCapturer> capturer) { g_desktop_capturer_for_testing.Get() = std::move(capturer); -@@ -143,7 +143,7 @@ void ChromeScreenEnumerator::EnumerateScreens( +@@ -142,7 +142,7 @@ void ChromeScreenEnumerator::EnumerateScreens( + ScreensCallback screens_callback) const { DCHECK_CURRENTLY_ON(content::BrowserThread::IO); - DCHECK(base::FeatureList::IsEnabled(blink::features::kGetAllScreensMedia)); -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/iridium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc b/www/iridium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc index 8f1e2fde32bd..a1f60bd1b3d3 100644 --- a/www/iridium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc +++ b/www/iridium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc @@ -1,4 +1,4 @@ ---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc @@ -78,8 +78,10 @@ @@ -39,7 +39,7 @@ shell_integration::DefaultWebClientState default_state = shell_integration::GetDefaultBrowser(); base::UmaHistogramEnumeration("DefaultBrowser.State", default_state, -@@ -1227,11 +1229,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt +@@ -1239,11 +1241,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt } #endif // !BUILDFLAG(IS_ANDROID) diff --git a/www/iridium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc b/www/iridium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc index c6d512b729d9..a87b89e618ad 100644 --- a/www/iridium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc +++ b/www/iridium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/metrics/chrome_metrics_service_client.cc -@@ -183,7 +183,7 @@ +@@ -184,7 +184,7 @@ #include "chrome/notification_helper/notification_helper_constants.h" #endif @@ -9,7 +9,7 @@ #include "components/metrics/motherboard_metrics_provider.h" #endif -@@ -209,7 +209,7 @@ +@@ -210,7 +210,7 @@ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -18,7 +18,7 @@ #include "chrome/browser/metrics/family_link_user_metrics_provider.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS_LACROS))||BUILDFLAG(IS_ANDROID)) -@@ -809,7 +809,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -810,7 +810,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic metrics_service_->RegisterMetricsProvider( std::make_unique<metrics::CPUMetricsProvider>()); @@ -27,7 +27,7 @@ metrics_service_->RegisterMetricsProvider( std::make_unique<metrics::MotherboardMetricsProvider>()); #endif -@@ -891,7 +891,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -892,7 +892,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -36,7 +36,7 @@ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) metrics_service_->RegisterMetricsProvider( std::make_unique<DesktopPlatformFeaturesMetricsProvider>()); -@@ -1007,7 +1007,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -1011,7 +1011,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic std::make_unique<PowerMetricsProvider>()); #endif @@ -45,7 +45,7 @@ metrics_service_->RegisterMetricsProvider( metrics::CreateDesktopSessionMetricsProvider()); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) -@@ -1206,7 +1206,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve +@@ -1210,7 +1210,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/iridium/files/patch-chrome_browser_net_system__network__context__manager.cc b/www/iridium/files/patch-chrome_browser_net_system__network__context__manager.cc index c7e491b6cf6d..d5ff58127353 100644 --- a/www/iridium/files/patch-chrome_browser_net_system__network__context__manager.cc +++ b/www/iridium/files/patch-chrome_browser_net_system__network__context__manager.cc @@ -1,4 +1,4 @@ ---- chrome/browser/net/system_network_context_manager.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/net/system_network_context_manager.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/net/system_network_context_manager.cc @@ -92,7 +92,7 @@ @@ -7,9 +7,27 @@ -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) #include "chrome/common/chrome_paths_internal.h" - #include "chrome/grit/chromium_strings.h" + #include "chrome/grit/branded_strings.h" #include "ui/base/l10n/l10n_util.h" -@@ -183,7 +183,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut +@@ -136,7 +136,7 @@ SystemNetworkContextManager* g_system_network_context_ + // received a failed launch for a sandboxed network service. + bool g_previously_failed_to_launch_sandboxed_service = false; + +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Whether kerberos library loading will work in the network service due to the + // sandbox. + bool g_network_service_will_allow_gssapi_library_load = false; +@@ -144,7 +144,7 @@ bool g_network_service_will_allow_gssapi_library_load + const char* kGssapiDesiredPref = + #if BUILDFLAG(IS_CHROMEOS) + prefs::kKerberosEnabled; +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + prefs::kReceivedHttpAuthNegotiateHeader; + #endif + #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +@@ -190,7 +190,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut auth_dynamic_params->basic_over_http_enabled = local_state->GetBoolean(prefs::kBasicAuthOverHttpEnabled); @@ -18,7 +36,25 @@ auth_dynamic_params->delegate_by_kdc_policy = local_state->GetBoolean(prefs::kAuthNegotiateDelegateByKdcPolicy); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -241,7 +241,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() +@@ -205,7 +205,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut + local_state->GetString(prefs::kAuthAndroidNegotiateAccountType); + #endif // BUILDFLAG(IS_ANDROID) + +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + auth_dynamic_params->allow_gssapi_library_load = + local_state->GetBoolean(kGssapiDesiredPref); + #endif // BUILDFLAG(IS_CHROMEOS) +@@ -215,7 +215,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut + + void OnNewHttpAuthDynamicParams( + network::mojom::HttpAuthDynamicParamsPtr& params) { +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // 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 +@@ -257,11 +257,11 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() if (g_previously_failed_to_launch_sandboxed_service) { return NetworkSandboxState::kDisabledBecauseOfFailedLaunch; } @@ -27,7 +63,12 @@ auto* local_state = g_browser_process->local_state(); #endif -@@ -262,7 +262,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // 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 || +@@ -278,7 +278,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() } #endif // BUILDFLAG(IS_WIN) @@ -36,7 +77,7 @@ if (local_state && local_state->HasPrefPath(prefs::kNetworkServiceSandboxEnabled)) { return local_state->GetBoolean(prefs::kNetworkServiceSandboxEnabled) -@@ -457,7 +457,7 @@ void SystemNetworkContextManager::DeleteInstance() { +@@ -473,7 +473,7 @@ void SystemNetworkContextManager::DeleteInstance() { g_system_network_context_manager = nullptr; } @@ -45,7 +86,7 @@ SystemNetworkContextManager::GssapiLibraryLoadObserver:: GssapiLibraryLoadObserver(SystemNetworkContextManager* owner) : owner_(owner) {} -@@ -515,7 +515,7 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -531,7 +531,7 @@ SystemNetworkContextManager::SystemNetworkContextManag pref_change_registrar_.Add(prefs::kAllHttpAuthSchemesAllowedForOrigins, auth_pref_callback); @@ -54,7 +95,7 @@ pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy, auth_pref_callback); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -562,7 +562,7 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -578,7 +578,7 @@ SystemNetworkContextManager::SystemNetworkContextManag #endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -63,7 +104,7 @@ pref_change_registrar_.Add( prefs::kEnforceLocalAnchorConstraintsEnabled, base::BindRepeating(&SystemNetworkContextManager:: -@@ -611,7 +611,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -627,7 +627,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe registry->RegisterBooleanPref(prefs::kKerberosEnabled, false); #endif // BUILDFLAG(IS_CHROMEOS_LACROS) @@ -72,7 +113,7 @@ registry->RegisterBooleanPref(prefs::kAuthNegotiateDelegateByKdcPolicy, false); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -640,7 +640,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -656,7 +656,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe registry->RegisterBooleanPref(prefs::kChromeRootStoreEnabled, false); #endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -81,7 +122,7 @@ // Note that the default value is not relevant because the pref is only // evaluated when it is managed. registry->RegisterBooleanPref(prefs::kEnforceLocalAnchorConstraintsEnabled, -@@ -649,11 +649,11 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -665,11 +665,11 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe registry->RegisterListPref(prefs::kExplicitlyAllowedNetworkPorts); @@ -94,8 +135,8 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) registry->RegisterBooleanPref(prefs::kReceivedHttpAuthNegotiateHeader, false); #endif // BUILDFLAG(IS_LINUX) - } -@@ -702,7 +702,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea + +@@ -720,7 +720,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea OnNewHttpAuthDynamicParams(http_auth_dynamic_params); network_service->ConfigureHttpAuthPrefs(std::move(http_auth_dynamic_params)); @@ -104,7 +145,7 @@ gssapi_library_loader_observer_.Install(network_service); #endif // BUILDFLAG(IS_LINUX) -@@ -1009,7 +1009,7 @@ void SystemNetworkContextManager::UpdateChromeRootStor +@@ -1028,7 +1028,7 @@ void SystemNetworkContextManager::UpdateChromeRootStor #endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc b/www/iridium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc index 52cda9b7814d..0e591019a809 100644 --- a/www/iridium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc +++ b/www/iridium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc @@ -1,12 +1,13 @@ ---- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -214,17 +214,17 @@ +@@ -218,19 +218,20 @@ #include "components/spellcheck/browser/pref_names.h" #endif // BUILDFLAG(ENABLE_SPELLCHECK) -#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/idle/action.h" + #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h" #include "components/device_signals/core/browser/pref_names.h" // nogncheck due to crbug.com/1125897 #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) @@ -16,12 +17,14 @@ #include "components/enterprise/idle/idle_timeout_policy_handler.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) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_ANDROID) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_ANDROID) || \ ++ BUILDFLAG(IS_BSD) #include "chrome/browser/privacy_sandbox/privacy_sandbox_policy_handler.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || -@@ -811,7 +811,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || +@@ -816,7 +817,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kManagedDefaultGeolocationSetting, base::Value::Type::INTEGER }, #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \ @@ -30,7 +33,7 @@ { key::kRequireOnlineRevocationChecksForLocalAnchors, prefs::kCertRevocationCheckingRequiredLocalAnchors, base::Value::Type::BOOLEAN }, -@@ -821,7 +821,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -826,7 +827,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = #endif // #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) // || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_MAC) #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \ @@ -39,7 +42,7 @@ { key::kFullscreenAllowed, prefs::kFullscreenAllowed, base::Value::Type::BOOLEAN }, -@@ -1532,7 +1532,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1546,7 +1547,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::INTEGER }, #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -48,7 +51,7 @@ { key::kGSSAPILibraryName, prefs::kGSSAPILibraryName, base::Value::Type::STRING }, -@@ -1580,7 +1580,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1588,7 +1589,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_WIN) @@ -57,7 +60,7 @@ { key::kNetworkServiceSandboxEnabled, prefs::kNetworkServiceSandboxEnabled, base::Value::Type::BOOLEAN }, -@@ -1606,12 +1606,12 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1614,12 +1615,12 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kTotalMemoryLimitMb, base::Value::Type::INTEGER }, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -72,7 +75,7 @@ { key::kUnmanagedDeviceSignalsConsentFlowEnabled, device_signals::prefs::kUnmanagedDeviceSignalsConsentFlowEnabled, base::Value::Type::BOOLEAN }, -@@ -1620,7 +1620,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1628,7 +1629,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::LIST }, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) \ @@ -81,7 +84,7 @@ { key::kDefaultBrowserSettingEnabled, prefs::kDefaultBrowserSettingEnabled, base::Value::Type::BOOLEAN }, -@@ -1633,7 +1633,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1641,7 +1642,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) // || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) \ @@ -90,7 +93,7 @@ { key::kAutoplayAllowed, prefs::kAutoplayAllowed, base::Value::Type::BOOLEAN }, -@@ -1737,7 +1737,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1745,7 +1746,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS) @@ -99,7 +102,7 @@ { key::kAlternativeBrowserPath, browser_switcher::prefs::kAlternativeBrowserPath, base::Value::Type::STRING }, -@@ -1833,7 +1833,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1841,7 +1842,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_CHROMEOS) @@ -108,7 +111,7 @@ // TODO(crbug.com/1454054): replace the // kGetDisplayMediaSetSelectAllScreensAllowedForUrls policy by a policy that // matches the name of the new `getAllScreensMedia` API. -@@ -1842,7 +1842,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1850,7 +1851,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::LIST }, #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) @@ -117,7 +120,7 @@ { key::kAuthNegotiateDelegateByKdcPolicy, prefs::kAuthNegotiateDelegateByKdcPolicy, base::Value::Type::BOOLEAN }, -@@ -1873,7 +1873,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1881,7 +1882,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = #endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -126,7 +129,7 @@ { key::kEnforceLocalAnchorConstraintsEnabled, prefs::kEnforceLocalAnchorConstraintsEnabled, base::Value::Type::BOOLEAN }, -@@ -1952,7 +1952,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1957,7 +1958,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = ash::prefs::kUrlParameterToAutofillSAMLUsername, base::Value::Type::STRING }, #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -135,7 +138,7 @@ { key::kBatterySaverModeAvailability, performance_manager::user_tuning::prefs::kBatterySaverModeState, base::Value::Type::INTEGER }, -@@ -1983,7 +1983,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1988,7 +1989,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kCloudApAuthEnabled, base::Value::Type::INTEGER }, #endif // BUILDFLAG(IS_WIN) @@ -144,7 +147,7 @@ { key::kOutOfProcessSystemDnsResolutionEnabled, prefs::kOutOfProcessSystemDnsResolutionEnabled, base::Value::Type::BOOLEAN }, -@@ -2097,7 +2097,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2112,7 +2113,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH // Policies for all platforms - End #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -153,7 +156,7 @@ handlers->AddHandler( std::make_unique<performance_manager::HighEfficiencyPolicyHandler>()); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || -@@ -2299,7 +2299,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2314,7 +2315,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -162,7 +165,7 @@ handlers->AddHandler( std::make_unique<enterprise_idle::IdleTimeoutPolicyHandler>()); handlers->AddHandler( -@@ -2357,7 +2357,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2372,7 +2373,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime, chrome_schema)); @@ -171,7 +174,7 @@ handlers->AddHandler(std::make_unique<LocalSyncPolicyHandler>()); handlers->AddHandler(std::make_unique<ThemeColorPolicyHandler>()); handlers->AddHandler( -@@ -2413,7 +2413,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2433,7 +2434,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) || \ @@ -180,7 +183,7 @@ signin_legacy_policies.push_back(std::make_unique<SimplePolicyHandler>( key::kForceBrowserSignin, prefs::kForceBrowserSignin, base::Value::Type::BOOLEAN)); -@@ -2774,7 +2774,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2795,7 +2796,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif #if BUILDFLAG(ENABLE_SPELLCHECK) @@ -189,7 +192,7 @@ handlers->AddHandler(std::make_unique<SpellcheckLanguagePolicyHandler>()); handlers->AddHandler( std::make_unique<SpellcheckLanguageBlocklistPolicyHandler>( -@@ -2782,7 +2782,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2803,7 +2804,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) #endif // BUILDFLAG(ENABLE_SPELLCHECK) @@ -198,7 +201,7 @@ handlers->AddHandler(std::make_unique<SimplePolicyHandler>( key::kAllowSystemNotifications, prefs::kAllowSystemNotifications, base::Value::Type::BOOLEAN)); -@@ -2795,7 +2795,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2816,7 +2817,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH handlers->AddHandler( std::make_unique<first_party_sets::FirstPartySetsOverridesPolicyHandler>( chrome_schema)); diff --git a/www/iridium/files/patch-chrome_browser_prefs_browser__prefs.cc b/www/iridium/files/patch-chrome_browser_prefs_browser__prefs.cc index 872749dead3f..4dd4a16b0cbb 100644 --- a/www/iridium/files/patch-chrome_browser_prefs_browser__prefs.cc +++ b/www/iridium/files/patch-chrome_browser_prefs_browser__prefs.cc @@ -1,6 +1,6 @@ ---- chrome/browser/prefs/browser_prefs.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/prefs/browser_prefs.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/prefs/browser_prefs.cc -@@ -478,13 +478,13 @@ +@@ -485,18 +485,18 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -16,7 +16,13 @@ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" #endif -@@ -517,7 +517,7 @@ + +-#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/signin/enterprise_signin_prefs.h" + #endif + +@@ -528,7 +528,7 @@ #include "chrome/browser/sessions/session_service_log.h" #endif @@ -25,7 +31,7 @@ #include "ui/color/system_theme.h" #endif -@@ -662,7 +662,7 @@ const char kPluginsPluginsList[] = "plugins.plugins_li +@@ -674,7 +674,7 @@ const char kPluginsPluginsList[] = "plugins.plugins_li const char kPluginsShowDetails[] = "plugins.show_details"; // Deprecated 02/2023. @@ -34,7 +40,7 @@ const char kWebAppsUrlHandlerInfo[] = "web_apps.url_handler_info"; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -948,7 +948,7 @@ void RegisterLocalStatePrefsForMigration(PrefRegistryS +@@ -995,7 +995,7 @@ void RegisterLocalStatePrefsForMigration(PrefRegistryS #endif // BUILDFLAG(IS_CHROMEOS_ASH) // Deprecated 02/2023. @@ -43,7 +49,7 @@ registry->RegisterDictionaryPref(kWebAppsUrlHandlerInfo); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -1863,12 +1863,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync +@@ -1950,12 +1950,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -56,9 +62,9 @@ -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) browser_switcher::BrowserSwitcherPrefs::RegisterProfilePrefs(registry); + enterprise_signin::RegisterProfilePrefs(registry); #endif - -@@ -2018,7 +2018,7 @@ void MigrateObsoleteLocalStatePrefs(PrefService* local +@@ -2110,7 +2110,7 @@ void MigrateObsoleteLocalStatePrefs(PrefService* local #endif // BUILDFLAG(IS_CHROMEOS_ASH) // Added 02/2023 diff --git a/www/iridium/files/patch-chrome_browser_printing_printer__query.cc b/www/iridium/files/patch-chrome_browser_printing_printer__query.cc index b703bc115477..29d9336b9f6a 100644 --- a/www/iridium/files/patch-chrome_browser_printing_printer__query.cc +++ b/www/iridium/files/patch-chrome_browser_printing_printer__query.cc @@ -1,6 +1,6 @@ ---- chrome/browser/printing/printer_query.cc.orig 2023-07-24 14:27:53 UTC +--- chrome/browser/printing/printer_query.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/printing/printer_query.cc -@@ -341,7 +341,7 @@ void PrinterQuery::UpdatePrintSettings(base::Value::Di +@@ -339,7 +339,7 @@ void PrinterQuery::UpdatePrintSettings(base::Value::Di crash_key = std::make_unique<crash_keys::ScopedPrinterInfo>( print_backend->GetPrinterDriverInfo(printer_name)); diff --git a/www/iridium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc b/www/iridium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc index 219b2d64d48a..2766edd02501 100644 --- a/www/iridium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc +++ b/www/iridium/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 2023-10-21 11:51:27 UTC +--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -385,18 +385,18 @@ +@@ -393,18 +393,18 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -22,7 +22,7 @@ #include "chrome/browser/browser_switcher/browser_switcher_service_factory.h" #include "chrome/browser/enterprise/connectors/analysis/local_binary_upload_service_factory.h" #include "chrome/browser/enterprise/signals/signals_aggregator_factory.h" -@@ -596,7 +596,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -607,7 +607,7 @@ void ChromeBrowserMainExtraPartsProfiles:: if (breadcrumbs::IsEnabled()) { BreadcrumbManagerKeyedServiceFactory::GetInstance(); } @@ -31,9 +31,9 @@ browser_switcher::BrowserSwitcherServiceFactory::GetInstance(); #endif browser_sync::UserEventServiceFactory::GetInstance(); -@@ -689,26 +689,26 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -707,29 +707,29 @@ void ChromeBrowserMainExtraPartsProfiles:: + enterprise_commands::UserRemoteCommandsServiceFactory::GetInstance(); #endif - enterprise::ProfileIdServiceFactory::GetInstance(); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS_ASH) + BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) @@ -62,8 +62,12 @@ + BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) enterprise_signals::UserPermissionServiceFactory::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) + enterprise_signin::EnterpriseSigninServiceFactory::GetInstance(); + #endif #if BUILDFLAG(ENABLE_SESSION_SERVICE) -@@ -817,7 +817,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -844,7 +844,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -72,7 +76,7 @@ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance(); #endif -@@ -912,7 +912,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -940,7 +940,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #if BUILDFLAG(IS_CHROMEOS) policy::PolicyCertServiceFactory::GetInstance(); #endif @@ -81,7 +85,7 @@ policy::ProfileTokenPolicyWebSigninServiceFactory::GetInstance(); #endif policy::UserCloudPolicyInvalidatorFactory::GetInstance(); -@@ -953,7 +953,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -981,7 +981,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #if !BUILDFLAG(IS_ANDROID) ProfileThemeUpdateServiceFactory::GetInstance(); #endif diff --git a/www/iridium/files/patch-chrome_browser_renderer__preferences__util.cc b/www/iridium/files/patch-chrome_browser_renderer__preferences__util.cc index 7326de80e063..4d81865d59d8 100644 --- a/www/iridium/files/patch-chrome_browser_renderer__preferences__util.cc +++ b/www/iridium/files/patch-chrome_browser_renderer__preferences__util.cc @@ -1,6 +1,6 @@ ---- chrome/browser/renderer_preferences_util.cc.orig 2023-07-24 14:27:53 UTC +--- chrome/browser/renderer_preferences_util.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/renderer_preferences_util.cc -@@ -36,7 +36,7 @@ +@@ -38,7 +38,7 @@ #include "ui/views/controls/textfield/textfield.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" #include "ui/linux/linux_ui.h" -@@ -149,7 +149,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc +@@ -152,7 +152,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc prefs->caret_blink_interval = views::Textfield::GetCaretBlinkInterval(); #endif @@ -18,7 +18,7 @@ auto* linux_ui_theme = ui::LinuxUiTheme::GetForProfile(profile); if (linux_ui_theme) { if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) { -@@ -172,7 +172,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc +@@ -175,7 +175,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ diff --git a/www/iridium/files/patch-chrome_browser_resources_settings_route.ts b/www/iridium/files/patch-chrome_browser_resources_settings_route.ts index 77c9b619c304..e36a61ada02f 100644 --- a/www/iridium/files/patch-chrome_browser_resources_settings_route.ts +++ b/www/iridium/files/patch-chrome_browser_resources_settings_route.ts @@ -1,6 +1,6 @@ ---- chrome/browser/resources/settings/route.ts.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/resources/settings/route.ts.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/resources/settings/route.ts -@@ -236,7 +236,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes +@@ -240,7 +240,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes r.ACCESSIBILITY = r.ADVANCED.createSection( '/accessibility', 'a11y', loadTimeData.getString('a11yPageTitle')); diff --git a/www/iridium/files/patch-chrome_browser_signin_signin__util.cc b/www/iridium/files/patch-chrome_browser_signin_signin__util.cc index b41881775621..241d64c91cee 100644 --- a/www/iridium/files/patch-chrome_browser_signin_signin__util.cc +++ b/www/iridium/files/patch-chrome_browser_signin_signin__util.cc @@ -1,6 +1,6 @@ ---- chrome/browser/signin/signin_util.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/signin/signin_util.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/signin/signin_util.cc -@@ -74,7 +74,7 @@ CookiesMover::CookiesMover(base::WeakPtr<Profile> sour +@@ -75,7 +75,7 @@ CookiesMover::CookiesMover(base::WeakPtr<Profile> sour CookiesMover::~CookiesMover() = default; void CookiesMover::StartMovingCookies() { diff --git a/www/iridium/files/patch-chrome_browser_sync_sync__service__factory.cc b/www/iridium/files/patch-chrome_browser_sync_sync__service__factory.cc index 01dc2134654f..b8ac5d89bb70 100644 --- a/www/iridium/files/patch-chrome_browser_sync_sync__service__factory.cc +++ b/www/iridium/files/patch-chrome_browser_sync_sync__service__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/sync/sync_service_factory.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/sync/sync_service_factory.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/sync/sync_service_factory.cc -@@ -82,7 +82,7 @@ +@@ -81,7 +81,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" #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || // BUILDFLAG(IS_WIN) -@@ -131,7 +131,7 @@ std::unique_ptr<KeyedService> BuildSyncService( +@@ -126,7 +126,7 @@ std::unique_ptr<KeyedService> BuildSyncService( // TODO(crbug.com/1052397): 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(); -@@ -256,7 +256,7 @@ SyncServiceFactory::SyncServiceFactory() +@@ -252,7 +252,7 @@ SyncServiceFactory::SyncServiceFactory() DependsOn(PasswordStoreFactory::GetInstance()); DependsOn(PowerBookmarkServiceFactory::GetInstance()); #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ diff --git a/www/iridium/files/patch-chrome_browser_themes_theme__service.cc b/www/iridium/files/patch-chrome_browser_themes_theme__service.cc index e8a53dbf31b9..3e2be2cbf5f6 100644 --- a/www/iridium/files/patch-chrome_browser_themes_theme__service.cc +++ b/www/iridium/files/patch-chrome_browser_themes_theme__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/themes/theme_service.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/themes/theme_service.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/themes/theme_service.cc -@@ -74,7 +74,7 @@ +@@ -75,7 +75,7 @@ #include "extensions/browser/extension_registry_observer.h" #endif @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #include "ui/ozone/public/ozone_platform.h" #endif -@@ -330,7 +330,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier() +@@ -331,7 +331,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier() } bool ThemeService::ShouldUseCustomFrame() const { diff --git a/www/iridium/files/patch-chrome_browser_ui_actions_chrome__action__id.h b/www/iridium/files/patch-chrome_browser_ui_actions_chrome__action__id.h index f8cb10aee732..7696a2feb173 100644 --- a/www/iridium/files/patch-chrome_browser_ui_actions_chrome__action__id.h +++ b/www/iridium/files/patch-chrome_browser_ui_actions_chrome__action__id.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/actions/chrome_action_id.h.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/ui/actions/chrome_action_id.h.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/ui/actions/chrome_action_id.h -@@ -532,7 +532,7 @@ +@@ -542,7 +542,7 @@ IDC_CONTENT_CONTEXT_QUICK_ANSWERS_INLINE_ANSWER) \ E(kActionContentContextQuickAnswersInlineQuery, \ IDC_CONTENT_CONTEXT_QUICK_ANSWERS_INLINE_QUERY) diff --git a/www/iridium/files/patch-chrome_browser_ui_browser.h b/www/iridium/files/patch-chrome_browser_ui_browser.h index e54899455998..44221748edf0 100644 --- a/www/iridium/files/patch-chrome_browser_ui_browser.h +++ b/www/iridium/files/patch-chrome_browser_ui_browser.h @@ -1,7 +1,7 @@ ---- chrome/browser/ui/browser.h.orig 2023-04-22 17:45:15 UTC +--- chrome/browser/ui/browser.h.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/ui/browser.h -@@ -289,7 +289,7 @@ class Browser : public TabStripModelObserver, - int32_t restore_id = kDefaultRestoreId; +@@ -293,7 +293,7 @@ class Browser : public TabStripModelObserver, + absl::optional<int64_t> display_id; #endif -#if BUILDFLAG(IS_LINUX) diff --git a/www/iridium/files/patch-chrome_browser_ui_browser__command__controller.cc b/www/iridium/files/patch-chrome_browser_ui_browser__command__controller.cc index ae126d08e40a..a0c4b731fcc9 100644 --- a/www/iridium/files/patch-chrome_browser_ui_browser__command__controller.cc +++ b/www/iridium/files/patch-chrome_browser_ui_browser__command__controller.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/browser_command_controller.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/ui/browser_command_controller.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/ui/browser_command_controller.cc -@@ -124,7 +124,7 @@ +@@ -125,7 +125,7 @@ #include "components/user_manager/user_manager.h" #endif @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #endif -@@ -305,7 +305,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( +@@ -306,7 +306,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( #endif } @@ -18,7 +18,7 @@ // If this key was registered by the user as a content editing hotkey, then // it is not reserved. auto* linux_ui = ui::LinuxUi::instance(); -@@ -556,7 +556,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -557,7 +557,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -27,7 +27,7 @@ case IDC_MINIMIZE_WINDOW: browser_->window()->Minimize(); break; -@@ -568,7 +568,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -569,7 +569,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo break; #endif @@ -36,7 +36,7 @@ case IDC_USE_SYSTEM_TITLE_BAR: { PrefService* prefs = profile()->GetPrefs(); prefs->SetBoolean(prefs::kUseCustomChromeFrame, -@@ -1211,12 +1211,12 @@ void BrowserCommandController::InitCommandState() { +@@ -1215,12 +1215,12 @@ void BrowserCommandController::InitCommandState() { #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/iridium/files/patch-chrome_browser_ui_browser__dialogs.h b/www/iridium/files/patch-chrome_browser_ui_browser__dialogs.h new file mode 100644 index 000000000000..6271837404bf --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_ui_browser__dialogs.h @@ -0,0 +1,29 @@ +--- chrome/browser/ui/browser_dialogs.h.orig 2023-11-22 14:00:11 UTC ++++ chrome/browser/ui/browser_dialogs.h +@@ -26,7 +26,7 @@ + #include "ui/gfx/native_widget_types.h" + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + #include "chrome/browser/web_applications/web_app_callback_app_identity.h" + #include "chrome/browser/web_applications/web_app_id.h" + #include "chrome/browser/web_applications/web_app_install_info.h" +@@ -84,7 +84,7 @@ class Widget; + } // namespace views + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + namespace webapps { + class MlInstallOperationTracker; + struct Screenshot; +@@ -162,7 +162,7 @@ void ShowBluetoothDevicePairConfirmDialog( + #endif // PAIR_BLUETOOTH_ON_DEMAND() + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + // Callback used to indicate whether a user has accepted the installation of a + // web app. The boolean parameter is true when the user accepts the dialog. The + // WebAppInstallInfo parameter contains the information about the app, diff --git a/www/iridium/files/patch-chrome_browser_ui_chrome__pages.cc b/www/iridium/files/patch-chrome_browser_ui_chrome__pages.cc index a9cb9c4a58c1..6111fedee0a8 100644 --- a/www/iridium/files/patch-chrome_browser_ui_chrome__pages.cc +++ b/www/iridium/files/patch-chrome_browser_ui_chrome__pages.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/chrome_pages.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/ui/chrome_pages.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/ui/chrome_pages.cc -@@ -78,7 +78,7 @@ +@@ -79,7 +79,7 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ #include "chrome/browser/web_applications/web_app_utils.h" #endif -@@ -668,7 +668,7 @@ void ShowShortcutCustomizationApp(Profile* profile, +@@ -674,7 +674,7 @@ void ShowShortcutCustomizationApp(Profile* profile, } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-chrome_browser_ui_chrome__pages.h b/www/iridium/files/patch-chrome_browser_ui_chrome__pages.h index 80b414b0a278..94595891e5e3 100644 --- a/www/iridium/files/patch-chrome_browser_ui_chrome__pages.h +++ b/www/iridium/files/patch-chrome_browser_ui_chrome__pages.h @@ -1,4 +1,4 @@ ---- chrome/browser/ui/chrome_pages.h.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/ui/chrome_pages.h.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/ui/chrome_pages.h @@ -38,7 +38,7 @@ enum class ConsentLevel; } // namespace signin @@ -9,7 +9,7 @@ namespace web_app { enum class AppSettingsPageEntryPoint; } // namespace web_app -@@ -249,7 +249,7 @@ void ShowShortcutCustomizationApp(Profile* profile, +@@ -250,7 +250,7 @@ void ShowShortcutCustomizationApp(Profile* profile, #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-chrome_browser_ui_exclusive__access_exclusive__access__bubble.cc b/www/iridium/files/patch-chrome_browser_ui_exclusive__access_exclusive__access__bubble.cc index fc3afd99d16b..253b89303686 100644 --- a/www/iridium/files/patch-chrome_browser_ui_exclusive__access_exclusive__access__bubble.cc +++ b/www/iridium/files/patch-chrome_browser_ui_exclusive__access_exclusive__access__bubble.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc -@@ -16,7 +16,7 @@ +@@ -19,7 +19,7 @@ // NOTE(koz): Linux doesn't use the thick shadowed border, so we add padding // here. diff --git a/www/iridium/files/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc b/www/iridium/files/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc index 2dd1bbb7352f..be0f9447fc1f 100644 --- a/www/iridium/files/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc +++ b/www/iridium/files/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc -@@ -1961,7 +1961,7 @@ const gfx::VectorIcon& GetSharingHubVectorIcon() { +@@ -1981,7 +1981,7 @@ const gfx::VectorIcon& GetSharingHubVectorIcon() { OmniboxFieldTrial::IsChromeRefreshActionChipIconsEnabled() ? omnibox::kShareWinChromeRefreshIcon : omnibox::kShareWinIcon; diff --git a/www/iridium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc b/www/iridium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc index 8bf950da56b2..32a843e2deb7 100644 --- a/www/iridium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc +++ b/www/iridium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/ui/startup/bad_flags_prompt.cc -@@ -100,7 +100,7 @@ const char* const kBadFlags[] = { +@@ -104,7 +104,7 @@ const char* const kBadFlags[] = { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/iridium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc b/www/iridium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc index 8532d8b9dd0f..a1953c67cc87 100644 --- a/www/iridium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc +++ b/www/iridium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/ui/startup/startup_browser_creator.cc @@ -133,7 +133,7 @@ #include "chrome/credential_provider/common/gcp_strings.h" @@ -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" -@@ -921,7 +921,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -925,7 +925,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())) { -@@ -1025,7 +1025,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -1029,7 +1029,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) && -@@ -1238,7 +1238,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -1242,7 +1242,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/iridium/files/patch-chrome_browser_ui_tab__helpers.cc b/www/iridium/files/patch-chrome_browser_ui_tab__helpers.cc index 739330f4a51e..8ab34d05ae69 100644 --- a/www/iridium/files/patch-chrome_browser_ui_tab__helpers.cc +++ b/www/iridium/files/patch-chrome_browser_ui_tab__helpers.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/tab_helpers.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/ui/tab_helpers.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/ui/tab_helpers.cc -@@ -221,7 +221,7 @@ +@@ -224,7 +224,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" -@@ -610,12 +610,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con +@@ -629,12 +629,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ diff --git a/www/iridium/files/patch-chrome_browser_ui_ui__features.cc b/www/iridium/files/patch-chrome_browser_ui_ui__features.cc index 34dd5fd2077b..651b8f362d92 100644 --- a/www/iridium/files/patch-chrome_browser_ui_ui__features.cc +++ b/www/iridium/files/patch-chrome_browser_ui_ui__features.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/ui_features.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/ui/ui_features.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/ui/ui_features.cc -@@ -306,7 +306,7 @@ BASE_FEATURE(kTopChromeWebUIUsesSpareRenderer, +@@ -311,7 +311,7 @@ BASE_FEATURE(kTopChromeWebUIUsesSpareRenderer, "TopChromeWebUIUsesSpareRenderer", base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/www/iridium/files/patch-chrome_browser_ui_ui__features.h b/www/iridium/files/patch-chrome_browser_ui_ui__features.h index eb058cb18b4e..131b0b76ff12 100644 --- a/www/iridium/files/patch-chrome_browser_ui_ui__features.h +++ b/www/iridium/files/patch-chrome_browser_ui_ui__features.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/ui_features.h.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/ui/ui_features.h.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/ui/ui_features.h -@@ -194,7 +194,7 @@ BASE_DECLARE_FEATURE(kToolbarUseHardwareBitmapDraw); +@@ -195,7 +195,7 @@ BASE_DECLARE_FEATURE(kToolbarUseHardwareBitmapDraw); BASE_DECLARE_FEATURE(kTopChromeWebUIUsesSpareRenderer); diff --git a/www/iridium/files/patch-chrome_browser_ui_views_accelerator__table.cc b/www/iridium/files/patch-chrome_browser_ui_views_accelerator__table.cc index 738586002392..8f09ce1ec46f 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_accelerator__table.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_accelerator__table.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/accelerator_table.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/ui/views/accelerator_table.cc.orig 2023-11-22 14:00:11 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}, -@@ -149,7 +149,7 @@ const AcceleratorMapping kAcceleratorMap[] = { +@@ -154,7 +154,7 @@ const AcceleratorMapping kAcceleratorMap[] = { IDC_SHOW_AVATAR_MENU}, // Platform-specific key maps. @@ -32,7 +32,7 @@ {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}, -@@ -244,7 +244,7 @@ const AcceleratorMapping kAcceleratorMap[] = { +@@ -249,7 +249,7 @@ const AcceleratorMapping kAcceleratorMap[] = { #endif // !BUILDFLAG(IS_CHROMEOS) #endif // !BUILDFLAG(IS_MAC) #if BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) && \ diff --git a/www/iridium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc b/www/iridium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc index 837e4543ce77..c1b7b57a67a5 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc @@ -1,20 +1,20 @@ ---- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc -@@ -41,7 +41,7 @@ +@@ -39,7 +39,7 @@ + #include "ui/wm/core/wm_state.h" + #endif // defined(USE_AURA) - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include <sys/stat.h> #include <sys/types.h> #include <unistd.h> -@@ -136,7 +136,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( +@@ -132,7 +132,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( + return controller; + })); - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // On the Linux desktop, we want to prevent the user from logging in as root, // so that we don't destroy the profile. Now that we have some minimal ui // initialized, check to see if we're running as root and bail if we are. diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__view.cc b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__view.cc index e84fe103c534..f5b25602c5dd 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__view.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__view.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/browser_view.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/ui/views/frame/browser_view.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/ui/views/frame/browser_view.cc -@@ -2106,7 +2106,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra +@@ -2134,7 +2134,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra // CrOS cleanup is done. // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc b/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc index fd8809d42e14..121f98cdffe1 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc @@ -54,7 +54,7 @@ #include "ui/views/window/vector_icons/vector_icons.h" @@ -9,7 +9,7 @@ #include "ui/views/controls/menu/menu_runner.h" #endif -@@ -568,7 +568,7 @@ OpaqueBrowserFrameView::FrameButtonStyle +@@ -566,7 +566,7 @@ OpaqueBrowserFrameView::FrameButtonStyle OpaqueBrowserFrameView::GetFrameButtonStyle() const { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -18,7 +18,7 @@ return FrameButtonStyle::kMdButton; #else return FrameButtonStyle::kImageButton; -@@ -591,7 +591,7 @@ bool OpaqueBrowserFrameView::ShouldDrawRestoredFrameSh +@@ -589,7 +589,7 @@ bool OpaqueBrowserFrameView::ShouldDrawRestoredFrameSh return false; } @@ -27,7 +27,7 @@ ui::WindowTiledEdges OpaqueBrowserFrameView::GetTiledEdges() const { return frame()->tiled_edges(); } -@@ -789,7 +789,7 @@ gfx::Rect OpaqueBrowserFrameView::GetIconBounds() cons +@@ -787,7 +787,7 @@ gfx::Rect OpaqueBrowserFrameView::GetIconBounds() cons } void OpaqueBrowserFrameView::WindowIconPressed() { diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h b/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h index 170678fff38f..00f287e16cb8 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h +++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view.h.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/ui/views/frame/opaque_browser_frame_view.h.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/ui/views/frame/opaque_browser_frame_view.h -@@ -116,7 +116,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient +@@ -115,7 +115,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient const gfx::Rect& bounding_rect) const override; bool IsTranslucentWindowOpacitySupported() const override; bool ShouldDrawRestoredFrameShadow() const override; @@ -9,7 +9,7 @@ ui::WindowTiledEdges GetTiledEdges() const override; #endif int WebAppButtonHeight() const override; -@@ -233,7 +233,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient +@@ -232,7 +232,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient // Background painter for the window frame. std::unique_ptr<views::FrameBackground> frame_background_; diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc b/www/iridium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc index 97a59458c327..954f3c3d7a58 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc +++ b/www/iridium/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 2023-10-21 11:51:27 UTC +--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc -@@ -53,7 +53,7 @@ +@@ -55,7 +55,7 @@ #include "ui/aura/window.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/ui/views/frame/browser_frame_view_paint_utils_linux.h" #include "chrome/browser/ui/views/frame/desktop_browser_frame_aura_linux.h" #endif -@@ -80,7 +80,7 @@ constexpr int kBackToTabImageSize = 16; +@@ -82,7 +82,7 @@ constexpr int kBackToTabImageSize = 16; // The height of the controls bar at the top of the window. constexpr int kTopControlsHeight = 30; @@ -18,7 +18,7 @@ // Frame border when window shadow is not drawn. constexpr int kFrameBorderThickness = 4; #endif -@@ -175,7 +175,7 @@ class WindowEventObserver : public ui::EventObserver { +@@ -177,7 +177,7 @@ class WindowEventObserver : public ui::EventObserver { gfx::Rect input_bounds = pip_browser_frame_view_->GetLocalBounds(); @@ -27,16 +27,16 @@ // 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()) { -@@ -534,7 +534,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow +@@ -558,7 +558,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow + AddChildView(std::move(auto_pip_setting_overlay)); } - #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) frame_background_ = std::make_unique<views::FrameBackground>(); #endif -@@ -709,7 +709,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged( +@@ -734,7 +734,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))); -@@ -772,7 +772,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg +@@ -803,7 +803,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg BrowserNonClientFrameView::RemovedFromWidget(); } @@ -54,7 +54,7 @@ gfx::Insets PictureInPictureBrowserFrameView::MirroredFrameBorderInsets() const { auto border = FrameBorderInsets(); -@@ -1016,7 +1016,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre +@@ -1052,7 +1052,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_) { -@@ -1140,7 +1140,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie +@@ -1176,7 +1176,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 auto tiled_edges = frame()->tiled_edges(); -@@ -1161,7 +1161,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor +@@ -1197,7 +1197,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor } gfx::Insets PictureInPictureBrowserFrameView::ResizeBorderInsets() const { @@ -81,7 +81,7 @@ return FrameBorderInsets(); #elif BUILDFLAG(IS_CHROMEOS_ASH) return gfx::Insets(chromeos::kResizeInsideBoundsSize); -@@ -1182,7 +1182,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie +@@ -1218,7 +1218,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie top_height + border_thickness.bottom()); } diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h b/www/iridium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h index ee8188477f32..77324fd70bbc 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h +++ b/www/iridium/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 2023-10-21 11:51:27 UTC +--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h @@ -24,7 +24,7 @@ #include "ui/views/controls/image_view.h" @@ -27,7 +27,7 @@ gfx::Insets MirroredFrameBorderInsets() const override; gfx::Insets GetInputInsets() const override; SkRRect GetRestoredClipRegion() const override; -@@ -186,7 +186,7 @@ class PictureInPictureBrowserFrameView +@@ -188,7 +188,7 @@ class PictureInPictureBrowserFrameView // Called when mouse entered or exited the pip window. void OnMouseEnteredOrExitedWindow(bool entered); @@ -36,7 +36,7 @@ // Sets the window frame provider so that it will be used for drawing. void SetWindowFrameProvider(ui::WindowFrameProvider* window_frame_provider); -@@ -349,7 +349,7 @@ class PictureInPictureBrowserFrameView +@@ -355,7 +355,7 @@ class PictureInPictureBrowserFrameView // `top_bar_color_animation_`. absl::optional<SkColor> current_foreground_color_; diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_tab__strip__region__view.cc b/www/iridium/files/patch-chrome_browser_ui_views_frame_tab__strip__region__view.cc index 15d5ab7b9733..6f705547548e 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_frame_tab__strip__region__view.cc +++ b/www/iridium/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 2023-10-21 11:51:27 UTC +--- chrome/browser/ui/views/frame/tab_strip_region_view.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/ui/views/frame/tab_strip_region_view.cc -@@ -170,7 +170,7 @@ TabStripRegionView::TabStripRegionView(std::unique_ptr +@@ -195,7 +195,7 @@ TabStripRegionView::TabStripRegionView(std::unique_ptr // TODO(crbug.com/1052397): Revisit the macro expression once build flag // switch of lacros-chrome is complete. diff --git a/www/iridium/files/patch-chrome_browser_ui_views_profiles_dice__web__signin__interception__backdrop__layer.cc b/www/iridium/files/patch-chrome_browser_ui_views_profiles_dice__web__signin__interception__backdrop__layer.cc new file mode 100644 index 000000000000..5123e4bec054 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_ui_views_profiles_dice__web__signin__interception__backdrop__layer.cc @@ -0,0 +1,11 @@ +--- chrome/browser/ui/views/profiles/dice_web_signin_interception_backdrop_layer.cc.orig 2023-11-22 14:00:11 UTC ++++ chrome/browser/ui/views/profiles/dice_web_signin_interception_backdrop_layer.cc +@@ -89,7 +89,7 @@ void DiceWebSigninInterceptionBackdropLayer::DrawDarkB + // The dark layer should be drawn on top of this region, but it's not easily + // accessible in code, and requires specific implementations. + // After the 2023 refresh, this drag area no longer exists. +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // On linux, the drag area is accessible through the + // `MirroredFrameBorderInsets()` function, which crashes on non-Linux + // platforms. diff --git a/www/iridium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc b/www/iridium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc index 63d332dee4d9..7447ff45c171 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc +++ b/www/iridium/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 2023-10-21 11:51:27 UTC +--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc -@@ -53,7 +53,7 @@ namespace { +@@ -56,7 +56,7 @@ namespace { const int kModalDialogWidth = 448; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ const int kEnterpriseConfirmationDialogWidth = 512; const int kEnterpriseConfirmationDialogHeight = 576; #endif -@@ -179,7 +179,7 @@ SigninViewControllerDelegateViews::CreateProfileCustom +@@ -182,7 +182,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,25 @@ // static std::unique_ptr<views::WebView> SigninViewControllerDelegateViews::CreateEnterpriseConfirmationWebView( -@@ -454,7 +454,7 @@ SigninViewControllerDelegate::CreateProfileCustomizati +@@ -327,7 +327,7 @@ SigninViewControllerDelegateViews::SigninViewControlle + SetButtons(ui::DIALOG_BUTTON_NONE); + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS_LACROS) ++ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + // 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) { +@@ -417,7 +417,7 @@ void SigninViewControllerDelegateViews::DisplayModal() + } + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS_LACROS) ++ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + void SigninViewControllerDelegateViews::DeleteProfileOnCancel() { + ProfileAttributesEntry* entry = + g_browser_process->profile_manager() +@@ -490,7 +490,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/iridium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h b/www/iridium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h index 148a759d0545..1c6b0f39b4db 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h +++ b/www/iridium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h @@ -73,7 +73,7 @@ class SigninViewControllerDelegateViews #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS) @@ -9,3 +9,12 @@ static std::unique_ptr<views::WebView> CreateEnterpriseConfirmationWebView( Browser* browser, const AccountInfo& account_info, +@@ -137,7 +137,7 @@ class SigninViewControllerDelegateViews + InitializeSigninWebDialogUI initialize_signin_web_dialog_ui); + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS_LACROS) ++ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + // Deletes the ephemeral profile when cancelling the local profile creation + // dialog. + void DeleteProfileOnCancel(); diff --git a/www/iridium/files/patch-chrome_browser_ui_views_tab__search__bubble__host.cc b/www/iridium/files/patch-chrome_browser_ui_views_tab__search__bubble__host.cc index 652457d0847c..6800c0b43760 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_tab__search__bubble__host.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_tab__search__bubble__host.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/tab_search_bubble_host.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/ui/views/tab_search_bubble_host.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/ui/views/tab_search_bubble_host.cc -@@ -184,7 +184,7 @@ bool TabSearchBubbleHost::ShouldTabSearchRenderBeforeT +@@ -186,7 +186,7 @@ bool TabSearchBubbleHost::ShouldTabSearchRenderBeforeT // Mac should have tabsearch on the right side. Windows >= Win10 has the // Tab Search button as a FrameCaptionButton, but it still needs to be on the // left if it exists. diff --git a/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab.cc b/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab.cc index ce37f5153af5..9ee1664634d3 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/tabs/tab.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/ui/views/tabs/tab.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/ui/views/tabs/tab.cc -@@ -605,7 +605,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& +@@ -610,7 +610,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& if (mouse_hovered_ || !GetWidget()->IsMouseEventsEnabled()) return; diff --git a/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc b/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc index b1928d9b162b..ac27b2d109f5 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc +++ b/www/iridium/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 2023-10-21 11:51:27 UTC +--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/ui/views/tabs/tab_drag_controller.cc -@@ -89,7 +89,7 @@ +@@ -91,7 +91,7 @@ #include "components/remote_cocoa/browser/window.h" #endif @@ -9,7 +9,7 @@ #include "ui/aura/client/drag_drop_client.h" #endif -@@ -206,7 +206,7 @@ bool IsWindowDragUsingSystemDragDropAllowed() { +@@ -208,7 +208,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)) { -@@ -386,7 +386,7 @@ void TabDragController::Init(TabDragContext* source_co +@@ -388,7 +388,7 @@ void TabDragController::Init(TabDragContext* source_co // synchronous on desktop Linux, so use that. // - ChromeOS Ash // Releasing capture on Ash cancels gestures so avoid it. @@ -27,7 +27,7 @@ can_release_capture_ = false; #endif start_point_in_screen_ = gfx::Point(source_view_offset, mouse_offset.y()); -@@ -1011,7 +1011,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon +@@ -1013,7 +1013,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon // TODO(crbug.com/1052397): 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. -@@ -2051,7 +2051,7 @@ void TabDragController::CompleteDrag() { +@@ -2053,7 +2053,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 -@@ -2465,7 +2465,7 @@ TabDragController::Liveness TabDragController::GetLoca +@@ -2485,7 +2485,7 @@ TabDragController::Liveness TabDragController::GetLoca } // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/iridium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc b/www/iridium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc index c99a3552d39d..5a018557cd44 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc @@ -464,7 +464,7 @@ std::string GetFileExtension(FileExtension file_extens } @@ -9,7 +9,7 @@ SiteConfig GetSiteConfigurationFromAppName(const std::string& app_name) { SiteConfig config; bool is_app_found = false; -@@ -1933,7 +1933,7 @@ void WebAppIntegrationTestDriver::DeletePlatformShortc +@@ -1936,7 +1936,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( -@@ -3249,7 +3249,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginEna +@@ -3253,7 +3253,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 -@@ -3264,7 +3264,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis +@@ -3268,7 +3268,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 -@@ -3274,7 +3274,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis +@@ -3278,7 +3278,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis void WebAppIntegrationTestDriver::CheckSiteHandlesFile( Site site, FileExtension file_extension) { @@ -45,7 +45,7 @@ if (!BeforeStateCheckAction(__FUNCTION__)) { return; } -@@ -3290,7 +3290,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile +@@ -3294,7 +3294,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile void WebAppIntegrationTestDriver::CheckSiteNotHandlesFile( Site site, FileExtension file_extension) { @@ -54,17 +54,17 @@ if (!BeforeStateCheckAction(__FUNCTION__)) { return; } -@@ -4073,7 +4073,7 @@ base::FilePath WebAppIntegrationTestDriver::GetShortcu +@@ -4079,7 +4079,7 @@ base::FilePath WebAppIntegrationTestDriver::GetShortcu base::FilePath shortcut_dir, const std::string& app_name, - const AppId& app_id) { + const webapps::AppId& app_id) { -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) return override_registration_->test_override->GetShortcutPath( profile(), shortcut_dir, app_id, app_name); #else -@@ -4260,7 +4260,7 @@ bool WebAppIntegrationTestDriver::IsShortcutAndIconCre - const AppId& id) { +@@ -4273,7 +4273,7 @@ bool WebAppIntegrationTestDriver::IsShortcutAndIconCre + const webapps::AppId& id) { base::ScopedAllowBlockingForTesting allow_blocking; bool is_shortcut_and_icon_correct = false; -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) @@ -72,7 +72,7 @@ bool is_shortcut_correct = override_registration_->test_override->IsShortcutCreated(profile, id, name); -@@ -4304,7 +4304,7 @@ bool WebAppIntegrationTestDriver::DoIconColorsMatch(Pr +@@ -4317,7 +4317,7 @@ bool WebAppIntegrationTestDriver::DoIconColorsMatch(Pr do_icon_colors_match = (expected_icon_pixel_color == shortcut_pixel_color_apps_folder.value()); } diff --git a/www/iridium/files/patch-chrome_browser_ui_webauthn_sheet__models.cc b/www/iridium/files/patch-chrome_browser_ui_webauthn_sheet__models.cc deleted file mode 100644 index d66a8d3e360d..000000000000 --- a/www/iridium/files/patch-chrome_browser_ui_webauthn_sheet__models.cc +++ /dev/null @@ -1,14 +0,0 @@ ---- chrome/browser/ui/webauthn/sheet_models.cc.orig 2023-10-21 11:51:27 UTC -+++ chrome/browser/ui/webauthn/sheet_models.cc -@@ -1499,7 +1499,11 @@ AuthenticatorMultiSourcePickerSheetModel:: - using ICloudKeychainMech = - AuthenticatorRequestDialogModel::Mechanism::ICloudKeychain; - bool has_local_passkeys = -+#if (_LIBCPP_VERSION >= 160000) - std::ranges::any_of(dialog_model->mechanisms(), [](const auto& mech) { -+#else -+ base::ranges::any_of(dialog_model->mechanisms(), [](const auto& mech) { -+#endif - return absl::holds_alternative<CredentialMech>(mech.type) && - absl::get<CredentialMech>(mech.type).value().source != - device::AuthenticatorType::kPhone; diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc b/www/iridium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc index 8aa059d8f799..a9b803fe0c15 100644 --- a/www/iridium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc +++ b/www/iridium/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 2023-10-21 11:51:27 UTC +--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -210,7 +210,7 @@ +@@ -212,7 +212,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 -@@ -236,17 +236,17 @@ +@@ -238,17 +238,17 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -30,7 +30,7 @@ #include "chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.h" #endif -@@ -399,7 +399,7 @@ bool IsAboutUI(const GURL& url) { +@@ -401,7 +401,7 @@ bool IsAboutUI(const GURL& url) { #if !BUILDFLAG(IS_ANDROID) || url.host_piece() == chrome::kChromeUITermsHost #endif @@ -48,7 +48,7 @@ if (url.host_piece() == chrome::kChromeUIWebUIJsErrorHost) return &NewWebUI<WebUIJsErrorUI>; #endif -@@ -722,7 +722,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -723,7 +723,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we if (url.host_piece() == chrome::kChromeUINaClHost) return &NewWebUI<NaClUI>; #endif @@ -57,7 +57,7 @@ defined(TOOLKIT_VIEWS)) || \ defined(USE_AURA) if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost) -@@ -789,27 +789,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -794,27 +794,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we } #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_connectors__internals_device__trust__utils.cc b/www/iridium/files/patch-chrome_browser_ui_webui_connectors__internals_device__trust__utils.cc index 9ddbc07fac8e..642fe523303e 100644 --- a/www/iridium/files/patch-chrome_browser_ui_webui_connectors__internals_device__trust__utils.cc +++ b/www/iridium/files/patch-chrome_browser_ui_webui_connectors__internals_device__trust__utils.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/webui/connectors_internals/device_trust_utils.cc.orig 2023-03-13 07:33:08 UTC +--- chrome/browser/ui/webui/connectors_internals/device_trust_utils.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/ui/webui/connectors_internals/device_trust_utils.cc @@ -6,7 +6,7 @@ @@ -9,7 +9,7 @@ #include "base/base64url.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/policy/chrome_browser_policy_connector.h" -@@ -24,7 +24,7 @@ namespace utils { +@@ -29,7 +29,7 @@ namespace utils { namespace { @@ -18,7 +18,7 @@ connectors_internals::mojom::KeyTrustLevel ParseTrustLevel( BPKUR::KeyTrustLevel trust_level) { -@@ -92,7 +92,7 @@ connectors_internals::mojom::Int32ValuePtr ToMojomValu +@@ -97,7 +97,7 @@ connectors_internals::mojom::Int32ValuePtr ToMojomValu } // namespace connectors_internals::mojom::KeyInfoPtr GetKeyInfo() { diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc b/www/iridium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc index 85ce60267106..dc995b960b95 100644 --- a/www/iridium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc +++ b/www/iridium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/ntp/app_launcher_handler.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/ui/webui/ntp/app_launcher_handler.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/ui/webui/ntp/app_launcher_handler.cc -@@ -320,7 +320,7 @@ base::Value::Dict AppLauncherHandler::CreateExtensionI +@@ -312,7 +312,7 @@ base::Value::Dict AppLauncherHandler::CreateExtensionI bool is_deprecated_app = false; auto* context = extension_service_->GetBrowserContext(); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc b/www/iridium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc index e64b2268290e..589aeec7d1f4 100644 --- a/www/iridium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc +++ b/www/iridium/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 2023-10-21 11:51:27 UTC +--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -135,7 +135,7 @@ +@@ -137,7 +137,7 @@ #include "ash/webui/settings/public/constants/routes.mojom.h" #endif @@ -9,7 +9,7 @@ #include "ui/display/screen.h" #endif -@@ -155,7 +155,7 @@ +@@ -156,7 +156,7 @@ #include "chrome/browser/ui/webui/certificate_manager_localized_strings_provider.h" #endif @@ -18,7 +18,7 @@ #include "ui/linux/linux_ui_factory.h" #include "ui/ozone/public/ozone_platform.h" #endif -@@ -263,7 +263,7 @@ void AddCommonStrings(content::WebUIDataSource* html_s +@@ -264,7 +264,7 @@ void AddCommonStrings(content::WebUIDataSource* html_s base::FeatureList::IsEnabled( supervised_user::kClearingCookiesKeepsSupervisedUsersSignedIn)); @@ -27,7 +27,7 @@ bool allow_qt_theme = base::FeatureList::IsEnabled(ui::kAllowQt); #else bool allow_qt_theme = false; -@@ -294,7 +294,7 @@ void AddA11yStrings(content::WebUIDataSource* html_sou +@@ -295,7 +295,7 @@ void AddA11yStrings(content::WebUIDataSource* html_sou {"focusHighlightLabel", IDS_SETTINGS_ACCESSIBILITY_FOCUS_HIGHLIGHT_DESCRIPTION}, #endif @@ -36,7 +36,7 @@ {"overscrollHistoryNavigationTitle", IDS_SETTINGS_OVERSCROLL_HISTORY_NAVIGATION_TITLE}, {"overscrollHistoryNavigationSubtitle", -@@ -433,7 +433,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -434,7 +434,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht {"huge", IDS_SETTINGS_HUGE_FONT_SIZE}, {"sidePanelAlignLeft", IDS_SETTINGS_SIDE_PANEL_ALIGN_LEFT}, {"sidePanelAlignRight", IDS_SETTINGS_SIDE_PANEL_ALIGN_RIGHT}, @@ -45,7 +45,7 @@ {"gtkTheme", IDS_SETTINGS_GTK_THEME}, {"useGtkTheme", IDS_SETTINGS_USE_GTK_THEME}, {"qtTheme", IDS_SETTINGS_QT_THEME}, -@@ -443,7 +443,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -444,7 +444,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht #else {"resetToDefaultTheme", IDS_SETTINGS_RESET_TO_DEFAULT_THEME}, #endif @@ -54,7 +54,7 @@ {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS}, #endif #if BUILDFLAG(IS_MAC) -@@ -468,7 +468,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -469,7 +469,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/iridium/files/patch-chrome_browser_web__applications_os__integration_os__integration__test__override.h b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_os__integration__test__override.h index 19f84c86e750..e9427db4ee73 100644 --- a/www/iridium/files/patch-chrome_browser_web__applications_os__integration_os__integration__test__override.h +++ b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_os__integration__test__override.h @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/os_integration/os_integration_test_override.h.orig 2023-07-24 14:27:53 UTC +--- chrome/browser/web_applications/os_integration/os_integration_test_override.h.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/web_applications/os_integration/os_integration_test_override.h -@@ -92,7 +92,7 @@ class OsIntegrationTestOverride +@@ -93,7 +93,7 @@ class OsIntegrationTestOverride virtual const base::FilePath& chrome_apps_folder() = 0; virtual void EnableOrDisablePathOnLogin(const base::FilePath& file_path, bool enable_on_login) = 0; diff --git a/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__file__handler__registration.h b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__file__handler__registration.h index 98610a45534c..24656b97aa94 100644 --- a/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__file__handler__registration.h +++ b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__file__handler__registration.h @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/os_integration/web_app_file_handler_registration.h.orig 2023-07-24 14:27:53 UTC +--- chrome/browser/web_applications/os_integration/web_app_file_handler_registration.h.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/web_applications/os_integration/web_app_file_handler_registration.h -@@ -43,7 +43,7 @@ void UnregisterFileHandlersWithOs(const AppId& app_id, +@@ -44,7 +44,7 @@ void UnregisterFileHandlersWithOs(const webapps::AppId const base::FilePath& profile_path, ResultCallback callback); diff --git a/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h index ef3e2fd341ba..acf37c0c37ad 100644 --- a/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h +++ b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/os_integration/web_app_shortcut.h.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/web_applications/os_integration/web_app_shortcut.h.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/web_applications/os_integration/web_app_shortcut.h -@@ -21,7 +21,7 @@ +@@ -22,7 +22,7 @@ #include "ui/gfx/image/image_family.h" #include "url/gurl.h" @@ -9,7 +9,7 @@ #include "chrome/browser/web_applications/os_integration/web_app_shortcut_linux.h" #endif // BUILDFLAG(IS_LINUX) -@@ -70,7 +70,7 @@ struct ShortcutInfo { +@@ -71,7 +71,7 @@ struct ShortcutInfo { std::set<std::string> file_handler_extensions; std::set<std::string> file_handler_mime_types; std::set<std::string> protocol_handlers; diff --git a/www/iridium/files/patch-chrome_browser_web__applications_policy_web__app__policy__manager.cc b/www/iridium/files/patch-chrome_browser_web__applications_policy_web__app__policy__manager.cc index 60625d830c23..677c485af02b 100644 --- a/www/iridium/files/patch-chrome_browser_web__applications_policy_web__app__policy__manager.cc +++ b/www/iridium/files/patch-chrome_browser_web__applications_policy_web__app__policy__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/policy/web_app_policy_manager.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/web_applications/policy/web_app_policy_manager.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/web_applications/policy/web_app_policy_manager.cc -@@ -117,7 +117,7 @@ namespace web_app { +@@ -128,7 +128,7 @@ namespace web_app { BASE_FEATURE(kDesktopPWAsForceUnregisterOSIntegration, "DesktopPWAsForceUnregisterOSIntegration", diff --git a/www/iridium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc b/www/iridium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc index 233810c45c64..dcc332a7b54a 100644 --- a/www/iridium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc +++ b/www/iridium/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 2023-10-21 11:51:27 UTC +--- chrome/browser/web_applications/test/os_integration_test_override_impl.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/web_applications/test/os_integration_test_override_impl.cc @@ -127,7 +127,7 @@ std::vector<std::wstring> GetFileExtensionsForProgId( } @@ -8,7 +8,7 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Performs a blocking read of app icons from the disk. SkColor IconManagerReadIconTopLeftColorForSize(WebAppIconManager& icon_manager, - const AppId& app_id, + const webapps::AppId& app_id, @@ -224,7 +224,7 @@ bool OsIntegrationTestOverrideImpl::SimulateDeleteShor GetShortcutPath(profile, chrome_apps_folder(), app_id, app_name); CHECK(base::PathExists(app_folder_shortcut_path)); @@ -29,7 +29,7 @@ return desktop_.Delete(); @@ -278,7 +278,7 @@ bool OsIntegrationTestOverrideImpl::IsRunOnOsLoginEnab Profile* profile, - const AppId& app_id, + const webapps::AppId& app_id, const std::string& app_name) { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/iridium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.h b/www/iridium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.h index f2c9f24c933a..a7842d0812c4 100644 --- a/www/iridium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.h +++ b/www/iridium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.h @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/test/os_integration_test_override_impl.h.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/web_applications/test/os_integration_test_override_impl.h.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/web_applications/test/os_integration_test_override_impl.h -@@ -38,7 +38,7 @@ class ShellLinkItem; +@@ -39,7 +39,7 @@ class ShellLinkItem; namespace web_app { @@ -9,7 +9,7 @@ struct LinuxFileRegistration { base::FilePath file_name; std::string xdg_command; -@@ -112,7 +112,7 @@ class OsIntegrationTestOverrideImpl : public OsIntegra +@@ -113,7 +113,7 @@ class OsIntegrationTestOverrideImpl : public OsIntegra bool DeleteApplicationMenuDirOnWin(); #endif // BUILDFLAG(IS_WIN) @@ -18,7 +18,7 @@ bool DeleteDesktopDirOnLinux(); #endif // BUILDFLAG(IS_LINUX) -@@ -231,7 +231,7 @@ class OsIntegrationTestOverrideImpl : public OsIntegra +@@ -232,7 +232,7 @@ class OsIntegrationTestOverrideImpl : public OsIntegra const base::FilePath& chrome_apps_folder() override; void EnableOrDisablePathOnLogin(const base::FilePath& file_path, bool enable_on_login) override; @@ -27,7 +27,7 @@ const base::FilePath& desktop() override; const base::FilePath& startup() override; const base::FilePath& applications_dir() override; -@@ -278,7 +278,7 @@ class OsIntegrationTestOverrideImpl : public OsIntegra +@@ -279,7 +279,7 @@ class OsIntegrationTestOverrideImpl : public OsIntegra base::ScopedTempDir chrome_apps_folder_; std::map<base::FilePath, bool> startup_enabled_; diff --git a/www/iridium/files/patch-chrome_browser_web__applications_web__app__install__info.h b/www/iridium/files/patch-chrome_browser_web__applications_web__app__install__info.h new file mode 100644 index 000000000000..430c1e54660b --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_web__applications_web__app__install__info.h @@ -0,0 +1,11 @@ +--- chrome/browser/web_applications/web_app_install_info.h.orig 2023-11-22 14:00:11 UTC ++++ chrome/browser/web_applications/web_app_install_info.h +@@ -36,7 +36,7 @@ + #include "url/gurl.h" + + static_assert(BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)); ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)); + + class SkBitmap; + diff --git a/www/iridium/files/patch-chrome_browser_webauthn_authenticator__request__dialog__model.cc b/www/iridium/files/patch-chrome_browser_webauthn_authenticator__request__dialog__model.cc deleted file mode 100644 index 0a845e8104a6..000000000000 --- a/www/iridium/files/patch-chrome_browser_webauthn_authenticator__request__dialog__model.cc +++ /dev/null @@ -1,14 +0,0 @@ ---- chrome/browser/webauthn/authenticator_request_dialog_model.cc.orig 2023-10-21 11:51:27 UTC -+++ chrome/browser/webauthn/authenticator_request_dialog_model.cc -@@ -495,7 +495,11 @@ void AuthenticatorRequestDialogModel:: - // extra step. Jump to Windows instead. - if (base::FeatureList::IsEnabled(device::kWebAuthnNewPasskeyUI) && - transport_availability_.has_win_native_api_authenticator && -+#if (_LIBCPP_VERSION >= 160000) - std::ranges::all_of(mechanisms_, [](const auto& mech) { -+#else -+ base::ranges::all_of(mechanisms_, [](const auto& mech) { -+#endif - return absl::holds_alternative<Mechanism::WindowsAPI>(mech.type) || - (absl::holds_alternative<Mechanism::Credential>(mech.type) && - absl::get<Mechanism::Credential>(mech.type).value().source == diff --git a/www/iridium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc b/www/iridium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc index eae865e09251..3bec769366dd 100644 --- a/www/iridium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc +++ b/www/iridium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/browser/webauthn/chrome_authenticator_request_delegate.cc -@@ -670,7 +670,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureDisc +@@ -672,7 +672,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureDisc g_observer->ConfiguringCable(request_type); } @@ -9,15 +9,12 @@ // No caBLEv1 on Linux. It tends to crash bluez. if (base::Contains(pairings_from_extension, device::CableDiscoveryData::Version::V1, -@@ -886,7 +886,11 @@ void ChromeAuthenticatorRequestDelegate::OnTransportAv - if (data.has_platform_authenticator_credential == - device::FidoRequestHandlerBase::RecognizedCredential:: - kHasRecognizedCredential && -+#if (_LIBCPP_VERSION >= 160000) - std::ranges::none_of(data.recognized_credentials, -+#else -+ base::ranges::none_of(data.recognized_credentials, -+#endif - IsCredentialFromPlatformAuthenticator)) { - data.has_platform_authenticator_credential = device:: - FidoRequestHandlerBase::RecognizedCredential::kNoRecognizedCredential; +@@ -879,7 +879,7 @@ void ChromeAuthenticatorRequestDelegate::OnTransportAv + device::FidoRequestHandlerBase::TransportAvailabilityInfo data) { + if (base::FeatureList::IsEnabled(device::kWebAuthnFilterGooglePasskeys) && + dialog_model()->relying_party_id() == kGoogleRpId && +- std::ranges::any_of(data.recognized_credentials, ++ base::ranges::any_of(data.recognized_credentials, + IsCredentialFromPlatformAuthenticator)) { + // Regrettably, Chrome will create webauthn credentials for things other + // than authentication (e.g. credit card autofill auth) under the rp id diff --git a/www/iridium/files/patch-chrome_common_chrome__features.cc b/www/iridium/files/patch-chrome_common_chrome__features.cc index 348bc436e309..10767f148f4c 100644 --- a/www/iridium/files/patch-chrome_common_chrome__features.cc +++ b/www/iridium/files/patch-chrome_common_chrome__features.cc @@ -1,4 +1,4 @@ ---- chrome/common/chrome_features.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/common/chrome_features.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/common/chrome_features.cc @@ -76,7 +76,7 @@ BASE_FEATURE(kAppShimNotificationAttribution, BASE_FEATURE(kAsyncDns, @@ -27,16 +27,16 @@ // 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. -@@ -297,7 +297,7 @@ BASE_FEATURE(kDesktopPWAsEnforceWebAppSettingsPolicy, - // Enables or disables Desktop PWAs to be auto-started on OS login. +@@ -304,7 +304,7 @@ BASE_FEATURE(kDesktopPWAsEnforceWebAppSettingsPolicy, BASE_FEATURE(kDesktopPWAsRunOnOsLogin, "DesktopPWAsRunOnOsLogin", --#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) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -326,7 +326,7 @@ BASE_FEATURE(kDesktopPWAsWebBundles, +@@ -338,7 +338,7 @@ BASE_FEATURE(kDesktopPWAsWebBundles, base::FEATURE_DISABLED_BY_DEFAULT); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -45,7 +45,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. -@@ -359,7 +359,7 @@ BASE_FEATURE(kDisruptiveNotificationPermissionRevocati +@@ -371,7 +371,7 @@ BASE_FEATURE(kDisruptiveNotificationPermissionRevocati BASE_FEATURE(kDnsOverHttps, "DnsOverHttps", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -54,7 +54,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -375,7 +375,7 @@ const base::FeatureParam<bool> kDnsOverHttpsFallbackPa +@@ -387,7 +387,7 @@ const base::FeatureParam<bool> kDnsOverHttpsFallbackPa const base::FeatureParam<bool> kDnsOverHttpsShowUiParam { &kDnsOverHttps, "ShowUi", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -63,16 +63,16 @@ true #else false -@@ -863,7 +863,7 @@ BASE_FEATURE(kKAnonymityServiceStorage, - "KAnonymityServiceStorage", - base::FEATURE_ENABLED_BY_DEFAULT); +@@ -894,7 +894,7 @@ BASE_FEATURE(kLacrosSharedComponentsDir, + base::FEATURE_DISABLED_BY_DEFAULT); + #endif // BUILDFLAG(IS_CHROMEOS_ASH) -#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) +#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)) || BUILDFLAG(IS_BSD) BASE_FEATURE(kLinuxLowMemoryMonitor, "LinuxLowMemoryMonitor", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -876,7 +876,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit +@@ -907,7 +907,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit &kLinuxLowMemoryMonitor, "critical_level", 255}; #endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) diff --git a/www/iridium/files/patch-chrome_common_chrome__features.h b/www/iridium/files/patch-chrome_common_chrome__features.h index 211a0a3c4563..3768cbed5d97 100644 --- a/www/iridium/files/patch-chrome_common_chrome__features.h +++ b/www/iridium/files/patch-chrome_common_chrome__features.h @@ -1,4 +1,4 @@ ---- chrome/common/chrome_features.h.orig 2023-10-21 11:51:27 UTC +--- chrome/common/chrome_features.h.orig 2023-11-22 14:00:11 UTC +++ chrome/common/chrome_features.h @@ -61,13 +61,13 @@ BASE_DECLARE_FEATURE(kAppShimNotificationAttribution); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kAsyncDns); @@ -16,7 +16,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kBackgroundModeAllowRestart); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -201,7 +201,7 @@ BASE_DECLARE_FEATURE(kDesktopPWAsTabStripSettings); +@@ -204,7 +204,7 @@ BASE_DECLARE_FEATURE(kDesktopPWAsTabStripSettings); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kDesktopPWAsWebBundles); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -25,16 +25,16 @@ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kChromeAppsDeprecation); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kKeepForceInstalledPreinstalledApps); -@@ -499,7 +499,7 @@ BASE_DECLARE_FEATURE(kKAnonymityServiceOHTTPRequests); - COMPONENT_EXPORT(CHROME_FEATURES) - BASE_DECLARE_FEATURE(kKAnonymityServiceStorage); +@@ -508,7 +508,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) + BASE_DECLARE_FEATURE(kLacrosSharedComponentsDir); + #endif // BUILDFLAG(IS_CHROMEOS_ASH) -#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) +#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)) || BUILDFLAG(IS_BSD) COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kLinuxLowMemoryMonitor); COMPONENT_EXPORT(CHROME_FEATURES) extern const base::FeatureParam<int> kLinuxLowMemoryMonitorModerateLevel; -@@ -507,7 +507,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) +@@ -516,7 +516,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::FeatureParam<int> kLinuxLowMemoryMonitorCriticalLevel; #endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) diff --git a/www/iridium/files/patch-chrome_common_chrome__paths.cc b/www/iridium/files/patch-chrome_common_chrome__paths.cc new file mode 100644 index 000000000000..1d02486d97a9 --- /dev/null +++ b/www/iridium/files/patch-chrome_common_chrome__paths.cc @@ -0,0 +1,98 @@ +--- chrome/common/chrome_paths.cc.orig 2023-11-22 14:00:11 UTC ++++ chrome/common/chrome_paths.cc +@@ -30,7 +30,7 @@ + #include "base/apple/foundation_util.h" + #endif + +-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_OPENBSD) ++#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) + #include "components/policy/core/common/policy_paths.h" + #endif + +@@ -51,14 +51,14 @@ + + namespace { + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // The path to the external extension <id>.json files. + // /usr/share seems like a good choice, see: http://www.pathname.com/fhs/ + const base::FilePath::CharType kFilepathSinglePrefExtensions[] = + #if BUILDFLAG(GOOGLE_CHROME_BRANDING) +- FILE_PATH_LITERAL("/usr/share/google-chrome/extensions"); ++ FILE_PATH_LITERAL("/usr/local/share/iridium/extensions"); + #else +- FILE_PATH_LITERAL("/usr/share/chromium/extensions"); ++ FILE_PATH_LITERAL("/usr/local/share/iridium/extensions"); + #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) + + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +@@ -213,7 +213,7 @@ bool PathProvider(int key, base::FilePath* result) { + } + break; + case chrome::DIR_DEFAULT_DOWNLOADS_SAFE: +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + if (!GetUserDownloadsDirectorySafe(&cur)) { + return false; + } +@@ -516,7 +516,7 @@ bool PathProvider(int key, base::FilePath* result) { + return false; + } + break; +-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_OPENBSD) ++#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) + case chrome::DIR_POLICY_FILES: { + cur = base::FilePath(policy::kPolicyPath); + break; +@@ -527,7 +527,7 @@ bool PathProvider(int key, base::FilePath* result) { + #if BUILDFLAG(IS_CHROMEOS_ASH) || \ + ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ + BUILDFLAG(CHROMIUM_BRANDING)) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + case chrome::DIR_USER_EXTERNAL_EXTENSIONS: { + if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) { + return false; +@@ -536,7 +536,7 @@ bool PathProvider(int key, base::FilePath* result) { + break; + } + #endif +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: { + cur = base::FilePath(kFilepathSinglePrefExtensions); + break; +@@ -583,7 +583,7 @@ bool PathProvider(int key, base::FilePath* result) { + break; + #endif + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + case chrome::DIR_NATIVE_MESSAGING: + #if BUILDFLAG(IS_MAC) + #if BUILDFLAG(GOOGLE_CHROME_BRANDING) +@@ -595,11 +595,21 @@ bool PathProvider(int key, base::FilePath* result) { + #endif + #else // BUILDFLAG(IS_MAC) + #if BUILDFLAG(GOOGLE_CHROME_BRANDING) ++#if BUILDFLAG(IS_FREEBSD) + cur = base::FilePath( +- FILE_PATH_LITERAL("/etc/iridium-browser/native-messaging-hosts")); ++ FILE_PATH_LITERAL("/usr/local/etc/iridium/native-messaging-hosts")); + #else + cur = base::FilePath( +- FILE_PATH_LITERAL("/etc/iridium-browser/native-messaging-hosts")); ++ FILE_PATH_LITERAL("/etc/iridium/native-messaging-hosts")); ++#endif ++#else ++#if BUILDFLAG(IS_FREEBSD) ++ cur = base::FilePath( ++ FILE_PATH_LITERAL("/usr/local/etc/iridium/native-messaging-hosts")); ++#else ++ cur = base::FilePath( ++ FILE_PATH_LITERAL("/etc/iridium/native-messaging-hosts")); ++#endif + #endif + #endif // !BUILDFLAG(IS_MAC) + break; diff --git a/www/iridium/files/patch-chrome_common_chrome__switches.cc b/www/iridium/files/patch-chrome_common_chrome__switches.cc index d3041b6db575..ea87517d63c3 100644 --- a/www/iridium/files/patch-chrome_common_chrome__switches.cc +++ b/www/iridium/files/patch-chrome_common_chrome__switches.cc @@ -1,6 +1,6 @@ ---- chrome/common/chrome_switches.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/common/chrome_switches.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/common/chrome_switches.cc -@@ -849,14 +849,14 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket- +@@ -861,14 +861,14 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket- #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/iridium/files/patch-chrome_common_chrome__switches.h b/www/iridium/files/patch-chrome_common_chrome__switches.h index 04d1ab5bdb17..26fdcca70eef 100644 --- a/www/iridium/files/patch-chrome_common_chrome__switches.h +++ b/www/iridium/files/patch-chrome_common_chrome__switches.h @@ -1,6 +1,6 @@ ---- chrome/common/chrome_switches.h.orig 2023-10-21 11:51:27 UTC +--- chrome/common/chrome_switches.h.orig 2023-11-22 14:00:11 UTC +++ chrome/common/chrome_switches.h -@@ -269,12 +269,12 @@ extern const char kAllowNaClSocketAPI[]; +@@ -273,12 +273,12 @@ extern const char kAllowNaClSocketAPI[]; #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/iridium/files/patch-chrome_common_crash__keys.cc b/www/iridium/files/patch-chrome_common_crash__keys.cc new file mode 100644 index 000000000000..03f12ea768f9 --- /dev/null +++ b/www/iridium/files/patch-chrome_common_crash__keys.cc @@ -0,0 +1,23 @@ +--- chrome/common/crash_keys.cc.orig 2023-11-22 14:00:11 UTC ++++ chrome/common/crash_keys.cc +@@ -32,20 +32,10 @@ namespace crash_keys { + namespace { + + // A convenient wrapper around a crash key and its name. +-// +-// The CrashKey contract requires that CrashKeyStrings are never +-// moved, copied, or deleted (see +-// third_party/crashpad/crashpad/client/annotation.h); since this class holds +-// a CrashKeyString, it likewise cannot be moved, copied, or deleted. + class CrashKeyWithName { + public: + explicit CrashKeyWithName(std::string name) + : name_(std::move(name)), crash_key_(name_.c_str()) {} +- CrashKeyWithName(const CrashKeyWithName&) = delete; +- CrashKeyWithName& operator=(const CrashKeyWithName&) = delete; +- CrashKeyWithName(CrashKeyWithName&&) = delete; +- CrashKeyWithName& operator=(CrashKeyWithName&&) = delete; +- ~CrashKeyWithName() = delete; + + void Clear() { crash_key_.Clear(); } + void Set(base::StringPiece value) { crash_key_.Set(value); } diff --git a/www/iridium/files/patch-chrome_common_pref__names.h b/www/iridium/files/patch-chrome_common_pref__names.h index b342dbca7cea..86a5e3b4bc56 100644 --- a/www/iridium/files/patch-chrome_common_pref__names.h +++ b/www/iridium/files/patch-chrome_common_pref__names.h @@ -1,6 +1,6 @@ ---- chrome/common/pref_names.h.orig 2023-10-21 11:51:27 UTC +--- chrome/common/pref_names.h.orig 2023-11-22 14:00:11 UTC +++ chrome/common/pref_names.h -@@ -1316,7 +1316,7 @@ inline constexpr char kUseAshProxy[] = "lacros.proxy.u +@@ -1302,7 +1302,7 @@ inline constexpr char kUseAshProxy[] = "lacros.proxy.u // TODO(crbug.com/1052397): 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 -@@ -1442,7 +1442,7 @@ inline constexpr char kShowUpdatePromotionInfoBar[] = +@@ -1428,7 +1428,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"; -@@ -1986,7 +1986,7 @@ inline constexpr char kDownloadLastCompleteTime[] = +@@ -1969,7 +1969,7 @@ inline constexpr char kDownloadLastCompleteTime[] = "download.last_complete_time"; #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 -@@ -2392,14 +2392,14 @@ inline constexpr char kMediaStorageIdSalt[] = "media.s +@@ -2380,14 +2380,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"; -@@ -2477,7 +2477,7 @@ inline constexpr char kAmbientAuthenticationInPrivateM +@@ -2465,7 +2465,7 @@ inline constexpr char kAmbientAuthenticationInPrivateM inline constexpr char kBasicAuthOverHttpEnabled[] = "auth.basic_over_http_enabled"; @@ -53,7 +53,7 @@ // Boolean that specifies whether OK-AS-DELEGATE flag from KDC is respected // along with kAuthNegotiateDelegateAllowlist. inline constexpr char kAuthNegotiateDelegateByKdcPolicy[] = -@@ -3551,7 +3551,7 @@ inline constexpr char kFileOrDirectoryPickerWithoutGes +@@ -3494,7 +3494,7 @@ inline constexpr char kFileOrDirectoryPickerWithoutGes inline constexpr char kSandboxExternalProtocolBlocked[] = "profile.sandbox_external_protocol_blocked"; @@ -62,7 +62,7 @@ // Boolean that indicates if system notifications are allowed to be used in // place of Chrome notifications. inline constexpr char kAllowSystemNotifications[] = -@@ -3607,7 +3607,7 @@ inline constexpr char kCACertificateManagementAllowed[ +@@ -3550,7 +3550,7 @@ inline constexpr char kCACertificateManagementAllowed[ inline constexpr char kChromeRootStoreEnabled[] = "chrome_root_store_enabled"; #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -71,7 +71,7 @@ inline constexpr char kEnforceLocalAnchorConstraintsEnabled[] = "enforce_local_anchor_constraints_enabled"; #endif -@@ -3921,7 +3921,7 @@ inline constexpr char kThrottleNonVisibleCrossOriginIf +@@ -3864,7 +3864,7 @@ inline constexpr char kThrottleNonVisibleCrossOriginIf inline constexpr char kNewBaseUrlInheritanceBehaviorAllowed[] = "new_base_url_inheritance_behavior_allowed"; diff --git a/www/iridium/files/patch-chrome_common_url__constants.cc b/www/iridium/files/patch-chrome_common_url__constants.cc index b22ffa16854d..b8d25cfe41b3 100644 --- a/www/iridium/files/patch-chrome_common_url__constants.cc +++ b/www/iridium/files/patch-chrome_common_url__constants.cc @@ -1,6 +1,6 @@ ---- chrome/common/url_constants.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/common/url_constants.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/common/url_constants.cc -@@ -560,7 +560,7 @@ const char kPhoneHubPermissionLearnMoreURL[] = +@@ -592,7 +592,7 @@ const char kPhoneHubPermissionLearnMoreURL[] = "https://support.google.com/chromebook/?p=multidevice"; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-chrome_common_url__constants.h b/www/iridium/files/patch-chrome_common_url__constants.h index 2c775899d7e4..5fbdfa196ad0 100644 --- a/www/iridium/files/patch-chrome_common_url__constants.h +++ b/www/iridium/files/patch-chrome_common_url__constants.h @@ -1,6 +1,6 @@ ---- chrome/common/url_constants.h.orig 2023-10-21 11:51:27 UTC +--- chrome/common/url_constants.h.orig 2023-11-22 14:00:11 UTC +++ chrome/common/url_constants.h -@@ -537,7 +537,7 @@ extern const char kOutdatedPluginLearnMoreURL[]; +@@ -567,7 +567,7 @@ extern const char kOutdatedPluginLearnMoreURL[]; extern const char kPhoneHubPermissionLearnMoreURL[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-chrome_common_webui__url__constants.cc b/www/iridium/files/patch-chrome_common_webui__url__constants.cc index 282c56ce881b..4bb277b141e8 100644 --- a/www/iridium/files/patch-chrome_common_webui__url__constants.cc +++ b/www/iridium/files/patch-chrome_common_webui__url__constants.cc @@ -1,4 +1,4 @@ ---- chrome/common/webui_url_constants.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/common/webui_url_constants.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/common/webui_url_constants.cc @@ -499,18 +499,18 @@ const char kOsUIShortcutCustomizationAppURL[] = "os:// const char kOsUIVersionURL[] = "os://version"; @@ -48,7 +48,7 @@ defined(TOOLKIT_VIEWS)) || \ defined(USE_AURA) const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog"; -@@ -631,7 +631,7 @@ const char kPrivacySandboxSubPagePath[] = "/privacySan +@@ -636,7 +636,7 @@ const char kCookiesSubPagePath[] = "/cookies"; #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -57,7 +57,7 @@ const char kChromeUIWebAppSettingsURL[] = "chrome://app-settings/"; const char kChromeUIWebAppSettingsHost[] = "app-settings"; #endif -@@ -865,7 +865,7 @@ const char* const kChromeDebugURLs[] = { +@@ -869,7 +869,7 @@ const char* const kChromeDebugURLs[] = { blink::kChromeUIGpuJavaCrashURL, kChromeUIJavaCrashURL, #endif diff --git a/www/iridium/files/patch-chrome_common_webui__url__constants.h b/www/iridium/files/patch-chrome_common_webui__url__constants.h index ac1bfc740ffb..7b3755c19289 100644 --- a/www/iridium/files/patch-chrome_common_webui__url__constants.h +++ b/www/iridium/files/patch-chrome_common_webui__url__constants.h @@ -1,6 +1,6 @@ ---- chrome/common/webui_url_constants.h.orig 2023-10-21 11:51:27 UTC +--- chrome/common/webui_url_constants.h.orig 2023-11-22 14:00:11 UTC +++ chrome/common/webui_url_constants.h -@@ -419,24 +419,24 @@ extern const char kOsUIShortcutCustomizationAppURL[]; +@@ -418,24 +418,24 @@ extern const char kOsUIShortcutCustomizationAppURL[]; extern const char kOsUIVersionURL[]; #endif @@ -29,7 +29,7 @@ extern const char kChromeUIWebAppSettingsURL[]; extern const char kChromeUIWebAppSettingsHost[]; #endif -@@ -451,7 +451,7 @@ extern const char kChromeUILinuxProxyConfigHost[]; +@@ -450,7 +450,7 @@ extern const char kChromeUILinuxProxyConfigHost[]; #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -38,7 +38,7 @@ extern const char kChromeUISandboxHost[]; #endif -@@ -463,7 +463,7 @@ extern const char kChromeUISearchEngineChoiceHost[]; +@@ -462,7 +462,7 @@ extern const char kChromeUISearchEngineChoiceHost[]; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) || \ @@ -47,7 +47,7 @@ extern const char kChromeUIBrowserSwitchHost[]; extern const char kChromeUIBrowserSwitchURL[]; extern const char kChromeUIEnterpriseProfileWelcomeHost[]; -@@ -479,7 +479,7 @@ extern const char kChromeUIProfilePickerUrl[]; +@@ -478,7 +478,7 @@ extern const char kChromeUIProfilePickerUrl[]; extern const char kChromeUIProfilePickerStartupQuery[]; #endif diff --git a/www/iridium/files/patch-chrome_services_printing_print__backend__service__impl.cc b/www/iridium/files/patch-chrome_services_printing_print__backend__service__impl.cc index 52c0b4892335..0f27a339caa3 100644 --- a/www/iridium/files/patch-chrome_services_printing_print__backend__service__impl.cc +++ b/www/iridium/files/patch-chrome_services_printing_print__backend__service__impl.cc @@ -1,4 +1,4 @@ ---- chrome/services/printing/print_backend_service_impl.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/services/printing/print_backend_service_impl.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/services/printing/print_backend_service_impl.cc @@ -46,7 +46,7 @@ #include "printing/backend/cups_connection_pool.h" @@ -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()); -@@ -466,7 +466,7 @@ void PrintBackendServiceImpl::Init( +@@ -460,7 +460,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`. -@@ -686,7 +686,7 @@ void PrintBackendServiceImpl::UpdatePrintSettings( +@@ -680,7 +680,7 @@ void PrintBackendServiceImpl::UpdatePrintSettings( crash_keys_ = std::make_unique<crash_keys::ScopedPrinterInfo>( print_backend_->GetPrinterDriverInfo(*printer_name)); diff --git a/www/iridium/files/patch-chrome_services_speech_audio__source__fetcher__impl.cc b/www/iridium/files/patch-chrome_services_speech_audio__source__fetcher__impl.cc index f70c1b748a7c..90801cd208ce 100644 --- a/www/iridium/files/patch-chrome_services_speech_audio__source__fetcher__impl.cc +++ b/www/iridium/files/patch-chrome_services_speech_audio__source__fetcher__impl.cc @@ -1,6 +1,6 @@ ---- chrome/services/speech/audio_source_fetcher_impl.cc.orig 2023-07-24 14:27:53 UTC +--- chrome/services/speech/audio_source_fetcher_impl.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/services/speech/audio_source_fetcher_impl.cc -@@ -132,7 +132,7 @@ void AudioSourceFetcherImpl::Start( +@@ -129,7 +129,7 @@ void AudioSourceFetcherImpl::Start( // TODO(crbug.com/1185978): Check implementation / sandbox policy on Mac and // Windows. diff --git a/www/iridium/files/patch-chrome_test_BUILD.gn b/www/iridium/files/patch-chrome_test_BUILD.gn index eae82a3a1270..eab7abc3adf9 100644 --- a/www/iridium/files/patch-chrome_test_BUILD.gn +++ b/www/iridium/files/patch-chrome_test_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/test/BUILD.gn.orig 2023-10-21 11:51:27 UTC +--- chrome/test/BUILD.gn.orig 2023-11-22 14:00:11 UTC +++ chrome/test/BUILD.gn -@@ -10971,7 +10971,7 @@ test("chrome_app_unittests") { +@@ -11055,7 +11055,7 @@ test("chrome_app_unittests") { "//components/heap_profiling/in_process", "//components/safe_browsing:buildflags", ] diff --git a/www/iridium/files/patch-chrome_utility_services.cc b/www/iridium/files/patch-chrome_utility_services.cc index b88bf68f64ea..ebe09ca0476c 100644 --- a/www/iridium/files/patch-chrome_utility_services.cc +++ b/www/iridium/files/patch-chrome_utility_services.cc @@ -1,4 +1,4 @@ ---- chrome/utility/services.cc.orig 2023-10-21 11:51:27 UTC +--- chrome/utility/services.cc.orig 2023-11-22 14:00:11 UTC +++ chrome/utility/services.cc @@ -56,7 +56,7 @@ #include "chrome/services/system_signals/mac/mac_system_signals_service.h" @@ -18,7 +18,7 @@ #include "chrome/services/file_util/document_analysis_service.h" // nogncheck #endif -@@ -216,7 +216,7 @@ auto RunMacNotificationService( +@@ -218,7 +218,7 @@ auto RunMacNotificationService( } #endif // BUILDFLAG(IS_MAC) @@ -27,7 +27,7 @@ auto RunSystemSignalsService( mojo::PendingReceiver<device_signals::mojom::SystemSignalsService> receiver) { -@@ -276,7 +276,7 @@ auto RunCupsIppParser( +@@ -278,7 +278,7 @@ auto RunCupsIppParser( } #endif @@ -36,7 +36,7 @@ auto RunDocumentAnalysis( mojo::PendingReceiver<chrome::mojom::DocumentAnalysisService> receiver) { return std::make_unique<DocumentAnalysisService>(std::move(receiver)); -@@ -452,7 +452,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& +@@ -466,7 +466,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& services.Add(RunWindowsIconReader); #endif // BUILDFLAG(IS_WIN) @@ -45,7 +45,7 @@ services.Add(RunSystemSignalsService); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -468,7 +468,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& +@@ -482,7 +482,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& services.Add(RunFileUtil); #endif diff --git a/www/iridium/files/patch-chromecast_browser_cast__content__browser__client.cc b/www/iridium/files/patch-chromecast_browser_cast__content__browser__client.cc index 17fba3cc6d9b..1b3cfa104a34 100644 --- a/www/iridium/files/patch-chromecast_browser_cast__content__browser__client.cc +++ b/www/iridium/files/patch-chromecast_browser_cast__content__browser__client.cc @@ -1,6 +1,6 @@ ---- chromecast/browser/cast_content_browser_client.cc.orig 2023-10-21 11:51:27 UTC +--- chromecast/browser/cast_content_browser_client.cc.orig 2023-11-22 14:00:11 UTC +++ chromecast/browser/cast_content_browser_client.cc -@@ -451,7 +451,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS +@@ -435,7 +435,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS switches::kAudioOutputChannels)); } } else if (process_type == switches::kGpuProcess) { diff --git a/www/iridium/files/patch-components_autofill__payments__strings.grdp b/www/iridium/files/patch-components_autofill__payments__strings.grdp index 8b4f41a4c3a3..0e03056f775d 100644 --- a/www/iridium/files/patch-components_autofill__payments__strings.grdp +++ b/www/iridium/files/patch-components_autofill__payments__strings.grdp @@ -1,11 +1,11 @@ ---- components/autofill_payments_strings.grdp.orig 2023-10-21 11:51:27 UTC +--- components/autofill_payments_strings.grdp.orig 2023-11-22 14:00:11 UTC +++ components/autofill_payments_strings.grdp -@@ -130,7 +130,7 @@ +@@ -134,7 +134,7 @@ <message name="IDS_AUTOFILL_FIX_FLOW_PROMPT_SAVE_CARD_LABEL" desc="Text to show on the button to save the card to Google when the fix flow dialog is shown after the Autofill save card prompt." formatter_data="android_java"> Save card </message> - <if expr="is_linux"> + <if expr="is_posix"> <then> - <message name="IDS_AUTOFILL_SAVE_CARD_PROMPT_TITLE_TO_CLOUD" desc="Title text for the Autofill save card prompt when the card is to be saved by uploading it to Google Payments and also saved locally. The prompt can be either a bubble or an infobar."> - Do you want to save this card to your Google Account? + <message name="IDS_AUTOFILL_SAVE_CARD_PROMPT_TITLE_TO_CLOUD" desc="Title text for the Autofill save card prompt when the card is to be saved by uploading it to Google Payments and also saved locally. The prompt is a bubble."> + Do you want to save this card in your Google Account? diff --git a/www/iridium/files/patch-components_autofill_core_browser_contact__info__sync__util.cc b/www/iridium/files/patch-components_autofill_core_browser_contact__info__sync__util.cc deleted file mode 100644 index 051560f3f9b6..000000000000 --- a/www/iridium/files/patch-components_autofill_core_browser_contact__info__sync__util.cc +++ /dev/null @@ -1,18 +0,0 @@ ---- components/autofill/core/browser/contact_info_sync_util.cc.orig 2023-10-21 11:51:27 UTC -+++ components/autofill/core/browser/contact_info_sync_util.cc -@@ -174,9 +174,15 @@ class ContactInfoProfileSetter { - CHECK(observations.empty()); - for (const sync_pb::ContactInfoSpecifics::Observation& proto_observation : - proto_observations) { -+#if defined(__clang__) && (__clang_major__ >= 15) - observations.emplace_back(proto_observation.type(), - ProfileTokenQuality::FormSignatureHash( - proto_observation.form_hash())); -+#else -+ observations.emplace_back() = { static_cast<unsigned char>(proto_observation.type()), -+ ProfileTokenQuality::FormSignatureHash( -+ proto_observation.form_hash()) }; -+#endif - } - } - diff --git a/www/iridium/files/patch-components_autofill_core_browser_payments_iban__save__manager.cc b/www/iridium/files/patch-components_autofill_core_browser_payments_iban__save__manager.cc new file mode 100644 index 000000000000..9110d5b35f76 --- /dev/null +++ b/www/iridium/files/patch-components_autofill_core_browser_payments_iban__save__manager.cc @@ -0,0 +1,14 @@ +--- components/autofill/core/browser/payments/iban_save_manager.cc.orig 2023-11-22 14:00:11 UTC ++++ components/autofill/core/browser/payments/iban_save_manager.cc +@@ -63,7 +63,11 @@ bool IbanSaveManager::AttemptToOfferIbanLocalSave( + bool IbanSaveManager::ShouldOfferLocalSave(const Iban& iban_import_candidate) { + // Only offer to save new IBANs. Users can go to the payment methods settings + // page to update existing IBANs if desired. ++#if (_LIBCPP_VERSION >= 160000) + return std::ranges::none_of( ++#else ++ return base::ranges::none_of( ++#endif + personal_data_manager_->GetLocalIbans(), [&](const auto& iban) { + return iban->value() == iban_import_candidate.value(); + }); diff --git a/www/iridium/files/patch-components_autofill_core_browser_personal__data__manager.cc b/www/iridium/files/patch-components_autofill_core_browser_personal__data__manager.cc index 781340cbebfe..a137693d8eb9 100644 --- a/www/iridium/files/patch-components_autofill_core_browser_personal__data__manager.cc +++ b/www/iridium/files/patch-components_autofill_core_browser_personal__data__manager.cc @@ -1,6 +1,6 @@ ---- components/autofill/core/browser/personal_data_manager.cc.orig 2023-10-21 11:51:27 UTC +--- components/autofill/core/browser/personal_data_manager.cc.orig 2023-11-22 14:00:11 UTC +++ components/autofill/core/browser/personal_data_manager.cc -@@ -2492,7 +2492,8 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp +@@ -2384,7 +2384,8 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ diff --git a/www/iridium/files/patch-components_autofill_core_browser_webdata_autofill__sync__bridge__util.cc b/www/iridium/files/patch-components_autofill_core_browser_webdata_autofill__sync__bridge__util.cc deleted file mode 100644 index 7e9ddabbdd56..000000000000 --- a/www/iridium/files/patch-components_autofill_core_browser_webdata_autofill__sync__bridge__util.cc +++ /dev/null @@ -1,22 +0,0 @@ ---- components/autofill/core/browser/webdata/autofill_sync_bridge_util.cc.orig 2023-10-21 11:51:27 UTC -+++ components/autofill/core/browser/webdata/autofill_sync_bridge_util.cc -@@ -553,11 +553,19 @@ ServerCvc AutofillWalletCvcStructDataFromWalletCredent - base::StringToInt64(wallet_credential_specifics.instrument_id(), - &instrument_id); - -+#if defined(__clang__) && (__clang_major__ >= 15) - return ServerCvc( - instrument_id, base::UTF8ToUTF16(wallet_credential_specifics.cvc()), - base::Time::UnixEpoch() + - base::Milliseconds(wallet_credential_specifics - .last_updated_time_unix_epoch_millis())); -+#else -+ return ServerCvc( { -+ instrument_id, base::UTF8ToUTF16(wallet_credential_specifics.cvc()), -+ base::Time::UnixEpoch() + -+ base::Milliseconds(wallet_credential_specifics -+ .last_updated_time_unix_epoch_millis()) }); -+#endif - } - - VirtualCardUsageData VirtualCardUsageDataFromUsageSpecifics( diff --git a/www/iridium/files/patch-components_autofill_core_common_autofill__payments__features.cc b/www/iridium/files/patch-components_autofill_core_common_autofill__payments__features.cc index 0caff231edc6..d9b8e159580e 100644 --- a/www/iridium/files/patch-components_autofill_core_common_autofill__payments__features.cc +++ b/www/iridium/files/patch-components_autofill_core_common_autofill__payments__features.cc @@ -1,6 +1,6 @@ ---- components/autofill/core/common/autofill_payments_features.cc.orig 2023-10-21 11:51:27 UTC +--- components/autofill/core/common/autofill_payments_features.cc.orig 2023-11-22 14:00:11 UTC +++ components/autofill/core/common/autofill_payments_features.cc -@@ -281,7 +281,7 @@ BASE_FEATURE(kEnablePixPayments, +@@ -292,7 +292,7 @@ BASE_FEATURE(kEnablePixPayments, bool ShouldShowImprovedUserConsentForCreditCardSave() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/iridium/files/patch-components_autofill_core_common_autofill__util.cc b/www/iridium/files/patch-components_autofill_core_common_autofill__util.cc index e49dd0d41141..72086acf30c0 100644 --- a/www/iridium/files/patch-components_autofill_core_common_autofill__util.cc +++ b/www/iridium/files/patch-components_autofill_core_common_autofill__util.cc @@ -1,6 +1,6 @@ ---- components/autofill/core/common/autofill_util.cc.orig 2023-10-21 11:51:27 UTC +--- components/autofill/core/common/autofill_util.cc.orig 2023-11-22 14:00:11 UTC +++ components/autofill/core/common/autofill_util.cc -@@ -153,7 +153,7 @@ bool SanitizedFieldIsEmpty(const std::u16string& value +@@ -133,7 +133,7 @@ bool SanitizedFieldIsEmpty(const std::u16string& value bool ShouldAutoselectFirstSuggestionOnArrowDown() { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-components_commerce__strings.grdp b/www/iridium/files/patch-components_commerce__strings.grdp index 081284797d71..42046dc3c9f6 100644 --- a/www/iridium/files/patch-components_commerce__strings.grdp +++ b/www/iridium/files/patch-components_commerce__strings.grdp @@ -1,6 +1,6 @@ ---- components/commerce_strings.grdp.orig 2023-10-21 11:51:27 UTC +--- components/commerce_strings.grdp.orig 2023-11-22 14:00:11 UTC +++ components/commerce_strings.grdp -@@ -292,7 +292,7 @@ +@@ -304,7 +304,7 @@ <message name="IDS_PRICE_HISTORY_DESCRIPTION" desc="The description of the Price History section in the Shopping Insights side panel explaining how the prices are gathered."> Typical prices are based on stores across the web over the past 90 days. </message> diff --git a/www/iridium/files/patch-components_feature__engagement_public_feature__configurations.cc b/www/iridium/files/patch-components_feature__engagement_public_feature__configurations.cc index 3f4bc5eb7f85..caaefc2c3aef 100644 --- a/www/iridium/files/patch-components_feature__engagement_public_feature__configurations.cc +++ b/www/iridium/files/patch-components_feature__engagement_public_feature__configurations.cc @@ -1,4 +1,4 @@ ---- components/feature_engagement/public/feature_configurations.cc.orig 2023-10-21 11:51:27 UTC +--- components/feature_engagement/public/feature_configurations.cc.orig 2023-11-22 14:00:11 UTC +++ components/feature_engagement/public/feature_configurations.cc @@ -46,7 +46,7 @@ FeatureConfig CreateAlwaysTriggerConfig(const base::Fe absl::optional<FeatureConfig> GetClientSideFeatureConfig( @@ -9,7 +9,7 @@ if (kIPHPasswordsAccountStorageFeature.name == feature->name) { absl::optional<FeatureConfig> config = FeatureConfig(); config->valid = true; -@@ -1336,7 +1336,8 @@ absl::optional<FeatureConfig> GetClientSideFeatureConf +@@ -1399,7 +1399,8 @@ absl::optional<FeatureConfig> GetClientSideFeatureConf #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-components_feature__engagement_public_feature__constants.cc b/www/iridium/files/patch-components_feature__engagement_public_feature__constants.cc index 4c09caa74edd..67867f5cc8d8 100644 --- a/www/iridium/files/patch-components_feature__engagement_public_feature__constants.cc +++ b/www/iridium/files/patch-components_feature__engagement_public_feature__constants.cc @@ -1,4 +1,4 @@ ---- components/feature_engagement/public/feature_constants.cc.orig 2023-10-21 11:51:27 UTC +--- components/feature_engagement/public/feature_constants.cc.orig 2023-11-22 14:00:11 UTC +++ components/feature_engagement/public/feature_constants.cc @@ -21,7 +21,7 @@ BASE_FEATURE(kUseClientConfigIPH, BASE_FEATURE(kIPHDummyFeature, "IPH_Dummy", base::FEATURE_DISABLED_BY_DEFAULT); @@ -6,16 +6,15 @@ #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) - BASE_FEATURE(kIPHAutofillFeedbackNewBadgeFeature, - "IPH_AutofillFeedbackNewBadge", - base::FEATURE_DISABLED_BY_DEFAULT); -@@ -519,7 +519,8 @@ BASE_FEATURE(kIPHiOSPromoPasswordManagerWidgetFeature, + BASE_FEATURE(kIPHBatterySaverModeFeature, + "IPH_BatterySaverMode", + base::FEATURE_ENABLED_BY_DEFAULT); +@@ -539,7 +539,7 @@ constexpr base::FeatureParam<int> kDefaultBrowserEligi + /*default_value=*/365}; #endif // BUILDFLAG(IS_IOS) - #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 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) BASE_FEATURE(kIPHAutofillExternalAccountProfileSuggestionFeature, "IPH_AutofillExternalAccountProfileSuggestion", - base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/www/iridium/files/patch-components_feature__engagement_public_feature__constants.h b/www/iridium/files/patch-components_feature__engagement_public_feature__constants.h index d25b126aeb3c..4cf94c74c4b2 100644 --- a/www/iridium/files/patch-components_feature__engagement_public_feature__constants.h +++ b/www/iridium/files/patch-components_feature__engagement_public_feature__constants.h @@ -1,21 +1,20 @@ ---- components/feature_engagement/public/feature_constants.h.orig 2023-10-21 11:51:27 UTC +--- components/feature_engagement/public/feature_constants.h.orig 2023-11-22 14:00:11 UTC +++ components/feature_engagement/public/feature_constants.h -@@ -23,7 +23,7 @@ BASE_DECLARE_FEATURE(kUseClientConfigIPH); +@@ -24,7 +24,7 @@ BASE_DECLARE_FEATURE(kUseClientConfigIPH); BASE_DECLARE_FEATURE(kIPHDummyFeature); #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) - BASE_DECLARE_FEATURE(kIPHAutofillFeedbackNewBadgeFeature); BASE_DECLARE_FEATURE(kIPHBatterySaverModeFeature); BASE_DECLARE_FEATURE(kIPHCompanionSidePanelFeature); -@@ -211,7 +211,8 @@ BASE_DECLARE_FEATURE(kIPHiOSPromoPasswordManagerWidget + BASE_DECLARE_FEATURE(kIPHCompanionSidePanelRegionSearchFeature); +@@ -226,7 +226,7 @@ extern const base::FeatureParam<int> + kDefaultBrowserEligibilitySlidingWindowParam; #endif // BUILDFLAG(IS_IOS) - #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 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) BASE_DECLARE_FEATURE(kIPHAutofillExternalAccountProfileSuggestionFeature); BASE_DECLARE_FEATURE(kIPHAutofillVirtualCardCVCSuggestionFeature); - BASE_DECLARE_FEATURE(kIPHAutofillVirtualCardSuggestionFeature); diff --git a/www/iridium/files/patch-components_feature__engagement_public_feature__list.cc b/www/iridium/files/patch-components_feature__engagement_public_feature__list.cc index c7b36d550bf8..707feb780495 100644 --- a/www/iridium/files/patch-components_feature__engagement_public_feature__list.cc +++ b/www/iridium/files/patch-components_feature__engagement_public_feature__list.cc @@ -1,21 +1,20 @@ ---- components/feature_engagement/public/feature_list.cc.orig 2023-10-21 11:51:27 UTC +--- components/feature_engagement/public/feature_list.cc.orig 2023-11-22 14:00:11 UTC +++ components/feature_engagement/public/feature_list.cc -@@ -139,7 +139,7 @@ const base::Feature* const kAllFeatures[] = { - &kIPHiOSPromoPasswordManagerWidgetFeature, +@@ -143,7 +143,7 @@ const base::Feature* const kAllFeatures[] = { + &kIPHiOSChoiceScreenFeature, #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) - &kIPHAutofillFeedbackNewBadgeFeature, &kIPHBatterySaverModeFeature, &kIPHCompanionSidePanelFeature, -@@ -186,7 +186,8 @@ const base::Feature* const kAllFeatures[] = { + &kIPHCompanionSidePanelRegionSearchFeature, +@@ -189,7 +189,7 @@ const base::Feature* const kAllFeatures[] = { + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) || 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 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) &kIPHAutofillExternalAccountProfileSuggestionFeature, &kIPHAutofillVirtualCardCVCSuggestionFeature, - &kIPHAutofillVirtualCardSuggestionFeature, diff --git a/www/iridium/files/patch-components_feature__engagement_public_feature__list.h b/www/iridium/files/patch-components_feature__engagement_public_feature__list.h index 9da48b75ac4b..402a8b71ce76 100644 --- a/www/iridium/files/patch-components_feature__engagement_public_feature__list.h +++ b/www/iridium/files/patch-components_feature__engagement_public_feature__list.h @@ -1,40 +1,38 @@ ---- components/feature_engagement/public/feature_list.h.orig 2023-10-21 11:51:27 UTC +--- components/feature_engagement/public/feature_list.h.orig 2023-11-22 14:00:11 UTC +++ components/feature_engagement/public/feature_list.h -@@ -259,7 +259,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSPromoPasswordManagerWidg +@@ -265,7 +265,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSChoiceScreenFeature, #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) - DEFINE_VARIATION_PARAM(kIPHAutofillFeedbackNewBadgeFeature, - "IPH_AutofillFeedbackNewBadge"); DEFINE_VARIATION_PARAM(kIPHBatterySaverModeFeature, "IPH_BatterySaverMode"); -@@ -335,7 +335,8 @@ DEFINE_VARIATION_PARAM(kIPHBackNavigationMenuFeature, + DEFINE_VARIATION_PARAM(kIPHCompanionSidePanelFeature, "IPH_CompanionSidePanel"); + DEFINE_VARIATION_PARAM(kIPHCompanionSidePanelRegionSearchFeature, +@@ -340,7 +340,7 @@ DEFINE_VARIATION_PARAM(kIPHBackNavigationMenuFeature, + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) || 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 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) DEFINE_VARIATION_PARAM(kIPHAutofillExternalAccountProfileSuggestionFeature, "IPH_AutofillExternalAccountProfileSuggestion"); - DEFINE_VARIATION_PARAM(kIPHAutofillVirtualCardCVCSuggestionFeature, -@@ -541,7 +542,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation - VARIATION_ENTRY(kIPHiOSPromoPostRestoreDefaultBrowserFeature), +@@ -552,7 +552,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation VARIATION_ENTRY(kIPHiOSPromoPasswordManagerWidgetFeature), + VARIATION_ENTRY(kIPHiOSChoiceScreenFeature), #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(kIPHAutofillFeedbackNewBadgeFeature), VARIATION_ENTRY(kIPHBatterySaverModeFeature), VARIATION_ENTRY(kIPHCompanionSidePanelFeature), -@@ -589,7 +590,8 @@ constexpr flags_ui::FeatureEntry::FeatureVariation + VARIATION_ENTRY(kIPHCompanionSidePanelRegionSearchFeature), +@@ -599,7 +599,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) || 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 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) VARIATION_ENTRY(kIPHAutofillExternalAccountProfileSuggestionFeature), VARIATION_ENTRY(kIPHAutofillVirtualCardCVCSuggestionFeature), - VARIATION_ENTRY(kIPHAutofillVirtualCardSuggestionFeature), diff --git a/www/iridium/files/patch-components_gwp__asan_client_gwp__asan.cc b/www/iridium/files/patch-components_gwp__asan_client_gwp__asan.cc index 0f3449049248..3a91a7837cac 100644 --- a/www/iridium/files/patch-components_gwp__asan_client_gwp__asan.cc +++ b/www/iridium/files/patch-components_gwp__asan_client_gwp__asan.cc @@ -1,6 +1,6 @@ ---- components/gwp_asan/client/gwp_asan.cc.orig 2023-10-21 11:51:27 UTC +--- components/gwp_asan/client/gwp_asan.cc.orig 2023-11-22 14:00:11 UTC +++ components/gwp_asan/client/gwp_asan.cc -@@ -64,7 +64,7 @@ constexpr bool kCpuIs64Bit = +@@ -66,7 +66,7 @@ constexpr bool kCpuIs64Bit = // ProcessSamplingBoost is the multiplier to increase the // ProcessSamplingProbability in scenarios where we want to perform additional // testing (e.g., on canary/dev builds). @@ -9,12 +9,3 @@ constexpr int kDefaultMaxAllocations = 50; constexpr int kDefaultMaxMetadata = 210; constexpr int kDefaultTotalPages = kCpuIs64Bit ? 2048 : kDefaultMaxMetadata * 2; -@@ -84,7 +84,7 @@ constexpr int kDefaultProcessSamplingBoost2 = 10; - // BUILDFLAG(IS_FUCHSIA) - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS_ASH) -+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) - constexpr base::FeatureState kDefaultEnabled = base::FEATURE_ENABLED_BY_DEFAULT; - #else - constexpr base::FeatureState kDefaultEnabled = diff --git a/www/iridium/files/patch-components_gwp__asan_client_gwp__asan__features.cc b/www/iridium/files/patch-components_gwp__asan_client_gwp__asan__features.cc new file mode 100644 index 000000000000..fb02ad99780d --- /dev/null +++ b/www/iridium/files/patch-components_gwp__asan_client_gwp__asan__features.cc @@ -0,0 +1,11 @@ +--- components/gwp_asan/client/gwp_asan_features.cc.orig 2023-11-22 14:00:11 UTC ++++ components/gwp_asan/client/gwp_asan_features.cc +@@ -9,7 +9,7 @@ + namespace gwp_asan::internal { + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + constexpr base::FeatureState kDefaultEnabled = base::FEATURE_ENABLED_BY_DEFAULT; + #else + constexpr base::FeatureState kDefaultEnabled = diff --git a/www/iridium/files/patch-components_media__router_common_providers_cast_channel_cast__message__util.cc b/www/iridium/files/patch-components_media__router_common_providers_cast_channel_cast__message__util.cc index 23aefc4bfb92..268cf171f569 100644 --- a/www/iridium/files/patch-components_media__router_common_providers_cast_channel_cast__message__util.cc +++ b/www/iridium/files/patch-components_media__router_common_providers_cast_channel_cast__message__util.cc @@ -1,6 +1,6 @@ ---- components/media_router/common/providers/cast/channel/cast_message_util.cc.orig 2022-12-06 08:09:13 UTC +--- components/media_router/common/providers/cast/channel/cast_message_util.cc.orig 2023-11-22 14:00:11 UTC +++ components/media_router/common/providers/cast/channel/cast_message_util.cc -@@ -170,7 +170,7 @@ int GetVirtualConnectPlatformValue() { +@@ -169,7 +169,7 @@ int GetVirtualConnectPlatformValue() { return 4; #elif BUILDFLAG(IS_CHROMEOS_ASH) return 5; diff --git a/www/iridium/files/patch-components_miracle__parameter_common_public_miracle__parameter.h b/www/iridium/files/patch-components_miracle__parameter_common_public_miracle__parameter.h new file mode 100644 index 000000000000..b74da7d21996 --- /dev/null +++ b/www/iridium/files/patch-components_miracle__parameter_common_public_miracle__parameter.h @@ -0,0 +1,12 @@ +--- components/miracle_parameter/common/public/miracle_parameter.h.orig 2023-11-22 14:00:11 UTC ++++ components/miracle_parameter/common/public/miracle_parameter.h +@@ -93,7 +93,8 @@ class MiracleParameter { + template <> + class MiracleParameter<std::string> : public MiracleParameterBase<std::string> { + public: +- constexpr MiracleParameter(const base::Feature* feature, ++ // XXXROBERT ++ MiracleParameter(const base::Feature* feature, + const char* param_name, + std::string default_value) + : MiracleParameterBase(feature, param_name, std::move(default_value)) {} diff --git a/www/iridium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc b/www/iridium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc index 2c9fc7f0faf5..f9412560483e 100644 --- a/www/iridium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc +++ b/www/iridium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc @@ -1,6 +1,6 @@ ---- components/network_session_configurator/browser/network_session_configurator.cc.orig 2023-10-21 11:51:27 UTC +--- components/network_session_configurator/browser/network_session_configurator.cc.orig 2023-11-22 14:00:11 UTC +++ components/network_session_configurator/browser/network_session_configurator.cc -@@ -793,7 +793,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C +@@ -801,7 +801,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C // backport, having it behave differently than in stable would be a bigger // problem. TODO: Does this work in later macOS releases? #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/iridium/files/patch-components_optimization__guide_core_optimization__guide__util.cc b/www/iridium/files/patch-components_optimization__guide_core_optimization__guide__util.cc index cbe1419b6301..e95cf346a254 100644 --- a/www/iridium/files/patch-components_optimization__guide_core_optimization__guide__util.cc +++ b/www/iridium/files/patch-components_optimization__guide_core_optimization__guide__util.cc @@ -1,6 +1,6 @@ ---- components/optimization_guide/core/optimization_guide_util.cc.orig 2022-12-01 10:35:46 UTC +--- components/optimization_guide/core/optimization_guide_util.cc.orig 2023-11-22 14:00:11 UTC +++ components/optimization_guide/core/optimization_guide_util.cc -@@ -27,7 +27,7 @@ optimization_guide::proto::Platform GetPlatform() { +@@ -34,7 +34,7 @@ optimization_guide::proto::Platform GetPlatform() { return optimization_guide::proto::PLATFORM_CHROMEOS; #elif BUILDFLAG(IS_ANDROID) return optimization_guide::proto::PLATFORM_ANDROID; diff --git a/www/iridium/files/patch-components_password__manager_core_browser_features_password__features.cc b/www/iridium/files/patch-components_password__manager_core_browser_features_password__features.cc new file mode 100644 index 000000000000..7c6123520edb --- /dev/null +++ b/www/iridium/files/patch-components_password__manager_core_browser_features_password__features.cc @@ -0,0 +1,11 @@ +--- components/password_manager/core/browser/features/password_features.cc.orig 2023-11-22 14:00:11 UTC ++++ components/password_manager/core/browser/features/password_features.cc +@@ -20,7 +20,7 @@ BASE_FEATURE(kBiometricTouchToFill, + // Delete undecryptable passwords from the store when Sync is active. + BASE_FEATURE(kClearUndecryptablePasswordsOnSync, + "ClearUndecryptablePasswordsInSync", +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + base::FEATURE_ENABLED_BY_DEFAULT + #else + base::FEATURE_DISABLED_BY_DEFAULT diff --git a/www/iridium/files/patch-components_password__manager_core_browser_login__database.cc b/www/iridium/files/patch-components_password__manager_core_browser_login__database.cc deleted file mode 100644 index 512fa34e3e91..000000000000 --- a/www/iridium/files/patch-components_password__manager_core_browser_login__database.cc +++ /dev/null @@ -1,29 +0,0 @@ ---- components/password_manager/core/browser/login_database.cc.orig 2023-10-21 11:51:27 UTC -+++ components/password_manager/core/browser/login_database.cc -@@ -1050,7 +1050,7 @@ std::string GeneratePlaceholders(size_t count) { - return result; - } - --#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Fills |form| with necessary data required to be removed from the database - // and returns it. - PasswordForm GetFormForRemoval(sql::Statement& statement) { -@@ -1067,7 +1067,7 @@ PasswordForm GetFormForRemoval(sql::Statement& stateme - // Whether we should try to return the decryptable passwords while the - // encryption service fails for some passwords. - bool ShouldReturnPartialPasswords() { --#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - return base::FeatureList::IsEnabled(features::kSkipUndecryptablePasswords); - #else - return false; -@@ -1959,7 +1959,7 @@ bool LoginDatabase::DeleteAndRecreateDatabaseFile() { - } - - DatabaseCleanupResult LoginDatabase::DeleteUndecryptableLogins() { --#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - TRACE_EVENT0("passwords", "LoginDatabase::DeleteUndecryptableLogins"); - // If the Keychain in MacOS or the real secret key in Linux is unavailable, - // don't delete any logins. diff --git a/www/iridium/files/patch-components_password__manager_core_browser_login__database__unittest.cc b/www/iridium/files/patch-components_password__manager_core_browser_login__database__unittest.cc index 1dc38a21c51c..8e948c2fac49 100644 --- a/www/iridium/files/patch-components_password__manager_core_browser_login__database__unittest.cc +++ b/www/iridium/files/patch-components_password__manager_core_browser_login__database__unittest.cc @@ -1,29 +1,11 @@ ---- components/password_manager/core/browser/login_database_unittest.cc.orig 2023-10-21 11:51:27 UTC +--- components/password_manager/core/browser/login_database_unittest.cc.orig 2023-11-22 14:00:11 UTC +++ components/password_manager/core/browser/login_database_unittest.cc -@@ -2222,7 +2222,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, DeleteUnd - base::HistogramTester histogram_tester; - ASSERT_TRUE(db.Init()); +@@ -2100,7 +2100,7 @@ INSTANTIATE_TEST_SUITE_P(MigrationToVCurrent, + LoginDatabaseMigrationTestBroken, + testing::Values(1, 2, 3, 24)); --#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) -+#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) || BUILDFLAG(IS_BSD) - // Make sure that we can't get any logins when database is corrupted. - // Disabling the checks in chromecast because encryption is unavailable. - std::vector<std::unique_ptr<PasswordForm>> result; -@@ -2249,7 +2249,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, DeleteUnd - #endif - - // Check histograms. --#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) -+#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) || BUILDFLAG(IS_BSD) - histogram_tester.ExpectUniqueSample( - "PasswordManager.DeleteUndecryptableLoginsReturnValue", - metrics_util::DeleteCorruptedPasswordsResult::kSuccessPasswordsDeleted, -@@ -2292,7 +2292,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, KeychainL - } - #endif // BUILDFLAG(IS_MAC) - --#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Test getting auto sign in logins when there are undecryptable ones - TEST_F(LoginDatabaseUndecryptableLoginsTest, GetAutoSignInLogins) { - std::vector<std::unique_ptr<PasswordForm>> forms; +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_IOS) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD) + class LoginDatabaseUndecryptableLoginsTest : public testing::Test { + protected: + LoginDatabaseUndecryptableLoginsTest() = default; diff --git a/www/iridium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc b/www/iridium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc index 958d91153503..32452041c189 100644 --- a/www/iridium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc +++ b/www/iridium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc @@ -1,15 +1,6 @@ ---- components/password_manager/core/browser/sync/password_sync_bridge.cc.orig 2023-10-21 11:51:27 UTC +--- components/password_manager/core/browser/sync/password_sync_bridge.cc.orig 2023-11-22 14:00:11 UTC +++ components/password_manager/core/browser/sync/password_sync_bridge.cc -@@ -191,7 +191,7 @@ bool IsCredentialPhished(const sync_pb::PasswordSpecif - // merge. - bool ShouldRecoverPasswordsDuringMerge() { - // Delete the local undecryptable copy when this is MacOS or Linux only. --#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - return true; - #else - return false; -@@ -199,7 +199,7 @@ bool ShouldRecoverPasswordsDuringMerge() { +@@ -197,7 +197,7 @@ bool ShouldRecoverPasswordsDuringMerge() { } bool ShouldCleanSyncMetadataDuringStartupWhenDecryptionFails() { diff --git a/www/iridium/files/patch-components_password__manager_core_browser_ui_passwords__grouper.cc b/www/iridium/files/patch-components_password__manager_core_browser_ui_passwords__grouper.cc deleted file mode 100644 index 00b590a8a548..000000000000 --- a/www/iridium/files/patch-components_password__manager_core_browser_ui_passwords__grouper.cc +++ /dev/null @@ -1,14 +0,0 @@ ---- components/password_manager/core/browser/ui/passwords_grouper.cc.orig 2023-10-21 11:51:27 UTC -+++ components/password_manager/core/browser/ui/passwords_grouper.cc -@@ -277,7 +277,11 @@ absl::optional<PasskeyCredential> PasswordsGrouper::Ge - const std::vector<PasskeyCredential>& passkeys = - map_group_id_to_credentials_[group_id_iterator->second].passkeys; - const auto passkey_it = -+#if (_LIBCPP_VERSION >= 160000) - std::ranges::find_if(passkeys, [&credential](const auto& passkey) { -+#else -+ base::ranges::find_if(passkeys, [&credential](const auto& passkey) { -+#endif - return credential.passkey_credential_id == passkey.credential_id(); - }); - if (passkey_it == passkeys.end()) { diff --git a/www/iridium/files/patch-components_password__manager_core_common_password__manager__features.cc b/www/iridium/files/patch-components_password__manager_core_common_password__manager__features.cc index 60980c29c260..f025f0d0e6cb 100644 --- a/www/iridium/files/patch-components_password__manager_core_common_password__manager__features.cc +++ b/www/iridium/files/patch-components_password__manager_core_common_password__manager__features.cc @@ -1,4 +1,4 @@ ---- components/password_manager/core/common/password_manager_features.cc.orig 2023-10-21 11:51:27 UTC +--- components/password_manager/core/common/password_manager_features.cc.orig 2023-11-22 14:00:11 UTC +++ components/password_manager/core/common/password_manager_features.cc @@ -18,7 +18,7 @@ BASE_FEATURE(kEnableOverwritingPlaceholderUsernames, "EnableOverwritingPlaceholderUsernames", @@ -9,12 +9,3 @@ // When enabled, initial sync will be forced during startup if the password // store has encryption service failures. BASE_FEATURE(kForceInitialSyncWhenDecryptionFails, -@@ -99,7 +99,7 @@ BASE_FEATURE(kRecoverFromNeverSaveAndroid, - "RecoverFromNeverSaveAndroid_LAUNCHED", - base::FEATURE_ENABLED_BY_DEFAULT); - --#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Displays at least the decryptable and never saved logins in the password - // manager - BASE_FEATURE(kSkipUndecryptablePasswords, diff --git a/www/iridium/files/patch-components_password__manager_core_common_password__manager__features.h b/www/iridium/files/patch-components_password__manager_core_common_password__manager__features.h index 2a6ba2af344f..fb0b9e1102a6 100644 --- a/www/iridium/files/patch-components_password__manager_core_common_password__manager__features.h +++ b/www/iridium/files/patch-components_password__manager_core_common_password__manager__features.h @@ -1,4 +1,4 @@ ---- components/password_manager/core/common/password_manager_features.h.orig 2023-10-21 11:51:27 UTC +--- components/password_manager/core/common/password_manager_features.h.orig 2023-11-22 14:00:11 UTC +++ components/password_manager/core/common/password_manager_features.h @@ -24,7 +24,7 @@ namespace password_manager::features { // alongside the definition of their values in the .cc file. @@ -9,12 +9,3 @@ BASE_DECLARE_FEATURE(kForceInitialSyncWhenDecryptionFails); #endif BASE_DECLARE_FEATURE(kForgotPasswordFormSupport); -@@ -43,7 +43,7 @@ BASE_DECLARE_FEATURE(kPasswordGenerationExperiment); - #endif - BASE_DECLARE_FEATURE(kPasswordsImportM2); - BASE_DECLARE_FEATURE(kRecoverFromNeverSaveAndroid); --#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - BASE_DECLARE_FEATURE(kSkipUndecryptablePasswords); - #endif - #if BUILDFLAG(IS_ANDROID) diff --git a/www/iridium/files/patch-components_performance__manager_public_features.h b/www/iridium/files/patch-components_performance__manager_public_features.h index b779352f41dc..a4f5010b8abe 100644 --- a/www/iridium/files/patch-components_performance__manager_public_features.h +++ b/www/iridium/files/patch-components_performance__manager_public_features.h @@ -1,11 +1,11 @@ ---- components/performance_manager/public/features.h.orig 2023-07-24 14:27:53 UTC +--- components/performance_manager/public/features.h.orig 2023-11-22 14:00:11 UTC +++ components/performance_manager/public/features.h @@ -28,7 +28,7 @@ BASE_DECLARE_FEATURE(kRunOnDedicatedThreadPoolThread); #if !BUILDFLAG(IS_ANDROID) --#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #define URGENT_DISCARDING_FROM_PERFORMANCE_MANAGER() false #else #define URGENT_DISCARDING_FROM_PERFORMANCE_MANAGER() true diff --git a/www/iridium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc b/www/iridium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc index 6c12786d2141..91aa3db426c1 100644 --- a/www/iridium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc +++ b/www/iridium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc @@ -1,6 +1,6 @@ ---- components/policy/core/common/cloud/cloud_policy_client.cc.orig 2023-07-24 14:27:53 UTC +--- components/policy/core/common/cloud/cloud_policy_client.cc.orig 2023-11-22 14:00:11 UTC +++ components/policy/core/common/cloud/cloud_policy_client.cc -@@ -455,7 +455,7 @@ void CloudPolicyClient::FetchPolicy() { +@@ -507,7 +507,7 @@ void CloudPolicyClient::FetchPolicy(PolicyFetchReason fetch_request->set_invalidation_payload(invalidation_payload_); } } diff --git a/www/iridium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc b/www/iridium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc index a2724b7b2ede..2f70f360f6c4 100644 --- a/www/iridium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc +++ b/www/iridium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc @@ -1,4 +1,4 @@ ---- components/policy/core/common/cloud/cloud_policy_util.cc.orig 2023-10-21 11:51:27 UTC +--- components/policy/core/common/cloud/cloud_policy_util.cc.orig 2023-11-22 14:00:11 UTC +++ components/policy/core/common/cloud/cloud_policy_util.cc @@ -20,7 +20,7 @@ #endif @@ -35,7 +35,7 @@ char hostname[HOST_NAME_MAX]; if (gethostname(hostname, HOST_NAME_MAX) == 0) // Success. return hostname; -@@ -144,7 +149,7 @@ std::string GetMachineName() { +@@ -143,7 +148,7 @@ std::string GetMachineName() { std::string GetOSVersion() { #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \ @@ -44,7 +44,7 @@ return base::SysInfo::OperatingSystemVersion(); #elif BUILDFLAG(IS_WIN) base::win::OSInfo::VersionNumber version_number = -@@ -167,7 +172,7 @@ std::string GetOSArchitecture() { +@@ -166,7 +171,7 @@ std::string GetOSArchitecture() { } std::string GetOSUsername() { diff --git a/www/iridium/files/patch-components_segmentation__platform_embedder_default__model_cross__device__user__segment.cc b/www/iridium/files/patch-components_segmentation__platform_embedder_default__model_cross__device__user__segment.cc index d4d56bb5ef2e..79468df8ee03 100644 --- a/www/iridium/files/patch-components_segmentation__platform_embedder_default__model_cross__device__user__segment.cc +++ b/www/iridium/files/patch-components_segmentation__platform_embedder_default__model_cross__device__user__segment.cc @@ -1,6 +1,6 @@ ---- components/segmentation_platform/embedder/default_model/cross_device_user_segment.cc.orig 2023-10-21 11:51:27 UTC +--- components/segmentation_platform/embedder/default_model/cross_device_user_segment.cc.orig 2023-11-22 14:00:11 UTC +++ components/segmentation_platform/embedder/default_model/cross_device_user_segment.cc -@@ -179,7 +179,7 @@ void CrossDeviceUserSegment::ExecuteModelWithInput( +@@ -148,7 +148,7 @@ void CrossDeviceUserSegment::ExecuteModelWithInput( // Check for current device type and subtract it from the device count // calculation. #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ diff --git a/www/iridium/files/patch-components_services_screen__ai_screen__ai__library__wrapper.cc b/www/iridium/files/patch-components_services_screen__ai_screen__ai__library__wrapper.cc index 2f4e1abf9d4e..19f1df225805 100644 --- a/www/iridium/files/patch-components_services_screen__ai_screen__ai__library__wrapper.cc +++ b/www/iridium/files/patch-components_services_screen__ai_screen__ai__library__wrapper.cc @@ -1,6 +1,6 @@ ---- components/services/screen_ai/screen_ai_library_wrapper.cc.orig 2023-10-21 11:51:27 UTC +--- components/services/screen_ai/screen_ai_library_wrapper.cc.orig 2023-11-22 14:00:11 UTC +++ components/services/screen_ai/screen_ai_library_wrapper.cc -@@ -187,7 +187,7 @@ ScreenAILibraryWrapper::PerformOcr(const SkBitmap& ima +@@ -190,7 +190,7 @@ ScreenAILibraryWrapper::PerformOcr(const SkBitmap& ima // TODO(crbug.com/1443341): Remove this after fixing the crash issue on Linux // official. @@ -9,7 +9,7 @@ free_library_allocated_char_array_(library_buffer.release()); #endif -@@ -219,7 +219,7 @@ ScreenAILibraryWrapper::ExtractLayout(const SkBitmap& +@@ -222,7 +222,7 @@ ScreenAILibraryWrapper::ExtractLayout(const SkBitmap& // TODO(crbug.com/1443341): Remove this after fixing the crash issue on Linux // official. @@ -18,7 +18,7 @@ free_library_allocated_char_array_(library_buffer.release()); #endif -@@ -253,7 +253,7 @@ absl::optional<std::vector<int32_t>> ScreenAILibraryWr +@@ -256,7 +256,7 @@ absl::optional<std::vector<int32_t>> ScreenAILibraryWr // TODO(crbug.com/1443341): Remove this after fixing the crash issue on Linux // official. diff --git a/www/iridium/files/patch-components_storage__monitor_BUILD.gn b/www/iridium/files/patch-components_storage__monitor_BUILD.gn index 5878b9d26a5a..b718e2977be6 100644 --- a/www/iridium/files/patch-components_storage__monitor_BUILD.gn +++ b/www/iridium/files/patch-components_storage__monitor_BUILD.gn @@ -1,6 +1,6 @@ ---- components/storage_monitor/BUILD.gn.orig 2022-12-06 08:09:13 UTC +--- components/storage_monitor/BUILD.gn.orig 2023-11-22 14:00:11 UTC +++ components/storage_monitor/BUILD.gn -@@ -74,7 +74,7 @@ static_library("storage_monitor") { +@@ -77,7 +77,7 @@ static_library("storage_monitor") { deps += [ "//services/device/public/mojom" ] } } else if (is_linux || is_chromeos_lacros) { @@ -9,7 +9,7 @@ sources += [ "mtab_watcher_linux.cc", "mtab_watcher_linux.h", -@@ -178,7 +178,7 @@ source_set("unit_tests") { +@@ -184,7 +184,7 @@ source_set("unit_tests") { "storage_monitor_chromeos_unittest.cc", ] } diff --git a/www/iridium/files/patch-components_user__education_common_product__messaging__controller.cc b/www/iridium/files/patch-components_user__education_common_product__messaging__controller.cc new file mode 100644 index 000000000000..810724d04c1c --- /dev/null +++ b/www/iridium/files/patch-components_user__education_common_product__messaging__controller.cc @@ -0,0 +1,10 @@ +--- components/user_education/common/product_messaging_controller.cc.orig 2023-11-22 14:00:11 UTC ++++ components/user_education/common/product_messaging_controller.cc +@@ -6,6 +6,7 @@ + + #include <sstream> + #include <utility> ++#include <vector> + + #include "base/containers/contains.h" + #include "base/functional/callback.h" diff --git a/www/iridium/files/patch-components_user__education_views_help__bubble__view.cc b/www/iridium/files/patch-components_user__education_views_help__bubble__view.cc index 22338de50855..0f2099557c70 100644 --- a/www/iridium/files/patch-components_user__education_views_help__bubble__view.cc +++ b/www/iridium/files/patch-components_user__education_views_help__bubble__view.cc @@ -1,6 +1,6 @@ ---- components/user_education/views/help_bubble_view.cc.orig 2023-10-21 11:51:27 UTC +--- components/user_education/views/help_bubble_view.cc.orig 2023-11-22 14:00:11 UTC +++ components/user_education/views/help_bubble_view.cc -@@ -991,7 +991,7 @@ gfx::Rect HelpBubbleView::GetAnchorRect() const { +@@ -997,7 +997,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/iridium/files/patch-components_variations_service_google__groups__updater__service.cc b/www/iridium/files/patch-components_variations_service_google__groups__updater__service.cc deleted file mode 100644 index 7f2e8ac30181..000000000000 --- a/www/iridium/files/patch-components_variations_service_google__groups__updater__service.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- components/variations/service/google_groups_updater_service.cc.orig 2023-10-21 11:51:27 UTC -+++ components/variations/service/google_groups_updater_service.cc -@@ -15,7 +15,7 @@ - // information from per-profile data to local-state. - BASE_FEATURE(kVariationsGoogleGroupFiltering, - "VariationsGoogleGroupFiltering", --#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_ENABLED_BY_DEFAULT - #else - // TODO(b/286365351): launch on Android, iOS and ChromeOS. diff --git a/www/iridium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc b/www/iridium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc index 3a35878e85ba..9a56c86ee52b 100644 --- a/www/iridium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc +++ b/www/iridium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc @@ -1,11 +1,11 @@ ---- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2023-10-21 11:51:27 UTC +--- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2023-11-22 14:00:11 UTC +++ components/viz/service/display_embedder/skia_output_surface_impl.cc -@@ -1485,7 +1485,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor - ->GetDeviceQueue() - ->GetVulkanPhysicalDevice(), - VK_IMAGE_TILING_OPTIMAL, ycbcr_info); --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +@@ -1512,7 +1512,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor + ->GetDeviceQueue() + ->GetVulkanPhysicalDevice(), + VK_IMAGE_TILING_OPTIMAL, vk_format, yuv_color_space, ycbcr_info); +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Textures that were allocated _on linux_ with ycbcr info came from // VaapiVideoDecoder, which exports using DRM format modifiers. return GrBackendFormats::MakeVk(gr_ycbcr_info, diff --git a/www/iridium/files/patch-components_viz_service_display_skia__renderer.cc b/www/iridium/files/patch-components_viz_service_display_skia__renderer.cc index a750b081282d..c657f82dbf31 100644 --- a/www/iridium/files/patch-components_viz_service_display_skia__renderer.cc +++ b/www/iridium/files/patch-components_viz_service_display_skia__renderer.cc @@ -1,6 +1,6 @@ ---- components/viz/service/display/skia_renderer.cc.orig 2023-10-21 11:51:27 UTC +--- components/viz/service/display/skia_renderer.cc.orig 2023-11-22 14:00:11 UTC +++ components/viz/service/display/skia_renderer.cc -@@ -1218,7 +1218,7 @@ void SkiaRenderer::ClearFramebuffer() { +@@ -1219,7 +1219,7 @@ void SkiaRenderer::ClearFramebuffer() { if (current_frame()->current_render_pass->has_transparent_background) { ClearCanvas(SkColors::kTransparent); } else { diff --git a/www/iridium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc b/www/iridium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc index ae5b91824897..fc914946c527 100644 --- a/www/iridium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc +++ b/www/iridium/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 2023-10-21 11:51:27 UTC +--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2023-11-22 14:00:11 UTC +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc @@ -110,7 +110,7 @@ RootCompositorFrameSinkImpl::Create( @@ -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); -@@ -709,7 +709,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw +@@ -714,7 +714,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw display_client_->DidCompleteSwapWithSize(pixel_size); // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/iridium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h b/www/iridium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h index b4dcd93c18ad..5f2b820131a0 100644 --- a/www/iridium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h +++ b/www/iridium/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 2023-10-21 11:51:27 UTC +--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig 2023-11-22 14:00:11 UTC +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h -@@ -211,7 +211,7 @@ class VIZ_SERVICE_EXPORT RootCompositorFrameSinkImpl +@@ -212,7 +212,7 @@ class VIZ_SERVICE_EXPORT RootCompositorFrameSinkImpl // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/iridium/files/patch-components_webauthn_core_browser_passkey__sync__bridge.cc b/www/iridium/files/patch-components_webauthn_core_browser_passkey__sync__bridge.cc deleted file mode 100644 index 21d75a93a297..000000000000 --- a/www/iridium/files/patch-components_webauthn_core_browser_passkey__sync__bridge.cc +++ /dev/null @@ -1,26 +0,0 @@ ---- components/webauthn/core/browser/passkey_sync_bridge.cc.orig 2023-10-21 11:51:27 UTC -+++ components/webauthn/core/browser/passkey_sync_bridge.cc -@@ -258,7 +258,11 @@ PasskeySyncBridge::GetPasskeysForRelyingPartyId( - bool PasskeySyncBridge::DeletePasskey(const std::string& credential_id) { - // Find the credential with the given |credential_id|. - const auto passkey_it = -+#if (_LIBCPP_VERSION >= 160000) - std::ranges::find_if(data_, [&credential_id](const auto& passkey) { -+#else -+ base::ranges::find_if(data_, [&credential_id](const auto& passkey) { -+#endif - return passkey.second.credential_id() == credential_id; - }); - if (passkey_it == data_.end()) { -@@ -309,7 +313,11 @@ bool PasskeySyncBridge::UpdatePasskey(const std::strin - PasskeyChange change) { - // Find the credential with the given |credential_id|. - const auto passkey_it = -+#if (_LIBCPP_VERSION >= 160000) - std::ranges::find_if(data_, [&credential_id](const auto& passkey) { -+#else -+ base::ranges::find_if(data_, [&credential_id](const auto& passkey) { -+#endif - return passkey.second.credential_id() == credential_id; - }); - if (passkey_it == data_.end()) { diff --git a/www/iridium/files/patch-content_app_content__main.cc b/www/iridium/files/patch-content_app_content__main.cc index 84622b79eb7b..e6da55dbf73f 100644 --- a/www/iridium/files/patch-content_app_content__main.cc +++ b/www/iridium/files/patch-content_app_content__main.cc @@ -1,6 +1,6 @@ ---- content/app/content_main.cc.orig 2023-03-13 07:33:08 UTC +--- content/app/content_main.cc.orig 2023-11-22 14:00:11 UTC +++ content/app/content_main.cc -@@ -205,7 +205,7 @@ RunContentProcess(ContentMainParams params, +@@ -206,7 +206,7 @@ RunContentProcess(ContentMainParams params, #endif base::EnableTerminationOnOutOfMemory(); diff --git a/www/iridium/files/patch-content_app_content__main__runner__impl.cc b/www/iridium/files/patch-content_app_content__main__runner__impl.cc index cfacdf5a1596..c8ee99e2acaf 100644 --- a/www/iridium/files/patch-content_app_content__main__runner__impl.cc +++ b/www/iridium/files/patch-content_app_content__main__runner__impl.cc @@ -1,6 +1,6 @@ ---- content/app/content_main_runner_impl.cc.orig 2023-10-21 11:51:27 UTC +--- content/app/content_main_runner_impl.cc.orig 2023-11-22 14:00:11 UTC +++ content/app/content_main_runner_impl.cc -@@ -142,13 +142,13 @@ +@@ -144,13 +144,13 @@ #include "content/browser/posix_file_descriptor_info_impl.h" #include "content/public/common/content_descriptors.h" @@ -16,7 +16,7 @@ #include "base/files/file_path_watcher_inotify.h" #include "base/native_library.h" #include "base/rand_util.h" -@@ -186,6 +186,10 @@ +@@ -188,6 +188,10 @@ #include "media/base/media_switches.h" #endif @@ -27,7 +27,7 @@ #if BUILDFLAG(IS_ANDROID) #include "base/system/sys_info.h" #include "content/browser/android/battery_metrics.h" -@@ -372,7 +376,7 @@ void InitializeZygoteSandboxForBrowserProcess( +@@ -374,7 +378,7 @@ void InitializeZygoteSandboxForBrowserProcess( } #endif // BUILDFLAG(USE_ZYGOTE) @@ -36,7 +36,7 @@ #if BUILDFLAG(ENABLE_PPAPI) // Loads the (native) libraries but does not initialize them (i.e., does not -@@ -410,7 +414,10 @@ void PreloadLibraryCdms() { +@@ -412,7 +416,10 @@ void PreloadLibraryCdms() { void PreSandboxInit() { // Ensure the /dev/urandom is opened. @@ -47,7 +47,7 @@ // May use sysinfo(), sched_getaffinity(), and open various /sys/ and /proc/ // files. -@@ -421,9 +428,16 @@ void PreSandboxInit() { +@@ -424,9 +431,16 @@ void PreSandboxInit() { // https://boringssl.googlesource.com/boringssl/+/HEAD/SANDBOXING.md CRYPTO_pre_sandbox_init(); @@ -64,7 +64,7 @@ #if BUILDFLAG(ENABLE_PPAPI) // Ensure access to the Pepper plugins before the sandbox is turned on. -@@ -830,11 +844,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -833,11 +847,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam kFieldTrialDescriptor + base::GlobalDescriptors::kBaseDescriptor); #endif // !BUILDFLAG(IS_ANDROID) @@ -78,7 +78,7 @@ #endif // !BUILDFLAG(IS_WIN) -@@ -1029,8 +1042,20 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -1033,8 +1046,20 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam process_type == switches::kZygoteProcess) { PreSandboxInit(); } @@ -99,7 +99,7 @@ delegate_->SandboxInitialized(process_type); #if BUILDFLAG(USE_ZYGOTE) -@@ -1098,7 +1123,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { +@@ -1102,7 +1127,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { ->ReconfigureAfterFeatureListInit(process_type); } @@ -108,7 +108,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 -@@ -1133,6 +1158,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { +@@ -1137,6 +1162,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { content_main_params_.reset(); RegisterMainThreadFactories(); diff --git a/www/iridium/files/patch-content_browser_BUILD.gn b/www/iridium/files/patch-content_browser_BUILD.gn index 482ae9a73181..ba96ac6f6fd3 100644 --- a/www/iridium/files/patch-content_browser_BUILD.gn +++ b/www/iridium/files/patch-content_browser_BUILD.gn @@ -1,6 +1,6 @@ ---- content/browser/BUILD.gn.orig 2023-10-21 11:51:27 UTC +--- content/browser/BUILD.gn.orig 2023-11-22 14:00:11 UTC +++ content/browser/BUILD.gn -@@ -2461,6 +2461,13 @@ source_set("browser") { +@@ -2462,6 +2462,13 @@ source_set("browser") { deps += [ "//media/mojo/mojom/stable:stable_video_decoder" ] } diff --git a/www/iridium/files/patch-content_browser_browser__main__loop.cc b/www/iridium/files/patch-content_browser_browser__main__loop.cc index ae97935b53ba..0fcd75f12a8a 100644 --- a/www/iridium/files/patch-content_browser_browser__main__loop.cc +++ b/www/iridium/files/patch-content_browser_browser__main__loop.cc @@ -1,6 +1,6 @@ ---- content/browser/browser_main_loop.cc.orig 2023-10-21 11:51:27 UTC +--- content/browser/browser_main_loop.cc.orig 2023-11-22 14:00:11 UTC +++ content/browser/browser_main_loop.cc -@@ -246,6 +246,12 @@ +@@ -247,6 +247,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 -@@ -539,6 +545,12 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -540,6 +546,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 -@@ -576,7 +588,7 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -577,7 +589,7 @@ int BrowserMainLoop::EarlyInitialization() { base::PlatformThread::SetCurrentThreadType(base::ThreadType::kCompositing); #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/iridium/files/patch-content_browser_child__process__launcher__helper.h b/www/iridium/files/patch-content_browser_child__process__launcher__helper.h new file mode 100644 index 000000000000..bf46c747d233 --- /dev/null +++ b/www/iridium/files/patch-content_browser_child__process__launcher__helper.h @@ -0,0 +1,11 @@ +--- content/browser/child_process_launcher_helper.h.orig 2023-11-22 14:00:11 UTC ++++ content/browser/child_process_launcher_helper.h +@@ -262,7 +262,7 @@ class ChildProcessLauncherHelper + std::unique_ptr<SandboxedProcessLauncherDelegate> delegate_; + base::WeakPtr<ChildProcessLauncher> child_process_launcher_; + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // The priority of the process. The state is stored to avoid changing the + // setting repeatedly. + absl::optional<base::Process::Priority> priority_; diff --git a/www/iridium/files/patch-content_browser_child__process__launcher__helper__linux.cc b/www/iridium/files/patch-content_browser_child__process__launcher__helper__linux.cc index 13d666acfd34..7359e1866878 100644 --- a/www/iridium/files/patch-content_browser_child__process__launcher__helper__linux.cc +++ b/www/iridium/files/patch-content_browser_child__process__launcher__helper__linux.cc @@ -1,4 +1,4 @@ ---- content/browser/child_process_launcher_helper_linux.cc.orig 2023-10-21 11:51:27 UTC +--- content/browser/child_process_launcher_helper_linux.cc.orig 2023-11-22 14:00:11 UTC +++ content/browser/child_process_launcher_helper_linux.cc @@ -21,7 +21,9 @@ #include "content/public/common/result_codes.h" @@ -109,7 +109,7 @@ } void ChildProcessLauncherHelper::SetProcessPriorityOnLauncherThread( -@@ -178,11 +198,13 @@ void ChildProcessLauncherHelper::SetProcessPriorityOnL +@@ -179,11 +199,13 @@ void ChildProcessLauncherHelper::SetProcessPriorityOnL } } diff --git a/www/iridium/files/patch-content_browser_devtools_devtools__frontend__host__impl.cc b/www/iridium/files/patch-content_browser_devtools_devtools__frontend__host__impl.cc new file mode 100644 index 000000000000..23d47e989947 --- /dev/null +++ b/www/iridium/files/patch-content_browser_devtools_devtools__frontend__host__impl.cc @@ -0,0 +1,38 @@ +--- content/browser/devtools/devtools_frontend_host_impl.cc.orig 2023-11-22 14:00:11 UTC ++++ content/browser/devtools/devtools_frontend_host_impl.cc +@@ -22,7 +22,7 @@ + #include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h" + #include "ui/base/webui/resource_path.h" + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include "components/crash/content/browser/error_reporting/javascript_error_report.h" // nogncheck + #include "components/crash/content/browser/error_reporting/js_error_report_processor.h" // nogncheck + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +@@ -37,7 +37,7 @@ const char kCompatibilityScriptSourceURL[] = + "\n//# " + "sourceURL=devtools://devtools/bundled/devtools_compatibility.js"; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // Remove the pieces of the URL we don't want to send back with the error + // reports. In particular, do not send query or fragments as those can have + // privacy-sensitive information in them. +@@ -107,7 +107,7 @@ DevToolsFrontendHostImpl::DevToolsFrontendHostImpl( + const HandleMessageCallback& handle_message_callback) + : web_contents_(WebContents::FromRenderFrameHost(frame_host)), + handle_message_callback_(handle_message_callback) { +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + Observe(web_contents_); + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) + mojo::AssociatedRemote<blink::mojom::DevToolsFrontend> frontend; +@@ -132,7 +132,7 @@ void DevToolsFrontendHostImpl::DispatchEmbedderMessage + handle_message_callback_.Run(std::move(message)); + } + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + void DevToolsFrontendHostImpl::OnDidAddMessageToConsole( + RenderFrameHost* source_frame, + blink::mojom::ConsoleMessageLevel log_level, diff --git a/www/iridium/files/patch-content_browser_devtools_devtools__frontend__host__impl.h b/www/iridium/files/patch-content_browser_devtools_devtools__frontend__host__impl.h new file mode 100644 index 000000000000..390f07543c26 --- /dev/null +++ b/www/iridium/files/patch-content_browser_devtools_devtools__frontend__host__impl.h @@ -0,0 +1,11 @@ +--- content/browser/devtools/devtools_frontend_host_impl.h.orig 2023-11-22 14:00:11 UTC ++++ content/browser/devtools/devtools_frontend_host_impl.h +@@ -33,7 +33,7 @@ class DevToolsFrontendHostImpl : public DevToolsFronte + + void BadMessageReceived() override; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + void OnDidAddMessageToConsole( + RenderFrameHost* source_frame, + blink::mojom::ConsoleMessageLevel log_level, diff --git a/www/iridium/files/patch-content_browser_file__system__access_file__system__access__local__path__watcher.cc b/www/iridium/files/patch-content_browser_file__system__access_file__system__access__local__path__watcher.cc index b2713488c2fd..a41548a9d262 100644 --- a/www/iridium/files/patch-content_browser_file__system__access_file__system__access__local__path__watcher.cc +++ b/www/iridium/files/patch-content_browser_file__system__access_file__system__access__local__path__watcher.cc @@ -1,6 +1,6 @@ ---- content/browser/file_system_access/file_system_access_local_path_watcher.cc.orig 2023-10-21 11:51:27 UTC +--- content/browser/file_system_access/file_system_access_local_path_watcher.cc.orig 2023-11-22 14:00:11 UTC +++ content/browser/file_system_access/file_system_access_local_path_watcher.cc -@@ -56,7 +56,7 @@ void FileSystemAccessLocalPathWatcher::Initialize( +@@ -63,7 +63,7 @@ void FileSystemAccessLocalPathWatcher::Initialize( base::FilePathWatcher::WatchOptions watch_options { .type = scope().IsRecursive() ? base::FilePathWatcher::Type::kRecursive : base::FilePathWatcher::Type::kNonRecursive, diff --git a/www/iridium/files/patch-content_browser_font__access_font__enumeration__data__source.cc b/www/iridium/files/patch-content_browser_font__access_font__enumeration__data__source.cc index 5970c3258ea2..0984442420eb 100644 --- a/www/iridium/files/patch-content_browser_font__access_font__enumeration__data__source.cc +++ b/www/iridium/files/patch-content_browser_font__access_font__enumeration__data__source.cc @@ -1,8 +1,8 @@ ---- content/browser/font_access/font_enumeration_data_source.cc.orig 2022-10-05 07:34:01 UTC +--- content/browser/font_access/font_enumeration_data_source.cc.orig 2023-11-22 14:00:11 UTC +++ content/browser/font_access/font_enumeration_data_source.cc @@ -16,7 +16,7 @@ #include "content/browser/font_access/font_enumeration_data_source_win.h" - #elif BUILDFLAG(IS_MAC) + #elif BUILDFLAG(IS_APPLE) #include "content/browser/font_access/font_enumeration_data_source_mac.h" -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) @@ -11,7 +11,7 @@ @@ -61,7 +61,7 @@ std::unique_ptr<FontEnumerationDataSource> FontEnumera return std::make_unique<FontEnumerationDataSourceWin>(); - #elif BUILDFLAG(IS_MAC) + #elif BUILDFLAG(IS_APPLE) return std::make_unique<FontEnumerationDataSourceMac>(); -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) @@ -20,7 +20,7 @@ return std::make_unique<FontEnumerationDataSourceNull>(); @@ -76,7 +76,7 @@ bool FontEnumerationDataSource::IsOsSupported() { return true; - #elif BUILDFLAG(IS_MAC) + #elif BUILDFLAG(IS_APPLE) return true; -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) diff --git a/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc b/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc index bdc7f25e087b..84fedf4232a4 100644 --- a/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc +++ b/www/iridium/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 2023-10-21 11:51:27 UTC +--- content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2023-11-22 14:00:11 UTC +++ content/browser/gpu/gpu_data_manager_impl_private.cc -@@ -1780,7 +1780,7 @@ void GpuDataManagerImplPrivate::RecordCompositingMode( +@@ -1783,7 +1783,7 @@ void GpuDataManagerImplPrivate::RecordCompositingMode( UMA_HISTOGRAM_ENUMERATION("GPU.CompositingMode", compositing_mode); } diff --git a/www/iridium/files/patch-content_browser_gpu_gpu__process__host.cc b/www/iridium/files/patch-content_browser_gpu_gpu__process__host.cc index fa87b46757a2..37475cde989f 100644 --- a/www/iridium/files/patch-content_browser_gpu_gpu__process__host.cc +++ b/www/iridium/files/patch-content_browser_gpu_gpu__process__host.cc @@ -1,6 +1,6 @@ ---- content/browser/gpu/gpu_process_host.cc.orig 2023-10-21 11:51:27 UTC +--- content/browser/gpu/gpu_process_host.cc.orig 2023-11-22 14:00:11 UTC +++ content/browser/gpu/gpu_process_host.cc -@@ -254,6 +254,7 @@ static const char* const kSwitchNames[] = { +@@ -253,6 +253,7 @@ static const char* const kSwitchNames[] = { switches::kEnableBackgroundThreadPool, switches::kEnableGpuRasterization, switches::kEnableLogging, diff --git a/www/iridium/files/patch-content_browser_interest__group_header__direct__from__seller__signals.cc b/www/iridium/files/patch-content_browser_interest__group_header__direct__from__seller__signals.cc index d3cc2cf5d3d9..c6f7265c36dc 100644 --- a/www/iridium/files/patch-content_browser_interest__group_header__direct__from__seller__signals.cc +++ b/www/iridium/files/patch-content_browser_interest__group_header__direct__from__seller__signals.cc @@ -1,6 +1,6 @@ ---- content/browser/interest_group/header_direct_from_seller_signals.cc.orig 2023-10-21 11:51:27 UTC +--- content/browser/interest_group/header_direct_from_seller_signals.cc.orig 2023-11-22 14:00:11 UTC +++ content/browser/interest_group/header_direct_from_seller_signals.cc -@@ -187,7 +187,11 @@ void OnJsonDecoded(std::unique_ptr<const std::set<std: +@@ -206,7 +206,11 @@ void OnJsonDecoded( } // namespace diff --git a/www/iridium/files/patch-content_browser_network__service__instance__impl.cc b/www/iridium/files/patch-content_browser_network__service__instance__impl.cc index e0df16eacc4a..b76074c60172 100644 --- a/www/iridium/files/patch-content_browser_network__service__instance__impl.cc +++ b/www/iridium/files/patch-content_browser_network__service__instance__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/network_service_instance_impl.cc.orig 2023-10-21 11:51:27 UTC +--- content/browser/network_service_instance_impl.cc.orig 2023-11-22 14:00:11 UTC +++ content/browser/network_service_instance_impl.cc -@@ -82,7 +82,7 @@ +@@ -81,7 +81,7 @@ #include "content/browser/network/network_service_process_tracker_win.h" #endif @@ -9,8 +9,8 @@ #include "content/browser/system_dns_resolution/system_dns_resolver.h" #include "services/network/public/mojom/system_dns_resolution.mojom-forward.h" #endif -@@ -421,7 +421,7 @@ void CreateInProcessNetworkService( - #endif +@@ -373,7 +373,7 @@ void CreateInProcessNetworkService( + std::move(receiver))); } -#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) @@ -18,7 +18,7 @@ // Runs a self-owned SystemDnsResolverMojoImpl. This is meant to run on a // high-priority thread pool. void RunSystemDnsResolverOnThreadPool( -@@ -488,7 +488,7 @@ network::mojom::NetworkServiceParamsPtr CreateNetworkS +@@ -440,7 +440,7 @@ network::mojom::NetworkServiceParamsPtr CreateNetworkS } #endif // BUILDFLAG(IS_POSIX) diff --git a/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.cc b/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.cc index 53a2ed517115..5101d502cc0c 100644 --- a/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.cc +++ b/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.cc @@ -1,4 +1,4 @@ ---- content/browser/renderer_host/render_process_host_impl.cc.orig 2023-10-21 11:51:27 UTC +--- content/browser/renderer_host/render_process_host_impl.cc.orig 2023-11-22 14:00:11 UTC +++ content/browser/renderer_host/render_process_host_impl.cc @@ -220,7 +220,7 @@ #include "third_party/blink/public/mojom/android_font_lookup/android_font_lookup.mojom.h" @@ -36,7 +36,7 @@ mojo::Remote<media::mojom::VideoEncodeAcceleratorProviderFactory> video_encode_accelerator_factory_remote_; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -3261,7 +3261,7 @@ void RenderProcessHostImpl::AppendRendererCommandLine( +@@ -3256,7 +3256,7 @@ void RenderProcessHostImpl::AppendRendererCommandLine( base::TimeTicks::UnixEpoch().since_origin().InMicroseconds())); } @@ -45,12 +45,12 @@ // Append `kDisableVideoCaptureUseGpuMemoryBuffer` flag if there is no support // for NV12 GPU memory buffer. if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled() && -@@ -3321,6 +3321,8 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin +@@ -3316,6 +3316,8 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin switches::kDisableSpeechAPI, switches::kDisableThreadedCompositing, switches::kDisableTouchDragDrop, + switches::kDisableUnveil, + switches::kTrk, + switches::kDisableUseSharedImagesForPepperVideo, switches::kDisableV8IdleTasks, switches::kDisableVideoCaptureUseGpuMemoryBuffer, - switches::kDisableWebGLImageChromium, diff --git a/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.h b/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.h index 18f08a0f4ad1..4c557e5dff74 100644 --- a/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.h +++ b/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.h @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_process_host_impl.h.orig 2023-10-21 11:51:27 UTC +--- content/browser/renderer_host/render_process_host_impl.h.orig 2023-11-22 14:00:11 UTC +++ content/browser/renderer_host/render_process_host_impl.h -@@ -540,7 +540,7 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -541,7 +541,7 @@ class CONTENT_EXPORT RenderProcessHostImpl // Sets this RenderProcessHost to be guest only. For Testing only. void SetForGuestsOnlyForTesting(); diff --git a/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc b/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc index 862e5b5e998d..40868782ba38 100644 --- a/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc +++ b/www/iridium/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 2023-10-21 11:51:27 UTC +--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2023-11-22 14:00:11 UTC +++ content/browser/renderer_host/render_widget_host_view_aura.cc @@ -121,7 +121,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/linux/linux_ui.h" -@@ -461,7 +461,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge +@@ -462,7 +462,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge return ToBrowserAccessibilityWin(manager->GetBrowserAccessibilityRoot()) ->GetCOM(); @@ -18,7 +18,7 @@ BrowserAccessibilityManager* manager = host()->GetOrCreateRootBrowserAccessibilityManager(); if (manager && manager->GetBrowserAccessibilityRoot()) -@@ -1720,7 +1720,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() { +@@ -1721,7 +1721,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() { return GetTextInputManager() && GetTextInputManager()->should_do_learning(); } @@ -27,7 +27,7 @@ bool RenderWidgetHostViewAura::SetCompositionFromExistingText( const gfx::Range& range, const std::vector<ui::ImeTextSpan>& ui_ime_text_spans) { -@@ -2565,7 +2565,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { +@@ -2566,7 +2566,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { } bool RenderWidgetHostViewAura::NeedsMouseCapture() { @@ -36,7 +36,7 @@ return NeedsInputGrab(); #else return false; -@@ -2748,7 +2748,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit +@@ -2749,7 +2749,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit if (!target_host) return; diff --git a/www/iridium/files/patch-content_browser_utility__process__host.cc b/www/iridium/files/patch-content_browser_utility__process__host.cc index 754efb816f2e..07806f259c02 100644 --- a/www/iridium/files/patch-content_browser_utility__process__host.cc +++ b/www/iridium/files/patch-content_browser_utility__process__host.cc @@ -1,6 +1,6 @@ ---- content/browser/utility_process_host.cc.orig 2023-10-21 11:51:27 UTC +--- content/browser/utility_process_host.cc.orig 2023-11-22 14:00:11 UTC +++ content/browser/utility_process_host.cc -@@ -59,7 +59,7 @@ +@@ -60,7 +60,7 @@ #include "content/browser/v8_snapshot_files.h" #endif @@ -9,7 +9,7 @@ #include "base/files/file_util.h" #include "base/files/scoped_file.h" #include "base/pickle.h" -@@ -69,7 +69,7 @@ +@@ -70,7 +70,7 @@ #include "media/capture/capture_switches.h" #endif @@ -18,7 +18,7 @@ #include "base/task/sequenced_task_runner.h" #include "components/viz/host/gpu_client.h" #include "media/capture/capture_switches.h" -@@ -80,7 +80,7 @@ namespace content { +@@ -81,7 +81,7 @@ namespace content { namespace { @@ -27,7 +27,7 @@ base::ScopedFD PassNetworkContextParentDirs( std::vector<base::FilePath> network_context_parent_dirs) { base::Pickle pickle; -@@ -129,7 +129,7 @@ UtilityProcessHost::UtilityProcessHost(std::unique_ptr +@@ -130,7 +130,7 @@ UtilityProcessHost::UtilityProcessHost(std::unique_ptr started_(false), name_(u"utility process"), file_data_(std::make_unique<ChildProcessLauncherFileData>()), @@ -36,7 +36,7 @@ gpu_client_(nullptr, base::OnTaskRunnerDeleter(nullptr)), #endif client_(std::move(client)) { -@@ -418,7 +418,7 @@ bool UtilityProcessHost::StartProcess() { +@@ -419,7 +419,7 @@ bool UtilityProcessHost::StartProcess() { file_data_->files_to_preload.merge(GetV8SnapshotFilesToPreload()); #endif // BUILDFLAG(IS_POSIX) @@ -45,7 +45,7 @@ // The network service should have access to the parent directories // necessary for its usage. if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork) { -@@ -429,7 +429,7 @@ bool UtilityProcessHost::StartProcess() { +@@ -430,7 +430,7 @@ bool UtilityProcessHost::StartProcess() { } #endif // BUILDFLAG(IS_LINUX) diff --git a/www/iridium/files/patch-content_browser_web__contents_web__contents__view__aura.cc b/www/iridium/files/patch-content_browser_web__contents_web__contents__view__aura.cc index 4b06bf40670c..3f7b1c21bf11 100644 --- a/www/iridium/files/patch-content_browser_web__contents_web__contents__view__aura.cc +++ b/www/iridium/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 2023-10-21 11:51:27 UTC +--- content/browser/web_contents/web_contents_view_aura.cc.orig 2023-11-22 14:00:11 UTC +++ content/browser/web_contents/web_contents_view_aura.cc @@ -178,7 +178,7 @@ class WebDragSourceAura : public content::WebContentsO raw_ptr<aura::Window> window_; @@ -9,7 +9,7 @@ // Fill out the OSExchangeData with a file contents, synthesizing a name if // necessary. void PrepareDragForFileContents(const DropData& drop_data, -@@ -261,7 +261,7 @@ void PrepareDragData(const DropData& drop_data, +@@ -262,7 +262,7 @@ void PrepareDragData(const DropData& drop_data, if (!drop_data.download_metadata.empty()) PrepareDragForDownload(drop_data, provider, web_contents); #endif @@ -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. -@@ -1340,7 +1340,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent* +@@ -1380,7 +1380,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/iridium/files/patch-content_browser_webid_idp__network__request__manager.cc b/www/iridium/files/patch-content_browser_webid_idp__network__request__manager.cc deleted file mode 100644 index e592bd141359..000000000000 --- a/www/iridium/files/patch-content_browser_webid_idp__network__request__manager.cc +++ /dev/null @@ -1,14 +0,0 @@ ---- content/browser/webid/idp_network_request_manager.cc.orig 2023-10-21 11:51:27 UTC -+++ content/browser/webid/idp_network_request_manager.cc -@@ -604,7 +604,11 @@ void OnTokenRequestParsed( - if (response_error) { - int error_code = response_error->FindInt(kErrorCodeKey).value_or(0); - GURL error_url = ExtractUrl(*response_error, kErrorUrlKey); -+#if defined(__clang__) && (__clang_major__ >= 16) - token_result.error = TokenError(error_code, error_url); -+#else -+ token_result.error = TokenError(TokenError{error_code, error_url}); -+#endif - } - } - diff --git a/www/iridium/files/patch-content_child_child__process.cc b/www/iridium/files/patch-content_child_child__process.cc index 64c480b2574c..d4435c13653c 100644 --- a/www/iridium/files/patch-content_child_child__process.cc +++ b/www/iridium/files/patch-content_child_child__process.cc @@ -1,11 +1,11 @@ ---- content/child/child_process.cc.orig 2023-10-21 11:51:27 UTC +--- content/child/child_process.cc.orig 2023-11-22 14:00:11 UTC +++ content/child/child_process.cc -@@ -70,7 +70,7 @@ ChildProcess::ChildProcess(base::ThreadType io_thread_ +@@ -66,7 +66,7 @@ ChildProcess::ChildProcess(base::ThreadType io_thread_ + thread_pool_init_params) + : resetter_(&child_process, this, nullptr), io_thread_(std::make_unique<ChildIOThread>()) { - const base::CommandLine& command_line = - *base::CommandLine::ForCurrentProcess(); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + const base::CommandLine& command_line = + *base::CommandLine::ForCurrentProcess(); const bool is_embedded_in_browser_process = - !command_line.HasSwitch(switches::kProcessType); - if (IsMojoCoreSharedLibraryEnabled() && !is_embedded_in_browser_process) { diff --git a/www/iridium/files/patch-content_common_BUILD.gn b/www/iridium/files/patch-content_common_BUILD.gn index 50d7651b4118..6015e142107a 100644 --- a/www/iridium/files/patch-content_common_BUILD.gn +++ b/www/iridium/files/patch-content_common_BUILD.gn @@ -1,6 +1,6 @@ ---- content/common/BUILD.gn.orig 2023-10-21 11:51:27 UTC +--- content/common/BUILD.gn.orig 2023-11-22 14:00:11 UTC +++ content/common/BUILD.gn -@@ -435,6 +435,9 @@ if (is_linux || is_chromeos) { +@@ -441,6 +441,9 @@ if (is_linux || is_chromeos) { public = [ "set_process_title_linux.h" ] sources = [ "set_process_title_linux.cc" ] deps = [ "//base" ] @@ -10,7 +10,7 @@ } } -@@ -480,7 +483,7 @@ mojom("mojo_bindings") { +@@ -486,7 +489,7 @@ mojom("mojo_bindings") { if (enable_ipc_logging) { enabled_features += [ "ipc_logging" ] } diff --git a/www/iridium/files/patch-content_common_features.cc b/www/iridium/files/patch-content_common_features.cc new file mode 100644 index 000000000000..89a1432354e5 --- /dev/null +++ b/www/iridium/files/patch-content_common_features.cc @@ -0,0 +1,20 @@ +--- content/common/features.cc.orig 2023-11-22 14:00:11 UTC ++++ content/common/features.cc +@@ -147,7 +147,7 @@ BASE_FEATURE(kEnableBackForwardCacheForScreenReader, + base::FEATURE_ENABLED_BY_DEFAULT); + + // Enables error reporting for JS errors inside DevTools frontend host +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + BASE_FEATURE(kEnableDevToolsJsErrorReporting, + "EnableDevToolsJsErrorReporting", + base::FEATURE_DISABLED_BY_DEFAULT); +@@ -219,7 +219,7 @@ BASE_FEATURE(kGpuInfoCollectionSeparatePrefetch, + // process and having browser process handle adjusting thread properties (nice + // value, c-group, latency sensitivity...) for renderers which have sandbox + // restrictions. +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + BASE_FEATURE(kHandleRendererThreadTypeChangesInBrowser, + "HandleRendererThreadTypeChangesInBrowser", + base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/www/iridium/files/patch-content_common_features.h b/www/iridium/files/patch-content_common_features.h new file mode 100644 index 000000000000..8fa5527a25ff --- /dev/null +++ b/www/iridium/files/patch-content_common_features.h @@ -0,0 +1,20 @@ +--- content/common/features.h.orig 2023-11-22 14:00:11 UTC ++++ content/common/features.h +@@ -37,7 +37,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kDeviceMonitorMac) + CONTENT_EXPORT BASE_DECLARE_FEATURE(kDocumentPolicyNegotiation); + CONTENT_EXPORT BASE_DECLARE_FEATURE(kEnumerateDevicesHideDeviceIDs); + CONTENT_EXPORT BASE_DECLARE_FEATURE(kEnableBackForwardCacheForScreenReader); +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + CONTENT_EXPORT BASE_DECLARE_FEATURE(kEnableDevToolsJsErrorReporting); + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) + CONTENT_EXPORT BASE_DECLARE_FEATURE(kEnsureAllowBindingsIsAlwaysForWebUI); +@@ -55,7 +55,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kForwardMemoryPres + #if BUILDFLAG(IS_WIN) + CONTENT_EXPORT BASE_DECLARE_FEATURE(kGpuInfoCollectionSeparatePrefetch); + #endif +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + CONTENT_EXPORT BASE_DECLARE_FEATURE(kHandleRendererThreadTypeChangesInBrowser); + #endif + CONTENT_EXPORT BASE_DECLARE_FEATURE(kHighPriorityBeforeUnload); diff --git a/www/iridium/files/patch-content_public_common_content__features.cc b/www/iridium/files/patch-content_public_common_content__features.cc index dbd4bdba1d09..13e42a304e89 100644 --- a/www/iridium/files/patch-content_public_common_content__features.cc +++ b/www/iridium/files/patch-content_public_common_content__features.cc @@ -1,6 +1,6 @@ ---- content/public/common/content_features.cc.orig 2023-10-21 11:51:27 UTC +--- content/public/common/content_features.cc.orig 2023-11-22 14:00:11 UTC +++ content/public/common/content_features.cc -@@ -53,7 +53,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess, +@@ -40,7 +40,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess, "AudioServiceOutOfProcess", // TODO(crbug.com/1052397): Remove !IS_CHROMEOS_LACROS once lacros starts being // built with OS_CHROMEOS instead of OS_LINUX. @@ -9,7 +9,7 @@ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) base::FEATURE_ENABLED_BY_DEFAULT #else -@@ -65,7 +65,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess, +@@ -52,7 +52,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess, // kAudioServiceOutOfProcess feature is enabled. BASE_FEATURE(kAudioServiceSandbox, "AudioServiceSandbox", @@ -18,16 +18,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -553,7 +553,7 @@ BASE_FEATURE(kNetworkQualityEstimatorWebHoldback, - // (activated by kUserAgentClientHint) - BASE_FEATURE(kGreaseUACH, "GreaseUACH", base::FEATURE_ENABLED_BY_DEFAULT); - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // Supports proxying thread type changes of renderer processes to browser - // process and having browser process handle adjusting thread properties (nice - // value, c-group, latency sensitivity...) for renderers which have sandbox -@@ -1463,7 +1463,7 @@ BASE_FEATURE(kWebAssemblyTiering, +@@ -1131,7 +1131,7 @@ BASE_FEATURE(kWebAssemblyTiering, BASE_FEATURE(kWebAssemblyTrapHandler, "WebAssemblyTrapHandler", #if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ @@ -36,7 +27,7 @@ defined(ARCH_CPU_X86_64)) || \ (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) base::FEATURE_ENABLED_BY_DEFAULT -@@ -1515,7 +1515,11 @@ BASE_FEATURE(kWebUICodeCache, +@@ -1172,7 +1172,11 @@ BASE_FEATURE(kWebUICodeCache, // Controls whether the WebUSB API is enabled: // https://wicg.github.io/webusb diff --git a/www/iridium/files/patch-content_public_common_content__features.h b/www/iridium/files/patch-content_public_common_content__features.h deleted file mode 100644 index d1315afd5c2d..000000000000 --- a/www/iridium/files/patch-content_public_common_content__features.h +++ /dev/null @@ -1,11 +0,0 @@ ---- content/public/common/content_features.h.orig 2023-10-21 11:51:27 UTC -+++ content/public/common/content_features.h -@@ -120,7 +120,7 @@ CONTENT_EXPORT extern const base::FeatureParam<int> - kFledgeLimitNumAuctionsParam; - CONTENT_EXPORT BASE_DECLARE_FEATURE(kFractionalScrollOffsets); - CONTENT_EXPORT BASE_DECLARE_FEATURE(kGreaseUACH); --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - CONTENT_EXPORT BASE_DECLARE_FEATURE(kHandleRendererThreadTypeChangesInBrowser); - #endif - CONTENT_EXPORT BASE_DECLARE_FEATURE(kIdleDetection); diff --git a/www/iridium/files/patch-content_renderer_render__process__impl.cc b/www/iridium/files/patch-content_renderer_render__process__impl.cc index 9426cb1df86c..7f2b4e04492c 100644 --- a/www/iridium/files/patch-content_renderer_render__process__impl.cc +++ b/www/iridium/files/patch-content_renderer_render__process__impl.cc @@ -1,6 +1,6 @@ ---- content/renderer/render_process_impl.cc.orig 2023-08-28 20:17:35 UTC +--- content/renderer/render_process_impl.cc.orig 2023-11-22 14:00:11 UTC +++ content/renderer/render_process_impl.cc -@@ -45,7 +45,7 @@ +@@ -46,7 +46,7 @@ #if BUILDFLAG(IS_WIN) #include "base/win/win_util.h" #endif @@ -9,7 +9,7 @@ #include "v8/include/v8-wasm-trap-handler-posix.h" #endif -@@ -211,7 +211,7 @@ RenderProcessImpl::RenderProcessImpl() +@@ -212,7 +212,7 @@ RenderProcessImpl::RenderProcessImpl() v8::V8::SetFlagsFromString(kSABPerContextFlag, sizeof(kSABPerContextFlag)); } diff --git a/www/iridium/files/patch-content_renderer_render__thread__impl.cc b/www/iridium/files/patch-content_renderer_render__thread__impl.cc index f562290e9efa..60716126ae17 100644 --- a/www/iridium/files/patch-content_renderer_render__thread__impl.cc +++ b/www/iridium/files/patch-content_renderer_render__thread__impl.cc @@ -1,6 +1,6 @@ ---- content/renderer/render_thread_impl.cc.orig 2023-10-21 11:51:27 UTC +--- content/renderer/render_thread_impl.cc.orig 2023-11-22 14:00:11 UTC +++ content/renderer/render_thread_impl.cc -@@ -204,6 +204,8 @@ +@@ -205,6 +205,8 @@ #if BUILDFLAG(IS_APPLE) #include <malloc/malloc.h> @@ -9,7 +9,7 @@ #else #include <malloc.h> #endif -@@ -1054,7 +1056,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1016,7 +1018,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) && -@@ -1063,7 +1065,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1025,7 +1027,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) && -@@ -1835,7 +1837,7 @@ std::unique_ptr<CodecFactory> RenderThreadImpl::Create +@@ -1799,7 +1801,7 @@ std::unique_ptr<CodecFactory> RenderThreadImpl::Create bool enable_video_encode_accelerator) { mojo::PendingRemote<media::mojom::VideoEncodeAcceleratorProvider> vea_provider; diff --git a/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.cc b/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.cc index 4a70d6304c67..d75caf9d97d0 100644 --- a/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.cc +++ b/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.cc @@ -1,6 +1,6 @@ ---- content/renderer/renderer_blink_platform_impl.cc.orig 2023-10-21 11:51:27 UTC +--- content/renderer/renderer_blink_platform_impl.cc.orig 2023-11-22 14:00:11 UTC +++ content/renderer/renderer_blink_platform_impl.cc -@@ -114,7 +114,7 @@ +@@ -113,7 +113,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" #endif -@@ -182,13 +182,13 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -181,13 +181,13 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( sudden_termination_disables_(0), is_locked_to_site_(false), main_thread_scheduler_(main_thread_scheduler) { @@ -25,7 +25,7 @@ mojo::PendingRemote<font_service::mojom::FontService> font_service; RenderThreadImpl::current()->BindHostReceiver( font_service.InitWithNewPipeAndPassReceiver()); -@@ -197,7 +197,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -196,7 +196,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( #endif } @@ -34,7 +34,7 @@ if (sandboxEnabled()) { #if BUILDFLAG(IS_MAC) sandbox_support_ = std::make_unique<WebSandboxSupportMac>(); -@@ -255,7 +255,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl +@@ -254,7 +254,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl #endif blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() { diff --git a/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.h b/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.h index ebe82ef197ac..eaac5cf6d946 100644 --- a/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.h +++ b/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.h @@ -1,6 +1,6 @@ ---- content/renderer/renderer_blink_platform_impl.h.orig 2023-08-28 20:17:35 UTC +--- content/renderer/renderer_blink_platform_impl.h.orig 2023-11-22 14:00:11 UTC +++ content/renderer/renderer_blink_platform_impl.h -@@ -234,7 +234,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -235,7 +235,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi void Collect3DContextInformation(blink::Platform::GraphicsInfo* gl_info, const gpu::GPUInfo& gpu_info) const; diff --git a/www/iridium/files/patch-content_shell_BUILD.gn b/www/iridium/files/patch-content_shell_BUILD.gn index fbb812537d9d..8495f11d0b6e 100644 --- a/www/iridium/files/patch-content_shell_BUILD.gn +++ b/www/iridium/files/patch-content_shell_BUILD.gn @@ -1,6 +1,6 @@ ---- content/shell/BUILD.gn.orig 2023-10-21 11:51:27 UTC +--- content/shell/BUILD.gn.orig 2023-11-22 14:00:11 UTC +++ content/shell/BUILD.gn -@@ -1027,7 +1027,7 @@ group("content_shell_crash_test") { +@@ -1028,7 +1028,7 @@ group("content_shell_crash_test") { if (is_win) { data_deps += [ "//build/win:copy_cdb_to_output" ] } diff --git a/www/iridium/files/patch-content_test_BUILD.gn b/www/iridium/files/patch-content_test_BUILD.gn index 19e3da25e01a..15372557dab7 100644 --- a/www/iridium/files/patch-content_test_BUILD.gn +++ b/www/iridium/files/patch-content_test_BUILD.gn @@ -1,6 +1,6 @@ ---- content/test/BUILD.gn.orig 2023-10-21 11:51:27 UTC +--- content/test/BUILD.gn.orig 2023-11-22 14:00:11 UTC +++ content/test/BUILD.gn -@@ -2226,7 +2226,7 @@ static_library("run_all_unittests") { +@@ -2237,7 +2237,7 @@ static_library("run_all_unittests") { ":test_support", "//base/test:test_support", ] @@ -9,7 +9,7 @@ deps += [ "//content/common:set_process_title_linux" ] } } -@@ -3302,7 +3302,7 @@ test("content_unittests") { +@@ -3322,7 +3322,7 @@ test("content_unittests") { deps += [ "//third_party/boringssl" ] } diff --git a/www/iridium/files/patch-content_utility_services.cc b/www/iridium/files/patch-content_utility_services.cc index 47477e1482f2..54e4a6b55008 100644 --- a/www/iridium/files/patch-content_utility_services.cc +++ b/www/iridium/files/patch-content_utility_services.cc @@ -1,6 +1,6 @@ ---- content/utility/services.cc.orig 2023-10-21 11:51:27 UTC +--- content/utility/services.cc.orig 2023-11-22 14:00:11 UTC +++ content/utility/services.cc -@@ -64,7 +64,7 @@ +@@ -67,7 +67,7 @@ extern sandbox::TargetServices* g_utility_target_services; #endif // BUILDFLAG(IS_WIN) @@ -9,7 +9,7 @@ #include "media/mojo/services/mojo_video_encode_accelerator_provider_factory.h" #include "sandbox/linux/services/libc_interceptor.h" #include "sandbox/policy/mojom/sandbox.mojom.h" -@@ -87,7 +87,7 @@ extern sandbox::TargetServices* g_utility_target_servi +@@ -90,7 +90,7 @@ extern sandbox::TargetServices* g_utility_target_servi #endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) || // BUILDFLAG(USE_V4L2_CODEC)) @@ -18,7 +18,7 @@ (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) #include "media/mojo/services/stable_video_decoder_factory_process_service.h" // nogncheck #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && -@@ -109,7 +109,7 @@ extern sandbox::TargetServices* g_utility_target_servi +@@ -106,7 +106,7 @@ extern sandbox::TargetServices* g_utility_target_servi #include "ui/accessibility/accessibility_features.h" #endif // BUILDFLAG(ENABLE_ACCESSIBILITY_SERVICE) @@ -27,7 +27,7 @@ #include "media/capture/capture_switches.h" #include "services/viz/public/cpp/gpu/gpu.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -@@ -226,7 +226,7 @@ auto RunAudio(mojo::PendingReceiver<audio::mojom::Audi +@@ -223,7 +223,7 @@ auto RunAudio(mojo::PendingReceiver<audio::mojom::Audi << "task_policy_set TASK_QOS_POLICY"; #endif @@ -36,7 +36,7 @@ auto* command_line = base::CommandLine::ForCurrentProcess(); if (sandbox::policy::SandboxTypeFromCommandLine(*command_line) == sandbox::mojom::Sandbox::kNoSandbox) { -@@ -308,7 +308,7 @@ auto RunVideoCapture( +@@ -305,7 +305,7 @@ auto RunVideoCapture( mojo::PendingReceiver<video_capture::mojom::VideoCaptureService> receiver) { auto service = std::make_unique<UtilityThreadVideoCaptureServiceImpl>( std::move(receiver), base::SingleThreadTaskRunner::GetCurrentDefault()); @@ -45,7 +45,7 @@ if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled()) { mojo::PendingRemote<viz::mojom::Gpu> remote_gpu; content::UtilityThread::Get()->BindHostReceiver( -@@ -340,7 +340,7 @@ auto RunOOPArcVideoAcceleratorFactoryService( +@@ -344,7 +344,7 @@ auto RunOOPArcVideoAcceleratorFactoryService( #endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) || // BUILDFLAG(USE_V4L2_CODEC)) @@ -54,7 +54,7 @@ (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) auto RunStableVideoDecoderFactoryProcessService( mojo::PendingReceiver< -@@ -351,7 +351,7 @@ auto RunStableVideoDecoderFactoryProcessService( +@@ -355,7 +355,7 @@ auto RunStableVideoDecoderFactoryProcessService( #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && // (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) @@ -63,7 +63,7 @@ auto RunVideoEncodeAcceleratorProviderFactory( mojo::PendingReceiver<media::mojom::VideoEncodeAcceleratorProviderFactory> receiver) { -@@ -415,13 +415,13 @@ void RegisterMainThreadServices(mojo::ServiceFactory& +@@ -418,13 +418,13 @@ void RegisterMainThreadServices(mojo::ServiceFactory& #endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) || // BUILDFLAG(USE_V4L2_CODEC)) diff --git a/www/iridium/files/patch-device_fido_get__assertion__request__handler.cc b/www/iridium/files/patch-device_fido_get__assertion__request__handler.cc deleted file mode 100644 index 6072a200bf7f..000000000000 --- a/www/iridium/files/patch-device_fido_get__assertion__request__handler.cc +++ /dev/null @@ -1,26 +0,0 @@ ---- device/fido/get_assertion_request_handler.cc.orig 2023-10-21 11:51:27 UTC -+++ device/fido/get_assertion_request_handler.cc -@@ -370,7 +370,11 @@ bool AllowListOnlyHybridOrInternal(const CtapGetAssert - - bool AllowListIncludedTransport(const CtapGetAssertionRequest& request, - FidoTransportProtocol transport) { -+#if (_LIBCPP_VERSION >= 160000) - return std::ranges::any_of( -+#else -+ return base::ranges::any_of( -+#endif - request.allow_list, - [transport](const PublicKeyCredentialDescriptor& cred) { - return cred.transports.empty() || -@@ -441,7 +445,11 @@ void GetAssertionRequestHandler::PreselectAccount( - PublicKeyCredentialDescriptor credential) { - DCHECK(!preselected_credential_); - DCHECK(request_.allow_list.empty() || -+#if (_LIBCPP_VERSION >= 160000) - std::ranges::any_of( -+#else -+ base::ranges::any_of( -+#endif - request_.allow_list, - [&credential](const PublicKeyCredentialDescriptor& desc) { - return desc.id == credential.id; diff --git a/www/iridium/files/patch-device_gamepad_BUILD.gn b/www/iridium/files/patch-device_gamepad_BUILD.gn index 00d237052fe9..7ecf7a5b6acc 100644 --- a/www/iridium/files/patch-device_gamepad_BUILD.gn +++ b/www/iridium/files/patch-device_gamepad_BUILD.gn @@ -1,6 +1,6 @@ ---- device/gamepad/BUILD.gn.orig 2022-12-01 10:35:46 UTC +--- device/gamepad/BUILD.gn.orig 2023-11-22 14:00:11 UTC +++ device/gamepad/BUILD.gn -@@ -98,7 +98,7 @@ component("gamepad") { +@@ -99,7 +99,7 @@ component("gamepad") { "hid_writer_linux.cc", "hid_writer_linux.h", ] diff --git a/www/iridium/files/patch-extensions_shell_app_shell__main__delegate.cc b/www/iridium/files/patch-extensions_shell_app_shell__main__delegate.cc index 78134caa2045..99ced1448cd3 100644 --- a/www/iridium/files/patch-extensions_shell_app_shell__main__delegate.cc +++ b/www/iridium/files/patch-extensions_shell_app_shell__main__delegate.cc @@ -1,15 +1,15 @@ ---- extensions/shell/app/shell_main_delegate.cc.orig 2022-03-28 18:11:04 UTC +--- extensions/shell/app/shell_main_delegate.cc.orig 2023-11-22 14:00:11 UTC +++ extensions/shell/app/shell_main_delegate.cc -@@ -42,7 +42,7 @@ - +@@ -43,7 +43,7 @@ #if BUILDFLAG(IS_WIN) #include "base/base_paths_win.h" + #include "base/process/process_info.h" -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "base/nix/xdg_util.h" #elif BUILDFLAG(IS_MAC) #include "base/base_paths_mac.h" -@@ -61,7 +61,7 @@ base::FilePath GetDataPath() { +@@ -62,7 +62,7 @@ base::FilePath GetDataPath() { return cmd_line->GetSwitchValuePath(switches::kContentShellDataPath); base::FilePath data_dir; diff --git a/www/iridium/files/patch-gpu_command__buffer_service_dawn__context__provider.cc b/www/iridium/files/patch-gpu_command__buffer_service_dawn__context__provider.cc index 01347546eb16..f57a6253b724 100644 --- a/www/iridium/files/patch-gpu_command__buffer_service_dawn__context__provider.cc +++ b/www/iridium/files/patch-gpu_command__buffer_service_dawn__context__provider.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/dawn_context_provider.cc.orig 2023-10-21 11:51:27 UTC +--- gpu/command_buffer/service/dawn_context_provider.cc.orig 2023-11-22 14:00:11 UTC +++ gpu/command_buffer/service/dawn_context_provider.cc -@@ -145,7 +145,7 @@ wgpu::BackendType DawnContextProvider::GetDefaultBacke +@@ -151,7 +151,7 @@ wgpu::BackendType DawnContextProvider::GetDefaultBacke return base::FeatureList::IsEnabled(features::kSkiaGraphiteDawnUseD3D12) ? wgpu::BackendType::D3D12 : wgpu::BackendType::D3D11; diff --git a/www/iridium/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc b/www/iridium/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc index 9add9f3e8086..a8a5e8217426 100644 --- a/www/iridium/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc +++ b/www/iridium/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/gles2_cmd_decoder.cc.orig 2023-10-21 11:51:27 UTC +--- gpu/command_buffer/service/gles2_cmd_decoder.cc.orig 2023-11-22 14:00:11 UTC +++ gpu/command_buffer/service/gles2_cmd_decoder.cc -@@ -2980,7 +2980,7 @@ GLES2Decoder* GLES2Decoder::Create( +@@ -2986,7 +2986,7 @@ GLES2Decoder* GLES2Decoder::Create( } // Allow linux to run fuzzers. diff --git a/www/iridium/files/patch-gpu_command__buffer_service_shared__context__state.cc b/www/iridium/files/patch-gpu_command__buffer_service_shared__context__state.cc new file mode 100644 index 000000000000..cd3f6a992065 --- /dev/null +++ b/www/iridium/files/patch-gpu_command__buffer_service_shared__context__state.cc @@ -0,0 +1,32 @@ +--- gpu/command_buffer/service/shared_context_state.cc.orig 2023-11-22 14:00:11 UTC ++++ gpu/command_buffer/service/shared_context_state.cc +@@ -4,6 +4,7 @@ + + #include "gpu/command_buffer/service/shared_context_state.h" + ++#include "base/immediate_crash.h" + #include "base/observer_list.h" + #include "base/strings/stringprintf.h" + #include "base/system/sys_info.h" +@@ -101,6 +102,13 @@ void SharedContextState::compileError(const char* shad + << "------------------------\n" + << shader << "\nErrors:\n" + << errors; ++ ++ // Increase shader cache shm count and crash the GPU process so that the ++ // browser process would clear the cache. ++ GpuProcessShmCount::ScopedIncrement increment( ++ use_shader_cache_shm_count_.get()); ++ ++ base::ImmediateCrash(); + } + } + +@@ -305,6 +313,7 @@ bool SharedContextState::InitializeGanesh( + gl::ProgressReporter* progress_reporter) { + progress_reporter_ = progress_reporter; + gr_shader_cache_ = cache; ++ use_shader_cache_shm_count_ = use_shader_cache_shm_count; + + size_t max_resource_cache_bytes; + size_t glyph_cache_max_texture_bytes; diff --git a/www/iridium/files/patch-gpu_command__buffer_service_shared__context__state.h b/www/iridium/files/patch-gpu_command__buffer_service_shared__context__state.h new file mode 100644 index 000000000000..a7668bbe5e3d --- /dev/null +++ b/www/iridium/files/patch-gpu_command__buffer_service_shared__context__state.h @@ -0,0 +1,11 @@ +--- gpu/command_buffer/service/shared_context_state.h.orig 2023-11-22 14:00:11 UTC ++++ gpu/command_buffer/service/shared_context_state.h +@@ -392,6 +392,8 @@ class GPU_GLES2_EXPORT SharedContextState + std::vector<uint8_t> scratch_deserialization_buffer_; + raw_ptr<gpu::raster::GrShaderCache, DanglingUntriaged> gr_shader_cache_ = + nullptr; ++ raw_ptr<GpuProcessShmCount, DanglingUntriaged> use_shader_cache_shm_count_ = ++ nullptr; + + // |need_context_state_reset| is set whenever Skia may have altered the + // driver's GL state. diff --git a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc index 968776f456dd..fcbde90e239d 100644 --- a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc +++ b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc @@ -1,4 +1,4 @@ ---- gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig 2023-10-21 11:51:27 UTC +--- gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig 2023-11-22 14:00:11 UTC +++ gpu/command_buffer/service/shared_image/external_vk_image_backing.cc @@ -47,7 +47,7 @@ #include "ui/gl/gl_version_info.h" @@ -9,7 +9,7 @@ #include "gpu/command_buffer/service/shared_image/external_vk_image_dawn_representation.h" #endif -@@ -673,7 +673,7 @@ std::unique_ptr<DawnImageRepresentation> ExternalVkIma +@@ -679,7 +679,7 @@ std::unique_ptr<DawnImageRepresentation> ExternalVkIma const wgpu::Device& wgpuDevice, wgpu::BackendType backend_type, std::vector<wgpu::TextureFormat> view_formats) { diff --git a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc index cf82d6babafe..e9e9428146bc 100644 --- a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc +++ b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc.orig 2023-10-21 11:51:27 UTC +--- gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc.orig 2023-11-22 14:00:11 UTC +++ gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc -@@ -89,7 +89,7 @@ base::flat_map<VkFormat, VkImageUsageFlags> CreateImag +@@ -99,7 +99,7 @@ base::flat_map<VkFormat, VkImageUsageFlags> CreateImag } // namespace constexpr uint32_t kSupportedUsage = @@ -9,7 +9,7 @@ SHARED_IMAGE_USAGE_WEBGPU | SHARED_IMAGE_USAGE_WEBGPU_SWAP_CHAIN_TEXTURE | SHARED_IMAGE_USAGE_WEBGPU_STORAGE_TEXTURE | #endif -@@ -258,7 +258,7 @@ bool ExternalVkImageBackingFactory::IsSupported( +@@ -268,7 +268,7 @@ bool ExternalVkImageBackingFactory::IsSupported( return false; } diff --git a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc index 1fcc1d445020..8722098cc006 100644 --- a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc +++ b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/shared_image/wrapped_sk_image_backing.cc.orig 2023-10-21 11:51:27 UTC +--- gpu/command_buffer/service/shared_image/wrapped_sk_image_backing.cc.orig 2023-11-22 14:00:11 UTC +++ gpu/command_buffer/service/shared_image/wrapped_sk_image_backing.cc -@@ -211,7 +211,7 @@ bool WrappedSkImageBacking::Initialize(const std::stri +@@ -212,7 +212,7 @@ bool WrappedSkImageBacking::Initialize(const std::stri constexpr GrRenderable is_renderable = GrRenderable::kYes; constexpr GrProtected is_protected = GrProtected::kNo; diff --git a/www/iridium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc b/www/iridium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc index 97ac31a68f61..b69c2c2335e6 100644 --- a/www/iridium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc +++ b/www/iridium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2023-10-21 11:51:27 UTC +--- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2023-11-22 14:00:11 UTC +++ gpu/command_buffer/service/webgpu_decoder_impl.cc -@@ -1194,7 +1194,7 @@ void WebGPUDecoderImpl::RequestAdapterImpl( +@@ -1193,7 +1193,7 @@ void WebGPUDecoderImpl::RequestAdapterImpl( force_fallback_adapter = true; } @@ -9,7 +9,7 @@ if (!shared_context_state_->GrContextIsVulkan() && !shared_context_state_->IsGraphiteDawnVulkan() && use_webgpu_adapter_ != WebGPUAdapterName::kOpenGLES) { -@@ -1849,7 +1849,7 @@ WebGPUDecoderImpl::AssociateMailboxDawn( +@@ -1848,7 +1848,7 @@ WebGPUDecoderImpl::AssociateMailboxDawn( } #if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_APPLE) && \ diff --git a/www/iridium/files/patch-gpu_config_gpu__control__list.cc b/www/iridium/files/patch-gpu_config_gpu__control__list.cc index 4f7a825c37eb..35aaf33be1e2 100644 --- a/www/iridium/files/patch-gpu_config_gpu__control__list.cc +++ b/www/iridium/files/patch-gpu_config_gpu__control__list.cc @@ -1,4 +1,4 @@ ---- gpu/config/gpu_control_list.cc.orig 2023-08-28 20:17:35 UTC +--- gpu/config/gpu_control_list.cc.orig 2023-11-22 14:00:11 UTC +++ gpu/config/gpu_control_list.cc @@ -276,7 +276,7 @@ bool GpuControlList::More::GLVersionInfoMismatch( GpuControlList::GLType GpuControlList::More::GetDefaultGLType() { @@ -9,7 +9,7 @@ return kGLTypeGL; #elif BUILDFLAG(IS_MAC) return kGLTypeGL; -@@ -817,7 +817,7 @@ GpuControlList::OsType GpuControlList::GetOsType() { +@@ -820,7 +820,7 @@ GpuControlList::OsType GpuControlList::GetOsType() { return kOsAndroid; #elif BUILDFLAG(IS_FUCHSIA) return kOsFuchsia; diff --git a/www/iridium/files/patch-gpu_config_gpu__finch__features.cc b/www/iridium/files/patch-gpu_config_gpu__finch__features.cc index 51ed1ea3c2b2..5415bf18e090 100644 --- a/www/iridium/files/patch-gpu_config_gpu__finch__features.cc +++ b/www/iridium/files/patch-gpu_config_gpu__finch__features.cc @@ -1,6 +1,6 @@ ---- gpu/config/gpu_finch_features.cc.orig 2023-10-21 11:51:27 UTC +--- gpu/config/gpu_finch_features.cc.orig 2023-11-22 14:00:11 UTC +++ gpu/config/gpu_finch_features.cc -@@ -58,7 +58,7 @@ bool IsDeviceBlocked(const char* field, const std::str +@@ -63,7 +63,7 @@ bool IsDeviceBlocked(const char* field, const std::str BASE_FEATURE(kUseGles2ForOopR, "UseGles2ForOopR", #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ @@ -9,7 +9,7 @@ base::FEATURE_DISABLED_BY_DEFAULT #else base::FEATURE_ENABLED_BY_DEFAULT -@@ -142,7 +142,8 @@ BASE_FEATURE(kAggressiveSkiaGpuResourcePurge, +@@ -147,7 +147,8 @@ BASE_FEATURE(kAggressiveSkiaGpuResourcePurge, BASE_FEATURE(kDefaultEnableGpuRasterization, "DefaultEnableGpuRasterization", #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/iridium/files/patch-gpu_ipc_service_gpu__init.cc b/www/iridium/files/patch-gpu_ipc_service_gpu__init.cc index 3d8fb4252084..19cc35e143e3 100644 --- a/www/iridium/files/patch-gpu_ipc_service_gpu__init.cc +++ b/www/iridium/files/patch-gpu_ipc_service_gpu__init.cc @@ -1,4 +1,4 @@ ---- gpu/ipc/service/gpu_init.cc.orig 2023-10-21 11:51:27 UTC +--- gpu/ipc/service/gpu_init.cc.orig 2023-11-22 14:00:11 UTC +++ gpu/ipc/service/gpu_init.cc @@ -357,7 +357,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL enable_watchdog = false; @@ -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. -@@ -740,7 +740,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -741,7 +741,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 -@@ -894,7 +894,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -895,7 +895,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 -@@ -964,7 +964,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -965,7 +965,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c } } diff --git a/www/iridium/files/patch-gpu_vulkan_generate__bindings.py b/www/iridium/files/patch-gpu_vulkan_generate__bindings.py index aabfaf7a39a8..577c3ad149e1 100644 --- a/www/iridium/files/patch-gpu_vulkan_generate__bindings.py +++ b/www/iridium/files/patch-gpu_vulkan_generate__bindings.py @@ -1,6 +1,6 @@ ---- gpu/vulkan/generate_bindings.py.orig 2023-10-21 11:51:27 UTC +--- gpu/vulkan/generate_bindings.py.orig 2023-11-22 14:00:11 UTC +++ gpu/vulkan/generate_bindings.py -@@ -260,7 +260,7 @@ VULKAN_DEVICE_FUNCTIONS = [ +@@ -270,7 +270,7 @@ VULKAN_DEVICE_FUNCTIONS = [ ] }, { diff --git a/www/iridium/files/patch-gpu_vulkan_semaphore__handle.cc b/www/iridium/files/patch-gpu_vulkan_semaphore__handle.cc index a54338ac4b12..156b462b78a4 100644 --- a/www/iridium/files/patch-gpu_vulkan_semaphore__handle.cc +++ b/www/iridium/files/patch-gpu_vulkan_semaphore__handle.cc @@ -1,20 +1,20 @@ ---- gpu/vulkan/semaphore_handle.cc.orig 2023-10-21 11:51:27 UTC +--- gpu/vulkan/semaphore_handle.cc.orig 2023-11-22 14:00:11 UTC +++ gpu/vulkan/semaphore_handle.cc @@ -39,7 +39,7 @@ SemaphoreHandle::SemaphoreHandle(gfx::GpuFenceHandle f // https://fuchsia.dev/reference/fidl/fuchsia.ui.scenic. Init(VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_ZIRCON_EVENT_BIT_FUCHSIA, - std::move(fence_handle.owned_event)); + fence_handle.Release()); -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) Init(VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT_KHR, - std::move(fence_handle.owned_fd)); + fence_handle.Release()); #elif BUILDFLAG(IS_POSIX) @@ -64,7 +64,7 @@ gfx::GpuFenceHandle SemaphoreHandle::ToGpuFenceHandle( // VkSemaphore, which can then be used to submit present work, see // https://fuchsia.dev/reference/fidl/fuchsia.ui.scenic. - fence_handle.owned_event = TakeHandle(); + fence_handle.Adopt(TakeHandle()); -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) if (type_ == VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT_KHR) { - fence_handle.owned_fd = TakeHandle(); + fence_handle.Adopt(TakeHandle()); } else { diff --git a/www/iridium/files/patch-gpu_vulkan_vulkan__function__pointers.cc b/www/iridium/files/patch-gpu_vulkan_vulkan__function__pointers.cc index f8fb8d5f1468..e649124ac948 100644 --- a/www/iridium/files/patch-gpu_vulkan_vulkan__function__pointers.cc +++ b/www/iridium/files/patch-gpu_vulkan_vulkan__function__pointers.cc @@ -1,6 +1,6 @@ ---- gpu/vulkan/vulkan_function_pointers.cc.orig 2023-10-21 11:51:27 UTC +--- gpu/vulkan/vulkan_function_pointers.cc.orig 2023-11-22 14:00:11 UTC +++ gpu/vulkan/vulkan_function_pointers.cc -@@ -1161,7 +1161,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer +@@ -1241,7 +1241,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer } } @@ -9,7 +9,7 @@ if (gfx::HasExtension(enabled_extensions, VK_EXT_IMAGE_DRM_FORMAT_MODIFIER_EXTENSION_NAME)) { vkGetImageDrmFormatModifierPropertiesEXT = -@@ -1350,7 +1350,7 @@ void VulkanFunctionPointers::ResetForTesting() { +@@ -1440,7 +1440,7 @@ void VulkanFunctionPointers::ResetForTesting() { vkGetSwapchainImagesKHR = nullptr; vkQueuePresentKHR = nullptr; diff --git a/www/iridium/files/patch-gpu_vulkan_vulkan__function__pointers.h b/www/iridium/files/patch-gpu_vulkan_vulkan__function__pointers.h index e46b2e9aa3b7..34b784a2ab4f 100644 --- a/www/iridium/files/patch-gpu_vulkan_vulkan__function__pointers.h +++ b/www/iridium/files/patch-gpu_vulkan_vulkan__function__pointers.h @@ -1,6 +1,6 @@ ---- gpu/vulkan/vulkan_function_pointers.h.orig 2023-10-21 11:51:27 UTC +--- gpu/vulkan/vulkan_function_pointers.h.orig 2023-11-22 14:00:11 UTC +++ gpu/vulkan/vulkan_function_pointers.h -@@ -311,7 +311,7 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers +@@ -321,7 +321,7 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers VulkanFunction<PFN_vkGetSwapchainImagesKHR> vkGetSwapchainImagesKHR; VulkanFunction<PFN_vkQueuePresentKHR> vkQueuePresentKHR; @@ -9,7 +9,7 @@ VulkanFunction<PFN_vkGetImageDrmFormatModifierPropertiesEXT> vkGetImageDrmFormatModifierPropertiesEXT; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -1235,7 +1235,7 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR(VkQueue queue +@@ -1324,7 +1324,7 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR(VkQueue queue pPresentInfo); } @@ -18,7 +18,7 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierPropertiesEXT( VkDevice device, VkImage image, -@@ -1245,4 +1245,4 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierProp +@@ -1334,4 +1334,4 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierProp } #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/iridium/files/patch-media_audio_BUILD.gn b/www/iridium/files/patch-media_audio_BUILD.gn index 4a1f3db8ff8c..ef04c7755db2 100644 --- a/www/iridium/files/patch-media_audio_BUILD.gn +++ b/www/iridium/files/patch-media_audio_BUILD.gn @@ -1,6 +1,6 @@ ---- media/audio/BUILD.gn.orig 2023-10-21 11:51:27 UTC +--- media/audio/BUILD.gn.orig 2023-11-22 14:00:11 UTC +++ media/audio/BUILD.gn -@@ -279,9 +279,20 @@ source_set("audio") { +@@ -286,9 +286,20 @@ source_set("audio") { ] } diff --git a/www/iridium/files/patch-media_base_media__switches.cc b/www/iridium/files/patch-media_base_media__switches.cc index ef0856b3c272..dad688cab153 100644 --- a/www/iridium/files/patch-media_base_media__switches.cc +++ b/www/iridium/files/patch-media_base_media__switches.cc @@ -1,4 +1,4 @@ ---- media/base/media_switches.cc.orig 2023-10-21 11:51:27 UTC +--- media/base/media_switches.cc.orig 2023-11-22 14:00:11 UTC +++ media/base/media_switches.cc @@ -17,7 +17,7 @@ #include "ui/gl/gl_features.h" @@ -9,7 +9,7 @@ #include "base/cpu.h" #endif -@@ -673,7 +673,7 @@ BASE_FEATURE(kFallbackAfterDecodeError, +@@ -699,7 +699,7 @@ BASE_FEATURE(kFallbackAfterDecodeError, // Show toolbar button that opens dialog for controlling media sessions. BASE_FEATURE(kGlobalMediaControls, "GlobalMediaControls", @@ -18,7 +18,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -696,7 +696,7 @@ BASE_FEATURE(kGlobalMediaControlsCrOSUpdatedUI, +@@ -722,7 +722,7 @@ BASE_FEATURE(kGlobalMediaControlsCrOSUpdatedUI, // If enabled, users can request Media Remoting without fullscreen-in-tab. BASE_FEATURE(kMediaRemotingWithoutFullscreen, "MediaRemotingWithoutFullscreen", @@ -27,7 +27,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -708,7 +708,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen, +@@ -734,7 +734,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen, BASE_FEATURE(kGlobalMediaControlsPictureInPicture, "GlobalMediaControlsPictureInPicture", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -36,7 +36,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -752,7 +752,7 @@ BASE_FEATURE(kUnifiedAutoplay, +@@ -778,7 +778,7 @@ BASE_FEATURE(kUnifiedAutoplay, "UnifiedAutoplay", base::FEATURE_ENABLED_BY_DEFAULT); @@ -45,16 +45,16 @@ // Enable vaapi video decoding on linux. This is already enabled by default on // chromeos, but needs an experiment on linux. BASE_FEATURE(kVaapiVideoDecodeLinux, -@@ -832,7 +832,7 @@ BASE_FEATURE(kVaapiVp9kSVCHWEncoding, - "VaapiVp9kSVCHWEncoding", - base::FEATURE_ENABLED_BY_DEFAULT); +@@ -862,7 +862,7 @@ BASE_FEATURE(kVaapiVp9SModeHWEncoding, + "VaapiVp9SModeHWEncoding", + base::FEATURE_DISABLED_BY_DEFAULT); #endif // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Enables the new V4L2StatefulVideoDecoder instead of V4L2VideoDecoder. BASE_FEATURE(kV4L2FlatStatelessVideoDecoder, "V4L2FlatStatelessVideoDecoder", -@@ -1348,7 +1348,7 @@ const base::Feature MEDIA_EXPORT kUseOutOfProcessVideo +@@ -1397,7 +1397,7 @@ const base::Feature MEDIA_EXPORT kUseOutOfProcessVideo }; #endif // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER) diff --git a/www/iridium/files/patch-media_base_media__switches.h b/www/iridium/files/patch-media_base_media__switches.h index 883143215a9a..1b6446dcb3ed 100644 --- a/www/iridium/files/patch-media_base_media__switches.h +++ b/www/iridium/files/patch-media_base_media__switches.h @@ -1,6 +1,6 @@ ---- media/base/media_switches.h.orig 2023-10-21 11:51:27 UTC +--- media/base/media_switches.h.orig 2023-11-22 14:00:11 UTC +++ media/base/media_switches.h -@@ -305,7 +305,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseElementInsteadOf +@@ -320,7 +320,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseElementInsteadOf MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseFakeDeviceForMediaStream); MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseMediaHistoryStore); MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseR16Texture); @@ -9,16 +9,16 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoDecodeLinux); MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoDecodeLinuxGL); MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoEncodeLinux); -@@ -323,7 +323,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiH264TemporalLa - MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp8TemporalLayerHWEncoding); +@@ -339,7 +339,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp8TemporalLay MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp9kSVCHWEncoding); + MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp9SModeHWEncoding); #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(kV4L2FlatStatelessVideoDecoder); MEDIA_EXPORT BASE_DECLARE_FEATURE(kV4L2FlatStatefulVideoDecoder); #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -443,7 +443,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kExposeOutOfProcessV +@@ -459,7 +459,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kExposeOutOfProcessV MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseOutOfProcessVideoDecoding); #endif // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER) diff --git a/www/iridium/files/patch-media_base_video__frame.cc b/www/iridium/files/patch-media_base_video__frame.cc index 4a8a5ba439d2..7b63a8646a6a 100644 --- a/www/iridium/files/patch-media_base_video__frame.cc +++ b/www/iridium/files/patch-media_base_video__frame.cc @@ -1,4 +1,4 @@ ---- media/base/video_frame.cc.orig 2023-10-21 11:51:27 UTC +--- media/base/video_frame.cc.orig 2023-11-22 14:00:11 UTC +++ media/base/video_frame.cc @@ -80,7 +80,7 @@ std::string VideoFrame::StorageTypeToString( return "OWNED_MEMORY"; @@ -27,7 +27,7 @@ // This class allows us to embed a vector<ScopedFD> into a scoped_refptr, and // thus to have several VideoFrames share the same set of DMABUF FDs. class VideoFrame::DmabufHolder -@@ -635,7 +635,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM +@@ -636,7 +636,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM for (size_t i = 0; i < num_planes; ++i) planes[i].stride = gpu_memory_buffer->stride(i); uint64_t modifier = gfx::NativePixmapHandle::kNoModifier; @@ -36,7 +36,7 @@ if (gpu_memory_buffer->GetType() == gfx::NATIVE_PIXMAP) { const auto gmb_handle = gpu_memory_buffer->CloneHandle(); if (gmb_handle.is_null() || -@@ -681,7 +681,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM +@@ -682,7 +682,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM return frame; } @@ -45,7 +45,7 @@ // static scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs( const VideoFrameLayout& layout, -@@ -902,7 +902,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame( +@@ -903,7 +903,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame( } } @@ -54,7 +54,7 @@ DCHECK(frame->dmabuf_fds_); // If there are any |dmabuf_fds_| plugged in, we should refer them too. wrapping_frame->dmabuf_fds_ = frame->dmabuf_fds_; -@@ -1310,7 +1310,7 @@ const gpu::MailboxHolder& VideoFrame::mailbox_holder( +@@ -1311,7 +1311,7 @@ const gpu::MailboxHolder& VideoFrame::mailbox_holder( : mailbox_holders_[texture_index]; } @@ -63,7 +63,7 @@ const std::vector<base::ScopedFD>& VideoFrame::DmabufFds() const { DCHECK_EQ(storage_type_, STORAGE_DMABUFS); -@@ -1423,7 +1423,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout, +@@ -1424,7 +1424,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout, storage_type_(storage_type), visible_rect_(Intersection(visible_rect, gfx::Rect(layout.coded_size()))), natural_size_(natural_size), diff --git a/www/iridium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc b/www/iridium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc index ce7fb9ed87f5..9d16ccf40b40 100644 --- a/www/iridium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc +++ b/www/iridium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc @@ -1,16 +1,16 @@ ---- media/capture/video/linux/v4l2_capture_delegate.cc.orig 2023-10-21 11:51:27 UTC +--- media/capture/video/linux/v4l2_capture_delegate.cc.orig 2023-11-22 14:00:11 UTC +++ media/capture/video/linux/v4l2_capture_delegate.cc -@@ -4,8 +4,10 @@ - +@@ -5,8 +5,10 @@ #include "media/capture/video/linux/v4l2_capture_delegate.h" + #include <fcntl.h> +#if !BUILDFLAG(IS_BSD) #include <linux/version.h> #include <linux/videodev2.h> +#endif #include <poll.h> - #include <sys/fcntl.h> #include <sys/ioctl.h> + #include <sys/mman.h> @@ -26,17 +28,19 @@ #include "media/capture/video/blob_utils.h" #include "media/capture/video/linux/video_capture_device_linux.h" diff --git a/www/iridium/files/patch-media_gpu_buffer__validation.cc b/www/iridium/files/patch-media_gpu_buffer__validation.cc index 29d1698211ce..812bf1d84b03 100644 --- a/www/iridium/files/patch-media_gpu_buffer__validation.cc +++ b/www/iridium/files/patch-media_gpu_buffer__validation.cc @@ -1,4 +1,4 @@ ---- media/gpu/buffer_validation.cc.orig 2023-07-24 14:27:53 UTC +--- media/gpu/buffer_validation.cc.orig 2023-11-22 14:00:11 UTC +++ media/gpu/buffer_validation.cc @@ -15,7 +15,7 @@ #include "ui/gfx/geometry/size.h" @@ -18,7 +18,7 @@ if (fd < 0) { VLOG(1) << "Invalid file descriptor"; return false; -@@ -76,7 +76,7 @@ bool VerifyGpuMemoryBufferHandle( +@@ -77,7 +77,7 @@ bool VerifyGpuMemoryBufferHandle( VLOG(1) << "Unsupported: " << pixel_format; return false; } diff --git a/www/iridium/files/patch-media_gpu_chromeos_mailbox__video__frame__converter.cc b/www/iridium/files/patch-media_gpu_chromeos_mailbox__video__frame__converter.cc new file mode 100644 index 000000000000..8f7e2fc36a2e --- /dev/null +++ b/www/iridium/files/patch-media_gpu_chromeos_mailbox__video__frame__converter.cc @@ -0,0 +1,11 @@ +--- media/gpu/chromeos/mailbox_video_frame_converter.cc.orig 2023-11-22 14:00:11 UTC ++++ media/gpu/chromeos/mailbox_video_frame_converter.cc +@@ -59,7 +59,7 @@ viz::SharedImageFormat GetSharedImageFormat(gfx::Buffe + << static_cast<int>(buffer_format); + NOTREACHED_NORETURN(); + } +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // If format is true multiplanar format, we prefer external sampler on + // ChromeOS and Linux. + if (format.is_multi_plane()) { diff --git a/www/iridium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc b/www/iridium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc index bda5b55340f8..15c4a5ed6584 100644 --- a/www/iridium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc +++ b/www/iridium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc @@ -1,6 +1,6 @@ ---- media/gpu/chromeos/video_decoder_pipeline.cc.orig 2023-10-21 11:51:27 UTC +--- media/gpu/chromeos/video_decoder_pipeline.cc.orig 2023-11-22 14:00:11 UTC +++ media/gpu/chromeos/video_decoder_pipeline.cc -@@ -1026,14 +1026,14 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -1033,14 +1033,14 @@ VideoDecoderPipeline::PickDecoderOutputFormat( } } @@ -17,7 +17,7 @@ // Linux w/ V4L2 should not use a custom allocator // Only tested with video_decode_accelerator_tests // TODO(wenst@) Test with full Chromium Browser -@@ -1170,7 +1170,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -1177,7 +1177,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( << " VideoFrames"; auxiliary_frame_pool_->set_parent_task_runner(decoder_task_runner_); diff --git a/www/iridium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc b/www/iridium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc index f1e6271afda8..82fdd42ea935 100644 --- a/www/iridium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc +++ b/www/iridium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc @@ -1,6 +1,6 @@ ---- media/gpu/vaapi/vaapi_wrapper.cc.orig 2023-10-21 11:51:27 UTC +--- media/gpu/vaapi/vaapi_wrapper.cc.orig 2023-11-22 14:00:11 UTC +++ media/gpu/vaapi/vaapi_wrapper.cc -@@ -70,7 +70,7 @@ +@@ -82,7 +82,7 @@ extern "C" { using media_gpu_vaapi::kModuleVa_prot; #endif @@ -9,7 +9,7 @@ #include "base/files/file_util.h" #include "base/strings/string_split.h" #endif -@@ -1441,7 +1441,7 @@ bool IsVBREncodingSupported(VAProfile va_profile) { +@@ -1506,7 +1506,7 @@ bool IsVBREncodingSupported(VAProfile va_profile) { return VASupportedProfiles::Get().IsProfileSupported(mode, va_profile); } @@ -18,7 +18,7 @@ // Some VA-API drivers (vdpau-va-driver) will crash if used with VA/DRM on // NVIDIA GPUs. This function checks if such drivers are present. bool IsBrokenNvidiaVaapiDriverPresent() { -@@ -1502,7 +1502,7 @@ void VADisplayStateSingleton::PreSandboxInitialization +@@ -1567,7 +1567,7 @@ void VADisplayStateSingleton::PreSandboxInitialization VADisplayStateSingleton& va_display_state = GetInstance(); base::AutoLock lock(va_display_state.lock_); @@ -27,7 +27,7 @@ std::string va_driver_name; auto env = base::Environment::Create(); if (env->GetVar("LIBVA_DRIVER_NAME", &va_driver_name) && -@@ -1539,7 +1539,7 @@ void VADisplayStateSingleton::PreSandboxInitialization +@@ -1604,7 +1604,7 @@ void VADisplayStateSingleton::PreSandboxInitialization if (base::EqualsCaseInsensitiveASCII(version_name, "vgem")) { continue; } @@ -36,7 +36,7 @@ // Skip NVIDIA GPUs if the VA-API driver used for them is known for crashing // with VA/DRM. if (is_nvidia_va_drm_broken && -@@ -1572,7 +1572,7 @@ VADisplayStateHandle VADisplayStateSingleton::GetHandl +@@ -1637,7 +1637,7 @@ VADisplayStateHandle VADisplayStateSingleton::GetHandl return {}; } @@ -45,12 +45,3 @@ // TODO(crbug.com/1116701): add vaapi support for other Ozone platforms on // Linux. See comment in OzonePlatform::PlatformProperties::supports_vaapi // for more details. This will also require revisiting everything that's -@@ -2403,7 +2403,7 @@ scoped_refptr<VASurface> VaapiWrapper::CreateVASurface - return nullptr; - } - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // TODO(crbug.com/1326754): enable use DRIME_PRIME_2 API on Linux with the - // iHD driver. - const bool use_drm_prime_2 = false; diff --git a/www/iridium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc b/www/iridium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc index a6f7e401298e..46b241bad241 100644 --- a/www/iridium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc +++ b/www/iridium/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 2023-10-21 11:51:27 UTC +--- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2023-11-22 14:00:11 UTC +++ media/video/gpu_memory_buffer_video_frame_pool.cc -@@ -727,7 +727,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa +@@ -773,7 +773,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa } bool is_software_backed_video_frame = !video_frame->HasTextures(); @@ -9,7 +9,7 @@ is_software_backed_video_frame &= !video_frame->HasDmaBufs(); #endif -@@ -1199,7 +1199,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo +@@ -1223,7 +1223,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo } #endif @@ -18,7 +18,7 @@ is_webgpu_compatible = (gpu_memory_buffer != nullptr); if (is_webgpu_compatible) { is_webgpu_compatible &= -@@ -1218,7 +1218,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo +@@ -1242,7 +1242,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo gpu::SHARED_IMAGE_USAGE_DISPLAY_READ | gpu::SHARED_IMAGE_USAGE_SCANOUT; diff --git a/www/iridium/files/patch-mojo_public_c_system_thunks.cc b/www/iridium/files/patch-mojo_public_c_system_thunks.cc index 73b823265371..ef3766cb135b 100644 --- a/www/iridium/files/patch-mojo_public_c_system_thunks.cc +++ b/www/iridium/files/patch-mojo_public_c_system_thunks.cc @@ -1,6 +1,6 @@ ---- mojo/public/c/system/thunks.cc.orig 2022-12-06 08:09:13 UTC +--- mojo/public/c/system/thunks.cc.orig 2023-11-22 14:00:11 UTC +++ mojo/public/c/system/thunks.cc -@@ -23,7 +23,7 @@ +@@ -24,7 +24,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 { +@@ -73,7 +73,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 { +@@ -87,7 +87,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 { +@@ -143,7 +143,7 @@ class CoreLibraryInitializer { private: #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ diff --git a/www/iridium/files/patch-net_BUILD.gn b/www/iridium/files/patch-net_BUILD.gn index 4ce27a27226a..aeb51d86145d 100644 --- a/www/iridium/files/patch-net_BUILD.gn +++ b/www/iridium/files/patch-net_BUILD.gn @@ -1,4 +1,4 @@ ---- net/BUILD.gn.orig 2023-10-21 11:51:27 UTC +--- net/BUILD.gn.orig 2023-11-22 14:00:11 UTC +++ net/BUILD.gn @@ -122,7 +122,7 @@ net_configs = [ "//build/config/compiler:wexit_time_destructors", @@ -9,7 +9,7 @@ net_configs += [ "//build/config/linux:libresolv" ] } -@@ -1244,6 +1244,19 @@ component("net") { +@@ -1242,6 +1242,19 @@ component("net") { deps += [ "//third_party/xdg_shared_mime_info" ] } @@ -29,7 +29,7 @@ if (is_mac) { sources += [ "base/network_notification_thread_mac.cc", -@@ -1399,7 +1412,7 @@ component("net") { +@@ -1398,7 +1411,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", -@@ -2894,7 +2907,7 @@ test("net_unittests") { +@@ -2891,7 +2904,7 @@ test("net_unittests") { ] } @@ -47,7 +47,7 @@ sources += [ "base/address_tracker_linux_unittest.cc", "base/network_interfaces_linux_unittest.cc", -@@ -2962,6 +2975,10 @@ test("net_unittests") { +@@ -2963,6 +2976,10 @@ test("net_unittests") { "//url:buildflags", ] diff --git a/www/iridium/files/patch-net_base_features.cc b/www/iridium/files/patch-net_base_features.cc index f2005404ffd3..0b68ef94fa0d 100644 --- a/www/iridium/files/patch-net_base_features.cc +++ b/www/iridium/files/patch-net_base_features.cc @@ -1,6 +1,6 @@ ---- net/base/features.cc.orig 2023-10-21 11:51:27 UTC +--- net/base/features.cc.orig 2023-11-22 14:00:11 UTC +++ net/base/features.cc -@@ -177,7 +177,7 @@ BASE_FEATURE(kCertDualVerificationTrialFeature, +@@ -169,7 +169,7 @@ BASE_FEATURE(kSameSiteDefaultChecksMethodRigorously, #if BUILDFLAG(CHROME_ROOT_STORE_OPTIONAL) BASE_FEATURE(kChromeRootStoreUsed, "ChromeRootStoreUsed", diff --git a/www/iridium/files/patch-net_cert_cert__verify__proc__unittest.cc b/www/iridium/files/patch-net_cert_cert__verify__proc__unittest.cc index da0946abe7a0..1817dc9aa66c 100644 --- a/www/iridium/files/patch-net_cert_cert__verify__proc__unittest.cc +++ b/www/iridium/files/patch-net_cert_cert__verify__proc__unittest.cc @@ -1,6 +1,6 @@ ---- net/cert/cert_verify_proc_unittest.cc.orig 2023-08-28 20:17:35 UTC +--- net/cert/cert_verify_proc_unittest.cc.orig 2023-11-22 14:00:11 UTC +++ net/cert/cert_verify_proc_unittest.cc -@@ -215,7 +215,7 @@ scoped_refptr<CertVerifyProc> CreateCertVerifyProc( +@@ -213,7 +213,7 @@ scoped_refptr<CertVerifyProc> CreateCertVerifyProc( case CERT_VERIFY_PROC_IOS: return base::MakeRefCounted<CertVerifyProcIOS>(std::move(crl_set)); #endif @@ -9,7 +9,7 @@ case CERT_VERIFY_PROC_BUILTIN: return CreateCertVerifyProcBuiltin(std::move(cert_net_fetcher), std::move(crl_set), -@@ -244,7 +244,7 @@ constexpr CertVerifyProcType kAllCertVerifiers[] = { +@@ -242,7 +242,7 @@ constexpr CertVerifyProcType kAllCertVerifiers[] = { CERT_VERIFY_PROC_ANDROID, #elif BUILDFLAG(IS_IOS) CERT_VERIFY_PROC_IOS, diff --git a/www/iridium/files/patch-net_cert_pki_general__names.h b/www/iridium/files/patch-net_cert_pki_general__names.h index 56d06b4c97e7..be26517abdb5 100644 --- a/www/iridium/files/patch-net_cert_pki_general__names.h +++ b/www/iridium/files/patch-net_cert_pki_general__names.h @@ -1,8 +1,8 @@ ---- net/cert/pki/general_names.h.orig 2023-10-21 11:51:27 UTC +--- net/cert/pki/general_names.h.orig 2023-11-22 14:00:11 UTC +++ net/cert/pki/general_names.h -@@ -7,6 +7,7 @@ - +@@ -8,6 +8,7 @@ #include <memory> + #include <string_view> #include <vector> +#include <string> diff --git a/www/iridium/files/patch-net_dns_public_BUILD.gn b/www/iridium/files/patch-net_dns_public_BUILD.gn index c324ebebcf56..25e510860f23 100644 --- a/www/iridium/files/patch-net_dns_public_BUILD.gn +++ b/www/iridium/files/patch-net_dns_public_BUILD.gn @@ -1,6 +1,6 @@ ---- net/dns/public/BUILD.gn.orig 2022-12-01 10:35:46 UTC +--- net/dns/public/BUILD.gn.orig 2023-11-22 14:00:11 UTC +++ net/dns/public/BUILD.gn -@@ -76,7 +76,7 @@ source_set("tests") { +@@ -77,7 +77,7 @@ source_set("tests") { "doh_provider_entry_unittest.cc", ] diff --git a/www/iridium/files/patch-net_third__party_quiche_BUILD.gn b/www/iridium/files/patch-net_third__party_quiche_BUILD.gn index 533d0ef9d782..e4bcf02dbec7 100644 --- a/www/iridium/files/patch-net_third__party_quiche_BUILD.gn +++ b/www/iridium/files/patch-net_third__party_quiche_BUILD.gn @@ -1,6 +1,6 @@ ---- net/third_party/quiche/BUILD.gn.orig 2022-12-06 08:09:13 UTC +--- net/third_party/quiche/BUILD.gn.orig 2023-11-22 14:00:11 UTC +++ net/third_party/quiche/BUILD.gn -@@ -28,7 +28,7 @@ import("//build/config/chromeos/ui_mode.gni") +@@ -29,7 +29,7 @@ import("//net/third_party/quiche/src/build/source_list import("//testing/libfuzzer/fuzzer_test.gni") import("//third_party/protobuf/proto_library.gni") diff --git a/www/iridium/files/patch-net_tools_cert__verify__tool_cert__verify__comparision__tool.cc b/www/iridium/files/patch-net_tools_cert__verify__tool_cert__verify__comparision__tool.cc index 9ae338f0c187..ce52d494cc77 100644 --- a/www/iridium/files/patch-net_tools_cert__verify__tool_cert__verify__comparision__tool.cc +++ b/www/iridium/files/patch-net_tools_cert__verify__tool_cert__verify__comparision__tool.cc @@ -1,6 +1,6 @@ ---- net/tools/cert_verify_tool/cert_verify_comparision_tool.cc.orig 2023-07-24 14:27:53 UTC +--- net/tools/cert_verify_tool/cert_verify_comparision_tool.cc.orig 2023-11-22 14:00:11 UTC +++ net/tools/cert_verify_tool/cert_verify_comparision_tool.cc -@@ -35,7 +35,7 @@ +@@ -34,7 +34,7 @@ #include "net/url_request/url_request_context_builder.h" #include "net/url_request/url_request_context_getter.h" @@ -9,7 +9,7 @@ #include "net/proxy_resolution/proxy_config.h" #include "net/proxy_resolution/proxy_config_service_fixed.h" #endif -@@ -55,7 +55,7 @@ void SetUpOnNetworkThread( +@@ -54,7 +54,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. // -@@ -126,7 +126,7 @@ class CertVerifyImpl { +@@ -125,7 +125,7 @@ class CertVerifyImpl { std::unique_ptr<CertVerifyImpl> CreateCertVerifyImplFromName( base::StringPiece impl_name, scoped_refptr<net::CertNetFetcher> cert_net_fetcher) { diff --git a/www/iridium/files/patch-printing_mojom_printing__context__mojom__traits.cc b/www/iridium/files/patch-printing_mojom_printing__context__mojom__traits.cc index be77f314c765..d4165ef2b086 100644 --- a/www/iridium/files/patch-printing_mojom_printing__context__mojom__traits.cc +++ b/www/iridium/files/patch-printing_mojom_printing__context__mojom__traits.cc @@ -1,4 +1,4 @@ ---- printing/mojom/printing_context_mojom_traits.cc.orig 2023-10-21 11:51:27 UTC +--- printing/mojom/printing_context_mojom_traits.cc.orig 2023-11-22 14:00:11 UTC +++ printing/mojom/printing_context_mojom_traits.cc @@ -19,7 +19,7 @@ #include "base/numerics/safe_conversions.h" @@ -18,12 +18,12 @@ DCHECK(out->advanced_settings().empty()); if (!data.ReadAdvancedSettings(&out->advanced_settings())) return false; -@@ -239,7 +239,7 @@ bool StructTraits< +@@ -238,7 +238,7 @@ bool StructTraits< + if (system_print_dialog_data.size() != dictionary_entries) { return false; } - -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // The dictionary must contain three strings. - base::Value* value = system_print_dialog_data.Find( + const base::Value* value = system_print_dialog_data.Find( printing::kLinuxSystemPrintDialogDataPrinter); diff --git a/www/iridium/files/patch-remoting_host_client__session.cc b/www/iridium/files/patch-remoting_host_client__session.cc new file mode 100644 index 000000000000..e1f03e31b304 --- /dev/null +++ b/www/iridium/files/patch-remoting_host_client__session.cc @@ -0,0 +1,11 @@ +--- remoting/host/client_session.cc.orig 2023-11-22 14:00:11 UTC ++++ remoting/host/client_session.cc +@@ -157,7 +157,7 @@ void ClientSession::NotifyClientResolution( + if (desktop_environment_options_.enable_curtaining()) { + dpi_vector.set(resolution.x_dpi(), resolution.y_dpi()); + } +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + dpi_vector.set(resolution.x_dpi(), resolution.y_dpi()); + #endif + diff --git a/www/iridium/files/patch-sandbox_policy_features.cc b/www/iridium/files/patch-sandbox_policy_features.cc index 60c2ffbf42e3..10d761aab6f5 100644 --- a/www/iridium/files/patch-sandbox_policy_features.cc +++ b/www/iridium/files/patch-sandbox_policy_features.cc @@ -1,4 +1,4 @@ ---- sandbox/policy/features.cc.orig 2023-10-21 11:51:27 UTC +--- sandbox/policy/features.cc.orig 2023-11-22 14:00:11 UTC +++ sandbox/policy/features.cc @@ -19,7 +19,11 @@ namespace sandbox::policy::features { // (Only causes an effect when feature kNetworkServiceInProcess is disabled.) @@ -12,3 +12,12 @@ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) // Enables a fine-grained seccomp-BPF syscall filter for the network service. +@@ -126,7 +130,7 @@ BASE_FEATURE(kForceSpectreVariant2Mitigation, + base::FEATURE_DISABLED_BY_DEFAULT); + #endif // BUILDFLAG(IS_CHROMEOS_ASH) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // Enabling the kNetworkServiceSandbox feature automatically enables Spectre + // variant 2 mitigations in the network service. This can lead to performance + // regressions, so enabling this feature will turn off the Spectre Variant 2 diff --git a/www/iridium/files/patch-sandbox_policy_features.h b/www/iridium/files/patch-sandbox_policy_features.h new file mode 100644 index 000000000000..9e86b8b95ef9 --- /dev/null +++ b/www/iridium/files/patch-sandbox_policy_features.h @@ -0,0 +1,11 @@ +--- sandbox/policy/features.h.orig 2023-11-22 14:00:11 UTC ++++ sandbox/policy/features.h +@@ -44,7 +44,7 @@ SANDBOX_POLICY_EXPORT BASE_DECLARE_FEATURE(kSpectreVar + SANDBOX_POLICY_EXPORT BASE_DECLARE_FEATURE(kForceSpectreVariant2Mitigation); + #endif // BUILDFLAG(IS_CHROMEOS_ASH) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + SANDBOX_POLICY_EXPORT BASE_DECLARE_FEATURE( + kForceDisableSpectreVariant2MitigationInNetworkService); + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/iridium/files/patch-services_cert__verifier_cert__verifier__creation.cc b/www/iridium/files/patch-services_cert__verifier_cert__verifier__creation.cc index 723e1cb09e4e..7d8557305651 100644 --- a/www/iridium/files/patch-services_cert__verifier_cert__verifier__creation.cc +++ b/www/iridium/files/patch-services_cert__verifier_cert__verifier__creation.cc @@ -1,4 +1,4 @@ ---- services/cert_verifier/cert_verifier_creation.cc.orig 2023-08-28 20:17:35 UTC +--- services/cert_verifier/cert_verifier_creation.cc.orig 2023-11-22 14:00:11 UTC +++ services/cert_verifier/cert_verifier_creation.cc @@ -13,7 +13,7 @@ #include "net/cert/multi_threaded_cert_verifier.h" @@ -9,7 +9,7 @@ #include "net/cert/cert_verify_proc_builtin.h" #include "net/cert/internal/system_trust_store.h" #endif -@@ -112,7 +112,7 @@ class CertVerifyProcFactoryImpl : public net::CertVeri +@@ -108,7 +108,7 @@ class CertVerifyProcFactoryImpl : public net::CertVeri user_slot_restriction_ ? crypto::ScopedPK11Slot(PK11_ReferenceSlot( user_slot_restriction_.get())) : nullptr)); @@ -18,11 +18,11 @@ return net::CreateCertVerifyProcBuiltin(std::move(cert_net_fetcher), std::move(crl_set), net::CreateSslSystemTrustStore()); -@@ -212,6 +212,7 @@ std::unique_ptr<net::CertVerifierWithUpdatableProc> Cr +@@ -174,6 +174,7 @@ class CertVerifyProcFactoryImpl : public net::CertVeri bool IsUsingCertNetFetcher() { #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || \ + BUILDFLAG(IS_BSD) || \ - BUILDFLAG(TRIAL_COMPARISON_CERT_VERIFIER_SUPPORTED) || \ BUILDFLAG(CHROME_ROOT_STORE_SUPPORTED) return true; + #else diff --git a/www/iridium/files/patch-services_device_BUILD.gn b/www/iridium/files/patch-services_device_BUILD.gn index 5aa60b31040b..ada20a9454e2 100644 --- a/www/iridium/files/patch-services_device_BUILD.gn +++ b/www/iridium/files/patch-services_device_BUILD.gn @@ -1,6 +1,6 @@ ---- services/device/BUILD.gn.orig 2022-12-01 10:35:46 UTC +--- services/device/BUILD.gn.orig 2023-11-22 14:00:11 UTC +++ services/device/BUILD.gn -@@ -16,7 +16,7 @@ if (is_android) { +@@ -13,7 +13,7 @@ if (is_android) { } is_serial_enabled_platform = diff --git a/www/iridium/files/patch-services_device_public_cpp_generic__sensor_sensor__reading.h b/www/iridium/files/patch-services_device_public_cpp_generic__sensor_sensor__reading.h index 9f1aaede8d60..c23506ea8633 100644 --- a/www/iridium/files/patch-services_device_public_cpp_generic__sensor_sensor__reading.h +++ b/www/iridium/files/patch-services_device_public_cpp_generic__sensor_sensor__reading.h @@ -1,8 +1,8 @@ ---- services/device/public/cpp/generic_sensor/sensor_reading.h.orig 2023-10-21 11:51:27 UTC +--- services/device/public/cpp/generic_sensor/sensor_reading.h.orig 2023-11-22 14:00:11 UTC +++ services/device/public/cpp/generic_sensor/sensor_reading.h -@@ -5,6 +5,8 @@ - #ifndef SERVICES_DEVICE_PUBLIC_CPP_GENERIC_SENSOR_SENSOR_READING_H_ - #define SERVICES_DEVICE_PUBLIC_CPP_GENERIC_SENSOR_SENSOR_READING_H_ +@@ -8,6 +8,8 @@ + #include <stddef.h> + #include <stdint.h> +#include <cstdint> + diff --git a/www/iridium/files/patch-services_device_usb_BUILD.gn b/www/iridium/files/patch-services_device_usb_BUILD.gn index 6fb67f1069bd..139cff475b98 100644 --- a/www/iridium/files/patch-services_device_usb_BUILD.gn +++ b/www/iridium/files/patch-services_device_usb_BUILD.gn @@ -1,6 +1,6 @@ ---- services/device/usb/BUILD.gn.orig 2023-10-21 11:51:27 UTC +--- services/device/usb/BUILD.gn.orig 2023-11-22 14:00:11 UTC +++ services/device/usb/BUILD.gn -@@ -89,15 +89,17 @@ static_library("usb") { +@@ -90,15 +90,17 @@ static_library("usb") { deps += [ "//third_party/re2" ] } @@ -27,7 +27,7 @@ # These sources and deps are required for libusb. # TODO(https://crbug.com/1096743) Remove these sources. -@@ -121,6 +123,13 @@ static_library("usb") { +@@ -122,6 +124,13 @@ static_library("usb") { deps += [ "//third_party/libusb" ] } @@ -41,7 +41,7 @@ if (is_linux || is_chromeos) { sources += [ "usb_device_linux.cc", -@@ -138,7 +147,7 @@ static_library("usb") { +@@ -139,7 +148,7 @@ static_library("usb") { deps += [ "//device/udev_linux" ] } diff --git a/www/iridium/files/patch-services_network_BUILD.gn b/www/iridium/files/patch-services_network_BUILD.gn index 1b386d834e04..d2dbe3606cfe 100644 --- a/www/iridium/files/patch-services_network_BUILD.gn +++ b/www/iridium/files/patch-services_network_BUILD.gn @@ -1,6 +1,6 @@ ---- services/network/BUILD.gn.orig 2023-10-21 11:51:27 UTC +--- services/network/BUILD.gn.orig 2023-11-22 14:00:11 UTC +++ services/network/BUILD.gn -@@ -392,7 +392,6 @@ if (is_linux || is_chromeos) { +@@ -391,7 +391,6 @@ if (is_linux || is_chromeos) { ] deps = [ "//base:base", diff --git a/www/iridium/files/patch-services_network_network__context.cc b/www/iridium/files/patch-services_network_network__context.cc index 9c135c4cf8eb..0969bfab93d4 100644 --- a/www/iridium/files/patch-services_network_network__context.cc +++ b/www/iridium/files/patch-services_network_network__context.cc @@ -1,6 +1,6 @@ ---- services/network/network_context.cc.orig 2023-10-21 11:51:27 UTC +--- services/network/network_context.cc.orig 2023-11-22 14:00:11 UTC +++ services/network/network_context.cc -@@ -447,7 +447,7 @@ NetworkContext::NetworkContextHttpAuthPreferences:: +@@ -446,7 +446,7 @@ NetworkContext::NetworkContextHttpAuthPreferences:: NetworkContext::NetworkContextHttpAuthPreferences:: ~NetworkContextHttpAuthPreferences() = default; @@ -9,7 +9,7 @@ bool NetworkContext::NetworkContextHttpAuthPreferences::AllowGssapiLibraryLoad() const { if (network_service_) { -@@ -2301,7 +2301,7 @@ void NetworkContext::OnHttpAuthDynamicParamsChanged( +@@ -2364,7 +2364,7 @@ void NetworkContext::OnHttpAuthDynamicParamsChanged( http_auth_dynamic_network_service_params->android_negotiate_account_type); #endif // BUILDFLAG(IS_ANDROID) diff --git a/www/iridium/files/patch-services_network_network__context.h b/www/iridium/files/patch-services_network_network__context.h index 8359b858580f..5d6bd74e544a 100644 --- a/www/iridium/files/patch-services_network_network__context.h +++ b/www/iridium/files/patch-services_network_network__context.h @@ -1,6 +1,6 @@ ---- services/network/network_context.h.orig 2023-10-21 11:51:27 UTC +--- services/network/network_context.h.orig 2023-11-22 14:00:11 UTC +++ services/network/network_context.h -@@ -667,7 +667,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext +@@ -675,7 +675,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext public: explicit NetworkContextHttpAuthPreferences(NetworkService* network_service); ~NetworkContextHttpAuthPreferences() override; diff --git a/www/iridium/files/patch-services_network_public_cpp_BUILD.gn b/www/iridium/files/patch-services_network_public_cpp_BUILD.gn index 59a48325b62b..29cb500f56d9 100644 --- a/www/iridium/files/patch-services_network_public_cpp_BUILD.gn +++ b/www/iridium/files/patch-services_network_public_cpp_BUILD.gn @@ -1,6 +1,6 @@ ---- services/network/public/cpp/BUILD.gn.orig 2023-10-21 11:51:27 UTC +--- services/network/public/cpp/BUILD.gn.orig 2023-11-22 14:00:11 UTC +++ services/network/public/cpp/BUILD.gn -@@ -475,7 +475,7 @@ component("cpp_base") { +@@ -471,7 +471,7 @@ component("cpp_base") { sources += [ "transferable_directory_fuchsia.cc" ] } diff --git a/www/iridium/files/patch-services_network_public_cpp_features.cc b/www/iridium/files/patch-services_network_public_cpp_features.cc index 7c9d1a757ea1..f04bfe8849e2 100644 --- a/www/iridium/files/patch-services_network_public_cpp_features.cc +++ b/www/iridium/files/patch-services_network_public_cpp_features.cc @@ -1,6 +1,6 @@ ---- services/network/public/cpp/features.cc.orig 2023-10-21 11:51:27 UTC +--- services/network/public/cpp/features.cc.orig 2023-11-22 14:00:11 UTC +++ services/network/public/cpp/features.cc -@@ -383,7 +383,7 @@ BASE_FEATURE(kPrivateNetworkAccessPermissionPrompt, +@@ -376,7 +376,7 @@ BASE_FEATURE(kPrivateNetworkAccessPermissionPrompt, // that can be adequately sandboxed. BASE_FEATURE(kOutOfProcessSystemDnsResolution, "OutOfProcessSystemDnsResolution", diff --git a/www/iridium/files/patch-services_network_public_mojom_BUILD.gn b/www/iridium/files/patch-services_network_public_mojom_BUILD.gn index 6567470cd734..06a3dcf3cb66 100644 --- a/www/iridium/files/patch-services_network_public_mojom_BUILD.gn +++ b/www/iridium/files/patch-services_network_public_mojom_BUILD.gn @@ -1,4 +1,4 @@ ---- services/network/public/mojom/BUILD.gn.orig 2023-10-21 11:51:27 UTC +--- services/network/public/mojom/BUILD.gn.orig 2023-11-22 14:00:11 UTC +++ services/network/public/mojom/BUILD.gn @@ -515,11 +515,11 @@ mojom("url_loader_base") { } @@ -14,7 +14,7 @@ # TODO(crbug.com/1431866): Remove this once is_linux in the mojom IDL does # not include lacros. enabled_features += [ "use_network_interface_change_listener" ] -@@ -1435,7 +1435,7 @@ mojom("mojom") { +@@ -1431,7 +1431,7 @@ mojom("mojom") { } } diff --git a/www/iridium/files/patch-third__party_abseil-cpp_absl_base_internal_sysinfo.cc b/www/iridium/files/patch-third__party_abseil-cpp_absl_base_internal_sysinfo.cc index ab05daa6339b..d35eb4c9759c 100644 --- a/www/iridium/files/patch-third__party_abseil-cpp_absl_base_internal_sysinfo.cc +++ b/www/iridium/files/patch-third__party_abseil-cpp_absl_base_internal_sysinfo.cc @@ -1,6 +1,6 @@ ---- third_party/abseil-cpp/absl/base/internal/sysinfo.cc.orig 2023-10-21 11:51:27 UTC +--- third_party/abseil-cpp/absl/base/internal/sysinfo.cc.orig 2023-11-22 14:00:11 UTC +++ third_party/abseil-cpp/absl/base/internal/sysinfo.cc -@@ -30,10 +30,14 @@ +@@ -30,7 +30,7 @@ #include <sys/syscall.h> #endif @@ -9,14 +9,7 @@ #include <sys/sysctl.h> #endif -+#if defined(__FreeBSD__) -+#include <pthread_np.h> -+#endif -+ - #if defined(__myriad2__) - #include <rtems.h> - #endif -@@ -186,6 +190,7 @@ static double GetNominalCPUFrequency() { +@@ -194,6 +194,7 @@ static double GetNominalCPUFrequency() { #else @@ -24,7 +17,7 @@ // Helper function for reading a long from a file. Returns true if successful // and the memory location pointed to by value is set to the value read. static bool ReadLongFromFile(const char *file, long *value) { -@@ -218,6 +223,7 @@ static bool ReadLongFromFile(const char *file, long *v +@@ -226,6 +227,7 @@ static bool ReadLongFromFile(const char *file, long *v } return ret; } @@ -32,7 +25,7 @@ #if defined(ABSL_INTERNAL_UNSCALED_CYCLECLOCK_FREQUENCY_IS_CPU_FREQUENCY) -@@ -317,9 +323,11 @@ static double GetNominalCPUFrequency() { +@@ -325,9 +327,11 @@ static double GetNominalCPUFrequency() { // a new mode (turbo mode). Essentially, those frequencies cannot // always be relied upon. The same reasons apply to /proc/cpuinfo as // well. @@ -44,7 +37,7 @@ #if defined(ABSL_INTERNAL_UNSCALED_CYCLECLOCK_FREQUENCY_IS_CPU_FREQUENCY) // On these platforms, the TSC frequency is the nominal CPU -@@ -338,10 +346,12 @@ static double GetNominalCPUFrequency() { +@@ -346,10 +350,12 @@ static double GetNominalCPUFrequency() { // If CPU scaling is in effect, we want to use the *maximum* // frequency, not whatever CPU speed some random processor happens // to be using now. @@ -57,7 +50,7 @@ return 1.0; #endif // !ABSL_INTERNAL_UNSCALED_CYCLECLOCK_FREQUENCY_IS_CPU_FREQUENCY -@@ -439,6 +449,18 @@ pid_t GetTID() { +@@ -459,6 +465,12 @@ pid_t GetTID() { static_assert(sizeof(pid_t) == sizeof(thread), "In NaCL int expected to be the same size as a pointer"); return reinterpret_cast<pid_t>(thread); @@ -67,12 +60,6 @@ + +pid_t GetTID() { + return getthrid(); -+} -+ -+#elif defined(__FreeBSD__) -+ -+pid_t GetTID() { -+ return pthread_getthreadid_np(); } #else diff --git a/www/iridium/files/patch-third__party_angle_src_libANGLE_Display.cpp b/www/iridium/files/patch-third__party_angle_src_libANGLE_Display.cpp index ddc3e735dec7..fda25adb8649 100644 --- a/www/iridium/files/patch-third__party_angle_src_libANGLE_Display.cpp +++ b/www/iridium/files/patch-third__party_angle_src_libANGLE_Display.cpp @@ -1,4 +1,4 @@ ---- third_party/angle/src/libANGLE/Display.cpp.orig 2023-10-21 11:51:27 UTC +--- third_party/angle/src/libANGLE/Display.cpp.orig 2023-11-22 14:00:11 UTC +++ third_party/angle/src/libANGLE/Display.cpp @@ -60,7 +60,7 @@ # include "libANGLE/renderer/gl/cgl/DisplayCGL.h" @@ -9,7 +9,7 @@ # include "libANGLE/renderer/gl/egl/DisplayEGL.h" # if defined(ANGLE_USE_X11) # include "libANGLE/renderer/gl/glx/DisplayGLX.h" -@@ -411,7 +411,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di +@@ -408,7 +408,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di impl = new rx::DisplayEAGL(state); break; @@ -18,7 +18,7 @@ # if defined(ANGLE_USE_GBM) if (platformType == 0) { -@@ -457,7 +457,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di +@@ -454,7 +454,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di #if defined(ANGLE_ENABLE_OPENGL) # if defined(ANGLE_PLATFORM_WINDOWS) impl = new rx::DisplayWGL(state); @@ -27,7 +27,7 @@ # if defined(ANGLE_USE_GBM) if (platformType == 0) { -@@ -508,7 +508,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di +@@ -505,7 +505,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di impl = rx::CreateVulkanWin32Display(state); } break; @@ -36,7 +36,7 @@ # if defined(ANGLE_USE_GBM) if (platformType == EGL_PLATFORM_GBM_KHR && rx::IsVulkanGbmDisplayAvailable()) { -@@ -2148,7 +2148,7 @@ static ClientExtensions GenerateClientExtensions() +@@ -2106,7 +2106,7 @@ static ClientExtensions GenerateClientExtensions() extensions.x11Visual = true; #endif diff --git a/www/iridium/files/patch-third__party_blink_public_platform_platform.h b/www/iridium/files/patch-third__party_blink_public_platform_platform.h index 2c3b96a0fa94..5f4bb302da69 100644 --- a/www/iridium/files/patch-third__party_blink_public_platform_platform.h +++ b/www/iridium/files/patch-third__party_blink_public_platform_platform.h @@ -1,6 +1,6 @@ ---- third_party/blink/public/platform/platform.h.orig 2023-10-21 11:51:27 UTC +--- third_party/blink/public/platform/platform.h.orig 2023-11-22 14:00:11 UTC +++ third_party/blink/public/platform/platform.h -@@ -338,7 +338,7 @@ class BLINK_PLATFORM_EXPORT Platform { +@@ -344,7 +344,7 @@ class BLINK_PLATFORM_EXPORT Platform { return nullptr; } diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_editing_editing__behavior.cc b/www/iridium/files/patch-third__party_blink_renderer_core_editing_editing__behavior.cc index f0042973b1aa..21e86b12b0cf 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_core_editing_editing__behavior.cc +++ b/www/iridium/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-04-22 17:45:15 UTC +--- third_party/blink/renderer/core/editing/editing_behavior.cc.orig 2023-11-22 14:00:11 UTC +++ third_party/blink/renderer/core/editing/editing_behavior.cc -@@ -284,7 +284,7 @@ bool EditingBehavior::ShouldInsertCharacter(const Keyb +@@ -279,7 +279,7 @@ bool EditingBehavior::ShouldInsertCharacter(const Keyb // unexpected behaviour if (ch < ' ') return false; diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc b/www/iridium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc index 23a46c8817dd..a5a5849b118b 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc +++ b/www/iridium/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 2023-10-21 11:51:27 UTC +--- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2023-11-22 14:00:11 UTC +++ third_party/blink/renderer/core/exported/web_view_impl.cc @@ -421,7 +421,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' -@@ -3323,7 +3323,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs +@@ -3327,7 +3327,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/iridium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc b/www/iridium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc index ab7d5cde8acf..928d7ea1f2af 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc +++ b/www/iridium/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 2023-10-21 11:51:27 UTC +--- third_party/blink/renderer/core/frame/web_frame_test.cc.orig 2023-11-22 14:00:11 UTC +++ third_party/blink/renderer/core/frame/web_frame_test.cc -@@ -6456,7 +6456,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) { +@@ -6461,7 +6461,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 \ -@@ -6865,7 +6865,7 @@ TEST_F(CompositedSelectionBoundsTest, LargeSelectionSc +@@ -6870,7 +6870,7 @@ TEST_F(CompositedSelectionBoundsTest, LargeSelectionSc TEST_F(CompositedSelectionBoundsTest, LargeSelectionNoScroll) { RunTest("composited_selection_bounds_large_selection_noscroll.html"); } diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc b/www/iridium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc index 6905c88c5a37..fecbab32a951 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc @@ -1,11 +1,11 @@ ---- third_party/blink/renderer/core/inspector/inspector_memory_agent.cc.orig 2023-07-24 14:27:53 UTC +--- third_party/blink/renderer/core/inspector/inspector_memory_agent.cc.orig 2023-11-22 14:00:11 UTC +++ third_party/blink/renderer/core/inspector/inspector_memory_agent.cc -@@ -189,7 +189,7 @@ InspectorMemoryAgent::GetSamplingProfileById(uint32_t +@@ -190,7 +190,7 @@ InspectorMemoryAgent::GetSamplingProfileById(uint32_t Vector<String> InspectorMemoryAgent::Symbolize( - const WebVector<void*>& addresses) { + const WebVector<const void*>& addresses) { -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // TODO(alph): Move symbolization to the client. - Vector<void*> addresses_to_symbolize; - for (size_t i = 0; i < addresses.size(); i++) { + Vector<const void*> addresses_to_symbolize; + for (const void* address : addresses) { diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_layout_ng_layout__ng__view.cc b/www/iridium/files/patch-third__party_blink_renderer_core_layout_ng_layout__ng__view.cc index 828143008033..ac5fb156c555 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_core_layout_ng_layout__ng__view.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_core_layout_ng_layout__ng__view.cc @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/core/layout/ng/layout_ng_view.cc.orig 2023-10-21 11:51:27 UTC +--- third_party/blink/renderer/core/layout/ng/layout_ng_view.cc.orig 2023-11-22 14:00:11 UTC +++ third_party/blink/renderer/core/layout/ng/layout_ng_view.cc @@ -15,7 +15,7 @@ #include "third_party/blink/renderer/core/svg/svg_document_extensions.h" @@ -9,7 +9,7 @@ #include "third_party/blink/renderer/platform/fonts/font_cache.h" #endif -@@ -53,7 +53,7 @@ void LayoutNGView::UpdateLayout() { +@@ -51,7 +51,7 @@ void LayoutNGView::UpdateLayout() { fragmentation_context_.Clear(); } diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc b/www/iridium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc index 7fe276996dcd..b183cdb58bf4 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc +++ b/www/iridium/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 2023-10-21 11:51:27 UTC +--- third_party/blink/renderer/core/paint/paint_layer.cc.orig 2023-11-22 14:00:11 UTC +++ third_party/blink/renderer/core/paint/paint_layer.cc -@@ -118,7 +118,7 @@ namespace blink { +@@ -120,7 +120,7 @@ namespace blink { namespace { diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc b/www/iridium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc index 7857abc6bf4c..df9abc76d224 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2023-10-21 11:51:27 UTC +--- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2023-11-22 14:00:11 UTC +++ third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc -@@ -155,7 +155,7 @@ bool ScrollbarThemeAura::SupportsDragSnapBack() const +@@ -157,7 +157,7 @@ bool ScrollbarThemeAura::SupportsDragSnapBack() const // is true for at least GTK and QT apps). // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. @@ -9,7 +9,7 @@ return false; #else return true; -@@ -355,7 +355,7 @@ bool ScrollbarThemeAura::ShouldCenterOnThumb(const Scr +@@ -357,7 +357,7 @@ bool ScrollbarThemeAura::ShouldCenterOnThumb(const Scr const WebMouseEvent& event) { // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/iridium/files/patch-third__party_blink_renderer_modules_ml_webnn_ml__graph__xnnpack.cc b/www/iridium/files/patch-third__party_blink_renderer_modules_ml_webnn_ml__graph__xnnpack.cc index 55183379bae0..56bab65b0118 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_modules_ml_webnn_ml__graph__xnnpack.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_modules_ml_webnn_ml__graph__xnnpack.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/ml/webnn/ml_graph_xnnpack.cc.orig 2023-10-21 11:51:27 UTC +--- third_party/blink/renderer/modules/ml/webnn/ml_graph_xnnpack.cc.orig 2023-11-22 14:00:11 UTC +++ third_party/blink/renderer/modules/ml/webnn/ml_graph_xnnpack.cc -@@ -191,7 +191,7 @@ class SharedXnnpackContext : public ThreadSafeRefCount +@@ -195,7 +195,7 @@ class SharedXnnpackContext : public ThreadSafeRefCount ~SharedXnnpackContext() { base::AutoLock auto_lock(SharedXnnpackContextLock()); diff --git a/www/iridium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc b/www/iridium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc index d61f4ddddb34..45d604a9c9f6 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc +++ b/www/iridium/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 2023-07-24 14:27:53 UTC +--- third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig 2023-11-22 14:00:11 UTC +++ third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc -@@ -297,7 +297,7 @@ TEST_F(WebRtcAudioRendererTest, DISABLED_VerifySinkPar +@@ -298,7 +298,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/iridium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc b/www/iridium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc index d543dfa2d56d..732c98f310a9 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc +++ b/www/iridium/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 2023-10-21 11:51:27 UTC +--- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig 2023-11-22 14:00:11 UTC +++ third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -@@ -6321,7 +6321,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid +@@ -6330,7 +6330,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid constexpr bool kAllowZeroCopyImages = true; #endif diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_BUILD.gn b/www/iridium/files/patch-third__party_blink_renderer_platform_BUILD.gn index 0d1e55289607..34dc8172845d 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_platform_BUILD.gn +++ b/www/iridium/files/patch-third__party_blink_renderer_platform_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/BUILD.gn.orig 2023-10-21 11:51:27 UTC +--- third_party/blink/renderer/platform/BUILD.gn.orig 2023-11-22 14:00:11 UTC +++ third_party/blink/renderer/platform/BUILD.gn -@@ -1932,7 +1932,7 @@ static_library("test_support") { +@@ -1916,7 +1916,7 @@ static_library("test_support") { ] # fuzzed_data_provider may not work with a custom toolchain. diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc b/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc index ee142d721862..75505a1c920e 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/platform/fonts/font_description.cc.orig 2023-10-21 11:51:27 UTC +--- third_party/blink/renderer/platform/fonts/font_description.cc.orig 2023-11-22 14:00:11 UTC +++ third_party/blink/renderer/platform/fonts/font_description.cc @@ -39,7 +39,7 @@ #include "third_party/blink/renderer/platform/wtf/text/string_hash.h" @@ -9,7 +9,7 @@ #include "third_party/blink/renderer/platform/fonts/font_cache.h" #endif -@@ -274,7 +274,7 @@ FontCacheKey FontDescription::CacheKey( +@@ -275,7 +275,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/iridium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc b/www/iridium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc index 4ff2e4c45349..08e446692368 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc +++ b/www/iridium/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 2023-08-28 20:17:35 UTC +--- third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig 2023-11-22 14:00:11 UTC +++ third_party/blink/renderer/platform/graphics/video_frame_submitter.cc -@@ -356,7 +356,7 @@ void VideoFrameSubmitter::OnBeginFrame( +@@ -358,7 +358,7 @@ void VideoFrameSubmitter::OnBeginFrame( continue; auto& feedback = timing_details.find(frame_token)->value.presentation_feedback; diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 b/www/iridium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 index 3e25a87d62b1..2ac66ddf5a53 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 +++ b/www/iridium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 @@ -1,15 +1,24 @@ ---- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2023-10-21 11:51:27 UTC +--- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2023-11-22 14:00:11 UTC +++ third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -2781,7 +2781,7 @@ +@@ -1927,7 +1927,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", +@@ -2840,7 +2840,7 @@ name: "PaymentHandlerMinimalHeaderUX", origin_trial_feature_name: "PaymentHandlerMinimalHeaderUX", origin_trial_allows_third_party: true, - origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos"], + origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos", "openbsd", "freebsd"], + status: "stable", }, { - name: "PaymentInstruments", -@@ -3803,7 +3803,7 @@ +@@ -3865,7 +3865,7 @@ name: "UnrestrictedSharedArrayBuffer", base_feature: "none", origin_trial_feature_name: "UnrestrictedSharedArrayBuffer", @@ -18,7 +27,7 @@ }, { name: "URLPatternCompareComponent", -@@ -4006,12 +4006,12 @@ +@@ -4068,12 +4068,12 @@ status: "experimental", base_feature: "none", origin_trial_feature_name: "WebAppUrlHandling", diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_video__capture_video__capture__impl.cc b/www/iridium/files/patch-third__party_blink_renderer_platform_video__capture_video__capture__impl.cc index 31e01ecb70dc..efb5975436d0 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_platform_video__capture_video__capture__impl.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_platform_video__capture_video__capture__impl.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/video_capture/video_capture_impl.cc.orig 2023-10-21 11:51:27 UTC +--- third_party/blink/renderer/platform/video_capture/video_capture_impl.cc.orig 2023-11-22 14:00:11 UTC +++ third_party/blink/renderer/platform/video_capture/video_capture_impl.cc -@@ -621,7 +621,7 @@ bool VideoCaptureImpl::VideoFrameBufferPreparer::BindV +@@ -623,7 +623,7 @@ bool VideoCaptureImpl::VideoFrameBufferPreparer::BindV } const unsigned texture_target = diff --git a/www/iridium/files/patch-third__party_libxml_linux_config.h b/www/iridium/files/patch-third__party_libxml_linux_config.h deleted file mode 100644 index 28a592afdadc..000000000000 --- a/www/iridium/files/patch-third__party_libxml_linux_config.h +++ /dev/null @@ -1,12 +0,0 @@ ---- third_party/libxml/linux/config.h.orig 2023-10-21 11:51:27 UTC -+++ third_party/libxml/linux/config.h -@@ -69,6 +69,9 @@ - /* Define to 1 if you have the <pthread.h> header file. */ - #define HAVE_PTHREAD_H /**/ - -+/* Define to 1 if you have the `arc4random' function. */ -+#define HAVE_ARC4RANDOM 1 -+ - /* Define to 1 if you have the `rand_r' function. */ - - diff --git a/www/iridium/files/patch-third__party_libxml_src_dict.c b/www/iridium/files/patch-third__party_libxml_src_dict.c deleted file mode 100644 index d488a68f643f..000000000000 --- a/www/iridium/files/patch-third__party_libxml_src_dict.c +++ /dev/null @@ -1,41 +0,0 @@ ---- third_party/libxml/src/dict.c.orig 2023-03-13 07:33:08 UTC -+++ third_party/libxml/src/dict.c -@@ -133,7 +133,7 @@ struct _xmlDict { - static xmlMutex xmlDictMutex; - - #ifdef DICT_RANDOMIZATION --#ifdef HAVE_RAND_R -+#if defined(HAVE_RAND_R) && !defined(HAVE_ARC4RANDOM) - /* - * Internal data for random function, protected by xmlDictMutex - */ -@@ -160,7 +160,7 @@ int xmlInitializeDict(void) { - int __xmlInitializeDict(void) { - xmlInitMutex(&xmlDictMutex); - --#ifdef DICT_RANDOMIZATION -+#if defined(DICT_RANDOMIZATION) && !defined(HAVE_ARC4RANDOM) - #ifdef HAVE_RAND_R - rand_seed = time(NULL); - rand_r(& rand_seed); -@@ -175,13 +175,17 @@ int __xmlInitializeDict(void) { - int __xmlRandom(void) { - int ret; - -+#ifdef HAVE_ARC4RANDOM -+ ret = arc4random(); -+#else - xmlMutexLock(&xmlDictMutex); --#ifdef HAVE_RAND_R -+# ifdef HAVE_RAND_R - ret = rand_r(& rand_seed); --#else -+# else - ret = rand(); --#endif -+# endif - xmlMutexUnlock(&xmlDictMutex); -+#endif - return(ret); - } - #endif diff --git a/www/iridium/files/patch-third__party_maldoca_src_maldoca_base_get__runfiles__dir.cc b/www/iridium/files/patch-third__party_maldoca_src_maldoca_base_get__runfiles__dir.cc index 2a7cf6cf3ec3..020b101a51d0 100644 --- a/www/iridium/files/patch-third__party_maldoca_src_maldoca_base_get__runfiles__dir.cc +++ b/www/iridium/files/patch-third__party_maldoca_src_maldoca_base_get__runfiles__dir.cc @@ -1,6 +1,6 @@ ---- third_party/maldoca/src/maldoca/base/get_runfiles_dir.cc.orig 2022-03-28 18:11:04 UTC +--- third_party/maldoca/src/maldoca/base/get_runfiles_dir.cc.orig 2023-11-22 14:00:11 UTC +++ third_party/maldoca/src/maldoca/base/get_runfiles_dir.cc -@@ -24,11 +24,6 @@ +@@ -25,11 +25,6 @@ #error "__APPLE__ not supported." #endif @@ -12,7 +12,7 @@ #if defined(_WIN32) #include <windows.h> #define PATH_MAX MAX_PATH -@@ -50,8 +45,6 @@ std::string GetExecutablePath() { +@@ -51,8 +46,6 @@ std::string GetExecutablePath() { char exe_path[PATH_MAX] = {0}; #ifdef __APPLE__ #error "__APPLE__ not supported."; @@ -21,7 +21,7 @@ #elif defined(_WIN32) HMODULE hModule = GetModuleHandleW(NULL); WCHAR wc_file_path[MAX_PATH] = {0}; -@@ -97,8 +90,6 @@ std::string GetExecutablePath() { +@@ -98,8 +91,6 @@ std::string GetExecutablePath() { absl::Status IsDirectory(const std::string& name) { #ifdef __APPLE__ #error "__APPLE__ not supported."; diff --git a/www/iridium/files/patch-third__party_perfetto_include_perfetto_base_time.h b/www/iridium/files/patch-third__party_perfetto_include_perfetto_base_time.h index 3d03c94562f4..3197ef48fad2 100644 --- a/www/iridium/files/patch-third__party_perfetto_include_perfetto_base_time.h +++ b/www/iridium/files/patch-third__party_perfetto_include_perfetto_base_time.h @@ -1,6 +1,6 @@ ---- third_party/perfetto/include/perfetto/base/time.h.orig 2023-03-13 07:33:08 UTC +--- third_party/perfetto/include/perfetto/base/time.h.orig 2023-11-22 14:00:11 UTC +++ third_party/perfetto/include/perfetto/base/time.h -@@ -157,6 +157,9 @@ inline TimeNanos GetTimeInternalNs(clockid_t clk_id) { +@@ -166,6 +166,9 @@ inline TimeNanos GetTimeInternalNs(clockid_t clk_id) { // Return ns from boot. Conversely to GetWallTimeNs, this clock counts also time // during suspend (when supported). inline TimeNanos GetBootTimeNs() { @@ -10,7 +10,7 @@ // Determine if CLOCK_BOOTTIME is available on the first call. static const clockid_t kBootTimeClockSource = [] { struct timespec ts = {}; -@@ -164,6 +167,7 @@ inline TimeNanos GetBootTimeNs() { +@@ -173,6 +176,7 @@ inline TimeNanos GetBootTimeNs() { return res == 0 ? CLOCK_BOOTTIME : kWallTimeClockSource; }(); return GetTimeInternalNs(kBootTimeClockSource); @@ -18,7 +18,7 @@ } inline TimeNanos GetWallTimeNs() { -@@ -171,7 +175,13 @@ inline TimeNanos GetWallTimeNs() { +@@ -180,7 +184,13 @@ inline TimeNanos GetWallTimeNs() { } inline TimeNanos GetWallTimeRawNs() { diff --git a/www/iridium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h b/www/iridium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h index d4c669e5b437..2b85ff666909 100644 --- a/www/iridium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h +++ b/www/iridium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h @@ -1,6 +1,6 @@ ---- third_party/vulkan-deps/vulkan-loader/src/loader/vk_loader_platform.h.orig 2023-10-21 11:51:27 UTC +--- third_party/vulkan-deps/vulkan-loader/src/loader/vk_loader_platform.h.orig 2023-11-22 14:00:11 UTC +++ third_party/vulkan-deps/vulkan-loader/src/loader/vk_loader_platform.h -@@ -304,7 +304,15 @@ static inline char *loader_platform_executable_path(ch +@@ -312,7 +312,15 @@ static inline char *loader_platform_executable_path(ch return buffer; } diff --git a/www/iridium/files/patch-third__party_vulkan__memory__allocator_include_vk__mem__alloc.h b/www/iridium/files/patch-third__party_vulkan__memory__allocator_include_vk__mem__alloc.h new file mode 100644 index 000000000000..1058572f7169 --- /dev/null +++ b/www/iridium/files/patch-third__party_vulkan__memory__allocator_include_vk__mem__alloc.h @@ -0,0 +1,11 @@ +--- third_party/vulkan_memory_allocator/include/vk_mem_alloc.h.orig 2023-11-22 14:00:11 UTC ++++ third_party/vulkan_memory_allocator/include/vk_mem_alloc.h +@@ -2504,7 +2504,7 @@ void *vma_aligned_alloc(size_t alignment, size_t size) + + return memalign(alignment, size); + } +-#elif defined(__APPLE__) || defined(__ANDROID__) || (defined(__linux__) && defined(__GLIBCXX__) && !defined(_GLIBCXX_HAVE_ALIGNED_ALLOC)) ++#elif defined(__APPLE__) || defined(__ANDROID__) || (defined(__linux__) && defined(__GLIBCXX__) && !defined(_GLIBCXX_HAVE_ALIGNED_ALLOC)) || defined(__OpenBSD__) || defined(__FreeBSD__) + #include <cstdlib> + + #if defined(__APPLE__) diff --git a/www/iridium/files/patch-third__party_webrtc_BUILD.gn b/www/iridium/files/patch-third__party_webrtc_BUILD.gn index 0cb7c40a6920..74d1009f4e5a 100644 --- a/www/iridium/files/patch-third__party_webrtc_BUILD.gn +++ b/www/iridium/files/patch-third__party_webrtc_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/webrtc/BUILD.gn.orig 2023-10-21 11:51:27 UTC +--- third_party/webrtc/BUILD.gn.orig 2023-11-22 14:00:11 UTC +++ third_party/webrtc/BUILD.gn -@@ -216,6 +216,9 @@ config("common_inherited_config") { +@@ -217,6 +217,9 @@ config("common_inherited_config") { if (is_linux || is_chromeos) { defines += [ "WEBRTC_LINUX" ] } diff --git a/www/iridium/files/patch-ui_aura_screen__ozone.cc b/www/iridium/files/patch-ui_aura_screen__ozone.cc index c5553216df45..bac0090fe8b0 100644 --- a/www/iridium/files/patch-ui_aura_screen__ozone.cc +++ b/www/iridium/files/patch-ui_aura_screen__ozone.cc @@ -1,6 +1,6 @@ ---- ui/aura/screen_ozone.cc.orig 2023-03-13 07:33:08 UTC +--- ui/aura/screen_ozone.cc.orig 2023-11-22 14:00:11 UTC +++ ui/aura/screen_ozone.cc -@@ -110,7 +110,7 @@ display::Display ScreenOzone::GetPrimaryDisplay() cons +@@ -106,7 +106,7 @@ display::Display ScreenOzone::GetPrimaryDisplay() cons return platform_screen_->GetPrimaryDisplay(); } diff --git a/www/iridium/files/patch-ui_aura_screen__ozone.h b/www/iridium/files/patch-ui_aura_screen__ozone.h index 3e60a1e6114f..a30e605686a4 100644 --- a/www/iridium/files/patch-ui_aura_screen__ozone.h +++ b/www/iridium/files/patch-ui_aura_screen__ozone.h @@ -1,6 +1,6 @@ ---- ui/aura/screen_ozone.h.orig 2023-03-13 07:33:08 UTC +--- ui/aura/screen_ozone.h.orig 2023-11-22 14:00:11 UTC +++ ui/aura/screen_ozone.h -@@ -46,7 +46,7 @@ class AURA_EXPORT ScreenOzone : public display::Screen +@@ -44,7 +44,7 @@ class AURA_EXPORT ScreenOzone : public display::Screen display::Display GetDisplayMatching( const gfx::Rect& match_rect) const override; display::Display GetPrimaryDisplay() const override; @@ -9,7 +9,7 @@ std::unique_ptr<display::Screen::ScreenSaverSuspender> SuspendScreenSaver() override; #endif // BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) -@@ -73,7 +73,7 @@ class AURA_EXPORT ScreenOzone : public display::Screen +@@ -71,7 +71,7 @@ class AURA_EXPORT ScreenOzone : public display::Screen ui::PlatformScreen* platform_screen() { return platform_screen_.get(); } private: diff --git a/www/iridium/files/patch-ui_base_clipboard_clipboard__non__backed.cc b/www/iridium/files/patch-ui_base_clipboard_clipboard__non__backed.cc new file mode 100644 index 000000000000..66afdb98fe9b --- /dev/null +++ b/www/iridium/files/patch-ui_base_clipboard_clipboard__non__backed.cc @@ -0,0 +1,11 @@ +--- ui/base/clipboard/clipboard_non_backed.cc.orig 2023-11-22 14:00:11 UTC ++++ ui/base/clipboard/clipboard_non_backed.cc +@@ -455,7 +455,7 @@ ClipboardNonBacked::ClipboardNonBacked() { + // so create internal clipboards for platform supported clipboard buffers. + constexpr ClipboardBuffer kClipboardBuffers[] = { + ClipboardBuffer::kCopyPaste, +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + ClipboardBuffer::kSelection, + #endif + #if BUILDFLAG(IS_MAC) diff --git a/www/iridium/files/patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.cc b/www/iridium/files/patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.cc index 5a29616dd511..36128ff2a161 100644 --- a/www/iridium/files/patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.cc +++ b/www/iridium/files/patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.cc @@ -1,6 +1,6 @@ ---- ui/base/dragdrop/os_exchange_data_provider_non_backed.cc.orig 2022-03-28 18:11:04 UTC +--- ui/base/dragdrop/os_exchange_data_provider_non_backed.cc.orig 2023-11-22 14:00:11 UTC +++ ui/base/dragdrop/os_exchange_data_provider_non_backed.cc -@@ -94,7 +94,7 @@ void OSExchangeDataProviderNonBacked::SetPickledData( +@@ -96,7 +96,7 @@ void OSExchangeDataProviderNonBacked::SetPickledData( } bool OSExchangeDataProviderNonBacked::GetString(std::u16string* data) const { diff --git a/www/iridium/files/patch-ui_base_resource_resource__bundle.cc b/www/iridium/files/patch-ui_base_resource_resource__bundle.cc index 167cdba473cf..fdb232aba7a8 100644 --- a/www/iridium/files/patch-ui_base_resource_resource__bundle.cc +++ b/www/iridium/files/patch-ui_base_resource_resource__bundle.cc @@ -1,6 +1,6 @@ ---- ui/base/resource/resource_bundle.cc.orig 2023-10-21 11:51:27 UTC +--- ui/base/resource/resource_bundle.cc.orig 2023-11-22 14:00:11 UTC +++ ui/base/resource/resource_bundle.cc -@@ -926,7 +926,7 @@ void ResourceBundle::ReloadFonts() { +@@ -925,7 +925,7 @@ void ResourceBundle::ReloadFonts() { } ResourceScaleFactor ResourceBundle::GetMaxResourceScaleFactor() const { diff --git a/www/iridium/files/patch-ui_base_ui__base__features.cc b/www/iridium/files/patch-ui_base_ui__base__features.cc index 3e339727e6e4..dc025bcb2335 100644 --- a/www/iridium/files/patch-ui_base_ui__base__features.cc +++ b/www/iridium/files/patch-ui_base_ui__base__features.cc @@ -1,15 +1,6 @@ ---- ui/base/ui_base_features.cc.orig 2023-10-21 11:51:27 UTC +--- ui/base/ui_base_features.cc.orig 2023-11-22 14:00:11 UTC +++ ui/base/ui_base_features.cc -@@ -135,7 +135,7 @@ bool AreF11AndF12ShortcutsEnabled() { - } - #endif // BUILDFLAG(IS_CHROMEOS_ASH) - --#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - BASE_FEATURE(kRedundantImeCompositionClearing, - "RedundantImeCompositionClearing", - base::FEATURE_ENABLED_BY_DEFAULT); -@@ -234,7 +234,7 @@ BASE_FEATURE(kExperimentalFlingAnimation, +@@ -216,7 +216,7 @@ BASE_FEATURE(kExperimentalFlingAnimation, "ExperimentalFlingAnimation", // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -18,7 +9,7 @@ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ !BUILDFLAG(IS_CHROMEOS_LACROS)) base::FEATURE_ENABLED_BY_DEFAULT -@@ -346,7 +346,7 @@ bool IsForcedColorsEnabled() { +@@ -328,7 +328,7 @@ bool IsForcedColorsEnabled() { // milestones. BASE_FEATURE(kEyeDropper, "EyeDropper", @@ -27,9 +18,9 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -565,7 +565,7 @@ ChromeRefresh2023Level GetChromeRefresh2023Level() { - return level; - } +@@ -604,7 +604,7 @@ BASE_FEATURE(kBubbleMetricsApi, + "BubbleMetricsApi", + base::FEATURE_DISABLED_BY_DEFAULT); -#if !BUILDFLAG(IS_LINUX) +#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) diff --git a/www/iridium/files/patch-ui_base_ui__base__features.h b/www/iridium/files/patch-ui_base_ui__base__features.h index 478908bf920d..b58c50c26cab 100644 --- a/www/iridium/files/patch-ui_base_ui__base__features.h +++ b/www/iridium/files/patch-ui_base_ui__base__features.h @@ -1,17 +1,8 @@ ---- ui/base/ui_base_features.h.orig 2023-10-21 11:51:27 UTC +--- ui/base/ui_base_features.h.orig 2023-11-22 14:00:11 UTC +++ ui/base/ui_base_features.h -@@ -138,7 +138,7 @@ BASE_DECLARE_FEATURE(kSupportF11AndF12KeyShortcuts); - COMPONENT_EXPORT(UI_BASE_FEATURES) bool AreF11AndF12ShortcutsEnabled(); - #endif // BUILDFLAG(IS_CHROMEOS_ASH) - --#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - COMPONENT_EXPORT(UI_BASE_FEATURES) - BASE_DECLARE_FEATURE(kRedundantImeCompositionClearing); - #endif // BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) -@@ -273,7 +273,7 @@ enum class ChromeRefresh2023Level { +@@ -287,7 +287,7 @@ ChromeRefresh2023Level GetChromeRefresh2023Level(); COMPONENT_EXPORT(UI_BASE_FEATURES) - ChromeRefresh2023Level GetChromeRefresh2023Level(); + BASE_DECLARE_FEATURE(kBubbleMetricsApi); -#if !BUILDFLAG(IS_LINUX) +#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) diff --git a/www/iridium/files/patch-ui_base_x_x11__cursor__factory.cc b/www/iridium/files/patch-ui_base_x_x11__cursor__factory.cc index fd17561fcd7c..ccec488f3450 100644 --- a/www/iridium/files/patch-ui_base_x_x11__cursor__factory.cc +++ b/www/iridium/files/patch-ui_base_x_x11__cursor__factory.cc @@ -1,4 +1,4 @@ ---- ui/base/x/x11_cursor_factory.cc.orig 2023-08-28 20:17:35 UTC +--- ui/base/x/x11_cursor_factory.cc.orig 2023-11-22 14:00:11 UTC +++ ui/base/x/x11_cursor_factory.cc @@ -13,7 +13,7 @@ #include "ui/gfx/geometry/point.h" @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #endif -@@ -62,7 +62,7 @@ scoped_refptr<PlatformCursor> X11CursorFactory::Create +@@ -70,7 +70,7 @@ scoped_refptr<PlatformCursor> X11CursorFactory::Create } void X11CursorFactory::ObserveThemeChanges() { diff --git a/www/iridium/files/patch-ui_base_x_x11__cursor__factory.h b/www/iridium/files/patch-ui_base_x_x11__cursor__factory.h index 74dcca70e063..b055b8294d2d 100644 --- a/www/iridium/files/patch-ui_base_x_x11__cursor__factory.h +++ b/www/iridium/files/patch-ui_base_x_x11__cursor__factory.h @@ -1,4 +1,4 @@ ---- ui/base/x/x11_cursor_factory.h.orig 2023-08-28 20:17:35 UTC +--- ui/base/x/x11_cursor_factory.h.orig 2023-11-22 14:00:11 UTC +++ ui/base/x/x11_cursor_factory.h @@ -20,7 +20,7 @@ namespace ui { class X11Cursor; @@ -9,9 +9,9 @@ class LinuxUi; #endif -@@ -60,7 +60,7 @@ class COMPONENT_EXPORT(UI_BASE_X) X11CursorFactory - - std::map<mojom::CursorType, scoped_refptr<X11Cursor>> default_cursors_; +@@ -62,7 +62,7 @@ class COMPONENT_EXPORT(UI_BASE_X) X11CursorFactory + // initializing `cursor_loader_` will modify `default_cursors_`. + std::unique_ptr<XCursorLoader> cursor_loader_; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/iridium/files/patch-ui_base_x_x11__cursor__loader.cc b/www/iridium/files/patch-ui_base_x_x11__cursor__loader.cc index b206d844b445..f680e693ad45 100644 --- a/www/iridium/files/patch-ui_base_x_x11__cursor__loader.cc +++ b/www/iridium/files/patch-ui_base_x_x11__cursor__loader.cc @@ -1,4 +1,4 @@ ---- ui/base/x/x11_cursor_loader.cc.orig 2023-10-21 11:51:27 UTC +--- ui/base/x/x11_cursor_loader.cc.orig 2023-11-22 14:00:11 UTC +++ ui/base/x/x11_cursor_loader.cc @@ -32,7 +32,7 @@ #include "ui/gfx/x/xproto.h" @@ -30,9 +30,9 @@ // The toolkit theme has the highest priority. LinuxUi::instance() ? LinuxUi::instance()->GetCursorThemeName() : std::string(), -@@ -443,7 +447,7 @@ uint32_t XCursorLoader::GetPreferredCursorSize() const - if (base::StringToInt(GetEnv(kXcursorSizeEnv), &size) && size > 0) +@@ -448,7 +452,7 @@ uint32_t XCursorLoader::GetPreferredCursorSize() const return size; + } -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/iridium/files/patch-ui_base_x_x11__display__manager.cc b/www/iridium/files/patch-ui_base_x_x11__display__manager.cc new file mode 100644 index 000000000000..12d5aef80e7c --- /dev/null +++ b/www/iridium/files/patch-ui_base_x_x11__display__manager.cc @@ -0,0 +1,20 @@ +--- ui/base/x/x11_display_manager.cc.orig 2023-11-22 14:00:11 UTC ++++ ui/base/x/x11_display_manager.cc +@@ -15,7 +15,7 @@ + #include "ui/gfx/x/x11_atom_cache.h" + #include "ui/gfx/x/xproto.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "ui/linux/linux_ui.h" + #endif + +@@ -91,7 +91,7 @@ void XDisplayManager::FetchDisplayList() { + ? display::Display::GetForcedDeviceScaleFactor() + : 1.0f}; + const auto* display_config = &empty_display_config; +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (const auto* linux_ui = ui::LinuxUi::instance()) { + display_config = &linux_ui->display_config(); + } diff --git a/www/iridium/files/patch-ui_color_color__id.h b/www/iridium/files/patch-ui_color_color__id.h index 40a0bc0c7198..0fea910860cb 100644 --- a/www/iridium/files/patch-ui_color_color__id.h +++ b/www/iridium/files/patch-ui_color_color__id.h @@ -1,6 +1,6 @@ ---- ui/color/color_id.h.orig 2023-10-21 11:51:27 UTC +--- ui/color/color_id.h.orig 2023-11-22 14:00:11 UTC +++ ui/color/color_id.h -@@ -567,7 +567,7 @@ +@@ -600,7 +600,7 @@ E_CPONLY(kColorNativeColor6) \ E_CPONLY(kColorNativeBaseColor) \ E_CPONLY(kColorNativeSecondaryColor) diff --git a/www/iridium/files/patch-ui_color_color__provider__utils.cc b/www/iridium/files/patch-ui_color_color__provider__utils.cc index 3c0f244a780b..f0b5bd3ed1f0 100644 --- a/www/iridium/files/patch-ui_color_color__provider__utils.cc +++ b/www/iridium/files/patch-ui_color_color__provider__utils.cc @@ -1,6 +1,6 @@ ---- ui/color/color_provider_utils.cc.orig 2023-01-17 19:19:00 UTC +--- ui/color/color_provider_utils.cc.orig 2023-11-22 14:00:11 UTC +++ ui/color/color_provider_utils.cc -@@ -103,7 +103,7 @@ base::StringPiece SystemThemeName(ui::SystemTheme syst +@@ -179,7 +179,7 @@ base::StringPiece SystemThemeName(ui::SystemTheme syst switch (system_theme) { case ui::SystemTheme::kDefault: return "kDefault"; diff --git a/www/iridium/files/patch-ui_events_gesture__detection_motion__event__generic.h b/www/iridium/files/patch-ui_events_gesture__detection_motion__event__generic.h index 15d157017b0b..bd648c4530c6 100644 --- a/www/iridium/files/patch-ui_events_gesture__detection_motion__event__generic.h +++ b/www/iridium/files/patch-ui_events_gesture__detection_motion__event__generic.h @@ -1,4 +1,4 @@ ---- ui/events/gesture_detection/motion_event_generic.h.orig 2023-10-21 11:51:27 UTC +--- ui/events/gesture_detection/motion_event_generic.h.orig 2023-11-22 14:00:11 UTC +++ ui/events/gesture_detection/motion_event_generic.h @@ -7,6 +7,7 @@ @@ -6,5 +6,5 @@ #include <stdint.h> +#include <vector> - #include "base/time/time.h" - #include "third_party/abseil-cpp/absl/container/inlined_vector.h" + #include <memory> + #include <vector> diff --git a/www/iridium/files/patch-ui_gfx_BUILD.gn b/www/iridium/files/patch-ui_gfx_BUILD.gn index 50e1b66517f3..5c3eb3d7d06a 100644 --- a/www/iridium/files/patch-ui_gfx_BUILD.gn +++ b/www/iridium/files/patch-ui_gfx_BUILD.gn @@ -1,6 +1,6 @@ ---- ui/gfx/BUILD.gn.orig 2023-10-21 11:51:27 UTC +--- ui/gfx/BUILD.gn.orig 2023-11-22 14:00:11 UTC +++ ui/gfx/BUILD.gn -@@ -645,7 +645,7 @@ source_set("memory_buffer_sources") { +@@ -660,7 +660,7 @@ source_set("memory_buffer_sources") { deps += [ "//build/config/linux/libdrm" ] } diff --git a/www/iridium/files/patch-ui_gfx_x_xlib__support.cc b/www/iridium/files/patch-ui_gfx_x_xlib__support.cc index 07e4a5db9774..fbe790734a7a 100644 --- a/www/iridium/files/patch-ui_gfx_x_xlib__support.cc +++ b/www/iridium/files/patch-ui_gfx_x_xlib__support.cc @@ -1,21 +1,21 @@ ---- ui/gfx/x/xlib_support.cc.orig 2023-10-21 11:51:27 UTC +--- ui/gfx/x/xlib_support.cc.orig 2023-11-22 14:00:11 UTC +++ ui/gfx/x/xlib_support.cc -@@ -38,10 +38,18 @@ void InitXlib() { - if (xlib_loader->loaded()) +@@ -39,10 +39,18 @@ void InitXlib() { return; + } +#if BUILDFLAG(IS_BSD) -+ CHECK(xlib_loader->Load("libX11.so")); ++ DUMP_WILL_BE_CHECK(xlib_loader->Load("libX11.so")); +#else - CHECK(xlib_loader->Load("libX11.so.6")); + DUMP_WILL_BE_CHECK(xlib_loader->Load("libX11.so.6")); +#endif auto* xlib_xcb_loader = GetXlibXcbLoader(); +#if BUILDFLAG(IS_BSD) -+ CHECK(xlib_xcb_loader->Load("libX11-xcb.so")); ++ DUMP_WILL_BE_CHECK(xlib_xcb_loader->Load("libX11-xcb.so")); +#else - CHECK(xlib_xcb_loader->Load("libX11-xcb.so.1")); + DUMP_WILL_BE_CHECK(xlib_xcb_loader->Load("libX11-xcb.so.1")); +#endif - CHECK(xlib_loader->XInitThreads()); + DUMP_WILL_BE_CHECK(xlib_loader->XInitThreads()); diff --git a/www/iridium/files/patch-ui_gl_BUILD.gn b/www/iridium/files/patch-ui_gl_BUILD.gn index 6ed48013e3eb..10b7a4757c0f 100644 --- a/www/iridium/files/patch-ui_gl_BUILD.gn +++ b/www/iridium/files/patch-ui_gl_BUILD.gn @@ -1,4 +1,4 @@ ---- ui/gl/BUILD.gn.orig 2023-10-21 11:51:27 UTC +--- ui/gl/BUILD.gn.orig 2023-11-22 14:00:11 UTC +++ ui/gl/BUILD.gn @@ -151,8 +151,6 @@ component("gl") { defines += [ "GPU_ENABLE_SERVICE_LOGGING" ] @@ -17,7 +17,7 @@ "//ui/events/platform", "//ui/gfx", "//ui/gfx/geometry", -@@ -376,7 +373,6 @@ component("gl") { +@@ -377,7 +374,6 @@ component("gl") { data_deps += [ "//third_party/angle:libEGL", "//third_party/angle:libGLESv2", @@ -25,7 +25,7 @@ ] if (enable_swiftshader) { data_deps += [ -@@ -577,7 +573,6 @@ test("gl_unittests") { +@@ -578,7 +574,6 @@ test("gl_unittests") { data_deps = [ "//testing/buildbot/filters:gl_unittests_filters", diff --git a/www/iridium/files/patch-ui_gl_gl__context.cc b/www/iridium/files/patch-ui_gl_gl__context.cc index 442160a4cc0d..45d059f65f21 100644 --- a/www/iridium/files/patch-ui_gl_gl__context.cc +++ b/www/iridium/files/patch-ui_gl_gl__context.cc @@ -1,6 +1,6 @@ ---- ui/gl/gl_context.cc.orig 2023-07-24 14:27:53 UTC +--- ui/gl/gl_context.cc.orig 2023-11-22 14:00:11 UTC +++ ui/gl/gl_context.cc -@@ -443,7 +443,7 @@ bool GLContext::MakeVirtuallyCurrent( +@@ -440,7 +440,7 @@ bool GLContext::MakeVirtuallyCurrent( DCHECK(virtual_context->IsCurrent(surface)); if (switched_real_contexts || virtual_context != current_virtual_context_) { diff --git a/www/iridium/files/patch-ui_gl_gl__implementation.cc b/www/iridium/files/patch-ui_gl_gl__implementation.cc index 1aea112ed92b..7ffb0817a4e4 100644 --- a/www/iridium/files/patch-ui_gl_gl__implementation.cc +++ b/www/iridium/files/patch-ui_gl_gl__implementation.cc @@ -1,6 +1,6 @@ ---- ui/gl/gl_implementation.cc.orig 2023-07-24 14:27:53 UTC +--- ui/gl/gl_implementation.cc.orig 2023-11-22 14:00:11 UTC +++ ui/gl/gl_implementation.cc -@@ -281,7 +281,7 @@ GetRequestedGLImplementationFromCommandLine( +@@ -276,7 +276,7 @@ GetRequestedGLImplementationFromCommandLine( *fallback_to_software_gl = false; bool overrideUseSoftwareGL = command_line->HasSwitch(switches::kOverrideUseSoftwareGLForTests); diff --git a/www/iridium/files/patch-ui_gtk_printing_print__dialog__gtk.cc b/www/iridium/files/patch-ui_gtk_printing_print__dialog__gtk.cc index 97fbaf380268..560aa725ac08 100644 --- a/www/iridium/files/patch-ui_gtk_printing_print__dialog__gtk.cc +++ b/www/iridium/files/patch-ui_gtk_printing_print__dialog__gtk.cc @@ -1,6 +1,6 @@ ---- ui/gtk/printing/print_dialog_gtk.cc.orig 2023-10-21 11:51:27 UTC +--- ui/gtk/printing/print_dialog_gtk.cc.orig 2023-11-22 14:00:11 UTC +++ ui/gtk/printing/print_dialog_gtk.cc -@@ -440,7 +440,7 @@ void PrintDialogGtk::ShowDialog( +@@ -433,7 +433,7 @@ void PrintDialogGtk::ShowDialog( GtkPrintCapabilities cap = static_cast<GtkPrintCapabilities>( GTK_PRINT_CAPABILITY_GENERATE_PDF | GTK_PRINT_CAPABILITY_PAGE_SET | GTK_PRINT_CAPABILITY_COPIES | GTK_PRINT_CAPABILITY_COLLATE | diff --git a/www/iridium/files/patch-ui_native__theme_native__theme__base.cc b/www/iridium/files/patch-ui_native__theme_native__theme__base.cc index 25d66accce7f..ac7ef7ad4c54 100644 --- a/www/iridium/files/patch-ui_native__theme_native__theme__base.cc +++ b/www/iridium/files/patch-ui_native__theme_native__theme__base.cc @@ -1,6 +1,6 @@ ---- ui/native_theme/native_theme_base.cc.orig 2023-10-21 11:51:27 UTC +--- ui/native_theme/native_theme_base.cc.orig 2023-11-22 14:00:11 UTC +++ ui/native_theme/native_theme_base.cc -@@ -275,7 +275,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas, +@@ -235,7 +235,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas, break; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.cc b/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.cc index ae1d50025de7..8716f62fd70d 100644 --- a/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.cc +++ b/www/iridium/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 2023-10-21 11:51:27 UTC +--- ui/ozone/platform/wayland/host/wayland_toplevel_window.cc.orig 2023-11-22 14:00:11 UTC +++ ui/ozone/platform/wayland/host/wayland_toplevel_window.cc -@@ -539,7 +539,7 @@ void WaylandToplevelWindow::HandleAuraToplevelConfigur +@@ -570,7 +570,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/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.h b/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.h index bafdfe35096a..1dad27bccec3 100644 --- a/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.h +++ b/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.h @@ -1,8 +1,8 @@ ---- ui/ozone/platform/wayland/host/wayland_toplevel_window.h.orig 2023-10-21 11:51:27 UTC +--- ui/ozone/platform/wayland/host/wayland_toplevel_window.h.orig 2023-11-22 14:00:11 UTC +++ ui/ozone/platform/wayland/host/wayland_toplevel_window.h -@@ -244,7 +244,7 @@ class WaylandToplevelWindow : public WaylandWindow, - // Contains the previous state of the window. - PlatformWindowState previous_state_ = PlatformWindowState::kUnknown; +@@ -256,7 +256,7 @@ class WaylandToplevelWindow : public WaylandWindow, + // The display ID to switch to in case the state is `kFullscreen`. + int64_t fullscreen_display_id_ = display::kInvalidDisplayId; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) diff --git a/www/iridium/files/patch-ui_ozone_platform_wayland_host_xdg__toplevel__wrapper__impl.cc b/www/iridium/files/patch-ui_ozone_platform_wayland_host_xdg__toplevel__wrapper__impl.cc index aef24f1daa65..982e014e5cb2 100644 --- a/www/iridium/files/patch-ui_ozone_platform_wayland_host_xdg__toplevel__wrapper__impl.cc +++ b/www/iridium/files/patch-ui_ozone_platform_wayland_host_xdg__toplevel__wrapper__impl.cc @@ -1,6 +1,6 @@ ---- ui/ozone/platform/wayland/host/xdg_toplevel_wrapper_impl.cc.orig 2023-10-21 11:51:27 UTC +--- ui/ozone/platform/wayland/host/xdg_toplevel_wrapper_impl.cc.orig 2023-11-22 14:00:11 UTC +++ ui/ozone/platform/wayland/host/xdg_toplevel_wrapper_impl.cc -@@ -308,7 +308,7 @@ void XDGToplevelWrapperImpl::OnToplevelConfigure(void* +@@ -310,7 +310,7 @@ void XDGToplevelWrapperImpl::OnToplevelConfigure(void* CheckIfWlArrayHasValue(states, XDG_TOPLEVEL_STATE_ACTIVATED), }; diff --git a/www/iridium/files/patch-ui_ozone_platform_wayland_ozone__platform__wayland.cc b/www/iridium/files/patch-ui_ozone_platform_wayland_ozone__platform__wayland.cc index 776165dbe599..e207ed674bcb 100644 --- a/www/iridium/files/patch-ui_ozone_platform_wayland_ozone__platform__wayland.cc +++ b/www/iridium/files/patch-ui_ozone_platform_wayland_ozone__platform__wayland.cc @@ -1,4 +1,4 @@ ---- ui/ozone/platform/wayland/ozone_platform_wayland.cc.orig 2023-10-21 11:51:27 UTC +--- ui/ozone/platform/wayland/ozone_platform_wayland.cc.orig 2023-11-22 14:00:11 UTC +++ ui/ozone/platform/wayland/ozone_platform_wayland.cc @@ -66,13 +66,13 @@ #include "ui/events/ozone/layout/stub/stub_keyboard_layout_engine.h" @@ -34,7 +34,7 @@ linux_ui_delegate_ = std::make_unique<LinuxUiDelegateWayland>(connection_.get()); #endif -@@ -510,7 +510,7 @@ class OzonePlatformWayland : public OzonePlatform, +@@ -507,7 +507,7 @@ class OzonePlatformWayland : public OzonePlatform, DrmRenderNodePathFinder path_finder_; #endif diff --git a/www/iridium/files/patch-ui_ozone_platform_x11_x11__screen__ozone.cc b/www/iridium/files/patch-ui_ozone_platform_x11_x11__screen__ozone.cc index e8ff5d282faf..226cb4fb991b 100644 --- a/www/iridium/files/patch-ui_ozone_platform_x11_x11__screen__ozone.cc +++ b/www/iridium/files/patch-ui_ozone_platform_x11_x11__screen__ozone.cc @@ -1,11 +1,20 @@ ---- ui/ozone/platform/x11/x11_screen_ozone.cc.orig 2023-10-21 11:51:27 UTC +--- ui/ozone/platform/x11/x11_screen_ozone.cc.orig 2023-11-22 14:00:11 UTC +++ ui/ozone/platform/x11/x11_screen_ozone.cc -@@ -235,7 +235,7 @@ base::Value::List X11ScreenOzone::GetGpuExtraInfo( - return result; - } +@@ -22,7 +22,7 @@ + #include "ui/ozone/platform/x11/x11_window.h" + #include "ui/ozone/platform/x11/x11_window_manager.h" -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - void X11ScreenOzone::SetDisplayConfig(const DisplayConfig& display_config) { - display_config_ = &display_config; - // See DesktopScreenLinux, which sets the |device_scale_factor| before |this| + #include "ui/linux/linux_ui.h" + #endif + +@@ -77,7 +77,7 @@ X11ScreenOzone::X11ScreenOzone() + window_manager_(X11WindowManager::GetInstance()), + x11_display_manager_(std::make_unique<XDisplayManager>(this)) { + DCHECK(window_manager_); +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (auto* linux_ui = ui::LinuxUi::instance()) { + display_scale_factor_observer_.Observe(linux_ui); + } diff --git a/www/iridium/files/patch-ui_ozone_platform_x11_x11__screen__ozone.h b/www/iridium/files/patch-ui_ozone_platform_x11_x11__screen__ozone.h index 031ff30a9df7..353d68affbc5 100644 --- a/www/iridium/files/patch-ui_ozone_platform_x11_x11__screen__ozone.h +++ b/www/iridium/files/patch-ui_ozone_platform_x11_x11__screen__ozone.h @@ -1,11 +1,11 @@ ---- ui/ozone/platform/x11/x11_screen_ozone.h.orig 2023-10-21 11:51:27 UTC +--- ui/ozone/platform/x11/x11_screen_ozone.h.orig 2023-11-22 14:00:11 UTC +++ ui/ozone/platform/x11/x11_screen_ozone.h -@@ -61,7 +61,7 @@ class X11ScreenOzone : public PlatformScreen, - std::string GetCurrentWorkspace() override; - base::Value::List GetGpuExtraInfo( - const gfx::GpuExtraInfo& gpu_extra_info) override; +@@ -102,7 +102,7 @@ class X11ScreenOzone : public PlatformScreen, + // Indicates that |this| is initialized. + bool initialized_ = false; + -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - void SetDisplayConfig(const DisplayConfig& display_config) override; + base::ScopedObservation<ui::LinuxUi, DeviceScaleFactorObserver> + display_scale_factor_observer_{this}; #endif - diff --git a/www/iridium/files/patch-ui_ozone_public_platform__screen.cc b/www/iridium/files/patch-ui_ozone_public_platform__screen.cc deleted file mode 100644 index 74868b49d006..000000000000 --- a/www/iridium/files/patch-ui_ozone_public_platform__screen.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- ui/ozone/public/platform_screen.cc.orig 2023-10-21 11:51:27 UTC -+++ ui/ozone/public/platform_screen.cc -@@ -61,7 +61,7 @@ display::TabletState PlatformScreen::GetTabletState() - } - #endif - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - void PlatformScreen::SetDisplayConfig(const DisplayConfig& display_config) {} - #endif - diff --git a/www/iridium/files/patch-ui_ozone_public_platform__screen.h b/www/iridium/files/patch-ui_ozone_public_platform__screen.h index 72713f7970a9..35b6dd3d0e7e 100644 --- a/www/iridium/files/patch-ui_ozone_public_platform__screen.h +++ b/www/iridium/files/patch-ui_ozone_public_platform__screen.h @@ -1,4 +1,4 @@ ---- ui/ozone/public/platform_screen.h.orig 2023-10-21 11:51:27 UTC +--- ui/ozone/public/platform_screen.h.orig 2023-11-22 14:00:11 UTC +++ ui/ozone/public/platform_screen.h @@ -15,7 +15,7 @@ #include "ui/gfx/gpu_extra_info.h" @@ -9,12 +9,3 @@ #include "ui/linux/linux_ui.h" #endif -@@ -136,7 +136,7 @@ class COMPONENT_EXPORT(OZONE_BASE) PlatformScreen { - virtual base::Value::List GetGpuExtraInfo( - const gfx::GpuExtraInfo& gpu_extra_info); - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Sets device scale factor received from external sources such as toolkits. - virtual void SetDisplayConfig(const DisplayConfig& display_config); - #endif diff --git a/www/iridium/files/patch-ui_ozone_test_mock__platform__window__delegate.h b/www/iridium/files/patch-ui_ozone_test_mock__platform__window__delegate.h index 6c7784d10166..dde73bdf438c 100644 --- a/www/iridium/files/patch-ui_ozone_test_mock__platform__window__delegate.h +++ b/www/iridium/files/patch-ui_ozone_test_mock__platform__window__delegate.h @@ -1,4 +1,4 @@ ---- ui/ozone/test/mock_platform_window_delegate.h.orig 2022-12-06 08:09:13 UTC +--- ui/ozone/test/mock_platform_window_delegate.h.orig 2023-11-22 14:00:11 UTC +++ ui/ozone/test/mock_platform_window_delegate.h @@ -32,7 +32,7 @@ class MockPlatformWindowDelegate : public PlatformWind MOCK_METHOD2(OnWindowStateChanged, @@ -8,4 +8,4 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) MOCK_METHOD1(OnWindowTiledStateChanged, void(WindowTiledEdges new_tiled_edges)); - #endif + MOCK_METHOD0(OnFullscreenModeChanged, void()); diff --git a/www/iridium/files/patch-ui_views_controls_textfield_textfield.cc b/www/iridium/files/patch-ui_views_controls_textfield_textfield.cc index 886babe61988..feabe21b2ceb 100644 --- a/www/iridium/files/patch-ui_views_controls_textfield_textfield.cc +++ b/www/iridium/files/patch-ui_views_controls_textfield_textfield.cc @@ -1,6 +1,6 @@ ---- ui/views/controls/textfield/textfield.cc.orig 2023-10-21 11:51:27 UTC +--- ui/views/controls/textfield/textfield.cc.orig 2023-11-22 14:00:11 UTC +++ ui/views/controls/textfield/textfield.cc -@@ -79,7 +79,7 @@ +@@ -81,7 +81,7 @@ #include "base/win/win_util.h" #endif @@ -9,7 +9,7 @@ #include "ui/base/ime/linux/text_edit_command_auralinux.h" #include "ui/linux/linux_ui.h" #endif -@@ -173,7 +173,7 @@ bool IsControlKeyModifier(int flags) { +@@ -175,7 +175,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; -@@ -742,7 +742,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event +@@ -746,7 +746,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 && -@@ -924,7 +924,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo +@@ -928,7 +928,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; -@@ -1929,7 +1929,7 @@ bool Textfield::ShouldDoLearning() { +@@ -1933,7 +1933,7 @@ bool Textfield::ShouldDoLearning() { return false; } @@ -45,7 +45,7 @@ // TODO(https://crbug.com/952355): Implement this method to support Korean IME // reconversion feature on native text fields (e.g. find bar). bool Textfield::SetCompositionFromExistingText( -@@ -2442,14 +2442,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( +@@ -2446,14 +2446,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( #endif return ui::TextEditCommand::DELETE_BACKWARD; } diff --git a/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__screen__ozone.cc b/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__screen__ozone.cc deleted file mode 100644 index dcdf3cfcb662..000000000000 --- a/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__screen__ozone.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- ui/views/widget/desktop_aura/desktop_screen_ozone.cc.orig 2022-10-05 07:34:01 UTC -+++ ui/views/widget/desktop_aura/desktop_screen_ozone.cc -@@ -25,7 +25,7 @@ gfx::NativeWindow DesktopScreenOzone::GetNativeWindowF - widget); - } - --#if !BUILDFLAG(IS_LINUX) -+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) - std::unique_ptr<display::Screen> CreateDesktopScreen() { - auto screen = std::make_unique<DesktopScreenOzone>(); - screen->Initialize(); diff --git a/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc b/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc index 29cbbdd2f66a..03e293ed6c41 100644 --- a/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc +++ b/www/iridium/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 2023-10-21 11:51:27 UTC +--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2023-11-22 14:00:11 UTC +++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc @@ -44,7 +44,7 @@ #include "ui/wm/core/window_util.h" @@ -18,7 +18,7 @@ const bool requires_accelerated_widget = params.requires_accelerated_widget; #else const bool requires_accelerated_widget = false; -@@ -346,7 +346,7 @@ std::unique_ptr<aura::client::DragDropClient> +@@ -349,7 +349,7 @@ std::unique_ptr<aura::client::DragDropClient> DesktopWindowTreeHostPlatform::CreateDragDropClient() { ui::WmDragHandler* drag_handler = ui::GetWmDragHandler(*(platform_window())); std::unique_ptr<DesktopDragDropClientOzone> drag_drop_client = @@ -27,7 +27,7 @@ std::make_unique<DesktopDragDropClientOzoneLinux>(window(), drag_handler); #else std::make_unique<DesktopDragDropClientOzone>(window(), drag_handler); -@@ -1081,7 +1081,7 @@ bool DesktopWindowTreeHostPlatform::RotateFocusForWidg +@@ -1084,7 +1084,7 @@ bool DesktopWindowTreeHostPlatform::RotateFocusForWidg // DesktopWindowTreeHost: // Linux subclasses this host and adds some Linux specific bits. diff --git a/www/iridium/files/patch-ui_views_widget_widget.cc b/www/iridium/files/patch-ui_views_widget_widget.cc index b5f9a97a3d34..f23444a87f3d 100644 --- a/www/iridium/files/patch-ui_views_widget_widget.cc +++ b/www/iridium/files/patch-ui_views_widget_widget.cc @@ -1,4 +1,4 @@ ---- ui/views/widget/widget.cc.orig 2023-10-21 11:51:27 UTC +--- ui/views/widget/widget.cc.orig 2023-11-22 14:00:11 UTC +++ ui/views/widget/widget.cc @@ -54,7 +54,7 @@ #include "ui/views/window/custom_frame_view.h" @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #endif -@@ -2041,7 +2041,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const +@@ -2061,7 +2061,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const if (parent_) return parent_->GetNativeTheme(); diff --git a/www/iridium/files/patch-ui_views_widget_widget.h b/www/iridium/files/patch-ui_views_widget_widget.h index 6d799015c704..78ebe4b327f1 100644 --- a/www/iridium/files/patch-ui_views_widget_widget.h +++ b/www/iridium/files/patch-ui_views_widget_widget.h @@ -1,6 +1,6 @@ ---- ui/views/widget/widget.h.orig 2023-07-24 14:27:53 UTC +--- ui/views/widget/widget.h.orig 2023-11-22 14:00:11 UTC +++ ui/views/widget/widget.h -@@ -410,7 +410,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWid +@@ -417,7 +417,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWid // If set, the widget was created in headless mode. bool headless_mode = false; diff --git a/www/iridium/files/patch-v8_BUILD.gn b/www/iridium/files/patch-v8_BUILD.gn index b46dbc0820bc..3dc2c114b24c 100644 --- a/www/iridium/files/patch-v8_BUILD.gn +++ b/www/iridium/files/patch-v8_BUILD.gn @@ -1,6 +1,6 @@ ---- v8/BUILD.gn.orig 2023-10-21 11:51:27 UTC +--- v8/BUILD.gn.orig 2023-11-22 14:00:11 UTC +++ v8/BUILD.gn -@@ -1417,6 +1417,14 @@ config("toolchain") { +@@ -1412,6 +1412,14 @@ config("toolchain") { } else if (target_os == "chromeos") { defines += [ "V8_HAVE_TARGET_OS" ] defines += [ "V8_TARGET_OS_CHROMEOS" ] @@ -15,7 +15,7 @@ } # TODO(infra): Support v8_enable_prof on Windows. -@@ -2378,6 +2386,12 @@ template("run_mksnapshot") { +@@ -2375,6 +2383,12 @@ template("run_mksnapshot") { if (!v8_enable_builtins_profiling && v8_enable_builtins_reordering) { args += [ "--reorder-builtins" ] } @@ -28,7 +28,7 @@ } # This is needed to distinguish between generating code for the simulator -@@ -6111,7 +6125,7 @@ v8_component("v8_libbase") { +@@ -6156,7 +6170,7 @@ v8_component("v8_libbase") { } } @@ -37,7 +37,7 @@ sources += [ "src/base/debug/stack_trace_posix.cc", "src/base/platform/platform-linux.cc", -@@ -6122,6 +6136,18 @@ v8_component("v8_libbase") { +@@ -6167,6 +6181,18 @@ v8_component("v8_libbase") { "dl", "rt", ] diff --git a/www/iridium/files/patch-v8_src_api_api.cc b/www/iridium/files/patch-v8_src_api_api.cc index 7131ac6ca27f..641d8811b87f 100644 --- a/www/iridium/files/patch-v8_src_api_api.cc +++ b/www/iridium/files/patch-v8_src_api_api.cc @@ -1,4 +1,4 @@ ---- v8/src/api/api.cc.orig 2023-10-21 11:51:27 UTC +--- v8/src/api/api.cc.orig 2023-11-22 14:00:11 UTC +++ v8/src/api/api.cc @@ -141,7 +141,7 @@ #include "src/wasm/wasm-serialization.h" @@ -9,7 +9,7 @@ #include <signal.h> #include <unistd.h> -@@ -6352,7 +6352,7 @@ bool v8::V8::Initialize(const int build_config) { +@@ -6363,7 +6363,7 @@ bool v8::V8::Initialize(const int build_config) { return true; } diff --git a/www/iridium/files/patch-v8_src_base_platform_platform-posix.cc b/www/iridium/files/patch-v8_src_base_platform_platform-posix.cc index a61eda3f2048..bfc35876b750 100644 --- a/www/iridium/files/patch-v8_src_base_platform_platform-posix.cc +++ b/www/iridium/files/patch-v8_src_base_platform_platform-posix.cc @@ -1,4 +1,4 @@ ---- v8/src/base/platform/platform-posix.cc.orig 2023-10-21 11:51:27 UTC +--- v8/src/base/platform/platform-posix.cc.orig 2023-11-22 14:00:11 UTC +++ v8/src/base/platform/platform-posix.cc @@ -55,7 +55,7 @@ #if V8_OS_DARWIN @@ -51,7 +51,7 @@ return true; #else // TODO(bbudge) Return true for all POSIX platforms. -@@ -1281,7 +1289,7 @@ void Thread::SetThreadLocal(LocalStorageKey key, void* +@@ -1300,7 +1308,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/iridium/files/patch-v8_src_base_small-vector.h b/www/iridium/files/patch-v8_src_base_small-vector.h deleted file mode 100644 index 6d9d1e876cf5..000000000000 --- a/www/iridium/files/patch-v8_src_base_small-vector.h +++ /dev/null @@ -1,11 +0,0 @@ ---- v8/src/base/small-vector.h.orig 2022-12-01 10:35:46 UTC -+++ v8/src/base/small-vector.h -@@ -22,7 +22,7 @@ template <typename T, size_t kSize, typename Allocator - class SmallVector { - // Currently only support trivially copyable and trivially destructible data - // types, as it uses memcpy to copy elements and never calls destructors. -- ASSERT_TRIVIALLY_COPYABLE(T); -+ // XXX FREEBSD ASSERT_TRIVIALLY_COPYABLE(T); - static_assert(std::is_trivially_destructible<T>::value); - - public: diff --git a/www/iridium/files/patch-v8_src_baseline_x64_baseline-assembler-x64-inl.h b/www/iridium/files/patch-v8_src_baseline_x64_baseline-assembler-x64-inl.h index a8002f790cbf..fe20f7a90f8e 100644 --- a/www/iridium/files/patch-v8_src_baseline_x64_baseline-assembler-x64-inl.h +++ b/www/iridium/files/patch-v8_src_baseline_x64_baseline-assembler-x64-inl.h @@ -1,6 +1,6 @@ ---- v8/src/baseline/x64/baseline-assembler-x64-inl.h.orig 2023-07-24 14:27:53 UTC +--- v8/src/baseline/x64/baseline-assembler-x64-inl.h.orig 2023-11-22 14:00:11 UTC +++ v8/src/baseline/x64/baseline-assembler-x64-inl.h -@@ -73,9 +73,7 @@ MemOperand BaselineAssembler::FeedbackVectorOperand() +@@ -76,9 +76,7 @@ MemOperand BaselineAssembler::FeedbackCellOperand() { void BaselineAssembler::Bind(Label* label) { __ bind(label); } diff --git a/www/iridium/files/patch-v8_src_builtins_x64_builtins-x64.cc b/www/iridium/files/patch-v8_src_builtins_x64_builtins-x64.cc index 934f55e23a1c..35bfb90bba44 100644 --- a/www/iridium/files/patch-v8_src_builtins_x64_builtins-x64.cc +++ b/www/iridium/files/patch-v8_src_builtins_x64_builtins-x64.cc @@ -1,4 +1,4 @@ ---- v8/src/builtins/x64/builtins-x64.cc.orig 2023-10-21 11:51:27 UTC +--- v8/src/builtins/x64/builtins-x64.cc.orig 2023-11-22 14:00:11 UTC +++ v8/src/builtins/x64/builtins-x64.cc @@ -44,6 +44,8 @@ namespace internal { #define __ ACCESS_MASM(masm) @@ -18,7 +18,7 @@ // Store the current pc as the handler offset. It's used later to create the // handler table. -@@ -3327,6 +3329,9 @@ void SwitchBackAndReturnPromise(MacroAssembler* masm, +@@ -3324,6 +3326,9 @@ void SwitchBackAndReturnPromise(MacroAssembler* masm, void GenerateExceptionHandlingLandingPad(MacroAssembler* masm, Label* return_promise) { int catch_handler = __ pc_offset(); @@ -28,7 +28,7 @@ // Restore rsp to free the reserved stack slots for the sections. __ leaq(rsp, MemOperand(rbp, StackSwitchFrameConstants::kLastSpillOffset)); -@@ -3658,6 +3663,7 @@ void Builtins::Generate_WasmSuspend(MacroAssembler* ma +@@ -3655,6 +3660,7 @@ void Builtins::Generate_WasmSuspend(MacroAssembler* ma LoadJumpBuffer(masm, jmpbuf, true); __ Trap(); __ bind(&resume); @@ -36,7 +36,7 @@ __ LeaveFrame(StackFrame::STACK_SWITCH); __ ret(0); } -@@ -3790,6 +3796,7 @@ void Generate_WasmResumeHelper(MacroAssembler* masm, w +@@ -3787,6 +3793,7 @@ void Generate_WasmResumeHelper(MacroAssembler* masm, w } __ Trap(); __ bind(&suspend); diff --git a/www/iridium/files/patch-v8_src_codegen_x64_assembler-x64.h b/www/iridium/files/patch-v8_src_codegen_x64_assembler-x64.h index 19b9e05444ab..d7b1485a6f3b 100644 --- a/www/iridium/files/patch-v8_src_codegen_x64_assembler-x64.h +++ b/www/iridium/files/patch-v8_src_codegen_x64_assembler-x64.h @@ -1,4 +1,4 @@ ---- v8/src/codegen/x64/assembler-x64.h.orig 2023-10-21 11:51:27 UTC +--- v8/src/codegen/x64/assembler-x64.h.orig 2023-11-22 14:00:11 UTC +++ v8/src/codegen/x64/assembler-x64.h @@ -860,6 +860,7 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBa void ret(int imm16); @@ -8,7 +8,7 @@ void pblendw(XMMRegister dst, Operand src, uint8_t mask); void pblendw(XMMRegister dst, XMMRegister src, uint8_t mask); -@@ -917,8 +918,8 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBa +@@ -918,8 +919,8 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBa void jmp(Handle<Code> target, RelocInfo::Mode rmode); // Jump near absolute indirect (r64) diff --git a/www/iridium/files/patch-v8_src_codegen_x64_macro-assembler-x64.cc b/www/iridium/files/patch-v8_src_codegen_x64_macro-assembler-x64.cc index 462d545da95f..a207ba2377bb 100644 --- a/www/iridium/files/patch-v8_src_codegen_x64_macro-assembler-x64.cc +++ b/www/iridium/files/patch-v8_src_codegen_x64_macro-assembler-x64.cc @@ -1,4 +1,4 @@ ---- v8/src/codegen/x64/macro-assembler-x64.cc.orig 2023-10-21 11:51:27 UTC +--- v8/src/codegen/x64/macro-assembler-x64.cc.orig 2023-11-22 14:00:11 UTC +++ v8/src/codegen/x64/macro-assembler-x64.cc @@ -51,6 +51,8 @@ Operand StackArgumentsAccessor::GetArgumentOperand(int return Operand(rsp, kPCOnStackSize + index * kSystemPointerSize); @@ -9,7 +9,7 @@ void MacroAssembler::Load(Register destination, ExternalReference source) { if (root_array_available_ && options().enable_root_relative_access) { intptr_t delta = RootRegisterOffsetForExternalReference(isolate(), source); -@@ -2046,7 +2048,7 @@ void MacroAssembler::Switch(Register scratch, Register +@@ -2145,7 +2147,7 @@ void MacroAssembler::Switch(Register scratch, Register cmpq(reg, Immediate(num_labels)); j(above_equal, &fallthrough); leaq(table, MemOperand(&jump_table)); diff --git a/www/iridium/files/patch-v8_src_codegen_x64_macro-assembler-x64.h b/www/iridium/files/patch-v8_src_codegen_x64_macro-assembler-x64.h index e30a0d148f72..2d51e8d24baa 100644 --- a/www/iridium/files/patch-v8_src_codegen_x64_macro-assembler-x64.h +++ b/www/iridium/files/patch-v8_src_codegen_x64_macro-assembler-x64.h @@ -1,6 +1,6 @@ ---- v8/src/codegen/x64/macro-assembler-x64.h.orig 2023-10-21 11:51:27 UTC +--- v8/src/codegen/x64/macro-assembler-x64.h.orig 2023-11-22 14:00:11 UTC +++ v8/src/codegen/x64/macro-assembler-x64.h -@@ -646,11 +646,14 @@ class V8_EXPORT_PRIVATE MacroAssembler +@@ -655,11 +655,14 @@ class V8_EXPORT_PRIVATE MacroAssembler // Define a function entrypoint. This doesn't emit any code for this // architecture, as control-flow integrity is not supported for it. diff --git a/www/iridium/files/patch-v8_src_compiler_backend_x64_code-generator-x64.cc b/www/iridium/files/patch-v8_src_compiler_backend_x64_code-generator-x64.cc index 0f84a084fce7..32d954e0e371 100644 --- a/www/iridium/files/patch-v8_src_compiler_backend_x64_code-generator-x64.cc +++ b/www/iridium/files/patch-v8_src_compiler_backend_x64_code-generator-x64.cc @@ -1,6 +1,6 @@ ---- v8/src/compiler/backend/x64/code-generator-x64.cc.orig 2023-10-21 11:51:27 UTC +--- v8/src/compiler/backend/x64/code-generator-x64.cc.orig 2023-11-22 14:00:11 UTC +++ v8/src/compiler/backend/x64/code-generator-x64.cc -@@ -6828,11 +6828,11 @@ void CodeGenerator::AssembleArchTableSwitch(Instructio +@@ -6852,11 +6852,11 @@ void CodeGenerator::AssembleArchTableSwitch(Instructio // target = table + (target - table) __ addq(input, kScratchRegister); // Jump to the target. diff --git a/www/iridium/files/patch-v8_src_execution_isolate.cc b/www/iridium/files/patch-v8_src_execution_isolate.cc index e3fe2f430d59..ceab653c375d 100644 --- a/www/iridium/files/patch-v8_src_execution_isolate.cc +++ b/www/iridium/files/patch-v8_src_execution_isolate.cc @@ -1,4 +1,4 @@ ---- v8/src/execution/isolate.cc.orig 2023-10-21 11:51:27 UTC +--- v8/src/execution/isolate.cc.orig 2023-11-22 14:00:11 UTC +++ v8/src/execution/isolate.cc @@ -147,6 +147,10 @@ #include "src/execution/simulator-base.h" @@ -11,7 +11,7 @@ extern "C" const uint8_t v8_Default_embedded_blob_code_[]; extern "C" uint32_t v8_Default_embedded_blob_code_size_; extern "C" const uint8_t v8_Default_embedded_blob_data_[]; -@@ -4034,6 +4038,11 @@ void Isolate::InitializeDefaultEmbeddedBlob() { +@@ -4083,6 +4087,11 @@ void Isolate::InitializeDefaultEmbeddedBlob() { uint32_t code_size = DefaultEmbeddedBlobCodeSize(); const uint8_t* data = DefaultEmbeddedBlobData(); uint32_t data_size = DefaultEmbeddedBlobDataSize(); diff --git a/www/iridium/files/patch-v8_src_flags_flags.cc b/www/iridium/files/patch-v8_src_flags_flags.cc index ff88d3365a1e..17ca33d8bde1 100644 --- a/www/iridium/files/patch-v8_src_flags_flags.cc +++ b/www/iridium/files/patch-v8_src_flags_flags.cc @@ -1,7 +1,7 @@ ---- v8/src/flags/flags.cc.orig 2023-10-21 11:51:27 UTC +--- v8/src/flags/flags.cc.orig 2023-11-22 14:00:11 UTC +++ v8/src/flags/flags.cc -@@ -12,6 +12,10 @@ - #include <iomanip> +@@ -13,6 +13,10 @@ + #include <set> #include <sstream> +#if V8_OS_OPENBSD @@ -11,7 +11,7 @@ #include "src/base/functional.h" #include "src/base/logging.h" #include "src/base/platform/platform.h" -@@ -31,7 +35,11 @@ +@@ -32,7 +36,11 @@ namespace v8::internal { // Define {v8_flags}, declared in flags.h. @@ -23,7 +23,7 @@ // {v8_flags} needs to be aligned to a memory page, and the size needs to be a // multiple of a page size. This is required for memory-protection of the memory -@@ -824,6 +832,10 @@ void FlagList::FreezeFlags() { +@@ -905,6 +913,10 @@ void FlagList::FreezeFlags() { // Note that for string flags we only protect the pointer itself, but not the // string storage. TODO(12887): Fix this. base::OS::SetDataReadOnly(&v8_flags, sizeof(v8_flags)); diff --git a/www/iridium/files/patch-v8_src_maglev_x64_maglev-assembler-x64-inl.h b/www/iridium/files/patch-v8_src_maglev_x64_maglev-assembler-x64-inl.h index cd5195899f54..b4216fd3000f 100644 --- a/www/iridium/files/patch-v8_src_maglev_x64_maglev-assembler-x64-inl.h +++ b/www/iridium/files/patch-v8_src_maglev_x64_maglev-assembler-x64-inl.h @@ -1,6 +1,6 @@ ---- v8/src/maglev/x64/maglev-assembler-x64-inl.h.orig 2023-10-21 11:51:27 UTC +--- v8/src/maglev/x64/maglev-assembler-x64-inl.h.orig 2023-11-22 14:00:11 UTC +++ v8/src/maglev/x64/maglev-assembler-x64-inl.h -@@ -229,7 +229,10 @@ void MaglevAssembler::PushReverse(T... vals) { +@@ -231,7 +231,10 @@ void MaglevAssembler::PushReverse(T... vals) { detail::PushAllHelper<T...>::PushReverse(this, vals...); } diff --git a/www/iridium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.cc b/www/iridium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.cc index 8e6d56b7ae79..9db42dac6e0a 100644 --- a/www/iridium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.cc +++ b/www/iridium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-base.cc @@ -1,6 +1,6 @@ ---- v8/src/snapshot/embedded/platform-embedded-file-writer-base.cc.orig 2023-03-13 07:33:08 UTC +--- v8/src/snapshot/embedded/platform-embedded-file-writer-base.cc.orig 2023-11-22 14:00:11 UTC +++ v8/src/snapshot/embedded/platform-embedded-file-writer-base.cc -@@ -142,6 +142,8 @@ EmbeddedTargetOs ToEmbeddedTargetOs(const char* s) { +@@ -143,6 +143,8 @@ EmbeddedTargetOs ToEmbeddedTargetOs(const char* s) { return EmbeddedTargetOs::kWin; } else if (string == "starboard") { return EmbeddedTargetOs::kStarboard; diff --git a/www/iridium/files/patch-v8_src_trap-handler_handler-inside-posix.cc b/www/iridium/files/patch-v8_src_trap-handler_handler-inside-posix.cc index 2d7dd9b9fa36..5db1a87956be 100644 --- a/www/iridium/files/patch-v8_src_trap-handler_handler-inside-posix.cc +++ b/www/iridium/files/patch-v8_src_trap-handler_handler-inside-posix.cc @@ -1,6 +1,6 @@ ---- v8/src/trap-handler/handler-inside-posix.cc.orig 2023-07-24 14:27:53 UTC +--- v8/src/trap-handler/handler-inside-posix.cc.orig 2023-11-22 14:00:11 UTC +++ v8/src/trap-handler/handler-inside-posix.cc -@@ -59,6 +59,8 @@ namespace trap_handler { +@@ -61,6 +61,8 @@ namespace trap_handler { #define CONTEXT_REG(reg, REG) &uc->uc_mcontext->__ss.__##reg #elif V8_OS_FREEBSD #define CONTEXT_REG(reg, REG) &uc->uc_mcontext.mc_##reg @@ -9,7 +9,7 @@ #else #error "Unsupported platform." #endif -@@ -68,8 +70,12 @@ bool IsKernelGeneratedSignal(siginfo_t* info) { +@@ -70,8 +72,12 @@ bool IsKernelGeneratedSignal(siginfo_t* info) { // si_code at its default of 0 for signals that don’t originate in hardware. // The other conditions are only relevant for Linux. return info->si_code > 0 && info->si_code != SI_USER && diff --git a/www/iridium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32.h b/www/iridium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32.h index 9fbe1f14b897..4c41e1d0cdf6 100644 --- a/www/iridium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32.h +++ b/www/iridium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32.h @@ -1,6 +1,6 @@ ---- v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h.orig 2023-10-21 11:51:27 UTC +--- v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h.orig 2023-11-22 14:00:11 UTC +++ v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h -@@ -491,7 +491,7 @@ void LiftoffAssembler::StoreTaggedPointer(Register dst +@@ -492,7 +492,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) { -@@ -571,7 +571,7 @@ void LiftoffAssembler::Load(LiftoffRegister dst, Regis +@@ -572,7 +572,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 */) { -@@ -651,7 +651,7 @@ void LiftoffAssembler::Store(Register dst_addr, Regist +@@ -652,7 +652,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) { -@@ -671,7 +671,7 @@ void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, +@@ -672,7 +672,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_NE(offset_reg, no_reg); -@@ -741,7 +741,7 @@ enum Binop { kAdd, kSub, kAnd, kOr, kXor, kExchange }; +@@ -742,7 +742,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); -@@ -808,7 +808,7 @@ inline void AtomicAddOrSubOrExchange32(LiftoffAssemble +@@ -809,7 +809,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); -@@ -920,7 +920,7 @@ inline void AtomicBinop32(LiftoffAssembler* lasm, Bino +@@ -921,7 +921,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 +@@ -1013,7 +1013,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 +@@ -1027,7 +1027,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 +@@ -1040,7 +1040,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 +@@ -1054,7 +1054,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 +@@ -1068,7 +1068,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 +@@ -1082,7 +1082,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 +@@ -1097,7 +1097,7 @@ void LiftoffAssembler::AtomicExchange(Register dst_add } void LiftoffAssembler::AtomicCompareExchange( diff --git a/www/iridium/files/patch-v8_src_wasm_jump-table-assembler.cc b/www/iridium/files/patch-v8_src_wasm_jump-table-assembler.cc index 72ac1bd16ffb..023589174106 100644 --- a/www/iridium/files/patch-v8_src_wasm_jump-table-assembler.cc +++ b/www/iridium/files/patch-v8_src_wasm_jump-table-assembler.cc @@ -1,6 +1,6 @@ ---- v8/src/wasm/jump-table-assembler.cc.orig 2023-07-24 14:27:53 UTC +--- v8/src/wasm/jump-table-assembler.cc.orig 2023-11-22 14:00:11 UTC +++ v8/src/wasm/jump-table-assembler.cc -@@ -52,15 +52,21 @@ void JumpTableAssembler::InitializeJumpsToLazyCompileT +@@ -74,15 +74,21 @@ void JumpTableAssembler::InitializeJumpsToLazyCompileT #if V8_TARGET_ARCH_X64 void JumpTableAssembler::EmitLazyCompileJumpSlot(uint32_t func_index, Address lazy_compile_target) { @@ -25,7 +25,7 @@ near_jmp(displacement, RelocInfo::NO_INFO); // 5 bytes return true; } -@@ -68,11 +74,12 @@ bool JumpTableAssembler::EmitJumpSlot(Address target) +@@ -90,11 +96,12 @@ bool JumpTableAssembler::EmitJumpSlot(Address target) void JumpTableAssembler::EmitFarJumpSlot(Address target) { Label data; int start_offset = pc_offset(); @@ -40,7 +40,7 @@ USE(start_offset); bind(&data); dq(target); // 8 bytes -@@ -83,7 +90,7 @@ void JumpTableAssembler::PatchFarJumpSlot(Address slot +@@ -105,7 +112,7 @@ void JumpTableAssembler::PatchFarJumpSlot(Address slot // The slot needs to be pointer-size aligned so we can atomically update it. DCHECK(IsAligned(slot, kSystemPointerSize)); // Offset of the target is at 8 bytes, see {EmitFarJumpSlot}. diff --git a/www/iridium/files/patch-v8_src_wasm_jump-table-assembler.h b/www/iridium/files/patch-v8_src_wasm_jump-table-assembler.h index b9a08a85b23b..9e39adf98498 100644 --- a/www/iridium/files/patch-v8_src_wasm_jump-table-assembler.h +++ b/www/iridium/files/patch-v8_src_wasm_jump-table-assembler.h @@ -1,6 +1,6 @@ ---- v8/src/wasm/jump-table-assembler.h.orig 2023-07-24 14:27:53 UTC +--- v8/src/wasm/jump-table-assembler.h.orig 2023-11-22 14:00:11 UTC +++ v8/src/wasm/jump-table-assembler.h -@@ -185,9 +185,10 @@ class V8_EXPORT_PRIVATE JumpTableAssembler : public Ma +@@ -174,9 +174,10 @@ class V8_EXPORT_PRIVATE JumpTableAssembler : public Ma // boundaries. The jump table line size has been chosen to satisfy this. #if V8_TARGET_ARCH_X64 static constexpr int kJumpTableLineSize = 64; diff --git a/www/iridium/files/patch-weblayer_browser_browser__main__parts__impl.cc b/www/iridium/files/patch-weblayer_browser_browser__main__parts__impl.cc deleted file mode 100644 index 3312291f784e..000000000000 --- a/www/iridium/files/patch-weblayer_browser_browser__main__parts__impl.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- weblayer/browser/browser_main_parts_impl.cc.orig 2023-10-21 11:51:27 UTC -+++ weblayer/browser/browser_main_parts_impl.cc -@@ -82,7 +82,7 @@ - - // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is - // complete. --#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) - #include "ui/base/ime/init/input_method_initializer.h" - #endif - -@@ -201,7 +201,7 @@ int BrowserMainPartsImpl::PreEarlyInitialization() { - - // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is - // complete. --#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) - ui::InitializeInputMethodForTesting(); - #endif - #if BUILDFLAG(IS_ANDROID) diff --git a/www/iridium/files/patch-weblayer_browser_content__browser__client__impl.cc b/www/iridium/files/patch-weblayer_browser_content__browser__client__impl.cc deleted file mode 100644 index eee837edb3cb..000000000000 --- a/www/iridium/files/patch-weblayer_browser_content__browser__client__impl.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- weblayer/browser/content_browser_client_impl.cc.orig 2023-10-21 11:51:27 UTC -+++ weblayer/browser/content_browser_client_impl.cc -@@ -154,7 +154,7 @@ - // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is - // complete. - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ -- BUILDFLAG(IS_ANDROID) -+ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - #include "content/public/common/content_descriptors.h" - #endif - -@@ -1025,7 +1025,7 @@ SafeBrowsingService* ContentBrowserClientImpl::GetSafe - // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is - // complete. - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ -- BUILDFLAG(IS_ANDROID) -+ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - void ContentBrowserClientImpl::GetAdditionalMappedFilesForChildProcess( - const base::CommandLine& command_line, - int child_process_id, diff --git a/www/iridium/files/patch-weblayer_browser_content__browser__client__impl.h b/www/iridium/files/patch-weblayer_browser_content__browser__client__impl.h deleted file mode 100644 index 6bad63159485..000000000000 --- a/www/iridium/files/patch-weblayer_browser_content__browser__client__impl.h +++ /dev/null @@ -1,11 +0,0 @@ ---- weblayer/browser/content_browser_client_impl.h.orig 2023-10-21 11:51:27 UTC -+++ weblayer/browser/content_browser_client_impl.h -@@ -184,7 +184,7 @@ class ContentBrowserClientImpl : public content::Conte - // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is - // complete. - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ -- BUILDFLAG(IS_ANDROID) -+ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - void GetAdditionalMappedFilesForChildProcess( - const base::CommandLine& command_line, - int child_process_id, diff --git a/www/iridium/files/patch-weblayer_browser_system__network__context__manager.cc b/www/iridium/files/patch-weblayer_browser_system__network__context__manager.cc deleted file mode 100644 index 855c9b3ea784..000000000000 --- a/www/iridium/files/patch-weblayer_browser_system__network__context__manager.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- weblayer/browser/system_network_context_manager.cc.orig 2022-04-01 07:48:30 UTC -+++ weblayer/browser/system_network_context_manager.cc -@@ -69,7 +69,7 @@ void SystemNetworkContextManager::ConfigureDefaultNetw - network_context_params->user_agent = user_agent; - // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is - // complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - // We're not configuring the cookie encryption on these platforms yet. - network_context_params->enable_encrypted_cookies = false; - #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || diff --git a/www/iridium/files/patch-weblayer_common_weblayer__paths.cc b/www/iridium/files/patch-weblayer_common_weblayer__paths.cc deleted file mode 100644 index 62f0b380e6ff..000000000000 --- a/www/iridium/files/patch-weblayer_common_weblayer__paths.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- weblayer/common/weblayer_paths.cc.orig 2022-04-01 07:48:30 UTC -+++ weblayer/common/weblayer_paths.cc -@@ -18,7 +18,7 @@ - - #if BUILDFLAG(IS_WIN) - #include "base/base_paths_win.h" --#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) - #include "base/nix/xdg_util.h" - #endif - -@@ -36,7 +36,7 @@ bool GetDefaultUserDataDirectory(base::FilePath* resul - return false; - *result = result->AppendASCII("weblayer"); - return true; --#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) - std::unique_ptr<base::Environment> env(base::Environment::Create()); - base::FilePath config_dir(base::nix::GetXDGDirectory( - env.get(), base::nix::kXdgConfigHomeEnvVar, base::nix::kDotConfigDir)); |