diff options
| author | Robert Nagy <rnagy@FreeBSD.org> | 2024-10-01 09:37:51 +0000 |
|---|---|---|
| committer | Robert Nagy <rnagy@FreeBSD.org> | 2024-10-01 09:38:15 +0000 |
| commit | 9027865f9bf2c7d13543574195789f99add875e8 (patch) | |
| tree | 69e40fa2a3c581beca09749c262e20ef207cf86c | |
| parent | 3a54caee179d0fc05056d4ab42331ac6bc1526a7 (diff) | |
| download | ports-9027865f9bf2c7d13543574195789f99add875e8.tar.gz ports-9027865f9bf2c7d13543574195789f99add875e8.zip | |
www/ungoogled-chromium: update to 129.0.6668.70
368 files changed, 1710 insertions, 1567 deletions
diff --git a/www/ungoogled-chromium/Makefile b/www/ungoogled-chromium/Makefile index 8ee24bb1d56a..6bcd034b6e02 100644 --- a/www/ungoogled-chromium/Makefile +++ b/www/ungoogled-chromium/Makefile @@ -1,5 +1,5 @@ PORTNAME= ungoogled-chromium -PORTVERSION= 128.0.6613.137 +PORTVERSION= 129.0.6668.70 PULSEMV= 16 PULSEV= ${PULSEMV}.1 UGVERSION= ${DISTVERSION}-1 diff --git a/www/ungoogled-chromium/distinfo b/www/ungoogled-chromium/distinfo index 7752b1911c29..ec9409dd213f 100644 --- a/www/ungoogled-chromium/distinfo +++ b/www/ungoogled-chromium/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1726306029 -SHA256 (chromium-128.0.6613.137.tar.xz) = e1d39c170dfdc2627a7b003e11d77f04a578b8e1cfe41e714cdaa345c91f4943 -SIZE (chromium-128.0.6613.137.tar.xz) = 6724182764 -SHA256 (ungoogled-chromium-128.0.6613.137-1.tar.gz) = 94e2f80f72b1c0f791c826c734a676cd0cb60ebaaf2a8a4941a8475a15f5508d -SIZE (ungoogled-chromium-128.0.6613.137-1.tar.gz) = 1239916 +TIMESTAMP = 1727770211 +SHA256 (chromium-129.0.6668.70.tar.xz) = 094ddec3774b54feb04dcfb020e61766de16feabb04850d73ef82e38c4bbf2b5 +SIZE (chromium-129.0.6668.70.tar.xz) = 6668765016 +SHA256 (ungoogled-chromium-129.0.6668.70-1.tar.gz) = a9eb8896329304e429552fb15c640debd87bc6c66b051f802d3da5d707c24744 +SIZE (ungoogled-chromium-129.0.6668.70-1.tar.gz) = 1243277 SHA256 (pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92 SIZE (pulseaudio-16.1.tar.gz) = 2763111 -SHA256 (chromium-128.0.6613.137-testdata.tar.xz) = 366ff50d10e8def1e1a0caa7edc13e6d741312470061d559acf0a6ca061d9e95 -SIZE (chromium-128.0.6613.137-testdata.tar.xz) = 280838304 +SHA256 (chromium-129.0.6668.70-testdata.tar.xz) = 8c4484753a92cb5d8d0635e67df51e767c948800f2423d7b9529fca3abca6172 +SIZE (chromium-129.0.6668.70-testdata.tar.xz) = 275890820 diff --git a/www/ungoogled-chromium/files/patch-BUILD.gn b/www/ungoogled-chromium/files/patch-BUILD.gn index 1c871ffa1cc0..7df318904f11 100644 --- a/www/ungoogled-chromium/files/patch-BUILD.gn +++ b/www/ungoogled-chromium/files/patch-BUILD.gn @@ -1,4 +1,4 @@ ---- BUILD.gn.orig 2024-08-26 14:40:28 UTC +--- BUILD.gn.orig 2024-10-01 07:26:23 UTC +++ BUILD.gn @@ -66,7 +66,7 @@ declare_args() { root_extra_deps = [] @@ -17,7 +17,7 @@ "//net:net_unittests", "//sandbox:sandbox_unittests", "//services:services_unittests", -@@ -431,7 +430,7 @@ group("gn_all") { +@@ -428,7 +427,7 @@ group("gn_all") { } } @@ -26,7 +26,7 @@ deps += [ "//third_party/breakpad:breakpad_unittests", "//third_party/breakpad:core-2-minidump", -@@ -618,6 +617,15 @@ group("gn_all") { +@@ -615,6 +614,15 @@ group("gn_all") { } } @@ -42,7 +42,7 @@ if (is_mac) { deps += [ "//third_party/breakpad:dump_syms($host_system_allocator_toolchain)", -@@ -666,7 +674,7 @@ group("gn_all") { +@@ -663,7 +671,7 @@ group("gn_all") { } } @@ -51,16 +51,16 @@ # The official builders use this binary from the default toolchain's # output directory after building in order to upload the symbols of that # binary. They build the binary like `ninja symupload` which requires the -@@ -1116,7 +1124,7 @@ if (use_blink && !is_cronet_build) { +@@ -1103,7 +1111,7 @@ if (use_blink && !is_cronet_build) { ] } - 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) { + out_dir = get_path_info(root_build_dir, "name") script_test("chrome_wpt_tests") { script = "//third_party/blink/tools/run_wpt_tests.py" - args = [ -@@ -1213,7 +1221,7 @@ if (use_blink && !is_cronet_build) { +@@ -1201,7 +1209,7 @@ if (use_blink && !is_cronet_build) { data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ] } @@ -69,7 +69,7 @@ # Using the default toolchain for this tool, as it's run during tests not # during the build. This places a symlink in the root_build_dir for scrips # to use. -@@ -1227,7 +1235,7 @@ if (use_blink && !is_cronet_build) { +@@ -1215,7 +1223,7 @@ if (use_blink && !is_cronet_build) { data_deps += [ "//third_party/breakpad:dump_syms" ] } @@ -78,7 +78,7 @@ # Using the default toolchain for this tool, as it's run during tests not # during the build. This places a symlink in the root_build_dir for scrips # to use. -@@ -1694,7 +1702,7 @@ group("chromium_builder_perf") { +@@ -1685,7 +1693,7 @@ group("chromium_builder_perf") { data_deps += [ "//chrome/test:performance_browser_tests" ] } diff --git a/www/ungoogled-chromium/files/patch-base_BUILD.gn b/www/ungoogled-chromium/files/patch-base_BUILD.gn index 0e95d3407df2..be1f403fe1f3 100644 --- a/www/ungoogled-chromium/files/patch-base_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-base_BUILD.gn @@ -1,4 +1,4 @@ ---- base/BUILD.gn.orig 2024-08-26 14:40:28 UTC +--- base/BUILD.gn.orig 2024-10-01 07:26:23 UTC +++ base/BUILD.gn @@ -176,7 +176,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" -@@ -1119,11 +1119,23 @@ component("base") { +@@ -1117,11 +1117,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" ] -@@ -1143,7 +1155,7 @@ component("base") { +@@ -1141,7 +1153,7 @@ component("base") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -43,7 +43,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -2121,6 +2133,22 @@ component("base") { +@@ -2112,6 +2124,22 @@ component("base") { ] } @@ -66,7 +66,7 @@ # iOS if (is_ios) { sources += [ -@@ -2266,6 +2294,33 @@ component("base") { +@@ -2257,6 +2285,33 @@ component("base") { } } @@ -100,7 +100,7 @@ if (use_blink) { sources += [ "files/file_path_watcher.cc", -@@ -2276,7 +2331,7 @@ component("base") { +@@ -2267,7 +2322,7 @@ component("base") { } if (dep_libevent) { @@ -109,7 +109,7 @@ } if (use_libevent) { -@@ -3077,7 +3132,7 @@ if (is_apple) { +@@ -3084,7 +3139,7 @@ if (is_apple) { } } @@ -118,7 +118,7 @@ # This test must compile with -fstack-protector-all source_set("stack_canary_linux_unittests") { testonly = true -@@ -3730,7 +3785,7 @@ test("base_unittests") { +@@ -3743,7 +3798,7 @@ test("base_unittests") { ] } @@ -127,7 +127,7 @@ sources += [ "debug/proc_maps_linux_unittest.cc", "files/scoped_file_linux_unittest.cc", -@@ -3757,7 +3812,7 @@ test("base_unittests") { +@@ -3770,7 +3825,7 @@ test("base_unittests") { "posix/file_descriptor_shuffle_unittest.cc", "posix/unix_domain_socket_unittest.cc", ] @@ -136,7 +136,7 @@ sources += [ "profiler/stack_base_address_posix_unittest.cc", "profiler/stack_copier_signal_unittest.cc", -@@ -3768,7 +3823,7 @@ test("base_unittests") { +@@ -3781,7 +3836,7 @@ test("base_unittests") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -145,7 +145,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -3953,7 +4008,7 @@ test("base_unittests") { +@@ -3966,7 +4021,7 @@ test("base_unittests") { deps += [ ":base_profiler_test_support_library" ] } diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni index 516a38b1739a..ee569bbf1dc2 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni @@ -1,4 +1,4 @@ ---- base/allocator/partition_allocator/partition_alloc.gni.orig 2024-08-26 14:40:28 UTC +--- base/allocator/partition_allocator/partition_alloc.gni.orig 2024-10-01 07:26:23 UTC +++ base/allocator/partition_allocator/partition_alloc.gni @@ -31,7 +31,7 @@ if (is_nacl) { use_large_empty_slot_span_ring = is_mac @@ -9,7 +9,7 @@ declare_args() { # Causes all the allocations to be routed via allocator_shim.cc. Usually, -@@ -361,7 +361,7 @@ assert(!use_asan_backup_ref_ptr || use_raw_ptr_hookabl +@@ -389,7 +389,7 @@ assert(!use_asan_backup_ref_ptr || use_raw_ptr_hookabl # dependencies that use partition_allocator are compiled in AOSP against a # version of glibc that does not include pkeys syscall numbers. is_pkeys_available = diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn index fc0424842a89..3053838b187b 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig 2024-08-26 14:40:28 UTC +--- base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig 2024-10-01 07:26:23 UTC +++ base/allocator/partition_allocator/src/partition_alloc/BUILD.gn -@@ -796,7 +796,7 @@ if (is_clang_or_gcc) { +@@ -856,7 +856,7 @@ if (is_clang_or_gcc) { configs -= [ partition_alloc_enable_arc_config ] } } diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h index c191deb4d84c..85571641b3da 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h @@ -1,4 +1,4 @@ ---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h.orig 2024-08-26 14:40:28 UTC +--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h.orig 2024-10-01 07:26:23 UTC +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h @@ -329,7 +329,7 @@ PA_DEFINE_OPERATORS_FOR_FLAGS(PoolHandleMask); // 8GB for each of the glued pools). @@ -9,7 +9,7 @@ constexpr size_t kPoolMaxSize = 8 * kGiB; #else constexpr size_t kPoolMaxSize = 16 * kGiB; -@@ -458,7 +458,7 @@ PA_ALWAYS_INLINE constexpr size_t MaxDirectMapped() { +@@ -446,7 +446,7 @@ PA_ALWAYS_INLINE constexpr size_t MaxDirectMapped() { // TODO(casey.smalley@arm.com): under 64k pages we can end up in a situation // where a normal slot span will be large enough to contain multiple items, // but the address will go over the final partition page after being aligned. diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc index de863018a64c..92626c26fadf 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc @@ -1,4 +1,4 @@ ---- base/allocator/partition_allocator/src/partition_alloc/partition_root.cc.orig 2024-08-26 14:40:28 UTC +--- base/allocator/partition_allocator/src/partition_alloc/partition_root.cc.orig 2024-10-01 07:26:23 UTC +++ base/allocator/partition_allocator/src/partition_alloc/partition_root.cc @@ -43,7 +43,7 @@ #include "wow64apiset.h" @@ -18,7 +18,7 @@ // When fork() is called, only the current thread continues to execute in the // child process. If the lock is held, but *not* by this thread when fork() is // called, we have a deadlock. -@@ -1074,7 +1074,7 @@ void PartitionRoot::Init(PartitionOptions opts) { +@@ -1076,7 +1076,7 @@ void PartitionRoot::Init(PartitionOptions opts) { // apple OSes. PA_CHECK((internal::SystemPageSize() == (size_t{1} << 12)) || (internal::SystemPageSize() == (size_t{1} << 14))); diff --git a/www/ungoogled-chromium/files/patch-base_compiler__specific.h b/www/ungoogled-chromium/files/patch-base_compiler__specific.h index 6f5d1d3e4ed7..3b3dbf004c49 100644 --- a/www/ungoogled-chromium/files/patch-base_compiler__specific.h +++ b/www/ungoogled-chromium/files/patch-base_compiler__specific.h @@ -1,4 +1,4 @@ ---- base/compiler_specific.h.orig 2024-08-26 14:40:28 UTC +--- base/compiler_specific.h.orig 2024-10-01 07:26:23 UTC +++ base/compiler_specific.h @@ -326,7 +326,7 @@ // @@ -9,3 +9,12 @@ #if HAS_ATTRIBUTE(__no_stack_protector__) #define NO_STACK_PROTECTOR __attribute__((__no_stack_protector__)) #else +@@ -457,7 +457,7 @@ inline constexpr bool AnalyzerAssumeTrue(bool arg) { + // See https://clang.llvm.org/docs/AttributeReference.html#preserve-most for + // more details. + #if (defined(ARCH_CPU_ARM64) || defined(ARCH_CPU_X86_64)) && \ +- !(BUILDFLAG(IS_WIN) && defined(ARCH_CPU_ARM64)) && \ ++ !((BUILDFLAG(IS_WIN) || BUILDFLAG(IS_OPENBSD)) && defined(ARCH_CPU_ARM64)) && \ + !defined(COMPONENT_BUILD) && defined(__clang__) && \ + __clang_major__ >= 17 && HAS_ATTRIBUTE(preserve_most) + #define PRESERVE_MOST __attribute__((preserve_most)) diff --git a/www/ungoogled-chromium/files/patch-base_debug_stack__trace.cc b/www/ungoogled-chromium/files/patch-base_debug_stack__trace.cc index 3d5e9af1dd4e..766cc3e421ff 100644 --- a/www/ungoogled-chromium/files/patch-base_debug_stack__trace.cc +++ b/www/ungoogled-chromium/files/patch-base_debug_stack__trace.cc @@ -1,6 +1,6 @@ ---- base/debug/stack_trace.cc.orig 2024-07-31 14:19:23 UTC +--- base/debug/stack_trace.cc.orig 2024-10-01 07:26:23 UTC +++ base/debug/stack_trace.cc -@@ -255,7 +255,7 @@ bool StackTrace::WillSymbolizeToStreamForTesting() { +@@ -258,7 +258,7 @@ bool StackTrace::WillSymbolizeToStreamForTesting() { // Symbols are not expected to be reliable when gn args specifies // symbol_level=0. return false; @@ -9,7 +9,7 @@ // StackTrace::OutputToStream() is not implemented under uclibc, nor AIX. // See https://crbug.com/706728 return false; -@@ -317,7 +317,7 @@ std::string StackTrace::ToString() const { +@@ -320,7 +320,7 @@ std::string StackTrace::ToString() const { std::string StackTrace::ToStringWithPrefix(cstring_view prefix_string) const { std::stringstream stream; @@ -18,7 +18,7 @@ OutputToStreamWithPrefix(&stream, prefix_string); #endif return stream.str(); -@@ -341,7 +341,7 @@ bool StackTrace::ShouldSuppressOutput() { +@@ -344,7 +344,7 @@ bool StackTrace::ShouldSuppressOutput() { } std::ostream& operator<<(std::ostream& os, const StackTrace& s) { diff --git a/www/ungoogled-chromium/files/patch-base_files_file__util__unittest.cc b/www/ungoogled-chromium/files/patch-base_files_file__util__unittest.cc index df021fcb4119..a9e0c3740c4c 100644 --- a/www/ungoogled-chromium/files/patch-base_files_file__util__unittest.cc +++ b/www/ungoogled-chromium/files/patch-base_files_file__util__unittest.cc @@ -1,4 +1,4 @@ ---- base/files/file_util_unittest.cc.orig 2024-07-31 14:19:23 UTC +--- base/files/file_util_unittest.cc.orig 2024-10-01 07:26:23 UTC +++ base/files/file_util_unittest.cc @@ -3903,7 +3903,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) { } @@ -9,7 +9,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithProcFileSystem) { FilePath file_path("/proc/cpuinfo"); std::string data = "temp"; -@@ -4620,7 +4620,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles +@@ -4625,7 +4625,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles NULL); #else size_t bytes_written = diff --git a/www/ungoogled-chromium/files/patch-base_memory_discardable__memory.cc b/www/ungoogled-chromium/files/patch-base_memory_discardable__memory.cc index b3b2a5143c0c..9084cc5a31f8 100644 --- a/www/ungoogled-chromium/files/patch-base_memory_discardable__memory.cc +++ b/www/ungoogled-chromium/files/patch-base_memory_discardable__memory.cc @@ -1,4 +1,4 @@ ---- base/memory/discardable_memory.cc.orig 2022-12-02 17:56:32 UTC +--- base/memory/discardable_memory.cc.orig 2024-10-01 07:26:23 UTC +++ base/memory/discardable_memory.cc @@ -26,7 +26,7 @@ BASE_FEATURE(kMadvFreeDiscardableMemory, base::FEATURE_DISABLED_BY_DEFAULT); @@ -9,7 +9,7 @@ BASE_FEATURE(kDiscardableMemoryBackingTrial, "DiscardableMemoryBackingTrial", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -52,7 +52,7 @@ const base::FeatureParam<DiscardableMemoryTrialGroup> +@@ -39,7 +39,7 @@ BASE_FEATURE(kDiscardableMemoryBackingTrial, namespace { @@ -18,7 +18,7 @@ DiscardableMemoryBacking GetBackingForFieldTrial() { DiscardableMemoryTrialGroup trial_group = -@@ -71,7 +71,7 @@ DiscardableMemoryBacking GetBackingForFieldTrial() { +@@ -58,7 +58,7 @@ DiscardableMemoryBacking GetBackingForFieldTrial() { } // namespace @@ -27,7 +27,7 @@ // Probe capabilities of this device to determine whether we should participate // in the discardable memory backing trial. -@@ -101,7 +101,7 @@ DiscardableMemory::DiscardableMemory() = default; +@@ -88,7 +88,7 @@ DiscardableMemory::DiscardableMemory() = default; DiscardableMemory::~DiscardableMemory() = default; DiscardableMemoryBacking GetDiscardableMemoryBacking() { diff --git a/www/ungoogled-chromium/files/patch-base_memory_discardable__memory__internal.h b/www/ungoogled-chromium/files/patch-base_memory_discardable__memory__internal.h index 74d6b371cef8..b2d86e9437c4 100644 --- a/www/ungoogled-chromium/files/patch-base_memory_discardable__memory__internal.h +++ b/www/ungoogled-chromium/files/patch-base_memory_discardable__memory__internal.h @@ -1,6 +1,6 @@ ---- base/memory/discardable_memory_internal.h.orig 2022-10-01 07:40:07 UTC +--- base/memory/discardable_memory_internal.h.orig 2024-10-01 07:26:23 UTC +++ base/memory/discardable_memory_internal.h -@@ -10,7 +10,7 @@ +@@ -12,7 +12,7 @@ #include "base/metrics/field_trial_params.h" #include "build/build_config.h" diff --git a/www/ungoogled-chromium/files/patch-base_trace__event_memory__dump__manager.cc b/www/ungoogled-chromium/files/patch-base_trace__event_memory__dump__manager.cc index 806329f53067..7c6c2b2e4eac 100644 --- a/www/ungoogled-chromium/files/patch-base_trace__event_memory__dump__manager.cc +++ b/www/ungoogled-chromium/files/patch-base_trace__event_memory__dump__manager.cc @@ -1,6 +1,6 @@ ---- base/trace_event/memory_dump_manager.cc.orig 2024-06-22 08:49:42 UTC +--- base/trace_event/memory_dump_manager.cc.orig 2024-10-01 07:26:23 UTC +++ base/trace_event/memory_dump_manager.cc -@@ -87,7 +87,7 @@ const char* const MemoryDumpManager::kSystemAllocatorP +@@ -83,7 +83,7 @@ const char* const MemoryDumpManager::kSystemAllocatorP #if defined(MALLOC_MEMORY_TRACING_SUPPORTED) MallocDumpProvider::kAllocatedObjects; #else diff --git a/www/ungoogled-chromium/files/patch-build_config_clang_BUILD.gn b/www/ungoogled-chromium/files/patch-build_config_clang_BUILD.gn index 77767c902fb6..8449bf84659b 100644 --- a/www/ungoogled-chromium/files/patch-build_config_clang_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-build_config_clang_BUILD.gn @@ -1,11 +1,16 @@ ---- build/config/clang/BUILD.gn.orig 2024-08-26 14:40:28 UTC +--- build/config/clang/BUILD.gn.orig 2024-10-01 07:26:23 UTC +++ build/config/clang/BUILD.gn -@@ -237,7 +237,7 @@ template("clang_lib") { +@@ -237,7 +237,12 @@ template("clang_lib") { # Adds a dependency on the Clang runtime library clang_rt.builtins. clang_lib("compiler_builtins") { -- if (!toolchain_has_rust) { -+ if (!toolchain_has_rust || is_bsd) { - # Since there's no Rust in the toolchain, there's no concern that we'll use - # the Rust stdlib's intrinsics here. - # +- if (is_mac) { ++ if (is_bsd) { ++ # Since there's no Rust in the toolchain, there's no concern that we'll use ++ # the Rust stdlib's intrinsics here. ++ # ++ # Don't define libname which makes this target do nothing. ++ } else if (is_mac) { + libname = "osx" + } else if (is_ios) { + if (target_environment == "simulator") { diff --git a/www/ungoogled-chromium/files/patch-build_config_compiler_BUILD.gn b/www/ungoogled-chromium/files/patch-build_config_compiler_BUILD.gn index cf2cc88adacf..8fde769e9410 100644 --- a/www/ungoogled-chromium/files/patch-build_config_compiler_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-build_config_compiler_BUILD.gn @@ -1,4 +1,4 @@ ---- build/config/compiler/BUILD.gn.orig 2024-08-26 16:00:29 UTC +--- build/config/compiler/BUILD.gn.orig 2024-10-01 07:26:23 UTC +++ build/config/compiler/BUILD.gn @@ -199,7 +199,7 @@ declare_args() { # This greatly reduces the size of debug builds, at the cost of @@ -9,7 +9,7 @@ } declare_args() { -@@ -251,13 +251,16 @@ config("default_include_dirs") { +@@ -253,13 +253,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,7 +27,7 @@ } # compiler --------------------------------------------------------------------- -@@ -503,6 +506,10 @@ config("compiler") { +@@ -505,6 +508,10 @@ config("compiler") { } } @@ -38,7 +38,7 @@ # Linux-specific compiler flags setup. # ------------------------------------ if (use_icf && (!is_apple || use_lld)) { -@@ -556,7 +563,7 @@ config("compiler") { +@@ -558,7 +565,7 @@ config("compiler") { ldflags += [ "-Wl,-z,keep-text-section-prefix" ] } @@ -47,7 +47,7 @@ cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ] if (save_reproducers_on_lld_crash && use_lld) { ldflags += [ -@@ -1197,7 +1204,7 @@ config("compiler_cpu_abi") { +@@ -1212,7 +1219,7 @@ config("compiler_cpu_abi") { ] } } else if (current_cpu == "arm") { @@ -56,7 +56,7 @@ !(is_chromeos_lacros && is_chromeos_device)) { cflags += [ "--target=arm-linux-gnueabihf" ] ldflags += [ "--target=arm-linux-gnueabihf" ] -@@ -1212,7 +1219,7 @@ config("compiler_cpu_abi") { +@@ -1227,7 +1234,7 @@ config("compiler_cpu_abi") { cflags += [ "-mtune=$arm_tune" ] } } else if (current_cpu == "arm64") { @@ -65,7 +65,7 @@ !(is_chromeos_lacros && is_chromeos_device)) { cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] -@@ -1547,7 +1554,7 @@ config("compiler_deterministic") { +@@ -1562,7 +1569,7 @@ config("compiler_deterministic") { # different build directory like "out/feature_a" and "out/feature_b" if # we build same files with same compile flag. # Other paths are already given in relative, no need to normalize them. @@ -74,7 +74,7 @@ # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here. cflags += [ "-Xclang", -@@ -1605,7 +1612,7 @@ config("compiler_deterministic") { +@@ -1620,7 +1627,7 @@ config("compiler_deterministic") { } config("clang_revision") { @@ -83,7 +83,7 @@ current_os != "zos") { update_args = [ "--print-revision", -@@ -1938,9 +1945,6 @@ config("default_warnings") { +@@ -1950,9 +1957,6 @@ config("default_warnings") { # TODO(crbug.com/40286317): Evaluate and possibly enable. "-Wno-vla-extension", @@ -93,7 +93,7 @@ ] cflags_cc += [ -@@ -1948,14 +1952,11 @@ config("default_warnings") { +@@ -1960,17 +1964,11 @@ config("default_warnings") { "-Wenum-compare-conditional", ] @@ -106,10 +106,13 @@ - - # TODO(crbug.com/344680447): Fix and re-enable. - cflags_cc += [ "-Wno-missing-template-arg-list-after-template-kw" ] +- +- # TODO(crbug.com/356172342): Fix and re-enable. +- cflags_cc += [ "-Wno-dangling-assignment-gsl" ] } } -@@ -2676,7 +2677,7 @@ config("afdo_optimize_size") { +@@ -2699,7 +2697,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") { @@ -118,7 +121,7 @@ cflags = [] if (clang_emit_debug_info_for_profiling) { # Add the following flags to generate debug info for profiling. -@@ -2703,7 +2704,7 @@ config("afdo") { +@@ -2726,7 +2724,7 @@ config("afdo") { cflags += [ "-Wno-backend-plugin" ] inputs = [ _clang_sample_profile ] } @@ -127,7 +130,7 @@ cflags = [ "-fauto-profile=${auto_profile_path}" ] inputs = [ auto_profile_path ] } -@@ -2868,7 +2869,7 @@ config("symbols") { +@@ -2891,7 +2889,7 @@ config("symbols") { configs += [ "//build/config:compress_debug_sections" ] } diff --git a/www/ungoogled-chromium/files/patch-cc_BUILD.gn b/www/ungoogled-chromium/files/patch-cc_BUILD.gn deleted file mode 100644 index 69b15463c1ae..000000000000 --- a/www/ungoogled-chromium/files/patch-cc_BUILD.gn +++ /dev/null @@ -1,19 +0,0 @@ ---- cc/BUILD.gn.orig 2024-08-26 14:40:28 UTC -+++ cc/BUILD.gn -@@ -685,7 +685,7 @@ cc_test_static_library("test_support") { - if (enable_vulkan) { - deps += [ "//gpu/vulkan/init" ] - } -- if (!is_android) { -+ if (!is_android && !is_bsd) { - data_deps = [ "//third_party/mesa_headers" ] - } - if (skia_use_dawn) { -@@ -944,7 +944,6 @@ cc_test("cc_unittests") { - data = [ "//components/test/data/viz/" ] - data_deps = [ - "//testing/buildbot/filters:cc_unittests_filters", -- "//third_party/mesa_headers", - ] - - if (is_android && enable_chrome_android_internal) { diff --git a/www/ungoogled-chromium/files/patch-chrome_app_chrome__main__delegate.cc b/www/ungoogled-chromium/files/patch-chrome_app_chrome__main__delegate.cc index 4153c297b70b..94f60ade128b 100644 --- a/www/ungoogled-chromium/files/patch-chrome_app_chrome__main__delegate.cc +++ b/www/ungoogled-chromium/files/patch-chrome_app_chrome__main__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/app/chrome_main_delegate.cc -@@ -139,7 +139,7 @@ +@@ -144,7 +144,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 -@@ -183,21 +183,21 @@ +@@ -188,21 +188,21 @@ #include "v8/include/v8.h" #endif @@ -35,7 +35,7 @@ #include "chrome/browser/policy/policy_path_parser.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -341,7 +341,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty +@@ -346,7 +346,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty // and resources loaded. bool SubprocessNeedsResourceBundle(const std::string& process_type) { return @@ -44,7 +44,7 @@ // The zygote process opens the resources for the renderers. process_type == switches::kZygoteProcess || #endif -@@ -426,7 +426,7 @@ bool HandleVersionSwitches(const base::CommandLine& co +@@ -431,7 +431,7 @@ bool HandleVersionSwitches(const base::CommandLine& co // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -53,7 +53,7 @@ // Show the man page if --help or -h is on the command line. void HandleHelpSwitches(const base::CommandLine& command_line) { if (command_line.HasSwitch(switches::kHelp) || -@@ -472,7 +472,7 @@ void SetCrashpadUploadConsentPostLogin() { +@@ -477,7 +477,7 @@ void SetCrashpadUploadConsentPostLogin() { } #endif // BUILDFLAG(IS_CHROMEOS_LACROS) @@ -62,7 +62,7 @@ void SIGTERMProfilingShutdown(int signal) { content::Profiling::Stop(); struct sigaction sigact; -@@ -554,7 +554,7 @@ std::optional<int> AcquireProcessSingleton( +@@ -559,7 +559,7 @@ std::optional<int> AcquireProcessSingleton( // process can be exited. ChromeProcessSingleton::CreateInstance(user_data_dir); @@ -71,7 +71,7 @@ // Read the xdg-activation token and set it in the command line for the // duration of the notification in order to ensure this is propagated to an // already running browser process if it exists. -@@ -638,7 +638,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -643,7 +643,7 @@ void InitializeUserDataDir(base::CommandLine* command_ std::string process_type = command_line->GetSwitchValueASCII(switches::kProcessType); @@ -80,7 +80,7 @@ // On Linux, Chrome does not support running multiple copies under different // DISPLAYs, so the profile directory can be specified in the environment to // support the virtual desktop use-case. -@@ -768,7 +768,7 @@ void RecordMainStartupMetrics(const StartupTimestamps& +@@ -773,7 +773,7 @@ void RecordMainStartupMetrics(const StartupTimestamps& #endif #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ @@ -89,7 +89,7 @@ // Record the startup process creation time on supported platforms. On Android // this is recorded in ChromeMainDelegateAndroid. startup_metric_utils::GetCommon().RecordStartupProcessCreationTime( -@@ -962,7 +962,7 @@ std::optional<int> ChromeMainDelegate::PostEarlyInitia +@@ -967,7 +967,7 @@ std::optional<int> ChromeMainDelegate::PostEarlyInitia #if BUILDFLAG(IS_OZONE) // Initialize Ozone platform and add required feature flags as per platform's // properties. @@ -98,7 +98,7 @@ ui::SetOzonePlatformForLinuxIfNeeded(*base::CommandLine::ForCurrentProcess()); #endif ui::OzonePlatform::PreEarlyInitialization(); -@@ -1160,7 +1160,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv +@@ -1165,7 +1165,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv const bool is_canary_dev = IsCanaryDev(); const bool emit_crashes = #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -107,7 +107,7 @@ is_canary_dev; #else false; -@@ -1315,7 +1315,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom +@@ -1320,7 +1320,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom // TODO(crbug.com/40118868): Revisit the macro expression once build flag // switch of lacros-chrome is complete. @@ -116,7 +116,7 @@ // This will directly exit if the user asked for help. HandleHelpSwitches(command_line); #endif -@@ -1345,7 +1345,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom +@@ -1350,7 +1350,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom #if BUILDFLAG(IS_CHROMEOS) chromeos::dbus_paths::RegisterPathProvider(); #endif @@ -125,7 +125,7 @@ nacl::RegisterPathProvider(); #endif -@@ -1732,7 +1732,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1737,7 +1737,7 @@ void ChromeMainDelegate::PreSandboxStartup() { CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale; } @@ -134,7 +134,7 @@ // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess && !command_line.HasSwitch(switches::kDisableCrashpadForTesting)) { -@@ -1828,13 +1828,13 @@ absl::variant<int, content::MainFunctionParams> Chrome +@@ -1833,13 +1833,13 @@ absl::variant<int, content::MainFunctionParams> Chrome #else #if BUILDFLAG(IS_MAC) || (BUILDFLAG(ENABLE_NACL) && !BUILDFLAG(IS_LINUX) && \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_BUILD.gn b/www/ungoogled-chromium/files/patch-chrome_browser_BUILD.gn index dfb6477d609a..6da13ada75a8 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-chrome_browser_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/browser/BUILD.gn.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/BUILD.gn.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/BUILD.gn -@@ -6994,6 +6994,13 @@ static_library("browser") { +@@ -6793,6 +6793,13 @@ static_library("browser") { } } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_about__flags.cc b/www/ungoogled-chromium/files/patch-chrome_browser_about__flags.cc index c719e414e314..3258555f4c3e 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_about__flags.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_about__flags.cc @@ -1,6 +1,6 @@ ---- chrome/browser/about_flags.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/about_flags.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/about_flags.cc -@@ -239,7 +239,7 @@ +@@ -246,7 +246,7 @@ #include "ui/ui_features.h" #include "url/url_features.h" @@ -9,7 +9,7 @@ #include "base/allocator/buildflags.h" #endif -@@ -333,7 +333,7 @@ +@@ -340,7 +340,7 @@ #include "device/vr/public/cpp/features.h" #endif @@ -18,7 +18,7 @@ #include "ui/ozone/public/ozone_switches.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) -@@ -342,7 +342,7 @@ +@@ -349,7 +349,7 @@ #include "chrome/browser/win/mica_titlebar.h" #endif @@ -27,7 +27,7 @@ #include "chrome/browser/enterprise/profile_management/profile_management_features.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -@@ -352,7 +352,7 @@ +@@ -359,7 +359,7 @@ #include "components/user_education/common/user_education_features.h" // nogncheck #endif @@ -36,7 +36,7 @@ #include "chrome/browser/ui/ui_features.h" #include "ui/base/ui_base_features.h" #endif -@@ -494,7 +494,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap +@@ -501,7 +501,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap {"Max 3 Frames", &kDXGIWaitableSwapChain3Frames, 1, nullptr}}; #endif @@ -45,7 +45,7 @@ const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = { {flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""}, {flag_descriptions::kOzonePlatformHintChoiceAuto, -@@ -894,6 +894,26 @@ const FeatureEntry::FeatureVariation +@@ -784,6 +784,26 @@ const FeatureEntry::FeatureVariation std::size(kWebIdentityDigitalIdentityCredentialHighRiskDialogParam), nullptr}}; @@ -72,7 +72,7 @@ const FeatureEntry::FeatureParam kClipboardMaximumAge60Seconds[] = { {"UIClipboardMaximumAge", "60"}}; const FeatureEntry::FeatureParam kClipboardMaximumAge90Seconds[] = { -@@ -1307,7 +1327,7 @@ const FeatureEntry::FeatureVariation kPageContentAnnot +@@ -1196,7 +1216,7 @@ const FeatureEntry::FeatureVariation kPageContentAnnot }; #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -81,7 +81,7 @@ const FeatureEntry::FeatureParam kHistoryEmbeddingsAtKeywordAcceleration[]{ {"AtKeywordAcceleration", "true"}, }; -@@ -1351,7 +1371,7 @@ const FeatureEntry::FeatureVariation +@@ -1240,7 +1260,7 @@ const FeatureEntry::FeatureVariation }; #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -90,7 +90,7 @@ const FeatureEntry::FeatureParam kShortcutBoostSingleUrl[] = { {"ShortcutBoostSearchScore", "0"}, {"ShortcutBoostNonTopHitThreshold", "0"}, -@@ -3780,7 +3800,7 @@ const flags_ui::FeatureEntry::FeatureVariation +@@ -3720,7 +3740,7 @@ const flags_ui::FeatureEntry::FeatureVariation }; #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -99,7 +99,7 @@ const flags_ui::FeatureEntry::FeatureParam kDesktopPWAsLinkCapturingDefaultOn[] = { {"link_capturing_state", "on_by_default"}}; -@@ -4867,7 +4887,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4901,7 +4921,7 @@ const FeatureEntry kFeatureEntries[] = { }, #endif // BUILDFLAG(IS_ANDROID) @@ -108,7 +108,7 @@ { "fluent-overlay-scrollbars", flag_descriptions::kFluentOverlayScrollbarsName, -@@ -5286,7 +5306,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5312,7 +5332,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kWebAppUniversalInstallDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kWebAppUniversalInstall)}, #endif // !BUILDFLAG(IS_ANDROID) @@ -117,7 +117,7 @@ {"shortcuts-not-apps", flag_descriptions::kShortcutsNotAppsName, flag_descriptions::kShortcutsNotAppsDescription, kOsMac | kOsWin | kOsLinux, -@@ -5422,7 +5442,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5461,7 +5481,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kWebShare)}, #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -126,11 +126,10 @@ {"pulseaudio-loopback-for-cast", flag_descriptions::kPulseaudioLoopbackForCastName, flag_descriptions::kPulseaudioLoopbackForCastDescription, kOsLinux, -@@ -5445,9 +5465,19 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kWaylandPerWindowScalingName, - flag_descriptions::kWaylandPerWindowScalingDescription, kOsLinux, - FEATURE_VALUE_TYPE(features::kWaylandPerSurfaceScale)}, -+ +@@ -5488,9 +5508,18 @@ const FeatureEntry kFeatureEntries[] = { + {"wayland-text-input-v3", flag_descriptions::kWaylandTextInputV3Name, + flag_descriptions::kWaylandTextInputV3Description, kOsLinux, + FEATURE_VALUE_TYPE(features::kWaylandTextInputV3)}, +#if BUILDFLAG(IS_BSD) + {"audio-backend", + flag_descriptions::kAudioBackendName, @@ -147,7 +146,7 @@ {"skip-undecryptable-passwords", flag_descriptions::kSkipUndecryptablePasswordsName, flag_descriptions::kSkipUndecryptablePasswordsDescription, -@@ -6442,7 +6472,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6481,7 +6510,7 @@ const FeatureEntry kFeatureEntries[] = { "MlUrlScoring")}, #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -156,7 +155,7 @@ {"omnibox-domain-suggestions", flag_descriptions::kOmniboxDomainSuggestionsName, flag_descriptions::kOmniboxDomainSuggestionsDescription, kOsDesktop, -@@ -6737,7 +6767,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6776,7 +6805,7 @@ const FeatureEntry kFeatureEntries[] = { "OrganicRepeatableQueries")}, #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -165,7 +164,7 @@ {"history-embeddings", flag_descriptions::kHistoryEmbeddingsName, flag_descriptions::kHistoryEmbeddingsDescription, kOsDesktop, FEATURE_WITH_PARAMS_VALUE_TYPE(history_embeddings::kHistoryEmbeddings, -@@ -7406,7 +7436,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7410,7 +7439,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(printing::features::kAddPrinterViaPrintscanmgr)}, #endif // BUILDFLAG(IS_CHROMEOS) @@ -174,7 +173,7 @@ {"cups-ipp-printing-backend", flag_descriptions::kCupsIppPrintingBackendName, flag_descriptions::kCupsIppPrintingBackendDescription, kOsDesktop, -@@ -8426,7 +8456,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8414,7 +8443,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kCooperativeSchedulingDescription, kOsAll, FEATURE_VALUE_TYPE(features::kCooperativeScheduling)}, @@ -183,7 +182,7 @@ {"enable-network-service-sandbox", flag_descriptions::kEnableNetworkServiceSandboxName, flag_descriptions::kEnableNetworkServiceSandboxDescription, -@@ -8450,7 +8480,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8438,7 +8467,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(media::kV4L2FlatStatefulVideoDecoder)}, #endif @@ -192,7 +191,7 @@ {"enable-family-link-extensions-permissions", flag_descriptions:: kEnableExtensionsPermissionsForSupervisedUsersOnDesktopName, -@@ -9301,7 +9331,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9276,7 +9305,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(ash::features::kWallpaperPerDesk)}, #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -201,7 +200,7 @@ {"enable-get-all-screens-media", flag_descriptions::kGetAllScreensMediaName, flag_descriptions::kGetAllScreensMediaDescription, kOsCrOS | kOsLacros | kOsLinux, -@@ -9340,7 +9370,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9315,7 +9344,7 @@ const FeatureEntry kFeatureEntries[] = { #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -210,7 +209,7 @@ { "ui-debug-tools", flag_descriptions::kUIDebugToolsName, -@@ -9565,7 +9595,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9540,7 +9569,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -219,7 +218,7 @@ {"policy-indication-for-managed-default-search", flag_descriptions::kPolicyIndicationForManagedDefaultSearchName, flag_descriptions::kPolicyIndicationForManagedDefaultSearchDescription, -@@ -9905,7 +9935,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9878,7 +9907,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -228,7 +227,7 @@ {"media-session-enter-picture-in-picture", flag_descriptions::kMediaSessionEnterPictureInPictureName, flag_descriptions::kMediaSessionEnterPictureInPictureDescription, -@@ -10805,7 +10835,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10771,7 +10800,7 @@ const FeatureEntry kFeatureEntries[] = { kOsDesktop | kOsAndroid, FEATURE_VALUE_TYPE(features::kProcessPerSiteUpToMainFrameThreshold)}, @@ -237,7 +236,7 @@ {"camera-mic-effects", flag_descriptions::kCameraMicEffectsName, flag_descriptions::kCameraMicEffectsDescription, static_cast<unsigned short>(kOsMac | kOsWin | kOsLinux), -@@ -10843,7 +10873,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10809,7 +10838,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kSiteInstanceGroupsForDataUrls)}, #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -246,7 +245,7 @@ {"site-search-settings-policy", flag_descriptions::kSiteSearchSettingsPolicyName, flag_descriptions::kSiteSearchSettingsPolicyDescription, kOsAll, -@@ -10968,7 +10998,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10938,7 +10967,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kHideIncognitoMediaMetadataDescription, kOsAll, FEATURE_VALUE_TYPE(media::kHideIncognitoMediaMetadata)}, @@ -255,7 +254,7 @@ {"third-party-profile-management", flag_descriptions::kThirdPartyProfileManagementName, flag_descriptions::kThirdPartyProfileManagementDescription, -@@ -11011,7 +11041,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10981,7 +11010,7 @@ const FeatureEntry kFeatureEntries[] = { #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -264,7 +263,7 @@ {"enable-user-link-capturing-pwa", flag_descriptions::kDesktopPWAsUserLinkCapturingName, flag_descriptions::kDesktopPWAsUserLinkCapturingDescription, -@@ -11327,7 +11357,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -11271,7 +11300,7 @@ const FeatureEntry kFeatureEntries[] = { trusted_vault::kTrustedVaultFrequentDegradedRecoverabilityPolling)}, #endif @@ -273,7 +272,7 @@ {"restart-to-gain-access-to-keychain", flag_descriptions::kRestartToGainAccessToKeychainName, flag_descriptions::kRestartToGainAccessToKeychainDescription, -@@ -11990,7 +12020,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -11934,7 +11963,7 @@ const FeatureEntry kFeatureEntries[] = { kAuthenticateUsingUserConsentVerifierInteropApi)}, #endif @@ -282,12 +281,30 @@ {"sync-enable-bookmarks-in-transport-mode", flag_descriptions::kSyncEnableBookmarksInTransportModeName, flag_descriptions::kSyncEnableBookmarksInTransportModeDescription, -@@ -12016,7 +12046,7 @@ const FeatureEntry kFeatureEntries[] = { - "AutofillUploadCardRequestTimeout")}, +@@ -12010,7 +12039,7 @@ const FeatureEntry kFeatureEntries[] = { + #endif // BUILDFLAG(IS_WIN) + + #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + {"classify-url-on-process-response-event", + flag_descriptions::kClassifyUrlOnProcessResponseEventName, + flag_descriptions::kClassifyUrlOnProcessResponseEventDescription, +@@ -12019,7 +12048,7 @@ const FeatureEntry kFeatureEntries[] = { + #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - {"autofill-enable-amount-extraction-desktop", - flag_descriptions::kAutofillEnableAmountExtractionDesktopName, - flag_descriptions::kAutofillEnableAmountExtractionDesktopDescription, + {"tab-organization", flag_descriptions::kTabOrganizationName, + flag_descriptions::kTabOrganizationDescription, kOsDesktop, + FEATURE_VALUE_TYPE(features::kTabOrganization)}, +@@ -12058,7 +12087,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kLanguageDetectionAPIDescription, kOsAll, + FEATURE_VALUE_TYPE(blink::features::kLanguageDetectionAPI)}, + +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + {"supervised-profile-hide-guest", + flag_descriptions::kSupervisedProfileHideGuestName, + flag_descriptions::kSupervisedProfileHideGuestDescription, diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_browser__features.cc b/www/ungoogled-chromium/files/patch-chrome_browser_browser__features.cc index 692603803f17..cf64c0320fcd 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_browser__features.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_browser__features.cc @@ -1,4 +1,4 @@ ---- chrome/browser/browser_features.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/browser_features.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/browser_features.cc @@ -69,7 +69,7 @@ BASE_FEATURE(kClosedTabCache, BASE_FEATURE(kDestroyProfileOnBrowserClose, @@ -9,7 +9,7 @@ base::FEATURE_ENABLED_BY_DEFAULT); #else base::FEATURE_DISABLED_BY_DEFAULT); -@@ -316,7 +316,7 @@ BASE_FEATURE(kSandboxExternalProtocolBlockedWarning, +@@ -328,7 +328,7 @@ BASE_FEATURE(kSandboxExternalProtocolBlockedWarning, BASE_FEATURE(kSupportSearchSuggestionForPrerender2, "SupportSearchSuggestionForPrerender2", #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_browser__process__impl.cc b/www/ungoogled-chromium/files/patch-chrome_browser_browser__process__impl.cc index a5f09e3d6252..de0ac8b16c2f 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_browser__process__impl.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_browser__process__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/browser_process_impl.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/browser_process_impl.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/browser_process_impl.cc -@@ -230,7 +230,7 @@ +@@ -231,7 +231,7 @@ #include "chrome/browser/ui/profiles/profile_picker.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/error_reporting/chrome_js_error_report_processor.h" // nogncheck #endif -@@ -1282,7 +1282,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { +@@ -1280,7 +1280,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { ApplyMetricsReportingPolicy(); @@ -18,7 +18,7 @@ ChromeJsErrorReportProcessor::Create(); #endif -@@ -1600,7 +1600,7 @@ void BrowserProcessImpl::Unpin() { +@@ -1594,7 +1594,7 @@ void BrowserProcessImpl::Unpin() { // Mac is currently not supported. // TODO(crbug.com/40118868): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_browser__process__impl.h b/www/ungoogled-chromium/files/patch-chrome_browser_browser__process__impl.h index 53fb58bce709..38130a62f7e8 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_browser__process__impl.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_browser__process__impl.h @@ -1,6 +1,6 @@ ---- chrome/browser/browser_process_impl.h.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/browser_process_impl.h.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/browser_process_impl.h -@@ -400,7 +400,7 @@ class BrowserProcessImpl : public BrowserProcess, +@@ -396,7 +396,7 @@ class BrowserProcessImpl : public BrowserProcess, // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc index 77075f8b92af..ccaefb9f8343 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_interface_binders.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/chrome_browser_interface_binders.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/chrome_browser_interface_binders.cc -@@ -133,12 +133,12 @@ +@@ -127,12 +127,12 @@ #endif // BUILDFLAG(FULL_SAFE_BROWSING) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -15,7 +15,7 @@ #include "chrome/browser/ui/webui/app_settings/web_app_settings_ui.h" #include "ui/webui/resources/cr_components/app_management/app_management.mojom.h" #endif -@@ -226,7 +226,7 @@ +@@ -219,7 +219,7 @@ #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -24,7 +24,7 @@ #include "chrome/browser/companion/visual_query/visual_query_suggestions_service_factory.h" #include "chrome/browser/ui/web_applications/sub_apps_service_impl.h" #include "chrome/browser/ui/webui/discards/discards.mojom.h" -@@ -237,7 +237,7 @@ +@@ -230,7 +230,7 @@ #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) @@ -33,16 +33,7 @@ #include "chrome/browser/ui/webui/whats_new/whats_new_ui.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -864,7 +864,7 @@ void BindScreen2xMainContentExtractor( - #endif - - #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ -- BUILDFLAG(IS_WIN) -+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - void BindVisualSuggestionsModelProvider( - content::RenderFrameHost* frame_host, - mojo::PendingReceiver< -@@ -1060,7 +1060,7 @@ void PopulateChromeFrameBinders( +@@ -1029,7 +1029,7 @@ void PopulateChromeFrameBinders( #endif // BUILDFLAG(ENABLE_SPEECH_SERVICE) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -51,7 +42,7 @@ if (base::FeatureList::IsEnabled(blink::features::kDesktopPWAsSubApps) && !render_frame_host->GetParentOrOuterDocument()) { // The service binder will reject non-primary main frames, but we still need -@@ -1158,7 +1158,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -1110,7 +1110,7 @@ void PopulateChromeWebUIFrameBinders( DataSharingInternalsUI>(map); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -60,7 +51,7 @@ RegisterWebUIControllerInterfaceBinder< connectors_internals::mojom::PageHandler, enterprise_connectors::ConnectorsInternalsUI>(map); -@@ -1169,7 +1169,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -1121,7 +1121,7 @@ void PopulateChromeWebUIFrameBinders( policy::DlpInternalsUI>(map); #endif @@ -69,7 +60,15 @@ RegisterWebUIControllerInterfaceBinder< app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map); #endif -@@ -1261,7 +1261,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -1207,14 +1207,14 @@ void PopulateChromeWebUIFrameBinders( + page_image_service::mojom::PageImageServiceHandler, HistoryUI, + HistoryClustersSidePanelUI, NewTabPageUI, BookmarksSidePanelUI>(map); + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + RegisterWebUIControllerInterfaceBinder<whats_new::mojom::PageHandlerFactory, + WhatsNewUI>(map); + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) RegisterWebUIControllerInterfaceBinder< browser_command::mojom::CommandHandlerFactory, @@ -78,7 +77,7 @@ WhatsNewUI, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) NewTabPageUI>(map); -@@ -1753,7 +1753,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -1701,7 +1701,7 @@ void PopulateChromeWebUIFrameBinders( #endif // BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main.cc b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main.cc index 01c26ca5fcb0..827e97e31b9a 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_main.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/chrome_browser_main.cc -@@ -251,15 +251,15 @@ +@@ -247,15 +247,15 @@ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -19,7 +19,7 @@ #include "base/nix/xdg_util.h" #endif -@@ -292,14 +292,14 @@ +@@ -288,14 +288,14 @@ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -36,7 +36,7 @@ #include "chrome/browser/headless/headless_mode_metrics.h" // nogncheck #include "chrome/browser/headless/headless_mode_util.h" // nogncheck #include "components/headless/select_file_dialog/headless_select_file_dialog.h" -@@ -371,14 +371,14 @@ +@@ -367,14 +367,14 @@ #endif // BUILDFLAG(IS_WIN) && BUILDFLAG(USE_BROWSER_SPELLCHECKER) #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -53,7 +53,7 @@ constexpr base::FilePath::CharType kMediaHistoryDatabaseName[] = FILE_PATH_LITERAL("Media History"); -@@ -543,7 +543,7 @@ void ProcessSingletonNotificationCallbackImpl( +@@ -539,7 +539,7 @@ void ProcessSingletonNotificationCallbackImpl( } #endif @@ -62,7 +62,7 @@ // Set the global activation token sent as a command line switch by another // browser process. This also removes the switch after use to prevent any side // effects of leaving it in the command line after this point. -@@ -1110,7 +1110,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1106,7 +1106,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { browser_creator_->AddFirstRunTabs(master_prefs_->new_tabs); } @@ -71,7 +71,7 @@ // Create directory for user-level Native Messaging manifest files. This // makes it less likely that the directory will be created by third-party // software with incorrect owner or permission. See crbug.com/725513 . -@@ -1158,7 +1158,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1154,7 +1154,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -80,7 +80,7 @@ metrics::DesktopSessionDurationTracker::Initialize(); ProfileActivityMetricsRecorder::Initialize(); TouchModeStatsTracker::Initialize( -@@ -1345,7 +1345,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* +@@ -1341,7 +1341,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* #endif // BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -89,7 +89,7 @@ // Delete the media history database if it still exists. // TODO(crbug.com/40177301): Remove this. base::ThreadPool::PostTask( -@@ -1394,7 +1394,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* +@@ -1390,7 +1390,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* *UrlLanguageHistogramFactory::GetForBrowserContext(profile)); #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -98,7 +98,7 @@ if (headless::IsHeadlessMode()) { headless::ReportHeadlessActionMetrics(); } -@@ -1506,7 +1506,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl( +@@ -1502,7 +1502,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl( // In headless mode provide alternate SelectFileDialog factory overriding // any platform specific SelectFileDialog implementation that may have been // set. @@ -107,7 +107,7 @@ if (headless::IsHeadlessMode()) { headless::HeadlessSelectFileDialogFactory::SetUp(); } -@@ -2052,7 +2052,7 @@ bool ChromeBrowserMainParts::ProcessSingletonNotificat +@@ -2046,7 +2046,7 @@ bool ChromeBrowserMainParts::ProcessSingletonNotificat // Drop the request if headless mode is in effect or the request is from // a headless Chrome process. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__content__browser__client.cc b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__content__browser__client.cc index 3714d53110e1..29baaca4bd97 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__content__browser__client.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__content__browser__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_content_browser_client.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -476,7 +476,7 @@ +@@ -487,7 +487,7 @@ #include "storage/browser/file_system/external_mount_points.h" // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ #include "chrome/browser/chrome_browser_main_linux.h" #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h" #elif BUILDFLAG(IS_ANDROID) -@@ -592,12 +592,12 @@ +@@ -604,12 +604,12 @@ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -24,7 +24,7 @@ #include "components/crash/core/app/crash_switches.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -608,7 +608,7 @@ +@@ -620,7 +620,7 @@ #include "chrome/browser/apps/link_capturing/web_app_link_capturing_delegate.h" #endif @@ -33,7 +33,7 @@ #include "chrome/browser/enterprise/chrome_browser_main_extra_parts_enterprise.h" #include "chrome/browser/enterprise/profile_management/oidc_auth_response_capture_navigation_throttle.h" #include "chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.h" -@@ -616,7 +616,7 @@ +@@ -628,7 +628,7 @@ #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -42,7 +42,7 @@ #include "chrome/browser/enterprise/connectors/device_trust/navigation_throttle.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || // BUILDFLAG(IS_CHROMEOS_ASH) -@@ -631,7 +631,7 @@ +@@ -643,7 +643,7 @@ #include "chrome/browser/ui/views/lens/lens_side_panel_navigation_helper.h" #endif @@ -51,7 +51,7 @@ #include "chrome/browser/chrome_browser_main_extra_parts_linux.h" #elif BUILDFLAG(IS_OZONE) #include "chrome/browser/chrome_browser_main_extra_parts_ozone.h" -@@ -1575,7 +1575,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre +@@ -1595,7 +1595,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre #if BUILDFLAG(IS_CHROMEOS) registry->RegisterBooleanPref(prefs::kNativeClientForceAllowed, false); #endif // BUILDFLAG(IS_CHROMEOS) @@ -60,7 +60,7 @@ registry->RegisterBooleanPref(prefs::kOutOfProcessSystemDnsResolutionEnabled, true); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) -@@ -1775,7 +1775,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1795,7 +1795,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo #elif BUILDFLAG(IS_CHROMEOS_LACROS) main_parts = std::make_unique<ChromeBrowserMainPartsLacros>( is_integration_test, &startup_data_); @@ -69,7 +69,7 @@ main_parts = std::make_unique<ChromeBrowserMainPartsLinux>( is_integration_test, &startup_data_); #elif BUILDFLAG(IS_ANDROID) -@@ -1809,7 +1809,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1829,7 +1829,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo std::make_unique<ChromeBrowserMainExtraPartsViewsLacros>()); // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -78,7 +78,7 @@ main_parts->AddParts( std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>()); #else -@@ -1830,7 +1830,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1850,7 +1850,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLacros>()); #endif @@ -87,7 +87,7 @@ main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>()); #elif BUILDFLAG(IS_OZONE) main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>()); -@@ -1849,7 +1849,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1869,7 +1869,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo chrome::AddMetricsExtraParts(main_parts.get()); @@ -95,8 +95,18 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) main_parts->AddParts( std::make_unique< - chrome::enterprise_util::ChromeBrowserMainExtraPartsEnterprise>()); -@@ -3045,7 +3045,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin + enterprise_util::ChromeBrowserMainExtraPartsEnterprise>()); +@@ -2743,7 +2743,9 @@ void MaybeAppendBlinkSettingsSwitchForFieldTrial( + void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( + base::CommandLine* command_line, + int child_process_id) { ++#ifdef notyet + crash_keys::AppendStringAnnotationsCommandLineSwitch(command_line); ++#endif + #if BUILDFLAG(IS_MAC) + std::unique_ptr<metrics::ClientInfo> client_info = + GoogleUpdateSettings::LoadMetricsClientInfo(); +@@ -3086,7 +3088,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin } } @@ -105,7 +115,7 @@ // Opt into a hardened stack canary mitigation if it hasn't already been // force-disabled. if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) { -@@ -4873,7 +4873,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst +@@ -4913,7 +4915,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst } } @@ -114,7 +124,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -5460,7 +5460,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5505,7 +5507,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati &throttles); } @@ -123,7 +133,7 @@ MaybeAddThrottle( WebAppSettingsNavigationThrottle::MaybeCreateThrottleFor(handle), &throttles); -@@ -5474,7 +5474,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5519,7 +5521,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -132,7 +142,7 @@ MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle:: MaybeCreateThrottleFor(handle), &throttles); -@@ -5505,7 +5505,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -5550,7 +5552,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati } #endif @@ -141,7 +151,7 @@ MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle:: MaybeCreateThrottleFor(handle), &throttles); -@@ -7364,7 +7364,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS +@@ -7440,7 +7442,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS bool ChromeContentBrowserClient::ShouldRunOutOfProcessSystemDnsResolution() { // This enterprise policy is supported on Android, but the feature will not be // launched there. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__content__browser__client.h b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__content__browser__client.h index b5a4aa5495c2..8d5f1f0daca7 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__content__browser__client.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__content__browser__client.h @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_content_browser_client.h.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/chrome_content_browser_client.h.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/chrome_content_browser_client.h -@@ -523,7 +523,7 @@ class ChromeContentBrowserClient : public content::Con +@@ -525,7 +525,7 @@ class ChromeContentBrowserClient : public content::Con bool IsPluginAllowedToUseDevChannelAPIs( content::BrowserContext* browser_context, const GURL& url) override; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc b/www/ungoogled-chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc index 3743f2498fd3..487dc859ad3a 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2024-09-03 20:46:48 UTC +--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/download/chrome_download_manager_delegate.cc -@@ -1724,7 +1724,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1734,7 +1734,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferredForFile( const base::FilePath& path) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -9,7 +9,7 @@ if (path.MatchesExtension(FILE_PATH_LITERAL(".pdf"))) { return !download_prefs_->ShouldOpenPdfInSystemReader(); } -@@ -1843,7 +1843,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow +@@ -1853,7 +1853,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow content::CheckDownloadAllowedCallback check_download_allowed_cb) { DCHECK_CURRENTLY_ON(BrowserThread::UI); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_download_download__prefs.cc b/www/ungoogled-chromium/files/patch-chrome_browser_download_download__prefs.cc index d35aef1f5389..e5d3f3edb980 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_download_download__prefs.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_download_download__prefs.cc @@ -1,4 +1,4 @@ ---- chrome/browser/download/download_prefs.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/download/download_prefs.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/download/download_prefs.cc @@ -11,6 +11,7 @@ #include <vector> @@ -46,7 +46,7 @@ registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false); #endif #if BUILDFLAG(IS_ANDROID) -@@ -458,7 +463,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens +@@ -460,7 +465,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; -@@ -490,7 +495,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons +@@ -492,7 +497,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(); -@@ -527,7 +532,7 @@ void DownloadPrefs::SaveAutoOpenState() { +@@ -529,7 +534,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; -@@ -679,7 +684,14 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa +@@ -681,7 +686,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/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_analysis_analysis__service__settings.cc b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_analysis_analysis__service__settings.cc index b2b53016a2e3..e480cbfaee91 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_analysis_analysis__service__settings.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_analysis_analysis__service__settings.cc @@ -1,6 +1,6 @@ ---- chrome/browser/enterprise/connectors/analysis/analysis_service_settings.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/enterprise/connectors/analysis/analysis_service_settings.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/enterprise/connectors/analysis/analysis_service_settings.cc -@@ -151,7 +151,7 @@ AnalysisServiceSettings::AnalysisServiceSettings( +@@ -150,7 +150,7 @@ AnalysisServiceSettings::AnalysisServiceSettings( const char* verification_key = kKeyWindowsVerification; #elif BUILDFLAG(IS_MAC) const char* verification_key = kKeyMacVerification; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc index 425c571847ce..ca76c0e3ca5a 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/enterprise/connectors/connectors_service.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/enterprise/connectors/connectors_service.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/enterprise/connectors/connectors_service.cc -@@ -525,7 +525,7 @@ bool ConnectorsService::ConnectorsEnabled() const { +@@ -530,7 +530,7 @@ bool ConnectorsService::ConnectorsEnabled() const { Profile* profile = Profile::FromBrowserContext(context_); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_browser_commands_key__rotation__command__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_browser_commands_key__rotation__command__factory.cc index 3d2f72124f6b..028a25ce8a04 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_browser_commands_key__rotation__command__factory.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_browser_commands_key__rotation__command__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/key_rotation_command_factory.cc.orig 2024-02-25 20:22:18 UTC +--- chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/key_rotation_command_factory.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/key_rotation_command_factory.cc -@@ -14,7 +14,7 @@ +@@ -18,7 +18,7 @@ #if BUILDFLAG(IS_WIN) #include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/win_key_rotation_command.h" @@ -9,12 +9,12 @@ #include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/linux_key_rotation_command.h" #elif BUILDFLAG(IS_MAC) #include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/mac_key_rotation_command.h" -@@ -47,7 +47,7 @@ std::unique_ptr<KeyRotationCommand> KeyRotationCommand - scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory) { +@@ -53,7 +53,7 @@ std::unique_ptr<KeyRotationCommand> KeyRotationCommand + policy::DeviceManagementService* device_management_service) { #if BUILDFLAG(IS_WIN) return std::make_unique<WinKeyRotationCommand>(); -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return std::make_unique<LinuxKeyRotationCommand>(url_loader_factory); #elif BUILDFLAG(IS_MAC) - return std::make_unique<MacKeyRotationCommand>(url_loader_factory); + if (IsDTCKeyRotationUploadedBySharedAPI()) { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_crash__reporting__context.cc b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_crash__reporting__context.cc index 8c616424ad1d..d010b0277043 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_crash__reporting__context.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_crash__reporting__context.cc @@ -1,6 +1,6 @@ ---- chrome/browser/enterprise/connectors/reporting/crash_reporting_context.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/enterprise/connectors/reporting/crash_reporting_context.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/enterprise/connectors/reporting/crash_reporting_context.cc -@@ -19,7 +19,7 @@ +@@ -20,7 +20,7 @@ namespace enterprise_connectors { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc index 37626f99f99b..68ce945541a9 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc.orig 2024-07-31 14:19:23 UTC +--- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc -@@ -58,7 +58,7 @@ +@@ -59,7 +59,7 @@ #include "base/strings/utf_string_conversions.h" #endif @@ -9,8 +9,8 @@ #include "chrome/browser/enterprise/signals/signals_aggregator_factory.h" #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h" #include "components/device_signals/core/browser/signals_aggregator.h" -@@ -133,7 +133,7 @@ void UploadSecurityEventReport(base::Value::Dict event - std::move(upload_callback)); +@@ -144,7 +144,7 @@ void UploadSecurityEventReport(base::Value::Dict event + std::move(report), std::move(upload_callback)); } -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.h b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.h index 338566ece670..a379ecc4c2f3 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_enterprise_connectors_reporting_realtime__reporting__client.h @@ -1,6 +1,6 @@ ---- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.h.orig 2023-10-13 13:20:35 UTC +--- chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.h.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.h -@@ -16,7 +16,7 @@ +@@ -17,7 +17,7 @@ #include "components/keyed_service/core/keyed_service.h" #include "components/policy/core/common/cloud/cloud_policy_client.h" @@ -9,7 +9,7 @@ #include "components/device_signals/core/browser/signals_types.h" #endif -@@ -184,7 +184,7 @@ class RealtimeReportingClient : public KeyedService, +@@ -165,7 +165,7 @@ class RealtimeReportingClient : public KeyedService, base::WeakPtrFactory<RealtimeReportingClient> weak_ptr_factory_{this}; }; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_BUILD.gn b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_BUILD.gn index 390cb29ea4ec..1762d476f865 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/BUILD.gn.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/extensions/BUILD.gn.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/extensions/BUILD.gn -@@ -1508,6 +1508,10 @@ source_set("extensions") { +@@ -1530,6 +1530,10 @@ source_set("extensions") { deps += [ "//chrome/services/printing/public/mojom" ] } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_api__browser__context__keyed__service__factories.cc b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_api__browser__context__keyed__service__factories.cc index 171ee31577bd..67b9c1057884 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_api__browser__context__keyed__service__factories.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_api__browser__context__keyed__service__factories.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc.orig 2024-07-31 14:19:23 UTC +--- chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc -@@ -44,7 +44,7 @@ +@@ -43,7 +43,7 @@ #include "pdf/buildflags.h" #include "printing/buildflags/buildflags.h" @@ -9,7 +9,7 @@ #include "chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.h" #endif -@@ -119,7 +119,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt +@@ -118,7 +118,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt extensions::SettingsPrivateEventRouterFactory::GetInstance(); extensions::SettingsOverridesAPI::GetFactoryInstance(); extensions::SidePanelService::GetFactoryInstance(); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc index af1f5d73e4de..74dca98b87de 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig 2024-05-23 20:04:36 UTC +--- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc -@@ -33,7 +33,7 @@ +@@ -38,7 +38,7 @@ #include "components/reporting/util/statusor.h" #endif @@ -9,7 +9,7 @@ #include <optional> #include "base/strings/string_util.h" -@@ -107,7 +107,7 @@ api::enterprise_reporting_private::ContextInfo ToConte +@@ -112,7 +112,7 @@ api::enterprise_reporting_private::ContextInfo ToConte return info; } @@ -18,7 +18,7 @@ device_signals::SignalsAggregationRequest CreateAggregationRequest( device_signals::SignalName signal_name) { -@@ -168,7 +168,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction:: +@@ -174,7 +174,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction:: // getPersistentSecret @@ -27,7 +27,7 @@ EnterpriseReportingPrivateGetPersistentSecretFunction:: EnterpriseReportingPrivateGetPersistentSecretFunction() = default; -@@ -594,7 +594,7 @@ void EnterpriseReportingPrivateEnqueueRecordFunction:: +@@ -600,7 +600,7 @@ void EnterpriseReportingPrivateEnqueueRecordFunction:: } #endif diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc index 87a78088204a..e4e1c6e8ddcc 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -203,7 +203,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -202,7 +202,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist (*s_allowlist)[tab_groups::prefs::kAutoPinNewTabGroups] = settings_api::PrefType::kBoolean; @@ -9,7 +9,7 @@ (*s_allowlist)[::prefs::kUseCustomChromeFrame] = settings_api::PrefType::kBoolean; #endif -@@ -215,7 +215,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -214,7 +214,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist (*s_allowlist)[::prefs::kCurrentThemeID] = settings_api::PrefType::kString; (*s_allowlist)[::prefs::kPinnedActions] = settings_api::PrefType::kList; (*s_allowlist)[::prefs::kPolicyThemeColor] = settings_api::PrefType::kNumber; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_tabs_tabs__api.cc b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_tabs_tabs__api.cc index 05c2fd93e9ae..bc92b799fc40 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_tabs_tabs__api.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_tabs_tabs__api.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/tabs/tabs_api.cc.orig 2024-07-31 14:19:23 UTC +--- chrome/browser/extensions/api/tabs/tabs_api.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/extensions/api/tabs/tabs_api.cc -@@ -868,7 +868,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio +@@ -867,7 +867,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio // minimized. // TODO(crbug.com/40254339): Remove this workaround when linux is fixed. // TODO(crbug.com/40254339): Find a fix for wayland as well. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc index 03afa4456d9f..d00d884d6f1c 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/extensions/api/webstore_private/webstore_private_api.cc -@@ -898,7 +898,7 @@ void WebstorePrivateBeginInstallWithManifest3Function: +@@ -903,7 +903,7 @@ void WebstorePrivateBeginInstallWithManifest3Function: #if BUILDFLAG(IS_CHROMEOS) RequestExtensionApproval(contents); return; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc b/www/ungoogled-chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc index b89d750f3b29..517e22a0b01c 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc @@ -1,6 +1,6 @@ ---- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2024-07-31 14:19:23 UTC +--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc -@@ -317,7 +317,7 @@ const struct { +@@ -320,7 +320,7 @@ const struct { FILE_PATH_LITERAL("Library/Mobile Documents/com~apple~CloudDocs"), kDontBlockChildren}, #endif diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.cc b/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.cc index d420126cee8d..e0c999e2d8ce 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.cc @@ -1,6 +1,6 @@ ---- chrome/browser/flag_descriptions.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/flag_descriptions.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/flag_descriptions.cc -@@ -419,7 +419,7 @@ const char kIsolatedSandboxedIframesDescription[] = +@@ -464,7 +464,7 @@ const char kIsolatedSandboxedIframesDescription[] = "grouping when enabled is per-site."; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ const char kAutofillEnableAmountExtractionDesktopName[] = "Enable checkout amount extraction on Chrome desktop"; const char kAutofillEnableAmountExtractionDesktopDescription[] = -@@ -856,7 +856,7 @@ const char kDevicePostureDescription[] = +@@ -909,7 +909,7 @@ const char kDevicePostureDescription[] = "Enables Device Posture API (foldable devices)"; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -18,7 +18,7 @@ const char kDocumentPictureInPictureAnimateResizeName[] = "Document Picture-in-Picture Animate Resize"; const char kDocumentPictureInPictureAnimateResizeDescription[] = -@@ -3054,7 +3054,7 @@ const char kCbdTimeframeRequiredDescription[] = +@@ -3134,7 +3134,7 @@ const char kCbdTimeframeRequiredDescription[] = "value to the list."; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -27,7 +27,7 @@ const char kPolicyIndicationForManagedDefaultSearchName[] = "Enable policy indication for managed Default Search provider"; const char kPolicyIndicationForManagedDefaultSearchDescription[] = -@@ -3389,7 +3389,7 @@ const char kShowAutofillTypePredictionsDescription[] = +@@ -3476,7 +3476,7 @@ const char kShowAutofillTypePredictionsDescription[] = "text."; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -36,7 +36,7 @@ const char kShowFeaturedEnterpriseSiteSearchName[] = "Show featured Enterprise site search engines in Omnibox"; const char kShowFeaturedEnterpriseSiteSearchDescription[] = -@@ -3426,7 +3426,7 @@ const char kSiteInstanceGroupsForDataUrlsDescription[] +@@ -3513,7 +3513,7 @@ const char kSiteInstanceGroupsForDataUrlsDescription[] "but in the same SiteInstanceGroup, and thus the same process."; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -45,7 +45,7 @@ const char kSiteSearchSettingsPolicyName[] = "Enable SiteSearchSettings policy"; const char kSiteSearchSettingsPolicyDescription[] = "Allow site search engines to be defined by the SiteSearchSettings policy."; -@@ -7873,7 +7873,7 @@ const char kLacrosMergeIcuDataFileDescription[] = +@@ -7954,7 +7954,7 @@ const char kLacrosMergeIcuDataFileDescription[] = "Enables sharing common areas of icudtl.dat between Ash and Lacros."; #endif // #if BUILDFLAG(IS_CHROMEOS_LACROS) @@ -54,7 +54,7 @@ const char kGetAllScreensMediaName[] = "GetAllScreensMedia API"; const char kGetAllScreensMediaDescription[] = "When enabled, the getAllScreensMedia API for capturing multiple screens " -@@ -8130,7 +8130,7 @@ const char kV4L2FlatStatefulVideoDecoderDescription[] +@@ -8202,7 +8202,7 @@ const char kV4L2FlatStatefulVideoDecoderDescription[] // Linux ----------------------------------------------------------------------- @@ -63,10 +63,10 @@ const char kOzonePlatformHintChoiceDefault[] = "Default"; const char kOzonePlatformHintChoiceAuto[] = "Auto"; const char kOzonePlatformHintChoiceX11[] = "X11"; -@@ -8160,6 +8160,18 @@ const char kSimplifiedTabDragUIDescription[] = - const char kWaylandPerWindowScalingName[] = "Wayland per-window scaling"; - const char kWaylandPerWindowScalingDescription[] = - "Enable Wayland's per-window scaling experimental support."; +@@ -8235,6 +8235,18 @@ const char kWaylandPerWindowScalingDescription[] = + const char kWaylandTextInputV3Name[] = "Wayland text-input-v3"; + const char kWaylandTextInputV3Description[] = + "Enable Wayland's text-input-v3 experimental support."; + +#if BUILDFLAG(IS_BSD) +const char kAudioBackendName[] = @@ -82,7 +82,7 @@ #endif // BUILDFLAG(IS_LINUX) // All views-based platforms -------------------------------------------------- -@@ -8186,14 +8198,14 @@ const char kZeroCopyVideoCaptureDescription[] = +@@ -8261,14 +8273,14 @@ const char kZeroCopyVideoCaptureDescription[] = #endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -99,7 +99,7 @@ const char kEnableNetworkServiceSandboxName[] = "Enable the network service sandbox."; const char kEnableNetworkServiceSandboxDescription[] = -@@ -8225,7 +8237,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti +@@ -8300,7 +8312,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti "Bluetooth"; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) @@ -108,7 +108,7 @@ const char kSkipUndecryptablePasswordsName[] = "Skip undecryptable passwords to use the available decryptable " "passwords."; -@@ -8379,7 +8391,7 @@ const char kElementCaptureDescription[] = +@@ -8454,7 +8466,7 @@ const char kElementCaptureDescription[] = #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -117,7 +117,7 @@ const char kUIDebugToolsName[] = "Debugging tools for UI"; const char kUIDebugToolsDescription[] = "Enables additional keyboard shortcuts to help debugging."; -@@ -8453,7 +8465,7 @@ const char kAutofillCaretExtractionDescription[] = +@@ -8528,7 +8540,7 @@ const char kAutofillCaretExtractionDescription[] = "Enables passing caret position via Autofill"; #endif // BUILDFLAG(ENABLE_COMPOSE) @@ -126,3 +126,12 @@ const char kThirdPartyProfileManagementName[] = "Third party profile management"; const char kThirdPartyProfileManagementDescription[] = +@@ -8617,7 +8629,7 @@ const char kEnableCertManagementV2UIDescription[] = + "chrome://settings/certificates"; + #endif // BUILDFLAG(CHROME_ROOT_STORE_CERT_MANAGEMENT_UI) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + const char kSupervisedProfileHideGuestName[] = "Supervised Profile Hide Guest"; + const char kSupervisedProfileHideGuestDescription[] = + "Hides Guest Profile entry points for supervised users"; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.h b/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.h index 948d7aa3b65f..be0c68a6354d 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.h @@ -1,6 +1,6 @@ ---- chrome/browser/flag_descriptions.h.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/flag_descriptions.h.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/flag_descriptions.h -@@ -273,7 +273,7 @@ extern const char kImageDescriptionsAlternateRoutingNa +@@ -299,7 +299,7 @@ extern const char kImageDescriptionsAlternateRoutingNa extern const char kImageDescriptionsAlternateRoutingDescription[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ extern const char kAutofillEnableAmountExtractionDesktopName[]; extern const char kAutofillEnableAmountExtractionDesktopDescription[]; #endif -@@ -660,7 +660,7 @@ extern const char kDevicePostureName[]; +@@ -694,7 +694,7 @@ extern const char kDevicePostureName[]; extern const char kDevicePostureDescription[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -18,7 +18,7 @@ extern const char kDocumentPictureInPictureAnimateResizeName[]; extern const char kDocumentPictureInPictureAnimateResizeDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || -@@ -1767,7 +1767,7 @@ extern const char kCbdTimeframeRequiredName[]; +@@ -1808,7 +1808,7 @@ extern const char kCbdTimeframeRequiredName[]; extern const char kCbdTimeframeRequiredDescription[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -27,7 +27,7 @@ extern const char kPolicyIndicationForManagedDefaultSearchName[]; extern const char kPolicyIndicationForManagedDefaultSearchDescription[]; #endif -@@ -1961,7 +1961,7 @@ extern const char kShowAutofillTypePredictionsName[]; +@@ -2006,7 +2006,7 @@ extern const char kShowAutofillTypePredictionsName[]; extern const char kShowAutofillTypePredictionsDescription[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -36,7 +36,7 @@ extern const char kShowFeaturedEnterpriseSiteSearchName[]; extern const char kShowFeaturedEnterpriseSiteSearchDescription[]; -@@ -1983,7 +1983,7 @@ extern const char kSiteInstanceGroupsForDataUrlsName[] +@@ -2028,7 +2028,7 @@ extern const char kSiteInstanceGroupsForDataUrlsName[] extern const char kSiteInstanceGroupsForDataUrlsDescription[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -45,7 +45,7 @@ extern const char kSiteSearchSettingsPolicyName[]; extern const char kSiteSearchSettingsPolicyDescription[]; -@@ -4560,7 +4560,7 @@ extern const char kLacrosMergeIcuDataFileName[]; +@@ -4607,7 +4607,7 @@ extern const char kLacrosMergeIcuDataFileName[]; extern const char kLacrosMergeIcuDataFileDescription[]; #endif // #if BUILDFLAG(IS_CHROMEOS_LACROS) @@ -54,7 +54,7 @@ extern const char kGetAllScreensMediaName[]; extern const char kGetAllScreensMediaDescription[]; #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -4708,7 +4708,7 @@ extern const char kV4L2FlatStatefulVideoDecoderDescrip +@@ -4753,7 +4753,7 @@ extern const char kV4L2FlatStatefulVideoDecoderDescrip // Linux --------------------------------------------------------------------- @@ -63,17 +63,17 @@ extern const char kOzonePlatformHintChoiceDefault[]; extern const char kOzonePlatformHintChoiceAuto[]; extern const char kOzonePlatformHintChoiceX11[]; -@@ -4727,6 +4727,9 @@ extern const char kSimplifiedTabDragUIDescription[]; +@@ -4775,6 +4775,9 @@ extern const char kWaylandPerWindowScalingDescription[ - extern const char kWaylandPerWindowScalingName[]; - extern const char kWaylandPerWindowScalingDescription[]; + extern const char kWaylandTextInputV3Name[]; + extern const char kWaylandTextInputV3Description[]; + +extern const char kAudioBackendName[]; +extern const char kAudioBackendDescription[]; #endif // BUILDFLAG(IS_LINUX) // All views-based platforms -------------------------------------------------- -@@ -4756,7 +4759,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa +@@ -4804,7 +4807,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa extern const char kWebBluetoothConfirmPairingSupportDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) @@ -82,7 +82,7 @@ extern const char kSkipUndecryptablePasswordsName[]; extern const char kSkipUndecryptablePasswordsDescription[]; -@@ -4775,13 +4778,13 @@ extern const char kScreenlockReauthPromoCardDescriptio +@@ -4823,13 +4826,13 @@ extern const char kScreenlockReauthPromoCardDescriptio #endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -98,7 +98,7 @@ extern const char kEnableNetworkServiceSandboxName[]; extern const char kEnableNetworkServiceSandboxDescription[]; -@@ -4880,7 +4883,7 @@ extern const char kElementCaptureDescription[]; +@@ -4928,7 +4931,7 @@ extern const char kElementCaptureDescription[]; #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -107,7 +107,7 @@ extern const char kUIDebugToolsName[]; extern const char kUIDebugToolsDescription[]; #endif -@@ -4934,7 +4937,7 @@ extern const char kAutofillCaretExtractionName[]; +@@ -4982,7 +4985,7 @@ extern const char kAutofillCaretExtractionName[]; extern const char kAutofillCaretExtractionDescription[]; #endif // BUILDFLAG(ENABLE_COMPOSE) @@ -116,3 +116,12 @@ extern const char kThirdPartyProfileManagementName[]; extern const char kThirdPartyProfileManagementDescription[]; +@@ -5038,7 +5041,7 @@ extern const char kEnableCertManagementV2UIName[]; + extern const char kEnableCertManagementV2UIDescription[]; + #endif // BUILDFLAG(CHROME_ROOT_STORE_CERT_MANAGEMENT_UI) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + extern const char kSupervisedProfileHideGuestName[]; + extern const char kSupervisedProfileHideGuestDescription[]; + diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_global__desktop__features.cc b/www/ungoogled-chromium/files/patch-chrome_browser_global__desktop__features.cc deleted file mode 100644 index 627965aa4c03..000000000000 --- a/www/ungoogled-chromium/files/patch-chrome_browser_global__desktop__features.cc +++ /dev/null @@ -1,19 +0,0 @@ ---- chrome/browser/global_desktop_features.cc.orig 2024-08-26 14:40:28 UTC -+++ chrome/browser/global_desktop_features.cc -@@ -45,14 +45,14 @@ void GlobalDesktopFeatures::ReplaceGlobalDesktopFeatur - } - - void GlobalDesktopFeatures::Init() { --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (user_education::features::IsWhatsNewV2()) { - whats_new_registry_ = CreateWhatsNewRegistry(); - } - #endif - } - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - std::unique_ptr<whats_new::WhatsNewRegistry> - GlobalDesktopFeatures::CreateWhatsNewRegistry() { - return whats_new::CreateWhatsNewRegistry(); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_global__features.cc b/www/ungoogled-chromium/files/patch-chrome_browser_global__features.cc new file mode 100644 index 000000000000..4f240547b456 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_global__features.cc @@ -0,0 +1,29 @@ +--- chrome/browser/global_features.cc.orig 2024-10-01 07:26:23 UTC ++++ chrome/browser/global_features.cc +@@ -10,7 +10,7 @@ + #include "build/build_config.h" + #include "chrome/browser/permissions/system/platform_handle.h" + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // This causes a gn error on Android builds, because gn does not understand + // buildflags, so we include it only on platforms where it is used. + #include "components/user_education/common/user_education_features.h" // nogncheck +@@ -49,7 +49,7 @@ void GlobalFeatures::ReplaceGlobalFeaturesForTesting( + + void GlobalFeatures::Init() { + system_permissions_platform_handle_ = CreateSystemPermissionsPlatformHandle(); +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (user_education::features::IsWhatsNewV2()) { + whats_new_registry_ = CreateWhatsNewRegistry(); + } +@@ -61,7 +61,7 @@ GlobalFeatures::CreateSystemPermissionsPlatformHandle( + return system_permission_settings::PlatformHandle::Create(); + } + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + std::unique_ptr<whats_new::WhatsNewRegistry> + GlobalFeatures::CreateWhatsNewRegistry() { + return whats_new::CreateWhatsNewRegistry(); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_global__desktop__features.h b/www/ungoogled-chromium/files/patch-chrome_browser_global__features.h index 1ffec98183e9..78aaf20cb30f 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_global__desktop__features.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_global__features.h @@ -1,36 +1,36 @@ ---- chrome/browser/global_desktop_features.h.orig 2024-08-26 14:40:28 UTC -+++ chrome/browser/global_desktop_features.h -@@ -9,7 +9,7 @@ - #include "build/build_config.h" - +--- chrome/browser/global_features.h.orig 2024-10-01 07:26:23 UTC ++++ chrome/browser/global_features.h +@@ -14,7 +14,7 @@ namespace system_permission_settings { + class PlatformHandle; + } // namespace system_permission_settings namespace whats_new { -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) class WhatsNewRegistry; #endif } // namespace whats_new -@@ -37,7 +37,7 @@ class GlobalDesktopFeatures { - // Public accessors for features, e.g. - // FooFeature* foo_feature() { return foo_feature_.get(); } - +@@ -45,7 +45,7 @@ class GlobalFeatures { + system_permissions_platform_handle() { + return system_permissions_platform_handle_.get(); + } -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) whats_new::WhatsNewRegistry* whats_new_registry() { return whats_new_registry_.get(); } -@@ -50,7 +50,7 @@ class GlobalDesktopFeatures { - // testing. e.g. - // virtual std::unique_ptr<FooFeature> CreateFooFeature(); +@@ -60,7 +60,7 @@ class GlobalFeatures { + virtual std::unique_ptr<system_permission_settings::PlatformHandle> + CreateSystemPermissionsPlatformHandle(); -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) virtual std::unique_ptr<whats_new::WhatsNewRegistry> CreateWhatsNewRegistry(); #endif -@@ -58,7 +58,7 @@ class GlobalDesktopFeatures { - // Features will each have a controller. e.g. - // std::unique_ptr<FooFeature> foo_feature_; +@@ -70,7 +70,7 @@ class GlobalFeatures { + std::unique_ptr<system_permission_settings::PlatformHandle> + system_permissions_platform_handle_; -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) std::unique_ptr<whats_new::WhatsNewRegistry> whats_new_registry_; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__posix.cc b/www/ungoogled-chromium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__posix.cc index 60e13f141bbb..8c5380d79346 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__posix.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__posix.cc @@ -1,6 +1,6 @@ ---- chrome/browser/media/router/discovery/discovery_network_list_posix.cc.orig 2022-10-01 07:40:07 UTC +--- chrome/browser/media/router/discovery/discovery_network_list_posix.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/media/router/discovery/discovery_network_list_posix.cc -@@ -5,11 +5,12 @@ +@@ -10,11 +10,12 @@ #include "chrome/browser/media/router/discovery/discovery_network_list.h" #include <ifaddrs.h> @@ -15,7 +15,7 @@ #include <algorithm> -@@ -18,7 +19,7 @@ +@@ -23,7 +24,7 @@ #include "chrome/browser/media/router/discovery/discovery_network_list_wifi.h" #include "net/base/net_errors.h" @@ -24,7 +24,7 @@ #include <netpacket/packet.h> #else #include <net/if_dl.h> -@@ -27,7 +28,7 @@ +@@ -32,7 +33,7 @@ namespace media_router { namespace { @@ -33,7 +33,7 @@ using sll = struct sockaddr_ll; #define SOCKET_ARP_TYPE(s) ((s)->sll_hatype) #define SOCKET_ADDRESS_LEN(s) ((s)->sll_halen) -@@ -38,6 +39,12 @@ using sll = struct sockaddr_dl; +@@ -43,6 +44,12 @@ using sll = struct sockaddr_dl; #define SOCKET_ARP_TYPE(s) ((s)->sdl_type) #define SOCKET_ADDRESS_LEN(s) ((s)->sdl_alen) #define SOCKET_ADDRESS(s) (LLADDR(s)) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc b/www/ungoogled-chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc index e4067a299d10..3048cb3c327d 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc @@ -1,6 +1,6 @@ ---- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/media/webrtc/webrtc_log_uploader.cc -@@ -101,7 +101,7 @@ std::string GetLogUploadProduct() { +@@ -106,7 +106,7 @@ std::string GetLogUploadProduct() { const char product[] = "Chrome_Mac"; // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc b/www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc index fd89a59e414a..80c6ed461d30 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc @@ -1,6 +1,6 @@ ---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2024-07-31 14:19:23 UTC +--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc -@@ -83,8 +83,10 @@ +@@ -88,8 +88,10 @@ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -12,7 +12,7 @@ #include "base/linux_util.h" #include "base/strings/string_split.h" -@@ -108,7 +110,7 @@ +@@ -113,7 +115,7 @@ #include "chromeos/crosapi/cpp/crosapi_constants.h" #endif // BUILDFLAG(IS_CHROMEOS_LACROS) @@ -21,7 +21,7 @@ #include "chrome/browser/metrics/pressure/pressure_metrics_reporter.h" #endif // BUILDFLAG(IS_LINUX) -@@ -117,7 +119,7 @@ +@@ -122,7 +124,7 @@ #include "components/user_manager/user_manager.h" #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -30,7 +30,7 @@ #include "components/power_metrics/system_power_monitor.h" #endif -@@ -864,7 +866,7 @@ void RecordStartupMetrics() { +@@ -869,7 +871,7 @@ void RecordStartupMetrics() { // Record whether Chrome is the default browser or not. // Disabled on Linux due to hanging browser tests, see crbug.com/1216328. @@ -39,7 +39,7 @@ shell_integration::DefaultWebClientState default_state = shell_integration::GetDefaultBrowser(); base::UmaHistogramEnumeration("DefaultBrowser.State", default_state, -@@ -1163,11 +1165,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt +@@ -1177,11 +1179,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt } #endif // !BUILDFLAG(IS_ANDROID) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_net_profile__network__context__service.cc b/www/ungoogled-chromium/files/patch-chrome_browser_net_profile__network__context__service.cc index 0a4a5f5beb9a..0399f6a989dd 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_net_profile__network__context__service.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_net_profile__network__context__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/net/profile_network_context_service.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/net/profile_network_context_service.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/net/profile_network_context_service.cc -@@ -139,7 +139,7 @@ +@@ -137,7 +137,7 @@ #include "chromeos/startup/browser_params_proxy.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/enterprise/client_certificates/certificate_provisioning_service_factory.h" #include "components/enterprise/client_certificates/core/certificate_provisioning_service.h" #include "components/enterprise/client_certificates/core/client_certificates_service.h" -@@ -259,7 +259,7 @@ void UpdateCookieSettings(Profile* profile, ContentSet +@@ -257,7 +257,7 @@ void UpdateCookieSettings(Profile* profile, ContentSet }); } @@ -18,7 +18,7 @@ std::unique_ptr<net::ClientCertStore> GetWrappedCertStore( Profile* profile, std::unique_ptr<net::ClientCertStore> platform_store) { -@@ -938,7 +938,7 @@ ProfileNetworkContextService::CreateClientCertStore() +@@ -974,7 +974,7 @@ ProfileNetworkContextService::CreateClientCertStore() store = std::make_unique<ClientCertStoreLacros>( std::move(certificate_provider), cert_db_initializer, std::move(store)); #endif // BUILDFLAG(IS_CHROMEOS_LACROS) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_net_system__network__context__manager.cc b/www/ungoogled-chromium/files/patch-chrome_browser_net_system__network__context__manager.cc index 3a8b8c54fb1e..ec8fba14bf0f 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_net_system__network__context__manager.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_net_system__network__context__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/net/system_network_context_manager.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/net/system_network_context_manager.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/net/system_network_context_manager.cc -@@ -96,7 +96,7 @@ +@@ -101,7 +101,7 @@ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ #include "chrome/common/chrome_paths_internal.h" #include "chrome/grit/branded_strings.h" #include "ui/base/l10n/l10n_util.h" -@@ -140,7 +140,7 @@ SystemNetworkContextManager* g_system_network_context_ +@@ -145,7 +145,7 @@ SystemNetworkContextManager* g_system_network_context_ // received a failed launch for a sandboxed network service. bool g_previously_failed_to_launch_sandboxed_service = false; @@ -18,7 +18,7 @@ // Whether kerberos library loading will work in the network service due to the // sandbox. bool g_network_service_will_allow_gssapi_library_load = false; -@@ -148,7 +148,7 @@ bool g_network_service_will_allow_gssapi_library_load +@@ -153,7 +153,7 @@ bool g_network_service_will_allow_gssapi_library_load const char* kGssapiDesiredPref = #if BUILDFLAG(IS_CHROMEOS) prefs::kKerberosEnabled; @@ -27,7 +27,7 @@ prefs::kReceivedHttpAuthNegotiateHeader; #endif #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -194,7 +194,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut +@@ -199,7 +199,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut auth_dynamic_params->basic_over_http_enabled = local_state->GetBoolean(prefs::kBasicAuthOverHttpEnabled); @@ -36,7 +36,7 @@ auth_dynamic_params->delegate_by_kdc_policy = local_state->GetBoolean(prefs::kAuthNegotiateDelegateByKdcPolicy); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -209,7 +209,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut +@@ -214,7 +214,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut local_state->GetString(prefs::kAuthAndroidNegotiateAccountType); #endif // BUILDFLAG(IS_ANDROID) @@ -45,7 +45,7 @@ auth_dynamic_params->allow_gssapi_library_load = local_state->GetBoolean(kGssapiDesiredPref); #endif // BUILDFLAG(IS_CHROMEOS) -@@ -219,7 +219,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut +@@ -224,7 +224,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut void OnNewHttpAuthDynamicParams( network::mojom::HttpAuthDynamicParamsPtr& params) { @@ -54,7 +54,7 @@ // The kerberos library is incompatible with the network service sandbox, so // if library loading is now enabled, the network service needs to be // restarted. It will be restarted unsandboxed because is -@@ -261,11 +261,11 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() +@@ -266,11 +266,11 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() if (g_previously_failed_to_launch_sandboxed_service) { return NetworkSandboxState::kDisabledBecauseOfFailedLaunch; } @@ -68,7 +68,7 @@ // The network service sandbox and the kerberos library are incompatible. // If kerberos is enabled by policy, disable the network service sandbox. if (g_network_service_will_allow_gssapi_library_load || -@@ -281,7 +281,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() +@@ -286,7 +286,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() } #endif // BUILDFLAG(IS_WIN) @@ -77,7 +77,7 @@ if (local_state && local_state->HasPrefPath(prefs::kNetworkServiceSandboxEnabled)) { return local_state->GetBoolean(prefs::kNetworkServiceSandboxEnabled) -@@ -511,7 +511,7 @@ void SystemNetworkContextManager::DeleteInstance() { +@@ -516,7 +516,7 @@ void SystemNetworkContextManager::DeleteInstance() { g_system_network_context_manager = nullptr; } @@ -86,7 +86,7 @@ SystemNetworkContextManager::GssapiLibraryLoadObserver:: GssapiLibraryLoadObserver(SystemNetworkContextManager* owner) : owner_(owner) {} -@@ -569,7 +569,7 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -574,7 +574,7 @@ SystemNetworkContextManager::SystemNetworkContextManag pref_change_registrar_.Add(prefs::kAllHttpAuthSchemesAllowedForOrigins, auth_pref_callback); @@ -95,7 +95,7 @@ pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy, auth_pref_callback); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -583,7 +583,7 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -588,7 +588,7 @@ SystemNetworkContextManager::SystemNetworkContextManag auth_pref_callback); #endif // BUILDFLAG(IS_ANDROID) @@ -104,7 +104,7 @@ pref_change_registrar_.Add(kGssapiDesiredPref, auth_pref_callback); #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -653,7 +653,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -658,7 +658,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe registry->RegisterBooleanPref(prefs::kKerberosEnabled, false); #endif // BUILDFLAG(IS_CHROMEOS_LACROS) @@ -113,7 +113,7 @@ registry->RegisterBooleanPref(prefs::kAuthNegotiateDelegateByKdcPolicy, false); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -678,11 +678,11 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -683,11 +683,11 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe registry->RegisterListPref(prefs::kExplicitlyAllowedNetworkPorts); @@ -127,7 +127,7 @@ registry->RegisterBooleanPref(prefs::kReceivedHttpAuthNegotiateHeader, false); #endif // BUILDFLAG(IS_LINUX) -@@ -735,7 +735,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea +@@ -740,7 +740,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea OnNewHttpAuthDynamicParams(http_auth_dynamic_params); network_service->ConfigureHttpAuthPrefs(std::move(http_auth_dynamic_params)); @@ -136,7 +136,7 @@ gssapi_library_loader_observer_.Install(network_service); #endif // BUILDFLAG(IS_LINUX) -@@ -950,7 +950,7 @@ bool SystemNetworkContextManager::IsNetworkSandboxEnab +@@ -955,7 +955,7 @@ bool SystemNetworkContextManager::IsNetworkSandboxEnab break; } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_new__tab__page_new__tab__page__util.cc b/www/ungoogled-chromium/files/patch-chrome_browser_new__tab__page_new__tab__page__util.cc index dc3028ad57a1..cffcf1fb3fdc 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_new__tab__page_new__tab__page__util.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_new__tab__page_new__tab__page__util.cc @@ -1,6 +1,6 @@ ---- chrome/browser/new_tab_page/new_tab_page_util.cc.orig 2024-02-25 20:22:18 UTC +--- chrome/browser/new_tab_page/new_tab_page_util.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/new_tab_page/new_tab_page_util.cc -@@ -20,7 +20,7 @@ bool IsOsSupportedForCart() { +@@ -24,7 +24,7 @@ bool IsOsSupportedForCart() { } bool IsOsSupportedForDrive() { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_notifications_notification__platform__bridge__delegator.cc b/www/ungoogled-chromium/files/patch-chrome_browser_notifications_notification__platform__bridge__delegator.cc index b07d1a108822..9ff69869a4ad 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_notifications_notification__platform__bridge__delegator.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_notifications_notification__platform__bridge__delegator.cc @@ -1,6 +1,6 @@ ---- chrome/browser/notifications/notification_platform_bridge_delegator.cc.orig 2022-10-01 07:40:07 UTC +--- chrome/browser/notifications/notification_platform_bridge_delegator.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/notifications/notification_platform_bridge_delegator.cc -@@ -57,7 +57,7 @@ bool SystemNotificationsEnabled(Profile* profile) { +@@ -56,7 +56,7 @@ bool SystemNotificationsEnabled(Profile* profile) { #elif BUILDFLAG(IS_WIN) return NotificationPlatformBridgeWin::SystemNotificationEnabled(); #else diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc b/www/ungoogled-chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc index 8ac641d0ecc3..af70b00eedbe 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/password_manager/chrome_password_manager_client.cc -@@ -559,7 +559,7 @@ void ChromePasswordManagerClient:: +@@ -556,7 +556,7 @@ void ChromePasswordManagerClient:: bool ChromePasswordManagerClient::IsReauthBeforeFillingRequired( device_reauth::DeviceAuthenticator* authenticator) { @@ -9,7 +9,7 @@ if (!GetLocalStatePrefs() || !GetPrefs() || !authenticator) { return false; } -@@ -797,7 +797,7 @@ void ChromePasswordManagerClient::NotifyUserCredential +@@ -794,7 +794,7 @@ void ChromePasswordManagerClient::NotifyUserCredential } void ChromePasswordManagerClient::NotifyKeychainError() { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc b/www/ungoogled-chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc index 0abc14a5dfa5..7b87340f1fb2 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc @@ -1,6 +1,6 @@ ---- chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc -@@ -50,7 +50,7 @@ +@@ -53,7 +53,7 @@ #include "chrome/browser/policy/browser_dm_token_storage_mac.h" #endif // BUILDFLAG(IS_MAC) @@ -9,7 +9,7 @@ #include "chrome/browser/policy/browser_dm_token_storage_linux.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -59,7 +59,7 @@ +@@ -62,7 +62,7 @@ #include "chrome/install_static/install_util.h" #endif // BUILDFLAG(IS_WIN) @@ -18,7 +18,7 @@ #include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/device_trust_key_manager_impl.h" #include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/key_rotation_launcher.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -@@ -87,7 +87,7 @@ void ChromeBrowserCloudManagementControllerDesktop:: +@@ -93,7 +93,7 @@ void ChromeBrowserCloudManagementControllerDesktop:: #if BUILDFLAG(IS_MAC) storage_delegate = std::make_unique<BrowserDMTokenStorageMac>(); @@ -27,7 +27,7 @@ storage_delegate = std::make_unique<BrowserDMTokenStorageLinux>(); #elif BUILDFLAG(IS_WIN) storage_delegate = std::make_unique<BrowserDMTokenStorageWin>(); -@@ -255,7 +255,7 @@ ChromeBrowserCloudManagementControllerDesktop::CreateC +@@ -265,7 +265,7 @@ ChromeBrowserCloudManagementControllerDesktop::CreateC std::unique_ptr<enterprise_connectors::DeviceTrustKeyManager> ChromeBrowserCloudManagementControllerDesktop::CreateDeviceTrustKeyManager() { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc index 1d745fc723fc..75c16eda1cb9 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -234,19 +234,19 @@ +@@ -243,19 +243,19 @@ #include "components/spellcheck/browser/pref_names.h" #endif // BUILDFLAG(ENABLE_SPELLCHECK) @@ -23,7 +23,7 @@ #include "chrome/browser/privacy_sandbox/privacy_sandbox_policy_handler.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -@@ -260,13 +260,13 @@ +@@ -269,13 +269,13 @@ #endif // BUILDFLAG(ENTERPRISE_CLIENT_CERTIFICATES) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -39,7 +39,7 @@ #include "components/search_engines/site_search_policy_handler.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) -@@ -528,7 +528,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -540,7 +540,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = { key::kDefaultDirectSocketsSetting, prefs::kManagedDefaultDirectSocketsSetting, base::Value::Type::INTEGER }, @@ -48,7 +48,7 @@ { key::kDeletingUndecryptablePasswordsEnabled, password_manager::prefs::kDeletingUndecryptablePasswordsEnabled, base::Value::Type::BOOLEAN }, -@@ -855,13 +855,13 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -867,13 +867,13 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kManagedDefaultGeolocationSetting, base::Value::Type::INTEGER }, #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \ @@ -64,7 +64,7 @@ { key::kFullscreenAllowed, prefs::kFullscreenAllowed, base::Value::Type::BOOLEAN }, -@@ -1689,7 +1689,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1698,7 +1698,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::LIST }, #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -73,7 +73,7 @@ { key::kGSSAPILibraryName, prefs::kGSSAPILibraryName, base::Value::Type::STRING }, -@@ -1746,7 +1746,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1755,7 +1755,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_WIN) @@ -82,7 +82,7 @@ { key::kNetworkServiceSandboxEnabled, prefs::kNetworkServiceSandboxEnabled, base::Value::Type::BOOLEAN }, -@@ -1772,17 +1772,17 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1781,17 +1781,17 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kTotalMemoryLimitMb, base::Value::Type::INTEGER }, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -103,7 +103,7 @@ { key::kDefaultBrowserSettingEnabled, prefs::kDefaultBrowserSettingEnabled, base::Value::Type::BOOLEAN }, -@@ -1794,7 +1794,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1803,7 +1803,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) \ @@ -112,7 +112,7 @@ { key::kAutoplayAllowed, prefs::kAutoplayAllowed, base::Value::Type::BOOLEAN }, -@@ -1892,7 +1892,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1901,7 +1901,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS) @@ -121,7 +121,7 @@ { key::kAlternativeBrowserPath, browser_switcher::prefs::kAlternativeBrowserPath, base::Value::Type::STRING }, -@@ -2003,7 +2003,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2015,7 +2015,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::LIST }, #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -130,7 +130,7 @@ { key::kAuthNegotiateDelegateByKdcPolicy, prefs::kAuthNegotiateDelegateByKdcPolicy, base::Value::Type::BOOLEAN }, -@@ -2082,7 +2082,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2094,7 +2094,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = ash::prefs::kUrlParameterToAutofillSAMLUsername, base::Value::Type::STRING }, #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -139,7 +139,7 @@ { key::kTabDiscardingExceptions, performance_manager::user_tuning::prefs::kManagedTabDiscardingExceptions, base::Value::Type::LIST }, -@@ -2111,7 +2111,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2123,7 +2123,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kUiAutomationProviderEnabled, base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_WIN) @@ -148,7 +148,7 @@ { key::kOutOfProcessSystemDnsResolutionEnabled, prefs::kOutOfProcessSystemDnsResolutionEnabled, base::Value::Type::BOOLEAN }, -@@ -2151,7 +2151,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -2163,7 +2163,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::INTEGER }, #endif #if BUILDFLAG(ENABLE_EXTENSIONS) @@ -157,16 +157,16 @@ { key::kExtensionInstallTypeBlocklist, extensions::pref_names::kExtensionInstallTypeBlocklist, base::Value::Type::LIST}, -@@ -2171,7 +2171,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = - optimization_guide::model_execution::prefs::kHistorySearchEnterprisePolicyAllowed, +@@ -2186,7 +2186,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + { key::kTabCompareSettings, + optimization_guide::prefs::kProductSpecificationsEnterprisePolicyAllowed, base::Value::Type::INTEGER}, - #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) { key::kChromeForTestingAllowed, prefs::kChromeForTestingAllowed, base::Value::Type::BOOLEAN }, -@@ -2303,7 +2303,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2322,7 +2322,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH // Policies for all platforms - End #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -175,7 +175,7 @@ handlers->AddHandler(std::make_unique<IntRangePolicyHandler>( key::kMemorySaverModeSavings, performance_manager::user_tuning::prefs::kMemorySaverModeAggressiveness, -@@ -2319,7 +2319,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2338,7 +2338,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH // BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -184,7 +184,7 @@ handlers->AddHandler( std::make_unique<SiteSearchPolicyHandler>(chrome_schema)); -@@ -2512,7 +2512,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2537,7 +2537,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -193,7 +193,7 @@ handlers->AddHandler( std::make_unique<enterprise_idle::IdleTimeoutPolicyHandler>()); handlers->AddHandler( -@@ -2564,7 +2564,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2590,7 +2590,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime, chrome_schema)); @@ -202,7 +202,7 @@ handlers->AddHandler(std::make_unique<LocalSyncPolicyHandler>()); handlers->AddHandler(std::make_unique<ThemeColorPolicyHandler>()); handlers->AddHandler( -@@ -2975,7 +2975,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -3012,7 +3012,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif #if BUILDFLAG(ENABLE_SPELLCHECK) @@ -211,7 +211,7 @@ handlers->AddHandler(std::make_unique<SpellcheckLanguagePolicyHandler>()); handlers->AddHandler( std::make_unique<SpellcheckLanguageBlocklistPolicyHandler>( -@@ -2983,7 +2983,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -3020,7 +3020,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) #endif // BUILDFLAG(ENABLE_SPELLCHECK) @@ -220,7 +220,7 @@ handlers->AddHandler(std::make_unique<SimplePolicyHandler>( key::kAllowSystemNotifications, prefs::kAllowSystemNotifications, base::Value::Type::BOOLEAN)); -@@ -3001,7 +3001,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -3038,7 +3038,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH first_party_sets::FirstPartySetsOverridesPolicyHandler>( key::kRelatedWebsiteSetsOverrides, chrome_schema))); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -229,7 +229,7 @@ handlers->AddHandler(std::make_unique<PrivacySandboxPolicyHandler>()); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -@@ -3024,7 +3024,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -3061,7 +3061,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH base::Value::Type::BOOLEAN))); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_prefs_browser__prefs.cc b/www/ungoogled-chromium/files/patch-chrome_browser_prefs_browser__prefs.cc index f993a2526241..74452f548c1d 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_prefs_browser__prefs.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_prefs_browser__prefs.cc @@ -1,6 +1,6 @@ ---- chrome/browser/prefs/browser_prefs.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/prefs/browser_prefs.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/prefs/browser_prefs.cc -@@ -311,7 +311,7 @@ +@@ -305,7 +305,7 @@ #include "components/user_notes/user_notes_prefs.h" #endif // BUILDFLAG(IS_ANDROID) @@ -9,7 +9,7 @@ #include "chrome/browser/ui/webui/whats_new/whats_new_ui.h" #endif -@@ -493,18 +493,18 @@ +@@ -485,18 +485,18 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -31,7 +31,7 @@ #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h" #endif -@@ -539,7 +539,7 @@ +@@ -531,7 +531,7 @@ #include "chrome/browser/sessions/session_service_log.h" #endif @@ -40,7 +40,7 @@ #include "ui/color/system_theme.h" #endif -@@ -1558,7 +1558,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) +@@ -1591,7 +1591,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) registry->RegisterIntegerPref(prefs::kLastWhatsNewVersion, 0); #endif // BUILDFLAG(IS_ANDROID) @@ -49,7 +49,7 @@ WhatsNewUI::RegisterLocalStatePrefs(registry); #endif -@@ -1731,7 +1731,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) +@@ -1765,7 +1765,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) #endif // BUILDFLAG(ENABLE_PDF) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -58,7 +58,7 @@ registry->RegisterBooleanPref(prefs::kChromeForTestingAllowed, true); #endif -@@ -2087,12 +2087,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync +@@ -2119,12 +2119,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc b/www/ungoogled-chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc index d5e95f25cd9c..5a53bc7ffd78 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc @@ -1,6 +1,6 @@ ---- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/prefs/pref_service_incognito_allowlist.cc -@@ -188,7 +188,7 @@ const char* const kPersistentPrefNames[] = { +@@ -196,7 +196,7 @@ const char* const kPersistentPrefNames[] = { prefs::kShowFullscreenToolbar, #endif diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_process__singleton__posix.cc b/www/ungoogled-chromium/files/patch-chrome_browser_process__singleton__posix.cc index ec9794175a49..dd9cc43cdd69 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_process__singleton__posix.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_process__singleton__posix.cc @@ -1,6 +1,6 @@ ---- chrome/browser/process_singleton_posix.cc.orig 2023-08-18 10:26:52 UTC +--- chrome/browser/process_singleton_posix.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/process_singleton_posix.cc -@@ -97,7 +97,7 @@ +@@ -102,7 +102,7 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/scoped_startup_resource_bundle.h" @@ -9,7 +9,7 @@ #include "chrome/browser/ui/process_singleton_dialog_linux.h" #endif -@@ -355,7 +355,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo +@@ -360,7 +360,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo if (g_disable_prompt) return g_user_opted_unlock_in_use_profile; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc b/www/ungoogled-chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc index 95b4f7b11417..7f2163fc4088 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc @@ -1,6 +1,6 @@ ---- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -341,7 +341,7 @@ +@@ -340,7 +340,7 @@ #include "chromeos/constants/chromeos_features.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/policy/messaging_layer/util/manual_test_heartbeat_event_factory.h" #endif -@@ -427,18 +427,18 @@ +@@ -426,18 +426,18 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -31,7 +31,7 @@ #include "chrome/browser/browser_switcher/browser_switcher_service_factory.h" #include "chrome/browser/enterprise/client_certificates/certificate_provisioning_service_factory.h" #include "chrome/browser/enterprise/client_certificates/certificate_store_factory.h" -@@ -680,7 +680,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -677,7 +677,7 @@ void ChromeBrowserMainExtraPartsProfiles:: DiceBoundSessionCookieServiceFactory::GetInstance(); #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) #endif // BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS) @@ -40,7 +40,7 @@ browser_switcher::BrowserSwitcherServiceFactory::GetInstance(); #endif browser_sync::UserEventServiceFactory::GetInstance(); -@@ -809,7 +809,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -812,7 +812,7 @@ void ChromeBrowserMainExtraPartsProfiles:: enterprise_connectors::ConnectorsServiceFactory::GetInstance(); #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -49,7 +49,7 @@ enterprise_connectors::DeviceTrustConnectorServiceFactory::GetInstance(); enterprise_connectors::DeviceTrustServiceFactory::GetInstance(); #endif -@@ -818,21 +818,21 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -821,21 +821,21 @@ void ChromeBrowserMainExtraPartsProfiles:: enterprise_connectors::ExtensionTelemetryEventRouterFactory::GetInstance(); #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -75,7 +75,7 @@ enterprise_signin::EnterpriseSigninServiceFactory::GetInstance(); #endif #if BUILDFLAG(ENABLE_SESSION_SERVICE) -@@ -965,7 +965,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -967,7 +967,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #endif // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -84,7 +84,7 @@ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance(); #endif -@@ -1067,7 +1067,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -1068,7 +1068,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #if BUILDFLAG(IS_CHROMEOS) policy::PolicyCertServiceFactory::GetInstance(); #endif @@ -93,7 +93,7 @@ policy::ProfileTokenPolicyWebSigninServiceFactory::GetInstance(); policy::UserPolicyOidcSigninServiceFactory::GetInstance(); #endif -@@ -1111,7 +1111,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -1113,7 +1113,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #if !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_ANDROID) ProfileStatisticsFactory::GetInstance(); #endif @@ -102,7 +102,7 @@ ProfileTokenWebSigninInterceptorFactory::GetInstance(); OidcAuthenticationSigninInterceptorFactory::GetInstance(); #endif -@@ -1127,7 +1127,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -1129,7 +1129,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #endif ReduceAcceptLanguageFactory::GetInstance(); RendererUpdaterFactory::GetInstance(); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_profiles_profile__impl.cc b/www/ungoogled-chromium/files/patch-chrome_browser_profiles_profile__impl.cc index b6ef7717f345..672af90e00a2 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_profiles_profile__impl.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_profiles_profile__impl.cc @@ -1,4 +1,4 @@ ---- chrome/browser/profiles/profile_impl.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/profiles/profile_impl.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/profiles/profile_impl.cc @@ -264,6 +264,10 @@ #include "chrome/browser/spellchecker/spellcheck_service.h" @@ -20,7 +20,7 @@ ProfileManager* profile_manager = g_browser_process->profile_manager(); ProfileAttributesEntry* entry = profile_manager->GetProfileAttributesStorage() -@@ -888,7 +892,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) +@@ -878,7 +882,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) } base::FilePath ProfileImpl::last_selected_directory() { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc b/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc index 79d7a2f640a5..1c764bea086a 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc @@ -1,4 +1,4 @@ ---- chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc @@ -18,7 +18,7 @@ #include "net/base/url_util.h" @@ -9,7 +9,7 @@ #include "chrome/browser/enterprise/connectors/analysis/local_binary_upload_service_factory.h" #endif -@@ -434,7 +434,7 @@ BinaryUploadService* BinaryUploadService::GetForProfil +@@ -436,7 +436,7 @@ BinaryUploadService* BinaryUploadService::GetForProfil Profile* profile, const enterprise_connectors::AnalysisSettings& settings) { // Local content analysis is supported only on desktop platforms. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_deep__scanning__utils.cc b/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_deep__scanning__utils.cc index 082c000e1978..03b25da7ae7a 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_deep__scanning__utils.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_deep__scanning__utils.cc @@ -1,4 +1,4 @@ ---- chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_utils.cc.orig 2024-07-31 14:19:23 UTC +--- chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_utils.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_utils.cc @@ -16,7 +16,7 @@ #include "components/crash/core/common/crash_key.h" @@ -9,7 +9,7 @@ #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h" #include "components/prefs/pref_service.h" #endif -@@ -416,7 +416,7 @@ std::string GetProfileEmail(Profile* profile) { +@@ -419,7 +419,7 @@ std::string GetProfileEmail(Profile* profile) { std::string email = GetProfileEmail(IdentityManagerFactory::GetForProfile(profile)); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc b/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc index ad3878fb614b..16e9521e4323 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc -@@ -697,7 +697,7 @@ void IncidentReportingService::OnEnvironmentDataCollec +@@ -698,7 +698,7 @@ void IncidentReportingService::OnEnvironmentDataCollec // Process::Current().CreationTime() is missing on some platforms. #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_screen__ai_screen__ai__service__router.cc b/www/ungoogled-chromium/files/patch-chrome_browser_screen__ai_screen__ai__service__router.cc index 869172082191..6322f2d0de7a 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_screen__ai_screen__ai__service__router.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_screen__ai_screen__ai__service__router.cc @@ -1,6 +1,6 @@ ---- chrome/browser/screen_ai/screen_ai_service_router.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/screen_ai/screen_ai_service_router.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/screen_ai/screen_ai_service_router.cc -@@ -293,7 +293,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() { +@@ -297,7 +297,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() { base::FilePath binary_path = state_instance->get_component_binary_path(); #if BUILDFLAG(IS_WIN) std::vector<base::FilePath> preload_libraries = {binary_path}; @@ -9,7 +9,7 @@ std::vector<std::string> extra_switches = { base::StringPrintf("--%s=%s", screen_ai::GetBinaryPathSwitch(), binary_path.MaybeAsASCII().c_str())}; -@@ -307,7 +307,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() { +@@ -311,7 +311,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() { .WithPreloadedLibraries( preload_libraries, content::ServiceProcessHostPreloadLibraries::GetPassKey()) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_sessions_session__restore.cc b/www/ungoogled-chromium/files/patch-chrome_browser_sessions_session__restore.cc index 27ed1eadfd9b..be2462688034 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_sessions_session__restore.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_sessions_session__restore.cc @@ -1,4 +1,4 @@ ---- chrome/browser/sessions/session_restore.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/sessions/session_restore.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/sessions/session_restore.cc @@ -99,7 +99,7 @@ #include "chrome/browser/web_applications/web_app_registrar.h" @@ -9,7 +9,7 @@ #include "chrome/browser/ui/webui/whats_new/whats_new_fetcher.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -1049,7 +1049,7 @@ class SessionRestoreImpl : public BrowserListObserver +@@ -1051,7 +1051,7 @@ class SessionRestoreImpl : public BrowserListObserver bool is_first_tab = true; for (const auto& startup_tab : startup_tabs) { const GURL& url = startup_tab.url; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_sharing_sharing__device__registration.cc b/www/ungoogled-chromium/files/patch-chrome_browser_sharing_sharing__device__registration.cc deleted file mode 100644 index f19bc3bea8c6..000000000000 --- a/www/ungoogled-chromium/files/patch-chrome_browser_sharing_sharing__device__registration.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/sharing/sharing_device_registration.cc.orig 2024-07-31 14:19:23 UTC -+++ chrome/browser/sharing/sharing_device_registration.cc -@@ -331,7 +331,7 @@ bool SharingDeviceRegistration::IsSmsFetcherSupported( - - bool SharingDeviceRegistration::IsRemoteCopySupported() const { - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - return true; - #else - return false; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__browser__utils.cc b/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__browser__utils.cc new file mode 100644 index 000000000000..447d371e77cd --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__browser__utils.cc @@ -0,0 +1,20 @@ +--- chrome/browser/supervised_user/supervised_user_browser_utils.cc.orig 2024-10-01 07:26:23 UTC ++++ chrome/browser/supervised_user/supervised_user_browser_utils.cc +@@ -40,7 +40,7 @@ + #include "components/user_manager/user_type.h" + #elif BUILDFLAG(IS_CHROMEOS_LACROS) + #include "chromeos/startup/browser_params_proxy.h" +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + #include "chrome/browser/supervised_user/supervised_user_verification_controller_client.h" + #include "chrome/browser/supervised_user/supervised_user_verification_page.h" + #endif +@@ -178,7 +178,7 @@ bool IsAuthenticatedSupervisedProfile(Profile* profile + supervised_user::ChildAccountService::AuthState::AUTHENTICATED; + } + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + std::string CreateReauthenticationInterstitial( + content::NavigationHandle& navigation_handle, + SupervisedUserVerificationPage::VerificationPurpose verification_purpose) { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__browser__utils.h b/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__browser__utils.h new file mode 100644 index 000000000000..c8cd0a189f56 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__browser__utils.h @@ -0,0 +1,20 @@ +--- chrome/browser/supervised_user/supervised_user_browser_utils.h.orig 2024-10-01 07:26:23 UTC ++++ chrome/browser/supervised_user/supervised_user_browser_utils.h +@@ -11,7 +11,7 @@ + #include "content/public/browser/web_contents.h" + #include "url/gurl.h" + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + #include "chrome/browser/supervised_user/supervised_user_verification_page.h" + #endif + +@@ -59,7 +59,7 @@ void AssertChildStatusOfTheUser(Profile* profile, bool + // content area. + bool IsAuthenticatedSupervisedProfile(Profile* profile); + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + // Returns the html content of the reauthentication interstitial for blocked + // sites. This interstitial is associated with the given NavigationHandle. + std::string CreateReauthenticationInterstitial( diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__delegate__impl.cc b/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__delegate__impl.cc index 3d3357e675e4..2c7755277f64 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__delegate__impl.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__delegate__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/supervised_user/supervised_user_extensions_delegate_impl.cc.orig 2024-07-31 14:19:23 UTC +--- chrome/browser/supervised_user/supervised_user_extensions_delegate_impl.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/supervised_user/supervised_user_extensions_delegate_impl.cc -@@ -196,7 +196,7 @@ void SupervisedUserExtensionsDelegateImpl::RequestExte +@@ -194,7 +194,7 @@ void SupervisedUserExtensionsDelegateImpl::RequestExte return; } } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc b/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc index 1768c73f7f00..90be44eacd79 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc @@ -1,4 +1,4 @@ ---- chrome/browser/supervised_user/supervised_user_extensions_manager.cc.orig 2024-07-31 14:19:23 UTC +--- chrome/browser/supervised_user/supervised_user_extensions_manager.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/supervised_user/supervised_user_extensions_manager.cc @@ -359,7 +359,7 @@ void SupervisedUserExtensionsManager:: ActivateManagementPolicyAndUpdateRegistration() { @@ -9,7 +9,7 @@ MaybeMarkExtensionsLocallyParentApproved(); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) } -@@ -476,7 +476,7 @@ bool SupervisedUserExtensionsManager::ShouldBlockExten +@@ -477,7 +477,7 @@ bool SupervisedUserExtensionsManager::ShouldBlockExten return false; } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc b/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc index 0554e40df218..f16ac9541ba0 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__google__auth__navigation__throttle.cc @@ -1,6 +1,6 @@ ---- chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.cc -@@ -25,7 +25,7 @@ +@@ -26,7 +26,7 @@ #if BUILDFLAG(IS_ANDROID) #include "chrome/browser/supervised_user/child_accounts/child_account_service_android.h" @@ -9,7 +9,7 @@ #include "chrome/browser/supervised_user/supervised_user_verification_controller_client.h" #include "chrome/browser/supervised_user/supervised_user_verification_page.h" #endif -@@ -139,7 +139,7 @@ SupervisedUserGoogleAuthNavigationThrottle::ShouldProc +@@ -140,7 +140,7 @@ SupervisedUserGoogleAuthNavigationThrottle::ShouldProc return content::NavigationThrottle::DEFER; } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__metrics__service__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__metrics__service__factory.cc index 1dda4fe5e765..0feb0af441ba 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__metrics__service__factory.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__metrics__service__factory.cc @@ -1,4 +1,4 @@ ---- chrome/browser/supervised_user/supervised_user_metrics_service_factory.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/supervised_user/supervised_user_metrics_service_factory.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/supervised_user/supervised_user_metrics_service_factory.cc @@ -14,7 +14,7 @@ #include "components/supervised_user/core/browser/supervised_user_service.h" @@ -17,4 +17,4 @@ +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) extensions_metrics_delegate = std::make_unique<SupervisedUserExtensionsMetricsDelegateImpl>( - extensions::ExtensionRegistry::Get(profile), *profile->GetPrefs()); + extensions::ExtensionRegistry::Get(profile), profile); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__navigation__throttle.cc b/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__navigation__throttle.cc new file mode 100644 index 000000000000..0b788e354557 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_supervised__user_supervised__user__navigation__throttle.cc @@ -0,0 +1,11 @@ +--- chrome/browser/supervised_user/supervised_user_navigation_throttle.cc.orig 2024-10-01 07:26:23 UTC ++++ chrome/browser/supervised_user/supervised_user_navigation_throttle.cc +@@ -212,7 +212,7 @@ void SupervisedUserNavigationThrottle::OnInterstitialR + Profile* profile = Profile::FromBrowserContext( + navigation_handle()->GetWebContents()->GetBrowserContext()); + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + if (base::FeatureList::IsEnabled( + supervised_user:: + kForceSupervisedUserReauthenticationForBlockedSites) && diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc b/www/ungoogled-chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc index 4b0b02c0530c..f272af8da81a 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc @@ -1,4 +1,4 @@ ---- chrome/browser/sync/chrome_sync_client.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/sync/chrome_sync_client.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/sync/chrome_sync_client.cc @@ -119,7 +119,7 @@ #endif // BUILDFLAG(ENABLE_SPELLCHECK) @@ -10,7 +10,7 @@ #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_service_factory.h" #elif BUILDFLAG(IS_ANDROID) @@ -233,7 +233,7 @@ bool ShouldSyncAppsTypesInTransportMode() { - syncer::ModelTypeControllerDelegate* GetSavedTabGroupControllerDelegate( + syncer::DataTypeControllerDelegate* GetSavedTabGroupControllerDelegate( Profile* profile) { #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) @@ -18,8 +18,8 @@ auto* keyed_service = tab_groups::SavedTabGroupServiceFactory::GetForProfile(profile); CHECK(keyed_service); -@@ -251,7 +251,7 @@ syncer::ModelTypeControllerDelegate* GetSavedTabGroupC - syncer::ModelTypeControllerDelegate* GetSharedTabGroupControllerDelegate( +@@ -251,7 +251,7 @@ syncer::DataTypeControllerDelegate* GetSavedTabGroupCo + syncer::DataTypeControllerDelegate* GetSharedTabGroupControllerDelegate( Profile* profile) { #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) @@ -27,7 +27,7 @@ tab_groups::SavedTabGroupKeyedService* keyed_service = tab_groups::SavedTabGroupServiceFactory::GetForProfile(profile); CHECK(keyed_service); -@@ -545,7 +545,7 @@ ChromeSyncClient::CreateModelTypeControllers( +@@ -544,7 +544,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy // platforms. bool enable_tab_group_sync = false; #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -36,7 +36,7 @@ enable_tab_group_sync = true; #elif BUILDFLAG(IS_ANDROID) enable_tab_group_sync = -@@ -586,7 +586,7 @@ ChromeSyncClient::CreateModelTypeControllers( +@@ -585,7 +585,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy // Chrome prefers OS provided spell checkers where they exist. So only sync the // custom dictionary on platforms that typically don't provide one. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_sync_sync__service__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_sync_sync__service__factory.cc index 70ffe4514296..4de695d5d679 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_sync_sync__service__factory.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_sync_sync__service__factory.cc @@ -1,4 +1,4 @@ ---- chrome/browser/sync/sync_service_factory.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/sync/sync_service_factory.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/sync/sync_service_factory.cc @@ -85,7 +85,7 @@ #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -18,7 +18,7 @@ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) syncer::SyncPrefs prefs(profile->GetPrefs()); local_sync_backend_enabled = prefs.IsLocalSyncEnabled(); -@@ -271,7 +271,7 @@ SyncServiceFactory::SyncServiceFactory() +@@ -276,7 +276,7 @@ SyncServiceFactory::SyncServiceFactory() DependsOn(ProfilePasswordStoreFactory::GetInstance()); DependsOn(PowerBookmarkServiceFactory::GetInstance()); #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc b/www/ungoogled-chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc index 839404874ca0..ec6457b85940 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc @@ -1,6 +1,6 @@ ---- chrome/browser/task_manager/sampling/task_group.cc.orig 2023-01-13 08:56:02 UTC +--- chrome/browser/task_manager/sampling/task_group.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/task_manager/sampling/task_group.cc -@@ -38,7 +38,7 @@ const int kBackgroundRefreshTypesMask = +@@ -41,7 +41,7 @@ const int kBackgroundRefreshTypesMask = #if BUILDFLAG(IS_WIN) REFRESH_TYPE_START_TIME | REFRESH_TYPE_CPU_TIME | #endif // BUILDFLAG(IS_WIN) @@ -9,7 +9,7 @@ REFRESH_TYPE_FD_COUNT | #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) #if BUILDFLAG(ENABLE_NACL) -@@ -123,7 +123,7 @@ TaskGroup::TaskGroup( +@@ -126,7 +126,7 @@ TaskGroup::TaskGroup( #if BUILDFLAG(ENABLE_NACL) nacl_debug_stub_port_(nacl::kGdbDebugStubPortUnknown), #endif // BUILDFLAG(ENABLE_NACL) @@ -18,7 +18,7 @@ open_fd_count_(-1), #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) idle_wakeups_per_second_(-1), -@@ -142,7 +142,7 @@ TaskGroup::TaskGroup( +@@ -145,7 +145,7 @@ TaskGroup::TaskGroup( weak_ptr_factory_.GetWeakPtr()), base::BindRepeating(&TaskGroup::OnIdleWakeupsRefreshDone, weak_ptr_factory_.GetWeakPtr()), @@ -27,7 +27,7 @@ base::BindRepeating(&TaskGroup::OnOpenFdCountRefreshDone, weak_ptr_factory_.GetWeakPtr()), #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) -@@ -322,7 +322,7 @@ void TaskGroup::OnRefreshNaClDebugStubPortDone(int nac +@@ -325,7 +325,7 @@ void TaskGroup::OnRefreshNaClDebugStubPortDone(int nac } #endif // BUILDFLAG(ENABLE_NACL) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_themes_theme__service.cc b/www/ungoogled-chromium/files/patch-chrome_browser_themes_theme__service.cc index fa2433ed969c..4a124d605625 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_themes_theme__service.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_themes_theme__service.cc @@ -1,4 +1,4 @@ ---- chrome/browser/themes/theme_service.cc.orig 2024-07-31 14:19:23 UTC +--- chrome/browser/themes/theme_service.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/themes/theme_service.cc @@ -70,7 +70,7 @@ #include "extensions/browser/extension_registry_observer.h" @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #include "ui/ozone/public/ozone_platform.h" // nogncheck #endif -@@ -326,7 +326,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier() +@@ -327,7 +327,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier() } bool ThemeService::ShouldUseCustomFrame() const { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_actions_chrome__action__id.h b/www/ungoogled-chromium/files/patch-chrome_browser_ui_actions_chrome__action__id.h index 1ecfce4bf98c..fa81e04293e7 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_actions_chrome__action__id.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_actions_chrome__action__id.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/actions/chrome_action_id.h.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/ui/actions/chrome_action_id.h.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/ui/actions/chrome_action_id.h -@@ -510,7 +510,7 @@ +@@ -512,7 +512,7 @@ IDC_CONTENT_CONTEXT_QUICK_ANSWERS_INLINE_ANSWER) \ E(kActionContentContextQuickAnswersInlineQuery, \ IDC_CONTENT_CONTEXT_QUICK_ANSWERS_INLINE_QUERY) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.cc index a359af5fae7c..2e1cdd1fa74f 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/autofill/payments/desktop_payments_window_manager.cc.orig 2024-07-31 14:19:23 UTC +--- chrome/browser/ui/autofill/payments/desktop_payments_window_manager.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/ui/autofill/payments/desktop_payments_window_manager.cc -@@ -49,7 +49,7 @@ gfx::Rect GetPopupSizeForVcn3ds() { +@@ -46,7 +46,7 @@ gfx::Rect GetPopupSizeForVcn3ds() { DesktopPaymentsWindowManager::DesktopPaymentsWindowManager( ContentAutofillClient* client) : client_(CHECK_DEREF(client)) { @@ -9,7 +9,7 @@ scoped_observation_.Observe(BrowserList::GetInstance()); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) } -@@ -109,7 +109,7 @@ void DesktopPaymentsWindowManager::WebContentsDestroye +@@ -106,7 +106,7 @@ void DesktopPaymentsWindowManager::WebContentsDestroye } } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser.h b/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser.h index 474f2e876868..87e383080715 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/browser.h.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/ui/browser.h.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/ui/browser.h -@@ -339,7 +339,7 @@ class Browser : public TabStripModelObserver, +@@ -298,7 +298,7 @@ class Browser : public TabStripModelObserver, std::optional<int64_t> display_id; #endif diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__command__controller.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__command__controller.cc index d0c879d5bfc7..a2cf5d701193 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__command__controller.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__command__controller.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/browser_command_controller.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/ui/browser_command_controller.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/ui/browser_command_controller.cc -@@ -128,7 +128,7 @@ +@@ -129,7 +129,7 @@ #include "components/user_manager/user_manager.h" #endif @@ -9,7 +9,7 @@ #include "ui/base/ime/text_input_flags.h" #include "ui/linux/linux_ui.h" #endif -@@ -137,7 +137,7 @@ +@@ -138,7 +138,7 @@ #include "ui/ozone/public/ozone_platform.h" #endif @@ -18,7 +18,7 @@ #include "chrome/browser/ui/shortcuts/desktop_shortcuts_utils.h" #endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -@@ -314,7 +314,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( +@@ -315,7 +315,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( #endif } @@ -27,7 +27,7 @@ // If this key was registered by the user as a content editing hotkey, then // it is not reserved. auto* linux_ui = ui::LinuxUi::instance(); -@@ -566,7 +566,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -570,7 +570,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -36,7 +36,7 @@ case IDC_MINIMIZE_WINDOW: browser_->window()->Minimize(); break; -@@ -578,7 +578,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -582,7 +582,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo break; #endif @@ -45,7 +45,7 @@ case IDC_USE_SYSTEM_TITLE_BAR: { PrefService* prefs = profile()->GetPrefs(); prefs->SetBoolean(prefs::kUseCustomChromeFrame, -@@ -772,7 +772,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -776,7 +776,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo break; case IDC_CREATE_SHORTCUT: base::RecordAction(base::UserMetricsAction("CreateShortcut")); @@ -54,7 +54,7 @@ if (base::FeatureList::IsEnabled(features::kShortcutsNotApps)) { chrome::CreateDesktopShortcutForActiveWebContents(browser_); } else { -@@ -1271,12 +1271,12 @@ void BrowserCommandController::InitCommandState() { +@@ -1279,12 +1279,12 @@ void BrowserCommandController::InitCommandState() { #endif // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -69,7 +69,7 @@ bool use_system_title_bar = true; #if BUILDFLAG(IS_OZONE) use_system_title_bar = ui::OzonePlatform::GetInstance() -@@ -1592,7 +1592,7 @@ void BrowserCommandController::UpdateCommandsForTabSta +@@ -1600,7 +1600,7 @@ void BrowserCommandController::UpdateCommandsForTabSta bool can_create_web_app = web_app::CanCreateWebApp(browser_); command_updater_.UpdateCommandEnabled(IDC_INSTALL_PWA, can_create_web_app); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__commands.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__commands.cc index 79f218e8e291..d18d9ac92f45 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__commands.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__commands.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/browser_commands.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/ui/browser_commands.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/ui/browser_commands.cc -@@ -2000,7 +2000,7 @@ void OpenUpdateChromeDialog(Browser* browser) { +@@ -2018,7 +2018,7 @@ void OpenUpdateChromeDialog(Browser* browser) { } else if (UpgradeDetector::GetInstance()->is_outdated_install_no_au()) { UpgradeDetector::GetInstance()->NotifyOutdatedInstallNoAutoUpdate(); } else { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__ui__prefs.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__ui__prefs.cc index 2356d549eb65..94886de4345f 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__ui__prefs.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_browser__ui__prefs.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/browser_ui_prefs.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/ui/browser_ui_prefs.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/ui/browser_ui_prefs.cc -@@ -72,7 +72,7 @@ void RegisterBrowserPrefs(PrefRegistrySimple* registry +@@ -74,7 +74,7 @@ void RegisterBrowserPrefs(PrefRegistrySimple* registry registry->RegisterIntegerPref(prefs::kDefaultBrowserDeclinedCount, 0); registry->RegisterTimePref(prefs::kDefaultBrowserFirstShownTime, base::Time()); @@ -9,7 +9,7 @@ registry->RegisterStringPref(prefs::kEnterpriseCustomLabel, std::string()); registry->RegisterStringPref(prefs::kEnterpriseLogoUrl, std::string()); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -@@ -179,7 +179,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistry +@@ -184,7 +184,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistry registry->RegisterDictionaryPref(prefs::kHttpsUpgradeFallbacks); registry->RegisterDictionaryPref(prefs::kHttpsUpgradeNavigations); registry->RegisterBooleanPref(prefs::kHttpsOnlyModeAutoEnabled, false); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_chrome__pages.h b/www/ungoogled-chromium/files/patch-chrome_browser_ui_chrome__pages.h index 0101a6b37b50..2532acfa459d 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_chrome__pages.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_chrome__pages.h @@ -1,4 +1,4 @@ ---- chrome/browser/ui/chrome_pages.h.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/ui/chrome_pages.h.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/ui/chrome_pages.h @@ -39,7 +39,7 @@ namespace signin { enum class ConsentLevel; @@ -9,7 +9,7 @@ namespace web_app { enum class AppSettingsPageEntryPoint; } // namespace web_app -@@ -196,7 +196,7 @@ void ShowShortcutCustomizationApp(Profile* profile, +@@ -174,7 +174,7 @@ void ShowShortcutCustomizationApp(Profile* profile, const std::string& category); #endif diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_managed__ui.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_managed__ui.cc new file mode 100644 index 000000000000..1ac09862e138 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_managed__ui.cc @@ -0,0 +1,20 @@ +--- chrome/browser/ui/managed_ui.cc.orig 2024-10-01 07:26:23 UTC ++++ chrome/browser/ui/managed_ui.cc +@@ -435,7 +435,7 @@ std::optional<std::string> GetDeviceManagerIdentity() + g_browser_process->platform_part()->browser_policy_connector_ash(); + return connector->GetEnterpriseDomainManager(); + #else +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + std::string custom_management_label = + g_browser_process->local_state()->GetString( + prefs::kEnterpriseCustomLabel); +@@ -467,7 +467,7 @@ std::optional<std::string> GetAccountManagerIdentity(P + policy::EnterpriseManagementAuthority::CLOUD)) + return std::nullopt; + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + std::string custom_management_label = + profile->GetPrefs()->GetString(prefs::kEnterpriseCustomLabel); + if (!custom_management_label.empty()) { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc index 9106795528b6..ae479ed915b2 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/passwords/manage_passwords_ui_controller.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/ui/passwords/manage_passwords_ui_controller.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/ui/passwords/manage_passwords_ui_controller.cc -@@ -97,7 +97,7 @@ namespace { +@@ -100,7 +100,7 @@ namespace { using Logger = autofill::SavePasswordProgressLogger; @@ -9,7 +9,7 @@ // Should be kept in sync with constant declared in // bubble_controllers/relaunch_chrome_bubble_controller.cc. constexpr int kMaxNumberOfTimesKeychainErrorBubbleIsShown = 3; -@@ -502,7 +502,7 @@ void ManagePasswordsUIController::OnBiometricAuthBefor +@@ -528,7 +528,7 @@ void ManagePasswordsUIController::OnBiometricAuthBefor } void ManagePasswordsUIController::OnKeychainError() { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc index 81da5c505365..2261ede5ac4e 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/ui/startup/startup_browser_creator.cc @@ -138,7 +138,7 @@ #include "chrome/credential_provider/common/gcp_strings.h" @@ -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) && -@@ -1294,7 +1294,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -1303,7 +1303,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( CHECK_EQ(profile_info.mode, StartupProfileMode::kBrowserWindow) << "Failed launch with app: couldn't pick a profile"; std::string app_id = command_line.GetSwitchValueASCII(switches::kAppId); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_tab__helpers.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_tab__helpers.cc index 85dffce6e609..d8323f027806 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_tab__helpers.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_tab__helpers.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/tab_helpers.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/ui/tab_helpers.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/ui/tab_helpers.cc -@@ -241,7 +241,7 @@ +@@ -240,7 +240,7 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ #include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/hats/hats_helper.h" -@@ -694,12 +694,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con +@@ -687,12 +687,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc index 3d60d15ad445..ee26f534f3d0 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig 2024-05-23 20:04:36 UTC +--- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/ui/task_manager/task_manager_table_model.cc -@@ -454,7 +454,7 @@ std::u16string TaskManagerTableModel::GetText(size_t r +@@ -459,7 +459,7 @@ std::u16string TaskManagerTableModel::GetText(size_t r ? stringifier_->backgrounded_string() : stringifier_->foregrounded_string(); @@ -9,7 +9,7 @@ case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: { const int fd_count = observed_task_manager()->GetOpenFdCount(tasks_[row]); return fd_count >= 0 ? base::FormatNumber(fd_count) -@@ -621,7 +621,7 @@ int TaskManagerTableModel::CompareValues(size_t row1, +@@ -626,7 +626,7 @@ int TaskManagerTableModel::CompareValues(size_t row1, return BooleanCompare(is_proc1_bg, is_proc2_bg); } @@ -18,7 +18,7 @@ case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: { const int proc1_fd_count = observed_task_manager()->GetOpenFdCount(tasks_[row1]); -@@ -806,7 +806,7 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col +@@ -811,7 +811,7 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col type = REFRESH_TYPE_KEEPALIVE_COUNT; break; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_test_popup__browsertest.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_test_popup__browsertest.cc index a3fcd8dac2b8..1d255d82a1e6 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_test_popup__browsertest.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_test_popup__browsertest.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/test/popup_browsertest.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/ui/test/popup_browsertest.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/ui/test/popup_browsertest.cc -@@ -74,7 +74,7 @@ IN_PROC_BROWSER_TEST_F(PopupTest, OpenLeftAndTopZeroCo +@@ -75,7 +75,7 @@ IN_PROC_BROWSER_TEST_F(PopupTest, OpenLeftAndTopZeroCo const display::Display display = GetDisplayNearestBrowser(popup); gfx::Rect expected(popup->window()->GetBounds().size()); expected.AdjustToFit(display.work_area()); @@ -9,7 +9,7 @@ // TODO(crbug.com/40815883) Desktop Linux window bounds are inaccurate. expected.Outset(50); EXPECT_TRUE(expected.Contains(popup->window()->GetBounds())) -@@ -106,7 +106,7 @@ IN_PROC_BROWSER_TEST_F(PopupTest, OpenClampedToCurrent +@@ -107,7 +107,7 @@ IN_PROC_BROWSER_TEST_F(PopupTest, OpenClampedToCurrent // The popup should be constrained to the opener's available display space. EXPECT_EQ(display, GetDisplayNearestBrowser(popup)); gfx::Rect work_area(display.work_area()); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_ui__features.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_ui__features.cc index 801b5e9a5d9b..031419516118 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_ui__features.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_ui__features.cc @@ -1,15 +1,15 @@ ---- chrome/browser/ui/ui_features.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/ui/ui_features.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/ui/ui_features.cc -@@ -108,7 +108,7 @@ BASE_FEATURE(kEvDetailsInPageInfo, - "EvDetailsInPageInfo", +@@ -103,7 +103,7 @@ BASE_FEATURE(kAccessCodeCastUI, base::FEATURE_ENABLED_BY_DEFAULT); + #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Enables the feature to remove the last confirmation dialog when relaunching // to update Chrome. BASE_FEATURE(kFewerUpdateConfirmations, -@@ -381,7 +381,7 @@ BASE_FEATURE(kTopChromeWebUIUsesSpareRenderer, +@@ -391,7 +391,7 @@ BASE_FEATURE(kTopChromeWebUIUsesSpareRenderer, "TopChromeWebUIUsesSpareRenderer", base::FEATURE_ENABLED_BY_DEFAULT); @@ -18,7 +18,7 @@ // Enables alternate update-related text to be displayed in browser app menu // button, menu item and confirmation dialog. BASE_FEATURE(kUpdateTextOptions, -@@ -457,7 +457,7 @@ BASE_FEATURE(kStopLoadingAnimationForHiddenWindow, +@@ -469,7 +469,7 @@ BASE_FEATURE(kStopLoadingAnimationForHiddenWindow, "StopLoadingAnimationForHiddenWindow", base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_ui__features.h b/www/ungoogled-chromium/files/patch-chrome_browser_ui_ui__features.h index d11d0380cd53..03f9af48da37 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_ui__features.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_ui__features.h @@ -1,15 +1,15 @@ ---- chrome/browser/ui/ui_features.h.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/ui/ui_features.h.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/ui/ui_features.h -@@ -80,7 +80,7 @@ BASE_DECLARE_FEATURE(kAccessCodeCastUI); - - BASE_DECLARE_FEATURE(kEvDetailsInPageInfo); +@@ -78,7 +78,7 @@ bool IsExtensionMenuInRootAppMenu(); + BASE_DECLARE_FEATURE(kAccessCodeCastUI); + #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) BASE_DECLARE_FEATURE(kFewerUpdateConfirmations); #endif -@@ -239,7 +239,7 @@ bool IsToolbarPinningEnabled(); +@@ -256,7 +256,7 @@ bool IsToolbarPinningEnabled(); BASE_DECLARE_FEATURE(kTopChromeWebUIUsesSpareRenderer); @@ -18,7 +18,7 @@ BASE_DECLARE_FEATURE(kUpdateTextOptions); extern const base::FeatureParam<int> kUpdateTextOptionNumber; #endif -@@ -266,7 +266,7 @@ BASE_DECLARE_FEATURE(kViewsJSAppModalDialog); +@@ -283,7 +283,7 @@ BASE_DECLARE_FEATURE(kViewsJSAppModalDialog); BASE_DECLARE_FEATURE(kStopLoadingAnimationForHiddenWindow); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc index 9f46e155f22b..348438ab34bb 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/browser_frame.cc.orig 2024-02-25 20:22:18 UTC +--- chrome/browser/ui/views/frame/browser_frame.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/ui/views/frame/browser_frame.cc @@ -54,7 +54,7 @@ #include "components/user_manager/user_manager.h" @@ -36,7 +36,7 @@ // If the window was sent to a different workspace, prioritize it if // it was sent to the current workspace and deprioritize it // otherwise. This is done by MoveBrowsersInWorkspaceToFront() -@@ -563,7 +563,7 @@ void BrowserFrame::OnMenuClosed() { +@@ -564,7 +564,7 @@ void BrowserFrame::OnMenuClosed() { } void BrowserFrame::SelectNativeTheme() { @@ -45,7 +45,7 @@ // Use the regular NativeTheme instance if running incognito mode, regardless // of system theme (gtk, qt etc). ui::NativeTheme* native_theme = ui::NativeTheme::GetInstanceForNativeUi(); -@@ -604,7 +604,7 @@ void BrowserFrame::OnTouchUiChanged() { +@@ -605,7 +605,7 @@ void BrowserFrame::OnTouchUiChanged() { bool BrowserFrame::RegenerateFrameOnThemeChange( BrowserThemeChangeType theme_change_type) { bool need_regenerate = false; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__frame__view__layout__linux.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__frame__view__layout__linux.cc index 79fa9d656e37..29cbb3a06c9e 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__frame__view__layout__linux.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__frame__view__layout__linux.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/browser_frame_view_layout_linux.cc.orig 2024-02-25 20:22:18 UTC +--- chrome/browser/ui/views/frame/browser_frame_view_layout_linux.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/ui/views/frame/browser_frame_view_layout_linux.cc -@@ -53,7 +53,7 @@ gfx::Insets BrowserFrameViewLayoutLinux::RestoredFrame +@@ -54,7 +54,7 @@ gfx::Insets BrowserFrameViewLayoutLinux::RestoredFrame OpaqueBrowserFrameViewLayout::RestoredFrameBorderInsets()); } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc index e7a9bd491d9a..330acce1095a 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/browser_view.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/ui/views/frame/browser_view.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/ui/views/frame/browser_view.cc -@@ -2262,7 +2262,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra +@@ -2321,7 +2321,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra // CrOS cleanup is done. // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc index 896b7b9d5306..ee70b7770278 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc +++ b/www/ungoogled-chromium/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 2024-07-31 14:19:23 UTC +--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2024-10-01 07:26:23 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 -@@ -564,7 +564,7 @@ OpaqueBrowserFrameView::FrameButtonStyle +@@ -559,7 +559,7 @@ OpaqueBrowserFrameView::FrameButtonStyle OpaqueBrowserFrameView::GetFrameButtonStyle() const { // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -18,7 +18,7 @@ return FrameButtonStyle::kMdButton; #else return FrameButtonStyle::kImageButton; -@@ -583,7 +583,7 @@ bool OpaqueBrowserFrameView::ShouldDrawRestoredFrameSh +@@ -578,7 +578,7 @@ bool OpaqueBrowserFrameView::ShouldDrawRestoredFrameSh return false; } @@ -27,7 +27,7 @@ bool OpaqueBrowserFrameView::IsTiled() const { return frame()->tiled(); } -@@ -782,7 +782,7 @@ gfx::Rect OpaqueBrowserFrameView::GetIconBounds() cons +@@ -777,7 +777,7 @@ gfx::Rect OpaqueBrowserFrameView::GetIconBounds() cons } void OpaqueBrowserFrameView::WindowIconPressed() { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h index 9e02700ba08d..06e815d6213a 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view.h.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/ui/views/frame/opaque_browser_frame_view.h.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/ui/views/frame/opaque_browser_frame_view.h -@@ -114,7 +114,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient +@@ -111,7 +111,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient FrameButtonStyle GetFrameButtonStyle() const override; void UpdateWindowControlsOverlay(const gfx::Rect& bounding_rect) override; bool ShouldDrawRestoredFrameShadow() const override; @@ -9,7 +9,7 @@ bool IsTiled() const override; #endif int WebAppButtonHeight() const override; -@@ -231,7 +231,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient +@@ -228,7 +228,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient // Background painter for the window frame. std::unique_ptr<views::FrameBackground> frame_background_; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc index 1fd5d6564822..1add996998c9 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc @@ -61,7 +61,7 @@ #include "ui/aura/window.h" @@ -18,7 +18,7 @@ // Frame border when window shadow is not drawn. constexpr int kFrameBorderThickness = 4; #endif -@@ -185,7 +185,7 @@ class WindowEventObserver : public ui::EventObserver { +@@ -188,7 +188,7 @@ class WindowEventObserver : public ui::EventObserver { gfx::Rect input_bounds = pip_browser_frame_view_->GetLocalBounds(); @@ -27,7 +27,7 @@ // Calculate input bounds for Linux. This is needed because the input bounds // is not necessary the same as the local bounds on Linux. if (pip_browser_frame_view_->ShouldDrawFrameShadow()) { -@@ -581,7 +581,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow +@@ -591,7 +591,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow AddChildView(std::move(auto_pip_setting_overlay)); } @@ -36,7 +36,7 @@ auto* profile = browser_view->browser()->profile(); auto* linux_ui_theme = ui::LinuxUiTheme::GetForProfile(profile); auto* theme_service_factory = ThemeServiceFactory::GetForProfile(profile); -@@ -803,7 +803,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged( +@@ -813,7 +813,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged( for (ContentSettingImageView* view : content_setting_views_) view->SetIconColor(color_provider->GetColor(kColorPipWindowForeground)); @@ -45,16 +45,16 @@ // On Linux the top bar background will be drawn in OnPaint(). top_bar_container_view_->SetBackground(views::CreateSolidBackground( color_provider->GetColor(kColorPipWindowTopBarBackground))); -@@ -885,7 +885,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg +@@ -897,7 +897,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg BrowserNonClientFrameView::RemovedFromWidget(); } -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - gfx::Insets PictureInPictureBrowserFrameView::MirroredFrameBorderInsets() - const { + gfx::Insets + PictureInPictureBrowserFrameView::RestoredMirroredFrameBorderInsets() const { auto border = FrameBorderInsets(); -@@ -1153,7 +1153,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre +@@ -1188,7 +1188,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre // views::View implementations: void PictureInPictureBrowserFrameView::OnPaint(gfx::Canvas* canvas) { @@ -63,7 +63,7 @@ // Draw the PiP window frame borders and shadows, including the top bar // background. if (window_frame_provider_) { -@@ -1287,7 +1287,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie +@@ -1343,7 +1343,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie } gfx::Insets PictureInPictureBrowserFrameView::FrameBorderInsets() const { @@ -72,7 +72,7 @@ if (window_frame_provider_) { const auto insets = window_frame_provider_->GetFrameThicknessDip(); const bool tiled = frame()->tiled(); -@@ -1305,7 +1305,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor +@@ -1361,7 +1361,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor } gfx::Insets PictureInPictureBrowserFrameView::ResizeBorderInsets() const { @@ -81,7 +81,7 @@ return FrameBorderInsets(); #elif !BUILDFLAG(IS_CHROMEOS_ASH) return gfx::Insets(kResizeBorder); -@@ -1326,7 +1326,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie +@@ -1382,7 +1382,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie top_height + border_thickness.bottom()); } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h index 5d39b1f110d7..741a9410c2b8 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h @@ -27,7 +27,7 @@ #include "ui/views/layout/flex_layout_view.h" @@ -24,7 +24,7 @@ void RemovedFromWidget() override; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - gfx::Insets MirroredFrameBorderInsets() const override; + gfx::Insets RestoredMirroredFrameBorderInsets() const override; gfx::Insets GetInputInsets() const override; SkRRect GetRestoredClipRegion() const override; @@ -195,7 +195,7 @@ class PictureInPictureBrowserFrameView @@ -36,7 +36,7 @@ // Returns whether a client-side shadow should be drawn for the window. bool ShouldDrawFrameShadow() const; -@@ -371,7 +371,7 @@ class PictureInPictureBrowserFrameView +@@ -376,7 +376,7 @@ class PictureInPictureBrowserFrameView // `top_bar_color_animation_`. std::optional<SkColor> current_foreground_color_; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc index ec9c53097a1c..991aabf6b2b8 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/ui/views/frame/system_menu_model_builder.cc -@@ -75,7 +75,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser +@@ -77,7 +77,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser ui::SimpleMenuModel* model) { // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ model->AddItemWithStringId(IDC_MINIMIZE_WINDOW, IDS_MINIMIZE_WINDOW_MENU); model->AddItemWithStringId(IDC_MAXIMIZE_WINDOW, IDS_MAXIMIZE_WINDOW_MENU); model->AddItemWithStringId(IDC_RESTORE_WINDOW, IDS_RESTORE_WINDOW_MENU); -@@ -91,7 +91,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser +@@ -97,7 +97,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser } // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -18,7 +18,7 @@ model->AddSeparator(ui::NORMAL_SEPARATOR); bool supports_server_side_decorations = true; #if BUILDFLAG(IS_OZONE) && !BUILDFLAG(IS_CHROMEOS) -@@ -155,7 +155,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo +@@ -171,7 +171,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo model->AddSeparator(ui::NORMAL_SEPARATOR); model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc index bf6bf0da840f..bb1d4ad94eb9 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/hung_renderer_view.cc.orig 2024-02-25 20:22:18 UTC +--- chrome/browser/ui/views/hung_renderer_view.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/ui/views/hung_renderer_view.cc -@@ -406,7 +406,7 @@ void HungRendererDialogView::ForceCrashHungRenderer() +@@ -407,7 +407,7 @@ void HungRendererDialogView::ForceCrashHungRenderer() content::RenderProcessHost* rph = hung_pages_table_model_->GetRenderWidgetHost()->GetProcess(); if (rph) { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc index 79211dc2437a..00fd71952359 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/omnibox/omnibox_view_views.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/ui/views/omnibox/omnibox_view_views.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/ui/views/omnibox/omnibox_view_views.cc -@@ -1972,7 +1972,7 @@ void OmniboxViewViews::MaybeAddSendTabToSelfItem( +@@ -1973,7 +1973,7 @@ void OmniboxViewViews::MaybeAddSendTabToSelfItem( } void OmniboxViewViews::OnPopupOpened() { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_passwords_password__bubble__view__base.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_passwords_password__bubble__view__base.cc index b0e4ef18dc7e..1bf749fff082 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_passwords_password__bubble__view__base.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_passwords_password__bubble__view__base.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/passwords/password_bubble_view_base.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/ui/views/passwords/password_bubble_view_base.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/ui/views/passwords/password_bubble_view_base.cc -@@ -37,7 +37,7 @@ +@@ -41,7 +41,7 @@ #include "ui/base/metadata/metadata_impl_macros.h" #include "ui/views/controls/button/button.h" @@ -9,7 +9,7 @@ #include "chrome/browser/ui/views/passwords/password_relaunch_chrome_view.h" #endif -@@ -141,7 +141,7 @@ PasswordBubbleViewBase* PasswordBubbleViewBase::Create +@@ -156,7 +156,7 @@ PasswordBubbleViewBase* PasswordBubbleViewBase::Create } else if (model_state == password_manager::ui::NOTIFY_RECEIVED_SHARED_CREDENTIALS) { view = new SharedPasswordsNotificationView(web_contents, anchor_view); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc index d1c38448bafa..04868b26d128 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig 2024-07-31 14:19:23 UTC +--- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/ui/views/profiles/profile_menu_view_base.cc -@@ -687,7 +687,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo( +@@ -693,7 +693,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo( // TODO(crbug.com/40118868): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc index ac594813c0d8..3feaf5c58cce 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc -@@ -55,7 +55,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 kManagedUserNoticeConfirmationDialogWidth = 512; const int kManagedUserNoticeConfirmationDialogHeight = 576; const int kManagedUserNoticeConfirmationUpdatedDialogWidth = 900; -@@ -173,7 +173,7 @@ SigninViewControllerDelegateViews::CreateProfileCustom +@@ -174,7 +174,7 @@ SigninViewControllerDelegateViews::CreateProfileCustom #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -18,7 +18,7 @@ // static std::unique_ptr<views::WebView> SigninViewControllerDelegateViews::CreateManagedUserNoticeConfirmationWebView( -@@ -335,7 +335,7 @@ SigninViewControllerDelegateViews::SigninViewControlle +@@ -336,7 +336,7 @@ SigninViewControllerDelegateViews::SigninViewControlle SetButtons(ui::DIALOG_BUTTON_NONE); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -36,7 +36,7 @@ void SigninViewControllerDelegateViews::DeleteProfileOnCancel() { ProfileAttributesEntry* entry = g_browser_process->profile_manager() -@@ -499,7 +499,7 @@ SigninViewControllerDelegate::CreateProfileCustomizati +@@ -500,7 +500,7 @@ SigninViewControllerDelegate::CreateProfileCustomizati #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h index b1c40e6b2996..b4f84cc6ff08 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h.orig 2024-07-31 14:19:23 UTC +--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h -@@ -75,7 +75,7 @@ class SigninViewControllerDelegateViews +@@ -76,7 +76,7 @@ class SigninViewControllerDelegateViews #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ static std::unique_ptr<views::WebView> CreateManagedUserNoticeConfirmationWebView( Browser* browser, -@@ -141,7 +141,7 @@ class SigninViewControllerDelegateViews +@@ -142,7 +142,7 @@ class SigninViewControllerDelegateViews InitializeSigninWebDialogUI initialize_signin_web_dialog_ui); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc index e52f88390cf6..a784448f8a5e 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/tabs/tab.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/ui/views/tabs/tab.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/ui/views/tabs/tab.cc -@@ -617,7 +617,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& +@@ -626,7 +626,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& return; } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc index a070ff8d3098..3c8114cc6937 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/ui/views/tabs/tab_drag_controller.cc @@ -98,7 +98,7 @@ #include "components/remote_cocoa/browser/window.h" @@ -27,7 +27,7 @@ ref->can_release_capture_ = false; #endif ref->start_point_in_screen_ = -@@ -1065,7 +1065,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon +@@ -1034,7 +1034,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -36,7 +36,7 @@ // EndMoveLoop is going to snap the window back to its original location. // Hide it so users don't see this. Hiding a window in Linux aura causes // it to lose capture so skip it. -@@ -2151,7 +2151,7 @@ void TabDragController::CompleteDrag() { +@@ -2064,7 +2064,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 -@@ -2597,7 +2597,7 @@ TabDragController::Liveness TabDragController::GetLoca +@@ -2510,7 +2510,7 @@ TabDragController::Liveness TabDragController::GetLoca } // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc index 23cd7ddb8da3..e08c354ab2ed 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/user_education/browser_user_education_service.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/ui/views/user_education/browser_user_education_service.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/ui/views/user_education/browser_user_education_service.cc -@@ -997,7 +997,7 @@ void MaybeRegisterChromeFeaturePromos( +@@ -946,7 +946,7 @@ void MaybeRegisterChromeFeaturePromos( FeaturePromoSpecification::AcceleratorInfo()) .SetBubbleArrow(HelpBubbleArrow::kTopLeft))); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc index d522eacc1e25..7e73d060ff28 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc -@@ -516,7 +516,7 @@ std::string GetFileExtension(FileExtension file_extens +@@ -515,7 +515,7 @@ std::string GetFileExtension(FileExtension file_extens } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ SiteConfig GetSiteConfigurationFromAppName(const std::string& app_name) { SiteConfig config; bool is_app_found = false; -@@ -2104,7 +2104,7 @@ void WebAppIntegrationTestDriver::DeletePlatformShortc +@@ -2100,7 +2100,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( -@@ -3431,7 +3431,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginEna +@@ -3427,7 +3427,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 -@@ -3446,7 +3446,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis +@@ -3442,7 +3442,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 -@@ -3456,7 +3456,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis +@@ -3452,7 +3452,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis void WebAppIntegrationTestDriver::CheckSiteHandlesFile( Site site, FileExtension file_extension) { @@ -45,7 +45,7 @@ if (!BeforeStateCheckAction(__FUNCTION__)) { return; } -@@ -3472,7 +3472,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile +@@ -3468,7 +3468,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile void WebAppIntegrationTestDriver::CheckSiteNotHandlesFile( Site site, FileExtension file_extension) { @@ -54,7 +54,7 @@ if (!BeforeStateCheckAction(__FUNCTION__)) { return; } -@@ -4289,7 +4289,7 @@ base::FilePath WebAppIntegrationTestDriver::GetShortcu +@@ -4285,7 +4285,7 @@ base::FilePath WebAppIntegrationTestDriver::GetShortcu base::FilePath shortcut_dir, const std::string& app_name, const webapps::AppId& app_id) { @@ -63,7 +63,7 @@ return override_registration_->test_override().GetShortcutPath( profile(), shortcut_dir, app_id, app_name); #else -@@ -4489,7 +4489,7 @@ bool WebAppIntegrationTestDriver::IsShortcutAndIconCre +@@ -4485,7 +4485,7 @@ bool WebAppIntegrationTestDriver::IsShortcutAndIconCre const webapps::AppId& id) { base::ScopedAllowBlockingForTesting allow_blocking; bool is_shortcut_and_icon_correct = false; @@ -72,7 +72,7 @@ bool is_shortcut_correct = override_registration_->test_override().IsShortcutCreated(profile, id, name); -@@ -4533,7 +4533,7 @@ bool WebAppIntegrationTestDriver::DoIconColorsMatch(Pr +@@ -4529,7 +4529,7 @@ bool WebAppIntegrationTestDriver::DoIconColorsMatch(Pr do_icon_colors_match = (expected_icon_pixel_color == shortcut_pixel_color_apps_folder.value()); } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc index 008a8743bdf8..9df8102e6f0b 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/web_applications/web_app_ui_manager_impl.cc.orig 2024-07-31 14:19:23 UTC +--- chrome/browser/ui/web_applications/web_app_ui_manager_impl.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/ui/web_applications/web_app_ui_manager_impl.cc -@@ -577,7 +577,7 @@ void WebAppUiManagerImpl::MaybeShowIPHPromoForAppsLaun +@@ -573,7 +573,7 @@ void WebAppUiManagerImpl::MaybeShowIPHPromoForAppsLaun content::WebContents* web_contents, Profile* profile, const std::string& app_id) { @@ -9,7 +9,7 @@ WebAppProvider* provider = WebAppProvider::GetForWebApps(profile); CHECK(provider); -@@ -797,7 +797,7 @@ void WebAppUiManagerImpl::ClearWebAppSiteDataIfNeeded( +@@ -799,7 +799,7 @@ void WebAppUiManagerImpl::ClearWebAppSiteDataIfNeeded( } } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_about_about__ui.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_about_about__ui.cc index 09e01d1f45a6..bd90d16893db 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_about_about__ui.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_about_about__ui.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/webui/about/about_ui.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/ui/webui/about/about_ui.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/ui/webui/about/about_ui.cc @@ -596,7 +596,7 @@ std::string ChromeURLs(content::BrowserContext* browse return html; @@ -9,7 +9,16 @@ std::string AboutLinuxProxyConfig() { std::string data; AppendHeader(&data, -@@ -651,7 +651,7 @@ void AboutUIHTMLSource::StartDataRequest( +@@ -629,7 +629,7 @@ TermsUIConfig::TermsUIConfig() + : AboutUIConfigBase(chrome::kChromeUITermsHost) {} + #endif + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OPENBSD) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + LinuxProxyConfigUI::LinuxProxyConfigUI() + : AboutUIConfigBase(chrome::kChromeUILinuxProxyConfigHost) {} + #endif +@@ -681,7 +681,7 @@ void AboutUIHTMLSource::StartDataRequest( response = ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(idr); } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_about_about__ui.h b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_about_about__ui.h new file mode 100644 index 000000000000..d311430584db --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_about_about__ui.h @@ -0,0 +1,11 @@ +--- chrome/browser/ui/webui/about/about_ui.h.orig 2024-10-01 07:26:23 UTC ++++ chrome/browser/ui/webui/about/about_ui.h +@@ -50,7 +50,7 @@ class TermsUIConfig : public AboutUIConfigBase { + }; + #endif + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OPENBSD) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // chrome://linux-proxy-config + class LinuxProxyConfigUI : public AboutUIConfigBase { + public: diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc index f240fcfd6d2e..fc8576c124b9 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/app_home/app_home_page_handler.cc.orig 2024-07-31 14:19:23 UTC +--- chrome/browser/ui/webui/app_home/app_home_page_handler.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/ui/webui/app_home/app_home_page_handler.cc -@@ -61,7 +61,7 @@ +@@ -62,7 +62,7 @@ #include "ui/base/window_open_disposition_utils.h" #include "url/gurl.h" diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc index 45ca39746e4b..60c3cbcde0b3 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/webui/certificate_manager/client_cert_sources.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/ui/webui/certificate_manager/client_cert_sources.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/ui/webui/certificate_manager/client_cert_sources.cc @@ -36,7 +36,7 @@ #include "net/ssl/client_cert_store_mac.h" @@ -18,7 +18,7 @@ // ClientCertStore implementation that always returns an empty list. The // CertificateProvisioningService implementation expects to wrap a platform // cert store, but here we only want to get results from the provisioning -@@ -373,7 +373,7 @@ CreatePlatformClientCertSource() { +@@ -393,7 +393,7 @@ CreatePlatformClientCertSource( #endif } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.h b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.h index f2cf6c55dc92..fdde0724e518 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_certificate__manager_client__cert__sources.h @@ -1,8 +1,8 @@ ---- chrome/browser/ui/webui/certificate_manager/client_cert_sources.h.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/ui/webui/certificate_manager/client_cert_sources.h.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/ui/webui/certificate_manager/client_cert_sources.h -@@ -15,7 +15,7 @@ class Profile; - std::unique_ptr<CertificateManagerPageHandler::CertSource> - CreatePlatformClientCertSource(); +@@ -17,7 +17,7 @@ CreatePlatformClientCertSource( + mojo::Remote<certificate_manager_v2::mojom::CertificateManagerPage>* + remote_client); -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__configs.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__configs.cc new file mode 100644 index 000000000000..c946bd7fe00a --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__configs.cc @@ -0,0 +1,15 @@ +--- chrome/browser/ui/webui/chrome_web_ui_configs.cc.orig 2024-10-01 07:26:23 UTC ++++ chrome/browser/ui/webui/chrome_web_ui_configs.cc +@@ -110,10 +110,10 @@ void RegisterChromeWebUIConfigs() { + map.AddWebUIConfig(std::make_unique<TermsUIConfig>()); + #endif // !BUILDFLAG(IS_ANDROID) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OPENBSD) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + map.AddWebUIConfig(std::make_unique<LinuxProxyConfigUI>()); + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || +- // BUILDFLAG(IS_OPENBSD) ++ // BUILDFLAG(IS_BSD) + + #if BUILDFLAG(ENABLE_EXTENSIONS) + map.AddWebUIConfig(std::make_unique<extensions::ExtensionsUIConfig>()); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc index 4916c84b96d9..ccc09a58ddf2 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc @@ -190,7 +190,7 @@ #include "chrome/browser/ui/webui/chromeos/chrome_url_disabled/chrome_url_disabled_ui.h" @@ -9,12 +9,13 @@ #include "chrome/browser/ui/webui/webui_js_error/webui_js_error_ui.h" #endif -@@ -215,21 +215,21 @@ +@@ -215,22 +215,22 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include "chrome/browser/ui/webui/commerce/product_specifications_ui.h" #include "chrome/browser/ui/webui/discards/discards_ui.h" #endif @@ -35,16 +36,7 @@ #include "chrome/browser/ui/webui/whats_new/whats_new_ui.h" #include "chrome/browser/ui/webui/whats_new/whats_new_util.h" #endif -@@ -379,7 +379,7 @@ bool IsAboutUI(const GURL& url) { - #if !BUILDFLAG(IS_ANDROID) - || url.host_piece() == chrome::kChromeUITermsHost - #endif --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OPENBSD) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - || url.host_piece() == chrome::kChromeUILinuxProxyConfigHost - #endif - #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -570,7 +570,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -548,7 +548,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we if (url.host_piece() == chrome::kChromeUIMobileSetupHost) return &NewWebUI<ash::cellular_setup::MobileSetupUI>; #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -53,7 +45,7 @@ if (url.host_piece() == chrome::kChromeUIWebUIJsErrorHost) return &NewWebUI<WebUIJsErrorUI>; #endif -@@ -626,7 +626,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -600,7 +600,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we if (url.host_piece() == chrome::kChromeUINaClHost) return &NewWebUI<NaClUI>; #endif @@ -62,7 +54,7 @@ defined(TOOLKIT_VIEWS)) || \ defined(USE_AURA) if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost) -@@ -657,7 +657,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -631,7 +631,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we if (url.host_piece() == chrome::kChromeUIWebuiGalleryHost) { return &NewWebUI<WebuiGalleryUI>; } @@ -71,7 +63,7 @@ if (url.host_piece() == chrome::kChromeUIWhatsNewHost && whats_new::IsEnabled()) { return &NewWebUI<WhatsNewUI>; -@@ -676,26 +676,26 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -650,26 +650,26 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we } #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -103,7 +95,7 @@ if (url.host_piece() == chrome::kChromeUIWebAppSettingsHost) return &NewWebUI<WebAppSettingsUI>; #endif -@@ -936,7 +936,7 @@ base::RefCountedMemory* ChromeWebUIControllerFactory:: +@@ -907,7 +907,7 @@ base::RefCountedMemory* ChromeWebUIControllerFactory:: if (page_url.host_piece() == chrome::kChromeUINewTabPageHost) return NewTabPageUI::GetFaviconResourceBytes(scale_factor); @@ -112,3 +104,12 @@ if (page_url.host_piece() == chrome::kChromeUIWhatsNewHost) return WhatsNewUI::GetFaviconResourceBytes(scale_factor); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +@@ -935,7 +935,7 @@ base::RefCountedMemory* ChromeWebUIControllerFactory:: + return ManagementUI::GetFaviconResourceBytes(scale_factor); + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + if (page_url.host_piece() == commerce::kChromeUICompareHost) { + return commerce::ProductSpecificationsUI::GetFaviconResourceBytes( + scale_factor); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_internals_user__education_user__education__internals__page__handler__impl.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_internals_user__education_user__education__internals__page__handler__impl.cc new file mode 100644 index 000000000000..0c03c3bc205f --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_internals_user__education_user__education__internals__page__handler__impl.cc @@ -0,0 +1,29 @@ +--- chrome/browser/ui/webui/internals/user_education/user_education_internals_page_handler_impl.cc.orig 2024-10-01 07:26:23 UTC ++++ chrome/browser/ui/webui/internals/user_education/user_education_internals_page_handler_impl.cc +@@ -41,7 +41,7 @@ + #include "ui/base/l10n/l10n_util.h" + #include "ui/base/webui/resource_path.h" + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "chrome/browser/ui/browser_navigator.h" + #include "chrome/browser/ui/browser_navigator_params.h" + #include "net/base/url_util.h" +@@ -81,7 +81,7 @@ user_education::NewBadgeRegistry* GetNewBadgeRegistry( + } + + whats_new::WhatsNewRegistry* GetWhatsNewRegistry() { +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return g_browser_process->GetFeatures()->whats_new_registry(); + #else + return nullptr; +@@ -765,7 +765,7 @@ void UserEducationInternalsPageHandlerImpl::ClearWhats + } + + void UserEducationInternalsPageHandlerImpl::LaunchWhatsNewStaging() { +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + GURL url = net::AppendQueryParameter(GURL(chrome::kChromeUIWhatsNewURL), + "staging", "true"); + NavigateParams params(profile_, url, ui::PAGE_TRANSITION_TYPED); diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_interstitials_interstitial__ui.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_interstitials_interstitial__ui.cc index c87968bd374a..575aab61e70e 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_interstitials_interstitial__ui.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_interstitials_interstitial__ui.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/interstitials/interstitial_ui.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/ui/webui/interstitials/interstitial_ui.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/ui/webui/interstitials/interstitial_ui.cc -@@ -70,7 +70,7 @@ +@@ -71,7 +71,7 @@ #include "components/security_interstitials/content/captive_portal_blocking_page.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/supervised_user/supervised_user_verification_controller_client.h" #include "chrome/browser/supervised_user/supervised_user_verification_page.h" #endif -@@ -289,7 +289,7 @@ std::unique_ptr<EnterpriseBlockPage> CreateEnterpriseB +@@ -291,7 +291,7 @@ std::unique_ptr<EnterpriseBlockPage> CreateEnterpriseB kRequestUrl)); } @@ -18,7 +18,7 @@ std::unique_ptr<SupervisedUserVerificationPage> CreateSupervisedUserVerificationPage(content::WebContents* web_contents) { const GURL kRequestUrl("https://supervised-user-verification.example.net"); -@@ -424,7 +424,7 @@ void InterstitialHTMLSource::StartDataRequest( +@@ -444,7 +444,7 @@ void InterstitialHTMLSource::StartDataRequest( interstitial_delegate = CreateInsecureFormPage(web_contents); } else if (path_without_query == "/https_only") { interstitial_delegate = CreateHttpsOnlyModePage(web_contents); @@ -26,4 +26,4 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) } else if (path_without_query == "/supervised-user-verify") { interstitial_delegate = CreateSupervisedUserVerificationPage(web_contents); - #endif + } else if (path_without_query == "/supervised-user-verify-blocked-site") { diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_management_management__ui.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_management_management__ui.cc index 74ea6ea6b925..a2a1be0e1a7a 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_management_management__ui.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_management_management__ui.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/management/management_ui.cc.orig 2024-07-31 14:19:23 UTC +--- chrome/browser/ui/webui/management/management_ui.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/ui/webui/management/management_ui.cc -@@ -100,11 +100,11 @@ content::WebUIDataSource* CreateAndAddManagementUIHtml +@@ -105,11 +105,11 @@ content::WebUIDataSource* CreateAndAddManagementUIHtml {kManagementOnFileTransferVisibleData, IDS_MANAGEMENT_FILE_TRANSFER_VISIBLE_DATA}, #endif // BUILDFLAG(IS_CHROMEOS) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_searchbox_searchbox__handler.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_searchbox_searchbox__handler.cc index 42ebf09c8baf..93e6475625dd 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_searchbox_searchbox__handler.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_searchbox_searchbox__handler.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/webui/searchbox/searchbox_handler.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/ui/webui/searchbox/searchbox_handler.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/ui/webui/searchbox/searchbox_handler.cc @@ -108,7 +108,7 @@ const char* kMacShareIconResourceName = #elif BUILDFLAG(IS_WIN) @@ -18,7 +18,7 @@ kLinuxShareIconResourceName = "//resources/cr_components/searchbox/icons/share_cr23.svg"; #else -@@ -675,7 +675,7 @@ std::string SearchboxHandler::ActionVectorIconToResour +@@ -674,7 +674,7 @@ std::string SearchboxHandler::ActionVectorIconToResour icon.name == omnibox::kShareWinChromeRefreshIcon.name) { return kWinShareIconResourceName; } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc index e68a86f949a1..9f47b4686b1d 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -140,7 +140,7 @@ +@@ -142,7 +142,7 @@ #include "chrome/browser/ui/chrome_pages.h" #endif @@ -9,7 +9,7 @@ #include "ui/display/screen.h" #endif -@@ -159,7 +159,7 @@ +@@ -161,7 +161,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 -@@ -279,7 +279,7 @@ void AddA11yStrings(content::WebUIDataSource* html_sou +@@ -281,7 +281,7 @@ void AddA11yStrings(content::WebUIDataSource* html_sou {"focusHighlightLabel", IDS_SETTINGS_ACCESSIBILITY_FOCUS_HIGHLIGHT_DESCRIPTION}, #endif @@ -27,7 +27,7 @@ {"overscrollHistoryNavigationTitle", IDS_SETTINGS_OVERSCROLL_HISTORY_NAVIGATION_TITLE}, {"overscrollHistoryNavigationSubtitle", -@@ -404,7 +404,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -406,7 +406,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht {"uiFeatureAlignLeft", IDS_SETTINGS_UI_FEATURE_ALIGN_LEFT}, {"uiFeatureAlignRight", IDS_SETTINGS_UI_FEATURE_ALIGN_RIGHT}, {"resetToDefault", IDS_SETTINGS_RESET_TO_DEFAULT}, @@ -36,7 +36,7 @@ {"gtkTheme", IDS_SETTINGS_GTK_THEME}, {"useGtkTheme", IDS_SETTINGS_USE_GTK_THEME}, {"qtTheme", IDS_SETTINGS_QT_THEME}, -@@ -412,7 +412,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -414,7 +414,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht {"classicTheme", IDS_SETTINGS_CLASSIC_THEME}, {"useClassicTheme", IDS_SETTINGS_USE_CLASSIC_THEME}, #endif @@ -45,7 +45,7 @@ {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS}, #endif #if BUILDFLAG(IS_MAC) -@@ -440,7 +440,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -442,7 +442,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc index fcfa72dc5fe6..53d6a59f327f 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_webui_signin_profile__picker__handler.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/signin/profile_picker_handler.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/ui/webui/signin/profile_picker_handler.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/ui/webui/signin/profile_picker_handler.cc -@@ -203,7 +203,7 @@ base::Value::Dict CreateProfileEntry(const ProfileAttr +@@ -205,7 +205,7 @@ base::Value::Dict CreateProfileEntry(const ProfileAttr if (AccountInfo::IsManaged(entry->GetHostedDomain())) { profile_entry.Set("avatarBadge", "cr:domain"); @@ -9,3 +9,12 @@ } else if (base::FeatureList::IsEnabled( supervised_user::kShowKiteForSupervisedUsers) && entry->IsSupervised()) { +@@ -1208,7 +1208,7 @@ void ProfilePickerHandler::BeginFirstWebContentsProfil + } + + void ProfilePickerHandler::MaybeUpdateGuestMode() { +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + if (!base::FeatureList::IsEnabled( + supervised_user::kHideGuestModeForSupervisedUsers)) { + return; diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_ui_window__sizer_window__sizer.cc b/www/ungoogled-chromium/files/patch-chrome_browser_ui_window__sizer_window__sizer.cc index a1edfca913ea..07c9bf338b68 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_ui_window__sizer_window__sizer.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_ui_window__sizer_window__sizer.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/window_sizer/window_sizer.cc.orig 2024-05-23 20:04:36 UTC +--- chrome/browser/ui/window_sizer/window_sizer.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/ui/window_sizer/window_sizer.cc -@@ -210,7 +210,7 @@ void WindowSizer::GetBrowserWindowBoundsAndShowState( +@@ -209,7 +209,7 @@ void WindowSizer::GetBrowserWindowBoundsAndShowState( browser, window_bounds, show_state); } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_visited__url__ranking_visited__url__ranking__service__factory.cc b/www/ungoogled-chromium/files/patch-chrome_browser_visited__url__ranking_visited__url__ranking__service__factory.cc index 824e9e5d7978..2f9a497bb82d 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_visited__url__ranking_visited__url__ranking__service__factory.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_visited__url__ranking_visited__url__ranking__service__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/visited_url_ranking/visited_url_ranking_service_factory.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/visited_url_ranking/visited_url_ranking_service_factory.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/visited_url_ranking/visited_url_ranking_service_factory.cc -@@ -41,7 +41,7 @@ +@@ -42,7 +42,7 @@ #include "components/visited_url_ranking/public/visited_url_ranking_service.h" #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ #include "chrome/browser/visited_url_ranking/desktop_tab_model_url_visit_data_fetcher.h" #elif BUILDFLAG(IS_ANDROID) #include "chrome/browser/visited_url_ranking/android_tab_model_url_visit_data_fetcher.h" -@@ -114,7 +114,7 @@ VisitedURLRankingServiceFactory::BuildServiceInstanceF +@@ -115,7 +115,7 @@ VisitedURLRankingServiceFactory::BuildServiceInstanceF std::map<Fetcher, std::unique_ptr<URLVisitDataFetcher>> data_fetchers; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_extension__status__utils.h b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_extension__status__utils.h index 5b8f50f4cb04..2c2896f03fbb 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_extension__status__utils.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_extension__status__utils.h @@ -1,8 +1,8 @@ ---- chrome/browser/web_applications/extension_status_utils.h.orig 2024-04-23 07:42:17 UTC +--- chrome/browser/web_applications/extension_status_utils.h.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/web_applications/extension_status_utils.h -@@ -55,7 +55,7 @@ bool IsExternalExtensionUninstalled(content::BrowserCo - bool ClearExternalExtensionUninstalled(content::BrowserContext* context, - const std::string& extension_id); +@@ -50,7 +50,7 @@ bool IsExtensionDefaultInstalled(content::BrowserConte + bool IsExternalExtensionUninstalled(content::BrowserContext* context, + const std::string& extension_id); -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc index d500e42c8d1c..913b881978a2 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc @@ -1,4 +1,4 @@ ---- chrome/browser/web_applications/extensions/extension_status_utils.cc.orig 2024-05-23 20:04:36 UTC +--- chrome/browser/web_applications/extensions/extension_status_utils.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/web_applications/extensions/extension_status_utils.cc @@ -25,7 +25,7 @@ namespace { @@ -9,8 +9,8 @@ // TODO(b/268221237): Remove this allow-list. const char kDefaultAllowedExtensionIds[] = "alhngdkjgnedakdlnamimgfihgkmenbh," -@@ -113,7 +113,7 @@ bool ClearExternalExtensionUninstalled(content::Browse - extension_id); +@@ -107,7 +107,7 @@ bool IsExternalExtensionUninstalled(content::BrowserCo + return prefs && prefs->IsExternalExtensionUninstalled(extension_id); } -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc index e44cc19e401e..602e0110a05d 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/os_integration/web_app_shortcut.cc.orig 2024-06-22 08:49:42 UTC +--- chrome/browser/web_applications/os_integration/web_app_shortcut.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/web_applications/os_integration/web_app_shortcut.cc -@@ -65,7 +65,7 @@ namespace { +@@ -71,7 +71,7 @@ namespace { #if BUILDFLAG(IS_MAC) const int kDesiredIconSizesForShortcut[] = {16, 32, 128, 256, 512}; @@ -9,7 +9,7 @@ // Linux supports icons of any size. FreeDesktop Icon Theme Specification states // that "Minimally you should install a 48x48 icon in the hicolor theme." const int kDesiredIconSizesForShortcut[] = {16, 32, 48, 128, 256, 512}; -@@ -227,7 +227,7 @@ std::unique_ptr<ShortcutInfo> BuildShortcutInfoWithout +@@ -259,7 +259,7 @@ std::unique_ptr<ShortcutInfo> BuildShortcutInfoWithout // TODO(crbug.com/40257107): Implement tests on Linux for using shortcuts_menu // actions. diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_policy_web__app__policy__manager.cc b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_policy_web__app__policy__manager.cc index 3ced30ec1e50..40a4195debd7 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_policy_web__app__policy__manager.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_policy_web__app__policy__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/policy/web_app_policy_manager.cc.orig 2024-05-23 20:04:36 UTC +--- chrome/browser/web_applications/policy/web_app_policy_manager.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/web_applications/policy/web_app_policy_manager.cc -@@ -101,7 +101,7 @@ namespace web_app { +@@ -102,7 +102,7 @@ namespace web_app { BASE_FEATURE(kDesktopPWAsForceUnregisterOSIntegration, "DesktopPWAsForceUnregisterOSIntegration", diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_web__app__install__info.h b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_web__app__install__info.h index 2d61d5ea2f07..0e124bee791c 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_web__app__install__info.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_web__applications_web__app__install__info.h @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/web_app_install_info.h.orig 2024-07-31 14:19:23 UTC +--- chrome/browser/web_applications/web_app_install_info.h.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/web_applications/web_app_install_info.h -@@ -38,7 +38,7 @@ +@@ -39,7 +39,7 @@ #include "url/gurl.h" static_assert(BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc b/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc index 434dd6b3d2ba..0e66deec2b43 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/webauthn/chrome_authenticator_request_delegate.cc -@@ -1095,7 +1095,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureDisc +@@ -1167,7 +1167,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureDisc g_observer->ConfiguringCable(request_type); } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_enclave__manager.cc b/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_enclave__manager.cc index b5cae7db8625..9bd7003aaab8 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_enclave__manager.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_webauthn_enclave__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/webauthn/enclave_manager.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/browser/webauthn/enclave_manager.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/browser/webauthn/enclave_manager.cc -@@ -686,7 +686,7 @@ base::flat_set<std::string> GetGaiaIDs( +@@ -693,7 +693,7 @@ base::flat_set<std::string> GetGaiaIDs( std::string UserVerifyingLabelToString(crypto::UserVerifyingKeyLabel label) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ return label; #else return std::string("placeholder"); -@@ -696,7 +696,7 @@ std::string UserVerifyingLabelToString(crypto::UserVer +@@ -703,7 +703,7 @@ std::string UserVerifyingLabelToString(crypto::UserVer std::optional<crypto::UserVerifyingKeyLabel> UserVerifyingKeyLabelFromString( std::string saved_label) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.cc b/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.cc index add44da14ccf..ab2eb84be79d 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.cc +++ b/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.cc @@ -1,4 +1,4 @@ ---- chrome/common/chrome_features.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/common/chrome_features.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/common/chrome_features.cc @@ -75,7 +75,7 @@ BASE_FEATURE(kUseAdHocSigningForWebAppShims, #endif // BUILDFLAG(IS_MAC) @@ -18,7 +18,7 @@ // Enables the Restart background mode optimization. When all Chrome UI is // closed and it goes in the background, allows to restart the browser to // discard memory. -@@ -260,7 +260,7 @@ BASE_FEATURE(kDesktopPWAsElidedExtensionsMenu, +@@ -256,7 +256,7 @@ BASE_FEATURE(kDesktopPWAsElidedExtensionsMenu, BASE_FEATURE(kDesktopPWAsRunOnOsLogin, "DesktopPWAsRunOnOsLogin", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -27,7 +27,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -309,7 +309,7 @@ BASE_FEATURE(kDesktopPWAsTabStripSettings, +@@ -305,7 +305,7 @@ BASE_FEATURE(kDesktopPWAsTabStripSettings, "DesktopPWAsTabStripSettings", base::FEATURE_DISABLED_BY_DEFAULT); @@ -36,7 +36,7 @@ // Controls whether Chrome Apps are supported. See https://crbug.com/1221251. // If the feature is disabled, Chrome Apps continue to work. If enabled, Chrome // Apps will not launch and will be marked in the UI as deprecated. -@@ -897,7 +897,7 @@ BASE_FEATURE(kKAnonymityServiceStorage, +@@ -883,7 +883,7 @@ BASE_FEATURE(kKAnonymityServiceStorage, "KAnonymityServiceStorage", base::FEATURE_ENABLED_BY_DEFAULT); @@ -45,7 +45,7 @@ BASE_FEATURE(kLinuxLowMemoryMonitor, "LinuxLowMemoryMonitor", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -910,7 +910,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit +@@ -896,7 +896,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit &kLinuxLowMemoryMonitor, "critical_level", 255}; #endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) diff --git a/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.h b/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.h index a3ae83a15cb3..0a6e6ddd355c 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.h +++ b/www/ungoogled-chromium/files/patch-chrome_common_chrome__features.h @@ -1,4 +1,4 @@ ---- chrome/common/chrome_features.h.orig 2024-08-26 14:40:28 UTC +--- chrome/common/chrome_features.h.orig 2024-10-01 07:26:23 UTC +++ chrome/common/chrome_features.h @@ -55,13 +55,13 @@ BASE_DECLARE_FEATURE(kUseAdHocSigningForWebAppShims); #endif // BUILDFLAG(IS_MAC) @@ -16,7 +16,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kBackgroundModeAllowRestart); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -192,7 +192,7 @@ BASE_DECLARE_FEATURE(kDesktopPWAsPreventClose); +@@ -190,7 +190,7 @@ BASE_DECLARE_FEATURE(kDesktopPWAsPreventClose); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kDesktopPWAsTabStripSettings); @@ -25,7 +25,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kChromeAppsDeprecation); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kShortcutsNotApps); -@@ -545,7 +545,7 @@ BASE_DECLARE_FEATURE(kKAnonymityServiceOHTTPRequests); +@@ -530,7 +530,7 @@ BASE_DECLARE_FEATURE(kKAnonymityServiceOHTTPRequests); COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kKAnonymityServiceStorage); @@ -34,7 +34,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kLinuxLowMemoryMonitor); COMPONENT_EXPORT(CHROME_FEATURES) extern const base::FeatureParam<int> kLinuxLowMemoryMonitorModerateLevel; -@@ -553,7 +553,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) +@@ -538,7 +538,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::FeatureParam<int> kLinuxLowMemoryMonitorCriticalLevel; #endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) diff --git a/www/ungoogled-chromium/files/patch-chrome_common_chrome__switches.cc b/www/ungoogled-chromium/files/patch-chrome_common_chrome__switches.cc index 67c53bcfd2c9..16dd90ba4ce7 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_chrome__switches.cc +++ b/www/ungoogled-chromium/files/patch-chrome_common_chrome__switches.cc @@ -1,6 +1,6 @@ ---- chrome/common/chrome_switches.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/common/chrome_switches.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/common/chrome_switches.cc -@@ -898,14 +898,14 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket- +@@ -886,14 +886,14 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket- #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_common_chrome__switches.h b/www/ungoogled-chromium/files/patch-chrome_common_chrome__switches.h index f8946bdab0f1..65d940e024fd 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_chrome__switches.h +++ b/www/ungoogled-chromium/files/patch-chrome_common_chrome__switches.h @@ -1,6 +1,6 @@ ---- chrome/common/chrome_switches.h.orig 2024-08-26 14:40:28 UTC +--- chrome/common/chrome_switches.h.orig 2024-10-01 07:26:23 UTC +++ chrome/common/chrome_switches.h -@@ -279,12 +279,12 @@ extern const char kAllowNaClSocketAPI[]; +@@ -275,12 +275,12 @@ extern const char kAllowNaClSocketAPI[]; #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_common_crash__keys.cc b/www/ungoogled-chromium/files/patch-chrome_common_crash__keys.cc new file mode 100644 index 000000000000..7e419f1f34f4 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-chrome_common_crash__keys.cc @@ -0,0 +1,28 @@ +--- chrome/common/crash_keys.cc.orig 2024-10-01 07:26:23 UTC ++++ chrome/common/crash_keys.cc +@@ -56,7 +56,9 @@ class CrashKeyWithName { + ~CrashKeyWithName() = delete; + + std::string_view Name() const { return name_; } ++#if BUILDFLAG(USE_CRASHPAD_ANNOTATION) + std::string_view Value() const { return crash_key_.value(); } ++#endif + void Clear() { crash_key_.Clear(); } + void Set(std::string_view value) { crash_key_.Set(value); } + +@@ -201,6 +203,7 @@ void AllocateCrashKeyInBrowserAndChildren(std::string_ + GetCommandLineStringAnnotations().emplace_back(std::string(key)).Set(value); + } + ++#if BUILDFLAG(USE_CRASHPAD_ANNOTATION) + void AppendStringAnnotationsCommandLineSwitch(base::CommandLine* command_line) { + std::string string_annotations; + for (const auto& crash_key : GetCommandLineStringAnnotations()) { +@@ -212,6 +215,7 @@ void AppendStringAnnotationsCommandLineSwitch(base::Co + } + command_line->AppendSwitchASCII(kStringAnnotationsSwitch, string_annotations); + } ++#endif + + void SetCrashKeysFromCommandLine(const base::CommandLine& command_line) { + SetStringAnnotations(command_line); diff --git a/www/ungoogled-chromium/files/patch-chrome_common_pref__names.h b/www/ungoogled-chromium/files/patch-chrome_common_pref__names.h index 35792be44e23..cfaa04b9e143 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_pref__names.h +++ b/www/ungoogled-chromium/files/patch-chrome_common_pref__names.h @@ -1,6 +1,6 @@ ---- chrome/common/pref_names.h.orig 2024-08-26 14:40:28 UTC +--- chrome/common/pref_names.h.orig 2024-10-01 07:26:23 UTC +++ chrome/common/pref_names.h -@@ -1364,7 +1364,7 @@ inline constexpr char kUseAshProxy[] = "lacros.proxy.u +@@ -1375,7 +1375,7 @@ inline constexpr char kUseAshProxy[] = "lacros.proxy.u // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ // Linux specific preference on whether we should match the system theme. inline constexpr char kSystemTheme[] = "extensions.theme.system_theme"; #endif -@@ -1507,7 +1507,7 @@ inline constexpr char kShowUpdatePromotionInfoBar[] = +@@ -1536,7 +1536,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"; -@@ -2112,7 +2112,7 @@ inline constexpr char kDownloadDefaultDirectory[] = +@@ -2143,7 +2143,7 @@ inline constexpr char kDownloadDefaultDirectory[] = inline constexpr char kDownloadDirUpgraded[] = "download.directory_upgrade"; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -27,7 +27,7 @@ inline constexpr char kOpenPdfDownloadInSystemReader[] = "download.open_pdf_in_system_reader"; #endif -@@ -2549,14 +2549,14 @@ inline constexpr char kMediaStorageIdSalt[] = "media.s +@@ -2586,14 +2586,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"; -@@ -2634,7 +2634,7 @@ inline constexpr char kAmbientAuthenticationInPrivateM +@@ -2671,7 +2671,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[] = -@@ -3164,7 +3164,7 @@ inline constexpr char kDeviceWeeklyScheduledSuspend[] +@@ -3213,7 +3213,7 @@ inline constexpr char kDeviceWeeklyScheduledSuspend[] #endif // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -62,7 +62,7 @@ // Defines administrator-set availability of Chrome for Testing. inline constexpr char kChromeForTestingAllowed[] = "chrome_for_testing.allowed"; #endif -@@ -3760,7 +3760,7 @@ inline constexpr char kFileOrDirectoryPickerWithoutGes +@@ -3809,7 +3809,7 @@ inline constexpr char kFileOrDirectoryPickerWithoutGes inline constexpr char kSandboxExternalProtocolBlocked[] = "profile.sandbox_external_protocol_blocked"; @@ -71,7 +71,7 @@ // Boolean that indicates if system notifications are allowed to be used in // place of Chrome notifications. inline constexpr char kAllowSystemNotifications[] = -@@ -4034,7 +4034,7 @@ inline constexpr char kLensDesktopNTPSearchEnabled[] = +@@ -4079,7 +4079,7 @@ inline constexpr char kLensDesktopNTPSearchEnabled[] = "policy.lens_desktop_ntp_search_enabled"; #endif @@ -80,7 +80,7 @@ // A dict mapping the edition name with the major version it was shown. inline constexpr char kWhatsNewEditionUsed[] = "browser.whats_new.edition_used"; // A list containing the features of each module in order of when they -@@ -4128,7 +4128,7 @@ inline constexpr char kPrintingOAuth2AuthorizationServ +@@ -4173,7 +4173,7 @@ inline constexpr char kPrintingOAuth2AuthorizationServ "printing.oauth2_authorization_servers"; #endif diff --git a/www/ungoogled-chromium/files/patch-chrome_common_webui__url__constants.h b/www/ungoogled-chromium/files/patch-chrome_common_webui__url__constants.h index b4e3162da497..116c0faef640 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_webui__url__constants.h +++ b/www/ungoogled-chromium/files/patch-chrome_common_webui__url__constants.h @@ -1,6 +1,6 @@ ---- chrome/common/webui_url_constants.h.orig 2024-08-26 14:40:28 UTC +--- chrome/common/webui_url_constants.h.orig 2024-10-01 07:26:23 UTC +++ chrome/common/webui_url_constants.h -@@ -564,24 +564,24 @@ inline constexpr char16_t kOsUISystemURL[] = u"os://sy +@@ -566,24 +566,24 @@ inline constexpr char16_t kOsUISystemURL[] = u"os://sy inline constexpr char kOsUIVersionURL[] = "os://version"; #endif @@ -29,7 +29,7 @@ inline constexpr char kChromeUIWebAppSettingsHost[] = "app-settings"; inline constexpr char kChromeUIWebAppSettingsURL[] = "chrome://app-settings/"; inline constexpr char kChromeUIWhatsNewHost[] = "whats-new"; -@@ -593,13 +593,13 @@ inline constexpr char kChromeUILinuxProxyConfigHost[] +@@ -595,13 +595,13 @@ inline constexpr char kChromeUILinuxProxyConfigHost[] #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -45,7 +45,7 @@ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) inline constexpr char kChromeUIBrowserSwitchHost[] = "browser-switch"; inline constexpr char kChromeUIBrowserSwitchURL[] = "chrome://browser-switch/"; -@@ -621,7 +621,7 @@ inline constexpr char kChromeUIProfilePickerStartupQue +@@ -623,7 +623,7 @@ inline constexpr char kChromeUIProfilePickerStartupQue inline constexpr char kChromeUIProfilePickerUrl[] = "chrome://profile-picker/"; #endif diff --git a/www/ungoogled-chromium/files/patch-chrome_enterprise__companion_enterprise__companion__client.cc b/www/ungoogled-chromium/files/patch-chrome_enterprise__companion_enterprise__companion__client.cc index 51a1743a5015..ea8e6e6edf92 100644 --- a/www/ungoogled-chromium/files/patch-chrome_enterprise__companion_enterprise__companion__client.cc +++ b/www/ungoogled-chromium/files/patch-chrome_enterprise__companion_enterprise__companion__client.cc @@ -1,6 +1,6 @@ ---- chrome/enterprise_companion/enterprise_companion_client.cc.orig 2024-08-26 14:40:28 UTC +--- chrome/enterprise_companion/enterprise_companion_client.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/enterprise_companion/enterprise_companion_client.cc -@@ -33,7 +33,7 @@ namespace { +@@ -36,7 +36,7 @@ namespace { #if BUILDFLAG(IS_MAC) constexpr char kServerName[] = MAC_BUNDLE_IDENTIFIER_STRING ".service"; diff --git a/www/ungoogled-chromium/files/patch-chrome_test_chromedriver_key__converter__unittest.cc b/www/ungoogled-chromium/files/patch-chrome_test_chromedriver_key__converter__unittest.cc index 824f38e7e4ab..7c5e29de9a50 100644 --- a/www/ungoogled-chromium/files/patch-chrome_test_chromedriver_key__converter__unittest.cc +++ b/www/ungoogled-chromium/files/patch-chrome_test_chromedriver_key__converter__unittest.cc @@ -1,6 +1,6 @@ ---- chrome/test/chromedriver/key_converter_unittest.cc.orig 2022-10-01 07:40:07 UTC +--- chrome/test/chromedriver/key_converter_unittest.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/test/chromedriver/key_converter_unittest.cc -@@ -246,7 +246,7 @@ TEST(KeyConverter, ToggleModifiers) { +@@ -251,7 +251,7 @@ TEST(KeyConverter, ToggleModifiers) { CheckEventsReleaseModifiers(keys, key_events); } @@ -9,7 +9,7 @@ // Fails on bots: crbug.com/174962 #define MAYBE_AllEnglishKeyboardSymbols DISABLED_AllEnglishKeyboardSymbols #else -@@ -303,7 +303,7 @@ TEST(KeyConverter, AllEnglishKeyboardTextChars) { +@@ -308,7 +308,7 @@ TEST(KeyConverter, AllEnglishKeyboardTextChars) { TEST(KeyConverter, AllSpecialWebDriverKeysOnEnglishKeyboard) { ui::ScopedKeyboardLayout keyboard_layout(ui::KEYBOARD_LAYOUT_ENGLISH_US); const char kTextForKeys[] = { diff --git a/www/ungoogled-chromium/files/patch-chrome_utility_services.cc b/www/ungoogled-chromium/files/patch-chrome_utility_services.cc index c7b38d068b9f..2c9cf11faa24 100644 --- a/www/ungoogled-chromium/files/patch-chrome_utility_services.cc +++ b/www/ungoogled-chromium/files/patch-chrome_utility_services.cc @@ -1,6 +1,6 @@ ---- chrome/utility/services.cc.orig 2024-07-31 14:19:23 UTC +--- chrome/utility/services.cc.orig 2024-10-01 07:26:23 UTC +++ chrome/utility/services.cc -@@ -57,7 +57,7 @@ +@@ -51,7 +51,7 @@ #include "chrome/services/system_signals/mac/mac_system_signals_service.h" #endif // BUILDFLAG(IS_MAC) @@ -9,7 +9,7 @@ #include "chrome/services/system_signals/linux/linux_system_signals_service.h" #endif // BUILDFLAG(IS_LINUX) -@@ -214,7 +214,7 @@ auto RunMacNotificationService( +@@ -208,7 +208,7 @@ auto RunMacNotificationService( } #endif // BUILDFLAG(IS_MAC) @@ -18,7 +18,7 @@ auto RunSystemSignalsService( mojo::PendingReceiver<device_signals::mojom::SystemSignalsService> receiver) { -@@ -481,7 +481,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& +@@ -465,7 +465,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& services.Add(RunWindowsIconReader); #endif // BUILDFLAG(IS_WIN) diff --git a/www/ungoogled-chromium/files/patch-components_autofill_core_browser_autofill__optimization__guide.cc b/www/ungoogled-chromium/files/patch-components_autofill_core_browser_autofill__optimization__guide.cc new file mode 100644 index 000000000000..1af75556c63a --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_autofill_core_browser_autofill__optimization__guide.cc @@ -0,0 +1,11 @@ +--- components/autofill/core/browser/autofill_optimization_guide.cc.orig 2024-10-01 07:26:23 UTC ++++ components/autofill/core/browser/autofill_optimization_guide.cc +@@ -186,7 +186,7 @@ void AutofillOptimizationGuide::OnDidParseForm( + } + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + if (has_credit_card_field && + !personal_data_manager->payments_data_manager() + .GetServerCreditCards() diff --git a/www/ungoogled-chromium/files/patch-components_autofill_core_browser_payments__data__manager.cc b/www/ungoogled-chromium/files/patch-components_autofill_core_browser_payments__data__manager.cc index 461f84c7444b..07ddb273683a 100644 --- a/www/ungoogled-chromium/files/patch-components_autofill_core_browser_payments__data__manager.cc +++ b/www/ungoogled-chromium/files/patch-components_autofill_core_browser_payments__data__manager.cc @@ -1,6 +1,6 @@ ---- components/autofill/core/browser/payments_data_manager.cc.orig 2024-08-26 14:40:28 UTC +--- components/autofill/core/browser/payments_data_manager.cc.orig 2024-10-01 07:26:23 UTC +++ components/autofill/core/browser/payments_data_manager.cc -@@ -1055,7 +1055,7 @@ bool PaymentsDataManager::ShouldShowCardsFromAccountOp +@@ -1057,7 +1057,7 @@ bool PaymentsDataManager::ShouldShowCardsFromAccountOp // The feature is only for Linux, Windows, Mac, and Fuchsia. // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__features.cc b/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__features.cc deleted file mode 100644 index 9ee4126177b2..000000000000 --- a/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__features.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- components/autofill/core/common/autofill_features.cc.orig 2024-08-26 14:40:28 UTC -+++ components/autofill/core/common/autofill_features.cc -@@ -673,7 +673,7 @@ BASE_FEATURE(kAutofillSilentProfileUpdateForInsufficie - // Enabled by default for Mac and Windows platforms. - BASE_FEATURE(kAutofillContentEditableChangeEvents, - "AutofillContentEditableChangeEvents", --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - base::FEATURE_ENABLED_BY_DEFAULT - #else - base::FEATURE_DISABLED_BY_DEFAULT diff --git a/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc b/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc index 629258c79f09..c353c8a7b987 100644 --- a/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc +++ b/www/ungoogled-chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc @@ -1,4 +1,4 @@ ---- components/autofill/core/common/autofill_payments_features.cc.orig 2024-08-26 14:40:28 UTC +--- components/autofill/core/common/autofill_payments_features.cc.orig 2024-10-01 07:26:23 UTC +++ components/autofill/core/common/autofill_payments_features.cc @@ -8,7 +8,7 @@ @@ -9,7 +9,7 @@ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) // When enabled, Chrome will extract the checkout amount from the checkout page // of the allowlisted merchant websites. -@@ -272,7 +272,7 @@ BASE_FEATURE(kAutofillSyncEwalletAccounts, +@@ -292,7 +292,7 @@ BASE_FEATURE(kAutofillSyncEwalletAccounts, bool ShouldShowImprovedUserConsentForCreditCardSave() { // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/files/patch-components_commerce_core_commerce__feature__list.cc b/www/ungoogled-chromium/files/patch-components_commerce_core_commerce__feature__list.cc index 6e8957f87a96..d4d859bc6227 100644 --- a/www/ungoogled-chromium/files/patch-components_commerce_core_commerce__feature__list.cc +++ b/www/ungoogled-chromium/files/patch-components_commerce_core_commerce__feature__list.cc @@ -1,4 +1,4 @@ ---- components/commerce/core/commerce_feature_list.cc.orig 2024-08-26 14:40:28 UTC +--- components/commerce/core/commerce_feature_list.cc.orig 2024-10-01 07:26:23 UTC +++ components/commerce/core/commerce_feature_list.cc @@ -168,7 +168,7 @@ BASE_FEATURE(kPriceInsights, "PriceInsights", @@ -9,7 +9,7 @@ BASE_FEATURE(kPriceInsightsRegionLaunched, "PriceInsightsRegionLaunched", base::FEATURE_ENABLED_BY_DEFAULT); -@@ -261,7 +261,7 @@ const base::FeatureParam<bool> kDeleteAllMerchantsOnCl +@@ -272,7 +272,7 @@ const base::FeatureParam<bool> kDeleteAllMerchantsOnCl BASE_FEATURE(kShoppingList, "ShoppingList", base::FEATURE_DISABLED_BY_DEFAULT); #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ diff --git a/www/ungoogled-chromium/files/patch-components_constrained__window_constrained__window__views.cc b/www/ungoogled-chromium/files/patch-components_constrained__window_constrained__window__views.cc index 5870f85efada..4f20e4e0ac9f 100644 --- a/www/ungoogled-chromium/files/patch-components_constrained__window_constrained__window__views.cc +++ b/www/ungoogled-chromium/files/patch-components_constrained__window_constrained__window__views.cc @@ -1,6 +1,6 @@ ---- components/constrained_window/constrained_window_views.cc.orig 2024-08-26 14:40:28 UTC +--- components/constrained_window/constrained_window_views.cc.orig 2024-10-01 07:26:23 UTC +++ components/constrained_window/constrained_window_views.cc -@@ -369,7 +369,7 @@ bool SupportsGlobalScreenCoordinates() { +@@ -371,7 +371,7 @@ bool SupportsGlobalScreenCoordinates() { } bool PlatformClipsChildrenToViewport() { diff --git a/www/ungoogled-chromium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc b/www/ungoogled-chromium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc index ebe28b169889..f762a14a5f94 100644 --- a/www/ungoogled-chromium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc +++ b/www/ungoogled-chromium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc @@ -1,6 +1,6 @@ ---- components/discardable_memory/service/discardable_shared_memory_manager.cc.orig 2024-06-22 08:49:42 UTC +--- components/discardable_memory/service/discardable_shared_memory_manager.cc.orig 2024-10-01 07:26:23 UTC +++ components/discardable_memory/service/discardable_shared_memory_manager.cc -@@ -176,7 +176,7 @@ uint64_t GetDefaultMemoryLimit() { +@@ -172,7 +172,7 @@ uint64_t GetDefaultMemoryLimit() { // Limits the number of FDs used to 32, assuming a 4MB allocation size. uint64_t max_default_memory_limit = 128 * kMegabyte; #else diff --git a/www/ungoogled-chromium/files/patch-components_eye__dropper_eye__dropper__view.cc b/www/ungoogled-chromium/files/patch-components_eye__dropper_eye__dropper__view.cc index e04bc78a2d7d..609a1ea78eb4 100644 --- a/www/ungoogled-chromium/files/patch-components_eye__dropper_eye__dropper__view.cc +++ b/www/ungoogled-chromium/files/patch-components_eye__dropper_eye__dropper__view.cc @@ -1,6 +1,6 @@ ---- components/eye_dropper/eye_dropper_view.cc.orig 2024-07-31 14:19:23 UTC +--- components/eye_dropper/eye_dropper_view.cc.orig 2024-10-01 07:26:23 UTC +++ components/eye_dropper/eye_dropper_view.cc -@@ -202,7 +202,7 @@ EyeDropperView::EyeDropperView(gfx::NativeView parent, +@@ -203,7 +203,7 @@ EyeDropperView::EyeDropperView(gfx::NativeView parent, // EyeDropper/WidgetDelegate. set_owned_by_client(); SetPreferredSize(GetSize()); diff --git a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__configurations.cc b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__configurations.cc index 7fdb9c153ccd..6ff8f1002806 100644 --- a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__configurations.cc +++ b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__configurations.cc @@ -1,6 +1,6 @@ ---- components/feature_engagement/public/feature_configurations.cc.orig 2024-08-26 14:40:28 UTC +--- components/feature_engagement/public/feature_configurations.cc.orig 2024-10-01 07:26:23 UTC +++ components/feature_engagement/public/feature_configurations.cc -@@ -99,7 +99,7 @@ std::optional<FeatureConfig> CreateNewUserGestureInPro +@@ -94,7 +94,7 @@ std::optional<FeatureConfig> CreateNewUserGestureInPro std::optional<FeatureConfig> GetClientSideFeatureConfig( const base::Feature* feature) { @@ -9,7 +9,7 @@ // The IPH bubble for link capturing has a trigger set to ANY so that it // always shows up. The per app specific guardrails are independently stored -@@ -118,7 +118,7 @@ std::optional<FeatureConfig> GetClientSideFeatureConfi +@@ -113,7 +113,7 @@ std::optional<FeatureConfig> GetClientSideFeatureConfi #endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -18,7 +18,7 @@ if (kIPHPasswordsManagementBubbleAfterSaveFeature.name == feature->name) { std::optional<FeatureConfig> config = FeatureConfig(); config->valid = true; -@@ -1599,7 +1599,8 @@ std::optional<FeatureConfig> GetClientSideFeatureConfi +@@ -1643,7 +1643,8 @@ std::optional<FeatureConfig> GetClientSideFeatureConfi #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__constants.cc b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__constants.cc index 2ecec3fcbba7..a265876938c2 100644 --- a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__constants.cc +++ b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__constants.cc @@ -1,4 +1,4 @@ ---- components/feature_engagement/public/feature_constants.cc.orig 2024-08-26 14:40:28 UTC +--- components/feature_engagement/public/feature_constants.cc.orig 2024-10-01 07:26:23 UTC +++ components/feature_engagement/public/feature_constants.cc @@ -18,7 +18,7 @@ BASE_FEATURE(kIPHDemoMode, "IPH_DemoMode", base::FEATU BASE_FEATURE(kIPHDummyFeature, "IPH_Dummy", base::FEATURE_DISABLED_BY_DEFAULT); @@ -9,7 +9,7 @@ #if BUILDFLAG(GOOGLE_CHROME_BRANDING) BASE_FEATURE(kEsbDownloadRowPromoFeature, "EsbDownloadRowPromo", -@@ -637,7 +637,8 @@ BASE_FEATURE(kDefaultBrowserTriggerCriteriaExperiment, +@@ -630,7 +630,8 @@ BASE_FEATURE(kDefaultBrowserTriggerCriteriaExperiment, #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -19,7 +19,7 @@ BASE_FEATURE(kIPHAutofillCreditCardBenefitFeature, "IPH_AutofillCreditCardBenefit", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -771,7 +772,7 @@ BASE_FEATURE(kIPHScalableIphGamingFeature, +@@ -767,7 +768,7 @@ BASE_FEATURE(kIPHScalableIphGamingFeature, base::FEATURE_DISABLED_BY_DEFAULT); #endif diff --git a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__constants.h b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__constants.h index 6154b1786821..bef0357d9ceb 100644 --- a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__constants.h +++ b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__constants.h @@ -1,4 +1,4 @@ ---- components/feature_engagement/public/feature_constants.h.orig 2024-08-26 14:40:28 UTC +--- components/feature_engagement/public/feature_constants.h.orig 2024-10-01 07:26:23 UTC +++ components/feature_engagement/public/feature_constants.h @@ -20,7 +20,7 @@ BASE_DECLARE_FEATURE(kIPHDemoMode); BASE_DECLARE_FEATURE(kIPHDummyFeature); @@ -9,7 +9,7 @@ #if BUILDFLAG(GOOGLE_CHROME_BRANDING) BASE_DECLARE_FEATURE(kEsbDownloadRowPromoFeature); #endif -@@ -264,7 +264,8 @@ BASE_DECLARE_FEATURE(kDefaultBrowserTriggerCriteriaExp +@@ -255,7 +255,8 @@ BASE_DECLARE_FEATURE(kDefaultBrowserTriggerCriteriaExp #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -17,14 +17,14 @@ + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ + BUILDFLAG(IS_BSD) BASE_DECLARE_FEATURE(kIPHAutofillCreditCardBenefitFeature); + BASE_DECLARE_FEATURE(kIPHAutofillDisabledVirtualCardSuggestionFeature); BASE_DECLARE_FEATURE(kIPHAutofillExternalAccountProfileSuggestionFeature); - BASE_DECLARE_FEATURE(kIPHAutofillManualFallbackFeature); -@@ -314,7 +315,7 @@ BASE_DECLARE_FEATURE(kIPHScalableIphHelpAppBasedTenFea +@@ -306,7 +307,7 @@ BASE_DECLARE_FEATURE(kIPHScalableIphHelpAppBasedTenFea BASE_DECLARE_FEATURE(kIPHScalableIphGamingFeature); #endif -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) BASE_DECLARE_FEATURE(kIPHDesktopPWAsLinkCapturingLaunch); + BASE_DECLARE_FEATURE(kIPHToolbarManagementButtonFeature); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) - diff --git a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__list.cc b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__list.cc index dc75d40a2aa6..6a44f1c4449f 100644 --- a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__list.cc +++ b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__list.cc @@ -1,7 +1,7 @@ ---- components/feature_engagement/public/feature_list.cc.orig 2024-08-26 14:40:28 UTC +--- components/feature_engagement/public/feature_list.cc.orig 2024-10-01 07:26:23 UTC +++ components/feature_engagement/public/feature_list.cc -@@ -155,7 +155,7 @@ const base::Feature* const kAllFeatures[] = { - &kIPHiOSContextualPanelPriceInsightsFeature, +@@ -162,7 +162,7 @@ const base::Feature* const kAllFeatures[] = { + &kIPHHomeCustomizationMenuFeature, #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) @@ -9,7 +9,7 @@ #if BUILDFLAG(GOOGLE_CHROME_BRANDING) &kEsbDownloadRowPromoFeature, #endif -@@ -223,7 +223,8 @@ const base::Feature* const kAllFeatures[] = { +@@ -227,7 +227,8 @@ const base::Feature* const kAllFeatures[] = { // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -17,14 +17,14 @@ + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ + BUILDFLAG(IS_BSD) &kIPHAutofillCreditCardBenefitFeature, + &kIPHAutofillDisabledVirtualCardSuggestionFeature, &kIPHAutofillExternalAccountProfileSuggestionFeature, - &kIPHAutofillManualFallbackFeature, -@@ -273,7 +274,7 @@ const base::Feature* const kAllFeatures[] = { +@@ -278,7 +279,7 @@ const base::Feature* const kAllFeatures[] = { &kIPHScalableIphGamingFeature, #endif // BUILDFLAG(IS_CHROMEOS_ASH) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) &kIPHDesktopPWAsLinkCapturingLaunch, + &kIPHToolbarManagementButtonFeature, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) - diff --git a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__list.h b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__list.h index c5d8031e1005..1a859e904e75 100644 --- a/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__list.h +++ b/www/ungoogled-chromium/files/patch-components_feature__engagement_public_feature__list.h @@ -1,6 +1,6 @@ ---- components/feature_engagement/public/feature_list.h.orig 2024-08-26 14:40:28 UTC +--- components/feature_engagement/public/feature_list.h.orig 2024-10-01 07:26:23 UTC +++ components/feature_engagement/public/feature_list.h -@@ -278,7 +278,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSContextualPanelPriceInsi +@@ -282,7 +282,7 @@ DEFINE_VARIATION_PARAM(kIPHHomeCustomizationMenuFeatur #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ #if BUILDFLAG(GOOGLE_CHROME_BRANDING) DEFINE_VARIATION_PARAM(kEsbDownloadRowPromoFeature, "EsbDownloadRowPromo"); #endif -@@ -385,7 +385,8 @@ DEFINE_VARIATION_PARAM(kIPHTabGroupsSaveV2CloseGroupFe +@@ -383,7 +383,8 @@ DEFINE_VARIATION_PARAM(kIPHTabGroupsSaveV2CloseGroupFe // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -18,8 +18,8 @@ + BUILDFLAG(IS_BSD) DEFINE_VARIATION_PARAM(kIPHAutofillCreditCardBenefitFeature, "IPH_AutofillCreditCardBenefit"); - DEFINE_VARIATION_PARAM(kIPHAutofillExternalAccountProfileSuggestionFeature, -@@ -474,7 +475,7 @@ DEFINE_VARIATION_PARAM(kIPHScalableIphHelpAppBasedTenF + +@@ -475,7 +476,7 @@ DEFINE_VARIATION_PARAM(kIPHScalableIphHelpAppBasedTenF DEFINE_VARIATION_PARAM(kIPHScalableIphGamingFeature, "IPH_ScalableIphGaming"); #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -27,17 +27,17 @@ +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) DEFINE_VARIATION_PARAM(kIPHDesktopPWAsLinkCapturingLaunch, "IPH_DesktopPWAsLinkCapturingLaunch"); - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -632,7 +633,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation - VARIATION_ENTRY(kIPHiOSContextualPanelSampleModelFeature), + DEFINE_VARIATION_PARAM(kIPHToolbarManagementButtonFeature, +@@ -637,7 +638,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation VARIATION_ENTRY(kIPHiOSContextualPanelPriceInsightsFeature), + VARIATION_ENTRY(kIPHHomeCustomizationMenuFeature), #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) VARIATION_ENTRY(kIPHBatterySaverModeFeature), VARIATION_ENTRY(kIPHCompanionSidePanelFeature), VARIATION_ENTRY(kIPHCompanionSidePanelRegionSearchFeature), -@@ -690,7 +691,8 @@ constexpr flags_ui::FeatureEntry::FeatureVariation +@@ -692,7 +693,8 @@ constexpr flags_ui::FeatureEntry::FeatureVariation // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -45,14 +45,14 @@ + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ + BUILDFLAG(IS_BSD) VARIATION_ENTRY(kIPHAutofillCreditCardBenefitFeature), + VARIATION_ENTRY(kIPHAutofillDisabledVirtualCardSuggestionFeature), VARIATION_ENTRY(kIPHAutofillExternalAccountProfileSuggestionFeature), - VARIATION_ENTRY(kIPHAutofillManualFallbackFeature), -@@ -741,7 +743,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation +@@ -744,7 +746,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation VARIATION_ENTRY(kIPHScalableIphGamingFeature), #endif // BUILDFLAG(IS_CHROMEOS_ASH) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) VARIATION_ENTRY(kIPHDesktopPWAsLinkCapturingLaunch), + VARIATION_ENTRY(kIPHToolbarManagementButtonFeature), #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) - diff --git a/www/ungoogled-chromium/files/patch-components_feed_core_v2_feed__network__impl__unittest.cc b/www/ungoogled-chromium/files/patch-components_feed_core_v2_feed__network__impl__unittest.cc index 0c94b1bc6171..13a93fb938bc 100644 --- a/www/ungoogled-chromium/files/patch-components_feed_core_v2_feed__network__impl__unittest.cc +++ b/www/ungoogled-chromium/files/patch-components_feed_core_v2_feed__network__impl__unittest.cc @@ -1,6 +1,6 @@ ---- components/feed/core/v2/feed_network_impl_unittest.cc.orig 2024-08-26 14:40:28 UTC +--- components/feed/core/v2/feed_network_impl_unittest.cc.orig 2024-10-01 07:26:23 UTC +++ components/feed/core/v2/feed_network_impl_unittest.cc -@@ -752,8 +752,8 @@ TEST_F(FeedNetworkTest, SendApiRequest_DecodesClientIn +@@ -747,8 +747,8 @@ TEST_F(FeedNetworkTest, SendApiRequest_DecodesClientIn EXPECT_EQ(feedwire::ClientInfo::CHROME_ANDROID, client_info.app_type()); EXPECT_EQ(feedwire::Version::RELEASE, client_info.app_version().build_type()); diff --git a/www/ungoogled-chromium/files/patch-components_flags__ui_flags__state.cc b/www/ungoogled-chromium/files/patch-components_flags__ui_flags__state.cc index 55da3914c08c..2b017c488b99 100644 --- a/www/ungoogled-chromium/files/patch-components_flags__ui_flags__state.cc +++ b/www/ungoogled-chromium/files/patch-components_flags__ui_flags__state.cc @@ -1,6 +1,6 @@ ---- components/flags_ui/flags_state.cc.orig 2024-08-26 14:40:28 UTC +--- components/flags_ui/flags_state.cc.orig 2024-10-01 07:26:23 UTC +++ components/flags_ui/flags_state.cc -@@ -759,7 +759,7 @@ unsigned short FlagsState::GetCurrentPlatform() { +@@ -764,7 +764,7 @@ unsigned short FlagsState::GetCurrentPlatform() { return kOsCrOS; #elif BUILDFLAG(IS_CHROMEOS_LACROS) return kOsLacros; diff --git a/www/ungoogled-chromium/files/patch-components_gwp__asan_crash__handler_crash__analyzer.cc b/www/ungoogled-chromium/files/patch-components_gwp__asan_crash__handler_crash__analyzer.cc index 371650d56278..5c8c2dee2645 100644 --- a/www/ungoogled-chromium/files/patch-components_gwp__asan_crash__handler_crash__analyzer.cc +++ b/www/ungoogled-chromium/files/patch-components_gwp__asan_crash__handler_crash__analyzer.cc @@ -1,6 +1,6 @@ ---- components/gwp_asan/crash_handler/crash_analyzer.cc.orig 2024-04-23 07:42:17 UTC +--- components/gwp_asan/crash_handler/crash_analyzer.cc.orig 2024-10-01 07:26:23 UTC +++ components/gwp_asan/crash_handler/crash_analyzer.cc -@@ -30,7 +30,7 @@ +@@ -35,7 +35,7 @@ #include "third_party/crashpad/crashpad/snapshot/process_snapshot.h" #include "third_party/crashpad/crashpad/util/process/process_memory.h" @@ -9,7 +9,7 @@ #include <signal.h> #elif BUILDFLAG(IS_APPLE) #include <mach/exception_types.h> -@@ -90,7 +90,7 @@ bool CrashAnalyzer::GetExceptionInfo( +@@ -95,7 +95,7 @@ bool CrashAnalyzer::GetExceptionInfo( crashpad::VMAddress CrashAnalyzer::GetAccessAddress( const crashpad::ExceptionSnapshot& exception) { diff --git a/www/ungoogled-chromium/files/patch-components_named__mojo__ipc__server_connection__info.h b/www/ungoogled-chromium/files/patch-components_named__mojo__ipc__server_connection__info.h index d0723006e2ba..49f6e8405174 100644 --- a/www/ungoogled-chromium/files/patch-components_named__mojo__ipc__server_connection__info.h +++ b/www/ungoogled-chromium/files/patch-components_named__mojo__ipc__server_connection__info.h @@ -1,6 +1,6 @@ ---- components/named_mojo_ipc_server/connection_info.h.orig 2024-03-22 14:16:19 UTC +--- components/named_mojo_ipc_server/connection_info.h.orig 2024-10-01 07:26:23 UTC +++ components/named_mojo_ipc_server/connection_info.h -@@ -14,7 +14,7 @@ +@@ -12,7 +12,7 @@ #include "base/win/scoped_handle.h" #elif BUILDFLAG(IS_MAC) #include <bsm/libbsm.h> @@ -9,9 +9,9 @@ #include <sys/socket.h> #endif -@@ -33,7 +33,7 @@ struct ConnectionInfo { - std::optional<base::win::ScopedHandle> impersonation_token{}; - #elif BUILDFLAG(IS_MAC) +@@ -29,7 +29,7 @@ struct ConnectionInfo { + base::ProcessId pid{}; + #if BUILDFLAG(IS_MAC) audit_token_t audit_token{}; -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/ungoogled-chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc b/www/ungoogled-chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc index 393cf92d1939..1996ff797a28 100644 --- a/www/ungoogled-chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc +++ b/www/ungoogled-chromium/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 2024-06-22 08:49:42 UTC +--- components/network_session_configurator/browser/network_session_configurator.cc.orig 2024-10-01 07:26:23 UTC +++ components/network_session_configurator/browser/network_session_configurator.cc -@@ -825,7 +825,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C +@@ -839,7 +839,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/ungoogled-chromium/files/patch-components_network__session__configurator_browser_network__session__configurator__unittest.cc b/www/ungoogled-chromium/files/patch-components_network__session__configurator_browser_network__session__configurator__unittest.cc index eb785d2159df..5c2c0e2cfdef 100644 --- a/www/ungoogled-chromium/files/patch-components_network__session__configurator_browser_network__session__configurator__unittest.cc +++ b/www/ungoogled-chromium/files/patch-components_network__session__configurator_browser_network__session__configurator__unittest.cc @@ -1,6 +1,6 @@ ---- components/network_session_configurator/browser/network_session_configurator_unittest.cc.orig 2024-06-22 08:49:42 UTC +--- components/network_session_configurator/browser/network_session_configurator_unittest.cc.orig 2024-10-01 07:26:23 UTC +++ components/network_session_configurator/browser/network_session_configurator_unittest.cc -@@ -782,7 +782,7 @@ TEST_F(NetworkSessionConfiguratorTest, HostRules) { +@@ -828,7 +828,7 @@ TEST_F(NetworkSessionConfiguratorTest, HostRules) { TEST_F(NetworkSessionConfiguratorTest, DefaultCacheBackend) { #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/ungoogled-chromium/files/patch-components_os__crypt_sync_os__crypt.h b/www/ungoogled-chromium/files/patch-components_os__crypt_sync_os__crypt.h index cff4fcd4f98e..46509e60be6b 100644 --- a/www/ungoogled-chromium/files/patch-components_os__crypt_sync_os__crypt.h +++ b/www/ungoogled-chromium/files/patch-components_os__crypt_sync_os__crypt.h @@ -1,4 +1,4 @@ ---- components/os_crypt/sync/os_crypt.h.orig 2023-05-05 12:12:41 UTC +--- components/os_crypt/sync/os_crypt.h.orig 2024-10-01 07:26:23 UTC +++ components/os_crypt/sync/os_crypt.h @@ -14,7 +14,7 @@ #include "build/build_config.h" @@ -11,7 +11,7 @@ @@ -23,7 +23,7 @@ class PrefRegistrySimple; class PrefService; - #endif + #endif // BUILDFLAG(IS_WIN) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_APPLE) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manager.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manager.cc index edb803658f78..ceb227822cef 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manager.cc +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manager.cc @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/password_manager.cc.orig 2024-08-26 14:40:28 UTC +--- components/password_manager/core/browser/password_manager.cc.orig 2024-10-01 07:26:23 UTC +++ components/password_manager/core/browser/password_manager.cc -@@ -425,7 +425,7 @@ void PasswordManager::RegisterProfilePrefs( +@@ -414,7 +414,7 @@ void PasswordManager::RegisterProfilePrefs( prefs::kAutofillableCredentialsAccountStoreLoginDatabase, false); #endif // BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS) registry->RegisterBooleanPref(prefs::kPasswordSharingEnabled, true); @@ -9,7 +9,7 @@ registry->RegisterIntegerPref(prefs::kRelaunchChromeBubbleDismissedCounter, 0); #endif -@@ -438,7 +438,7 @@ void PasswordManager::RegisterProfilePrefs( +@@ -427,7 +427,7 @@ void PasswordManager::RegisterProfilePrefs( #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manager__client.h b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manager__client.h index f981d15645fa..96fa2ce25bcd 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manager__client.h +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manager__client.h @@ -1,4 +1,4 @@ ---- components/password_manager/core/browser/password_manager_client.h.orig 2024-08-26 14:40:28 UTC +--- components/password_manager/core/browser/password_manager_client.h.orig 2024-10-01 07:26:23 UTC +++ components/password_manager/core/browser/password_manager_client.h @@ -30,7 +30,7 @@ #include "net/cert/cert_status_flags.h" @@ -15,6 +15,6 @@ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // Creates and show the cross domain confirmation popup. - virtual std::unique_ptr<PasswordCrossDomainConfirmationPopupController> - ShowCrossDomainConfirmationPopup(const gfx::RectF& element_bounds, + + // Shows the bubble with the details of the `form`. + virtual void OpenPasswordDetailsBubble( diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.cc index 43a4bf5bfd58..133828c42ef4 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.cc +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.cc @@ -1,6 +1,15 @@ ---- components/password_manager/core/browser/password_manual_fallback_flow.cc.orig 2024-08-26 14:40:28 UTC +--- components/password_manager/core/browser/password_manual_fallback_flow.cc.orig 2024-10-01 07:26:23 UTC +++ components/password_manager/core/browser/password_manual_fallback_flow.cc -@@ -204,7 +204,7 @@ void PasswordManualFallbackFlow::DidAcceptSuggestion( +@@ -41,7 +41,7 @@ std::u16string GetUsernameFromLabel(const std::u16stri + } + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // Returns the password form corresponding to the `payload` data. In most + // cases there is only one such form stored, but having more than one or no + // forms is also possible. If there is more than one form, showing any of them +@@ -251,7 +251,7 @@ void PasswordManualFallbackFlow::DidAcceptSuggestion( payload.password)); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -9,3 +18,12 @@ if (payload.is_cross_domain) { cross_domain_confirmation_popup_controller_ = password_client_->ShowCrossDomainConfirmationPopup( +@@ -268,7 +268,7 @@ void PasswordManualFallbackFlow::DidAcceptSuggestion( + } + case autofill::SuggestionType::kViewPasswordDetails: { + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + std::optional<password_manager::PasswordForm> form = + GetCorrespondingPasswordForm( + suggestion.GetPayload<Suggestion::PasswordSuggestionDetails>(), diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store__factory__util.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store__factory__util.cc new file mode 100644 index 000000000000..93d906aba529 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store__factory__util.cc @@ -0,0 +1,11 @@ +--- components/password_manager/core/browser/password_store_factory_util.cc.orig 2024-10-01 07:26:23 UTC ++++ components/password_manager/core/browser/password_store_factory_util.cc +@@ -28,7 +28,7 @@ namespace { + LoginDatabase::DeletingUndecryptablePasswordsEnabled GetPolicyFromPrefs( + PrefService* prefs) { + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_IOS) ++ BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD) + return LoginDatabase::DeletingUndecryptablePasswordsEnabled( + prefs->GetBoolean(prefs::kDeletingUndecryptablePasswordsEnabled)); + #else diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store_login__database.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store_login__database.cc index 6fb06b4a8fbe..80664b94f8d9 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store_login__database.cc +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store_login__database.cc @@ -1,15 +1,15 @@ ---- components/password_manager/core/browser/password_store/login_database.cc.orig 2024-08-26 14:40:28 UTC +--- components/password_manager/core/browser/password_store/login_database.cc.orig 2024-10-01 07:26:23 UTC +++ components/password_manager/core/browser/password_store/login_database.cc -@@ -1028,7 +1028,7 @@ bool ShouldDeleteUndecryptablePasswords( - clearing_undecryptable_passwords, +@@ -1029,7 +1029,7 @@ bool ShouldDeleteUndecryptablePasswords( bool is_user_data_dir_policy_set, - bool is_disabled_by_policy) { + bool is_enabled_by_policy, + IsAccountStore is_account_store) { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) std::string user_data_dir_string; std::unique_ptr<base::Environment> environment(base::Environment::Create()); // On Linux user data directory ca be specified using an env variable. If it -@@ -1047,7 +1047,7 @@ bool ShouldDeleteUndecryptablePasswords( +@@ -1048,7 +1048,7 @@ bool ShouldDeleteUndecryptablePasswords( return false; } diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store_login__database__async__helper.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store_login__database__async__helper.cc index 38a065ed5bae..dd7ee84636a3 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store_login__database__async__helper.cc +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store_login__database__async__helper.cc @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/password_store/login_database_async_helper.cc.orig 2024-08-26 14:40:28 UTC +--- components/password_manager/core/browser/password_store/login_database_async_helper.cc.orig 2024-10-01 07:26:23 UTC +++ components/password_manager/core/browser/password_store/login_database_async_helper.cc -@@ -152,7 +152,7 @@ LoginsResultOrError LoginDatabaseAsyncHelper::FillMatc +@@ -154,7 +154,7 @@ LoginsResultOrError LoginDatabaseAsyncHelper::FillMatc std::vector<PasswordForm> matched_forms; if (!login_db_ || !login_db_->GetLogins(form, include_psl, &matched_forms)) { diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store_login__database__unittest.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store_login__database__unittest.cc index e39778d79a55..9fccb29496a3 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store_login__database__unittest.cc +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store_login__database__unittest.cc @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/password_store/login_database_unittest.cc.orig 2024-08-26 14:40:28 UTC +--- components/password_manager/core/browser/password_store/login_database_unittest.cc.orig 2024-10-01 07:26:23 UTC +++ components/password_manager/core/browser/password_store/login_database_unittest.cc -@@ -2207,7 +2207,7 @@ INSTANTIATE_TEST_SUITE_P(MigrationToVCurrent, +@@ -2228,7 +2228,7 @@ INSTANTIATE_TEST_SUITE_P(MigrationToVCurrent, testing::Bool())); #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_IOS) || \ diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store_password__store__built__in__backend.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store_password__store__built__in__backend.cc deleted file mode 100644 index 659dabf03b02..000000000000 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_password__store_password__store__built__in__backend.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- components/password_manager/core/browser/password_store/password_store_built_in_backend.cc.orig 2024-08-26 14:40:28 UTC -+++ components/password_manager/core/browser/password_store/password_store_built_in_backend.cc -@@ -211,7 +211,7 @@ void PasswordStoreBuiltInBackend::InitBackend( - std::move(clearing_undecryptable_passwords_cb))); - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_IOS) -+ BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD) - background_task_runner_->PostTask( - FROM_HERE, - base::BindOnce(&LoginDatabaseAsyncHelper:: diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_stub__password__manager__client.cc b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_stub__password__manager__client.cc index ab5e0444bb9f..8cdbdbfb40a9 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_stub__password__manager__client.cc +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_stub__password__manager__client.cc @@ -1,4 +1,4 @@ ---- components/password_manager/core/browser/stub_password_manager_client.cc.orig 2024-08-26 14:40:28 UTC +--- components/password_manager/core/browser/stub_password_manager_client.cc.orig 2024-10-01 07:26:23 UTC +++ components/password_manager/core/browser/stub_password_manager_client.cc @@ -180,7 +180,7 @@ version_info::Channel StubPasswordManagerClient::GetCh } @@ -6,6 +6,6 @@ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - std::unique_ptr< - password_manager::PasswordCrossDomainConfirmationPopupController> - StubPasswordManagerClient::ShowCrossDomainConfirmationPopup( + void StubPasswordManagerClient::OpenPasswordDetailsBubble( + const password_manager::PasswordForm& form) {} + diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_stub__password__manager__client.h b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_stub__password__manager__client.h index 1f64ff35c378..70fabd5341dc 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_stub__password__manager__client.h +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_browser_stub__password__manager__client.h @@ -1,4 +1,4 @@ ---- components/password_manager/core/browser/stub_password_manager_client.h.orig 2024-08-26 14:40:28 UTC +--- components/password_manager/core/browser/stub_password_manager_client.h.orig 2024-10-01 07:26:23 UTC +++ components/password_manager/core/browser/stub_password_manager_client.h @@ -75,7 +75,7 @@ class StubPasswordManagerClient : public PasswordManag MockPasswordFeatureManager* GetPasswordFeatureManager(); @@ -6,6 +6,6 @@ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + void OpenPasswordDetailsBubble( + const password_manager::PasswordForm& form) override; std::unique_ptr< - password_manager::PasswordCrossDomainConfirmationPopupController> - ShowCrossDomainConfirmationPopup( diff --git a/www/ungoogled-chromium/files/patch-components_password__manager_core_common_password__manager__pref__names.h b/www/ungoogled-chromium/files/patch-components_password__manager_core_common_password__manager__pref__names.h index 4d2d5ee521fa..63b99ecae479 100644 --- a/www/ungoogled-chromium/files/patch-components_password__manager_core_common_password__manager__pref__names.h +++ b/www/ungoogled-chromium/files/patch-components_password__manager_core_common_password__manager__pref__names.h @@ -1,4 +1,4 @@ ---- components/password_manager/core/common/password_manager_pref_names.h.orig 2024-08-26 14:40:28 UTC +--- components/password_manager/core/common/password_manager_pref_names.h.orig 2024-10-01 07:26:23 UTC +++ components/password_manager/core/common/password_manager_pref_names.h @@ -41,7 +41,7 @@ inline constexpr char kCredentialProviderEnabledOnStar #endif @@ -9,7 +9,7 @@ // Boolean pref controlled by the DeletingUndecryptablePasswordsEnabled policy. // If set to false it blocks deleting undecryptable passwords, otherwise the // deletion can happen. -@@ -370,7 +370,7 @@ inline constexpr char kAutofillableCredentialsAccountS +@@ -333,7 +333,7 @@ inline constexpr char kAutofillableCredentialsAccountS inline constexpr char kPasswordSharingEnabled[] = "password_manager.password_sharing_enabled"; diff --git a/www/ungoogled-chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc b/www/ungoogled-chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc index 837e251b568b..2098285447c4 100644 --- a/www/ungoogled-chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc +++ b/www/ungoogled-chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc @@ -1,6 +1,6 @@ ---- components/policy/core/common/cloud/cloud_policy_client.cc.orig 2024-06-22 08:49:42 UTC +--- components/policy/core/common/cloud/cloud_policy_client.cc.orig 2024-10-01 07:26:23 UTC +++ components/policy/core/common/cloud/cloud_policy_client.cc -@@ -647,7 +647,7 @@ void CloudPolicyClient::FetchPolicy(PolicyFetchReason +@@ -668,7 +668,7 @@ void CloudPolicyClient::FetchPolicy(PolicyFetchReason fetch_request->set_invalidation_payload(invalidation_payload_); } } diff --git a/www/ungoogled-chromium/files/patch-components_policy_core_common_policy__utils.cc b/www/ungoogled-chromium/files/patch-components_policy_core_common_policy__utils.cc index e74592a74610..5dcccf754a22 100644 --- a/www/ungoogled-chromium/files/patch-components_policy_core_common_policy__utils.cc +++ b/www/ungoogled-chromium/files/patch-components_policy_core_common_policy__utils.cc @@ -1,6 +1,6 @@ ---- components/policy/core/common/policy_utils.cc.orig 2024-02-03 15:42:55 UTC +--- components/policy/core/common/policy_utils.cc.orig 2024-10-01 07:26:23 UTC +++ components/policy/core/common/policy_utils.cc -@@ -28,7 +28,7 @@ bool IsPolicyTestingEnabled(PrefService* pref_service, +@@ -22,7 +22,7 @@ bool IsPolicyTestingEnabled(PrefService* pref_service, return true; } diff --git a/www/ungoogled-chromium/files/patch-components_safe__browsing_content_common_file__type__policies__unittest.cc b/www/ungoogled-chromium/files/patch-components_safe__browsing_content_common_file__type__policies__unittest.cc index 528ef4942bdc..0f70ba6eb047 100644 --- a/www/ungoogled-chromium/files/patch-components_safe__browsing_content_common_file__type__policies__unittest.cc +++ b/www/ungoogled-chromium/files/patch-components_safe__browsing_content_common_file__type__policies__unittest.cc @@ -1,6 +1,6 @@ ---- components/safe_browsing/content/common/file_type_policies_unittest.cc.orig 2024-06-22 08:49:42 UTC +--- components/safe_browsing/content/common/file_type_policies_unittest.cc.orig 2024-10-01 07:26:23 UTC +++ components/safe_browsing/content/common/file_type_policies_unittest.cc -@@ -139,7 +139,7 @@ TEST_F(FileTypePoliciesTest, UnpackResourceBundle) { +@@ -148,7 +148,7 @@ TEST_F(FileTypePoliciesTest, UnpackResourceBundle) { EXPECT_EQ(DownloadFileType::FULL_PING, file_type.ping_setting()); // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/files/patch-components_safe__browsing_core_common_features.cc b/www/ungoogled-chromium/files/patch-components_safe__browsing_core_common_features.cc index 566c9339a0e7..3e576fe4f9c3 100644 --- a/www/ungoogled-chromium/files/patch-components_safe__browsing_core_common_features.cc +++ b/www/ungoogled-chromium/files/patch-components_safe__browsing_core_common_features.cc @@ -1,15 +1,6 @@ ---- components/safe_browsing/core/common/features.cc.orig 2024-08-26 14:40:28 UTC +--- components/safe_browsing/core/common/features.cc.orig 2024-10-01 07:26:23 UTC +++ components/safe_browsing/core/common/features.cc -@@ -186,7 +186,7 @@ BASE_FEATURE(kGooglePlayProtectInApkTelemetry, - BASE_FEATURE(kHashPrefixRealTimeLookups, - "SafeBrowsingHashPrefixRealTimeLookups", - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_IOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD) - base::FEATURE_ENABLED_BY_DEFAULT - #else - base::FEATURE_DISABLED_BY_DEFAULT -@@ -267,7 +267,7 @@ constexpr base::FeatureParam<int> kReferrerChainEventM +@@ -240,7 +240,7 @@ BASE_FEATURE(kRippleForEnhancedProtection, BASE_FEATURE(kSafeBrowsingAsyncRealTimeCheck, "SafeBrowsingAsyncRealTimeCheck", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-components_search__engines_template__url__service.cc b/www/ungoogled-chromium/files/patch-components_search__engines_template__url__service.cc index e36b245b7d00..09d2ad421a02 100644 --- a/www/ungoogled-chromium/files/patch-components_search__engines_template__url__service.cc +++ b/www/ungoogled-chromium/files/patch-components_search__engines_template__url__service.cc @@ -1,6 +1,6 @@ ---- components/search_engines/template_url_service.cc.orig 2024-08-26 14:40:28 UTC +--- components/search_engines/template_url_service.cc.orig 2024-10-01 07:26:23 UTC +++ components/search_engines/template_url_service.cc -@@ -3096,7 +3096,7 @@ bool TemplateURLService::MatchesDefaultSearchProvider( +@@ -3092,7 +3092,7 @@ bool TemplateURLService::MatchesDefaultSearchProvider( std::unique_ptr<EnterpriseSiteSearchManager> TemplateURLService::GetEnterpriseSiteSearchManager(PrefService* prefs) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-components_soda_soda__util.cc b/www/ungoogled-chromium/files/patch-components_soda_soda__util.cc index af3feef99b14..54c7d0c19a9d 100644 --- a/www/ungoogled-chromium/files/patch-components_soda_soda__util.cc +++ b/www/ungoogled-chromium/files/patch-components_soda_soda__util.cc @@ -1,6 +1,6 @@ ---- components/soda/soda_util.cc.orig 2024-06-22 08:49:42 UTC +--- components/soda/soda_util.cc.orig 2024-10-01 07:26:23 UTC +++ components/soda/soda_util.cc -@@ -20,7 +20,7 @@ +@@ -27,7 +27,7 @@ #include "base/win/windows_version.h" #endif @@ -9,7 +9,7 @@ #include "base/cpu.h" #endif -@@ -45,7 +45,7 @@ bool IsSupportedChromeOS() { +@@ -52,7 +52,7 @@ bool IsSupportedChromeOS() { } #endif // BUILDFLAG(IS_CHROMEOS) @@ -18,7 +18,7 @@ bool IsSupportedLinux() { #if defined(ARCH_CPU_X86_FAMILY) // Check if the CPU has the required instruction set to run the Speech -@@ -76,7 +76,7 @@ bool IsSupportedWin() { +@@ -83,7 +83,7 @@ bool IsSupportedWin() { bool IsOnDeviceSpeechRecognitionSupported() { #if BUILDFLAG(IS_CHROMEOS) return IsSupportedChromeOS(); diff --git a/www/ungoogled-chromium/files/patch-components_storage__monitor_BUILD.gn b/www/ungoogled-chromium/files/patch-components_storage__monitor_BUILD.gn index 54850afcb523..3089edd4c75e 100644 --- a/www/ungoogled-chromium/files/patch-components_storage__monitor_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-components_storage__monitor_BUILD.gn @@ -1,6 +1,6 @@ ---- components/storage_monitor/BUILD.gn.orig 2023-11-04 07:08:51 UTC +--- components/storage_monitor/BUILD.gn.orig 2024-10-01 07:26:23 UTC +++ components/storage_monitor/BUILD.gn -@@ -77,7 +77,7 @@ static_library("storage_monitor") { +@@ -75,7 +75,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", -@@ -184,7 +184,7 @@ source_set("unit_tests") { +@@ -180,7 +180,7 @@ source_set("unit_tests") { "storage_monitor_chromeos_unittest.cc", ] } diff --git a/www/ungoogled-chromium/files/patch-components_supervised__user_core_browser_supervised__user__preferences.cc b/www/ungoogled-chromium/files/patch-components_supervised__user_core_browser_supervised__user__preferences.cc index 913ad436cd35..7863e98b733b 100644 --- a/www/ungoogled-chromium/files/patch-components_supervised__user_core_browser_supervised__user__preferences.cc +++ b/www/ungoogled-chromium/files/patch-components_supervised__user_core_browser_supervised__user__preferences.cc @@ -1,6 +1,6 @@ ---- components/supervised_user/core/browser/supervised_user_preferences.cc.orig 2024-08-26 14:40:28 UTC +--- components/supervised_user/core/browser/supervised_user_preferences.cc.orig 2024-10-01 07:26:23 UTC +++ components/supervised_user/core/browser/supervised_user_preferences.cc -@@ -154,7 +154,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry +@@ -147,7 +147,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry registry->RegisterBooleanPref(prefs::kChildAccountStatusKnown, false); registry->RegisterStringPref(prefs::kFamilyLinkUserMemberRole, std::string()); #if BUILDFLAG(ENABLE_EXTENSIONS) && \ diff --git a/www/ungoogled-chromium/files/patch-components_supervised__user_core_browser_supervised__user__service.cc b/www/ungoogled-chromium/files/patch-components_supervised__user_core_browser_supervised__user__service.cc index f1b6b00508ff..2d74ff8fa336 100644 --- a/www/ungoogled-chromium/files/patch-components_supervised__user_core_browser_supervised__user__service.cc +++ b/www/ungoogled-chromium/files/patch-components_supervised__user_core_browser_supervised__user__service.cc @@ -1,6 +1,6 @@ ---- components/supervised_user/core/browser/supervised_user_service.cc.orig 2024-08-26 14:40:28 UTC +--- components/supervised_user/core/browser/supervised_user_service.cc.orig 2024-10-01 07:26:23 UTC +++ components/supervised_user/core/browser/supervised_user_service.cc -@@ -176,7 +176,7 @@ FirstTimeInterstitialBannerState SupervisedUserService +@@ -173,7 +173,7 @@ FirstTimeInterstitialBannerState SupervisedUserService const FirstTimeInterstitialBannerState original_state) { FirstTimeInterstitialBannerState target_state = original_state; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-components_sync__device__info_local__device__info__util.cc b/www/ungoogled-chromium/files/patch-components_sync__device__info_local__device__info__util.cc index dae2a2a54f9f..da1a0aa7f72e 100644 --- a/www/ungoogled-chromium/files/patch-components_sync__device__info_local__device__info__util.cc +++ b/www/ungoogled-chromium/files/patch-components_sync__device__info_local__device__info__util.cc @@ -1,6 +1,6 @@ ---- components/sync_device_info/local_device_info_util.cc.orig 2024-06-22 08:49:42 UTC +--- components/sync_device_info/local_device_info_util.cc.orig 2024-10-01 07:26:23 UTC +++ components/sync_device_info/local_device_info_util.cc -@@ -84,7 +84,7 @@ void OnMachineStatisticsLoaded(LocalDeviceNameInfo* na +@@ -85,7 +85,7 @@ void OnMachineStatisticsLoaded(LocalDeviceNameInfo* na sync_pb::SyncEnums::DeviceType GetLocalDeviceType() { #if BUILDFLAG(IS_CHROMEOS) return sync_pb::SyncEnums_DeviceType_TYPE_CROS; @@ -9,7 +9,7 @@ return sync_pb::SyncEnums_DeviceType_TYPE_LINUX; #elif BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) switch (ui::GetDeviceFormFactor()) { -@@ -109,7 +109,7 @@ DeviceInfo::OsType GetLocalDeviceOSType() { +@@ -110,7 +110,7 @@ DeviceInfo::OsType GetLocalDeviceOSType() { return DeviceInfo::OsType::kChromeOsAsh; #elif BUILDFLAG(IS_CHROMEOS_LACROS) return DeviceInfo::OsType::kChromeOsLacros; @@ -18,7 +18,7 @@ return DeviceInfo::OsType::kLinux; #elif BUILDFLAG(IS_ANDROID) return DeviceInfo::OsType::kAndroid; -@@ -128,7 +128,7 @@ DeviceInfo::OsType GetLocalDeviceOSType() { +@@ -129,7 +129,7 @@ DeviceInfo::OsType GetLocalDeviceOSType() { DeviceInfo::FormFactor GetLocalDeviceFormFactor() { #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ diff --git a/www/ungoogled-chromium/files/patch-components_update__client_update__query__params.cc b/www/ungoogled-chromium/files/patch-components_update__client_update__query__params.cc index d0778434bc38..3abf53fc29fa 100644 --- a/www/ungoogled-chromium/files/patch-components_update__client_update__query__params.cc +++ b/www/ungoogled-chromium/files/patch-components_update__client_update__query__params.cc @@ -1,6 +1,6 @@ ---- components/update_client/update_query_params.cc.orig 2023-07-21 09:49:17 UTC +--- components/update_client/update_query_params.cc.orig 2024-10-01 07:26:23 UTC +++ components/update_client/update_query_params.cc -@@ -42,6 +42,8 @@ const char kOs[] = +@@ -40,6 +40,8 @@ const char kOs[] = "fuchsia"; #elif BUILDFLAG(IS_OPENBSD) "openbsd"; diff --git a/www/ungoogled-chromium/files/patch-components_viz_common_features.cc b/www/ungoogled-chromium/files/patch-components_viz_common_features.cc deleted file mode 100644 index 60c39847d017..000000000000 --- a/www/ungoogled-chromium/files/patch-components_viz_common_features.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- components/viz/common/features.cc.orig 2024-08-26 14:40:28 UTC -+++ components/viz/common/features.cc -@@ -234,7 +234,7 @@ BASE_FEATURE(kAllowForceMergeRenderPassWithRequireOver - "AllowForceMergeRenderPassWithRequireOverlayQuads", - base::FEATURE_ENABLED_BY_DEFAULT); - --#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // On platforms using SkiaOutputDeviceBufferQueue and not yet universally using - // SkiaRenderer-allocated images, when this is true SkiaRenderer will allocate - // and maintain a buffer queue of images for the root render pass, instead of -@@ -500,7 +500,7 @@ bool ShouldOnBeginFrameThrottleVideo() { - return base::FeatureList::IsEnabled(features::kOnBeginFrameThrottleVideo); - } - --#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - bool ShouldRendererAllocateImages() { - return base::FeatureList::IsEnabled(kRendererAllocatesImages); - } diff --git a/www/ungoogled-chromium/files/patch-components_viz_common_features.h b/www/ungoogled-chromium/files/patch-components_viz_common_features.h deleted file mode 100644 index 0a397d5f029a..000000000000 --- a/www/ungoogled-chromium/files/patch-components_viz_common_features.h +++ /dev/null @@ -1,20 +0,0 @@ ---- components/viz/common/features.h.orig 2024-08-26 14:40:28 UTC -+++ components/viz/common/features.h -@@ -72,7 +72,7 @@ VIZ_COMMON_EXPORT BASE_DECLARE_FEATURE(kDrawPredictedI - VIZ_COMMON_EXPORT BASE_DECLARE_FEATURE(kAllowUndamagedNonrootRenderPassToSkip); - VIZ_COMMON_EXPORT BASE_DECLARE_FEATURE( - kAllowForceMergeRenderPassWithRequireOverlayQuads); --#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - VIZ_COMMON_EXPORT BASE_DECLARE_FEATURE(kRendererAllocatesImages); - #endif - VIZ_COMMON_EXPORT BASE_DECLARE_FEATURE(kOnBeginFrameAcks); -@@ -129,7 +129,7 @@ VIZ_COMMON_EXPORT bool UseWebViewNewInvalidateHeuristi - VIZ_COMMON_EXPORT bool UseSurfaceLayerForVideo(); - VIZ_COMMON_EXPORT int MaxOverlaysConsidered(); - VIZ_COMMON_EXPORT bool ShouldOnBeginFrameThrottleVideo(); --#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - VIZ_COMMON_EXPORT bool ShouldRendererAllocateImages(); - #endif - VIZ_COMMON_EXPORT bool IsOnBeginFrameAcksEnabled(); diff --git a/www/ungoogled-chromium/files/patch-components_viz_service_display__embedder_skia__output__device__buffer__queue.cc b/www/ungoogled-chromium/files/patch-components_viz_service_display__embedder_skia__output__device__buffer__queue.cc deleted file mode 100644 index fa254177fc8c..000000000000 --- a/www/ungoogled-chromium/files/patch-components_viz_service_display__embedder_skia__output__device__buffer__queue.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- components/viz/service/display_embedder/skia_output_device_buffer_queue.cc.orig 2024-08-26 14:40:28 UTC -+++ components/viz/service/display_embedder/skia_output_device_buffer_queue.cc -@@ -175,7 +175,7 @@ SkiaOutputDeviceBufferQueue::SkiaOutputDeviceBufferQue - capabilities_.only_invalidates_damage_rect = false; - capabilities_.number_of_buffers = 3; - --#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - capabilities_.renderer_allocates_images = - ::features::ShouldRendererAllocateImages(); - #else diff --git a/www/ungoogled-chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc b/www/ungoogled-chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc index f32bc00f5619..62cebe303734 100644 --- a/www/ungoogled-chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc +++ b/www/ungoogled-chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc @@ -1,6 +1,6 @@ ---- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2024-08-26 14:40:28 UTC +--- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2024-10-01 07:26:23 UTC +++ components/viz/service/display_embedder/skia_output_surface_impl.cc -@@ -1663,7 +1663,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor +@@ -1575,7 +1575,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor ->GetVulkanPhysicalDevice(), VK_IMAGE_TILING_OPTIMAL, vk_format, si_format, yuv_color_space, ycbcr_info); diff --git a/www/ungoogled-chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc b/www/ungoogled-chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc index aaed7f800b5e..85ce8e1f5711 100644 --- a/www/ungoogled-chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc +++ b/www/ungoogled-chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc @@ -1,6 +1,6 @@ ---- components/viz/service/display_embedder/software_output_surface.cc.orig 2024-08-26 14:40:28 UTC +--- components/viz/service/display_embedder/software_output_surface.cc.orig 2024-10-01 07:26:23 UTC +++ components/viz/service/display_embedder/software_output_surface.cc -@@ -119,7 +119,7 @@ void SoftwareOutputSurface::SwapBuffersCallback(base:: +@@ -115,7 +115,7 @@ void SoftwareOutputSurface::SwapBuffersCallback(base:: now.SnappedToNextTick(refresh_timebase_, refresh_interval_) - now; // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ if (needs_swap_size_notifications_) client_->DidSwapWithSize(pixel_size); #endif -@@ -148,7 +148,7 @@ gfx::OverlayTransform SoftwareOutputSurface::GetDispla +@@ -144,7 +144,7 @@ gfx::OverlayTransform SoftwareOutputSurface::GetDispla // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/files/patch-components_viz_service_display__embedder_software__output__surface.h b/www/ungoogled-chromium/files/patch-components_viz_service_display__embedder_software__output__surface.h index 3d1ab4cb1c4c..92ee5b57f0f9 100644 --- a/www/ungoogled-chromium/files/patch-components_viz_service_display__embedder_software__output__surface.h +++ b/www/ungoogled-chromium/files/patch-components_viz_service_display__embedder_software__output__surface.h @@ -1,6 +1,6 @@ ---- components/viz/service/display_embedder/software_output_surface.h.orig 2024-08-26 14:40:28 UTC +--- components/viz/service/display_embedder/software_output_surface.h.orig 2024-10-01 07:26:23 UTC +++ components/viz/service/display_embedder/software_output_surface.h -@@ -45,7 +45,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi +@@ -44,7 +44,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi gfx::OverlayTransform GetDisplayTransform() override; // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ void SetNeedsSwapSizeNotifications( bool needs_swap_size_notifications) override; #endif -@@ -65,7 +65,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi +@@ -64,7 +64,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/files/patch-components_viz_service_display_skia__renderer.cc b/www/ungoogled-chromium/files/patch-components_viz_service_display_skia__renderer.cc index a6ce9c601a7a..a9cab452e2e8 100644 --- a/www/ungoogled-chromium/files/patch-components_viz_service_display_skia__renderer.cc +++ b/www/ungoogled-chromium/files/patch-components_viz_service_display_skia__renderer.cc @@ -1,6 +1,6 @@ ---- components/viz/service/display/skia_renderer.cc.orig 2024-08-26 14:40:28 UTC +--- components/viz/service/display/skia_renderer.cc.orig 2024-10-01 07:26:23 UTC +++ components/viz/service/display/skia_renderer.cc -@@ -1441,7 +1441,7 @@ void SkiaRenderer::ClearFramebuffer() { +@@ -1449,7 +1449,7 @@ void SkiaRenderer::ClearFramebuffer() { if (current_frame()->current_render_pass->has_transparent_background) { ClearCanvas(SkColors::kTransparent); } else { diff --git a/www/ungoogled-chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc b/www/ungoogled-chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc index 8c95bbd7d0b7..879493e291d8 100644 --- a/www/ungoogled-chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc +++ b/www/ungoogled-chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc @@ -1,6 +1,6 @@ ---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2024-08-26 14:40:28 UTC +--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2024-10-01 07:26:23 UTC +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc -@@ -111,7 +111,7 @@ RootCompositorFrameSinkImpl::Create( +@@ -113,7 +113,7 @@ RootCompositorFrameSinkImpl::Create( output_surface->SetNeedsSwapSizeNotifications( params->send_swap_size_notifications); @@ -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); -@@ -673,7 +673,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw +@@ -789,7 +789,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw if (display_client_ && enable_swap_completion_callback_) { display_client_->DidCompleteSwapWithSize(pixel_size); } diff --git a/www/ungoogled-chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h b/www/ungoogled-chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h index 0852388b54c1..b5158e3fb0e7 100644 --- a/www/ungoogled-chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h +++ b/www/ungoogled-chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h @@ -1,6 +1,6 @@ ---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig 2024-08-26 14:40:28 UTC +--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig 2024-10-01 07:26:23 UTC +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h -@@ -214,7 +214,7 @@ class VIZ_SERVICE_EXPORT RootCompositorFrameSinkImpl +@@ -231,7 +231,7 @@ class VIZ_SERVICE_EXPORT RootCompositorFrameSinkImpl // See comments on `EvictionHandler`. EvictionHandler eviction_handler_; diff --git a/www/ungoogled-chromium/files/patch-components_viz_test_mock__display__client.h b/www/ungoogled-chromium/files/patch-components_viz_test_mock__display__client.h index f933949438b1..3aebc3995192 100644 --- a/www/ungoogled-chromium/files/patch-components_viz_test_mock__display__client.h +++ b/www/ungoogled-chromium/files/patch-components_viz_test_mock__display__client.h @@ -1,9 +1,9 @@ ---- components/viz/test/mock_display_client.h.orig 2024-02-03 15:42:55 UTC +--- components/viz/test/mock_display_client.h.orig 2024-10-01 07:26:23 UTC +++ components/viz/test/mock_display_client.h -@@ -43,7 +43,7 @@ class MockDisplayClient : public mojom::DisplayClient - MOCK_METHOD1(SetWideColorEnabled, void(bool enabled)); +@@ -45,7 +45,7 @@ class MockDisplayClient : public mojom::DisplayClient + #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS_ASH) MOCK_METHOD1(SetPreferredRefreshRate, void(float refresh_rate)); - #endif + #endif // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS_ASH) -#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11) MOCK_METHOD1(DidCompleteSwapWithNewSize, void(const gfx::Size&)); diff --git a/www/ungoogled-chromium/files/patch-components_webapps_browser_features.cc b/www/ungoogled-chromium/files/patch-components_webapps_browser_features.cc index 4dbe6e47276a..8a7cfb129530 100644 --- a/www/ungoogled-chromium/files/patch-components_webapps_browser_features.cc +++ b/www/ungoogled-chromium/files/patch-components_webapps_browser_features.cc @@ -1,6 +1,6 @@ ---- components/webapps/browser/features.cc.orig 2024-08-26 14:40:28 UTC +--- components/webapps/browser/features.cc.orig 2024-10-01 07:26:23 UTC +++ components/webapps/browser/features.cc -@@ -59,7 +59,7 @@ extern const base::FeatureParam<int> kBannerParamsDays +@@ -43,7 +43,7 @@ extern const base::FeatureParam<int> kBannerParamsDays BASE_FEATURE(kWebAppsEnableMLModelForPromotion, "WebAppsEnableMLModelForPromotion", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-content_app_content__main.cc b/www/ungoogled-chromium/files/patch-content_app_content__main.cc index c41137fda771..d5ac5d5d2dc3 100644 --- a/www/ungoogled-chromium/files/patch-content_app_content__main.cc +++ b/www/ungoogled-chromium/files/patch-content_app_content__main.cc @@ -1,6 +1,6 @@ ---- content/app/content_main.cc.orig 2024-08-26 14:40:28 UTC +--- content/app/content_main.cc.orig 2024-10-01 07:26:23 UTC +++ content/app/content_main.cc -@@ -207,7 +207,7 @@ RunContentProcess(ContentMainParams params, +@@ -205,7 +205,7 @@ RunContentProcess(ContentMainParams params, base::EnableTerminationOnOutOfMemory(); logging::RegisterAbslAbortHook(); @@ -9,7 +9,7 @@ // The various desktop environments set this environment variable that // allows the dbus client library to connect directly to the bus. When this // variable is not set (test environments like xvfb-run), the dbus client -@@ -293,7 +293,7 @@ RunContentProcess(ContentMainParams params, +@@ -291,7 +291,7 @@ RunContentProcess(ContentMainParams params, command_line->AppendSwitch(switches::kUseMobileUserAgent); #endif diff --git a/www/ungoogled-chromium/files/patch-content_app_content__main__runner__impl.cc b/www/ungoogled-chromium/files/patch-content_app_content__main__runner__impl.cc index c84d083504d3..faec64b28456 100644 --- a/www/ungoogled-chromium/files/patch-content_app_content__main__runner__impl.cc +++ b/www/ungoogled-chromium/files/patch-content_app_content__main__runner__impl.cc @@ -1,6 +1,6 @@ ---- content/app/content_main_runner_impl.cc.orig 2024-08-26 14:40:28 UTC +--- content/app/content_main_runner_impl.cc.orig 2024-10-01 07:26:23 UTC +++ content/app/content_main_runner_impl.cc -@@ -149,18 +149,20 @@ +@@ -147,18 +147,20 @@ #include "content/browser/posix_file_descriptor_info_impl.h" #include "content/public/common/content_descriptors.h" @@ -23,7 +23,7 @@ #include "third_party/boringssl/src/include/openssl/crypto.h" #include "third_party/webrtc_overrides/init_webrtc.h" // nogncheck -@@ -194,6 +196,10 @@ +@@ -192,6 +194,10 @@ #include "media/base/media_switches.h" #endif @@ -34,7 +34,7 @@ #if BUILDFLAG(IS_ANDROID) #include "base/system/sys_info.h" #include "content/browser/android/battery_metrics.h" -@@ -403,7 +409,7 @@ void InitializeZygoteSandboxForBrowserProcess( +@@ -400,7 +406,7 @@ void InitializeZygoteSandboxForBrowserProcess( } #endif // BUILDFLAG(USE_ZYGOTE) @@ -43,7 +43,7 @@ #if BUILDFLAG(ENABLE_PPAPI) // Loads the (native) libraries but does not initialize them (i.e., does not -@@ -441,7 +447,10 @@ void PreloadLibraryCdms() { +@@ -438,7 +444,10 @@ void PreloadLibraryCdms() { void PreSandboxInit() { // Ensure the /dev/urandom is opened. @@ -54,7 +54,7 @@ // May use sysinfo(), sched_getaffinity(), and open various /sys/ and /proc/ // files. -@@ -453,9 +462,16 @@ void PreSandboxInit() { +@@ -450,9 +459,16 @@ void PreSandboxInit() { // https://boringssl.9oo91esource.qjz9zk/boringssl/+/HEAD/SANDBOXING.md CRYPTO_pre_sandbox_init(); @@ -71,7 +71,16 @@ #if BUILDFLAG(ENABLE_PPAPI) // Ensure access to the Pepper plugins before the sandbox is turned on. -@@ -877,11 +893,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -764,7 +780,7 @@ RunOtherNamedProcessTypeMain(const std::string& proces + unregister_thread_closure = base::HangWatcher::RegisterThread( + base::HangWatcher::ThreadType::kMainThread); + bool start_hang_watcher_now; +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // On Linux/ChromeOS, the HangWatcher can't start until after the sandbox is + // initialized, because the sandbox can't be started with multiple threads. + // TODO(mpdenton): start the HangWatcher after the sandbox is initialized. +@@ -874,11 +890,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam base::GlobalDescriptors::kBaseDescriptor); #endif // !BUILDFLAG(IS_ANDROID) @@ -85,7 +94,7 @@ #endif // !BUILDFLAG(IS_WIN) -@@ -1058,8 +1073,20 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -1055,8 +1070,20 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam process_type == switches::kZygoteProcess) { PreSandboxInit(); } @@ -106,16 +115,7 @@ delegate_->SandboxInitialized(process_type); #if BUILDFLAG(USE_ZYGOTE) -@@ -1133,7 +1160,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { - ->ReconfigureAfterFeatureListInit(process_type); - } - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // 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 -@@ -1168,6 +1195,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { +@@ -1153,6 +1180,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { content_main_params_.reset(); RegisterMainThreadFactories(); diff --git a/www/ungoogled-chromium/files/patch-content_browser_BUILD.gn b/www/ungoogled-chromium/files/patch-content_browser_BUILD.gn index d12c1c776872..b4510de43797 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-content_browser_BUILD.gn @@ -1,6 +1,6 @@ ---- content/browser/BUILD.gn.orig 2024-08-26 14:40:28 UTC +--- content/browser/BUILD.gn.orig 2024-10-01 07:26:23 UTC +++ content/browser/BUILD.gn -@@ -2398,6 +2398,14 @@ source_set("browser") { +@@ -2429,6 +2429,14 @@ source_set("browser") { ] } @@ -15,7 +15,7 @@ if (is_linux || is_chromeos) { sources += [ "child_process_launcher_helper_linux.cc", -@@ -2438,6 +2446,15 @@ source_set("browser") { +@@ -2469,6 +2477,15 @@ source_set("browser") { if (allow_oop_video_decoder) { sources += [ "media/stable_video_decoder_factory.cc" ] deps += [ "//media/mojo/mojom/stable:stable_video_decoder" ] diff --git a/www/ungoogled-chromium/files/patch-content_browser_browser__child__process__host__impl.cc b/www/ungoogled-chromium/files/patch-content_browser_browser__child__process__host__impl.cc index 909990229788..c85f85d07bd3 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_browser__child__process__host__impl.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_browser__child__process__host__impl.cc @@ -1,14 +1,14 @@ ---- content/browser/browser_child_process_host_impl.cc.orig 2024-08-26 14:40:28 UTC +--- content/browser/browser_child_process_host_impl.cc.orig 2024-10-01 07:26:23 UTC +++ content/browser/browser_child_process_host_impl.cc -@@ -324,6 +324,7 @@ void BrowserChildProcessHostImpl::LaunchWithoutExtraCo - switches::kMojoCoreLibraryPath, +@@ -328,6 +328,7 @@ void BrowserChildProcessHostImpl::LaunchWithoutExtraCo + switches::kLogBestEffortTasks, switches::kPerfettoDisableInterning, switches::kTraceToConsole, + switches::kDisableUnveil, }; cmd_line->CopySwitchesFrom(browser_command_line, kForwardSwitches); -@@ -655,7 +656,7 @@ void BrowserChildProcessHostImpl::OnProcessLaunched() +@@ -659,7 +660,7 @@ void BrowserChildProcessHostImpl::OnProcessLaunched() ->child_process()); #endif diff --git a/www/ungoogled-chromium/files/patch-content_browser_browser__main__loop.cc b/www/ungoogled-chromium/files/patch-content_browser_browser__main__loop.cc index 15eb5cefccf8..fe6b6b112ddd 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_browser__main__loop.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_browser__main__loop.cc @@ -1,6 +1,6 @@ ---- content/browser/browser_main_loop.cc.orig 2024-08-26 14:40:28 UTC +--- content/browser/browser_main_loop.cc.orig 2024-10-01 07:26:23 UTC +++ content/browser/browser_main_loop.cc -@@ -254,6 +254,12 @@ +@@ -250,6 +250,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 -@@ -549,6 +555,12 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -545,6 +551,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 -@@ -586,7 +598,7 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -582,7 +594,7 @@ int BrowserMainLoop::EarlyInitialization() { base::PlatformThread::SetCurrentThreadType(base::ThreadType::kCompositing); #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/ungoogled-chromium/files/patch-content_browser_child__process__launcher__helper.h b/www/ungoogled-chromium/files/patch-content_browser_child__process__launcher__helper.h index 264bcf16a04b..3d19377a1691 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_child__process__launcher__helper.h +++ b/www/ungoogled-chromium/files/patch-content_browser_child__process__launcher__helper.h @@ -1,6 +1,6 @@ ---- content/browser/child_process_launcher_helper.h.orig 2024-08-26 14:40:28 UTC +--- content/browser/child_process_launcher_helper.h.orig 2024-10-01 07:26:23 UTC +++ content/browser/child_process_launcher_helper.h -@@ -299,7 +299,7 @@ class ChildProcessLauncherHelper +@@ -293,7 +293,7 @@ class ChildProcessLauncherHelper std::optional<base::ProcessId> process_id_ = std::nullopt; #endif // BUILDFLAG(IS_CHROMEOS) diff --git a/www/ungoogled-chromium/files/patch-content_browser_file__system__access_file__path__watcher_file__path__watcher.h b/www/ungoogled-chromium/files/patch-content_browser_file__system__access_file__path__watcher_file__path__watcher.h index 0947a391907e..b69bd2f6db9b 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_file__system__access_file__path__watcher_file__path__watcher.h +++ b/www/ungoogled-chromium/files/patch-content_browser_file__system__access_file__path__watcher_file__path__watcher.h @@ -1,11 +1,11 @@ ---- content/browser/file_system_access/file_path_watcher/file_path_watcher.h.orig 2024-07-31 14:19:23 UTC +--- content/browser/file_system_access/file_path_watcher/file_path_watcher.h.orig 2024-10-01 07:26:23 UTC +++ content/browser/file_system_access/file_path_watcher/file_path_watcher.h @@ -125,7 +125,7 @@ class CONTENT_EXPORT FilePathWatcher { Type type = Type::kNonRecursive; #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ -- BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN) -+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) // The callback will return the full path to a changed file instead of // the watched path supplied as |path| when Watch is called. // So the full path can be different from the watched path when a folder is diff --git a/www/ungoogled-chromium/files/patch-content_browser_file__system__access_file__system__access__local__path__watcher.cc b/www/ungoogled-chromium/files/patch-content_browser_file__system__access_file__system__access__local__path__watcher.cc index 8af5c8cec786..07f193904467 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_file__system__access_file__system__access__local__path__watcher.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_file__system__access_file__system__access__local__path__watcher.cc @@ -1,11 +1,11 @@ ---- content/browser/file_system_access/file_system_access_local_path_watcher.cc.orig 2024-07-31 14:19:23 UTC +--- content/browser/file_system_access/file_system_access_local_path_watcher.cc.orig 2024-10-01 07:26:23 UTC +++ content/browser/file_system_access/file_system_access_local_path_watcher.cc -@@ -62,7 +62,7 @@ void FileSystemAccessLocalPathWatcher::Initialize( - FilePathWatcher::WatchOptions watch_options{ +@@ -63,7 +63,7 @@ void FileSystemAccessLocalPathWatcher::Initialize( .type = scope().IsRecursive() ? FilePathWatcher::Type::kRecursive : FilePathWatcher::Type::kNonRecursive, --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) // Note: `report_modified_path` is also present on Android // and Fuchsia. Update this switch if support for watching // the local file system is added on those platforms. diff --git a/www/ungoogled-chromium/files/patch-content_browser_network__service__instance__impl.cc b/www/ungoogled-chromium/files/patch-content_browser_network__service__instance__impl.cc index aba9bcc20f3b..9011b476f5a6 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_network__service__instance__impl.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_network__service__instance__impl.cc @@ -1,4 +1,4 @@ ---- content/browser/network_service_instance_impl.cc.orig 2024-08-26 14:40:28 UTC +--- content/browser/network_service_instance_impl.cc.orig 2024-10-01 07:26:23 UTC +++ content/browser/network_service_instance_impl.cc @@ -85,7 +85,7 @@ #include "content/browser/network/network_service_process_tracker_win.h" @@ -9,7 +9,7 @@ #include "content/browser/system_dns_resolution/system_dns_resolver.h" #include "services/network/public/mojom/system_dns_resolution.mojom-forward.h" #endif -@@ -363,7 +363,7 @@ void CreateInProcessNetworkService( +@@ -368,7 +368,7 @@ void CreateInProcessNetworkService( std::move(receiver))); } @@ -18,7 +18,7 @@ // Runs a self-owned SystemDnsResolverMojoImpl. This is meant to run on a // high-priority thread pool. void RunSystemDnsResolverOnThreadPool( -@@ -432,7 +432,7 @@ network::mojom::NetworkServiceParamsPtr CreateNetworkS +@@ -437,7 +437,7 @@ network::mojom::NetworkServiceParamsPtr CreateNetworkS } #endif // BUILDFLAG(IS_POSIX) diff --git a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc index 9b1dacc22a33..7a268772c6da 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_process_host_impl.cc.orig 2024-08-26 14:40:28 UTC +--- content/browser/renderer_host/render_process_host_impl.cc.orig 2024-10-01 07:26:23 UTC +++ content/browser/renderer_host/render_process_host_impl.cc -@@ -219,7 +219,7 @@ +@@ -220,7 +220,7 @@ #include "third_party/blink/public/mojom/android_font_lookup/android_font_lookup.mojom.h" #endif @@ -9,7 +9,7 @@ #include <sys/resource.h> #include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck -@@ -949,7 +949,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = +@@ -1028,7 +1028,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = // to indicate failure and std::numeric_limits<size_t>::max() to indicate // unlimited. size_t GetPlatformProcessLimit() { @@ -18,7 +18,7 @@ struct rlimit limit; if (getrlimit(RLIMIT_NPROC, &limit) != 0) return kUnknownPlatformProcessLimit; -@@ -1122,7 +1122,7 @@ RenderProcessHostImpl::IOThreadHostImpl::~IOThreadHost +@@ -1201,7 +1201,7 @@ RenderProcessHostImpl::IOThreadHostImpl::~IOThreadHost void RenderProcessHostImpl::IOThreadHostImpl::SetPid( base::ProcessId child_pid) { @@ -27,7 +27,7 @@ child_thread_type_switcher_.SetPid(child_pid); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) } -@@ -3132,7 +3132,7 @@ void RenderProcessHostImpl::AppendRendererCommandLine( +@@ -3233,7 +3233,7 @@ void RenderProcessHostImpl::AppendRendererCommandLine( base::TimeTicks::UnixEpoch().since_origin().InMicroseconds())); } @@ -36,7 +36,7 @@ // Append `kDisableVideoCaptureUseGpuMemoryBuffer` flag if there is no support // for NV12 GPU memory buffer. if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled() && -@@ -3189,6 +3189,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin +@@ -3289,6 +3289,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin switches::kDisableSpeechAPI, switches::kDisableThreadedCompositing, switches::kDisableTouchDragDrop, @@ -44,3 +44,12 @@ switches::kDisableV8IdleTasks, switches::kDisableVideoCaptureUseGpuMemoryBuffer, switches::kDisableWebGLImageChromium, +@@ -5064,7 +5065,7 @@ uint64_t RenderProcessHostImpl::GetPrivateMemoryFootpr + // - Win: https://crbug.com/707022 . + uint64_t total_size = 0; + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + total_size = dump->platform_private_footprint->rss_anon_bytes + + dump->platform_private_footprint->vm_swap_bytes; + #elif BUILDFLAG(IS_APPLE) diff --git a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h index d4afc0e58bba..24ef9bb8d9b3 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h +++ b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h @@ -1,4 +1,4 @@ ---- content/browser/renderer_host/render_process_host_impl.h.orig 2024-08-26 14:40:28 UTC +--- content/browser/renderer_host/render_process_host_impl.h.orig 2024-10-01 07:26:23 UTC +++ content/browser/renderer_host/render_process_host_impl.h @@ -102,7 +102,7 @@ #include "media/fuchsia_media_codec_provider_impl.h" @@ -9,7 +9,7 @@ #include "content/browser/child_thread_type_switcher_linux.h" #include "media/mojo/mojom/video_encode_accelerator.mojom.h" #endif -@@ -602,7 +602,7 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -611,7 +611,7 @@ class CONTENT_EXPORT RenderProcessHostImpl // Sets this RenderProcessHost to be guest only. For Testing only. void SetForGuestsOnlyForTesting(); @@ -18,7 +18,7 @@ // Launch the zygote early in the browser startup. static void EarlyZygoteLaunch(); #endif // BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_MAC) -@@ -967,7 +967,7 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -976,7 +976,7 @@ class CONTENT_EXPORT RenderProcessHostImpl std::unique_ptr<service_manager::BinderRegistry> binders_; mojo::Receiver<mojom::ChildProcessHost> receiver_{this}; diff --git a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc index 3752bf75b302..d34c79cd9d6b 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc @@ -1,4 +1,4 @@ ---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2024-09-14 09:26:11 UTC +--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2024-10-01 07:26:23 UTC +++ content/browser/renderer_host/render_widget_host_view_aura.cc @@ -120,7 +120,7 @@ #include "ui/gfx/gdi_util.h" @@ -9,7 +9,7 @@ #include "content/browser/accessibility/browser_accessibility_auralinux.h" #include "ui/base/ime/linux/text_edit_command_auralinux.h" #include "ui/base/ime/text_input_flags.h" -@@ -479,7 +479,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge +@@ -483,7 +483,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge return ToBrowserAccessibilityWin(manager->GetBrowserAccessibilityRoot()) ->GetCOM(); @@ -18,7 +18,7 @@ BrowserAccessibilityManager* manager = host()->GetOrCreateRootBrowserAccessibilityManager(); if (manager && manager->GetBrowserAccessibilityRoot()) -@@ -1736,7 +1736,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() { +@@ -1744,7 +1744,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() { return host() && host()->delegate() && host()->delegate()->ShouldDoLearning(); } @@ -27,7 +27,7 @@ bool RenderWidgetHostViewAura::SetCompositionFromExistingText( const gfx::Range& range, const std::vector<ui::ImeTextSpan>& ui_ime_text_spans) { -@@ -2564,7 +2564,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { +@@ -2588,7 +2588,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { } bool RenderWidgetHostViewAura::NeedsMouseCapture() { @@ -36,7 +36,7 @@ return NeedsInputGrab(); #else return false; -@@ -2748,7 +2748,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit +@@ -2772,7 +2772,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit if (!target_host) return; diff --git a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h index 8da7852efcf4..dc5288df47e9 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h +++ b/www/ungoogled-chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_widget_host_view_aura.h.orig 2024-08-26 14:40:28 UTC +--- content/browser/renderer_host/render_widget_host_view_aura.h.orig 2024-10-01 07:26:23 UTC +++ content/browser/renderer_host/render_widget_host_view_aura.h -@@ -260,7 +260,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura +@@ -261,7 +261,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura ukm::SourceId GetClientSourceForMetrics() const override; bool ShouldDoLearning() override; diff --git a/www/ungoogled-chromium/files/patch-content_browser_utility__process__host.cc b/www/ungoogled-chromium/files/patch-content_browser_utility__process__host.cc index 2645d37c8ebe..199032851ac4 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_utility__process__host.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_utility__process__host.cc @@ -1,6 +1,6 @@ ---- content/browser/utility_process_host.cc.orig 2024-08-26 14:40:28 UTC +--- content/browser/utility_process_host.cc.orig 2024-10-01 07:26:23 UTC +++ content/browser/utility_process_host.cc -@@ -61,7 +61,7 @@ +@@ -62,7 +62,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" -@@ -74,7 +74,7 @@ +@@ -75,7 +75,7 @@ #include "services/network/public/mojom/network_service.mojom.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" -@@ -85,7 +85,7 @@ namespace content { +@@ -86,7 +86,7 @@ namespace content { namespace { @@ -27,7 +27,7 @@ base::ScopedFD PassNetworkContextParentDirs( std::vector<base::FilePath> network_context_parent_dirs) { base::Pickle pickle; -@@ -150,7 +150,7 @@ UtilityProcessHost::UtilityProcessHost(std::unique_ptr +@@ -151,7 +151,7 @@ UtilityProcessHost::UtilityProcessHost(std::unique_ptr started_(false), name_(u"utility process"), file_data_(std::make_unique<ChildProcessLauncherFileData>()), @@ -36,7 +36,7 @@ allowed_gpu_(false), gpu_client_(nullptr, base::OnTaskRunnerDeleter(nullptr)), #endif -@@ -209,7 +209,7 @@ void UtilityProcessHost::SetPreloadLibraries( +@@ -210,7 +210,7 @@ void UtilityProcessHost::SetPreloadLibraries( #endif // BUILDFLAG(IS_WIN) void UtilityProcessHost::SetAllowGpuClient() { @@ -45,7 +45,7 @@ allowed_gpu_ = true; #endif } -@@ -407,7 +407,7 @@ bool UtilityProcessHost::StartProcess() { +@@ -408,7 +408,7 @@ bool UtilityProcessHost::StartProcess() { file_data_->files_to_preload.merge(GetV8SnapshotFilesToPreload(*cmd_line)); #endif // BUILDFLAG(IS_POSIX) @@ -54,7 +54,7 @@ // The network service should have access to the parent directories // necessary for its usage. if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork) { -@@ -418,13 +418,13 @@ bool UtilityProcessHost::StartProcess() { +@@ -419,13 +419,13 @@ bool UtilityProcessHost::StartProcess() { } #endif // BUILDFLAG(IS_LINUX) diff --git a/www/ungoogled-chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc b/www/ungoogled-chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc index aa23ddf939d7..9b58774565a4 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc @@ -1,4 +1,4 @@ ---- content/browser/web_contents/web_contents_view_aura.cc.orig 2024-08-26 14:40:28 UTC +--- content/browser/web_contents/web_contents_view_aura.cc.orig 2024-10-01 07:26:23 UTC +++ content/browser/web_contents/web_contents_view_aura.cc @@ -174,7 +174,7 @@ class WebDragSourceAura : public content::WebContentsO raw_ptr<aura::Window> window_; @@ -18,7 +18,7 @@ // We set the file contents before the URL because the URL also sets file // contents (to a .URL shortcut). We want to prefer file content data over // a shortcut so we add it first. -@@ -1319,7 +1319,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent* +@@ -1324,7 +1324,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent* // Linux window managers like to handle raise-on-click themselves. If we // raise-on-click manually, this may override user settings that prevent // focus-stealing. diff --git a/www/ungoogled-chromium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.cc b/www/ungoogled-chromium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.cc index b31521f84334..101da4e09b5d 100644 --- a/www/ungoogled-chromium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.cc +++ b/www/ungoogled-chromium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.cc @@ -1,6 +1,6 @@ ---- content/browser/zygote_host/zygote_host_impl_linux.cc.orig 2024-04-23 07:42:17 UTC +--- content/browser/zygote_host/zygote_host_impl_linux.cc.orig 2024-10-01 07:26:23 UTC +++ content/browser/zygote_host/zygote_host_impl_linux.cc -@@ -18,8 +18,10 @@ +@@ -19,8 +19,10 @@ #include "build/chromeos_buildflags.h" #include "content/common/zygote/zygote_commands_linux.h" #include "content/common/zygote/zygote_communication_linux.h" @@ -11,7 +11,7 @@ #include "sandbox/linux/services/credentials.h" #include "sandbox/linux/services/namespace_sandbox.h" #include "sandbox/linux/suid/client/setuid_sandbox_host.h" -@@ -37,6 +39,7 @@ namespace content { +@@ -38,6 +40,7 @@ namespace content { namespace { @@ -19,7 +19,7 @@ // Receive a fixed message on fd and return the sender's PID. // Returns true if the message received matches the expected message. bool ReceiveFixedMessage(int fd, -@@ -58,6 +61,7 @@ bool ReceiveFixedMessage(int fd, +@@ -60,6 +63,7 @@ bool ReceiveFixedMessage(int fd, return false; return true; } @@ -27,7 +27,7 @@ } // namespace -@@ -67,9 +71,13 @@ ZygoteHost* ZygoteHost::GetInstance() { +@@ -69,9 +73,13 @@ ZygoteHost* ZygoteHost::GetInstance() { } ZygoteHostImpl::ZygoteHostImpl() @@ -41,7 +41,7 @@ sandbox_binary_(), zygote_pids_lock_(), zygote_pids_() {} -@@ -82,6 +90,7 @@ ZygoteHostImpl* ZygoteHostImpl::GetInstance() { +@@ -84,6 +92,7 @@ ZygoteHostImpl* ZygoteHostImpl::GetInstance() { } void ZygoteHostImpl::Init(const base::CommandLine& command_line) { @@ -49,7 +49,7 @@ if (command_line.HasSwitch(sandbox::policy::switches::kNoSandbox)) { return; } -@@ -132,6 +141,7 @@ void ZygoteHostImpl::Init(const base::CommandLine& com +@@ -138,6 +147,7 @@ void ZygoteHostImpl::Init(const base::CommandLine& com "you can try using --" << sandbox::policy::switches::kNoSandbox << "."; } @@ -57,7 +57,7 @@ } void ZygoteHostImpl::AddZygotePid(pid_t pid) { -@@ -156,6 +166,7 @@ pid_t ZygoteHostImpl::LaunchZygote( +@@ -162,6 +172,7 @@ pid_t ZygoteHostImpl::LaunchZygote( base::CommandLine* cmd_line, base::ScopedFD* control_fd, base::FileHandleMappingVector additional_remapped_fds) { @@ -65,7 +65,7 @@ int fds[2]; CHECK_EQ(0, socketpair(AF_UNIX, SOCK_SEQPACKET | SOCK_CLOEXEC, 0, fds)); CHECK(base::UnixDomainSocket::EnableReceiveProcessId(fds[0])); -@@ -224,9 +235,12 @@ pid_t ZygoteHostImpl::LaunchZygote( +@@ -230,9 +241,12 @@ pid_t ZygoteHostImpl::LaunchZygote( AddZygotePid(pid); return pid; diff --git a/www/ungoogled-chromium/files/patch-content_child_child__process.cc b/www/ungoogled-chromium/files/patch-content_child_child__process.cc index 89c12ecbcf7e..ebdc3ca2e873 100644 --- a/www/ungoogled-chromium/files/patch-content_child_child__process.cc +++ b/www/ungoogled-chromium/files/patch-content_child_child__process.cc @@ -1,6 +1,6 @@ ---- content/child/child_process.cc.orig 2024-07-31 14:19:23 UTC +--- content/child/child_process.cc.orig 2024-10-01 07:26:23 UTC +++ content/child/child_process.cc -@@ -35,7 +35,7 @@ +@@ -32,7 +32,7 @@ #include "content/common/android/cpu_time_metrics.h" #endif @@ -9,16 +9,7 @@ #include "content/child/sandboxed_process_thread_type_handler.h" #endif -@@ -70,7 +70,7 @@ ChildProcess::ChildProcess(base::ThreadType io_thread_ - thread_pool_init_params) - : resetter_(&child_process, this, nullptr), - io_thread_(std::make_unique<ChildIOThread>()) { --#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 = -@@ -199,7 +199,7 @@ void ChildProcess::set_main_thread(ChildThreadImpl* th +@@ -179,7 +179,7 @@ void ChildProcess::set_main_thread(ChildThreadImpl* th main_thread_.reset(thread); } diff --git a/www/ungoogled-chromium/files/patch-content_common_BUILD.gn b/www/ungoogled-chromium/files/patch-content_common_BUILD.gn index f681cb996915..0f357b267d72 100644 --- a/www/ungoogled-chromium/files/patch-content_common_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-content_common_BUILD.gn @@ -1,6 +1,6 @@ ---- content/common/BUILD.gn.orig 2024-08-26 14:40:28 UTC +--- content/common/BUILD.gn.orig 2024-10-01 07:26:23 UTC +++ content/common/BUILD.gn -@@ -388,19 +388,28 @@ source_set("common") { +@@ -386,19 +386,28 @@ source_set("common") { } if (is_linux || is_chromeos) { diff --git a/www/ungoogled-chromium/files/patch-content_common_features.cc b/www/ungoogled-chromium/files/patch-content_common_features.cc index 073526da9f24..bc92e3a3f6ee 100644 --- a/www/ungoogled-chromium/files/patch-content_common_features.cc +++ b/www/ungoogled-chromium/files/patch-content_common_features.cc @@ -1,6 +1,6 @@ ---- content/common/features.cc.orig 2024-08-26 14:40:28 UTC +--- content/common/features.cc.orig 2024-10-01 07:26:23 UTC +++ content/common/features.cc -@@ -158,7 +158,7 @@ BASE_FEATURE(kEnableBackForwardCacheForOngoingSubframe +@@ -143,7 +143,7 @@ BASE_FEATURE(kEnableBackForwardCacheForOngoingSubframe base::FEATURE_ENABLED_BY_DEFAULT); // Enables error reporting for JS errors inside DevTools frontend host @@ -9,7 +9,7 @@ BASE_FEATURE(kEnableDevToolsJsErrorReporting, "EnableDevToolsJsErrorReporting", base::FEATURE_DISABLED_BY_DEFAULT); -@@ -308,7 +308,7 @@ BASE_FEATURE(kGroupNIKByJoiningOrigin, +@@ -293,7 +293,7 @@ BASE_FEATURE(kGroupNIKByJoiningOrigin, // process and having browser process handle adjusting thread properties (nice // value, c-group, latency sensitivity...) for children which have sandbox // restrictions. diff --git a/www/ungoogled-chromium/files/patch-content_common_features.h b/www/ungoogled-chromium/files/patch-content_common_features.h index 7c6c32bc22d6..0f6021806e47 100644 --- a/www/ungoogled-chromium/files/patch-content_common_features.h +++ b/www/ungoogled-chromium/files/patch-content_common_features.h @@ -1,6 +1,6 @@ ---- content/common/features.h.orig 2024-08-26 14:40:28 UTC +--- content/common/features.h.orig 2024-10-01 07:26:23 UTC +++ content/common/features.h -@@ -35,7 +35,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kDocumentPolicyNeg +@@ -34,7 +34,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kDocumentPolicyNeg CONTENT_EXPORT BASE_DECLARE_FEATURE(kEnableBackForwardCacheForScreenReader); CONTENT_EXPORT BASE_DECLARE_FEATURE( kEnableBackForwardCacheForOngoingSubframeNavigation); @@ -9,7 +9,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kEnableDevToolsJsErrorReporting); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) CONTENT_EXPORT BASE_DECLARE_FEATURE(kEmbeddingRequiresOptIn); -@@ -76,7 +76,7 @@ CONTENT_EXPORT extern const base::FeatureParam<int> +@@ -75,7 +75,7 @@ CONTENT_EXPORT extern const base::FeatureParam<int> CONTENT_EXPORT BASE_DECLARE_FEATURE(kGpuInfoCollectionSeparatePrefetch); #endif CONTENT_EXPORT BASE_DECLARE_FEATURE(kGroupNIKByJoiningOrigin); diff --git a/www/ungoogled-chromium/files/patch-content_common_mojo__core__library__support.cc b/www/ungoogled-chromium/files/patch-content_common_mojo__core__library__support.cc deleted file mode 100644 index 9db2e99ebe91..000000000000 --- a/www/ungoogled-chromium/files/patch-content_common_mojo__core__library__support.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- content/common/mojo_core_library_support.cc.orig 2024-02-25 20:22:18 UTC -+++ content/common/mojo_core_library_support.cc -@@ -15,7 +15,7 @@ bool IsMojoCoreSharedLibraryEnabled() { - } - - std::optional<base::FilePath> GetMojoCoreSharedLibraryPath() { --#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(); - if (!command_line.HasSwitch(switches::kMojoCoreLibraryPath)) diff --git a/www/ungoogled-chromium/files/patch-content_gpu_gpu__main.cc b/www/ungoogled-chromium/files/patch-content_gpu_gpu__main.cc index d29779072d8f..f2ac914a67c7 100644 --- a/www/ungoogled-chromium/files/patch-content_gpu_gpu__main.cc +++ b/www/ungoogled-chromium/files/patch-content_gpu_gpu__main.cc @@ -1,6 +1,6 @@ ---- content/gpu/gpu_main.cc.orig 2024-08-26 14:40:28 UTC +--- content/gpu/gpu_main.cc.orig 2024-10-01 07:26:23 UTC +++ content/gpu/gpu_main.cc -@@ -94,10 +94,14 @@ +@@ -95,10 +95,14 @@ #include "sandbox/win/src/sandbox.h" #endif @@ -16,7 +16,7 @@ #include "sandbox/policy/sandbox_type.h" #endif -@@ -116,7 +120,7 @@ namespace content { +@@ -117,7 +121,7 @@ namespace content { namespace { @@ -25,7 +25,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread*, const gpu::GPUInfo*, const gpu::GpuPreferences&); -@@ -174,7 +178,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel +@@ -175,7 +179,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel bool EnsureSandboxInitialized(gpu::GpuWatchdogThread* watchdog_thread, const gpu::GPUInfo* gpu_info, const gpu::GpuPreferences& gpu_prefs) override { @@ -34,7 +34,7 @@ return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs); #elif BUILDFLAG(IS_WIN) return StartSandboxWindows(sandbox_info_); -@@ -284,7 +288,7 @@ int GpuMain(MainFunctionParams parameters) { +@@ -285,7 +289,7 @@ int GpuMain(MainFunctionParams parameters) { std::make_unique<base::SingleThreadTaskExecutor>( gpu_preferences.message_pump_type); } @@ -43,9 +43,9 @@ #error "Unsupported Linux platform." #elif BUILDFLAG(IS_MAC) // Cross-process CoreAnimation requires a CFRunLoop to function at all, and -@@ -306,7 +310,8 @@ int GpuMain(MainFunctionParams parameters) { - +@@ -308,7 +312,8 @@ int GpuMain(MainFunctionParams parameters) { base::PlatformThread::SetName("CrGpuMain"); + mojo::InterfaceEndpointClient::SetThreadNameSuffixForMetrics("GpuMain"); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +// XXX BSD @@ -53,7 +53,7 @@ // Thread type delegate of the process should be registered before // thread type change below for the main thread and for thread pool in // ChildProcess constructor. -@@ -436,7 +441,7 @@ int GpuMain(MainFunctionParams parameters) { +@@ -438,7 +443,7 @@ int GpuMain(MainFunctionParams parameters) { namespace { @@ -62,7 +62,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdog_thread, const gpu::GPUInfo* gpu_info, const gpu::GpuPreferences& gpu_prefs) { -@@ -476,7 +481,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo +@@ -478,7 +483,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo sandbox_options.accelerated_video_encode_enabled = !gpu_prefs.disable_accelerated_video_encode; diff --git a/www/ungoogled-chromium/files/patch-content_public_browser_content__browser__client.cc b/www/ungoogled-chromium/files/patch-content_public_browser_content__browser__client.cc index e706d232e038..0bf8f9f80caa 100644 --- a/www/ungoogled-chromium/files/patch-content_public_browser_content__browser__client.cc +++ b/www/ungoogled-chromium/files/patch-content_public_browser_content__browser__client.cc @@ -1,6 +1,6 @@ ---- content/public/browser/content_browser_client.cc.orig 2024-08-26 14:40:28 UTC +--- content/public/browser/content_browser_client.cc.orig 2024-10-01 07:26:23 UTC +++ content/public/browser/content_browser_client.cc -@@ -1325,7 +1325,7 @@ bool ContentBrowserClient::ShouldRunOutOfProcessSystem +@@ -1331,7 +1331,7 @@ bool ContentBrowserClient::ShouldRunOutOfProcessSystem // that can be adequately sandboxed. // Currently Android's network service will not run out of process or sandboxed, // so OutOfProcessSystemDnsResolution is not currently enabled on Android. diff --git a/www/ungoogled-chromium/files/patch-content_public_common_content__features.cc b/www/ungoogled-chromium/files/patch-content_public_common_content__features.cc index c8a3aca586a7..bd4362bacc7b 100644 --- a/www/ungoogled-chromium/files/patch-content_public_common_content__features.cc +++ b/www/ungoogled-chromium/files/patch-content_public_common_content__features.cc @@ -1,6 +1,6 @@ ---- content/public/common/content_features.cc.orig 2024-08-26 14:40:28 UTC +--- content/public/common/content_features.cc.orig 2024-10-01 07:26:23 UTC +++ content/public/common/content_features.cc -@@ -36,7 +36,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess, +@@ -65,7 +65,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess, // TODO(crbug.com/40118868): Remove !IS_CHROMEOS_LACROS once lacros starts being // built with OS_CHROMEOS instead of OS_LINUX. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ @@ -9,7 +9,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -1128,9 +1128,9 @@ BASE_FEATURE(kWebAssemblyTiering, +@@ -1174,9 +1174,9 @@ BASE_FEATURE(kWebAssemblyTiering, BASE_FEATURE(kWebAssemblyTrapHandler, "WebAssemblyTrapHandler", #if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ @@ -21,7 +21,7 @@ defined(ARCH_CPU_ARM64)) base::FEATURE_ENABLED_BY_DEFAULT #else -@@ -1167,7 +1167,11 @@ BASE_FEATURE(kWebUICodeCache, +@@ -1213,7 +1213,11 @@ BASE_FEATURE(kWebUICodeCache, // Controls whether the WebUSB API is enabled: // https://wicg.github.io/webusb diff --git a/www/ungoogled-chromium/files/patch-content_public_common_content__switches.cc b/www/ungoogled-chromium/files/patch-content_public_common_content__switches.cc index 2a26119da828..25f5d0e87620 100644 --- a/www/ungoogled-chromium/files/patch-content_public_common_content__switches.cc +++ b/www/ungoogled-chromium/files/patch-content_public_common_content__switches.cc @@ -1,4 +1,4 @@ ---- content/public/common/content_switches.cc.orig 2024-08-26 14:40:28 UTC +--- content/public/common/content_switches.cc.orig 2024-10-01 07:26:23 UTC +++ content/public/common/content_switches.cc @@ -349,6 +349,8 @@ const char kEnableIsolatedWebAppsInRenderer[] = // builds. @@ -9,7 +9,7 @@ // Enables the type, downlinkMax attributes of the NetInfo API. Also, enables // triggering of change attribute of the NetInfo API when there is a change in // the connection type. -@@ -987,7 +989,7 @@ const char kPreventResizingContentsForTesting[] = +@@ -983,7 +985,7 @@ const char kPreventResizingContentsForTesting[] = // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/files/patch-content_public_common_content__switches.h b/www/ungoogled-chromium/files/patch-content_public_common_content__switches.h index bfe54ea74b72..1b0de8f04299 100644 --- a/www/ungoogled-chromium/files/patch-content_public_common_content__switches.h +++ b/www/ungoogled-chromium/files/patch-content_public_common_content__switches.h @@ -1,4 +1,4 @@ ---- content/public/common/content_switches.h.orig 2024-08-26 14:40:28 UTC +--- content/public/common/content_switches.h.orig 2024-10-01 07:26:23 UTC +++ content/public/common/content_switches.h @@ -110,6 +110,7 @@ CONTENT_EXPORT extern const char kEnableGpuMemoryBuffe CONTENT_EXPORT extern const char kEnableIsolatedWebAppsInRenderer[]; @@ -8,7 +8,7 @@ CONTENT_EXPORT extern const char kEnableNetworkInformationDownlinkMax[]; CONTENT_EXPORT extern const char kEnableCanvas2DLayers[]; CONTENT_EXPORT extern const char kEnablePluginPlaceholderTesting[]; -@@ -268,7 +269,7 @@ CONTENT_EXPORT extern const char kPreventResizingConte +@@ -267,7 +268,7 @@ CONTENT_EXPORT extern const char kPreventResizingConte // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/files/patch-content_renderer_render__thread__impl.cc b/www/ungoogled-chromium/files/patch-content_renderer_render__thread__impl.cc index 1e82b8c60f4b..2ea352305e77 100644 --- a/www/ungoogled-chromium/files/patch-content_renderer_render__thread__impl.cc +++ b/www/ungoogled-chromium/files/patch-content_renderer_render__thread__impl.cc @@ -1,6 +1,6 @@ ---- content/renderer/render_thread_impl.cc.orig 2024-08-26 14:40:28 UTC +--- content/renderer/render_thread_impl.cc.orig 2024-10-01 07:26:23 UTC +++ content/renderer/render_thread_impl.cc -@@ -214,6 +214,8 @@ +@@ -215,6 +215,8 @@ #if BUILDFLAG(IS_APPLE) #include <malloc/malloc.h> @@ -9,7 +9,7 @@ #else #include <malloc.h> #endif -@@ -1017,7 +1019,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1022,7 +1024,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) && -@@ -1026,7 +1028,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1031,7 +1033,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) && -@@ -1801,7 +1803,7 @@ std::unique_ptr<CodecFactory> RenderThreadImpl::Create +@@ -1817,7 +1819,7 @@ std::unique_ptr<CodecFactory> RenderThreadImpl::Create bool enable_video_encode_accelerator) { mojo::PendingRemote<media::mojom::VideoEncodeAcceleratorProvider> vea_provider; diff --git a/www/ungoogled-chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc b/www/ungoogled-chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc index 9d1a244da52e..60d2b3fcdf78 100644 --- a/www/ungoogled-chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc +++ b/www/ungoogled-chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc @@ -1,6 +1,6 @@ ---- content/renderer/renderer_blink_platform_impl.cc.orig 2024-08-26 14:40:28 UTC +--- content/renderer/renderer_blink_platform_impl.cc.orig 2024-10-01 07:26:23 UTC +++ content/renderer/renderer_blink_platform_impl.cc -@@ -127,7 +127,7 @@ +@@ -129,7 +129,7 @@ #if BUILDFLAG(IS_MAC) #include "content/child/child_process_sandbox_support_impl_mac.h" @@ -9,7 +9,7 @@ #include "content/child/child_process_sandbox_support_impl_linux.h" #include "content/child/sandboxed_process_thread_type_handler.h" #endif -@@ -197,13 +197,13 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -199,13 +199,13 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( is_locked_to_site_(false), main_thread_scheduler_(main_thread_scheduler), next_frame_sink_id_(uint32_t{std::numeric_limits<int32_t>::max()} + 1) { @@ -25,7 +25,7 @@ mojo::PendingRemote<font_service::mojom::FontService> font_service; RenderThreadImpl::current()->BindHostReceiver( font_service.InitWithNewPipeAndPassReceiver()); -@@ -223,7 +223,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -225,7 +225,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( #endif } @@ -34,7 +34,7 @@ if (sandboxEnabled()) { #if BUILDFLAG(IS_MAC) sandbox_support_ = std::make_unique<WebSandboxSupportMac>(); -@@ -284,7 +284,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl +@@ -286,7 +286,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl #endif blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() { diff --git a/www/ungoogled-chromium/files/patch-content_renderer_renderer__blink__platform__impl.h b/www/ungoogled-chromium/files/patch-content_renderer_renderer__blink__platform__impl.h index f9bb76ef7621..22b3f1eee2e9 100644 --- a/www/ungoogled-chromium/files/patch-content_renderer_renderer__blink__platform__impl.h +++ b/www/ungoogled-chromium/files/patch-content_renderer_renderer__blink__platform__impl.h @@ -1,6 +1,6 @@ ---- content/renderer/renderer_blink_platform_impl.h.orig 2024-09-14 09:26:11 UTC +--- content/renderer/renderer_blink_platform_impl.h.orig 2024-10-01 07:26:23 UTC +++ content/renderer/renderer_blink_platform_impl.h -@@ -255,7 +255,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -257,7 +257,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi void Collect3DContextInformation(blink::Platform::GraphicsInfo* gl_info, const gpu::GPUInfo& gpu_info) const; diff --git a/www/ungoogled-chromium/files/patch-content_shell_BUILD.gn b/www/ungoogled-chromium/files/patch-content_shell_BUILD.gn index e30bc9548343..edc16072684d 100644 --- a/www/ungoogled-chromium/files/patch-content_shell_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-content_shell_BUILD.gn @@ -1,6 +1,6 @@ ---- content/shell/BUILD.gn.orig 2024-08-26 14:40:28 UTC +--- content/shell/BUILD.gn.orig 2024-10-01 07:26:23 UTC +++ content/shell/BUILD.gn -@@ -1081,7 +1081,7 @@ group("content_shell_crash_test") { +@@ -1079,7 +1079,7 @@ group("content_shell_crash_test") { if (is_win) { data_deps += [ "//build/win:copy_cdb_to_output" ] } diff --git a/www/ungoogled-chromium/files/patch-content_utility_services.cc b/www/ungoogled-chromium/files/patch-content_utility_services.cc index 6b99083db21f..081821d4a5e7 100644 --- a/www/ungoogled-chromium/files/patch-content_utility_services.cc +++ b/www/ungoogled-chromium/files/patch-content_utility_services.cc @@ -1,4 +1,4 @@ ---- content/utility/services.cc.orig 2024-05-23 20:04:36 UTC +--- content/utility/services.cc.orig 2024-10-01 07:26:23 UTC +++ content/utility/services.cc @@ -74,7 +74,7 @@ extern sandbox::TargetServices* g_utility_target_services; @@ -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" -@@ -97,7 +97,7 @@ extern sandbox::TargetServices* g_utility_target_servi +@@ -102,7 +102,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 "content/common/features.h" #include "media/mojo/services/stable_video_decoder_factory_process_service.h" // nogncheck -@@ -115,13 +115,13 @@ extern sandbox::TargetServices* g_utility_target_servi +@@ -120,13 +120,13 @@ extern sandbox::TargetServices* g_utility_target_servi #endif // BUILDFLAG(ENABLE_ACCESSIBILITY_SERVICE) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || \ @@ -34,7 +34,7 @@ #include "media/capture/capture_switches.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || // BUILDFLAG(IS_CHROMEOS_ASH) -@@ -239,7 +239,7 @@ auto RunAudio(mojo::PendingReceiver<audio::mojom::Audi +@@ -244,7 +244,7 @@ auto RunAudio(mojo::PendingReceiver<audio::mojom::Audi << "task_policy_set TASK_QOS_POLICY"; #endif @@ -43,7 +43,7 @@ auto* command_line = base::CommandLine::ForCurrentProcess(); if (sandbox::policy::SandboxTypeFromCommandLine(*command_line) == sandbox::mojom::Sandbox::kNoSandbox) { -@@ -328,7 +328,7 @@ auto RunVideoCapture( +@@ -340,7 +340,7 @@ auto RunVideoCapture( #endif // BUILDFLAG(IS_CHROMEOS_ASH) auto service = std::make_unique<UtilityThreadVideoCaptureServiceImpl>( std::move(receiver), base::SingleThreadTaskRunner::GetCurrentDefault()); @@ -52,7 +52,7 @@ #if BUILDFLAG(IS_CHROMEOS_ASH) { #else -@@ -384,7 +384,7 @@ auto RunOOPArcVideoAcceleratorFactoryService( +@@ -396,7 +396,7 @@ auto RunOOPArcVideoAcceleratorFactoryService( #endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) || // BUILDFLAG(USE_V4L2_CODEC)) @@ -61,7 +61,7 @@ (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) auto RunStableVideoDecoderFactoryProcessService( mojo::PendingReceiver< -@@ -395,7 +395,7 @@ auto RunStableVideoDecoderFactoryProcessService( +@@ -407,7 +407,7 @@ auto RunStableVideoDecoderFactoryProcessService( #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && // (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) @@ -70,7 +70,7 @@ auto RunVideoEncodeAcceleratorProviderFactory( mojo::PendingReceiver<media::mojom::VideoEncodeAcceleratorProviderFactory> receiver) { -@@ -418,7 +418,7 @@ void RegisterIOThreadServices(mojo::ServiceFactory& se +@@ -430,7 +430,7 @@ void RegisterIOThreadServices(mojo::ServiceFactory& se // loop of type IO that can get notified when pipes have data. services.Add(RunNetworkService); @@ -79,7 +79,7 @@ (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) if (base::FeatureList::IsEnabled( features::kRunStableVideoDecoderFactoryProcessServiceOnIOThread)) { -@@ -470,7 +470,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& +@@ -486,7 +486,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& #endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) || // BUILDFLAG(USE_V4L2_CODEC)) @@ -88,7 +88,7 @@ (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) if (!base::FeatureList::IsEnabled( features::kRunStableVideoDecoderFactoryProcessServiceOnIOThread)) { -@@ -479,7 +479,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& +@@ -495,7 +495,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && // (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) diff --git a/www/ungoogled-chromium/files/patch-device_fido_fido__discovery__factory.cc b/www/ungoogled-chromium/files/patch-device_fido_fido__discovery__factory.cc deleted file mode 100644 index e4571975098a..000000000000 --- a/www/ungoogled-chromium/files/patch-device_fido_fido__discovery__factory.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- device/fido/fido_discovery_factory.cc.orig 2024-06-22 08:49:42 UTC -+++ device/fido/fido_discovery_factory.cc -@@ -127,7 +127,7 @@ std::vector<std::unique_ptr<FidoDiscoveryBase>> FidoDi - - std::optional<std::unique_ptr<FidoDiscoveryBase>> - FidoDiscoveryFactory::MaybeCreateEnclaveDiscovery() { --#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (!base::FeatureList::IsEnabled(kWebAuthnEnclaveAuthenticator) || - !enclave_ui_request_stream_ || !network_context_factory_) { - return std::nullopt; diff --git a/www/ungoogled-chromium/files/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc b/www/ungoogled-chromium/files/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc index 6affd4a3cf4c..d72284bb5342 100644 --- a/www/ungoogled-chromium/files/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc +++ b/www/ungoogled-chromium/files/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc @@ -1,6 +1,6 @@ ---- extensions/browser/api/api_browser_context_keyed_service_factories.cc.orig 2024-03-22 14:16:19 UTC +--- extensions/browser/api/api_browser_context_keyed_service_factories.cc.orig 2024-10-01 07:26:23 UTC +++ extensions/browser/api/api_browser_context_keyed_service_factories.cc -@@ -102,7 +102,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt +@@ -111,7 +111,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt #endif MessageService::GetFactoryInstance(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ diff --git a/www/ungoogled-chromium/files/patch-extensions_common_command.cc b/www/ungoogled-chromium/files/patch-extensions_common_command.cc index 4a7bd12e5b24..4c0fbcbdbe86 100644 --- a/www/ungoogled-chromium/files/patch-extensions_common_command.cc +++ b/www/ungoogled-chromium/files/patch-extensions_common_command.cc @@ -1,6 +1,6 @@ ---- extensions/common/command.cc.orig 2024-08-26 14:40:28 UTC +--- extensions/common/command.cc.orig 2024-10-01 07:26:23 UTC +++ extensions/common/command.cc -@@ -285,7 +285,7 @@ std::string Command::CommandPlatform() { +@@ -286,7 +286,7 @@ std::string Command::CommandPlatform() { return values::kKeybindingPlatformMac; #elif BUILDFLAG(IS_CHROMEOS) return values::kKeybindingPlatformChromeOs; diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_dawn__context__provider.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_dawn__context__provider.cc index 03d2e1e79288..487211a93fb8 100644 --- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_dawn__context__provider.cc +++ b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_dawn__context__provider.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/dawn_context_provider.cc.orig 2024-08-26 14:40:28 UTC +--- gpu/command_buffer/service/dawn_context_provider.cc.orig 2024-10-01 07:26:23 UTC +++ gpu/command_buffer/service/dawn_context_provider.cc -@@ -175,7 +175,7 @@ wgpu::BackendType DawnContextProvider::GetDefaultBacke +@@ -170,7 +170,7 @@ wgpu::BackendType DawnContextProvider::GetDefaultBacke return base::FeatureList::IsEnabled(features::kSkiaGraphiteDawnUseD3D12) ? wgpu::BackendType::D3D12 : wgpu::BackendType::D3D11; diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc index 8e65c75da226..26dce08e009d 100644 --- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc +++ b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/gles2_cmd_decoder.cc.orig 2024-08-26 14:40:28 UTC +--- gpu/command_buffer/service/gles2_cmd_decoder.cc.orig 2024-10-01 07:26:23 UTC +++ gpu/command_buffer/service/gles2_cmd_decoder.cc -@@ -2902,7 +2902,7 @@ GLES2Decoder* GLES2Decoder::Create( +@@ -2906,7 +2906,7 @@ GLES2Decoder* GLES2Decoder::Create( } // Allow linux to run fuzzers. diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc index 711bb08da994..2711ece04f61 100644 --- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc +++ b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig 2024-08-26 14:40:28 UTC +--- gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig 2024-10-01 07:26:23 UTC +++ gpu/command_buffer/service/shared_image/external_vk_image_backing.cc -@@ -54,7 +54,7 @@ +@@ -59,7 +59,7 @@ #include "ui/gl/gl_version_info.h" #include "ui/gl/scoped_binders.h" @@ -9,7 +9,7 @@ #include "gpu/command_buffer/service/shared_image/external_vk_image_dawn_representation.h" #if BUILDFLAG(DAWN_ENABLE_BACKEND_OPENGLES) #include "gpu/command_buffer/service/shared_image/dawn_gl_texture_representation.h" -@@ -734,7 +734,7 @@ std::unique_ptr<DawnImageRepresentation> ExternalVkIma +@@ -739,7 +739,7 @@ std::unique_ptr<DawnImageRepresentation> ExternalVkIma wgpu::BackendType backend_type, std::vector<wgpu::TextureFormat> view_formats, scoped_refptr<SharedContextState> context_state) { diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc index 5d61343a5e0c..af403405c30b 100644 --- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc +++ b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/shared_image/shared_image_factory.cc.orig 2024-08-26 14:40:28 UTC +--- gpu/command_buffer/service/shared_image/shared_image_factory.cc.orig 2024-10-01 07:26:23 UTC +++ gpu/command_buffer/service/shared_image/shared_image_factory.cc -@@ -148,7 +148,7 @@ gfx::GpuMemoryBufferType GetNativeBufferType() { +@@ -122,7 +122,7 @@ gfx::GpuMemoryBufferType GetNativeBufferType() { return gfx::GpuMemoryBufferType::IO_SURFACE_BUFFER; #elif BUILDFLAG(IS_ANDROID) return gfx::GpuMemoryBufferType::ANDROID_HARDWARE_BUFFER; diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc index 38ee93dc422f..782bb148e14a 100644 --- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc +++ b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/shared_image/shared_image_manager.cc.orig 2024-08-26 14:40:28 UTC +--- gpu/command_buffer/service/shared_image/shared_image_manager.cc.orig 2024-10-01 07:26:23 UTC +++ gpu/command_buffer/service/shared_image/shared_image_manager.cc -@@ -572,7 +572,7 @@ bool SharedImageManager::SupportsScanoutImages() { +@@ -576,7 +576,7 @@ bool SharedImageManager::SupportsScanoutImages() { return true; #elif BUILDFLAG(IS_ANDROID) return base::AndroidHardwareBufferCompat::IsSupportAvailable(); diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc index ebc53422c60f..99de2d2cd39f 100644 --- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc +++ b/www/ungoogled-chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2024-08-26 14:40:28 UTC +--- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2024-10-01 07:26:23 UTC +++ gpu/command_buffer/service/webgpu_decoder_impl.cc -@@ -1303,7 +1303,7 @@ WGPUFuture WebGPUDecoderImpl::RequestAdapterImpl( +@@ -1308,7 +1308,7 @@ WGPUFuture WebGPUDecoderImpl::RequestAdapterImpl( force_fallback_adapter = true; } @@ -9,7 +9,7 @@ if (!shared_context_state_->GrContextIsVulkan() && !shared_context_state_->IsGraphiteDawnVulkan() && use_webgpu_adapter_ != WebGPUAdapterName::kOpenGLES) { -@@ -1972,7 +1972,7 @@ WebGPUDecoderImpl::AssociateMailboxDawn( +@@ -1977,7 +1977,7 @@ WebGPUDecoderImpl::AssociateMailboxDawn( } #if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_APPLE) && \ diff --git a/www/ungoogled-chromium/files/patch-gpu_command__buffer_tests_gl__gpu__memory__buffer__unittest.cc b/www/ungoogled-chromium/files/patch-gpu_command__buffer_tests_gl__gpu__memory__buffer__unittest.cc index f3eec286ec83..d0ff85c827a4 100644 --- a/www/ungoogled-chromium/files/patch-gpu_command__buffer_tests_gl__gpu__memory__buffer__unittest.cc +++ b/www/ungoogled-chromium/files/patch-gpu_command__buffer_tests_gl__gpu__memory__buffer__unittest.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/tests/gl_gpu_memory_buffer_unittest.cc.orig 2023-05-05 12:12:41 UTC +--- gpu/command_buffer/tests/gl_gpu_memory_buffer_unittest.cc.orig 2024-10-01 07:26:23 UTC +++ gpu/command_buffer/tests/gl_gpu_memory_buffer_unittest.cc -@@ -27,7 +27,7 @@ +@@ -32,7 +32,7 @@ #include "ui/gfx/half_float.h" #include "ui/gl/test/gl_test_support.h" @@ -9,7 +9,7 @@ #include "gpu/ipc/common/gpu_memory_buffer_impl_native_pixmap.h" #include "ui/gfx/linux/client_native_pixmap_factory_dmabuf.h" #endif -@@ -70,7 +70,7 @@ class GpuMemoryBufferTest : public testing::TestWithPa +@@ -75,7 +75,7 @@ class GpuMemoryBufferTest : public testing::TestWithPa GLManager gl_; }; diff --git a/www/ungoogled-chromium/files/patch-gpu_config_gpu__control__list.cc b/www/ungoogled-chromium/files/patch-gpu_config_gpu__control__list.cc index 20228f70aac9..8962cd96c20d 100644 --- a/www/ungoogled-chromium/files/patch-gpu_config_gpu__control__list.cc +++ b/www/ungoogled-chromium/files/patch-gpu_config_gpu__control__list.cc @@ -1,6 +1,6 @@ ---- gpu/config/gpu_control_list.cc.orig 2024-08-26 14:40:28 UTC +--- gpu/config/gpu_control_list.cc.orig 2024-10-01 07:26:23 UTC +++ gpu/config/gpu_control_list.cc -@@ -277,7 +277,7 @@ bool GpuControlList::More::GLVersionInfoMismatch( +@@ -282,7 +282,7 @@ bool GpuControlList::More::GLVersionInfoMismatch( GpuControlList::GLType GpuControlList::More::GetDefaultGLType() { #if BUILDFLAG(IS_CHROMEOS) return kGLTypeGL; @@ -9,7 +9,7 @@ return kGLTypeGL; #elif BUILDFLAG(IS_MAC) return kGLTypeGL; -@@ -814,7 +814,7 @@ GpuControlList::OsType GpuControlList::GetOsType() { +@@ -819,7 +819,7 @@ GpuControlList::OsType GpuControlList::GetOsType() { return kOsAndroid; #elif BUILDFLAG(IS_FUCHSIA) return kOsFuchsia; diff --git a/www/ungoogled-chromium/files/patch-gpu_config_gpu__info__collector.cc b/www/ungoogled-chromium/files/patch-gpu_config_gpu__info__collector.cc index 0a29510a9704..e6599ab1f367 100644 --- a/www/ungoogled-chromium/files/patch-gpu_config_gpu__info__collector.cc +++ b/www/ungoogled-chromium/files/patch-gpu_config_gpu__info__collector.cc @@ -1,6 +1,6 @@ ---- gpu/config/gpu_info_collector.cc.orig 2024-02-25 20:22:18 UTC +--- gpu/config/gpu_info_collector.cc.orig 2024-10-01 07:26:23 UTC +++ gpu/config/gpu_info_collector.cc -@@ -364,7 +364,7 @@ void ReportWebGPUAdapterMetrics(dawn::native::Instance +@@ -370,7 +370,7 @@ void ReportWebGPUAdapterMetrics(dawn::native::Instance void ReportWebGPUSupportMetrics(dawn::native::Instance* instance) { static BASE_FEATURE(kCollectWebGPUSupportMetrics, "CollectWebGPUSupportMetrics", diff --git a/www/ungoogled-chromium/files/patch-gpu_ipc_service_gpu__init.cc b/www/ungoogled-chromium/files/patch-gpu_ipc_service_gpu__init.cc index 93f5373600e2..de58747ee5c3 100644 --- a/www/ungoogled-chromium/files/patch-gpu_ipc_service_gpu__init.cc +++ b/www/ungoogled-chromium/files/patch-gpu_ipc_service_gpu__init.cc @@ -1,6 +1,6 @@ ---- gpu/ipc/service/gpu_init.cc.orig 2024-08-26 14:40:28 UTC +--- gpu/ipc/service/gpu_init.cc.orig 2024-10-01 07:26:23 UTC +++ gpu/ipc/service/gpu_init.cc -@@ -398,7 +398,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -387,7 +387,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL enable_watchdog = false; #endif @@ -9,7 +9,7 @@ bool gpu_sandbox_start_early = gpu_preferences_.gpu_sandbox_start_early; #else // !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) // For some reasons MacOSX's VideoToolbox might crash when called after -@@ -435,7 +435,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -424,7 +424,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } bool attempted_startsandbox = false; @@ -18,7 +18,7 @@ // On Chrome OS ARM Mali, GPU driver userspace creates threads when // initializing a GL context, so start the sandbox early. // TODO(zmo): Need to collect OS version before this. -@@ -544,7 +544,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -528,7 +528,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL gpu_preferences_.gr_context_type = GrContextType::kGL; } @@ -27,7 +27,7 @@ // The ContentSandboxHelper is currently the only one implementation of // GpuSandboxHelper and it has no dependency. Except on Linux where // VaapiWrapper checks the GL implementation to determine which display -@@ -626,7 +626,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -610,7 +610,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL command_line, gpu_feature_info_, gpu_preferences_.disable_software_rasterizer, false); if (gl_use_swiftshader_) { @@ -36,7 +36,7 @@ VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly " << "on Linux"; return false; -@@ -777,7 +777,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -761,7 +761,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_); @@ -45,7 +45,7 @@ // Driver may create a compatibility profile context when collect graphics // information on Linux platform. Try to collect graphics information // based on core profile context after disabling platform extensions. -@@ -832,7 +832,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -816,7 +816,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 -@@ -1022,7 +1022,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -1001,7 +1001,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 -@@ -1077,7 +1077,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -1056,7 +1056,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c } } diff --git a/www/ungoogled-chromium/files/patch-gpu_vulkan_vulkan__device__queue.cc b/www/ungoogled-chromium/files/patch-gpu_vulkan_vulkan__device__queue.cc index ae5af074b85e..e37bc42a47de 100644 --- a/www/ungoogled-chromium/files/patch-gpu_vulkan_vulkan__device__queue.cc +++ b/www/ungoogled-chromium/files/patch-gpu_vulkan_vulkan__device__queue.cc @@ -1,6 +1,6 @@ ---- gpu/vulkan/vulkan_device_queue.cc.orig 2024-07-31 14:19:23 UTC +--- gpu/vulkan/vulkan_device_queue.cc.orig 2024-10-01 07:26:23 UTC +++ gpu/vulkan/vulkan_device_queue.cc -@@ -149,7 +149,7 @@ bool VulkanDeviceQueue::Initialize( +@@ -154,7 +154,7 @@ bool VulkanDeviceQueue::Initialize( // In dual-CPU cases, we cannot detect the active GPU correctly on Linux, // so don't select GPU device based on the |gpu_info|. @@ -9,7 +9,7 @@ // If gpu_info is provided, the device should match it. if (gpu_info && (device_properties.vendorID != gpu_info->gpu.vendor_id || device_properties.deviceID != gpu_info->gpu.device_id)) { -@@ -292,7 +292,7 @@ bool VulkanDeviceQueue::Initialize( +@@ -297,7 +297,7 @@ bool VulkanDeviceQueue::Initialize( // Android, Fuchsia, Linux, and CrOS (VaapiVideoDecoder) need YCbCr sampler // support. #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-gpu_vulkan_vulkan__util.cc b/www/ungoogled-chromium/files/patch-gpu_vulkan_vulkan__util.cc index 14e46d1694af..ad884b4d19e5 100644 --- a/www/ungoogled-chromium/files/patch-gpu_vulkan_vulkan__util.cc +++ b/www/ungoogled-chromium/files/patch-gpu_vulkan_vulkan__util.cc @@ -1,6 +1,6 @@ ---- gpu/vulkan/vulkan_util.cc.orig 2024-05-23 20:04:36 UTC +--- gpu/vulkan/vulkan_util.cc.orig 2024-10-01 07:26:23 UTC +++ gpu/vulkan/vulkan_util.cc -@@ -468,7 +468,7 @@ bool CheckVulkanCompatibilities( +@@ -473,7 +473,7 @@ bool CheckVulkanCompatibilities( } } diff --git a/www/ungoogled-chromium/files/patch-headless_lib_headless__content__main__delegate.cc b/www/ungoogled-chromium/files/patch-headless_lib_headless__content__main__delegate.cc index 85a2a8d81289..e5192f972a27 100644 --- a/www/ungoogled-chromium/files/patch-headless_lib_headless__content__main__delegate.cc +++ b/www/ungoogled-chromium/files/patch-headless_lib_headless__content__main__delegate.cc @@ -1,6 +1,6 @@ ---- headless/lib/headless_content_main_delegate.cc.orig 2024-08-26 14:40:28 UTC +--- headless/lib/headless_content_main_delegate.cc.orig 2024-10-01 07:26:23 UTC +++ headless/lib/headless_content_main_delegate.cc -@@ -409,7 +409,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( +@@ -406,7 +406,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( if (process_type != ::switches::kZygoteProcess) { g_headless_crash_client.Pointer()->set_crash_dumps_dir( command_line.GetSwitchValuePath(switches::kCrashDumpsDir)); diff --git a/www/ungoogled-chromium/files/patch-media_BUILD.gn b/www/ungoogled-chromium/files/patch-media_BUILD.gn index 8bda525cf9c5..05dd858bc73a 100644 --- a/www/ungoogled-chromium/files/patch-media_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-media_BUILD.gn @@ -1,12 +1,12 @@ ---- media/BUILD.gn.orig 2024-02-25 20:22:18 UTC +--- media/BUILD.gn.orig 2024-10-01 07:26:23 UTC +++ media/BUILD.gn -@@ -96,6 +96,9 @@ config("media_config") { +@@ -97,6 +97,9 @@ config("media_config") { defines += [ "DLOPEN_PULSEAUDIO" ] } } + if (use_sndio) { + defines += [ "USE_SNDIO" ] + } - if (use_cras) { - defines += [ "USE_CRAS" ] - } + } + + # Internal grouping of the configs necessary to support sub-folders having their diff --git a/www/ungoogled-chromium/files/patch-media_audio_BUILD.gn b/www/ungoogled-chromium/files/patch-media_audio_BUILD.gn index fe71e86e7828..693cd911dd80 100644 --- a/www/ungoogled-chromium/files/patch-media_audio_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-media_audio_BUILD.gn @@ -1,6 +1,6 @@ ---- media/audio/BUILD.gn.orig 2024-08-05 14:59:35 UTC +--- media/audio/BUILD.gn.orig 2024-10-01 07:26:23 UTC +++ media/audio/BUILD.gn -@@ -270,9 +270,23 @@ source_set("audio") { +@@ -268,9 +268,23 @@ source_set("audio") { deps += [ "//media/base/android:media_jni_headers" ] } diff --git a/www/ungoogled-chromium/files/patch-media_audio_alsa_audio__manager__alsa.cc b/www/ungoogled-chromium/files/patch-media_audio_alsa_audio__manager__alsa.cc index 1067e8d69d15..e98328f01880 100644 --- a/www/ungoogled-chromium/files/patch-media_audio_alsa_audio__manager__alsa.cc +++ b/www/ungoogled-chromium/files/patch-media_audio_alsa_audio__manager__alsa.cc @@ -1,6 +1,6 @@ ---- media/audio/alsa/audio_manager_alsa.cc.orig 2024-07-31 14:19:23 UTC +--- media/audio/alsa/audio_manager_alsa.cc.orig 2024-10-01 07:26:23 UTC +++ media/audio/alsa/audio_manager_alsa.cc -@@ -95,7 +95,9 @@ void AudioManagerAlsa::GetAlsaAudioDevices(StreamType +@@ -100,7 +100,9 @@ void AudioManagerAlsa::GetAlsaAudioDevices(StreamType int card = -1; // Loop through the physical sound cards to get ALSA device hints. @@ -10,7 +10,7 @@ void** hints = NULL; int error = wrapper_->DeviceNameHint(card, kPcmInterfaceName, &hints); if (!error) { -@@ -107,7 +109,9 @@ void AudioManagerAlsa::GetAlsaAudioDevices(StreamType +@@ -112,7 +114,9 @@ void AudioManagerAlsa::GetAlsaAudioDevices(StreamType DLOG(WARNING) << "GetAlsaAudioDevices: unable to get device hints: " << wrapper_->StrError(error); } @@ -20,7 +20,7 @@ } void AudioManagerAlsa::GetAlsaDevicesInfo(AudioManagerAlsa::StreamType type, -@@ -190,7 +194,11 @@ bool AudioManagerAlsa::IsAlsaDeviceAvailable( +@@ -195,7 +199,11 @@ bool AudioManagerAlsa::IsAlsaDeviceAvailable( // goes through software conversion if needed (e.g. incompatible // sample rate). // TODO(joi): Should we prefer "hw" instead? @@ -32,7 +32,7 @@ return strncmp(kDeviceTypeDesired, device_name, std::size(kDeviceTypeDesired) - 1) == 0; } -@@ -242,7 +250,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDevice( +@@ -247,7 +255,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDevice( // Loop through the sound cards. // Don't use snd_device_name_hint(-1,..) since there is an access violation // inside this ALSA API with libasound.so.2.0.0. @@ -42,7 +42,7 @@ int error = wrapper_->DeviceNameHint(card, kPcmInterfaceName, &hints); if (!error) { for (void** hint_iter = hints; *hint_iter != NULL; hint_iter++) { -@@ -266,7 +276,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDevice( +@@ -271,7 +281,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDevice( DLOG(WARNING) << "HasAnyAudioDevice: unable to get device hints: " << wrapper_->StrError(error); } diff --git a/www/ungoogled-chromium/files/patch-media_audio_audio__input__device.cc b/www/ungoogled-chromium/files/patch-media_audio_audio__input__device.cc index 17e2f2db3da8..a1609a69b24c 100644 --- a/www/ungoogled-chromium/files/patch-media_audio_audio__input__device.cc +++ b/www/ungoogled-chromium/files/patch-media_audio_audio__input__device.cc @@ -1,6 +1,6 @@ ---- media/audio/audio_input_device.cc.orig 2024-04-23 07:42:17 UTC +--- media/audio/audio_input_device.cc.orig 2024-10-01 07:26:23 UTC +++ media/audio/audio_input_device.cc -@@ -264,7 +264,7 @@ void AudioInputDevice::OnStreamCreated( +@@ -269,7 +269,7 @@ void AudioInputDevice::OnStreamCreated( // here. See comments in AliveChecker and PowerObserverHelper for details and // todos. if (detect_dead_stream_ == DeadStreamDetection::kEnabled) { diff --git a/www/ungoogled-chromium/files/patch-media_audio_pulse_pulse__util.cc b/www/ungoogled-chromium/files/patch-media_audio_pulse_pulse__util.cc index d6780ab23ce6..3ae851d32c8e 100644 --- a/www/ungoogled-chromium/files/patch-media_audio_pulse_pulse__util.cc +++ b/www/ungoogled-chromium/files/patch-media_audio_pulse_pulse__util.cc @@ -1,6 +1,6 @@ ---- media/audio/pulse/pulse_util.cc.orig 2024-05-23 20:04:36 UTC +--- media/audio/pulse/pulse_util.cc.orig 2024-10-01 07:26:23 UTC +++ media/audio/pulse/pulse_util.cc -@@ -45,7 +45,11 @@ constexpr char kBrowserDisplayName[] = "chromium-brows +@@ -50,7 +50,11 @@ constexpr char kBrowserDisplayName[] = "chromium-brows #if defined(DLOPEN_PULSEAUDIO) static const base::FilePath::CharType kPulseLib[] = diff --git a/www/ungoogled-chromium/files/patch-media_base_audio__latency.cc b/www/ungoogled-chromium/files/patch-media_base_audio__latency.cc index 7c46bd08832f..fcc62a268813 100644 --- a/www/ungoogled-chromium/files/patch-media_base_audio__latency.cc +++ b/www/ungoogled-chromium/files/patch-media_base_audio__latency.cc @@ -1,6 +1,6 @@ ---- media/base/audio_latency.cc.orig 2023-04-08 11:38:38 UTC +--- media/base/audio_latency.cc.orig 2024-10-01 07:26:23 UTC +++ media/base/audio_latency.cc -@@ -147,7 +147,7 @@ int AudioLatency::GetRtcBufferSize(int sample_rate, in +@@ -148,7 +148,7 @@ int AudioLatency::GetRtcBufferSize(int sample_rate, in } #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \ diff --git a/www/ungoogled-chromium/files/patch-media_base_media__switches.cc b/www/ungoogled-chromium/files/patch-media_base_media__switches.cc index 9356a9da3eab..525f3ec9d0b5 100644 --- a/www/ungoogled-chromium/files/patch-media_base_media__switches.cc +++ b/www/ungoogled-chromium/files/patch-media_base_media__switches.cc @@ -1,4 +1,4 @@ ---- media/base/media_switches.cc.orig 2024-08-26 14:40:28 UTC +--- media/base/media_switches.cc.orig 2024-10-01 07:26:23 UTC +++ media/base/media_switches.cc @@ -21,7 +21,7 @@ #include "ui/gl/gl_features.h" @@ -94,25 +94,7 @@ // Enables the new V4L2StatefulVideoDecoder instead of V4L2VideoDecoder. // Owners: frkoenig@ch40m1um.qjz9zk, mcasas@ch40m1um.qjz9zk // Expiry: When the |V4L2FlatVideoDecoder| flag handles stateful decoding on -@@ -963,7 +985,7 @@ BASE_FEATURE(kLiveCaptionUseWaitK, - // Live Caption can be used in multiple languages, as opposed to just English. - BASE_FEATURE(kLiveCaptionMultiLanguage, - "LiveCaptionMultiLanguage", --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - base::FEATURE_ENABLED_BY_DEFAULT - #else - base::FEATURE_DISABLED_BY_DEFAULT -@@ -993,7 +1015,7 @@ BASE_FEATURE(kLiveCaptionWebAudio, - // Live Translate translates captions generated by Live Caption. - BASE_FEATURE(kLiveTranslate, - "LiveTranslate", --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - base::FEATURE_ENABLED_BY_DEFAULT - #else - base::FEATURE_DISABLED_BY_DEFAULT -@@ -1468,7 +1490,7 @@ BASE_FEATURE(kUseGTFOOutOfProcessVideoDecoding, +@@ -1463,7 +1485,7 @@ BASE_FEATURE(kUseGTFOOutOfProcessVideoDecoding, base::FEATURE_DISABLED_BY_DEFAULT); #endif // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER) @@ -121,7 +103,7 @@ // Spawn utility processes to perform hardware encode acceleration instead of // using the GPU process. BASE_FEATURE(kUseOutOfProcessVideoEncoding, -@@ -1548,7 +1570,7 @@ BASE_FEATURE(kRecordWebAudioEngagement, +@@ -1543,7 +1565,7 @@ BASE_FEATURE(kRecordWebAudioEngagement, "RecordWebAudioEngagement", base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/www/ungoogled-chromium/files/patch-media_base_media__switches.h b/www/ungoogled-chromium/files/patch-media_base_media__switches.h index 3639537f5153..f3be4e47309e 100644 --- a/www/ungoogled-chromium/files/patch-media_base_media__switches.h +++ b/www/ungoogled-chromium/files/patch-media_base_media__switches.h @@ -1,6 +1,6 @@ ---- media/base/media_switches.h.orig 2024-08-26 14:40:28 UTC +--- media/base/media_switches.h.orig 2024-10-01 07:26:23 UTC +++ media/base/media_switches.h -@@ -325,13 +325,25 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kPlatformHEVCEncoder +@@ -327,13 +327,25 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kPlatformHEVCEncoder MEDIA_EXPORT BASE_DECLARE_FEATURE(kPlaybackSpeedButton); MEDIA_EXPORT BASE_DECLARE_FEATURE(kPreloadMediaEngagementData); MEDIA_EXPORT BASE_DECLARE_FEATURE(kPreloadMetadataSuspend); @@ -28,7 +28,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kReduceHardwareVideoDecoderBuffers); #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) MEDIA_EXPORT BASE_DECLARE_FEATURE(kResumeBackgroundVideo); -@@ -346,7 +358,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUnifiedAutoplay); +@@ -348,7 +360,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUnifiedAutoplay); MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseAndroidOverlayForSecureOnly); MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseDecoderStreamForWebRTC); MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseFakeDeviceForMediaStream); @@ -37,16 +37,16 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoDecodeLinux); MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoDecodeLinuxGL); MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoEncodeLinux); -@@ -365,7 +377,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiH264TemporalLa +@@ -367,7 +379,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiH264TemporalLa MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp8TemporalLayerHWEncoding); 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(kV4L2FlatStatefulVideoDecoder); + MEDIA_EXPORT BASE_DECLARE_FEATURE(kV4L2H264TemporalLayerHWEncoding); #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) - MEDIA_EXPORT BASE_DECLARE_FEATURE(kVideoBlitColorAccuracy); -@@ -510,7 +522,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseOutOfProcessVide +@@ -507,7 +519,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseOutOfProcessVide MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseGTFOOutOfProcessVideoDecoding); #endif // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER) diff --git a/www/ungoogled-chromium/files/patch-media_base_video__frame.cc b/www/ungoogled-chromium/files/patch-media_base_video__frame.cc index 712bf73498f0..589698d289c8 100644 --- a/www/ungoogled-chromium/files/patch-media_base_video__frame.cc +++ b/www/ungoogled-chromium/files/patch-media_base_video__frame.cc @@ -1,6 +1,6 @@ ---- media/base/video_frame.cc.orig 2024-08-26 14:40:28 UTC +--- media/base/video_frame.cc.orig 2024-10-01 07:26:23 UTC +++ media/base/video_frame.cc -@@ -83,7 +83,7 @@ std::string VideoFrame::StorageTypeToString( +@@ -88,7 +88,7 @@ std::string VideoFrame::StorageTypeToString( return "OWNED_MEMORY"; case VideoFrame::STORAGE_SHMEM: return "SHMEM"; @@ -9,7 +9,7 @@ case VideoFrame::STORAGE_DMABUFS: return "DMABUFS"; #endif -@@ -98,7 +98,7 @@ std::string VideoFrame::StorageTypeToString( +@@ -103,7 +103,7 @@ std::string VideoFrame::StorageTypeToString( // static bool VideoFrame::IsStorageTypeMappable(VideoFrame::StorageType storage_type) { return @@ -18,7 +18,7 @@ // This is not strictly needed but makes explicit that, at VideoFrame // level, DmaBufs are not mappable from userspace. storage_type != VideoFrame::STORAGE_DMABUFS && -@@ -396,7 +396,7 @@ VideoFrame::CreateFrameForGpuMemoryBufferOrMappableSII +@@ -401,7 +401,7 @@ VideoFrame::CreateFrameForGpuMemoryBufferOrMappableSII : shared_image->GetStrideForVideoFrame(i); } uint64_t modifier = gfx::NativePixmapHandle::kNoModifier; @@ -27,7 +27,7 @@ bool is_native_buffer = gpu_memory_buffer ? (gpu_memory_buffer->GetType() != gfx::SHARED_MEMORY_BUFFER) -@@ -817,7 +817,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM +@@ -822,7 +822,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM return frame; } @@ -36,7 +36,7 @@ // static scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs( const VideoFrameLayout& layout, -@@ -1528,7 +1528,7 @@ scoped_refptr<gpu::ClientSharedImage> VideoFrame::shar +@@ -1536,7 +1536,7 @@ scoped_refptr<gpu::ClientSharedImage> VideoFrame::shar : shared_images_[texture_index]; } diff --git a/www/ungoogled-chromium/files/patch-media_base_video__frame.h b/www/ungoogled-chromium/files/patch-media_base_video__frame.h index 37f28170de86..4ff6f4acd86e 100644 --- a/www/ungoogled-chromium/files/patch-media_base_video__frame.h +++ b/www/ungoogled-chromium/files/patch-media_base_video__frame.h @@ -1,6 +1,6 @@ ---- media/base/video_frame.h.orig 2024-08-26 14:40:28 UTC +--- media/base/video_frame.h.orig 2024-10-01 07:26:23 UTC +++ media/base/video_frame.h -@@ -45,7 +45,7 @@ +@@ -50,7 +50,7 @@ #include "base/apple/scoped_cftyperef.h" #endif // BUILDFLAG(IS_APPLE) @@ -9,7 +9,7 @@ #include "base/files/scoped_file.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -111,7 +111,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -116,7 +116,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte STORAGE_UNOWNED_MEMORY = 2, // External, non owned data pointers. STORAGE_OWNED_MEMORY = 3, // VideoFrame has allocated its own data buffer. STORAGE_SHMEM = 4, // Backed by read-only shared memory. @@ -18,7 +18,7 @@ // TODO(mcasas): Consider turning this type into STORAGE_NATIVE // based on the idea of using this same enum value for both DMA // buffers on Linux and CVPixelBuffers on Mac (which currently use -@@ -402,7 +402,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -407,7 +407,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte ReleaseMailboxAndGpuMemoryBufferCB mailbox_holder_and_gmb_release_cb, base::TimeDelta timestamp); @@ -27,7 +27,7 @@ // Wraps provided dmabufs // (https://www.kernel.org/doc/html/latest/driver-api/dma-buf.html) with a // VideoFrame. The frame will take ownership of |dmabuf_fds|, and will -@@ -721,7 +721,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -726,7 +726,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte scoped_refptr<gpu::ClientSharedImage> shared_image( size_t texture_index) const; @@ -36,7 +36,7 @@ // The number of DmaBufs will be equal or less than the number of planes of // the frame. If there are less, this means that the last FD contains the // remaining planes. Should be > 0 for STORAGE_DMABUFS. -@@ -963,7 +963,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -968,7 +968,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte // GpuMemoryBuffers. Clients will set this flag while creating a VideoFrame. bool is_mappable_si_enabled_ = false; diff --git a/www/ungoogled-chromium/files/patch-media_capture_video_video__capture__device__client.cc b/www/ungoogled-chromium/files/patch-media_capture_video_video__capture__device__client.cc index 013c0fd1c684..c839180b2be6 100644 --- a/www/ungoogled-chromium/files/patch-media_capture_video_video__capture__device__client.cc +++ b/www/ungoogled-chromium/files/patch-media_capture_video_video__capture__device__client.cc @@ -1,6 +1,6 @@ ---- media/capture/video/video_capture_device_client.cc.orig 2024-06-22 08:49:42 UTC +--- media/capture/video/video_capture_device_client.cc.orig 2024-10-01 07:26:23 UTC +++ media/capture/video/video_capture_device_client.cc -@@ -164,7 +164,7 @@ FourccAndFlip GetFourccAndFlipFromPixelFormat( +@@ -169,7 +169,7 @@ FourccAndFlip GetFourccAndFlipFromPixelFormat( CHECK(!is_width_odd && !is_height_odd); return {libyuv::FOURCC_UYVY}; case media::PIXEL_FORMAT_RGB24: diff --git a/www/ungoogled-chromium/files/patch-media_gpu_chromeos_libyuv__image__processor__backend.cc b/www/ungoogled-chromium/files/patch-media_gpu_chromeos_libyuv__image__processor__backend.cc index 7c6fc60f72cb..b5114d97b986 100644 --- a/www/ungoogled-chromium/files/patch-media_gpu_chromeos_libyuv__image__processor__backend.cc +++ b/www/ungoogled-chromium/files/patch-media_gpu_chromeos_libyuv__image__processor__backend.cc @@ -1,6 +1,6 @@ ---- media/gpu/chromeos/libyuv_image_processor_backend.cc.orig 2024-06-22 08:49:42 UTC +--- media/gpu/chromeos/libyuv_image_processor_backend.cc.orig 2024-10-01 07:26:23 UTC +++ media/gpu/chromeos/libyuv_image_processor_backend.cc -@@ -48,7 +48,7 @@ static constexpr struct { +@@ -53,7 +53,7 @@ static constexpr struct { #define CONV(in, out, trans, result) \ {Fourcc::in, Fourcc::out, Transform::trans, SupportResult::result} // Conversion. @@ -9,7 +9,7 @@ CONV(NV12, AR24, kConversion, Supported), #endif CONV(NV12, NV12, kConversion, Supported), -@@ -415,7 +415,7 @@ int LibYUVImageProcessorBackend::DoConversion(const Fr +@@ -420,7 +420,7 @@ int LibYUVImageProcessorBackend::DoConversion(const Fr fr->GetWritableVisibleData(VideoFrame::Plane::kUV)), \ fr->stride(VideoFrame::Plane::kUV) @@ -18,7 +18,7 @@ #define ARGB_DATA(fr) \ fr->GetWritableVisibleData(VideoFrame::Plane::kARGB), \ fr->stride(VideoFrame::Plane::kARGB) -@@ -577,7 +577,7 @@ int LibYUVImageProcessorBackend::DoConversion(const Fr +@@ -582,7 +582,7 @@ int LibYUVImageProcessorBackend::DoConversion(const Fr } } diff --git a/www/ungoogled-chromium/files/patch-media_gpu_chromeos_mailbox__video__frame__converter.cc b/www/ungoogled-chromium/files/patch-media_gpu_chromeos_mailbox__video__frame__converter.cc index 28e03afa95f2..243bc9fdcd05 100644 --- a/www/ungoogled-chromium/files/patch-media_gpu_chromeos_mailbox__video__frame__converter.cc +++ b/www/ungoogled-chromium/files/patch-media_gpu_chromeos_mailbox__video__frame__converter.cc @@ -1,8 +1,8 @@ ---- media/gpu/chromeos/mailbox_video_frame_converter.cc.orig 2024-07-31 14:19:23 UTC +--- media/gpu/chromeos/mailbox_video_frame_converter.cc.orig 2024-10-01 07:26:23 UTC +++ media/gpu/chromeos/mailbox_video_frame_converter.cc @@ -67,7 +67,7 @@ viz::SharedImageFormat GetSharedImageFormat(gfx::Buffe << static_cast<int>(buffer_format); - NOTREACHED_NORETURN(); + NOTREACHED(); } -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/ungoogled-chromium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc b/www/ungoogled-chromium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc index deb6b0abdeef..a54de4243bbb 100644 --- a/www/ungoogled-chromium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc +++ b/www/ungoogled-chromium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc @@ -1,4 +1,4 @@ ---- media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc.orig 2024-08-26 14:40:28 UTC +--- media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc.orig 2024-10-01 07:26:23 UTC +++ media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc @@ -16,7 +16,9 @@ #include "media/gpu/vaapi/vaapi_wrapper.h" @@ -19,7 +19,7 @@ bool include_sys_dev_char, bool read_write) { @@ -176,6 +179,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2( - NOTREACHED_NORETURN(); + NOTREACHED(); #endif // BUILDFLAG(USE_V4L2_CODEC) } +#endif diff --git a/www/ungoogled-chromium/files/patch-media_gpu_test_raw__video.cc b/www/ungoogled-chromium/files/patch-media_gpu_test_raw__video.cc new file mode 100644 index 000000000000..72b8e6129a6c --- /dev/null +++ b/www/ungoogled-chromium/files/patch-media_gpu_test_raw__video.cc @@ -0,0 +1,11 @@ +--- media/gpu/test/raw_video.cc.orig 2024-10-01 07:26:23 UTC ++++ media/gpu/test/raw_video.cc +@@ -60,7 +60,7 @@ std::unique_ptr<base::MemoryMappedFile> CreateMemoryMa + base::File::FLAG_READ | base::File::FLAG_WRITE + // On Windows FLAG_CREATE_ALWAYS will require FLAG_WRITE, and FLAG_APPEND + // must not be specified. +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + | base::File::FLAG_APPEND + #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) + ), diff --git a/www/ungoogled-chromium/files/patch-media_gpu_test_video__frame__file__writer.cc b/www/ungoogled-chromium/files/patch-media_gpu_test_video__frame__file__writer.cc new file mode 100644 index 000000000000..b878de19e50e --- /dev/null +++ b/www/ungoogled-chromium/files/patch-media_gpu_test_video__frame__file__writer.cc @@ -0,0 +1,11 @@ +--- media/gpu/test/video_frame_file_writer.cc.orig 2024-10-01 07:26:23 UTC ++++ media/gpu/test/video_frame_file_writer.cc +@@ -26,7 +26,7 @@ + #include "testing/gtest/include/gtest/gtest.h" + #include "ui/gfx/codec/png_codec.h" + +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include <sys/mman.h> + #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) + diff --git a/www/ungoogled-chromium/files/patch-media_gpu_test_video__frame__helpers.cc b/www/ungoogled-chromium/files/patch-media_gpu_test_video__frame__helpers.cc new file mode 100644 index 000000000000..1dcb32954acb --- /dev/null +++ b/www/ungoogled-chromium/files/patch-media_gpu_test_video__frame__helpers.cc @@ -0,0 +1,11 @@ +--- media/gpu/test/video_frame_helpers.cc.orig 2024-10-01 07:26:23 UTC ++++ media/gpu/test/video_frame_helpers.cc +@@ -22,7 +22,7 @@ + #include "ui/gfx/buffer_format_util.h" + #include "ui/gfx/gpu_memory_buffer.h" + +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include <sys/mman.h> + #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) + diff --git a/www/ungoogled-chromium/files/patch-media_gpu_test_video__frame__validator.cc b/www/ungoogled-chromium/files/patch-media_gpu_test_video__frame__validator.cc new file mode 100644 index 000000000000..085c59122d60 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-media_gpu_test_video__frame__validator.cc @@ -0,0 +1,11 @@ +--- media/gpu/test/video_frame_validator.cc.orig 2024-10-01 07:26:23 UTC ++++ media/gpu/test/video_frame_validator.cc +@@ -33,7 +33,7 @@ + #include "testing/gtest/include/gtest/gtest.h" + #include "ui/gfx/gpu_memory_buffer.h" + +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include <sys/mman.h> + #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) + diff --git a/www/ungoogled-chromium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc b/www/ungoogled-chromium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc index 9790448886ff..6ec544240fad 100644 --- a/www/ungoogled-chromium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc +++ b/www/ungoogled-chromium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc @@ -1,6 +1,6 @@ ---- media/gpu/vaapi/vaapi_wrapper.cc.orig 2024-07-31 14:19:23 UTC +--- media/gpu/vaapi/vaapi_wrapper.cc.orig 2024-10-01 07:26:23 UTC +++ media/gpu/vaapi/vaapi_wrapper.cc -@@ -72,7 +72,7 @@ +@@ -77,7 +77,7 @@ using media_gpu_vaapi::kModuleVa_prot; #endif diff --git a/www/ungoogled-chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h b/www/ungoogled-chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h index 7ebd8e001440..6878669389a0 100644 --- a/www/ungoogled-chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h +++ b/www/ungoogled-chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h @@ -1,6 +1,6 @@ ---- media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.h.orig 2024-06-22 08:49:42 UTC +--- media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.h.orig 2024-10-01 07:26:23 UTC +++ media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.h -@@ -690,7 +690,7 @@ struct StructTraits<media::stable::mojom::NativeGpuMem +@@ -695,7 +695,7 @@ struct StructTraits<media::stable::mojom::NativeGpuMem static const gfx::GpuMemoryBufferId& id( const gfx::GpuMemoryBufferHandle& input); diff --git a/www/ungoogled-chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc b/www/ungoogled-chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc index 566564323d6e..ace76a4e25b4 100644 --- a/www/ungoogled-chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc +++ b/www/ungoogled-chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc @@ -1,6 +1,6 @@ ---- media/mojo/mojom/video_frame_mojom_traits.cc.orig 2022-10-29 17:50:56 UTC +--- media/mojo/mojom/video_frame_mojom_traits.cc.orig 2024-10-01 07:26:23 UTC +++ media/mojo/mojom/video_frame_mojom_traits.cc -@@ -22,7 +22,7 @@ +@@ -27,7 +27,7 @@ #include "ui/gfx/mojom/color_space_mojom_traits.h" #include "ui/gfx/mojom/hdr_metadata_mojom_traits.h" diff --git a/www/ungoogled-chromium/files/patch-media_video_fake__gpu__memory__buffer.cc b/www/ungoogled-chromium/files/patch-media_video_fake__gpu__memory__buffer.cc index 4980629f6ac8..c7b2f6219f3f 100644 --- a/www/ungoogled-chromium/files/patch-media_video_fake__gpu__memory__buffer.cc +++ b/www/ungoogled-chromium/files/patch-media_video_fake__gpu__memory__buffer.cc @@ -1,6 +1,6 @@ ---- media/video/fake_gpu_memory_buffer.cc.orig 2024-04-23 07:42:17 UTC +--- media/video/fake_gpu_memory_buffer.cc.orig 2024-10-01 07:26:23 UTC +++ media/video/fake_gpu_memory_buffer.cc -@@ -9,7 +9,7 @@ +@@ -14,7 +14,7 @@ #include "media/base/format_utils.h" #include "media/base/video_frame.h" @@ -9,7 +9,7 @@ #include <fcntl.h> #include <sys/stat.h> #include <sys/types.h> -@@ -52,7 +52,7 @@ class FakeGpuMemoryBufferImpl : public gpu::GpuMemoryB +@@ -57,7 +57,7 @@ class FakeGpuMemoryBufferImpl : public gpu::GpuMemoryB } // namespace @@ -18,7 +18,7 @@ base::ScopedFD GetDummyFD() { base::ScopedFD fd(open("/dev/zero", O_RDWR)); DCHECK(fd.is_valid()); -@@ -82,7 +82,7 @@ FakeGpuMemoryBuffer::FakeGpuMemoryBuffer(const gfx::Si +@@ -87,7 +87,7 @@ FakeGpuMemoryBuffer::FakeGpuMemoryBuffer(const gfx::Si static base::AtomicSequenceNumber buffer_id_generator; handle_.id = gfx::GpuMemoryBufferId(buffer_id_generator.GetNext()); @@ -27,7 +27,7 @@ for (size_t i = 0; i < VideoFrame::NumPlanes(video_pixel_format_); i++) { const gfx::Size plane_size_in_bytes = VideoFrame::PlaneSize(video_pixel_format_, i, size_); -@@ -144,7 +144,7 @@ gfx::GpuMemoryBufferHandle FakeGpuMemoryBuffer::CloneH +@@ -149,7 +149,7 @@ gfx::GpuMemoryBufferHandle FakeGpuMemoryBuffer::CloneH gfx::GpuMemoryBufferHandle handle; handle.type = gfx::NATIVE_PIXMAP; handle.id = handle_.id; diff --git a/www/ungoogled-chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc b/www/ungoogled-chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc index 902c543ac925..355359c1d151 100644 --- a/www/ungoogled-chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc +++ b/www/ungoogled-chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc @@ -1,6 +1,6 @@ ---- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2024-08-26 14:40:28 UTC +--- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2024-10-01 07:26:23 UTC +++ media/video/gpu_memory_buffer_video_frame_pool.cc -@@ -106,7 +106,7 @@ class GpuMemoryBufferVideoFramePool::PoolImpl +@@ -111,7 +111,7 @@ class GpuMemoryBufferVideoFramePool::PoolImpl gpu::SHARED_IMAGE_USAGE_RASTER_READ | gpu::SHARED_IMAGE_USAGE_DISPLAY_READ | gpu::SHARED_IMAGE_USAGE_SCANOUT; @@ -9,7 +9,7 @@ // TODO(crbug.com/40194712): Always add the flag once the // OzoneImageBacking is by default turned on. if (base::CommandLine::ForCurrentProcess()->HasSwitch( -@@ -795,7 +795,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa +@@ -800,7 +800,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa } bool is_software_backed_video_frame = !video_frame->HasTextures(); @@ -18,7 +18,7 @@ is_software_backed_video_frame &= !video_frame->HasDmaBufs(); #endif -@@ -1340,7 +1340,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo +@@ -1345,7 +1345,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo media::IOSurfaceIsWebGPUCompatible(handle.io_surface.get()); #endif diff --git a/www/ungoogled-chromium/files/patch-media_video_video__encode__accelerator__adapter.cc b/www/ungoogled-chromium/files/patch-media_video_video__encode__accelerator__adapter.cc index c2d13b8cbedf..e6ff595ac9a8 100644 --- a/www/ungoogled-chromium/files/patch-media_video_video__encode__accelerator__adapter.cc +++ b/www/ungoogled-chromium/files/patch-media_video_video__encode__accelerator__adapter.cc @@ -1,6 +1,6 @@ ---- media/video/video_encode_accelerator_adapter.cc.orig 2024-08-26 14:40:28 UTC +--- media/video/video_encode_accelerator_adapter.cc.orig 2024-10-01 07:26:23 UTC +++ media/video/video_encode_accelerator_adapter.cc -@@ -158,7 +158,7 @@ VideoEncodeAccelerator::Config SetUpVeaConfig( +@@ -164,7 +164,7 @@ VideoEncodeAccelerator::Config SetUpVeaConfig( if (is_rgb) config.input_format = PIXEL_FORMAT_I420; @@ -9,7 +9,7 @@ if (format != PIXEL_FORMAT_I420 || !VideoFrame::IsStorageTypeMappable(storage_type)) { // ChromeOS/Linux hardware video encoders supports I420 on-memory -@@ -484,7 +484,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal +@@ -550,7 +550,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal SetUpVeaConfig(profile_, options_, format, first_frame->storage_type(), supported_rc_modes_, required_encoder_type_); diff --git a/www/ungoogled-chromium/files/patch-media_video_video__encode__accelerator__adapter__test.cc b/www/ungoogled-chromium/files/patch-media_video_video__encode__accelerator__adapter__test.cc index 37946a927c16..6717255b66ae 100644 --- a/www/ungoogled-chromium/files/patch-media_video_video__encode__accelerator__adapter__test.cc +++ b/www/ungoogled-chromium/files/patch-media_video_video__encode__accelerator__adapter__test.cc @@ -1,6 +1,6 @@ ---- media/video/video_encode_accelerator_adapter_test.cc.orig 2024-08-26 14:40:28 UTC +--- media/video/video_encode_accelerator_adapter_test.cc.orig 2024-10-01 07:26:23 UTC +++ media/video/video_encode_accelerator_adapter_test.cc -@@ -457,7 +457,7 @@ TEST_P(VideoEncodeAcceleratorAdapterTest, TwoFramesRes +@@ -461,7 +461,7 @@ TEST_P(VideoEncodeAcceleratorAdapterTest, TwoFramesRes CreateGreenFrame(large_size, pixel_format, base::Milliseconds(2)); VideoPixelFormat expected_input_format = PIXEL_FORMAT_I420; diff --git a/www/ungoogled-chromium/files/patch-media_webrtc_audio__processor.cc b/www/ungoogled-chromium/files/patch-media_webrtc_audio__processor.cc index c425c0f3dd56..396fe63ea6a6 100644 --- a/www/ungoogled-chromium/files/patch-media_webrtc_audio__processor.cc +++ b/www/ungoogled-chromium/files/patch-media_webrtc_audio__processor.cc @@ -1,6 +1,6 @@ ---- media/webrtc/audio_processor.cc.orig 2024-03-22 14:16:19 UTC +--- media/webrtc/audio_processor.cc.orig 2024-10-01 07:26:23 UTC +++ media/webrtc/audio_processor.cc -@@ -513,7 +513,7 @@ std::optional<double> AudioProcessor::ProcessData( +@@ -521,7 +521,7 @@ std::optional<double> AudioProcessor::ProcessData( #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) DCHECK_LE(volume, 1.0); #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ diff --git a/www/ungoogled-chromium/files/patch-mojo_core_BUILD.gn b/www/ungoogled-chromium/files/patch-mojo_core_BUILD.gn index a106683122dd..f1fe1e655f64 100644 --- a/www/ungoogled-chromium/files/patch-mojo_core_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-mojo_core_BUILD.gn @@ -1,11 +1,11 @@ ---- mojo/core/BUILD.gn.orig 2023-05-05 12:12:41 UTC +--- mojo/core/BUILD.gn.orig 2024-10-01 07:26:23 UTC +++ mojo/core/BUILD.gn -@@ -166,7 +166,7 @@ template("core_impl_source_set") { - ] - } +@@ -161,7 +161,7 @@ source_set("impl_for_embedder") { + ] + } -- if ((is_linux || is_chromeos || is_android) && !is_nacl) { -+ if ((is_linux || is_chromeos || is_android) && !is_nacl && !is_bsd) { - sources += [ - "channel_linux.cc", - "channel_linux.h", +- if ((is_linux || is_chromeos || is_android) && !is_nacl) { ++ if ((is_linux || is_chromeos || is_android) && !is_nacl && !is_bsd) { + sources += [ + "channel_linux.cc", + "channel_linux.h", diff --git a/www/ungoogled-chromium/files/patch-mojo_public_c_system_thunks.cc b/www/ungoogled-chromium/files/patch-mojo_public_c_system_thunks.cc deleted file mode 100644 index 1300ba7cd929..000000000000 --- a/www/ungoogled-chromium/files/patch-mojo_public_c_system_thunks.cc +++ /dev/null @@ -1,38 +0,0 @@ ---- mojo/public/c/system/thunks.cc.orig 2024-08-26 14:40:28 UTC -+++ mojo/public/c/system/thunks.cc -@@ -30,7 +30,7 @@ - #include "mojo/public/c/system/message_pipe.h" - - #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ -- BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - #include "base/environment.h" - #include "base/files/file_path.h" - #include "base/scoped_native_library.h" -@@ -77,7 +77,7 @@ class CoreLibraryInitializer { - - MojoResult LoadLibrary(base::FilePath library_path) { - #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ -- BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - if (library_ && library_->is_valid()) - return MOJO_RESULT_OK; - -@@ -91,7 +91,7 @@ class CoreLibraryInitializer { - - if (library_path.empty()) { - // Default to looking for the library in the current working directory. --#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - const base::FilePath::CharType kDefaultLibraryPathValue[] = - FILE_PATH_LITERAL("./libmojo_core.so"); - #elif BUILDFLAG(IS_FUCHSIA) -@@ -147,7 +147,7 @@ class CoreLibraryInitializer { - - private: - #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ -- BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - std::optional<base::ScopedNativeLibrary> library_; - #endif - }; diff --git a/www/ungoogled-chromium/files/patch-mojo_public_tools_bindings_mojom.gni b/www/ungoogled-chromium/files/patch-mojo_public_tools_bindings_mojom.gni index df2b6c1bf9e2..6ffab4f83d96 100644 --- a/www/ungoogled-chromium/files/patch-mojo_public_tools_bindings_mojom.gni +++ b/www/ungoogled-chromium/files/patch-mojo_public_tools_bindings_mojom.gni @@ -1,6 +1,6 @@ ---- mojo/public/tools/bindings/mojom.gni.orig 2024-08-26 14:40:28 UTC +--- mojo/public/tools/bindings/mojom.gni.orig 2024-10-01 07:26:23 UTC +++ mojo/public/tools/bindings/mojom.gni -@@ -763,6 +763,16 @@ template("mojom") { +@@ -776,6 +776,16 @@ template("mojom") { enabled_features += [ "is_apple" ] } diff --git a/www/ungoogled-chromium/files/patch-net_BUILD.gn b/www/ungoogled-chromium/files/patch-net_BUILD.gn index 8c3914b6e6ef..0856d8d82e7f 100644 --- a/www/ungoogled-chromium/files/patch-net_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-net_BUILD.gn @@ -1,4 +1,4 @@ ---- net/BUILD.gn.orig 2024-08-26 14:40:28 UTC +--- net/BUILD.gn.orig 2024-10-01 07:26:23 UTC +++ net/BUILD.gn @@ -123,7 +123,7 @@ net_configs = [ "//build/config/compiler:wexit_time_destructors", @@ -9,7 +9,7 @@ net_configs += [ "//build/config/linux:libresolv" ] } -@@ -1248,6 +1248,19 @@ component("net") { +@@ -1256,6 +1256,19 @@ component("net") { ] } @@ -29,7 +29,7 @@ if (is_mac) { sources += [ "base/network_notification_thread_mac.cc", -@@ -1409,7 +1422,7 @@ component("net") { +@@ -1417,7 +1430,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", -@@ -2885,7 +2898,7 @@ test("net_unittests") { +@@ -2894,7 +2907,7 @@ test("net_unittests") { ] } @@ -47,7 +47,7 @@ sources += [ "base/address_tracker_linux_unittest.cc", "base/network_interfaces_linux_unittest.cc", -@@ -2976,6 +2989,10 @@ test("net_unittests") { +@@ -2985,6 +2998,10 @@ test("net_unittests") { ] } @@ -58,7 +58,7 @@ if (enable_websockets) { deps += [ "//net/server:tests" ] } -@@ -3036,7 +3053,7 @@ test("net_unittests") { +@@ -3046,7 +3063,7 @@ test("net_unittests") { ] } @@ -67,7 +67,7 @@ sources += [ "tools/quic/quic_simple_server_test.cc" ] } -@@ -3175,7 +3192,7 @@ test("net_unittests") { +@@ -3185,7 +3202,7 @@ test("net_unittests") { } # Use getifaddrs() on POSIX platforms, except Linux. diff --git a/www/ungoogled-chromium/files/patch-net_base_features.cc b/www/ungoogled-chromium/files/patch-net_base_features.cc index b3b0596e3a09..b2f3f9c6c138 100644 --- a/www/ungoogled-chromium/files/patch-net_base_features.cc +++ b/www/ungoogled-chromium/files/patch-net_base_features.cc @@ -1,4 +1,4 @@ ---- net/base/features.cc.orig 2024-08-26 14:40:28 UTC +--- net/base/features.cc.orig 2024-10-01 07:26:23 UTC +++ net/base/features.cc @@ -28,7 +28,7 @@ BASE_FEATURE(kCapReferrerToOriginOnCrossOrigin, BASE_FEATURE(kAsyncDns, @@ -9,7 +9,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -508,7 +508,12 @@ BASE_FEATURE(kSpdyHeadersToHttpResponseUseBuilder, +@@ -526,7 +526,12 @@ BASE_FEATURE(kSpdyHeadersToHttpResponseUseBuilder, "SpdyHeadersToHttpResponseUseBuilder", base::FEATURE_DISABLED_BY_DEFAULT); diff --git a/www/ungoogled-chromium/files/patch-net_base_network__change__notifier.cc b/www/ungoogled-chromium/files/patch-net_base_network__change__notifier.cc index 1b678fc0450b..30fcdf8553dc 100644 --- a/www/ungoogled-chromium/files/patch-net_base_network__change__notifier.cc +++ b/www/ungoogled-chromium/files/patch-net_base_network__change__notifier.cc @@ -1,6 +1,6 @@ ---- net/base/network_change_notifier.cc.orig 2024-08-26 14:40:28 UTC +--- net/base/network_change_notifier.cc.orig 2024-10-01 07:26:23 UTC +++ net/base/network_change_notifier.cc -@@ -42,7 +42,7 @@ +@@ -37,7 +37,7 @@ #include "net/base/network_change_notifier_linux.h" #elif BUILDFLAG(IS_APPLE) #include "net/base/network_change_notifier_apple.h" @@ -9,7 +9,7 @@ #include "net/base/network_change_notifier_passive.h" #elif BUILDFLAG(IS_FUCHSIA) #include "net/base/network_change_notifier_fuchsia.h" -@@ -329,6 +329,9 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo +@@ -324,6 +324,9 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo #elif BUILDFLAG(IS_FUCHSIA) return std::make_unique<NetworkChangeNotifierFuchsia>( /*require_wlan=*/false); diff --git a/www/ungoogled-chromium/files/patch-net_http_http__network__session.cc b/www/ungoogled-chromium/files/patch-net_http_http__network__session.cc index c7797e1b37a6..cd02be689bbc 100644 --- a/www/ungoogled-chromium/files/patch-net_http_http__network__session.cc +++ b/www/ungoogled-chromium/files/patch-net_http_http__network__session.cc @@ -1,6 +1,6 @@ ---- net/http/http_network_session.cc.orig 2023-01-13 08:56:02 UTC +--- net/http/http_network_session.cc.orig 2024-10-01 07:26:23 UTC +++ net/http/http_network_session.cc -@@ -19,7 +19,9 @@ +@@ -20,7 +20,9 @@ #include "build/build_config.h" #include "net/base/features.h" #include "net/dns/host_resolver.h" @@ -9,4 +9,4 @@ +#endif #include "net/http/http_response_body_drainer.h" #include "net/http/http_stream_factory.h" - #include "net/http/url_security_manager.h" + #include "net/http/http_stream_pool.h" diff --git a/www/ungoogled-chromium/files/patch-net_socket_udp__socket__posix.cc b/www/ungoogled-chromium/files/patch-net_socket_udp__socket__posix.cc index 85e8f4d2e5fd..194827b2914f 100644 --- a/www/ungoogled-chromium/files/patch-net_socket_udp__socket__posix.cc +++ b/www/ungoogled-chromium/files/patch-net_socket_udp__socket__posix.cc @@ -1,7 +1,7 @@ ---- net/socket/udp_socket_posix.cc.orig 2024-07-31 14:19:23 UTC +--- net/socket/udp_socket_posix.cc.orig 2024-10-01 07:26:23 UTC +++ net/socket/udp_socket_posix.cc -@@ -521,12 +521,17 @@ int UDPSocketPosix::SetRecvTos() { - } +@@ -522,12 +522,17 @@ int UDPSocketPosix::SetRecvTos() { + #endif // BUILDFLAG(IS_APPLE) } +#ifdef IP_RECVTOS @@ -19,7 +19,7 @@ if (confirm) { sendto_flags_ |= MSG_CONFIRM; } else { -@@ -547,7 +552,7 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) { +@@ -548,7 +553,7 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) { DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); int value = broadcast ? 1 : 0; int rv; @@ -28,7 +28,7 @@ // SO_REUSEPORT on OSX permits multiple processes to each receive // UDP multicast or broadcast datagrams destined for the bound // port. -@@ -885,7 +890,7 @@ int UDPSocketPosix::DoBind(const IPEndPoint& address) +@@ -886,7 +891,7 @@ int UDPSocketPosix::DoBind(const IPEndPoint& address) #if BUILDFLAG(IS_CHROMEOS_ASH) if (last_error == EINVAL) return ERR_ADDRESS_IN_USE; diff --git a/www/ungoogled-chromium/files/patch-net_socket_udp__socket__unittest.cc b/www/ungoogled-chromium/files/patch-net_socket_udp__socket__unittest.cc index 4d1a0360f18d..1feae8761e6d 100644 --- a/www/ungoogled-chromium/files/patch-net_socket_udp__socket__unittest.cc +++ b/www/ungoogled-chromium/files/patch-net_socket_udp__socket__unittest.cc @@ -1,6 +1,6 @@ ---- net/socket/udp_socket_unittest.cc.orig 2024-06-22 08:49:42 UTC +--- net/socket/udp_socket_unittest.cc.orig 2024-10-01 07:26:23 UTC +++ net/socket/udp_socket_unittest.cc -@@ -358,7 +358,7 @@ TEST_F(UDPSocketTest, PartialRecv) { +@@ -372,7 +372,7 @@ TEST_F(UDPSocketTest, PartialRecv) { EXPECT_EQ(second_packet, received); } @@ -9,7 +9,7 @@ // - MacOS: requires root permissions on OSX 10.7+. // - Android: devices attached to testbots don't have default network, so // broadcasting to 255.255.255.255 returns error -109 (Address not reachable). -@@ -669,7 +669,7 @@ TEST_F(UDPSocketTest, ClientSetDoNotFragment) { +@@ -683,7 +683,7 @@ TEST_F(UDPSocketTest, ClientSetDoNotFragment) { EXPECT_THAT(rv, IsOk()); rv = client.SetDoNotFragment(); @@ -17,8 +17,8 @@ +#if BUILDFLAG(IS_IOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) // TODO(crbug.com/42050633): IP_MTU_DISCOVER is not implemented on Fuchsia. EXPECT_THAT(rv, IsError(ERR_NOT_IMPLEMENTED)); - #elif BUILDFLAG(IS_MAC) -@@ -697,7 +697,7 @@ TEST_F(UDPSocketTest, ServerSetDoNotFragment) { + #else +@@ -705,7 +705,7 @@ TEST_F(UDPSocketTest, ServerSetDoNotFragment) { EXPECT_THAT(rv, IsOk()); rv = server.SetDoNotFragment(); @@ -26,8 +26,8 @@ +#if BUILDFLAG(IS_IOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) // TODO(crbug.com/42050633): IP_MTU_DISCOVER is not implemented on Fuchsia. EXPECT_THAT(rv, IsError(ERR_NOT_IMPLEMENTED)); - #elif BUILDFLAG(IS_MAC) -@@ -762,7 +762,7 @@ TEST_F(UDPSocketTest, JoinMulticastGroup) { + #else +@@ -764,7 +764,7 @@ TEST_F(UDPSocketTest, JoinMulticastGroup) { // TODO(crbug.com/40620614): failing on device on iOS 12.2. // TODO(crbug.com/40189274): flaky on Mac 11. @@ -36,7 +36,7 @@ #define MAYBE_SharedMulticastAddress DISABLED_SharedMulticastAddress #else #define MAYBE_SharedMulticastAddress SharedMulticastAddress -@@ -816,7 +816,7 @@ TEST_F(UDPSocketTest, MAYBE_SharedMulticastAddress) { +@@ -818,7 +818,7 @@ TEST_F(UDPSocketTest, MAYBE_SharedMulticastAddress) { NetLogSource()); ASSERT_THAT(client_socket.Connect(send_address), IsOk()); diff --git a/www/ungoogled-chromium/files/patch-net_url__request_url__request__context__builder.cc b/www/ungoogled-chromium/files/patch-net_url__request_url__request__context__builder.cc index d3b4d198a24d..301956a94f62 100644 --- a/www/ungoogled-chromium/files/patch-net_url__request_url__request__context__builder.cc +++ b/www/ungoogled-chromium/files/patch-net_url__request_url__request__context__builder.cc @@ -1,6 +1,6 @@ ---- net/url_request/url_request_context_builder.cc.orig 2024-08-26 14:40:28 UTC +--- net/url_request/url_request_context_builder.cc.orig 2024-10-01 07:26:23 UTC +++ net/url_request/url_request_context_builder.cc -@@ -442,7 +442,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu +@@ -447,7 +447,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu } if (!proxy_resolution_service_) { diff --git a/www/ungoogled-chromium/files/patch-printing_print__settings.h b/www/ungoogled-chromium/files/patch-printing_print__settings.h index 001d8a0e8e97..87abcf55d21b 100644 --- a/www/ungoogled-chromium/files/patch-printing_print__settings.h +++ b/www/ungoogled-chromium/files/patch-printing_print__settings.h @@ -1,4 +1,4 @@ ---- printing/print_settings.h.orig 2023-10-13 13:20:35 UTC +--- printing/print_settings.h.orig 2024-10-01 07:26:23 UTC +++ printing/print_settings.h @@ -25,7 +25,7 @@ #include "base/values.h" @@ -18,7 +18,7 @@ inline constexpr char kLinuxSystemPrintDialogDataPrinter[] = "printer_name"; inline constexpr char kLinuxSystemPrintDialogDataPrintSettings[] = "print_settings"; -@@ -101,7 +101,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings { +@@ -101,7 +101,7 @@ class COMPONENT_EXPORT(PRINTING_SETTINGS) PrintSetting std::string vendor_id; }; @@ -27,7 +27,7 @@ using AdvancedSettings = std::map<std::string, base::Value>; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -276,7 +276,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings { +@@ -276,7 +276,7 @@ class COMPONENT_EXPORT(PRINTING_SETTINGS) PrintSetting pages_per_sheet_ = pages_per_sheet; } @@ -36,7 +36,7 @@ AdvancedSettings& advanced_settings() { return advanced_settings_; } const AdvancedSettings& advanced_settings() const { return advanced_settings_; -@@ -429,7 +429,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings { +@@ -429,7 +429,7 @@ class COMPONENT_EXPORT(PRINTING_SETTINGS) PrintSetting // Number of pages per sheet. int pages_per_sheet_; diff --git a/www/ungoogled-chromium/files/patch-remoting_host_chromoting__host.h b/www/ungoogled-chromium/files/patch-remoting_host_chromoting__host.h index e4f24884fbbd..a7ee21ad5fdd 100644 --- a/www/ungoogled-chromium/files/patch-remoting_host_chromoting__host.h +++ b/www/ungoogled-chromium/files/patch-remoting_host_chromoting__host.h @@ -1,6 +1,6 @@ ---- remoting/host/chromoting_host.h.orig 2023-09-17 07:59:53 UTC +--- remoting/host/chromoting_host.h.orig 2024-10-01 07:26:23 UTC +++ remoting/host/chromoting_host.h -@@ -32,7 +32,7 @@ +@@ -33,7 +33,7 @@ #include "remoting/protocol/session_manager.h" #include "remoting/protocol/transport_context.h" @@ -9,7 +9,7 @@ #include "remoting/host/chromoting_host_services_server.h" #endif -@@ -97,7 +97,7 @@ class ChromotingHost : public ClientSession::EventHand +@@ -98,7 +98,7 @@ class ChromotingHost : public ClientSession::EventHand // This method can only be called once during the lifetime of this object. void Start(const std::string& host_owner); @@ -18,7 +18,7 @@ // Starts running the ChromotingHostServices server and listening for incoming // IPC binding requests. // Currently only Linux runs the ChromotingHostServices server on the host -@@ -206,7 +206,7 @@ class ChromotingHost : public ClientSession::EventHand +@@ -204,7 +204,7 @@ class ChromotingHost : public ClientSession::EventHand // List of host extensions. std::vector<std::unique_ptr<HostExtension>> extensions_; diff --git a/www/ungoogled-chromium/files/patch-remoting_host_client__session.cc b/www/ungoogled-chromium/files/patch-remoting_host_client__session.cc index 3b8cdd23beb0..cbb7098bbf47 100644 --- a/www/ungoogled-chromium/files/patch-remoting_host_client__session.cc +++ b/www/ungoogled-chromium/files/patch-remoting_host_client__session.cc @@ -1,6 +1,6 @@ ---- remoting/host/client_session.cc.orig 2024-05-23 20:04:36 UTC +--- remoting/host/client_session.cc.orig 2024-10-01 07:26:23 UTC +++ remoting/host/client_session.cc -@@ -157,7 +157,7 @@ void ClientSession::NotifyClientResolution( +@@ -158,7 +158,7 @@ void ClientSession::NotifyClientResolution( if (desktop_environment_options_.enable_curtaining()) { dpi_vector.set(resolution.x_dpi(), resolution.y_dpi()); } diff --git a/www/ungoogled-chromium/files/patch-remoting_host_it2me_it2me__host.cc b/www/ungoogled-chromium/files/patch-remoting_host_it2me_it2me__host.cc index db415e0f9e3f..031f57ca838b 100644 --- a/www/ungoogled-chromium/files/patch-remoting_host_it2me_it2me__host.cc +++ b/www/ungoogled-chromium/files/patch-remoting_host_it2me_it2me__host.cc @@ -1,6 +1,6 @@ ---- remoting/host/it2me/it2me_host.cc.orig 2024-07-31 14:19:23 UTC +--- remoting/host/it2me/it2me_host.cc.orig 2024-10-01 07:26:23 UTC +++ remoting/host/it2me/it2me_host.cc -@@ -52,7 +52,7 @@ +@@ -56,7 +56,7 @@ #include "remoting/host/chromeos/features.h" #endif @@ -9,7 +9,7 @@ #include "remoting/host/linux/wayland_manager.h" #include "remoting/host/linux/wayland_utils.h" #endif // BUILDFLAG(IS_LINUX) -@@ -180,7 +180,7 @@ void It2MeHost::Connect( +@@ -184,7 +184,7 @@ void It2MeHost::Connect( OnPolicyUpdate(std::move(policies)); @@ -18,7 +18,7 @@ if (IsRunningWayland()) { WaylandManager::Get()->Init(host_context_->ui_task_runner()); } -@@ -340,7 +340,7 @@ void It2MeHost::ConnectOnNetworkThread( +@@ -344,7 +344,7 @@ void It2MeHost::ConnectOnNetworkThread( // Set up the desktop environment options. DesktopEnvironmentOptions options(DesktopEnvironmentOptions::CreateDefault()); diff --git a/www/ungoogled-chromium/files/patch-remoting_host_remoting__me2me__host.cc b/www/ungoogled-chromium/files/patch-remoting_host_remoting__me2me__host.cc index 87f17f64e5e0..cb305a917ab3 100644 --- a/www/ungoogled-chromium/files/patch-remoting_host_remoting__me2me__host.cc +++ b/www/ungoogled-chromium/files/patch-remoting_host_remoting__me2me__host.cc @@ -1,6 +1,6 @@ ---- remoting/host/remoting_me2me_host.cc.orig 2024-08-26 14:40:28 UTC +--- remoting/host/remoting_me2me_host.cc.orig 2024-10-01 07:26:23 UTC +++ remoting/host/remoting_me2me_host.cc -@@ -129,7 +129,7 @@ +@@ -131,7 +131,7 @@ #include "remoting/host/mac/permission_utils.h" #endif // BUILDFLAG(IS_APPLE) @@ -9,7 +9,7 @@ #if defined(REMOTING_USE_X11) #include <gtk/gtk.h> #endif // defined(REMOTING_USE_X11) -@@ -140,13 +140,13 @@ +@@ -142,13 +142,13 @@ #endif // defined(REMOTING_USE_X11) #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -25,7 +25,7 @@ #include "remoting/host/host_utmp_logger.h" #endif -@@ -159,7 +159,7 @@ +@@ -161,7 +161,7 @@ #include "remoting/host/win/session_desktop_environment.h" #endif // BUILDFLAG(IS_WIN) @@ -34,7 +34,7 @@ #include "remoting/host/linux/wayland_manager.h" #include "remoting/host/linux/wayland_utils.h" #endif // BUILDFLAG(IS_LINUX) -@@ -189,7 +189,7 @@ const char kApplicationName[] = "chromoting"; +@@ -191,7 +191,7 @@ const char kApplicationName[] = "chromoting"; const char kStdinConfigPath[] = "-"; #endif // !defined(REMOTING_MULTI_PROCESS) @@ -43,7 +43,7 @@ // The command line switch used to pass name of the pipe to capture audio on // linux. const char kAudioPipeSwitchName[] = "audio-pipe-name"; -@@ -397,7 +397,7 @@ class HostProcess : public ConfigWatcher::Delegate, +@@ -401,7 +401,7 @@ class HostProcess : public ConfigWatcher::Delegate, std::unique_ptr<ChromotingHostContext> context_; @@ -52,7 +52,7 @@ // Watch for certificate changes and kill the host when changes occur std::unique_ptr<CertificateWatcher> cert_watcher_; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -466,7 +466,7 @@ class HostProcess : public ConfigWatcher::Delegate, +@@ -471,7 +471,7 @@ class HostProcess : public ConfigWatcher::Delegate, std::unique_ptr<HostStatusLogger> host_status_logger_; std::unique_ptr<HostEventLogger> host_event_logger_; @@ -61,7 +61,7 @@ std::unique_ptr<HostUTMPLogger> host_utmp_logger_; #endif std::unique_ptr<HostPowerSaveBlocker> power_save_blocker_; -@@ -773,7 +773,7 @@ void HostProcess::StartOnNetworkThread() { +@@ -778,7 +778,7 @@ void HostProcess::StartOnNetworkThread() { void HostProcess::ShutdownOnNetworkThread() { DCHECK(context_->network_task_runner()->BelongsToCurrentThread()); config_watcher_.reset(); @@ -70,7 +70,7 @@ cert_watcher_.reset(); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) } -@@ -808,7 +808,7 @@ void HostProcess::CreateAuthenticatorFactory() { +@@ -814,7 +814,7 @@ void HostProcess::CreateAuthenticatorFactory() { base::MakeRefCounted<CorpSessionAuthzServiceClientFactory>( context_->url_loader_factory(), service_account_email_, oauth_refresh_token_)); @@ -79,7 +79,7 @@ if (!cert_watcher_) { cert_watcher_ = std::make_unique<CertificateWatcher>( base::BindRepeating(&HostProcess::ShutdownHost, -@@ -953,13 +953,13 @@ void HostProcess::StartOnUiThread() { +@@ -960,13 +960,13 @@ void HostProcess::StartOnUiThread() { base::BindRepeating(&HostProcess::OnPolicyUpdate, base::Unretained(this)), base::BindRepeating(&HostProcess::OnPolicyError, base::Unretained(this))); @@ -95,7 +95,7 @@ // If an audio pipe is specific on the command-line then initialize // AudioCapturerLinux to capture from it. base::FilePath audio_pipe_name = -@@ -1036,7 +1036,7 @@ void HostProcess::ShutdownOnUiThread() { +@@ -1043,7 +1043,7 @@ void HostProcess::ShutdownOnUiThread() { // It is now safe for the HostProcess to be deleted. self_ = nullptr; @@ -104,7 +104,7 @@ // Cause the global AudioPipeReader to be freed, otherwise the audio // thread will remain in-use and prevent the process from exiting. // TODO(wez): DesktopEnvironmentFactory should own the pipe reader. -@@ -1044,7 +1044,7 @@ void HostProcess::ShutdownOnUiThread() { +@@ -1051,7 +1051,7 @@ void HostProcess::ShutdownOnUiThread() { AudioCapturerLinux::InitializePipeReader(nullptr, base::FilePath()); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -113,7 +113,7 @@ context_->input_task_runner()->PostTask( FROM_HERE, base::BindOnce([]() { delete ui::X11EventSource::GetInstance(); })); -@@ -1401,7 +1401,7 @@ bool HostProcess::OnUsernamePolicyUpdate(const base::V +@@ -1450,7 +1450,7 @@ bool HostProcess::OnUsernamePolicyUpdate(const base::V // Returns false: never restart the host after this policy update. DCHECK(context_->network_task_runner()->BelongsToCurrentThread()); @@ -122,16 +122,16 @@ std::optional<bool> host_username_match_required = policies.FindBool(policy::key::kRemoteAccessHostMatchUsername); if (!host_username_match_required.has_value()) { -@@ -1849,7 +1849,7 @@ void HostProcess::StartHost() { +@@ -1883,7 +1883,7 @@ void HostProcess::StartHost() { corp_host_status_logger_->StartObserving(*session_manager); } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - desktop_environment_options_.set_enable_remote_webauthn(is_googler_); + desktop_environment_options_.set_enable_remote_webauthn(is_corp_user_); #endif -@@ -1882,7 +1882,7 @@ void HostProcess::StartHost() { +@@ -1912,7 +1912,7 @@ void HostProcess::StartHost() { host_status_logger_ = std::make_unique<HostStatusLogger>( host_->status_monitor(), log_to_server_.get()); @@ -140,7 +140,7 @@ const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); if (cmd_line->HasSwitch(kEnableUtempter)) { host_utmp_logger_ = -@@ -1914,7 +1914,7 @@ void HostProcess::StartHost() { +@@ -1944,7 +1944,7 @@ void HostProcess::StartHost() { host_->Start(host_owner_); @@ -149,7 +149,7 @@ // For Windows, ChromotingHostServices connections are handled by the daemon // process, then the message pipe is forwarded to the network process. host_->StartChromotingHostServices(); -@@ -2048,7 +2048,7 @@ int HostProcessMain() { +@@ -2078,7 +2078,7 @@ int HostProcessMain() { HOST_LOG << "Starting host process: version " << STRINGIZE(VERSION); const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); @@ -158,7 +158,7 @@ #if defined(REMOTING_USE_X11) // Initialize Xlib for multi-threaded use, allowing non-Chromium code to // use X11 safely (such as the WebRTC capturer, GTK ...) -@@ -2097,7 +2097,7 @@ int HostProcessMain() { +@@ -2127,7 +2127,7 @@ int HostProcessMain() { std::unique_ptr<net::NetworkChangeNotifier> network_change_notifier( net::NetworkChangeNotifier::CreateIfNeeded()); diff --git a/www/ungoogled-chromium/files/patch-remoting_host_setup_start__host__main.cc b/www/ungoogled-chromium/files/patch-remoting_host_setup_start__host__main.cc index 90ca35b6c9f5..d5c05f9ac47d 100644 --- a/www/ungoogled-chromium/files/patch-remoting_host_setup_start__host__main.cc +++ b/www/ungoogled-chromium/files/patch-remoting_host_setup_start__host__main.cc @@ -1,6 +1,6 @@ ---- remoting/host/setup/start_host_main.cc.orig 2024-06-22 08:49:42 UTC +--- remoting/host/setup/start_host_main.cc.orig 2024-10-01 07:26:23 UTC +++ remoting/host/setup/start_host_main.cc -@@ -37,7 +37,7 @@ +@@ -38,7 +38,7 @@ #include <unistd.h> #endif // BUILDFLAG(IS_POSIX) @@ -9,7 +9,7 @@ #include "remoting/host/setup/daemon_controller_delegate_linux.h" #include "remoting/host/setup/start_host_as_root.h" #endif // BUILDFLAG(IS_LINUX) -@@ -339,7 +339,7 @@ bool InitializeCloudMachineParams(HostStarter::Params& +@@ -354,7 +354,7 @@ bool InitializeCloudMachineParams(HostStarter::Params& } // namespace int StartHostMain(int argc, char** argv) { @@ -18,7 +18,7 @@ // Minimize the amount of code that runs as root on Posix systems. if (getuid() == 0) { return remoting::StartHostAsRoot(argc, argv); -@@ -364,7 +364,7 @@ int StartHostMain(int argc, char** argv) { +@@ -379,7 +379,7 @@ int StartHostMain(int argc, char** argv) { mojo::core::Init(); diff --git a/www/ungoogled-chromium/files/patch-sandbox_policy_BUILD.gn b/www/ungoogled-chromium/files/patch-sandbox_policy_BUILD.gn index 83445665d19b..6dfb95ed70f5 100644 --- a/www/ungoogled-chromium/files/patch-sandbox_policy_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-sandbox_policy_BUILD.gn @@ -1,6 +1,6 @@ ---- sandbox/policy/BUILD.gn.orig 2024-08-26 14:40:28 UTC +--- sandbox/policy/BUILD.gn.orig 2024-10-01 07:26:23 UTC +++ sandbox/policy/BUILD.gn -@@ -49,7 +49,7 @@ component("policy") { +@@ -50,7 +50,7 @@ component("policy") { "//third_party/jni_zero", ] } @@ -9,7 +9,7 @@ sources += [ "linux/bpf_audio_policy_linux.cc", "linux/bpf_audio_policy_linux.h", -@@ -122,6 +122,27 @@ component("policy") { +@@ -123,6 +123,27 @@ component("policy") { "//sandbox/linux:sandbox_services", "//sandbox/linux:seccomp_bpf", "//sandbox/linux:suid_sandbox_client", diff --git a/www/ungoogled-chromium/files/patch-sandbox_policy_features.cc b/www/ungoogled-chromium/files/patch-sandbox_policy_features.cc index d50d93abc067..da70e9286648 100644 --- a/www/ungoogled-chromium/files/patch-sandbox_policy_features.cc +++ b/www/ungoogled-chromium/files/patch-sandbox_policy_features.cc @@ -1,4 +1,4 @@ ---- sandbox/policy/features.cc.orig 2024-08-26 14:40:28 UTC +--- sandbox/policy/features.cc.orig 2024-10-01 07:26:23 UTC +++ sandbox/policy/features.cc @@ -20,7 +20,11 @@ namespace sandbox::policy::features { // (Only causes an effect when feature kNetworkServiceInProcess is disabled.) @@ -12,8 +12,8 @@ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) // Enables a fine-grained seccomp-BPF syscall filter for the network service. -@@ -147,7 +151,7 @@ BASE_FEATURE(kForceSpectreVariant2Mitigation, - base::FEATURE_DISABLED_BY_DEFAULT); +@@ -140,7 +144,7 @@ BASE_FEATURE(kSpectreVariant2Mitigation, + base::FEATURE_ENABLED_BY_DEFAULT); #endif // BUILDFLAG(IS_CHROMEOS_ASH) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/ungoogled-chromium/files/patch-sandbox_policy_features.h b/www/ungoogled-chromium/files/patch-sandbox_policy_features.h index 6aa04de088ed..f6e411315373 100644 --- a/www/ungoogled-chromium/files/patch-sandbox_policy_features.h +++ b/www/ungoogled-chromium/files/patch-sandbox_policy_features.h @@ -1,7 +1,7 @@ ---- sandbox/policy/features.h.orig 2024-08-26 14:40:28 UTC +--- sandbox/policy/features.h.orig 2024-10-01 07:26:23 UTC +++ sandbox/policy/features.h -@@ -47,7 +47,7 @@ SANDBOX_POLICY_EXPORT BASE_DECLARE_FEATURE(kSpectreVar - SANDBOX_POLICY_EXPORT BASE_DECLARE_FEATURE(kForceSpectreVariant2Mitigation); +@@ -46,7 +46,7 @@ SANDBOX_POLICY_EXPORT BASE_DECLARE_FEATURE(kWinSboxACP + SANDBOX_POLICY_EXPORT BASE_DECLARE_FEATURE(kSpectreVariant2Mitigation); #endif // BUILDFLAG(IS_CHROMEOS_ASH) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/ungoogled-chromium/files/patch-sandbox_policy_sandbox__type.cc b/www/ungoogled-chromium/files/patch-sandbox_policy_sandbox__type.cc index 729b10cc7924..3dcf668c0619 100644 --- a/www/ungoogled-chromium/files/patch-sandbox_policy_sandbox__type.cc +++ b/www/ungoogled-chromium/files/patch-sandbox_policy_sandbox__type.cc @@ -1,4 +1,4 @@ ---- sandbox/policy/sandbox_type.cc.orig 2024-07-31 14:19:23 UTC +--- sandbox/policy/sandbox_type.cc.orig 2024-10-01 07:26:23 UTC +++ sandbox/policy/sandbox_type.cc @@ -38,7 +38,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) { #endif @@ -9,16 +9,16 @@ case Sandbox::kVideoCapture: return false; #endif -@@ -63,7 +63,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) { +@@ -62,7 +62,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) { + #if BUILDFLAG(IS_MAC) case Sandbox::kMirroring: - case Sandbox::kNaClLoader: #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) case Sandbox::kHardwareVideoDecoding: #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -74,7 +74,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) { +@@ -73,7 +73,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) { case Sandbox::kLibassistant: #endif // BUILDFLAG(ENABLE_CROS_LIBASSISTANT) #endif // // BUILDFLAG(IS_CHROMEOS_ASH) @@ -27,7 +27,7 @@ case Sandbox::kZygoteIntermediateSandbox: case Sandbox::kHardwareVideoEncoding: #endif -@@ -131,7 +131,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi +@@ -130,7 +130,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi #endif case Sandbox::kPrintCompositor: case Sandbox::kAudio: @@ -36,7 +36,7 @@ case Sandbox::kVideoCapture: #endif #if BUILDFLAG(IS_WIN) -@@ -142,10 +142,10 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi +@@ -141,10 +141,10 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi case Sandbox::kMediaFoundationCdm: case Sandbox::kWindowsSystemProxyResolver: #endif // BUILDFLAG(IS_WIN) @@ -49,17 +49,17 @@ case Sandbox::kHardwareVideoEncoding: #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -174,7 +174,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi - case Sandbox::kNaClLoader: +@@ -169,7 +169,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi + switches::kServiceSandboxType, + StringFromUtilitySandboxType(sandbox_type)); break; - #endif // BUILDFLAG(IS_MAC) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) case Sandbox::kZygoteIntermediateSandbox: break; #endif -@@ -218,7 +218,7 @@ sandbox::mojom::Sandbox SandboxTypeFromCommandLine( - #endif +@@ -209,7 +209,7 @@ sandbox::mojom::Sandbox SandboxTypeFromCommandLine( + return Sandbox::kUtility; } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -67,7 +67,7 @@ // Intermediate process gains a sandbox later. if (process_type == switches::kZygoteProcessType) return Sandbox::kZygoteIntermediateSandbox; -@@ -266,7 +266,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb +@@ -257,7 +257,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb return switches::kUtilitySandbox; case Sandbox::kAudio: return switches::kAudioSandbox; @@ -76,7 +76,7 @@ case Sandbox::kVideoCapture: return switches::kVideoCaptureSandbox; #endif -@@ -296,11 +296,11 @@ std::string StringFromUtilitySandboxType(Sandbox sandb +@@ -287,11 +287,11 @@ std::string StringFromUtilitySandboxType(Sandbox sandb case Sandbox::kMirroring: return switches::kMirroringSandbox; #endif @@ -90,16 +90,16 @@ case Sandbox::kHardwareVideoEncoding: return switches::kHardwareVideoEncodingSandbox; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -322,7 +322,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb - #if BUILDFLAG(IS_MAC) - case Sandbox::kNaClLoader: - #endif // BUILDFLAG(IS_MAC) +@@ -310,7 +310,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb + // The following are not utility processes so should not occur. + case Sandbox::kRenderer: + case Sandbox::kGpu: -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) case Sandbox::kZygoteIntermediateSandbox: #endif NOTREACHED_IN_MIGRATION(); -@@ -394,11 +394,11 @@ sandbox::mojom::Sandbox UtilitySandboxTypeFromString( +@@ -382,15 +382,15 @@ sandbox::mojom::Sandbox UtilitySandboxTypeFromString( if (sandbox_string == switches::kScreenAISandbox) return Sandbox::kScreenAI; #endif @@ -113,3 +113,8 @@ if (sandbox_string == switches::kHardwareVideoDecodingSandbox) return Sandbox::kHardwareVideoDecoding; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + if (sandbox_string == switches::kHardwareVideoEncodingSandbox) + return Sandbox::kHardwareVideoEncoding; + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/ungoogled-chromium/files/patch-services_device_BUILD.gn b/www/ungoogled-chromium/files/patch-services_device_BUILD.gn index 85f89705e6c9..0c8dbf141e14 100644 --- a/www/ungoogled-chromium/files/patch-services_device_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-services_device_BUILD.gn @@ -1,6 +1,6 @@ ---- services/device/BUILD.gn.orig 2024-06-22 08:49:42 UTC +--- services/device/BUILD.gn.orig 2024-10-01 07:26:23 UTC +++ services/device/BUILD.gn -@@ -14,7 +14,7 @@ if (is_android) { +@@ -15,7 +15,7 @@ if (is_android) { } is_serial_enabled_platform = diff --git a/www/ungoogled-chromium/files/patch-services_device_public_mojom_BUILD.gn b/www/ungoogled-chromium/files/patch-services_device_public_mojom_BUILD.gn index bb1845fb57a8..5e144584624a 100644 --- a/www/ungoogled-chromium/files/patch-services_device_public_mojom_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-services_device_public_mojom_BUILD.gn @@ -1,6 +1,6 @@ ---- services/device/public/mojom/BUILD.gn.orig 2024-08-26 14:40:28 UTC +--- services/device/public/mojom/BUILD.gn.orig 2024-10-01 07:26:23 UTC +++ services/device/public/mojom/BUILD.gn -@@ -97,7 +97,7 @@ mojom("device_service") { +@@ -98,7 +98,7 @@ mojom("device_service") { enable_js_fuzzing = false enabled_features = [] diff --git a/www/ungoogled-chromium/files/patch-services_network_BUILD.gn b/www/ungoogled-chromium/files/patch-services_network_BUILD.gn index 48533a560238..4bf35cb45fd3 100644 --- a/www/ungoogled-chromium/files/patch-services_network_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-services_network_BUILD.gn @@ -1,6 +1,6 @@ ---- services/network/BUILD.gn.orig 2024-08-26 14:40:28 UTC +--- services/network/BUILD.gn.orig 2024-10-01 07:26:23 UTC +++ services/network/BUILD.gn -@@ -411,7 +411,6 @@ if (is_linux || is_chromeos) { +@@ -410,7 +410,6 @@ if (is_linux || is_chromeos) { ] deps = [ "//base:base", diff --git a/www/ungoogled-chromium/files/patch-services_network_network__context.cc b/www/ungoogled-chromium/files/patch-services_network_network__context.cc index bf16725df4ee..0f0dbc534616 100644 --- a/www/ungoogled-chromium/files/patch-services_network_network__context.cc +++ b/www/ungoogled-chromium/files/patch-services_network_network__context.cc @@ -1,6 +1,6 @@ ---- services/network/network_context.cc.orig 2024-08-26 14:40:28 UTC +--- services/network/network_context.cc.orig 2024-10-01 07:26:23 UTC +++ services/network/network_context.cc -@@ -589,7 +589,7 @@ NetworkContext::NetworkContextHttpAuthPreferences:: +@@ -590,7 +590,7 @@ NetworkContext::NetworkContextHttpAuthPreferences:: NetworkContext::NetworkContextHttpAuthPreferences:: ~NetworkContextHttpAuthPreferences() = default; @@ -9,7 +9,7 @@ bool NetworkContext::NetworkContextHttpAuthPreferences::AllowGssapiLibraryLoad() const { if (network_service_) { -@@ -2384,7 +2384,7 @@ void NetworkContext::OnHttpAuthDynamicParamsChanged( +@@ -2437,7 +2437,7 @@ void NetworkContext::OnHttpAuthDynamicParamsChanged( http_auth_dynamic_network_service_params->android_negotiate_account_type); #endif // BUILDFLAG(IS_ANDROID) diff --git a/www/ungoogled-chromium/files/patch-services_network_network__context.h b/www/ungoogled-chromium/files/patch-services_network_network__context.h index 94add3a69acb..09d1105e03a5 100644 --- a/www/ungoogled-chromium/files/patch-services_network_network__context.h +++ b/www/ungoogled-chromium/files/patch-services_network_network__context.h @@ -1,6 +1,6 @@ ---- services/network/network_context.h.orig 2024-08-26 14:40:28 UTC +--- services/network/network_context.h.orig 2024-10-01 07:26:23 UTC +++ services/network/network_context.h -@@ -692,7 +692,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext +@@ -696,7 +696,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext public: explicit NetworkContextHttpAuthPreferences(NetworkService* network_service); ~NetworkContextHttpAuthPreferences() override; diff --git a/www/ungoogled-chromium/files/patch-services_network_network__service.cc b/www/ungoogled-chromium/files/patch-services_network_network__service.cc index 5d35adbdd7c1..d0062e938515 100644 --- a/www/ungoogled-chromium/files/patch-services_network_network__service.cc +++ b/www/ungoogled-chromium/files/patch-services_network_network__service.cc @@ -1,4 +1,4 @@ ---- services/network/network_service.cc.orig 2024-08-26 14:40:28 UTC +--- services/network/network_service.cc.orig 2024-10-01 07:26:23 UTC +++ services/network/network_service.cc @@ -99,7 +99,7 @@ #include "third_party/boringssl/src/include/openssl/cpu.h" @@ -9,7 +9,7 @@ BUILDFLAG(IS_CHROMEOS_LACROS) #include "components/os_crypt/sync/key_storage_config_linux.h" -@@ -975,7 +975,7 @@ void NetworkService::SetExplicitlyAllowedPorts( +@@ -977,7 +977,7 @@ void NetworkService::SetExplicitlyAllowedPorts( net::SetExplicitlyAllowedPorts(ports); } @@ -18,7 +18,7 @@ void NetworkService::SetGssapiLibraryLoadObserver( mojo::PendingRemote<mojom::GssapiLibraryLoadObserver> gssapi_library_load_observer) { -@@ -1057,7 +1057,7 @@ NetworkService::CreateHttpAuthHandlerFactory(NetworkCo +@@ -1059,7 +1059,7 @@ NetworkService::CreateHttpAuthHandlerFactory(NetworkCo ); } diff --git a/www/ungoogled-chromium/files/patch-services_network_network__service.h b/www/ungoogled-chromium/files/patch-services_network_network__service.h index 5348fb20844e..087137042046 100644 --- a/www/ungoogled-chromium/files/patch-services_network_network__service.h +++ b/www/ungoogled-chromium/files/patch-services_network_network__service.h @@ -1,4 +1,4 @@ ---- services/network/network_service.h.orig 2024-05-23 20:04:36 UTC +--- services/network/network_service.h.orig 2024-10-01 07:26:23 UTC +++ services/network/network_service.h @@ -238,7 +238,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService const std::vector<ContentSettingPatternSource>& settings) override; @@ -18,7 +18,7 @@ // This is called just before a GSSAPI library may be loaded. void OnBeforeGssapiLibraryLoad(); #endif // BUILDFLAG(IS_LINUX) -@@ -494,7 +494,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService +@@ -498,7 +498,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService // leaking stale listeners between tests. std::unique_ptr<net::NetworkChangeNotifier> mock_network_change_notifier_; diff --git a/www/ungoogled-chromium/files/patch-services_video__capture_video__capture__service__impl.cc b/www/ungoogled-chromium/files/patch-services_video__capture_video__capture__service__impl.cc index 2075f8a98b8f..1551fc787c6d 100644 --- a/www/ungoogled-chromium/files/patch-services_video__capture_video__capture__service__impl.cc +++ b/www/ungoogled-chromium/files/patch-services_video__capture_video__capture__service__impl.cc @@ -1,4 +1,4 @@ ---- services/video_capture/video_capture_service_impl.cc.orig 2024-09-14 09:26:11 UTC +--- services/video_capture/video_capture_service_impl.cc.orig 2024-10-01 07:26:23 UTC +++ services/video_capture/video_capture_service_impl.cc @@ -42,7 +42,7 @@ #include "services/video_capture/lacros/device_factory_adapter_lacros.h" @@ -18,7 +18,7 @@ // Intended usage of this class is to create viz::Gpu in utility process and // connect to viz::GpuClient of browser process, which will call to Gpu service. // Also, this class holds the viz::ContextProvider to listen and monitor Gpu -@@ -331,7 +331,7 @@ void VideoCaptureServiceImpl::LazyInitializeGpuDepende +@@ -337,7 +337,7 @@ void VideoCaptureServiceImpl::LazyInitializeGpuDepende gpu_dependencies_context_ = std::make_unique<GpuDependenciesContext>(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) @@ -27,7 +27,7 @@ { #else if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled()) { -@@ -463,7 +463,7 @@ void VideoCaptureServiceImpl::OnGpuInfoUpdate(const CH +@@ -469,7 +469,7 @@ void VideoCaptureServiceImpl::OnGpuInfoUpdate(const CH } #endif diff --git a/www/ungoogled-chromium/files/patch-third__party_abseil-cpp_absl_base_internal_sysinfo.cc b/www/ungoogled-chromium/files/patch-third__party_abseil-cpp_absl_base_internal_sysinfo.cc index 6e0f83e3e41f..fc70d19907d8 100644 --- a/www/ungoogled-chromium/files/patch-third__party_abseil-cpp_absl_base_internal_sysinfo.cc +++ b/www/ungoogled-chromium/files/patch-third__party_abseil-cpp_absl_base_internal_sysinfo.cc @@ -1,4 +1,4 @@ ---- third_party/abseil-cpp/absl/base/internal/sysinfo.cc.orig 2023-11-04 07:08:51 UTC +--- third_party/abseil-cpp/absl/base/internal/sysinfo.cc.orig 2024-10-01 07:26:23 UTC +++ third_party/abseil-cpp/absl/base/internal/sysinfo.cc @@ -30,7 +30,7 @@ #include <sys/syscall.h> @@ -9,7 +9,7 @@ #include <sys/sysctl.h> #endif -@@ -194,6 +194,7 @@ static double GetNominalCPUFrequency() { +@@ -198,6 +198,7 @@ static double GetNominalCPUFrequency() { #else @@ -17,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) { -@@ -226,6 +227,7 @@ static bool ReadLongFromFile(const char *file, long *v +@@ -230,6 +231,7 @@ static bool ReadLongFromFile(const char *file, long *v } return ret; } @@ -25,7 +25,7 @@ #if defined(ABSL_INTERNAL_UNSCALED_CYCLECLOCK_FREQUENCY_IS_CPU_FREQUENCY) -@@ -325,9 +327,11 @@ static double GetNominalCPUFrequency() { +@@ -329,9 +331,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. @@ -37,7 +37,7 @@ #if defined(ABSL_INTERNAL_UNSCALED_CYCLECLOCK_FREQUENCY_IS_CPU_FREQUENCY) // On these platforms, the TSC frequency is the nominal CPU -@@ -346,10 +350,12 @@ static double GetNominalCPUFrequency() { +@@ -350,10 +354,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. @@ -50,7 +50,7 @@ return 1.0; #endif // !ABSL_INTERNAL_UNSCALED_CYCLECLOCK_FREQUENCY_IS_CPU_FREQUENCY -@@ -459,6 +465,12 @@ pid_t GetTID() { +@@ -463,6 +469,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); @@ -62,4 +62,4 @@ + return getthrid(); } - #else + #elif defined(__Fuchsia__) diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_public_platform_platform.h b/www/ungoogled-chromium/files/patch-third__party_blink_public_platform_platform.h index ff6fdabc3604..6f221474ccf5 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_public_platform_platform.h +++ b/www/ungoogled-chromium/files/patch-third__party_blink_public_platform_platform.h @@ -1,6 +1,6 @@ ---- third_party/blink/public/platform/platform.h.orig 2024-09-14 09:26:11 UTC +--- third_party/blink/public/platform/platform.h.orig 2024-10-01 07:26:23 UTC +++ third_party/blink/public/platform/platform.h -@@ -374,7 +374,7 @@ class BLINK_PLATFORM_EXPORT Platform { +@@ -375,7 +375,7 @@ class BLINK_PLATFORM_EXPORT Platform { return nullptr; } diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc index e4c294c1e781..a08ee601c2a0 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2024-08-26 14:40:28 UTC +--- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2024-10-01 07:26:23 UTC +++ third_party/blink/renderer/core/exported/web_view_impl.cc @@ -427,7 +427,7 @@ SkFontHinting RendererPreferencesToSkiaHinting( const blink::RendererPreferences& prefs) { @@ -9,7 +9,7 @@ if (!prefs.should_antialias_text) { // When anti-aliasing is off, GTK maps all non-zero hinting settings to // 'Normal' hinting so we do the same. Otherwise, folks who have 'Slight' -@@ -3418,7 +3418,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs +@@ -3407,7 +3407,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs renderer_preferences_.use_subpixel_positioning); // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc index 0d34afebeec8..4bc43af2feb2 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/layout/layout_view.cc.orig 2024-07-31 14:19:23 UTC +--- third_party/blink/renderer/core/layout/layout_view.cc.orig 2024-10-01 07:26:23 UTC +++ third_party/blink/renderer/core/layout/layout_view.cc -@@ -72,7 +72,7 @@ +@@ -73,7 +73,7 @@ #include "ui/display/screen_info.h" #include "ui/gfx/geometry/quad_f.h" @@ -9,7 +9,7 @@ #include "third_party/blink/renderer/platform/fonts/font_cache.h" #endif -@@ -775,7 +775,7 @@ void LayoutView::LayoutRoot() { +@@ -774,7 +774,7 @@ void LayoutView::LayoutRoot() { intrinsic_logical_widths_ = LogicalWidth(); } diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc index fcf5be652d8b..b0cf775d8cdb 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2024-08-26 14:40:28 UTC +--- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2024-10-01 07:26:23 UTC +++ third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc -@@ -149,7 +149,7 @@ bool ScrollbarThemeAura::SupportsDragSnapBack() const +@@ -148,7 +148,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; -@@ -372,7 +372,7 @@ bool ScrollbarThemeAura::ShouldCenterOnThumb(const Scr +@@ -418,7 +418,7 @@ bool ScrollbarThemeAura::ShouldCenterOnThumb(const Scr const WebMouseEvent& event) const { // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc index 29debe6930d0..ef0f64906695 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc.orig 2024-08-26 14:40:28 UTC +--- third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc.orig 2024-10-01 07:26:23 UTC +++ third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc -@@ -468,7 +468,7 @@ class AudioWorkletThreadPriorityTest +@@ -469,7 +469,7 @@ class AudioWorkletThreadPriorityTest // TODO(crbug.com/1022888): The worklet thread priority is always NORMAL // on OS_LINUX and OS_CHROMEOS regardless of the thread priority setting. diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc index e5867273e911..f4132e10df56 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig 2024-08-26 14:40:28 UTC +--- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig 2024-10-01 07:26:23 UTC +++ third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -@@ -6302,7 +6302,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid +@@ -6303,7 +6303,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid constexpr bool kAllowZeroCopyImages = true; #endif diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn index 4ce5e0fd33c9..2df49dc8b4dd 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/BUILD.gn.orig 2024-08-26 14:40:28 UTC +--- third_party/blink/renderer/platform/BUILD.gn.orig 2024-10-01 07:26:23 UTC +++ third_party/blink/renderer/platform/BUILD.gn -@@ -2006,7 +2006,7 @@ static_library("test_support") { +@@ -2010,7 +2010,7 @@ static_library("test_support") { ] # fuzzed_data_provider may not work with a custom toolchain. diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc index c0606eddd2f9..fba7fc0789c7 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2024-08-26 14:40:28 UTC +--- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2024-10-01 07:26:23 UTC +++ third_party/blink/renderer/platform/fonts/font_cache.cc -@@ -79,7 +79,7 @@ extern const char kNotoColorEmojiCompat[] = "Noto Colo +@@ -81,7 +81,7 @@ extern const char kNotoColorEmojiCompat[] = "Noto Colo SkFontMgr* FontCache::static_font_manager_ = nullptr; @@ -9,7 +9,7 @@ float FontCache::device_scale_factor_ = 1.0; #endif -@@ -130,7 +130,7 @@ const FontPlatformData* FontCache::SystemFontPlatformD +@@ -132,7 +132,7 @@ const FontPlatformData* FontCache::SystemFontPlatformD const FontDescription& font_description) { const AtomicString& family = FontCache::SystemFontFamily(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || \ diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h index 8eab1e04a44d..ecb3459f1877 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/platform/fonts/font_cache.h.orig 2024-08-26 14:40:28 UTC +--- third_party/blink/renderer/platform/fonts/font_cache.h.orig 2024-10-01 07:26:23 UTC +++ third_party/blink/renderer/platform/fonts/font_cache.h @@ -55,7 +55,7 @@ #include "third_party/skia/include/core/SkFontMgr.h" @@ -9,7 +9,7 @@ #include "ui/gfx/font_fallback_linux.h" #endif -@@ -165,7 +165,7 @@ class PLATFORM_EXPORT FontCache final { +@@ -167,7 +167,7 @@ class PLATFORM_EXPORT FontCache final { static void MaybePreloadSystemFonts(); @@ -18,7 +18,7 @@ // These are needed for calling QueryRenderStyleForStrike, since // gfx::GetFontRenderParams makes distinctions based on DSF. static float DeviceScaleFactor() { return device_scale_factor_; } -@@ -241,7 +241,7 @@ class PLATFORM_EXPORT FontCache final { +@@ -243,7 +243,7 @@ class PLATFORM_EXPORT FontCache final { const char* locale_family_name); #endif // BUILDFLAG(IS_ANDROID) @@ -27,7 +27,7 @@ static bool GetFontForCharacter(UChar32, const char* preferred_locale, gfx::FallbackFontData*); -@@ -314,7 +314,7 @@ class PLATFORM_EXPORT FontCache final { +@@ -316,7 +316,7 @@ class PLATFORM_EXPORT FontCache final { const FontFaceCreationParams&, std::string& name); @@ -36,7 +36,7 @@ static AtomicString GetFamilyNameForCharacter(SkFontMgr*, UChar32, const FontDescription&, -@@ -351,7 +351,7 @@ class PLATFORM_EXPORT FontCache final { +@@ -353,7 +353,7 @@ class PLATFORM_EXPORT FontCache final { bool is_test_font_mgr_ = false; #endif // BUILDFLAG(IS_WIN) diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc index 09efb0a442d5..48c1acdded1a 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc @@ -1,9 +1,9 @@ ---- third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig 2024-08-26 14:40:28 UTC +--- third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig 2024-10-01 07:26:23 UTC +++ third_party/blink/renderer/platform/graphics/video_frame_submitter.cc -@@ -418,7 +418,7 @@ void VideoFrameSubmitter::OnBeginFrame( - continue; - auto& feedback = - timing_details.find(frame_token)->value.presentation_feedback; +@@ -420,7 +420,7 @@ void VideoFrameSubmitter::OnBeginFrame( + auto& details = timing_details.find(frame_token)->value; + auto& feedback = details.presentation_feedback; + -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // TODO: On Linux failure flag is unreliable, and perfectly rendered frames diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc index 2d97d664ec38..49c3a79a2ee6 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_factory.cc.orig 2024-07-31 14:19:23 UTC +--- third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_factory.cc.orig 2024-10-01 07:26:23 UTC +++ third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_factory.cc -@@ -254,12 +254,12 @@ SupportedFormats GetSupportedFormatsInternal( +@@ -260,12 +260,12 @@ SupportedFormats GetSupportedFormatsInternal( supported_formats.scalability_modes.push_back(profile.scalability_modes); supported_formats.sdp_formats.push_back(std::move(*format)); diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 index 3cf917c8dae6..8bb7fec40149 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2024-08-26 14:40:28 UTC +--- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2024-10-01 07:26:23 UTC +++ third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -344,7 +344,7 @@ +@@ -364,7 +364,7 @@ name: "AppTitle", status: "experimental", origin_trial_feature_name: "AppTitle", @@ -9,7 +9,7 @@ base_feature: "WebAppEnableAppTitle", }, { -@@ -1703,7 +1703,7 @@ +@@ -1801,7 +1801,7 @@ base_feature: "none", public: true, origin_trial_feature_name: "FedCmMultipleIdentityProviders", @@ -18,7 +18,7 @@ origin_trial_allows_third_party: true, }, { -@@ -3114,7 +3114,7 @@ +@@ -3236,7 +3236,7 @@ // Tracking bug for the implementation: https://crbug.com/1462930 name: "PermissionElement", origin_trial_feature_name: "PermissionElement", @@ -27,7 +27,7 @@ status: "experimental", public: true, base_feature_status: "enabled", -@@ -3241,7 +3241,7 @@ +@@ -3375,7 +3375,7 @@ { name: "PrivateNetworkAccessPermissionPrompt", origin_trial_feature_name: "PrivateNetworkAccessPermissionPrompt", @@ -36,7 +36,7 @@ status: "stable", public: true, base_feature: "none", -@@ -4204,7 +4204,7 @@ +@@ -4393,7 +4393,7 @@ name: "UnrestrictedSharedArrayBuffer", base_feature: "none", origin_trial_feature_name: "UnrestrictedSharedArrayBuffer", @@ -45,7 +45,7 @@ }, // Enables using policy-controlled feature "usb-unrestricted" to allow // isolated context to access protected USB interface classes and to -@@ -4373,7 +4373,7 @@ +@@ -4573,7 +4573,7 @@ { name: "WebAppScopeExtensions", origin_trial_feature_name: "WebAppScopeExtensions", @@ -54,7 +54,7 @@ status: "experimental", base_feature: "none", }, -@@ -4416,7 +4416,7 @@ +@@ -4616,7 +4616,7 @@ status: "experimental", base_feature: "none", origin_trial_feature_name: "WebAppUrlHandling", diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_scheduler_common_thread.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_scheduler_common_thread.cc index 23e2f2404381..8cd63310aa6e 100644 --- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_scheduler_common_thread.cc +++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_scheduler_common_thread.cc @@ -1,8 +1,8 @@ ---- third_party/blink/renderer/platform/scheduler/common/thread.cc.orig 2023-05-05 12:12:41 UTC +--- third_party/blink/renderer/platform/scheduler/common/thread.cc.orig 2024-10-01 07:26:23 UTC +++ third_party/blink/renderer/platform/scheduler/common/thread.cc -@@ -82,7 +82,7 @@ void Thread::CreateAndSetCompositorThread() { - std::make_unique<scheduler::CompositorThread>(params); - compositor_thread->Init(); +@@ -88,7 +88,7 @@ void Thread::CreateAndSetCompositorThread() { + "Compositor"); + })); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_OPENBSD) diff --git a/www/ungoogled-chromium/files/patch-third__party_libc++_src_src_chrono.cpp b/www/ungoogled-chromium/files/patch-third__party_libc++_src_src_chrono.cpp index eef4c04585fe..28c7b9773292 100644 --- a/www/ungoogled-chromium/files/patch-third__party_libc++_src_src_chrono.cpp +++ b/www/ungoogled-chromium/files/patch-third__party_libc++_src_src_chrono.cpp @@ -1,11 +1,11 @@ ---- third_party/libc++/src/src/chrono.cpp.orig 2024-08-26 14:40:28 UTC +--- third_party/libc++/src/src/chrono.cpp.orig 2024-10-01 07:26:23 UTC +++ third_party/libc++/src/src/chrono.cpp -@@ -33,7 +33,7 @@ - - // OpenBSD does not have a fully conformant suite of POSIX timers, but +@@ -34,7 +34,7 @@ + // OpenBSD and GPU do not have a fully conformant suite of POSIX timers, but // it does have clock_gettime and CLOCK_MONOTONIC which is all we need. --#if defined(__APPLE__) || defined(__gnu_hurd__) || defined(__OpenBSD__) || (defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0) -+#if defined(__APPLE__) || defined(__gnu_hurd__) || defined(__OpenBSD__) || (defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0) || defined(__FreeBSD__) + #if defined(__APPLE__) || defined(__gnu_hurd__) || defined(__OpenBSD__) || defined(__AMDGPU__) || \ +- defined(__NVPTX__) || (defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0) ++ defined(__NVPTX__) || (defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0) || defined(__FreeBSD__) # define _LIBCPP_HAS_CLOCK_GETTIME #endif diff --git a/www/ungoogled-chromium/files/patch-third__party_libc++_src_src_filesystem_filesystem__clock.cpp b/www/ungoogled-chromium/files/patch-third__party_libc++_src_src_filesystem_filesystem__clock.cpp index 944c8fc35ead..a7fc35eebd96 100644 --- a/www/ungoogled-chromium/files/patch-third__party_libc++_src_src_filesystem_filesystem__clock.cpp +++ b/www/ungoogled-chromium/files/patch-third__party_libc++_src_src_filesystem_filesystem__clock.cpp @@ -1,11 +1,11 @@ ---- third_party/libc++/src/src/filesystem/filesystem_clock.cpp.orig 2024-02-25 20:22:18 UTC +--- third_party/libc++/src/src/filesystem/filesystem_clock.cpp.orig 2024-10-01 07:26:23 UTC +++ third_party/libc++/src/src/filesystem/filesystem_clock.cpp -@@ -29,7 +29,7 @@ - # include <sys/time.h> // for gettimeofday and timeval +@@ -30,7 +30,7 @@ #endif --#if defined(__APPLE__) || defined(__gnu_hurd__) || (defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0) -+#if defined(__APPLE__) || defined(__gnu_hurd__) || (defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0) || defined(__OpenBSD__) || defined(__FreeBSD__) + #if defined(__APPLE__) || defined(__gnu_hurd__) || defined(__AMDGPU__) || defined(__NVPTX__) || \ +- (defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0) ++ (defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0) || defined(__OpenBSD__) || defined(__FreeBSD__) # define _LIBCPP_HAS_CLOCK_GETTIME #endif diff --git a/www/ungoogled-chromium/files/patch-third__party_speech-dispatcher_libspeechd__version.h b/www/ungoogled-chromium/files/patch-third__party_speech-dispatcher_libspeechd__version.h index 5da04c1c48d4..691d8016bdba 100644 --- a/www/ungoogled-chromium/files/patch-third__party_speech-dispatcher_libspeechd__version.h +++ b/www/ungoogled-chromium/files/patch-third__party_speech-dispatcher_libspeechd__version.h @@ -1,4 +1,4 @@ ---- third_party/speech-dispatcher/libspeechd_version.h.orig 2024-08-26 14:40:28 UTC +--- third_party/speech-dispatcher/libspeechd_version.h.orig 2024-10-01 07:26:23 UTC +++ third_party/speech-dispatcher/libspeechd_version.h @@ -0,0 +1,29 @@ +/* @@ -19,7 +19,7 @@ + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see <https://www.gnu.org/licenses/>. + * -+ * $Id: patch-third_party_speech-dispatcher_libspeechd_version_h,v 1.9 2024/08/25 14:47:17 robert Exp $ ++ * $Id: patch-third_party_speech-dispatcher_libspeechd_version_h,v 1.10 2024/10/01 06:17:51 robert Exp $ + */ + +#ifndef _LIBSPEECHD_VERSION_H diff --git a/www/ungoogled-chromium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c b/www/ungoogled-chromium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c index d1b8346e6155..79556e8c3773 100644 --- a/www/ungoogled-chromium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c +++ b/www/ungoogled-chromium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c @@ -1,6 +1,6 @@ ---- third_party/sqlite/src/amalgamation/sqlite3.c.orig 2024-06-03 12:52:16 UTC +--- third_party/sqlite/src/amalgamation/sqlite3.c.orig 2024-10-01 07:26:23 UTC +++ third_party/sqlite/src/amalgamation/sqlite3.c -@@ -14119,7 +14119,7 @@ struct fts5_api { +@@ -14187,7 +14187,7 @@ struct fts5_api { ** But _XOPEN_SOURCE define causes problems for Mac OS X, so omit ** it. */ @@ -9,7 +9,7 @@ # define _XOPEN_SOURCE 600 #endif -@@ -44777,7 +44777,12 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB +@@ -45170,7 +45170,12 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB memset(zBuf, 0, nBuf); randomnessPid = osGetpid(0); #if !defined(SQLITE_TEST) && !defined(SQLITE_OMIT_RANDOMNESS) @@ -22,7 +22,7 @@ int fd, got; fd = robust_open("/dev/urandom", O_RDONLY, 0); if( fd<0 ){ -@@ -44792,6 +44797,7 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB +@@ -45185,6 +45190,7 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB robust_close(0, fd, __LINE__); } } diff --git a/www/ungoogled-chromium/files/patch-third__party_vulkan-loader_src_BUILD.gn b/www/ungoogled-chromium/files/patch-third__party_vulkan-loader_src_BUILD.gn index f5f1434a5114..3dcc8ef9d759 100644 --- a/www/ungoogled-chromium/files/patch-third__party_vulkan-loader_src_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-third__party_vulkan-loader_src_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/vulkan-loader/src/BUILD.gn.orig 2024-07-31 14:19:23 UTC +--- third_party/vulkan-loader/src/BUILD.gn.orig 2024-10-01 07:26:23 UTC +++ third_party/vulkan-loader/src/BUILD.gn -@@ -59,7 +59,7 @@ config("vulkan_internal_config") { +@@ -57,7 +57,7 @@ config("vulkan_internal_config") { defines += [ "SYSCONFDIR=\"/etc\"", "FALLBACK_CONFIG_DIRS=\"/etc/xdg\"", diff --git a/www/ungoogled-chromium/files/patch-tools_json__schema__compiler_cpp__bundle__generator.py b/www/ungoogled-chromium/files/patch-tools_json__schema__compiler_cpp__bundle__generator.py index edbd877adc85..0b4c6cd37e6d 100644 --- a/www/ungoogled-chromium/files/patch-tools_json__schema__compiler_cpp__bundle__generator.py +++ b/www/ungoogled-chromium/files/patch-tools_json__schema__compiler_cpp__bundle__generator.py @@ -1,6 +1,6 @@ ---- tools/json_schema_compiler/cpp_bundle_generator.py.orig 2023-03-10 11:01:21 UTC +--- tools/json_schema_compiler/cpp_bundle_generator.py.orig 2024-10-01 07:26:23 UTC +++ tools/json_schema_compiler/cpp_bundle_generator.py -@@ -149,7 +149,7 @@ class CppBundleGenerator(object): +@@ -148,7 +148,7 @@ class CppBundleGenerator(object): # BUILDFLAG(IS_CHROMEOS) && BUILDFLAG(IS_CHROMEOS_LACROS). ifdefs.append('BUILDFLAG(IS_CHROMEOS_LACROS)') elif platform == Platforms.LINUX: diff --git a/www/ungoogled-chromium/files/patch-ui_base_ime_dummy__text__input__client.cc b/www/ungoogled-chromium/files/patch-ui_base_ime_dummy__text__input__client.cc index 27e2e7bd2c0b..fe81e92ae77e 100644 --- a/www/ungoogled-chromium/files/patch-ui_base_ime_dummy__text__input__client.cc +++ b/www/ungoogled-chromium/files/patch-ui_base_ime_dummy__text__input__client.cc @@ -1,6 +1,6 @@ ---- ui/base/ime/dummy_text_input_client.cc.orig 2022-10-29 17:50:56 UTC +--- ui/base/ime/dummy_text_input_client.cc.orig 2024-10-01 07:26:23 UTC +++ ui/base/ime/dummy_text_input_client.cc -@@ -159,7 +159,7 @@ bool DummyTextInputClient::ShouldDoLearning() { +@@ -163,7 +163,7 @@ bool DummyTextInputClient::ShouldDoLearning() { return false; } diff --git a/www/ungoogled-chromium/files/patch-ui_base_ime_dummy__text__input__client.h b/www/ungoogled-chromium/files/patch-ui_base_ime_dummy__text__input__client.h index 2110186a251c..c049e9ad9bef 100644 --- a/www/ungoogled-chromium/files/patch-ui_base_ime_dummy__text__input__client.h +++ b/www/ungoogled-chromium/files/patch-ui_base_ime_dummy__text__input__client.h @@ -1,6 +1,6 @@ ---- ui/base/ime/dummy_text_input_client.h.orig 2022-10-01 07:40:07 UTC +--- ui/base/ime/dummy_text_input_client.h.orig 2024-10-01 07:26:23 UTC +++ ui/base/ime/dummy_text_input_client.h -@@ -65,7 +65,7 @@ class DummyTextInputClient : public TextInputClient { +@@ -67,7 +67,7 @@ class DummyTextInputClient : public TextInputClient { ukm::SourceId GetClientSourceForMetrics() const override; bool ShouldDoLearning() override; diff --git a/www/ungoogled-chromium/files/patch-ui_base_ime_fake__text__input__client.cc b/www/ungoogled-chromium/files/patch-ui_base_ime_fake__text__input__client.cc index bfad0ed914e2..e5520741eb9a 100644 --- a/www/ungoogled-chromium/files/patch-ui_base_ime_fake__text__input__client.cc +++ b/www/ungoogled-chromium/files/patch-ui_base_ime_fake__text__input__client.cc @@ -1,7 +1,7 @@ ---- ui/base/ime/fake_text_input_client.cc.orig 2024-06-22 08:49:42 UTC +--- ui/base/ime/fake_text_input_client.cc.orig 2024-10-01 07:26:23 UTC +++ ui/base/ime/fake_text_input_client.cc -@@ -210,7 +210,7 @@ bool FakeTextInputClient::ShouldDoLearning() { - return false; +@@ -215,7 +215,7 @@ bool FakeTextInputClient::ShouldDoLearning() { + return should_do_learning_; } -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/ungoogled-chromium/files/patch-ui_base_ime_fake__text__input__client.h b/www/ungoogled-chromium/files/patch-ui_base_ime_fake__text__input__client.h index a4254463c53e..eb4e0d3de737 100644 --- a/www/ungoogled-chromium/files/patch-ui_base_ime_fake__text__input__client.h +++ b/www/ungoogled-chromium/files/patch-ui_base_ime_fake__text__input__client.h @@ -1,6 +1,6 @@ ---- ui/base/ime/fake_text_input_client.h.orig 2024-06-22 08:49:42 UTC +--- ui/base/ime/fake_text_input_client.h.orig 2024-10-01 07:26:23 UTC +++ ui/base/ime/fake_text_input_client.h -@@ -98,7 +98,7 @@ class FakeTextInputClient : public TextInputClient { +@@ -101,7 +101,7 @@ class FakeTextInputClient : public TextInputClient { void SetTextEditCommandForNextKeyEvent(TextEditCommand command) override; ukm::SourceId GetClientSourceForMetrics() const override; bool ShouldDoLearning() override; diff --git a/www/ungoogled-chromium/files/patch-ui_base_ime_text__input__client.h b/www/ungoogled-chromium/files/patch-ui_base_ime_text__input__client.h index 06e24b942135..0bf374a9a1b8 100644 --- a/www/ungoogled-chromium/files/patch-ui_base_ime_text__input__client.h +++ b/www/ungoogled-chromium/files/patch-ui_base_ime_text__input__client.h @@ -1,6 +1,6 @@ ---- ui/base/ime/text_input_client.h.orig 2024-06-22 08:49:42 UTC +--- ui/base/ime/text_input_client.h.orig 2024-10-01 07:26:23 UTC +++ ui/base/ime/text_input_client.h -@@ -266,7 +266,7 @@ class COMPONENT_EXPORT(UI_BASE_IME) TextInputClient +@@ -268,7 +268,7 @@ class COMPONENT_EXPORT(UI_BASE_IME) TextInputClient { // fields that are considered 'private' (e.g. in incognito tabs). virtual bool ShouldDoLearning() = 0; diff --git a/www/ungoogled-chromium/files/patch-ui_base_resource_resource__bundle.cc b/www/ungoogled-chromium/files/patch-ui_base_resource_resource__bundle.cc index 05d9db844768..b8f855b436a9 100644 --- a/www/ungoogled-chromium/files/patch-ui_base_resource_resource__bundle.cc +++ b/www/ungoogled-chromium/files/patch-ui_base_resource_resource__bundle.cc @@ -1,6 +1,6 @@ ---- ui/base/resource/resource_bundle.cc.orig 2024-06-22 08:49:42 UTC +--- ui/base/resource/resource_bundle.cc.orig 2024-10-01 07:26:23 UTC +++ ui/base/resource/resource_bundle.cc -@@ -926,7 +926,7 @@ void ResourceBundle::ReloadFonts() { +@@ -913,7 +913,7 @@ void ResourceBundle::ReloadFonts() { } ResourceScaleFactor ResourceBundle::GetMaxResourceScaleFactor() const { diff --git a/www/ungoogled-chromium/files/patch-ui_base_ui__base__features.cc b/www/ungoogled-chromium/files/patch-ui_base_ui__base__features.cc index 599ef2ac9af4..cc8e3855b53d 100644 --- a/www/ungoogled-chromium/files/patch-ui_base_ui__base__features.cc +++ b/www/ungoogled-chromium/files/patch-ui_base_ui__base__features.cc @@ -1,6 +1,6 @@ ---- ui/base/ui_base_features.cc.orig 2024-08-26 14:40:28 UTC +--- ui/base/ui_base_features.cc.orig 2024-10-01 07:26:23 UTC +++ ui/base/ui_base_features.cc -@@ -157,7 +157,7 @@ BASE_FEATURE(kWaylandPerSurfaceScale, +@@ -162,7 +162,7 @@ BASE_FEATURE(kWaylandTextInputV3, base::FEATURE_DISABLED_BY_DEFAULT); #endif // BUILDFLAG(IS_OZONE) @@ -9,7 +9,7 @@ // If this feature is enabled, users not specify --ozone-platform-hint switch // will get --ozone-platform-hint=auto treatment. https://crbug.com/40250220. COMPONENT_EXPORT(UI_BASE_FEATURES) -@@ -259,7 +259,7 @@ BASE_FEATURE(kExperimentalFlingAnimation, +@@ -264,7 +264,7 @@ BASE_FEATURE(kExperimentalFlingAnimation, "ExperimentalFlingAnimation", // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -18,7 +18,7 @@ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ !BUILDFLAG(IS_CHROMEOS_LACROS)) base::FEATURE_ENABLED_BY_DEFAULT -@@ -363,7 +363,7 @@ bool IsForcedColorsEnabled() { +@@ -366,7 +366,7 @@ bool IsForcedColorsEnabled() { BASE_FEATURE(kEyeDropper, "EyeDropper", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-ui_base_ui__base__features.h b/www/ungoogled-chromium/files/patch-ui_base_ui__base__features.h index cf6d30556d0c..03eec37d0855 100644 --- a/www/ungoogled-chromium/files/patch-ui_base_ui__base__features.h +++ b/www/ungoogled-chromium/files/patch-ui_base_ui__base__features.h @@ -1,7 +1,7 @@ ---- ui/base/ui_base_features.h.orig 2024-08-26 14:40:28 UTC +--- ui/base/ui_base_features.h.orig 2024-10-01 07:26:23 UTC +++ ui/base/ui_base_features.h -@@ -138,7 +138,7 @@ COMPONENT_EXPORT(UI_BASE_FEATURES) - BASE_DECLARE_FEATURE(kWaylandPerSurfaceScale); +@@ -141,7 +141,7 @@ COMPONENT_EXPORT(UI_BASE_FEATURES) + BASE_DECLARE_FEATURE(kWaylandTextInputV3); #endif // BUILDFLAG(IS_OZONE) -#if BUILDFLAG(IS_LINUX) diff --git a/www/ungoogled-chromium/files/patch-ui_base_webui_web__ui__util.cc b/www/ungoogled-chromium/files/patch-ui_base_webui_web__ui__util.cc index 5b01dc8d2e61..6417c7056fea 100644 --- a/www/ungoogled-chromium/files/patch-ui_base_webui_web__ui__util.cc +++ b/www/ungoogled-chromium/files/patch-ui_base_webui_web__ui__util.cc @@ -1,6 +1,6 @@ ---- ui/base/webui/web_ui_util.cc.orig 2024-06-22 08:49:42 UTC +--- ui/base/webui/web_ui_util.cc.orig 2024-10-01 07:26:23 UTC +++ ui/base/webui/web_ui_util.cc -@@ -39,7 +39,7 @@ namespace { +@@ -44,7 +44,7 @@ namespace { constexpr float kMaxScaleFactor = 1000.0f; std::string GetFontFamilyMd() { @@ -9,7 +9,7 @@ return "Roboto, " + GetFontFamily(); #else return GetFontFamily(); -@@ -216,7 +216,7 @@ std::string GetFontFamily() { +@@ -221,7 +221,7 @@ std::string GetFontFamily() { // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/files/patch-ui_compositor_compositor.cc b/www/ungoogled-chromium/files/patch-ui_compositor_compositor.cc index a0678c732b9f..c8374e4d3006 100644 --- a/www/ungoogled-chromium/files/patch-ui_compositor_compositor.cc +++ b/www/ungoogled-chromium/files/patch-ui_compositor_compositor.cc @@ -1,6 +1,6 @@ ---- ui/compositor/compositor.cc.orig 2024-08-26 14:40:28 UTC +--- ui/compositor/compositor.cc.orig 2024-10-01 07:26:23 UTC +++ ui/compositor/compositor.cc -@@ -923,7 +923,7 @@ void Compositor::OnResume() { +@@ -926,7 +926,7 @@ void Compositor::OnResume() { obs.ResetIfActive(); } diff --git a/www/ungoogled-chromium/files/patch-ui_compositor_compositor.h b/www/ungoogled-chromium/files/patch-ui_compositor_compositor.h index c28c42cae304..fe361d273897 100644 --- a/www/ungoogled-chromium/files/patch-ui_compositor_compositor.h +++ b/www/ungoogled-chromium/files/patch-ui_compositor_compositor.h @@ -1,6 +1,6 @@ ---- ui/compositor/compositor.h.orig 2024-05-23 20:04:36 UTC +--- ui/compositor/compositor.h.orig 2024-10-01 07:26:23 UTC +++ ui/compositor/compositor.h -@@ -456,7 +456,7 @@ class COMPOSITOR_EXPORT Compositor : public base::Powe +@@ -458,7 +458,7 @@ class COMPOSITOR_EXPORT Compositor : public base::Powe // base::PowerSuspendObserver: void OnResume() override; diff --git a/www/ungoogled-chromium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc b/www/ungoogled-chromium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc index a55f999e28d6..5080712fe48f 100644 --- a/www/ungoogled-chromium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc +++ b/www/ungoogled-chromium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc @@ -1,6 +1,6 @@ ---- ui/events/devices/x11/device_data_manager_x11.cc.orig 2024-02-03 15:42:55 UTC +--- ui/events/devices/x11/device_data_manager_x11.cc.orig 2024-10-01 07:26:23 UTC +++ ui/events/devices/x11/device_data_manager_x11.cc -@@ -844,6 +844,7 @@ void DeviceDataManagerX11::SetDisabledKeyboardAllowedK +@@ -849,6 +849,7 @@ void DeviceDataManagerX11::SetDisabledKeyboardAllowedK } void DeviceDataManagerX11::DisableDevice(x11::Input::DeviceId deviceid) { diff --git a/www/ungoogled-chromium/files/patch-ui_events_event.cc b/www/ungoogled-chromium/files/patch-ui_events_event.cc index 55112052da5b..58581eee11c2 100644 --- a/www/ungoogled-chromium/files/patch-ui_events_event.cc +++ b/www/ungoogled-chromium/files/patch-ui_events_event.cc @@ -1,6 +1,6 @@ ---- ui/events/event.cc.orig 2024-08-26 14:40:28 UTC +--- ui/events/event.cc.orig 2024-10-01 07:26:23 UTC +++ ui/events/event.cc -@@ -365,7 +365,7 @@ std::string LocatedEvent::ToString() const { +@@ -366,7 +366,7 @@ std::string LocatedEvent::ToString() const { MouseEvent::MouseEvent(const PlatformEvent& native_event) : LocatedEvent(native_event), changed_button_flags_(GetChangedMouseButtonFlagsFromNative(native_event)), @@ -9,7 +9,7 @@ movement_(GetMouseMovementFromNative(native_event)), #endif pointer_details_(GetMousePointerDetailsFromNative(native_event)) { -@@ -621,7 +621,7 @@ std::unique_ptr<Event> MouseWheelEvent::Clone() const +@@ -622,7 +622,7 @@ std::unique_ptr<Event> MouseWheelEvent::Clone() const return std::make_unique<MouseWheelEvent>(*this); } @@ -18,7 +18,7 @@ // This value matches Windows, Fuchsia WHEEL_DELTA, and (roughly) Firefox on // Linux. // static -@@ -881,7 +881,7 @@ void KeyEvent::InitializeNative() { +@@ -882,7 +882,7 @@ void KeyEvent::InitializeNative() { if (synthesize_key_repeat_enabled_ && IsRepeated(GetLastKeyEvent())) SetFlags(flags() | EF_IS_REPEAT); diff --git a/www/ungoogled-chromium/files/patch-ui_events_keycodes_dom_keycode__converter.cc b/www/ungoogled-chromium/files/patch-ui_events_keycodes_dom_keycode__converter.cc index ca514c871790..c645270e8e4d 100644 --- a/www/ungoogled-chromium/files/patch-ui_events_keycodes_dom_keycode__converter.cc +++ b/www/ungoogled-chromium/files/patch-ui_events_keycodes_dom_keycode__converter.cc @@ -1,6 +1,6 @@ ---- ui/events/keycodes/dom/keycode_converter.cc.orig 2024-06-22 08:49:42 UTC +--- ui/events/keycodes/dom/keycode_converter.cc.orig 2024-10-01 07:26:23 UTC +++ ui/events/keycodes/dom/keycode_converter.cc -@@ -13,7 +13,7 @@ +@@ -18,7 +18,7 @@ #include "ui/events/keycodes/dom/dom_code.h" #include "ui/events/keycodes/dom/dom_key.h" @@ -9,7 +9,7 @@ #include <linux/input.h> #endif -@@ -26,7 +26,7 @@ namespace { +@@ -31,7 +31,7 @@ namespace { #if BUILDFLAG(IS_WIN) #define DOM_CODE(usb, evdev, xkb, win, mac, code, id) \ { usb, win, code } @@ -18,7 +18,7 @@ #define DOM_CODE(usb, evdev, xkb, win, mac, code, id) \ { usb, xkb, code } #elif BUILDFLAG(IS_APPLE) -@@ -65,7 +65,7 @@ struct DomKeyMapEntry { +@@ -70,7 +70,7 @@ struct DomKeyMapEntry { #undef DOM_KEY_UNI #undef DOM_KEY_MAP_DECLARATION_END @@ -27,7 +27,7 @@ // The offset between XKB Keycode and evdev code. constexpr int kXkbKeycodeOffset = 8; -@@ -186,7 +186,7 @@ int KeycodeConverter::DomCodeToNativeKeycode(DomCode c +@@ -191,7 +191,7 @@ int KeycodeConverter::DomCodeToNativeKeycode(DomCode c return UsbKeycodeToNativeKeycode(static_cast<uint32_t>(code)); } diff --git a/www/ungoogled-chromium/files/patch-ui_gfx_font__fallback__linux.cc b/www/ungoogled-chromium/files/patch-ui_gfx_font__fallback__linux.cc index 323416925311..1474d2770c87 100644 --- a/www/ungoogled-chromium/files/patch-ui_gfx_font__fallback__linux.cc +++ b/www/ungoogled-chromium/files/patch-ui_gfx_font__fallback__linux.cc @@ -1,6 +1,6 @@ ---- ui/gfx/font_fallback_linux.cc.orig 2024-02-03 15:42:55 UTC +--- ui/gfx/font_fallback_linux.cc.orig 2024-10-01 07:26:23 UTC +++ ui/gfx/font_fallback_linux.cc -@@ -27,6 +27,8 @@ +@@ -32,6 +32,8 @@ #include "ui/gfx/linux/fontconfig_util.h" #include "ui/gfx/platform_font.h" diff --git a/www/ungoogled-chromium/files/patch-ui_gfx_linux_gbm__wrapper.cc b/www/ungoogled-chromium/files/patch-ui_gfx_linux_gbm__wrapper.cc index 247b6b7579e6..1df978d27edd 100644 --- a/www/ungoogled-chromium/files/patch-ui_gfx_linux_gbm__wrapper.cc +++ b/www/ungoogled-chromium/files/patch-ui_gfx_linux_gbm__wrapper.cc @@ -1,6 +1,6 @@ ---- ui/gfx/linux/gbm_wrapper.cc.orig 2024-05-23 20:04:36 UTC +--- ui/gfx/linux/gbm_wrapper.cc.orig 2024-10-01 07:26:23 UTC +++ ui/gfx/linux/gbm_wrapper.cc -@@ -314,7 +314,7 @@ class Device final : public ui::GbmDevice { +@@ -319,7 +319,7 @@ class Device final : public ui::GbmDevice { // of 1x1 BOs which are destroyed before creating the final BO creation used // to instantiate the returned GbmBuffer. gfx::Size size_for_verification = diff --git a/www/ungoogled-chromium/files/patch-ui_gl_gl__implementation.cc b/www/ungoogled-chromium/files/patch-ui_gl_gl__implementation.cc index 6246cfe44e49..749fff79d42c 100644 --- a/www/ungoogled-chromium/files/patch-ui_gl_gl__implementation.cc +++ b/www/ungoogled-chromium/files/patch-ui_gl_gl__implementation.cc @@ -1,7 +1,7 @@ ---- ui/gl/gl_implementation.cc.orig 2024-08-26 14:40:28 UTC +--- ui/gl/gl_implementation.cc.orig 2024-10-01 07:26:23 UTC +++ ui/gl/gl_implementation.cc -@@ -254,7 +254,7 @@ GetRequestedGLImplementationFromCommandLine( - *fallback_to_software_gl = false; +@@ -252,7 +252,7 @@ GetRequestedGLImplementationFromCommandLine( + const base::CommandLine* command_line) { bool overrideUseSoftwareGL = command_line->HasSwitch(switches::kOverrideUseSoftwareGLForTests); -#if BUILDFLAG(IS_LINUX) || \ diff --git a/www/ungoogled-chromium/files/patch-ui_gl_gl__switches.cc b/www/ungoogled-chromium/files/patch-ui_gl_gl__switches.cc index 563360161524..459f0da11838 100644 --- a/www/ungoogled-chromium/files/patch-ui_gl_gl__switches.cc +++ b/www/ungoogled-chromium/files/patch-ui_gl_gl__switches.cc @@ -1,4 +1,4 @@ ---- ui/gl/gl_switches.cc.orig 2024-06-22 08:49:42 UTC +--- ui/gl/gl_switches.cc.orig 2024-10-01 07:26:23 UTC +++ ui/gl/gl_switches.cc @@ -11,7 +11,7 @@ #include "base/android/build_info.h" @@ -9,7 +9,7 @@ #include <vulkan/vulkan_core.h> #include "third_party/angle/src/gpu_info_util/SystemInfo.h" // nogncheck #endif -@@ -299,7 +299,7 @@ bool IsDefaultANGLEVulkan() { +@@ -284,7 +284,7 @@ bool IsDefaultANGLEVulkan() { base::android::SDK_VERSION_Q) return false; #endif // BUILDFLAG(IS_ANDROID) @@ -18,7 +18,7 @@ angle::SystemInfo system_info; if (!angle::GetSystemInfoVulkan(&system_info)) return false; -@@ -311,7 +311,7 @@ bool IsDefaultANGLEVulkan() { +@@ -296,7 +296,7 @@ bool IsDefaultANGLEVulkan() { const auto& active_gpu = system_info.gpus[system_info.activeGPUIndex]; diff --git a/www/ungoogled-chromium/files/patch-ui_gtk_printing_print__dialog__gtk.cc b/www/ungoogled-chromium/files/patch-ui_gtk_printing_print__dialog__gtk.cc index c01003cf3f8c..20339a3f07ae 100644 --- a/www/ungoogled-chromium/files/patch-ui_gtk_printing_print__dialog__gtk.cc +++ b/www/ungoogled-chromium/files/patch-ui_gtk_printing_print__dialog__gtk.cc @@ -1,6 +1,6 @@ ---- ui/gtk/printing/print_dialog_gtk.cc.orig 2024-08-26 14:40:28 UTC +--- ui/gtk/printing/print_dialog_gtk.cc.orig 2024-10-01 07:26:23 UTC +++ ui/gtk/printing/print_dialog_gtk.cc -@@ -434,7 +434,7 @@ void PrintDialogGtk::ShowDialog( +@@ -439,7 +439,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/ungoogled-chromium/files/patch-ui_message__center_views_message__popup__view.cc b/www/ungoogled-chromium/files/patch-ui_message__center_views_message__popup__view.cc index e06c145b2867..12062dd334df 100644 --- a/www/ungoogled-chromium/files/patch-ui_message__center_views_message__popup__view.cc +++ b/www/ungoogled-chromium/files/patch-ui_message__center_views_message__popup__view.cc @@ -1,6 +1,6 @@ ---- ui/message_center/views/message_popup_view.cc.orig 2024-07-31 14:19:23 UTC +--- ui/message_center/views/message_popup_view.cc.orig 2024-10-01 07:26:23 UTC +++ ui/message_center/views/message_popup_view.cc -@@ -137,7 +137,7 @@ void MessagePopupView::Show() { +@@ -144,7 +144,7 @@ std::unique_ptr<views::Widget> MessagePopupView::Show( params.z_order = ui::ZOrderLevel::kFloatingWindow; // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/files/patch-ui_native__theme_native__theme.h b/www/ungoogled-chromium/files/patch-ui_native__theme_native__theme.h index a571ed622c08..234106cd933c 100644 --- a/www/ungoogled-chromium/files/patch-ui_native__theme_native__theme.h +++ b/www/ungoogled-chromium/files/patch-ui_native__theme_native__theme.h @@ -1,6 +1,6 @@ ---- ui/native_theme/native_theme.h.orig 2024-08-26 14:40:28 UTC +--- ui/native_theme/native_theme.h.orig 2024-10-01 07:26:23 UTC +++ ui/native_theme/native_theme.h -@@ -63,7 +63,7 @@ class NATIVE_THEME_EXPORT NativeTheme { +@@ -64,7 +64,7 @@ class NATIVE_THEME_EXPORT NativeTheme { kCheckbox, // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/files/patch-ui_native__theme_native__theme__base.cc b/www/ungoogled-chromium/files/patch-ui_native__theme_native__theme__base.cc index 4828491fd56d..9aad3d2e953b 100644 --- a/www/ungoogled-chromium/files/patch-ui_native__theme_native__theme__base.cc +++ b/www/ungoogled-chromium/files/patch-ui_native__theme_native__theme__base.cc @@ -1,6 +1,6 @@ ---- ui/native_theme/native_theme_base.cc.orig 2024-06-22 08:49:42 UTC +--- ui/native_theme/native_theme_base.cc.orig 2024-10-01 07:26:23 UTC +++ ui/native_theme/native_theme_base.cc -@@ -236,7 +236,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas, +@@ -241,7 +241,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas, break; // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_common_wayland__util.cc b/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_common_wayland__util.cc index 5b2b703b12dc..1ba391e6b73f 100644 --- a/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_common_wayland__util.cc +++ b/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_common_wayland__util.cc @@ -1,6 +1,6 @@ ---- ui/ozone/platform/wayland/common/wayland_util.cc.orig 2024-06-22 08:49:42 UTC +--- ui/ozone/platform/wayland/common/wayland_util.cc.orig 2024-10-01 07:26:23 UTC +++ ui/ozone/platform/wayland/common/wayland_util.cc -@@ -336,7 +336,7 @@ void TransformToWlArray( +@@ -344,7 +344,7 @@ void TransformToWlArray( } base::TimeTicks EventMillisecondsToTimeTicks(uint32_t milliseconds) { diff --git a/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__connection.cc b/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__connection.cc index 8bc1ebd5f479..c537d8ae187c 100644 --- a/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__connection.cc +++ b/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__connection.cc @@ -1,6 +1,6 @@ ---- ui/ozone/platform/wayland/host/wayland_connection.cc.orig 2024-06-22 08:49:42 UTC +--- ui/ozone/platform/wayland/host/wayland_connection.cc.orig 2024-10-01 07:26:23 UTC +++ ui/ozone/platform/wayland/host/wayland_connection.cc -@@ -532,7 +532,7 @@ bool WaylandConnection::ShouldUseOverlayDelegation() c +@@ -537,7 +537,7 @@ bool WaylandConnection::ShouldUseOverlayDelegation() c // isn't present on any non-exo Wayland compositors. bool should_use_overlay_delegation = IsWaylandOverlayDelegationEnabled() && !fractional_scale_manager_v1(); diff --git a/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__input__method__context.cc b/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__input__method__context.cc index acecb606956b..5a7170f2ab3c 100644 --- a/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__input__method__context.cc +++ b/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__input__method__context.cc @@ -1,6 +1,6 @@ ---- ui/ozone/platform/wayland/host/wayland_input_method_context.cc.orig 2024-06-22 08:49:42 UTC +--- ui/ozone/platform/wayland/host/wayland_input_method_context.cc.orig 2024-10-01 07:26:23 UTC +++ ui/ozone/platform/wayland/host/wayland_input_method_context.cc -@@ -55,7 +55,7 @@ namespace { +@@ -60,7 +60,7 @@ namespace { // Only enable the preedit string for sequence mode (i.e. when using dead keys // or the Compose key) on Linux ozone/wayland (see b/220370007). constexpr CharacterComposer::PreeditStringMode kPreeditStringMode = diff --git a/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.cc b/www/ungoogled-chromium/files/patch-ui_ozone_platform_w |