diff options
| author | Robert Nagy <robert@openbsd.org> | 2022-03-29 20:42:38 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2022-03-29 21:12:41 +0000 |
| commit | d2c7aaaca13965ed2f7b6d3bd4930b5561fdf682 (patch) | |
| tree | af8ff48b5ed19039f09ff491783c4d806738009f | |
| parent | adbcbf8a27257b951a8e2fc30cf2f6027c800180 (diff) | |
| download | ports-d2c7aaaca13965ed2f7b6d3bd4930b5561fdf682.tar.gz ports-d2c7aaaca13965ed2f7b6d3bd4930b5561fdf682.zip | |
www/chromium: update to 100.0.4896.60
Enable some more unit tests.
Security: ab2d7f62-af9d-11ec-a0b8-3065ec8fd3ec
(cherry picked from commit 1e683edf9a258d43c95b485ad96f5c39860770cb)
328 files changed, 2126 insertions, 1539 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile index 736010d5416d..34b4f0f659c3 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -1,7 +1,7 @@ # Created by: Florent Thoumie <flz@FreeBSD.org> PORTNAME= chromium -PORTVERSION= 99.0.4844.84 +PORTVERSION= 100.0.4896.60 CATEGORIES= www MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ https://nerd.hu/distfiles/:fonts @@ -154,6 +154,7 @@ CUPS_LIB_DEPENDS= libcups.so:print/cups CUPS_VARS= GN_ARGS+=use_cups=true CUPS_VARS_OFF= GN_ARGS+=use_cups=false +DEBUG_BUILD_DEPENDS= esbuild:devel/esbuild DEBUG_VARS= BUILDTYPE=Debug \ GN_ARGS+=is_debug=true \ GN_ARGS+=is_component_build=false \ @@ -203,7 +204,7 @@ TEST_ALL_TARGET= ${TEST_TARGETS} IGNORE= you have selected HEIMDAL_BASE but do not have Heimdal installed in base .endif -.if ${COMPILER_VERSION} < 130 && ${PORT_OPTIONS:MLTO} +.if ${COMPILER_VERSION} < 130 LLVM_DEFAULT= 13 BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} BINARY_ALIAS+= cpp=${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} \ diff --git a/www/chromium/Makefile.tests b/www/chromium/Makefile.tests index aea948673823..a635e949f167 100644 --- a/www/chromium/Makefile.tests +++ b/www/chromium/Makefile.tests @@ -4,9 +4,13 @@ TEST_TARGETS= base_unittests \ components_unittests \ content_unittests \ crypto_unittests \ + gl_tests \ + gpu_unittests \ headless_unittests \ media_unittests \ mojo_unittests \ net_unittests \ printing_unittests \ - url_unittests + skia_unittests \ + url_unittests \ + wm_unittests diff --git a/www/chromium/distinfo b/www/chromium/distinfo index e70f0b8e14f9..a192e0735092 100644 --- a/www/chromium/distinfo +++ b/www/chromium/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1648281454 -SHA256 (chromium-99.0.4844.84.tar.xz) = 20ec184ed34bdc7e660ccf6c007b2db37007de423b3a5a51698a96aa29527515 -SIZE (chromium-99.0.4844.84.tar.xz) = 1326587000 -SHA256 (chromium-99.0.4844.84-testdata.tar.xz) = 682715d5058c6289cdfcc3795ef65b7d757f3f9b4773a8ebcf22a869b6aa3940 -SIZE (chromium-99.0.4844.84-testdata.tar.xz) = 259949040 +TIMESTAMP = 1648585637 +SHA256 (chromium-100.0.4896.60.tar.xz) = 0e5ea5f3061ad090cf6bd57ca037496d95ea8956de021aff902f7d0ded7bffdc +SIZE (chromium-100.0.4896.60.tar.xz) = 1357922968 +SHA256 (chromium-100.0.4896.60-testdata.tar.xz) = d242f678bb37976baad0f246f6d5025c29c14efbf74efb2c2e4140b5f08b884c +SIZE (chromium-100.0.4896.60-testdata.tar.xz) = 260020208 SHA256 (test_fonts-cd96fc55dc243f6c6f4cb63ad117cad6cd48dceb.tar.gz) = ec973eccd669d417fbf2d0a4dac730744a3174268ff062db5451b55c82bc3492 SIZE (test_fonts-cd96fc55dc243f6c6f4cb63ad117cad6cd48dceb.tar.gz) = 26759650 diff --git a/www/chromium/files/patch-BUILD.gn b/www/chromium/files/patch-BUILD.gn index e6324afdb6fc..30303505c930 100644 --- a/www/chromium/files/patch-BUILD.gn +++ b/www/chromium/files/patch-BUILD.gn @@ -1,6 +1,6 @@ ---- BUILD.gn.orig 2022-02-28 16:54:41 UTC +--- BUILD.gn.orig 2022-03-25 21:59:56 UTC +++ BUILD.gn -@@ -52,7 +52,7 @@ declare_args() { +@@ -53,7 +53,7 @@ declare_args() { root_extra_deps = [] } @@ -9,7 +9,7 @@ # An official (maximally optimized!) component (optimized for build times) # build doesn't make sense and usually doesn't work. assert(!is_component_build) -@@ -454,7 +454,7 @@ group("gn_all") { +@@ -452,7 +452,7 @@ group("gn_all") { ] } @@ -34,7 +34,7 @@ if (is_mac) { deps += [ "//third_party/breakpad:crash_inspector", -@@ -686,7 +695,7 @@ group("gn_all") { +@@ -685,7 +694,7 @@ group("gn_all") { host_os == "win") { deps += [ "//chrome/test/mini_installer:mini_installer_tests" ] } @@ -43,7 +43,7 @@ deps += [ "//third_party/breakpad:symupload($host_toolchain)" ] } -@@ -1137,7 +1146,7 @@ if (!is_ios) { +@@ -1147,7 +1156,7 @@ if (!is_ios) { data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ] } @@ -52,7 +52,7 @@ data_deps += [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } -@@ -1146,7 +1155,7 @@ if (!is_ios) { +@@ -1156,7 +1165,7 @@ if (!is_ios) { data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } @@ -61,7 +61,7 @@ data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } -@@ -1521,7 +1530,7 @@ group("chromium_builder_perf") { +@@ -1531,7 +1540,7 @@ group("chromium_builder_perf") { if (is_win) { data_deps += [ "//chrome/installer/mini_installer:mini_installer" ] diff --git a/www/chromium/files/patch-ash_display_mirror__window__controller.cc b/www/chromium/files/patch-ash_display_mirror__window__controller.cc index aae659dabc3b..b3983d74627a 100644 --- a/www/chromium/files/patch-ash_display_mirror__window__controller.cc +++ b/www/chromium/files/patch-ash_display_mirror__window__controller.cc @@ -1,6 +1,6 @@ ---- ash/display/mirror_window_controller.cc.orig 2022-02-07 13:39:41 UTC +--- ash/display/mirror_window_controller.cc.orig 2022-03-25 21:59:56 UTC +++ ash/display/mirror_window_controller.cc -@@ -297,7 +297,11 @@ void MirrorWindowController::UpdateWindow( +@@ -296,7 +296,11 @@ void MirrorWindowController::UpdateWindow( return info.id() == iter->first; }) == display_info_list.end()) { CloseAndDeleteHost(iter->second, true); diff --git a/www/chromium/files/patch-base_BUILD.gn b/www/chromium/files/patch-base_BUILD.gn index 72069cf118ab..1ae290e3f1c0 100644 --- a/www/chromium/files/patch-base_BUILD.gn +++ b/www/chromium/files/patch-base_BUILD.gn @@ -1,6 +1,6 @@ ---- base/BUILD.gn.orig 2022-02-28 16:54:41 UTC +--- base/BUILD.gn.orig 2022-03-25 21:59:56 UTC +++ base/BUILD.gn -@@ -993,7 +993,7 @@ mixed_component("base") { +@@ -999,7 +999,7 @@ mixed_component("base") { "timer/hi_res_timer_manager_posix.cc", ] @@ -9,7 +9,7 @@ sources += [ "cpu_affinity_posix.cc", "cpu_affinity_posix.h", -@@ -1004,6 +1004,12 @@ mixed_component("base") { +@@ -1010,6 +1010,12 @@ mixed_component("base") { "profiler/thread_delegate_posix.h", ] } @@ -22,7 +22,7 @@ } if (is_win) { -@@ -1462,11 +1468,23 @@ mixed_component("base") { +@@ -1478,11 +1484,23 @@ mixed_component("base") { # building inside the cros_sdk environment - use host_toolchain as a # more robust check for this. if (!use_sysroot && @@ -47,7 +47,7 @@ if (use_allocator_shim) { sources += [ "allocator/allocator_shim.cc", -@@ -1490,7 +1508,7 @@ mixed_component("base") { +@@ -1506,7 +1524,7 @@ mixed_component("base") { ] configs += [ "//base/allocator:mac_no_default_new_delete_symbols" ] } @@ -56,7 +56,7 @@ sources += [ "allocator/allocator_shim_override_cpp_symbols.h", "allocator/allocator_shim_override_glibc_weak_symbols.h", -@@ -1550,7 +1568,7 @@ mixed_component("base") { +@@ -1563,7 +1581,7 @@ mixed_component("base") { # Allow more direct string conversions on platforms with native utf8 # strings # TODO(crbug/1052397): Consider replacing is_ash with is_chromeos once lacros switches to target_os=chromeos @@ -65,7 +65,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -2222,6 +2240,42 @@ mixed_component("base") { +@@ -2243,6 +2261,42 @@ mixed_component("base") { } } @@ -108,7 +108,7 @@ # iOS if (is_ios) { sources -= [ -@@ -3465,7 +3519,7 @@ test("base_unittests") { +@@ -3495,7 +3549,7 @@ test("base_unittests") { } } @@ -117,7 +117,7 @@ sources += [ "debug/proc_maps_linux_unittest.cc", "files/scoped_file_linux_unittest.cc", -@@ -3513,7 +3567,7 @@ test("base_unittests") { +@@ -3543,7 +3597,7 @@ test("base_unittests") { "posix/unix_domain_socket_unittest.cc", "task/thread_pool/task_tracker_posix_unittest.cc", ] @@ -126,7 +126,7 @@ sources += [ "cpu_affinity_posix_unittest.cc", "profiler/stack_copier_signal_unittest.cc", -@@ -3525,7 +3579,7 @@ test("base_unittests") { +@@ -3555,7 +3609,7 @@ test("base_unittests") { # Allow more direct string conversions on platforms with native utf8 # strings # TODO(crbug/1052397): Consider replacing is_ash with is_chromeos once lacros switches to target_os=chromeos @@ -135,7 +135,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -3689,7 +3743,7 @@ test("base_unittests") { +@@ -3724,7 +3778,7 @@ test("base_unittests") { } } diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h index 700bf383a007..483bda5e796f 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h +++ b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2022-02-28 16:54:41 UTC +--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2022-03-25 21:59:56 UTC +++ base/allocator/partition_allocator/page_allocator_internals_posix.h -@@ -346,8 +346,12 @@ bool TryRecommitSystemPagesInternal( +@@ -352,8 +352,12 @@ bool TryRecommitSystemPagesInternal( void DiscardSystemPagesInternal(uintptr_t address, size_t length) { void* ptr = reinterpret_cast<void*>(address); diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h index 011bdf1a8e7b..454110a15f26 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h +++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h @@ -1,4 +1,4 @@ ---- base/allocator/partition_allocator/partition_alloc_config.h.orig 2022-02-28 16:54:41 UTC +--- base/allocator/partition_allocator/partition_alloc_config.h.orig 2022-03-25 21:59:56 UTC +++ base/allocator/partition_allocator/partition_alloc_config.h @@ -59,7 +59,7 @@ static_assert(sizeof(void*) != 8, ""); @@ -9,3 +9,12 @@ #define PA_HAS_LINUX_KERNEL #endif +@@ -179,7 +179,7 @@ constexpr bool kUseLazyCommit = false; + + // On these platforms, lock all the partitions before fork(), and unlock after. + // This may be required on more platforms in the future. +-#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #define PA_HAS_ATFORK_HANDLER + #endif + diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__page.h b/www/chromium/files/patch-base_allocator_partition__allocator_partition__page.h index 138e9832363f..c7c476112b95 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__page.h +++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__page.h @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/partition_page.h.orig 2022-02-28 16:54:41 UTC +--- base/allocator/partition_allocator/partition_page.h.orig 2022-03-25 21:59:56 UTC +++ base/allocator/partition_allocator/partition_page.h -@@ -129,7 +129,8 @@ struct __attribute__((packed)) SlotSpanMetadata { +@@ -128,7 +128,8 @@ struct __attribute__((packed)) SlotSpanMetadata { PartitionBucket<thread_safe>* const bucket = nullptr; // CHECK()ed in AllocNewSlotSpan(). @@ -10,7 +10,7 @@ // System page size is not a constant on Apple OSes, but is either 4 or 16kiB // (1 << 12 or 1 << 14), as checked in PartitionRoot::Init(). And // PartitionPageSize() is 4 times the OS page size. -@@ -143,7 +144,9 @@ struct __attribute__((packed)) SlotSpanMetadata { +@@ -142,7 +143,9 @@ struct __attribute__((packed)) SlotSpanMetadata { #endif // defined(PA_HAS_64_BITS_POINTERS) && BUILDFLAG(IS_APPLE) // The maximum number of bits needed to cover all currently supported OSes. static constexpr size_t kMaxSlotsPerSlotSpanBits = 13; diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.h b/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.h index a53eb22b38b2..dbd1382fed99 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.h +++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.h @@ -1,11 +1,11 @@ ---- base/allocator/partition_allocator/partition_root.h.orig 2022-02-28 16:54:41 UTC +--- base/allocator/partition_allocator/partition_root.h.orig 2022-03-25 21:59:56 UTC +++ base/allocator/partition_allocator/partition_root.h -@@ -1019,7 +1019,7 @@ ALWAYS_INLINE void PartitionRoot<thread_safe>::FreeNoH +@@ -1071,7 +1071,7 @@ ALWAYS_INLINE void PartitionRoot<thread_safe>::FreeNoH // essentially). #if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && \ ((BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMECAST)) || \ - (BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_64_BITS))) + ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_64_BITS))) - PA_CHECK(IsManagedByPartitionAlloc(address)); + PA_CHECK(IsManagedByPartitionAlloc(object_addr)); #endif diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_starscan_state__bitmap.h b/www/chromium/files/patch-base_allocator_partition__allocator_starscan_state__bitmap.h deleted file mode 100644 index b1d0d8621c7a..000000000000 --- a/www/chromium/files/patch-base_allocator_partition__allocator_starscan_state__bitmap.h +++ /dev/null @@ -1,20 +0,0 @@ ---- base/allocator/partition_allocator/starscan/state_bitmap.h.orig 2022-02-21 11:33:24.834416000 +0100 -+++ base/allocator/partition_allocator/starscan/state_bitmap.h -@@ -393,7 +393,7 @@ template <size_t PageSize, size_t PageAlignment, size_ - template <typename Filter, - typename CallbackForwarder, - typename Callback, -- bool Clear> -+ bool ClearBits> - inline void - StateBitmap<PageSize, PageAlignment, AllocationAlignment>::IterateImpl( - size_t epoch, -@@ -423,7 +423,7 @@ StateBitmap<PageSize, PageAlignment, AllocationAlignme - - callback_forwarder(callback, object_address, bits); - -- if (Clear) { -+ if (ClearBits) { - // Clear the current bits. - AsAtomicCell(cell_index) - .fetch_and(clear_value_mask, std::memory_order_relaxed); diff --git a/www/chromium/files/patch-base_compiler__specific.h b/www/chromium/files/patch-base_compiler__specific.h deleted file mode 100644 index 5424b9804aa7..000000000000 --- a/www/chromium/files/patch-base_compiler__specific.h +++ /dev/null @@ -1,11 +0,0 @@ ---- base/compiler_specific.h.orig 2022-02-28 16:54:41 UTC -+++ base/compiler_specific.h -@@ -359,7 +359,7 @@ inline constexpr bool AnalyzerAssumeTrue(bool arg) { - #endif // defined(__clang_analyzer__) - - // Use nomerge attribute to disable optimization of merging multiple same calls. --#if defined(__clang__) && __has_attribute(nomerge) -+#if defined(__clang__) && __has_attribute(nomerge) && !defined(OS_FREEBSD) - #define NOMERGE [[clang::nomerge]] - #else - #define NOMERGE diff --git a/www/chromium/files/patch-base_debug_stack__trace__posix.cc b/www/chromium/files/patch-base_debug_stack__trace__posix.cc index 5ddbea4f56ac..f53bb3e100d4 100644 --- a/www/chromium/files/patch-base_debug_stack__trace__posix.cc +++ b/www/chromium/files/patch-base_debug_stack__trace__posix.cc @@ -1,6 +1,6 @@ ---- base/debug/stack_trace_posix.cc.orig 2022-02-28 16:54:41 UTC +--- base/debug/stack_trace_posix.cc.orig 2022-03-25 21:59:56 UTC +++ base/debug/stack_trace_posix.cc -@@ -37,7 +37,7 @@ +@@ -38,7 +38,7 @@ #include <AvailabilityMacros.h> #endif diff --git a/www/chromium/files/patch-base_process_process__metrics.cc b/www/chromium/files/patch-base_process_process__metrics.cc index a20644fcc0a1..00d7bf404371 100644 --- a/www/chromium/files/patch-base_process_process__metrics.cc +++ b/www/chromium/files/patch-base_process_process__metrics.cc @@ -1,4 +1,4 @@ ---- base/process/process_metrics.cc.orig 2022-02-28 16:54:41 UTC +--- base/process/process_metrics.cc.orig 2022-03-25 21:59:56 UTC +++ base/process/process_metrics.cc @@ -18,7 +18,7 @@ namespace base { namespace { @@ -27,6 +27,15 @@ Value meminfo = memory_info_.ToValue(); Value vmstat = vmstat_info_.ToValue(); meminfo.MergeDictionary(&vmstat); +@@ -100,7 +100,7 @@ std::unique_ptr<ProcessMetrics> ProcessMetrics::Create + #endif // !BUILDFLAG(IS_MAC) + } + +-#if !BUILDFLAG(IS_FREEBSD) || !BUILDFLAG(IS_POSIX) ++#if !BUILDFLAG(IS_BSD) || !BUILDFLAG(IS_POSIX) + double ProcessMetrics::GetPlatformIndependentCPUUsage() { + TimeDelta cumulative_cpu = GetCumulativeCPUUsage(); + TimeTicks time = TimeTicks::Now(); @@ -126,7 +126,7 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage( #endif diff --git a/www/chromium/files/patch-base_process_process__metrics__freebsd.cc b/www/chromium/files/patch-base_process_process__metrics__freebsd.cc index 3e8eb45662f0..052477866871 100644 --- a/www/chromium/files/patch-base_process_process__metrics__freebsd.cc +++ b/www/chromium/files/patch-base_process_process__metrics__freebsd.cc @@ -1,4 +1,4 @@ ---- base/process/process_metrics_freebsd.cc.orig 2021-10-01 01:36:37 UTC +--- base/process/process_metrics_freebsd.cc.orig 2022-03-25 21:59:56 UTC +++ base/process/process_metrics_freebsd.cc @@ -3,21 +3,41 @@ // found in the LICENSE file. @@ -44,7 +44,22 @@ // static std::unique_ptr<ProcessMetrics> ProcessMetrics::CreateProcessMetrics( -@@ -37,7 +57,7 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage( +@@ -27,17 +47,18 @@ std::unique_ptr<ProcessMetrics> ProcessMetrics::Create + + double ProcessMetrics::GetPlatformIndependentCPUUsage() { + struct kinfo_proc info; +- int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_PID, process_}; +- size_t length = sizeof(info); ++ size_t length = sizeof(struct kinfo_proc); + ++ int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_PID, process_ }; ++ + if (sysctl(mib, base::size(mib), &info, &length, NULL, 0) < 0) +- return 0; ++ return 0.0; + +- return (info.ki_pctcpu / FSCALE) * 100.0; ++ return static_cast<double>((info.ki_pctcpu * 100.0) / FSCALE); } TimeDelta ProcessMetrics::GetCumulativeCPUUsage() { @@ -53,7 +68,7 @@ return TimeDelta(); } -@@ -68,4 +88,221 @@ size_t GetSystemCommitCharge() { +@@ -68,4 +89,221 @@ size_t GetSystemCommitCharge() { return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize); } diff --git a/www/chromium/files/patch-base_process_process__metrics__openbsd.cc b/www/chromium/files/patch-base_process_process__metrics__openbsd.cc index 1cc46d52fa55..97102c7e4f92 100644 --- a/www/chromium/files/patch-base_process_process__metrics__openbsd.cc +++ b/www/chromium/files/patch-base_process_process__metrics__openbsd.cc @@ -1,6 +1,6 @@ ---- base/process/process_metrics_openbsd.cc.orig 2022-02-07 13:39:41 UTC +--- base/process/process_metrics_openbsd.cc.orig 2022-03-25 21:59:56 UTC +++ base/process/process_metrics_openbsd.cc -@@ -4,14 +4,30 @@ +@@ -4,17 +4,36 @@ #include "base/process/process_metrics.h" @@ -31,27 +31,40 @@ namespace base { -@@ -25,48 +41,13 @@ bool ProcessMetrics::GetIOCounters(IoCounters* io_coun ++ProcessMetrics::ProcessMetrics(ProcessHandle process) ++ : process_(process) {} ++ + // static + std::unique_ptr<ProcessMetrics> ProcessMetrics::CreateProcessMetrics( + ProcessHandle process) { +@@ -25,49 +44,24 @@ bool ProcessMetrics::GetIOCounters(IoCounters* io_coun return false; } -static int GetProcessCPU(pid_t pid) { -- struct kinfo_proc info; ++double ProcessMetrics::GetPlatformIndependentCPUUsage() { + struct kinfo_proc info; - size_t length; - int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, pid, - sizeof(struct kinfo_proc), 0 }; -- ++ size_t length = sizeof(struct kinfo_proc); + - if (sysctl(mib, base::size(mib), NULL, &length, NULL, 0) < 0) - return -1; -- ++ int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process_, ++ sizeof(struct kinfo_proc), 1 }; + - mib[5] = (length / sizeof(struct kinfo_proc)); -- ++ if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0) ++ return 0.0; + - if (sysctl(mib, base::size(mib), &info, &length, NULL, 0) < 0) - return 0; - - return info.p_pctcpu; --} -- ++ return static_cast<double>((info.p_pctcpu * 100.0) / FSCALE); + } + -double ProcessMetrics::GetPlatformIndependentCPUUsage() { - TimeTicks time = TimeTicks::Now(); - @@ -74,14 +87,23 @@ return TimeDelta(); } - ProcessMetrics::ProcessMetrics(ProcessHandle process) +-ProcessMetrics::ProcessMetrics(ProcessHandle process) - : process_(process), - last_cpu_(0) {} -+ : process_(process) {} - +- size_t GetSystemCommitCharge() { int mib[] = { CTL_VM, VM_METER }; -@@ -85,6 +66,129 @@ size_t GetSystemCommitCharge() { + int pagesize; +@@ -75,7 +69,7 @@ size_t GetSystemCommitCharge() { + unsigned long mem_total, mem_free, mem_inactive; + size_t len = sizeof(vmtotal); + +- if (sysctl(mib, base::size(mib), &vmtotal, &len, NULL, 0) < 0) ++ if (sysctl(mib, std::size(mib), &vmtotal, &len, NULL, 0) < 0) + return 0; + + mem_total = vmtotal.t_vm; +@@ -85,6 +79,129 @@ size_t GetSystemCommitCharge() { pagesize = getpagesize(); return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize); diff --git a/www/chromium/files/patch-base_process_process__posix.cc b/www/chromium/files/patch-base_process_process__posix.cc index 8a7b5721a4a7..98e1db005454 100644 --- a/www/chromium/files/patch-base_process_process__posix.cc +++ b/www/chromium/files/patch-base_process_process__posix.cc @@ -1,4 +1,4 @@ ---- base/process/process_posix.cc.orig 2022-02-28 16:54:41 UTC +--- base/process/process_posix.cc.orig 2022-03-25 21:59:56 UTC +++ base/process/process_posix.cc @@ -23,10 +23,15 @@ #include "build/build_config.h" @@ -35,7 +35,7 @@ // On Mac we can wait on non child processes. return WaitForSingleNonChildProcess(handle, timeout); #else -@@ -358,7 +363,55 @@ void Process::Exited(int exit_code) const {} +@@ -356,7 +361,55 @@ void Process::Exited(int exit_code) const {} int Process::GetPriority() const { DCHECK(IsValid()); diff --git a/www/chromium/files/patch-base_rand__util.h b/www/chromium/files/patch-base_rand__util.h index 7afa38819627..7dbf39ebe0ba 100644 --- a/www/chromium/files/patch-base_rand__util.h +++ b/www/chromium/files/patch-base_rand__util.h @@ -1,6 +1,6 @@ ---- base/rand_util.h.orig 2022-02-28 16:54:41 UTC +--- base/rand_util.h.orig 2022-03-25 21:59:56 UTC +++ base/rand_util.h -@@ -77,7 +77,7 @@ void RandomShuffle(Itr first, Itr last) { +@@ -81,7 +81,7 @@ void RandomShuffle(Itr first, Itr last) { std::shuffle(first, last, RandomBitGenerator()); } diff --git a/www/chromium/files/patch-base_system_sys__info__freebsd.cc b/www/chromium/files/patch-base_system_sys__info__freebsd.cc index 1dceaec008cd..143fb26b294b 100644 --- a/www/chromium/files/patch-base_system_sys__info__freebsd.cc +++ b/www/chromium/files/patch-base_system_sys__info__freebsd.cc @@ -1,6 +1,6 @@ ---- base/system/sys_info_freebsd.cc.orig 2021-04-14 18:40:48 UTC +--- base/system/sys_info_freebsd.cc.orig 2022-03-25 21:59:56 UTC +++ base/system/sys_info_freebsd.cc -@@ -9,30 +9,95 @@ +@@ -9,30 +9,106 @@ #include <sys/sysctl.h> #include "base/notreached.h" @@ -9,6 +9,17 @@ namespace base { ++int SysInfo::NumberOfProcessors() { ++ int mib[] = {CTL_HW, HW_NCPU}; ++ int ncpu; ++ size_t size = sizeof(ncpu); ++ if (sysctl(mib, base::size(mib), &ncpu, &size, NULL, 0) < 0) { ++ NOTREACHED(); ++ return 1; ++ } ++ return ncpu; ++} ++ int64_t SysInfo::AmountOfPhysicalMemoryImpl() { - int pages, page_size; + int pages, page_size, r = 0; diff --git a/www/chromium/files/patch-base_system_sys__info__openbsd.cc b/www/chromium/files/patch-base_system_sys__info__openbsd.cc index 9da562746469..895f93683f73 100644 --- a/www/chromium/files/patch-base_system_sys__info__openbsd.cc +++ b/www/chromium/files/patch-base_system_sys__info__openbsd.cc @@ -1,4 +1,4 @@ ---- base/system/sys_info_openbsd.cc.orig 2022-02-07 13:39:41 UTC +--- base/system/sys_info_openbsd.cc.orig 2022-03-25 21:59:56 UTC +++ base/system/sys_info_openbsd.cc @@ -12,6 +12,7 @@ @@ -8,7 +8,7 @@ namespace { -@@ -29,9 +30,14 @@ int64_t AmountOfMemory(int pages_name) { +@@ -29,9 +30,15 @@ int64_t AmountOfMemory(int pages_name) { namespace base { @@ -16,6 +16,7 @@ +int64_t aofpmem = 0; +int64_t aofapmem = 0; +int64_t shmmax = 0; ++char cpumodel[256]; + // static int SysInfo::NumberOfProcessors() { @@ -24,7 +25,7 @@ int ncpu; size_t size = sizeof(ncpu); if (sysctl(mib, base::size(mib), &ncpu, &size, NULL, 0) < 0) { -@@ -43,38 +49,61 @@ int SysInfo::NumberOfProcessors() { +@@ -43,38 +50,62 @@ int SysInfo::NumberOfProcessors() { // static int64_t SysInfo::AmountOfPhysicalMemoryImpl() { @@ -49,13 +50,14 @@ // static +std::string SysInfo::CPUModelName() { + int mib[] = {CTL_HW, HW_MODEL}; -+ char name[256]; -+ size_t len = base::size(name); -+ if (sysctl(mib, base::size(mib), name, &len, NULL, 0) < 0) { -+ NOTREACHED(); -+ return std::string(); ++ size_t len = base::size(cpumodel); ++ ++ if (cpumodel[0] == '\0') { ++ if (sysctl(mib, base::size(mib), cpumodel, &len, NULL, 0) < 0) ++ return std::string(); + } -+ return name; ++ ++ return std::string(cpumodel, len - 1); +} + +// static diff --git a/www/chromium/files/patch-base_system_sys__info__posix.cc b/www/chromium/files/patch-base_system_sys__info__posix.cc index 28bbf3b3559f..42ceb1fda2dd 100644 --- a/www/chromium/files/patch-base_system_sys__info__posix.cc +++ b/www/chromium/files/patch-base_system_sys__info__posix.cc @@ -1,5 +1,37 @@ ---- base/system/sys_info_posix.cc.orig 2022-03-16 08:38:25 UTC +--- base/system/sys_info_posix.cc.orig 2022-03-25 21:59:56 UTC +++ base/system/sys_info_posix.cc +@@ -37,7 +37,7 @@ + + namespace { + +-#if !BUILDFLAG(IS_OPENBSD) ++#if !BUILDFLAG(IS_BSD) + int NumberOfProcessors() { + // sysconf returns the number of "logical" (not "physical") processors on both + // Mac and Linux. So we get the number of max available "logical" processors. +@@ -77,7 +77,7 @@ int NumberOfProcessors() { + + base::LazyInstance<base::internal::LazySysInfoValue<int, NumberOfProcessors>>:: + Leaky g_lazy_number_of_processors = LAZY_INSTANCE_INITIALIZER; +-#endif // !BUILDFLAG(IS_OPENBSD) ++#endif // !BUILDFLAG(IS_BSD) + + int64_t AmountOfVirtualMemory() { + struct rlimit limit; +@@ -143,11 +143,11 @@ bool GetDiskSpaceInfo(const base::FilePath& path, + + namespace base { + +-#if !BUILDFLAG(IS_OPENBSD) ++#if !BUILDFLAG(IS_BSD) + int SysInfo::NumberOfProcessors() { + return g_lazy_number_of_processors.Get().value(); + } +-#endif // !BUILDFLAG(IS_OPENBSD) ++#endif // !BUILDFLAG(IS_BSD) + + // static + int64_t SysInfo::AmountOfVirtualMemory() { @@ -239,6 +239,8 @@ std::string SysInfo::OperatingSystemArchitecture() { arch = "x86"; } else if (arch == "amd64") { diff --git a/www/chromium/files/patch-base_system_sys__info__unittest.cc b/www/chromium/files/patch-base_system_sys__info__unittest.cc index 590b817eaf49..2d9da201de79 100644 --- a/www/chromium/files/patch-base_system_sys__info__unittest.cc +++ b/www/chromium/files/patch-base_system_sys__info__unittest.cc @@ -1,6 +1,6 @@ ---- base/system/sys_info_unittest.cc.orig 2022-02-28 16:54:41 UTC +--- base/system/sys_info_unittest.cc.orig 2022-03-25 21:59:56 UTC +++ base/system/sys_info_unittest.cc -@@ -228,12 +228,15 @@ TEST_F(SysInfoTest, GetHardwareInfo) { +@@ -234,12 +234,15 @@ TEST_F(SysInfoTest, GetHardwareInfo) { EXPECT_TRUE(IsStringUTF8(hardware_info->model)); bool empty_result_expected = #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN) || \ diff --git a/www/chromium/files/patch-base_threading_thread__local__storage__unittest.cc b/www/chromium/files/patch-base_threading_thread__local__storage__unittest.cc deleted file mode 100644 index 6ea93f8745fd..000000000000 --- a/www/chromium/files/patch-base_threading_thread__local__storage__unittest.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- base/threading/thread_local_storage_unittest.cc.orig 2022-02-28 16:54:41 UTC -+++ base/threading/thread_local_storage_unittest.cc -@@ -90,7 +90,7 @@ class ThreadLocalStorageRunner : public DelegateSimple - void ThreadLocalStorageCleanup(void *value) { - int *ptr = reinterpret_cast<int*>(value); - // Destructors should never be called with a NULL. -- ASSERT_NE(reinterpret_cast<int*>(NULL), ptr); -+ ASSERT_NE(NULL, ptr); - if (*ptr == kFinalTlsValue) - return; // We've been called enough times. - ASSERT_LT(kFinalTlsValue, *ptr); diff --git a/www/chromium/files/patch-base_trace__event_memory__dump__manager.cc b/www/chromium/files/patch-base_trace__event_memory__dump__manager.cc index 45c5ecd63a91..f1f228e38e7b 100644 --- a/www/chromium/files/patch-base_trace__event_memory__dump__manager.cc +++ b/www/chromium/files/patch-base_trace__event_memory__dump__manager.cc @@ -1,6 +1,6 @@ ---- base/trace_event/memory_dump_manager.cc.orig 2022-02-07 13:39:41 UTC +--- base/trace_event/memory_dump_manager.cc.orig 2022-03-25 21:59:56 UTC +++ base/trace_event/memory_dump_manager.cc -@@ -78,7 +78,7 @@ const char* const MemoryDumpManager::kSystemAllocatorP +@@ -82,7 +82,7 @@ const char* const MemoryDumpManager::kSystemAllocatorP #if defined(MALLOC_MEMORY_TRACING_SUPPORTED) MallocDumpProvider::kAllocatedObjects; #else diff --git a/www/chromium/files/patch-build_config_compiler_BUILD.gn b/www/chromium/files/patch-build_config_compiler_BUILD.gn index 1c9d854a4148..badfeff900d0 100644 --- a/www/chromium/files/patch-build_config_compiler_BUILD.gn +++ b/www/chromium/files/patch-build_config_compiler_BUILD.gn @@ -1,4 +1,4 @@ ---- build/config/compiler/BUILD.gn.orig 2022-02-28 16:54:41 UTC +--- build/config/compiler/BUILD.gn.orig 2022-03-25 21:59:56 UTC +++ build/config/compiler/BUILD.gn @@ -236,13 +236,16 @@ config("default_include_dirs") { # Compiler instrumentation can introduce dependencies in DSOs to symbols in @@ -38,7 +38,7 @@ cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ] # TODO(hans): Remove this once Clang generates better optimized debug info -@@ -902,7 +909,7 @@ config("compiler_cpu_abi") { +@@ -908,7 +915,7 @@ config("compiler_cpu_abi") { ] } } else if (current_cpu == "arm") { @@ -47,7 +47,7 @@ cflags += [ "--target=arm-linux-gnueabihf" ] ldflags += [ "--target=arm-linux-gnueabihf" ] } -@@ -916,7 +923,7 @@ config("compiler_cpu_abi") { +@@ -922,7 +929,7 @@ config("compiler_cpu_abi") { cflags += [ "-mtune=$arm_tune" ] } } else if (current_cpu == "arm64") { @@ -56,7 +56,7 @@ cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] } -@@ -1237,7 +1244,7 @@ config("compiler_deterministic") { +@@ -1243,7 +1250,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. @@ -65,7 +65,7 @@ # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here. cflags += [ "-Xclang", -@@ -1524,7 +1531,7 @@ config("default_warnings") { +@@ -1533,7 +1540,7 @@ config("default_warnings") { "-Wno-ignored-pragma-optimize", ] @@ -74,7 +74,7 @@ # TODO(https://crbug.com/1016945): Re-enable once ChromeOS toolchain is up to date cflags += [ "-Wno-builtin-assume-aligned-alignment" ] } -@@ -1709,7 +1716,7 @@ config("no_chromium_code") { +@@ -1725,7 +1732,7 @@ config("no_chromium_code") { # third-party libraries. "-Wno-c++11-narrowing", ] @@ -83,8 +83,8 @@ cflags += [ # Disabled for similar reasons as -Wunused-variable. "-Wno-unused-but-set-variable", -@@ -2224,7 +2231,7 @@ config("afdo_optimize_size") { - # between //base/allocator:tcmalloc and AFDO on GCC), so we provide a separate +@@ -2239,7 +2246,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") { - if (is_clang) { @@ -92,7 +92,7 @@ cflags = [] if (clang_emit_debug_info_for_profiling) { # Add the following flags to generate debug info for profiling. -@@ -2240,7 +2247,7 @@ config("afdo") { +@@ -2255,7 +2262,7 @@ config("afdo") { cflags += [ "-fprofile-sample-use=${rebased_clang_sample_profile}" ] inputs = [ _clang_sample_profile ] } @@ -101,7 +101,7 @@ cflags = [ "-fauto-profile=${auto_profile_path}" ] inputs = [ auto_profile_path ] } -@@ -2379,7 +2386,8 @@ config("symbols") { +@@ -2398,7 +2405,8 @@ config("symbols") { } } diff --git a/www/chromium/files/patch-build_config_rust.gni b/www/chromium/files/patch-build_config_rust.gni index 5dd7ad561eef..88a93d14ee6d 100644 --- a/www/chromium/files/patch-build_config_rust.gni +++ b/www/chromium/files/patch-build_config_rust.gni @@ -1,11 +1,11 @@ ---- build/config/rust.gni.orig 2022-02-07 13:39:41 UTC +--- build/config/rust.gni.orig 2022-03-25 21:59:56 UTC +++ build/config/rust.gni -@@ -84,7 +84,7 @@ if (enable_rust) { - rust_sysroot = get_path_info(rust_sysroot_absolute, "abspath") - use_unverified_rust_toolchain = true +@@ -116,7 +116,7 @@ if (enable_rust) { + rust_sysroot = "//third_party/rust-toolchain" + use_unverified_rust_toolchain = false } else { - if (host_os != "linux") { + if (host_os != "linux" && host_os != "openbsd" && host_os != "freebsd") { - assert( - false, - "Attempt to use standard Rust toolchain on an unsupported platform") + assert(false, + "Attempt to use Android Rust toolchain on an unsupported platform") + } diff --git a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni index e941d6a67687..794335e0a1e6 100644 --- a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni +++ b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni @@ -1,4 +1,4 @@ ---- build/toolchain/gcc_toolchain.gni.orig 2022-03-16 08:38:25 UTC +--- build/toolchain/gcc_toolchain.gni.orig 2022-03-25 21:59:56 UTC +++ build/toolchain/gcc_toolchain.gni @@ -53,6 +53,13 @@ if (enable_resource_allowlist_generation) { "enable_resource_allowlist_generation=true does not work for target_os=$target_os") @@ -14,7 +14,7 @@ # This template defines a toolchain for something that works like gcc # (including clang). # -@@ -747,13 +754,12 @@ template("gcc_toolchain") { +@@ -771,13 +778,12 @@ template("gcc_toolchain") { # use_gold too. template("clang_toolchain") { gcc_toolchain(target_name) { diff --git a/www/chromium/files/patch-cc_BUILD.gn b/www/chromium/files/patch-cc_BUILD.gn index 88c78da6873d..34a6a620a314 100644 --- a/www/chromium/files/patch-cc_BUILD.gn +++ b/www/chromium/files/patch-cc_BUILD.gn @@ -1,6 +1,6 @@ ---- cc/BUILD.gn.orig 2022-02-28 16:54:41 UTC +--- cc/BUILD.gn.orig 2022-03-25 21:59:56 UTC +++ cc/BUILD.gn -@@ -660,7 +660,7 @@ cc_test_static_library("test_support") { +@@ -664,7 +664,7 @@ cc_test_static_library("test_support") { if (enable_vulkan) { deps += [ "//gpu/vulkan/init" ] } @@ -9,7 +9,7 @@ data_deps = [ "//third_party/mesa_headers" ] } } -@@ -886,7 +886,6 @@ cc_test("cc_unittests") { +@@ -891,7 +891,6 @@ cc_test("cc_unittests") { data = [ "//components/viz/test/data/" ] data_deps = [ "//testing/buildbot/filters:cc_unittests_filters", diff --git a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc index 9935801ef7b3..d8ca4ff70b5a 100644 --- a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc +++ b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/app/chrome_main_delegate.cc -@@ -113,7 +113,7 @@ +@@ -114,7 +114,7 @@ #include "chrome/app/chrome_crash_reporter_client.h" #endif @@ -9,7 +9,7 @@ #include "components/nacl/common/nacl_paths.h" #include "components/nacl/zygote/nacl_fork_delegate_linux.h" #endif -@@ -157,12 +157,12 @@ +@@ -158,12 +158,12 @@ #include "v8/include/v8.h" #endif @@ -24,7 +24,7 @@ #include "chrome/browser/policy/policy_path_parser.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -310,7 +310,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty +@@ -311,7 +311,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty // and resources loaded. bool SubprocessNeedsResourceBundle(const std::string& process_type) { return @@ -33,7 +33,7 @@ // The zygote process opens the resources for the renderers. process_type == switches::kZygoteProcess || #endif -@@ -350,7 +350,7 @@ bool HandleVersionSwitches(const base::CommandLine& co +@@ -351,7 +351,7 @@ bool HandleVersionSwitches(const base::CommandLine& co // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -42,7 +42,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) || -@@ -414,7 +414,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -415,7 +415,7 @@ void InitializeUserDataDir(base::CommandLine* command_ std::string process_type = command_line->GetSwitchValueASCII(switches::kProcessType); @@ -51,7 +51,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. -@@ -498,7 +498,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat +@@ -499,7 +499,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat #endif #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ @@ -60,7 +60,7 @@ // Record the startup process creation time on supported platforms. On Android // this is recorded in ChromeMainDelegateAndroid. startup_metric_utils::RecordStartupProcessCreationTime( -@@ -679,6 +679,8 @@ void ChromeMainDelegate::PostFieldTrialInitialization( +@@ -680,6 +680,8 @@ void ChromeMainDelegate::PostFieldTrialInitialization( // not always enabled on Linux/ChromeOS. #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) bool enable_gwp_asan = crash_reporter::IsCrashpadEnabled(); @@ -69,7 +69,7 @@ #else bool enable_gwp_asan = true; #endif -@@ -801,7 +803,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -815,7 +817,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi } // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -78,7 +78,7 @@ // This will directly exit if the user asked for help. HandleHelpSwitches(command_line); #endif -@@ -832,7 +834,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -846,7 +848,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) chromeos::dbus_paths::RegisterPathProvider(); #endif @@ -87,7 +87,7 @@ nacl::RegisterPathProvider(); #endif -@@ -1146,7 +1148,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1161,7 +1163,7 @@ void ChromeMainDelegate::PreSandboxStartup() { locale; } @@ -96,7 +96,7 @@ // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess) { #if BUILDFLAG(IS_ANDROID) -@@ -1222,7 +1224,7 @@ absl::variant<int, content::MainFunctionParams> Chrome +@@ -1237,7 +1239,7 @@ absl::variant<int, content::MainFunctionParams> Chrome // This entry is not needed on Linux, where the NaCl loader // process is launched via nacl_helper instead. diff --git a/www/chromium/files/patch-chrome_app_chromium__strings.grd b/www/chromium/files/patch-chrome_app_chromium__strings.grd index c7410f592b87..bc279203ed4e 100644 --- a/www/chromium/files/patch-chrome_app_chromium__strings.grd +++ b/www/chromium/files/patch-chrome_app_chromium__strings.grd @@ -1,4 +1,4 @@ ---- chrome/app/chromium_strings.grd.orig 2022-02-28 16:54:41 UTC +--- chrome/app/chromium_strings.grd.orig 2022-03-25 21:59:56 UTC +++ chrome/app/chromium_strings.grd @@ -298,7 +298,7 @@ If you update this file, be sure also to update google Welcome to Chromium; new browser window opened @@ -9,7 +9,7 @@ <message name="IDS_FIRST_RUN_DIALOG_WINDOW_TITLE" desc="Window title of First Run dialog on Mac and Linux, displayed in title bar"> Welcome to Chromium </message> -@@ -810,7 +810,7 @@ Chromium is unable to recover your settings. +@@ -818,7 +818,7 @@ Permissions you've already given to websites and apps </if> <!-- about:browser-switch strings --> @@ -18,7 +18,7 @@ <message name="IDS_ABOUT_BROWSER_SWITCH_DESCRIPTION_UNKNOWN_BROWSER" desc="Description shown while waiting for an alternative browser to open, when the browser name is not auto-detected"> Your system administrator has configured Chromium to open an alternative browser to access <ph name="TARGET_URL_HOSTNAME">$1<ex>example.com</ex></ph>. </message> -@@ -936,7 +936,7 @@ Chromium is unable to recover your settings. +@@ -944,7 +944,7 @@ Permissions you've already given to websites and apps </message> <!-- ProcessSingleton --> diff --git a/www/chromium/files/patch-chrome_app_generated__resources.grd b/www/chromium/files/patch-chrome_app_generated__resources.grd index 31e633027c98..55cbf9d5130f 100644 --- a/www/chromium/files/patch-chrome_app_generated__resources.grd +++ b/www/chromium/files/patch-chrome_app_generated__resources.grd @@ -1,4 +1,4 @@ ---- chrome/app/generated_resources.grd.orig 2022-02-28 16:54:41 UTC +--- chrome/app/generated_resources.grd.orig 2022-03-25 21:59:56 UTC +++ chrome/app/generated_resources.grd @@ -2,7 +2,7 @@ @@ -18,7 +18,7 @@ <part file="url_handler_intent_picker_strings.grdp" /> </if> -@@ -2813,7 +2813,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -2833,7 +2833,7 @@ are declared in tools/grit/grit_rule.gni. </if> <!-- Bluetooth Device Credentials (i.e. PIN/Passkey) dialog --> @@ -27,7 +27,7 @@ <message name="IDS_BLUETOOTH_DEVICE_CREDENTIALS_TITLE" desc="Title of the Bluetooth device credentials prompt dialog."> Device Credentials </message> -@@ -5568,7 +5568,7 @@ Keep your key file in a safe place. You will need it t +@@ -5686,7 +5686,7 @@ Keep your key file in a safe place. You will need it t </if> <!-- chrome://browser-switch strings --> @@ -36,7 +36,7 @@ <message name="IDS_ABOUT_BROWSER_SWITCH_TITLE" desc="about:browser-switch page title"> Legacy Browser Support </message> -@@ -8043,7 +8043,7 @@ Keep your key file in a safe place. You will need it t +@@ -8217,7 +8217,7 @@ Keep your key file in a safe place. You will need it t Google Pay </message> @@ -45,7 +45,7 @@ <message name="IDS_SHOW_WINDOW_DECORATIONS" desc="The label of a radio button in the options dialog for using the system title bar and borders."> Use system title bar and borders </message> -@@ -9134,7 +9134,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -9372,7 +9372,7 @@ Please help our engineers fix this problem. Tell us wh Set as default </message> diff --git a/www/chromium/files/patch-chrome_app_google__chrome__strings.grd b/www/chromium/files/patch-chrome_app_google__chrome__strings.grd index c257a13fb957..953d11ffebcf 100644 --- a/www/chromium/files/patch-chrome_app_google__chrome__strings.grd +++ b/www/chromium/files/patch-chrome_app_google__chrome__strings.grd @@ -1,4 +1,4 @@ ---- chrome/app/google_chrome_strings.grd.orig 2022-02-28 16:54:41 UTC +--- chrome/app/google_chrome_strings.grd.orig 2022-03-25 21:59:56 UTC +++ chrome/app/google_chrome_strings.grd @@ -303,7 +303,7 @@ chromium_strings.grd. --> Welcome to Chrome; new browser window opened @@ -9,7 +9,7 @@ <message name="IDS_FIRST_RUN_DIALOG_WINDOW_TITLE" desc="Window title of First Run dialog on Mac and Linux, displayed in title bar"> Welcome to Google Chrome </message> -@@ -818,7 +818,7 @@ Google Chrome is unable to recover your settings. +@@ -863,7 +863,7 @@ Permissions you've already given to websites and apps </if> <!-- about:browser-switch strings --> @@ -18,7 +18,7 @@ <message name="IDS_ABOUT_BROWSER_SWITCH_DESCRIPTION_UNKNOWN_BROWSER" desc="Description shown while waiting for an alternative browser to open, when the browser name is not auto-detected"> Your system administrator has configured Google Chrome to open an alternative browser to access <ph name="TARGET_URL_HOSTNAME">$1<ex>example.com</ex></ph>. </message> -@@ -944,7 +944,7 @@ Google Chrome is unable to recover your settings. +@@ -1012,7 +1012,7 @@ Permissions you've already given to websites and apps </message> <!-- ProcessSingleton --> diff --git a/www/chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd b/www/chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd index bdec0f7504f8..ddf87266e214 100644 --- a/www/chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd +++ b/www/chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd @@ -1,11 +1,32 @@ ---- chrome/app/theme/chrome_unscaled_resources.grd.orig 2021-04-14 18:40:52 UTC +--- chrome/app/theme/chrome_unscaled_resources.grd.orig 2022-03-25 21:59:56 UTC +++ chrome/app/theme/chrome_unscaled_resources.grd -@@ -18,7 +18,7 @@ - <include name="IDR_PRODUCT_LOGO_64" file="google_chrome/product_logo_64.png" type="BINDATA" /> - <include name="IDR_PRODUCT_LOGO_128" file="google_chrome/product_logo_128.png" type="BINDATA" /> - <include name="IDR_PRODUCT_LOGO_256" file="google_chrome/product_logo_256.png" type="BINDATA" /> +@@ -15,12 +15,12 @@ + <release seq="1"> + <includes> + <if expr="_google_chrome"> +- <if expr="not is_linux"> ++ <if expr="not is_posix"> + <include name="IDR_PRODUCT_LOGO_64" file="google_chrome/product_logo_64.png" type="BINDATA" /> + <include name="IDR_PRODUCT_LOGO_128" file="google_chrome/product_logo_128.png" type="BINDATA" /> + <include name="IDR_PRODUCT_LOGO_256" file="google_chrome/product_logo_256.png" type="BINDATA" /> + </if> - <if expr="is_linux"> + <if expr="is_posix"> - <include name="IDR_PRODUCT_LOGO_128_BETA" file="google_chrome/product_logo_128_beta.png" type="BINDATA" /> - <include name="IDR_PRODUCT_LOGO_128_DEV" file="google_chrome/product_logo_128_dev.png" type="BINDATA" /> + <include name="IDR_PRODUCT_LOGO_64" file="google_chrome/linux/product_logo_64.png" type="BINDATA" /> + <include name="IDR_PRODUCT_LOGO_128" file="google_chrome/linux/product_logo_128.png" type="BINDATA" /> + <include name="IDR_PRODUCT_LOGO_128_BETA" file="google_chrome/linux/product_logo_128_beta.png" type="BINDATA" /> +@@ -52,12 +52,12 @@ + </if> + </if> + <if expr="not _google_chrome"> +- <if expr="not is_linux"> ++ <if expr="not is_posix"> + <include name="IDR_PRODUCT_LOGO_64" file="chromium/product_logo_64.png" type="BINDATA" /> + <include name="IDR_PRODUCT_LOGO_128" file="chromium/product_logo_128.png" type="BINDATA" /> + <include name="IDR_PRODUCT_LOGO_256" file="chromium/product_logo_256.png" type="BINDATA" /> </if> +- <if expr="is_linux"> ++ <if expr="is_posix"> + <include name="IDR_PRODUCT_LOGO_64" file="chromium/linux/product_logo_64.png" type="BINDATA" /> + <include name="IDR_PRODUCT_LOGO_128" file="chromium/linux/product_logo_128.png" type="BINDATA" /> + <include name="IDR_PRODUCT_LOGO_256" file="chromium/linux/product_logo_256.png" type="BINDATA" /> diff --git a/www/chromium/files/patch-chrome_browser_about__flags.cc b/www/chromium/files/patch-chrome_browser_about__flags.cc index e0474b9664a0..6fc32f4e0118 100644 --- a/www/chromium/files/patch-chrome_browser_about__flags.cc +++ b/www/chromium/files/patch-chrome_browser_about__flags.cc @@ -1,6 +1,6 @@ ---- chrome/browser/about_flags.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/about_flags.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/browser/about_flags.cc -@@ -205,7 +205,7 @@ +@@ -206,7 +206,7 @@ #include "ui/native_theme/native_theme_features.h" #include "ui/ui_features.h" @@ -9,7 +9,7 @@ #include "base/allocator/buildflags.h" #endif -@@ -273,7 +273,7 @@ +@@ -275,7 +275,7 @@ #include "chrome/browser/supervised_user/supervised_user_features/supervised_user_features.h" #endif // ENABLE_SUPERVISED_USERS @@ -18,7 +18,7 @@ #include "ui/ozone/buildflags.h" #include "ui/ozone/public/ozone_switches.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) -@@ -360,7 +360,7 @@ const FeatureEntry::Choice kUseAngleChoicesMac[] = { +@@ -362,7 +362,7 @@ const FeatureEntry::Choice kUseAngleChoicesMac[] = { gl::kANGLEImplementationMetalName}}; #endif @@ -27,7 +27,7 @@ const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = { {flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""}, {flag_descriptions::kOzonePlatformHintChoiceAuto, -@@ -966,7 +966,7 @@ const FeatureEntry::FeatureVariation kPageContentAnnot +@@ -976,7 +976,7 @@ const FeatureEntry::FeatureVariation kPageContentAnnot }; #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -36,7 +36,7 @@ const FeatureEntry::FeatureParam kOmniboxDocumentProviderServerScoring[] = { {"DocumentUseServerScore", "true"}, {"DocumentUseClientScore", "false"}, -@@ -3243,7 +3243,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3424,7 +3424,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(chromeos::kLacrosTtsSupport)}, #endif // BUILDFLAG(IS_CHROMEOS) @@ -45,25 +45,34 @@ { "enable-accelerated-video-decode", flag_descriptions::kAcceleratedVideoDecodeName, -@@ -3648,7 +3648,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3838,7 +3838,7 @@ const FeatureEntry kFeatureEntries[] = { {"enable-login-detection", flag_descriptions::kEnableLoginDetectionName, flag_descriptions::kEnableLoginDetectionDescription, kOsAll, FEATURE_VALUE_TYPE(login_detection::kLoginDetection)}, -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - {"enable-save-data", flag_descriptions::kEnableSaveDataName, - flag_descriptions::kEnableSaveDataDescription, kOsCrOS | kOsLinux, - SINGLE_VALUE_TYPE( -@@ -3835,7 +3835,7 @@ const FeatureEntry kFeatureEntries[] = { + {"enable-navigation-predictor", + flag_descriptions::kEnableNavigationPredictorName, + flag_descriptions::kEnableNavigationPredictorDescription, +@@ -4031,7 +4031,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kWebShare)}, - #endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) + #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) {"ozone-platform-hint", flag_descriptions::kOzonePlatformHintName, flag_descriptions::kOzonePlatformHintDescription, kOsLinux, MULTI_VALUE_TYPE(kOzonePlatformHintRuntimeChoices)}, -@@ -4518,7 +4518,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4050,7 +4050,7 @@ const FeatureEntry kFeatureEntries[] = { + password_manager::features::kForceInitialSyncWhenDecryptionFails)}, + #endif // BUILDFLAG(IS_LINUX) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + {"skip-undecryptable-passwords", + flag_descriptions::kSkipUndecryptablePasswordsName, + flag_descriptions::kSkipUndecryptablePasswordsDescription, +@@ -4760,7 +4760,7 @@ const FeatureEntry kFeatureEntries[] = { "OmniboxBundledExperimentV1")}, #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -72,7 +81,7 @@ {"omnibox-experimental-keyword-mode", flag_descriptions::kOmniboxExperimentalKeywordModeName, flag_descriptions::kOmniboxExperimentalKeywordModeDescription, kOsDesktop, -@@ -4887,7 +4887,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5158,7 +5158,7 @@ const FeatureEntry kFeatureEntries[] = { #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -81,7 +90,7 @@ {"webui-feedback", flag_descriptions::kWebuiFeedbackName, flag_descriptions::kWebuiFeedbackDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kWebUIFeedback)}, -@@ -5897,7 +5897,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6198,7 +6198,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kMouseSubframeNoImplicitCapture)}, #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -90,16 +99,16 @@ {"global-media-controls-modern-ui", flag_descriptions::kGlobalMediaControlsModernUIName, flag_descriptions::kGlobalMediaControlsModernUIDescription, -@@ -6607,7 +6607,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6912,7 +6912,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - {"incognito-brand-consistency-for-desktop", - flag_descriptions::kIncognitoBrandConsistencyForDesktopName, - flag_descriptions::kIncognitoBrandConsistencyForDesktopDescription, -@@ -6740,7 +6740,7 @@ const FeatureEntry kFeatureEntries[] = { + {"incognito-clear-browsing-data-dialog-for-desktop", + flag_descriptions::kIncognitoClearBrowsingDataDialogForDesktopName, + flag_descriptions::kIncognitoClearBrowsingDataDialogForDesktopDescription, +@@ -7037,7 +7037,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -108,7 +117,7 @@ {"commander", flag_descriptions::kCommanderName, flag_descriptions::kCommanderDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kCommander)}, -@@ -6985,7 +6985,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7291,7 +7291,7 @@ const FeatureEntry kFeatureEntries[] = { #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -117,21 +126,3 @@ { "ui-debug-tools", flag_descriptions::kUIDebugToolsName, -@@ -7129,7 +7129,7 @@ const FeatureEntry kFeatureEntries[] = { - #endif - - #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - {"enable-desktop-pwas-app-icon-shortcuts-menu-ui", - flag_descriptions::kDesktopPWAsAppIconShortcutsMenuUIName, - flag_descriptions::kDesktopPWAsAppIconShortcutsMenuUIDescription, -@@ -7685,7 +7685,7 @@ const FeatureEntry kFeatureEntries[] = { - SINGLE_VALUE_TYPE(switches::kPervasiveSystemAccentColor)}, - #endif - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - {"improve-accessibility-tree-using-local-ml", - flag_descriptions::kImproveAccessibilityTreeUsingLocalMLName, - flag_descriptions::kImproveAccessibilityTreeUsingLocalMLDescription, diff --git a/www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc b/www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc index c3e6446c375d..9d687d026580 100644 --- a/www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc +++ b/www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/background/background_mode_manager.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/background/background_mode_manager.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/browser/background/background_mode_manager.cc -@@ -892,7 +892,7 @@ gfx::ImageSkia GetStatusTrayIcon() { +@@ -899,7 +899,7 @@ gfx::ImageSkia GetStatusTrayIcon() { return gfx::ImageSkia(); return family->CreateExact(size).AsImageSkia(); diff --git a/www/chromium/files/patch-chrome_browser_browser__features.cc b/www/chromium/files/patch-chrome_browser_browser__features.cc new file mode 100644 index 000000000000..f752e5299fe7 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_browser__features.cc @@ -0,0 +1,11 @@ +--- chrome/browser/browser_features.cc.orig 2022-03-25 21:59:56 UTC ++++ chrome/browser/browser_features.cc +@@ -29,7 +29,7 @@ const base::Feature kColorProviderRedirectionForThemeP + // the browser exits. + const base::Feature kDestroyProfileOnBrowserClose{ + "DestroyProfileOnBrowserClose", +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + base::FEATURE_ENABLED_BY_DEFAULT + }; + #else diff --git a/www/chromium/files/patch-chrome_browser_browser__process__impl.cc b/www/chromium/files/patch-chrome_browser_browser__process__impl.cc index 88bf739e9f2e..3b29a504fb43 100644 --- a/www/chromium/files/patch-chrome_browser_browser__process__impl.cc +++ b/www/chromium/files/patch-chrome_browser_browser__process__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/browser_process_impl.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/browser_process_impl.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/browser/browser_process_impl.cc -@@ -209,7 +209,7 @@ +@@ -208,7 +208,7 @@ #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h" #endif @@ -18,7 +18,7 @@ ChromeJsErrorReportProcessor::Create(); #endif -@@ -1418,7 +1418,7 @@ void BrowserProcessImpl::Unpin() { +@@ -1412,7 +1412,7 @@ void BrowserProcessImpl::Unpin() { // Mac is currently not supported. // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/chromium/files/patch-chrome_browser_browser__process__impl.h b/www/chromium/files/patch-chrome_browser_browser__process__impl.h index 14ccde8270cd..bb761eec2995 100644 --- a/www/chromium/files/patch-chrome_browser_browser__process__impl.h +++ b/www/chromium/files/patch-chrome_browser_browser__process__impl.h @@ -1,6 +1,6 @@ ---- chrome/browser/browser_process_impl.h.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/browser_process_impl.h.orig 2022-03-25 21:59:56 UTC +++ chrome/browser/browser_process_impl.h -@@ -373,7 +373,7 @@ class BrowserProcessImpl : public BrowserProcess, +@@ -367,7 +367,7 @@ class BrowserProcessImpl : public BrowserProcess, // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc index 1d3a0cb745bf..d686bc4e03f0 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_interface_binders.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/chrome_browser_interface_binders.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/browser/chrome_browser_interface_binders.cc -@@ -97,7 +97,7 @@ +@@ -96,13 +96,13 @@ #endif // BUILDFLAG(FULL_SAFE_BROWSING) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,14 @@ #include "chrome/browser/ui/webui/connectors_internals/connectors_internals.mojom.h" #include "chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.h" #endif -@@ -165,7 +165,7 @@ + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + #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 +@@ -172,7 +172,7 @@ #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -18,7 +25,7 @@ #include "chrome/browser/ui/webui/discards/discards.mojom.h" #include "chrome/browser/ui/webui/discards/discards_ui.h" #include "chrome/browser/ui/webui/discards/site_data.mojom.h" -@@ -658,7 +658,7 @@ void PopulateChromeFrameBinders( +@@ -665,7 +665,7 @@ void PopulateChromeFrameBinders( #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -27,7 +34,7 @@ if (!render_frame_host->GetParent()) { map->Add<chrome::mojom::DraggableRegions>( base::BindRepeating(&DraggableRegionsHostImpl::CreateIfAllowed)); -@@ -666,7 +666,7 @@ void PopulateChromeFrameBinders( +@@ -673,7 +673,7 @@ void PopulateChromeFrameBinders( #endif #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -36,7 +43,7 @@ if (base::FeatureList::IsEnabled(blink::features::kDesktopPWAsSubApps) && !render_frame_host->GetParent()) { map->Add<blink::mojom::SubAppsService>( -@@ -706,7 +706,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -714,14 +714,14 @@ void PopulateChromeWebUIFrameBinders( SegmentationInternalsUI>(map); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -45,7 +52,15 @@ RegisterWebUIControllerInterfaceBinder< connectors_internals::mojom::PageHandler, enterprise_connectors::ConnectorsInternalsUI>(map); -@@ -1013,7 +1013,7 @@ void PopulateChromeWebUIFrameBinders( + #endif + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + RegisterWebUIControllerInterfaceBinder< + app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map); + #endif +@@ -1040,7 +1040,7 @@ void PopulateChromeWebUIFrameBinders( #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc index ee6b20867dee..829d7ef22170 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_main.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/browser/chrome_browser_main.cc -@@ -228,11 +228,11 @@ +@@ -231,11 +231,11 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -14,7 +14,7 @@ #include "components/crash/core/app/breakpad_linux.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -267,7 +267,7 @@ +@@ -270,7 +270,7 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc index e7e35569e08c..39e734ef53d2 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_content_browser_client.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -373,7 +373,7 @@ +@@ -374,7 +374,7 @@ #include "services/service_manager/public/mojom/interface_provider_spec.mojom.h" #include "storage/browser/file_system/external_mount_points.h" #include "third_party/cros_system_api/switches/chrome_switches.h" @@ -9,7 +9,7 @@ #include "chrome/browser/chrome_browser_main_linux.h" #elif BUILDFLAG(IS_ANDROID) #include "base/android/application_status_listener.h" -@@ -442,17 +442,17 @@ +@@ -444,17 +444,17 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -30,7 +30,13 @@ #if !BUILDFLAG(IS_ANDROID) #include "base/debug/leak_annotations.h" #include "components/crash/core/app/breakpad_linux.h" -@@ -461,7 +461,7 @@ +@@ -462,12 +462,12 @@ + #include "components/crash/content/browser/crash_handler_host_linux.h" + #endif + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + #include "chrome/browser/ui/webui/app_settings/web_app_settings_navigation_throttle.h" #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -39,7 +45,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) -@@ -483,11 +483,11 @@ +@@ -489,11 +489,11 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -53,7 +59,7 @@ #include "chrome/browser/chrome_browser_main_extra_parts_linux.h" #elif defined(USE_OZONE) #include "chrome/browser/chrome_browser_main_extra_parts_ozone.h" -@@ -870,7 +870,7 @@ blink::mojom::AutoplayPolicy GetAutoplayPolicyForWebCo +@@ -880,7 +880,7 @@ blink::mojom::AutoplayPolicy GetAutoplayPolicyForWebCo int GetCrashSignalFD(const base::CommandLine& command_line) { return crashpad::CrashHandlerHost::Get()->GetDeathSignalSocket(); } @@ -62,7 +68,7 @@ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost( const std::string& process_type) { base::FilePath dumps_path; -@@ -1370,7 +1370,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( +@@ -1376,7 +1376,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( #elif BUILDFLAG(IS_CHROMEOS_LACROS) main_parts = std::make_unique<ChromeBrowserMainPartsLacros>( std::move(parameters), &startup_data_); @@ -71,7 +77,7 @@ main_parts = std::make_unique<ChromeBrowserMainPartsLinux>( std::move(parameters), &startup_data_); #elif BUILDFLAG(IS_ANDROID) -@@ -1404,7 +1404,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( +@@ -1410,7 +1410,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( std::make_unique<ChromeBrowserMainExtraPartsViewsLacros>()); // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -80,7 +86,7 @@ main_parts->AddParts( std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>()); #else -@@ -1421,7 +1421,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( +@@ -1427,7 +1427,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLacros>()); #endif @@ -89,7 +95,16 @@ main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>()); #elif defined(USE_OZONE) main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>()); -@@ -2161,6 +2161,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2101,7 +2101,7 @@ bool ChromeContentBrowserClient::AreDirectSocketsAllow + Profile* profile = Profile::FromBrowserContext(context); + return profile && profile->GetPrefs()->GetBoolean( + policy::policy_prefs::kEnableDirectSockets); +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // There are currently no reliable way to determine managed status on Linux. + return false; + #elif BUILDFLAG(IS_MAC) +@@ -2190,6 +2190,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin #elif BUILDFLAG(IS_POSIX) #if BUILDFLAG(IS_ANDROID) bool enable_crash_reporter = true; @@ -98,7 +113,7 @@ #else bool enable_crash_reporter = false; if (crash_reporter::IsCrashpadEnabled()) { -@@ -2474,7 +2476,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2498,7 +2500,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin ThreadProfilerConfiguration::Get()->AppendCommandLineSwitchForChildProcess( command_line); @@ -107,7 +122,7 @@ // Processes may only query perf_event_open with the BPF sandbox disabled. if (browser_command_line.HasSwitch(switches::kEnableThreadInstructionCount) && command_line->HasSwitch(sandbox::policy::switches::kNoSandbox)) { -@@ -3846,7 +3848,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst +@@ -3880,7 +3882,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst } } @@ -116,16 +131,24 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -4258,7 +4260,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -4292,14 +4294,14 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati + &throttles); } +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + MaybeAddThrottle( + WebAppSettingsNavigationThrottle::MaybeCreateThrottleFor(handle), + &throttles); + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ - BUILDFLAG(IS_CHROMEOS_ASH) + BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle:: MaybeCreateThrottleFor(handle), &throttles); -@@ -4291,7 +4293,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -4332,7 +4334,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h index ff16b8c5387c..89820124902a 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h +++ b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_content_browser_client.h.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/chrome_content_browser_client.h.orig 2022-03-25 21:59:56 UTC +++ chrome/browser/chrome_content_browser_client.h -@@ -410,7 +410,7 @@ class ChromeContentBrowserClient : public content::Con +@@ -417,7 +417,7 @@ class ChromeContentBrowserClient : public content::Con void OverridePageVisibilityState( content::RenderFrameHost* render_frame_host, content::PageVisibilityState* visibility_state) override; diff --git a/www/chromium/files/patch-chrome_browser_defaults.cc b/www/chromium/files/patch-chrome_browser_defaults.cc index f7270b716bdd..95e8a8dd3414 100644 --- a/www/chromium/files/patch-chrome_browser_defaults.cc +++ b/www/chromium/files/patch-chrome_browser_defaults.cc @@ -1,11 +1,11 @@ ---- chrome/browser/defaults.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/defaults.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/browser/defaults.cc -@@ -50,7 +50,7 @@ const bool kSyncAutoStarts = false; +@@ -48,7 +48,7 @@ const bool kSyncAutoStarts = true; + const bool kSyncAutoStarts = false; + #endif - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) const bool kScrollEventChangesTab = true; #else const bool kScrollEventChangesTab = false; diff --git a/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc b/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc index e50b9ab03679..61865d43000d 100644 --- a/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc +++ b/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/browser/download/chrome_download_manager_delegate.cc -@@ -1539,7 +1539,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1541,7 +1541,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe target_info->is_filetype_handled_safely) DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true); @@ -9,7 +9,7 @@ if (item->GetOriginalMimeType() == "application/x-x509-user-cert") DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true); #endif -@@ -1608,7 +1608,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1610,7 +1610,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile( const base::FilePath& path) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -18,7 +18,7 @@ if (path.MatchesExtension(FILE_PATH_LITERAL(".pdf"))) { return !download_prefs_->ShouldOpenPdfInSystemReader(); } -@@ -1716,7 +1716,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow +@@ -1718,7 +1718,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) || \ @@ -27,7 +27,7 @@ // Don't download pdf if it is a file URL, as that might cause an infinite // download loop if Chrome is not the system pdf viewer. if (url.SchemeIsFile() && download_prefs_->ShouldOpenPdfInSystemReader()) { -@@ -1758,7 +1758,7 @@ std::unique_ptr<download::DownloadItemRenameHandler> +@@ -1760,7 +1760,7 @@ std::unique_ptr<download::DownloadItemRenameHandler> ChromeDownloadManagerDelegate::GetRenameHandlerForDownload( download::DownloadItem* download_item) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -36,7 +36,7 @@ return enterprise_connectors::FileSystemRenameHandler::CreateIfNeeded( download_item); #else -@@ -1774,7 +1774,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl +@@ -1776,7 +1776,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl DCHECK(download_item->IsSavePackageDownload()); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/chromium/files/patch-chrome_browser_download_download__item__model.cc b/www/chromium/files/patch-chrome_browser_download_download__item__model.cc index de6f03b8595d..d7e0e1b8f2a4 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__item__model.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__item__model.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_item_model.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/download/download_item_model.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/browser/download/download_item_model.cc -@@ -636,7 +636,7 @@ bool DownloadItemModel::IsCommandChecked( +@@ -640,7 +640,7 @@ bool DownloadItemModel::IsCommandChecked( download_crx_util::IsExtensionDownload(*download_); case DownloadCommands::ALWAYS_OPEN_TYPE: #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -9,7 +9,7 @@ if (download_commands->CanOpenPdfInSystemViewer()) { DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile()); return prefs->ShouldOpenPdfInSystemReader(); -@@ -677,7 +677,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand +@@ -681,7 +681,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand DownloadCommands::ALWAYS_OPEN_TYPE); DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile()); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn index c415a0336962..7f9cc0d5ca15 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn +++ b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/BUILD.gn.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/extensions/BUILD.gn.orig 2022-03-25 21:59:56 UTC +++ chrome/browser/extensions/BUILD.gn -@@ -1298,6 +1298,10 @@ static_library("extensions") { +@@ -1299,6 +1299,10 @@ static_library("extensions") { deps += [ "//chrome/services/printing/public/mojom" ] } diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc b/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc index 5e1c8a8a0917..446a4a0e514d 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -181,7 +181,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -182,7 +182,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ (*s_allowlist)[::prefs::kUseCustomChromeFrame] = settings_api::PrefType::PREF_TYPE_BOOLEAN; #endif -@@ -195,7 +195,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -196,7 +196,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist settings_api::PrefType::PREF_TYPE_NUMBER; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc b/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc index ef8769083bb5..ced8d597037c 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/external_provider_impl.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/extensions/external_provider_impl.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/browser/extensions/external_provider_impl.cc -@@ -816,7 +816,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -818,7 +818,7 @@ void ExternalProviderImpl::CreateExternalProviders( if (!profile->GetPrefs()->GetBoolean(pref_names::kBlockExternalExtensions)) { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ provider_list->push_back(std::make_unique<ExternalProviderImpl>( service, base::MakeRefCounted<ExternalPrefLoader>( -@@ -844,7 +844,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -846,7 +846,7 @@ void ExternalProviderImpl::CreateExternalProviders( bundled_extension_creation_flags)); // Define a per-user source of external extensions. diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc index 6338e2b7acaa..7083102383fe 100644 --- a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc +++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc @@ -1,15 +1,15 @@ ---- chrome/browser/flag_descriptions.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/flag_descriptions.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/browser/flag_descriptions.cc -@@ -5323,7 +5323,7 @@ const char kDownloadShelfWebUIDescription[] = +@@ -5508,7 +5508,7 @@ const char kDownloadShelfWebUIDescription[] = // Random platform combinations ----------------------------------------------- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - const char kWebUIBrandingUpdateName[] = "WebUI Branding Update"; - const char kWebUIBrandingUpdateDescription[] = -@@ -5338,7 +5338,7 @@ const char kWebuiFeedbackDescription[] = + const char kWebuiFeedbackName[] = "WebUI Feedback"; + const char kWebuiFeedbackDescription[] = +@@ -5519,7 +5519,7 @@ const char kWebuiFeedbackDescription[] = // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -18,16 +18,7 @@ const char kCommanderName[] = "Commander"; const char kCommanderDescription[] = -@@ -5357,7 +5357,7 @@ const char kDesktopDetailedLanguageSettingsDescription - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || - // BUILDFLAG(IS_FUCHSIA) - --#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - const char kImproveAccessibilityTreeUsingLocalMLName[] = - "Enable improving accessibility tree using local machine learning library."; - const char kImproveAccessibilityTreeUsingLocalMLDescription[] = -@@ -5372,7 +5372,7 @@ const char kWebShareDescription[] = +@@ -5545,7 +5545,7 @@ const char kWebShareDescription[] = "platforms."; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) @@ -36,7 +27,7 @@ const char kOzonePlatformHintChoiceDefault[] = "Default"; const char kOzonePlatformHintChoiceAuto[] = "Auto"; const char kOzonePlatformHintChoiceX11[] = "X11"; -@@ -5384,7 +5384,7 @@ const char kOzonePlatformHintDescription[] = +@@ -5557,7 +5557,7 @@ const char kOzonePlatformHintDescription[] = "\"X11\". \"Auto\" selects Wayland if possible, X11 otherwise. "; #endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) @@ -45,7 +36,16 @@ const char kCleanUndecryptablePasswordsLinuxName[] = "Cleanup local undecryptable passwords during initial sync flow"; const char kCleanUndecryptablePasswordsLinuxDescription[] = -@@ -5500,7 +5500,7 @@ const char kElasticOverscrollDescription[] = +@@ -5570,7 +5570,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail + "storage and requests initial sync."; + #endif // BUILDFLAG(IS_LINUX) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + const char kSkipUndecryptablePasswordsName[] = + "Skip undecryptable passwords to use the available decryptable " + "passwords."; +@@ -5687,7 +5687,7 @@ const char kElasticOverscrollDescription[] = #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.h b/www/chromium/files/patch-chrome_browser_flag__descriptions.h index 0772dee1e296..c97e0e3503a5 100644 --- a/www/chromium/files/patch-chrome_browser_flag__descriptions.h +++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.h @@ -1,15 +1,15 @@ ---- chrome/browser/flag_descriptions.h.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/flag_descriptions.h.orig 2022-03-25 21:59:56 UTC +++ chrome/browser/flag_descriptions.h -@@ -3070,7 +3070,7 @@ extern const char kDownloadShelfWebUIDescription[]; +@@ -3178,7 +3178,7 @@ extern const char kDownloadShelfWebUIDescription[]; // Random platform combinations ----------------------------------------------- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - extern const char kWebUIBrandingUpdateName[]; - extern const char kWebUIBrandingUpdateDescription[]; -@@ -3082,7 +3082,7 @@ extern const char kWebuiFeedbackDescription[]; + extern const char kWebuiFeedbackName[]; + extern const char kWebuiFeedbackDescription[]; +@@ -3187,7 +3187,7 @@ extern const char kWebuiFeedbackDescription[]; // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -18,16 +18,7 @@ extern const char kCommanderName[]; extern const char kCommanderDescription[]; -@@ -3096,7 +3096,7 @@ extern const char kDesktopDetailedLanguageSettingsDesc - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || - // defined (OS_FUCHSIA) - --#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - - extern const char kImproveAccessibilityTreeUsingLocalMLName[]; - extern const char kImproveAccessibilityTreeUsingLocalMLDescription[]; -@@ -3107,7 +3107,7 @@ extern const char kWebShareName[]; +@@ -3206,7 +3206,7 @@ extern const char kWebShareName[]; extern const char kWebShareDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) @@ -36,7 +27,16 @@ extern const char kOzonePlatformHintChoiceDefault[]; extern const char kOzonePlatformHintChoiceAuto[]; extern const char kOzonePlatformHintChoiceX11[]; -@@ -3197,7 +3197,7 @@ extern const char kElasticOverscrollDescription[]; +@@ -3222,7 +3222,7 @@ extern const char kForcePasswordInitialSyncWhenDecrypt + extern const char kForcePasswordInitialSyncWhenDecryptionFailsDescription[]; + #endif // BUILDFLAG(IS_LINUX) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + extern const char kSkipUndecryptablePasswordsName[]; + extern const char kSkipUndecryptablePasswordsDescription[]; + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) +@@ -3304,7 +3304,7 @@ extern const char kElasticOverscrollDescription[]; #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ diff --git a/www/chromium/files/patch-chrome_browser_headless_headless__mode__util.cc b/www/chromium/files/patch-chrome_browser_headless_headless__mode__util.cc index dd8f461c2568..5cc3b96d020b 100644 --- a/www/chromium/files/patch-chrome_browser_headless_headless__mode__util.cc +++ b/www/chromium/files/patch-chrome_browser_headless_headless__mode__util.cc @@ -1,11 +1,11 @@ ---- chrome/browser/headless/headless_mode_util.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/headless/headless_mode_util.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/browser/headless/headless_mode_util.cc @@ -9,7 +9,7 @@ - // Native headless is currently available only on Linux and Windows platforms. + // Native headless is currently available on Linux, Windows and Mac platforms. // More platforms will be added later, so avoid function level clutter by // providing stub implementations at the end of the file. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) #include <cstdlib> #include <vector> diff --git a/www/chromium/files/patch-chrome_browser_media_router_discovery_BUILD.gn b/www/chromium/files/patch-chrome_browser_media_router_discovery_BUILD.gn index 2d1225b3ad1a..174848de2493 100644 --- a/www/chromium/files/patch-chrome_browser_media_router_discovery_BUILD.gn +++ b/www/chromium/files/patch-chrome_browser_media_router_discovery_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/browser/media/router/discovery/BUILD.gn.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/media/router/discovery/BUILD.gn.orig 2022-03-25 21:59:56 UTC +++ chrome/browser/media/router/discovery/BUILD.gn -@@ -93,7 +93,7 @@ static_library("discovery") { +@@ -94,7 +94,7 @@ static_library("discovery") { "media_sink_discovery_metrics.h", ] diff --git a/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc b/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc index e1174816f336..7e2720742be7 100644 --- a/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc +++ b/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc @@ -1,6 +1,6 @@ ---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc -@@ -58,8 +58,10 @@ +@@ -57,8 +57,10 @@ // TODO(crbug.com/1052397): 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" -@@ -224,7 +226,7 @@ void RecordStartupMetrics() { +@@ -223,7 +225,7 @@ void RecordStartupMetrics() { // Record whether Chrome is the default browser or not. // Disabled on Linux due to hanging browser tests, see crbug.com/1216328. diff --git a/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc b/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc index ec09b0349062..5fba581ad52d 100644 --- a/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc +++ b/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/browser/metrics/chrome_metrics_service_client.cc -@@ -752,7 +752,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -773,7 +773,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) metrics_service_->RegisterMetricsProvider( std::make_unique<DesktopPlatformFeaturesMetricsProvider>()); -@@ -848,7 +848,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -869,7 +869,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic std::make_unique<PowerMetricsProvider>()); #endif @@ -18,7 +18,7 @@ metrics_service_->RegisterMetricsProvider( metrics::CreateDesktopSessionMetricsProvider()); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) -@@ -1024,7 +1024,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve +@@ -1045,7 +1045,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc index 58b38715d304..1a0c089e782a 100644 --- a/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc +++ b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc @@ -1,4 +1,4 @@ ---- chrome/browser/net/system_network_context_manager.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/net/system_network_context_manager.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/browser/net/system_network_context_manager.cc @@ -84,7 +84,7 @@ @@ -9,7 +9,7 @@ #include "chrome/common/chrome_paths_internal.h" #include "chrome/grit/chromium_strings.h" #include "ui/base/l10n/l10n_util.h" -@@ -137,7 +137,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut +@@ -144,7 +144,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut auth_dynamic_params->basic_over_http_enabled = local_state->GetBoolean(prefs::kBasicAuthOverHttpEnabled); @@ -18,8 +18,8 @@ auth_dynamic_params->delegate_by_kdc_policy = local_state->GetBoolean(prefs::kAuthNegotiateDelegateByKdcPolicy); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -369,7 +369,7 @@ SystemNetworkContextManager::SystemNetworkContextManag - pref_change_registrar_.Add(prefs::kBasicAuthOverHttpEnabled, +@@ -377,7 +377,7 @@ SystemNetworkContextManager::SystemNetworkContextManag + pref_change_registrar_.Add(prefs::kAllHttpAuthSchemesAllowedForOrigins, auth_pref_callback); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) @@ -27,7 +27,7 @@ pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy, auth_pref_callback); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -427,7 +427,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -437,7 +437,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe registry->RegisterStringPref(prefs::kAuthServerAllowlist, std::string()); registry->RegisterStringPref(prefs::kAuthNegotiateDelegateAllowlist, std::string()); diff --git a/www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc b/www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc index d57ebf908539..7c7584a02130 100644 --- a/www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc +++ b/www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/notifications/notification_display_service_impl.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/notifications/notification_display_service_impl.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/browser/notifications/notification_display_service_impl.cc -@@ -31,7 +31,7 @@ +@@ -32,7 +32,7 @@ #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -9,7 +9,7 @@ #include "chrome/browser/send_tab_to_self/desktop_notification_handler.h" #include "chrome/browser/sharing/sharing_notification_handler.h" #endif -@@ -64,7 +64,7 @@ NotificationDisplayServiceImpl* NotificationDisplaySer +@@ -65,7 +65,7 @@ NotificationDisplayServiceImpl* NotificationDisplaySer // static void NotificationDisplayServiceImpl::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { @@ -18,7 +18,7 @@ registry->RegisterBooleanPref(prefs::kAllowNativeNotifications, true); registry->RegisterBooleanPref(prefs::kAllowSystemNotifications, true); #endif -@@ -81,7 +81,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer +@@ -82,7 +82,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer std::make_unique<PersistentNotificationHandler>()); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -27,7 +27,7 @@ AddNotificationHandler( NotificationHandler::Type::SEND_TAB_TO_SELF, std::make_unique<send_tab_to_self::DesktopNotificationHandler>( -@@ -89,7 +89,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer +@@ -90,7 +90,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__recorder__util.cc b/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__recorder__util.cc index a70e5774afa5..66e4c89e08ee 100644 --- a/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__recorder__util.cc +++ b/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__recorder__util.cc @@ -1,6 +1,6 @@ ---- chrome/browser/performance_monitor/process_metrics_recorder_util.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/performance_monitor/process_metrics_recorder_util.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/browser/performance_monitor/process_metrics_recorder_util.cc -@@ -42,7 +42,7 @@ void RecordProcessHistograms(const char* histogram_suf +@@ -39,7 +39,7 @@ void RecordProcessHistograms(const char* histogram_suf metrics.cpu_usage * kCPUUsageFactor, kCPUUsageHistogramMin, kCPUUsageHistogramMax, kCPUUsageHistogramBucketCount); #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/chromium/files/patch-chrome_browser_performance__monitor_process__monitor.h b/www/chromium/files/patch-chrome_browser_performance__monitor_process__monitor.h index d3867265beed..026781f76c1e 100644 --- a/www/chromium/files/patch-chrome_browser_performance__monitor_process__monitor.h +++ b/www/chromium/files/patch-chrome_browser_performance__monitor_process__monitor.h @@ -1,6 +1,6 @@ ---- chrome/browser/performance_monitor/process_monitor.h.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/performance_monitor/process_monitor.h.orig 2022-03-25 21:59:56 UTC +++ chrome/browser/performance_monitor/process_monitor.h -@@ -56,7 +56,7 @@ class ProcessMonitor { +@@ -52,7 +52,7 @@ class ProcessMonitor { double cpu_usage = 0.0; #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc b/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc index 17638cef1e0f..4866861223c6 100644 --- a/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc +++ b/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -1443,7 +1443,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1456,7 +1456,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_CHROMEOS) @@ -9,7 +9,7 @@ { key::kAuthNegotiateDelegateByKdcPolicy, prefs::kAuthNegotiateDelegateByKdcPolicy, base::Value::Type::BOOLEAN }, -@@ -1552,7 +1552,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1565,7 +1565,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -18,7 +18,7 @@ { key::kChromeAppsEnabled, extensions::pref_names::kChromeAppsEnabled, base::Value::Type::BOOLEAN }, -@@ -1848,7 +1848,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -1885,7 +1885,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -27,7 +27,7 @@ handlers->AddHandler( std::make_unique< enterprise_connectors::EnterpriseConnectorsPolicyHandler>( -@@ -2213,7 +2213,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2256,7 +2256,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH SimpleSchemaValidatingPolicyHandler::MANDATORY_ALLOWED)); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -36,7 +36,7 @@ handlers->AddHandler(std::make_unique<SimpleSchemaValidatingPolicyHandler>( key::kWebAppSettings, prefs::kWebAppSettings, chrome_schema, SCHEMA_ALLOW_UNKNOWN, -@@ -2244,7 +2244,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2287,7 +2287,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH policy::key::kSpellcheckLanguageBlocklist)); #endif // BUILDFLAG(ENABLE_SPELLCHECK) diff --git a/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc b/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc index 765d014c725f..93107a4cd271 100644 --- a/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc +++ b/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc @@ -1,4 +1,4 @@ ---- chrome/browser/prefs/browser_prefs.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/prefs/browser_prefs.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/browser/prefs/browser_prefs.cc @@ -418,14 +418,14 @@ #include "components/os_crypt/os_crypt.h" @@ -17,7 +17,7 @@ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" #endif -@@ -1133,7 +1133,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) +@@ -1139,7 +1139,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) // TODO(crbug/1169547) Remove `BUILDFLAG(IS_CHROMEOS_LACROS)` once the // migration is complete. #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -26,7 +26,7 @@ enterprise_connectors::RegisterLocalPrefs(registry); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -@@ -1165,7 +1165,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) +@@ -1171,7 +1171,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) #endif // BUILDFLAG(IS_WIN) @@ -35,7 +35,7 @@ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) web_app::url_handler_prefs::RegisterLocalStatePrefs(registry); #endif -@@ -1462,7 +1462,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync +@@ -1469,7 +1469,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc b/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc index 66ce87c56787..dcd99fc83110 100644 --- a/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc +++ b/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc @@ -1,6 +1,6 @@ ---- chrome/browser/process_singleton_posix.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/process_singleton_posix.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/browser/process_singleton_posix.cc -@@ -97,12 +97,12 @@ +@@ -98,12 +98,12 @@ #include "net/base/network_interfaces.h" #include "ui/base/l10n/l10n_util.h" @@ -15,7 +15,7 @@ #include "ui/views/linux_ui/linux_ui.h" #endif -@@ -356,7 +356,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo +@@ -357,7 +357,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo if (g_disable_prompt) return g_user_opted_unlock_in_use_profile; @@ -24,7 +24,7 @@ std::u16string relaunch_button_text = l10n_util::GetStringUTF16(IDS_PROFILE_IN_USE_LINUX_RELAUNCH); return ShowProcessSingletonDialog(error, relaunch_button_text); -@@ -935,7 +935,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::Notif +@@ -926,7 +926,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::Notif return PROCESS_NONE; } else if (strncmp(buf, kACKToken, base::size(kACKToken) - 1) == 0) { #if defined(TOOLKIT_VIEWS) && \ diff --git a/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc b/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc index 83a59c11089e..16e823150f14 100644 --- a/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc +++ b/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc @@ -1,6 +1,6 @@ ---- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -385,7 +385,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -393,7 +393,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc b/www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc index fad03295c3f7..1a9c1a209dd0 100644 --- a/www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc +++ b/www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/profiles/profile_impl.cc.orig 2022-03-20 09:08:36 UTC +--- chrome/browser/profiles/profile_impl.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/browser/profiles/profile_impl.cc -@@ -264,6 +264,10 @@ +@@ -263,6 +263,10 @@ #include "chrome/browser/spellchecker/spellcheck_service.h" #endif @@ -11,7 +11,7 @@ using bookmarks::BookmarkModel; using content::BrowserThread; using content::DownloadManagerDelegate; -@@ -850,7 +854,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) +@@ -854,7 +858,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) } base::FilePath ProfileImpl::last_selected_directory() { diff --git a/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc b/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc index b85855ca3911..4e1a5b590127 100644 --- a/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc +++ b/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc @@ -1,7 +1,7 @@ ---- chrome/browser/renderer_preferences_util.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/renderer_preferences_util.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/browser/renderer_preferences_util.cc -@@ -41,7 +41,7 @@ - #include "ui/base/cocoa/defaults_utils.h" +@@ -37,7 +37,7 @@ + #include "ui/views/controls/textfield/textfield.h" #endif -#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) @@ -9,8 +9,8 @@ #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" #include "ui/views/linux_ui/linux_ui.h" -@@ -169,7 +169,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc - prefs->caret_blink_interval = interval; +@@ -159,7 +159,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc + prefs->caret_blink_interval = views::Textfield::GetCaretBlinkInterval(); #endif -#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) @@ -18,7 +18,7 @@ views::LinuxUI* linux_ui = views::LinuxUI::instance(); if (linux_ui) { if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) { -@@ -189,7 +189,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc +@@ -179,7 +179,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ diff --git a/www/chromium/files/patch-chrome_browser_resources_new__tab__page_new__tab__page.js b/www/chromium/files/patch-chrome_browser_resources_new__tab__page_new__tab__page.js deleted file mode 100644 index e82d989ae51f..000000000000 --- a/www/chromium/files/patch-chrome_browser_resources_new__tab__page_new__tab__page.js +++ /dev/null @@ -1,13 +0,0 @@ ---- chrome/browser/resources/new_tab_page/new_tab_page.js.orig 2022-02-28 16:54:41 UTC -+++ chrome/browser/resources/new_tab_page/new_tab_page.js -@@ -21,10 +21,6 @@ export {chromeCartDescriptor as chromeCartV2Descriptor - export {DriveProxy} from './modules/drive/drive_module_proxy.js'; - export {driveDescriptor} from './modules/drive/module.js'; - export {driveDescriptor as driveV2Descriptor} from './modules/drive_v2/module.js'; --// <if expr="not is_official_build"> --export {FooProxy} from './modules/dummy_v2/foo_proxy.js'; --export {dummyV2Descriptor} from './modules/dummy_v2/module.js'; --// </if> - export {InfoDialogElement} from './modules/info_dialog.js'; - export {InitializeModuleCallback, Module, ModuleDescriptor, ModuleDescriptorV2, ModuleHeight} from './modules/module_descriptor.js'; - export {ModuleHeaderElement} from './modules/module_header.js'; diff --git a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.ts b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.ts index e928508bc496..39444d6681b1 100644 --- a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.ts +++ b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.ts @@ -1,6 +1,6 @@ ---- chrome/browser/resources/settings/appearance_page/appearance_page.ts.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/resources/settings/appearance_page/appearance_page.ts.orig 2022-03-25 21:59:56 UTC +++ chrome/browser/resources/settings/appearance_page/appearance_page.ts -@@ -145,7 +145,7 @@ export class SettingsAppearancePageElement extends +@@ -146,7 +146,7 @@ export class SettingsAppearancePageElement extends 'prefs.autogenerated.theme.policy.color.controlledBy)', }, @@ -9,7 +9,7 @@ /** * Whether to show the "Custom Chrome Frame" setting. */ -@@ -167,7 +167,7 @@ export class SettingsAppearancePageElement extends +@@ -168,7 +168,7 @@ export class SettingsAppearancePageElement extends 'themeChanged_(' + 'prefs.extensions.theme.id.value, useSystemTheme_, isForcedTheme_)', @@ -18,7 +18,7 @@ // NOTE: this pref only exists on Linux. 'useSystemThemePrefChanged_(prefs.extensions.theme.use_system.value)', // </if> -@@ -186,7 +186,7 @@ export class SettingsAppearancePageElement extends +@@ -187,7 +187,7 @@ export class SettingsAppearancePageElement extends private showReaderModeOption_: boolean; private isForcedTheme_: boolean; @@ -27,7 +27,7 @@ private showCustomChromeFrame_: boolean; // </if> -@@ -264,7 +264,7 @@ export class SettingsAppearancePageElement extends +@@ -265,7 +265,7 @@ export class SettingsAppearancePageElement extends this.appearanceBrowserProxy_.useDefaultTheme(); } @@ -36,7 +36,7 @@ private useSystemThemePrefChanged_(useSystemTheme: boolean) { this.useSystemTheme_ = useSystemTheme; } -@@ -325,10 +325,10 @@ export class SettingsAppearancePageElement extends +@@ -326,10 +326,10 @@ export class SettingsAppearancePageElement extends } let i18nId; diff --git a/www/chromium/files/patch-chrome_browser_resources_settings_route.ts b/www/chromium/files/patch-chrome_browser_resources_settings_route.ts index 239ee4522709..65eeddfba783 100644 --- a/www/chromium/files/patch-chrome_browser_resources_settings_route.ts +++ b/www/chromium/files/patch-chrome_browser_resources_settings_route.ts @@ -1,6 +1,6 @@ ---- chrome/browser/resources/settings/route.ts.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/resources/settings/route.ts.orig 2022-03-25 21:59:56 UTC +++ chrome/browser/resources/settings/route.ts -@@ -179,7 +179,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes +@@ -185,7 +185,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes r.ACCESSIBILITY = r.ADVANCED.createSection('/accessibility', 'a11y'); diff --git a/www/chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.cc b/www/chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.cc index 2fa19a4b6262..6d6d4fe52a48 100644 --- a/www/chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.cc +++ b/www/chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.cc @@ -1,15 +1,15 @@ ---- chrome/browser/safe_browsing/download_protection/file_analyzer.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/safe_browsing/download_protection/file_analyzer.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/browser/safe_browsing/download_protection/file_analyzer.cc -@@ -20,7 +20,7 @@ - #include "components/safe_browsing/core/common/features.h" +@@ -21,7 +21,7 @@ #include "content/public/browser/browser_thread.h" + #include "url/gurl.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) | BUILDFLAG(IS_BSD) #include "chrome/browser/safe_browsing/download_protection/document_analysis_service.h" #endif -@@ -101,7 +101,7 @@ void FileAnalyzer::Start(const base::FilePath& target_ +@@ -102,7 +102,7 @@ void FileAnalyzer::Start(const base::FilePath& target_ } else if (inspection_type == DownloadFileType::DMG) { StartExtractDmgFeatures(); #endif @@ -18,7 +18,7 @@ } else if (base::FeatureList::IsEnabled( safe_browsing::kClientSideDetectionDocumentScanning) && inspection_type == DownloadFileType::OFFICE_DOCUMENT) { -@@ -285,7 +285,7 @@ void FileAnalyzer::OnDmgAnalysisFinished( +@@ -286,7 +286,7 @@ void FileAnalyzer::OnDmgAnalysisFinished( } #endif // BUILDFLAG(IS_MAC) diff --git a/www/chromium/files/patch-chrome_browser_signin_signin__util.cc b/www/chromium/files/patch-chrome_browser_signin_signin__util.cc index 7498200c5c59..155a3866bc82 100644 --- a/www/chromium/files/patch-chrome_browser_signin_signin__util.cc +++ b/www/chromium/files/patch-chrome_browser_signin_signin__util.cc @@ -1,6 +1,6 @@ ---- chrome/browser/signin/signin_util.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/signin/signin_util.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/browser/signin/signin_util.cc -@@ -41,7 +41,7 @@ +@@ -39,7 +39,7 @@ #include "ui/base/l10n/l10n_util.h" #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc b/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc index e2c334970d8b..67f14188e656 100644 --- a/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc +++ b/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/sync/chrome_sync_client.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/sync/chrome_sync_client.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/browser/sync/chrome_sync_client.cc -@@ -420,7 +420,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy +@@ -412,7 +412,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/chromium/files/patch-chrome_browser_themes_theme__helper.cc b/www/chromium/files/patch-chrome_browser_themes_theme__helper.cc index d54f4fe80196..9c460e043f12 100644 --- a/www/chromium/files/patch-chrome_browser_themes_theme__helper.cc +++ b/www/chromium/files/patch-chrome_browser_themes_theme__helper.cc @@ -1,6 +1,6 @@ ---- chrome/browser/themes/theme_helper.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/themes/theme_helper.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/browser/themes/theme_helper.cc -@@ -334,7 +334,7 @@ bool ThemeHelper::ShouldUseIncreasedContrastThemeSuppl +@@ -297,7 +297,7 @@ bool ThemeHelper::ShouldUseIncreasedContrastThemeSuppl ui::NativeTheme* native_theme) const { // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc b/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc index c7a539c74fcd..4af07b967491 100644 --- a/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc +++ b/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/browser_command_controller.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/ui/browser_command_controller.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/browser/ui/browser_command_controller.cc @@ -88,7 +88,7 @@ @@ -9,7 +9,7 @@ #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" #endif -@@ -274,7 +274,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( +@@ -277,7 +277,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -18,7 +18,7 @@ // If this key was registered by the user as a content editing hotkey, then // it is not reserved. ui::TextEditKeyBindingsDelegateAuraLinux* delegate = -@@ -510,7 +510,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -513,7 +513,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -27,7 +27,7 @@ case IDC_MINIMIZE_WINDOW: browser_->window()->Minimize(); break; -@@ -1026,7 +1026,7 @@ void BrowserCommandController::InitCommandState() { +@@ -1040,7 +1040,7 @@ void BrowserCommandController::InitCommandState() { #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc b/www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc new file mode 100644 index 000000000000..00681b177e21 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc @@ -0,0 +1,11 @@ +--- chrome/browser/ui/chrome_pages.cc.orig 2022-03-25 21:59:56 UTC ++++ chrome/browser/ui/chrome_pages.cc +@@ -550,7 +550,7 @@ void ShowBrowserSigninOrSettings(Browser* browser, + #endif + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + void ShowWebAppSettings(Browser* browser, + const std::string& app_id, + web_app::AppSettingsPageEntryPoint entry_point) { diff --git a/www/chromium/files/patch-chrome_browser_ui_chrome__pages.h b/www/chromium/files/patch-chrome_browser_ui_chrome__pages.h new file mode 100644 index 000000000000..e6adadd0d937 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_chrome__pages.h @@ -0,0 +1,20 @@ +--- chrome/browser/ui/chrome_pages.h.orig 2022-03-25 21:59:56 UTC ++++ chrome/browser/ui/chrome_pages.h +@@ -26,7 +26,7 @@ + #endif + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + #include "chrome/browser/web_applications/web_app_utils.h" + #endif + +@@ -201,7 +201,7 @@ void ShowBrowserSigninOrSettings(Browser* browser, + #endif + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + // Show chrome://app-settings/<app-id> page. + void ShowWebAppSettings(Browser* browser, + const std::string& app_id, diff --git a/www/chromium/files/patch-chrome_browser_ui_color_native__chrome__color__mixer.cc b/www/chromium/files/patch-chrome_browser_ui_color_native__chrome__color__mixer.cc new file mode 100644 index 000000000000..05d1cac6218b --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_color_native__chrome__color__mixer.cc @@ -0,0 +1,11 @@ +--- chrome/browser/ui/color/native_chrome_color_mixer.cc.orig 2022-03-25 21:59:56 UTC ++++ chrome/browser/ui/color/native_chrome_color_mixer.cc +@@ -6,7 +6,7 @@ + + #include "build/build_config.h" + +-#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_WIN) ++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_BSD) + void AddNativeChromeColorMixer(ui::ColorProvider* provider, + const ui::ColorProviderManager::Key& key) {} + #endif diff --git a/www/chromium/files/patch-chrome_browser_ui_signin__view__controller.cc b/www/chromium/files/patch-chrome_browser_ui_signin__view__controller.cc index ee0af9eba9ff..b8873227ec81 100644 --- a/www/chromium/files/patch-chrome_browser_ui_signin__view__controller.cc +++ b/www/chromium/files/patch-chrome_browser_ui_signin__view__controller.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/signin_view_controller.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/ui/signin_view_controller.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/browser/ui/signin_view_controller.cc -@@ -253,7 +253,7 @@ void SigninViewController::ShowModalEnterpriseConfirma +@@ -259,7 +259,7 @@ void SigninViewController::ShowModalEnterpriseConfirma SkColor profile_color, base::OnceCallback<void(bool)> callback) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-chrome_browser_ui_signin_dice__web__signin__interceptor__delegate.cc b/www/chromium/files/patch-chrome_browser_ui_signin_dice__web__signin__interceptor__delegate.cc deleted file mode 100644 index 8b528e8d6035..000000000000 --- a/www/chromium/files/patch-chrome_browser_ui_signin_dice__web__signin__interceptor__delegate.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/ui/signin/dice_web_signin_interceptor_delegate.cc.orig 2022-02-28 16:54:41 UTC -+++ chrome/browser/ui/signin/dice_web_signin_interceptor_delegate.cc -@@ -66,7 +66,7 @@ class ForcedEnterpriseSigninInterceptionHandle - void ShowEnterpriseProfileInterceptionDialog(const AccountInfo& account_info, - SkColor profile_color) { - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS_LACROS) -+ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) - if (base::FeatureList::IsEnabled(kAccountPoliciesLoadedWithoutSync)) { - browser_->signin_view_controller()->ShowModalEnterpriseConfirmationDialog( - account_info, profile_color, diff --git a/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc index 2ab25d68304d..3e4464ffd50b 100644 --- a/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc +++ b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/browser/ui/startup/startup_browser_creator.cc -@@ -124,12 +124,12 @@ +@@ -126,12 +126,12 @@ #endif // BUILDFLAG(ENABLE_PRINT_PREVIEW) #endif // BUILDFLAG(IS_WIN) @@ -15,7 +15,7 @@ #include "chrome/browser/ui/startup/web_app_info_recorder_utils.h" #endif -@@ -414,7 +414,7 @@ bool MaybeLaunchAppShortcutWindow(const base::CommandL +@@ -518,7 +518,7 @@ bool MaybeLaunchAppShortcutWindow(const base::CommandL return false; } @@ -24,7 +24,7 @@ bool MaybeLaunchUrlHandlerWebAppFromCmd( const base::CommandLine& command_line, const base::FilePath& cur_dir, -@@ -908,7 +908,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -989,7 +989,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( silent_launch = true; } @@ -33,16 +33,16 @@ // Writes open and installed web apps to the specified file without // launching a new browser window or tab. if (base::FeatureList::IsEnabled(features::kListWebAppsSwitch) && -@@ -1057,7 +1057,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( - - if (command_line.HasSwitch(switches::kAppId)) { +@@ -1181,7 +1181,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); -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // If Chrome Apps are deprecated and |app_id| is a Chrome App, display the // deprecation UI instead of launching the app. if (apps::OpenDeprecatedApplicationPrompt(privacy_safe_profile, app_id)) -@@ -1094,7 +1094,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -1220,7 +1220,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( web_app::startup::MaybeHandleWebAppLaunch( command_line, cur_dir, privacy_safe_profile, is_first_run); diff --git a/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc index cbc3b83a1620..2fbc462f0e52 100644 --- a/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc +++ b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/tab_helpers.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/ui/tab_helpers.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/browser/ui/tab_helpers.cc -@@ -178,7 +178,7 @@ +@@ -179,7 +179,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" -@@ -495,13 +495,13 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con +@@ -500,13 +500,13 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -25,12 +25,12 @@ if (base::FeatureList::IsEnabled( features::kHappinessTrackingSurveysForDesktopDemo) || base::FeatureList::IsEnabled(features::kTrustSafetySentimentSurvey) || -@@ -512,7 +512,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con +@@ -517,7 +517,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - if (Browser* browser = chrome::FindBrowserWithProfile(profile)) { - SharedHighlightingPromo::CreateForWebContents(web_contents, browser); - } + SharedHighlightingPromo::CreateForWebContents(web_contents); + #endif + diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__desktop__window__tree__host__linux.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__desktop__window__tree__host__linux.cc index ac49ba40e61b..a9b4237c6880 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__desktop__window__tree__host__linux.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__desktop__window__tree__host__linux.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/browser_desktop_window_tree_host_linux.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/ui/views/frame/browser_desktop_window_tree_host_linux.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/browser/ui/views/frame/browser_desktop_window_tree_host_linux.cc -@@ -146,7 +146,7 @@ bool BrowserDesktopWindowTreeHostLinux::SupportsClient +@@ -150,7 +150,7 @@ bool BrowserDesktopWindowTreeHostLinux::SupportsClient } void BrowserDesktopWindowTreeHostLinux::UpdateFrameHints() { diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc index 09d242c51b33..2028f88f4f13 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/browser_frame.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/ui/views/frame/browser_frame.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/browser/ui/views/frame/browser_frame.cc -@@ -48,11 +48,11 @@ +@@ -49,11 +49,11 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -14,7 +14,7 @@ #include "ui/views/linux_ui/linux_ui.h" #endif -@@ -61,7 +61,7 @@ namespace { +@@ -62,7 +62,7 @@ namespace { bool IsUsingGtkTheme(Profile* profile) { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -23,7 +23,7 @@ return ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme(); #else return false; -@@ -263,7 +263,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() { +@@ -268,7 +268,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() { IsVisibleOnAllWorkspaces()); // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -32,8 +32,8 @@ // 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() -@@ -386,7 +386,7 @@ void BrowserFrame::SelectNativeTheme() { - } +@@ -381,7 +381,7 @@ void BrowserFrame::SelectNativeTheme() { + return; } -#if BUILDFLAG(IS_LINUX) @@ -41,7 +41,7 @@ const views::LinuxUI* linux_ui = views::LinuxUI::instance(); // Ignore GTK+ for web apps with window-controls-overlay as the // display_override so the web contents can blend with the overlay by using -@@ -405,7 +405,7 @@ bool BrowserFrame::RegenerateFrameOnThemeChange( +@@ -400,7 +400,7 @@ bool BrowserFrame::RegenerateFrameOnThemeChange( bool need_regenerate = false; // TODO(crbug.com/1052397): Revisit the macro expression once build flag // switch of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc index df9a5321a462..91d32afee5d1 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/browser_view.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/ui/views/frame/browser_view.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/browser/ui/views/frame/browser_view.cc -@@ -1750,7 +1750,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra +@@ -1825,7 +1825,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra // CrOS cleanup is done. // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc b/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc index d24d754243c8..c0e369a2dd4b 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/browser/ui/views/profiles/profile_menu_view_base.cc -@@ -612,7 +612,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo( +@@ -611,7 +611,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo( // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc b/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc index addcc9063f22..81ac51b1a358 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc -@@ -117,7 +117,7 @@ SigninViewControllerDelegateViews::CreateProfileCustom +@@ -137,7 +137,7 @@ SigninViewControllerDelegateViews::CreateProfileCustom #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ // static std::unique_ptr<views::WebView> SigninViewControllerDelegateViews::CreateEnterpriseConfirmationWebView( -@@ -392,7 +392,7 @@ SigninViewControllerDelegate::CreateProfileCustomizati +@@ -413,7 +413,7 @@ SigninViewControllerDelegate::CreateProfileCustomizati #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc index 801819e17c4e..f80771e5ce24 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/tabs/tab.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/ui/views/tabs/tab.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/browser/ui/views/tabs/tab.cc -@@ -576,7 +576,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& +@@ -580,7 +580,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& if (mouse_hovered_ || !GetWidget()->IsMouseEventsEnabled()) return; diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc index 79840ce9979a..d5c91c4f6357 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/browser/ui/views/tabs/tab_drag_controller.cc -@@ -468,7 +468,7 @@ void TabDragController::Init(TabDragContext* source_co +@@ -480,7 +480,7 @@ void TabDragController::Init(TabDragContext* source_co // synchronous on desktop Linux, so use that. // - Chrome OS // Releasing capture on Ash cancels gestures so avoid it. @@ -9,7 +9,7 @@ can_release_capture_ = false; #endif start_point_in_screen_ = gfx::Point(source_view_offset, mouse_offset.y()); -@@ -916,7 +916,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon +@@ -1021,7 +1021,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -18,7 +18,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. -@@ -2128,7 +2128,7 @@ TabDragController::Liveness TabDragController::GetLoca +@@ -2350,7 +2350,7 @@ TabDragController::Liveness TabDragController::GetLoca } // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc b/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc index 462a0554c9df..a9339afa548c 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/about_ui.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/ui/webui/about_ui.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/browser/ui/webui/about_ui.cc -@@ -656,7 +656,7 @@ std::string ChromeURLs() { +@@ -603,7 +603,7 @@ std::string ChromeURLs() { return html; } @@ -9,7 +9,7 @@ std::string AboutLinuxProxyConfig() { std::string data; AppendHeader(&data, -@@ -712,7 +712,7 @@ void AboutUIHTMLSource::StartDataRequest( +@@ -661,7 +661,7 @@ void AboutUIHTMLSource::StartDataRequest( response = ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(idr); } diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc b/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc index 24ef0bb1f1df..e1a965b96501 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -284,7 +284,7 @@ +@@ -296,7 +296,7 @@ #include "chrome/browser/ui/webui/app_launcher_page_ui.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/ui/webui/webui_js_error/webui_js_error_ui.h" #endif -@@ -308,17 +308,17 @@ +@@ -320,22 +320,22 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -30,7 +30,13 @@ #include "chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.h" #endif -@@ -611,7 +611,7 @@ bool IsAboutUI(const GURL& url) { + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + #include "chrome/browser/ui/webui/app_settings/web_app_settings_ui.h" + #endif + +@@ -661,7 +661,7 @@ bool IsAboutUI(const GURL& url) { #if !BUILDFLAG(IS_ANDROID) || url.host_piece() == chrome::kChromeUITermsHost #endif @@ -39,7 +45,7 @@ || url.host_piece() == chrome::kChromeUILinuxProxyConfigHost #endif #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -1003,7 +1003,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -1073,7 +1073,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we return &NewWebUI<ash::SampleSystemWebAppUI>; #endif // !defined(OFFICIAL_BUILD) #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -48,7 +54,7 @@ if (url.host_piece() == chrome::kChromeUIWebUIJsErrorHost) return &NewWebUI<WebUIJsErrorUI>; #endif -@@ -1061,7 +1061,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -1131,7 +1131,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we if (url.host_piece() == chrome::kChromeUINaClHost) return &NewWebUI<NaClUI>; #endif @@ -57,7 +63,7 @@ defined(TOOLKIT_VIEWS)) || \ defined(USE_AURA) if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost) -@@ -1117,22 +1117,22 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -1187,27 +1187,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we } #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -84,3 +90,9 @@ if (url.host_piece() == chrome::kChromeUIBrowserSwitchHost) return &NewWebUI<BrowserSwitchUI>; #endif + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + if (base::FeatureList::IsEnabled(features::kDesktopPWAsWebAppSettingsPage) && + url.host_piece() == chrome::kChromeUIWebAppSettingsHost) { + return &NewWebUI<WebAppSettingsUI>; diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc index 1c770743ed20..7dc963f872dd 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/ntp/app_launcher_handler.cc.orig 2022-03-16 08:38:25 UTC +--- chrome/browser/ui/webui/ntp/app_launcher_handler.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/browser/ui/webui/ntp/app_launcher_handler.cc -@@ -310,7 +310,7 @@ void AppLauncherHandler::CreateExtensionInfo(const Ext +@@ -313,7 +313,7 @@ void AppLauncherHandler::CreateExtensionInfo(const Ext base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode)); bool is_deprecated_app = false; @@ -9,7 +9,7 @@ is_deprecated_app = extensions::IsExtensionUnsupportedDeprecatedApp( extension_service_->GetBrowserContext(), extension->id()); #endif -@@ -739,7 +739,7 @@ void AppLauncherHandler::HandleLaunchApp(const base::L +@@ -756,7 +756,7 @@ void AppLauncherHandler::HandleLaunchApp(const base::L Profile* profile = extension_service_->profile(); @@ -18,7 +18,7 @@ if (extensions::IsExtensionUnsupportedDeprecatedApp(profile, extension_id)) { // TODO(crbug.com/1225779): Show the deprecated apps dialog. return; -@@ -1332,7 +1332,7 @@ void AppLauncherHandler::InstallOsHooks(const web_app: +@@ -1348,7 +1348,7 @@ void AppLauncherHandler::InstallOsHooks(const web_app: options.os_hooks[web_app::OsHookType::kUninstallationViaOsSettings] = web_app->CanUserUninstallWebApp(); diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc index 782c04267d74..2803fbb72c77 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc @@ -1,20 +1,20 @@ ---- chrome/browser/ui/webui/settings/appearance_handler.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/ui/webui/settings/appearance_handler.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/browser/ui/webui/settings/appearance_handler.cc @@ -31,7 +31,7 @@ void AppearanceHandler::RegisterMessages() { base::Unretained(this))); // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_LACROS) - web_ui()->RegisterDeprecatedMessageCallback( ++#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD) + web_ui()->RegisterMessageCallback( "useSystemTheme", base::BindRepeating(&AppearanceHandler::HandleUseSystemTheme, -@@ -45,7 +45,7 @@ void AppearanceHandler::HandleUseDefaultTheme(const ba +@@ -45,7 +45,7 @@ void AppearanceHandler::HandleUseDefaultTheme(base::Va // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_LACROS) - void AppearanceHandler::HandleUseSystemTheme(const base::ListValue* args) { ++#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD) + void AppearanceHandler::HandleUseSystemTheme(base::Value::ConstListView args) { if (profile_->IsChild()) NOTREACHED(); diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.h b/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.h index f0f8a86ec04f..23be49002df4 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.h +++ b/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.h @@ -1,11 +1,11 @@ ---- chrome/browser/ui/webui/settings/appearance_handler.h.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/ui/webui/settings/appearance_handler.h.orig 2022-03-25 21:59:56 UTC +++ chrome/browser/ui/webui/settings/appearance_handler.h -@@ -44,7 +44,7 @@ class AppearanceHandler : public SettingsPageUIHandler +@@ -40,7 +40,7 @@ class AppearanceHandler : public SettingsPageUIHandler // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) // Changes the UI theme of the browser to the system (GTK+) theme. - void HandleUseSystemTheme(const base::ListValue* args); + void HandleUseSystemTheme(base::Value::ConstListView args); #endif diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc b/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc index 9e7eb20c1b60..950e3ff547c5 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -117,7 +117,7 @@ +@@ -118,7 +118,7 @@ #include "chrome/browser/ui/webui/settings/chromeos/constants/routes.mojom.h" #endif @@ -9,7 +9,7 @@ #include "ui/display/screen.h" #endif -@@ -137,7 +137,7 @@ +@@ -138,7 +138,7 @@ #include "chrome/browser/ui/webui/certificate_manager_localized_strings_provider.h" #endif @@ -18,7 +18,7 @@ #include "ui/ozone/public/ozone_platform.h" #endif -@@ -370,7 +370,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -371,7 +371,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht {"huge", IDS_SETTINGS_HUGE_FONT_SIZE}, // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -27,7 +27,7 @@ {"systemTheme", IDS_SETTINGS_SYSTEM_THEME}, {"useSystemTheme", IDS_SETTINGS_USE_SYSTEM_THEME}, {"classicTheme", IDS_SETTINGS_CLASSIC_THEME}, -@@ -378,7 +378,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -379,7 +379,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht #else {"resetToDefaultTheme", IDS_SETTINGS_RESET_TO_DEFAULT_THEME}, #endif @@ -36,7 +36,7 @@ {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS}, #endif #if BUILDFLAG(IS_MAC) -@@ -399,7 +399,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -400,7 +400,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__ui.cc b/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__ui.cc index 5177cb1f8fb5..016bc2901d72 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__ui.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__ui.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/settings/settings_ui.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/ui/webui/settings/settings_ui.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/browser/ui/webui/settings/settings_ui.cc -@@ -141,7 +141,7 @@ +@@ -140,7 +140,7 @@ #include "chrome/browser/ui/webui/settings/native_certificates_handler.h" #endif // BUILDFLAG(USE_NSS_CERTS) @@ -9,7 +9,7 @@ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) #include "chrome/browser/ui/webui/settings/url_handlers_handler.h" #include "chrome/browser/web_applications/web_app_provider.h" -@@ -245,7 +245,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui) +@@ -243,7 +243,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui) AddSettingsPageUIHandler(std::make_unique<ChromeCleanupHandler>(profile)); #endif // BUILDFLAG(IS_WIN) diff --git a/www/chromium/files/patch-chrome_browser_web__applications_externally__managed__app__install__task.cc b/www/chromium/files/patch-chrome_browser_web__applications_externally__managed__app__install__task.cc deleted file mode 100644 index 8a5cd71c584c..000000000000 --- a/www/chromium/files/patch-chrome_browser_web__applications_externally__managed__app__install__task.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/web_applications/externally_managed_app_install_task.cc.orig 2022-02-28 16:54:41 UTC -+++ chrome/browser/web_applications/externally_managed_app_install_task.cc -@@ -363,7 +363,7 @@ void ExternallyManagedAppInstallTask::OnWebAppInstalle - const WebApp* web_app = registrar_->GetAppById(app_id); - options.os_hooks[OsHookType::kUninstallationViaOsSettings] = - web_app->CanUserUninstallWebApp(); --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ - (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) - options.os_hooks[OsHookType::kUrlHandlers] = true; - #else diff --git a/www/chromium/files/patch-chrome_browser_web__applications_web__app__file__handler__registration.h b/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__file__handler__registration.h index 0e4ff5c7c04c..a1594b05528e 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_web__app__file__handler__registration.h +++ b/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__file__handler__registration.h @@ -1,5 +1,5 @@ ---- chrome/browser/web_applications/web_app_file_handler_registration.h.orig 2022-02-28 16:54:41 UTC -+++ chrome/browser/web_applications/web_app_file_handler_registration.h +--- chrome/browser/web_applications/os_integration/web_app_file_handler_registration.h.orig 2022-03-25 21:59:56 UTC ++++ chrome/browser/web_applications/os_integration/web_app_file_handler_registration.h @@ -44,7 +44,7 @@ void UnregisterFileHandlersWithOs(const AppId& app_id, Profile* profile, ResultCallback callback); diff --git a/www/chromium/files/patch-chrome_browser_web__applications_web__app__shortcut.cc b/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc index 8bfe2aad8808..b883934bf2f7 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_web__app__shortcut.cc +++ b/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc @@ -1,5 +1,5 @@ ---- chrome/browser/web_applications/web_app_shortcut.cc.orig 2022-02-28 16:54:41 UTC -+++ chrome/browser/web_applications/web_app_shortcut.cc +--- chrome/browser/web_applications/os_integration/web_app_shortcut.cc.orig 2022-03-25 21:59:56 UTC ++++ chrome/browser/web_applications/os_integration/web_app_shortcut.cc @@ -43,7 +43,7 @@ namespace { #if BUILDFLAG(IS_MAC) diff --git a/www/chromium/files/patch-chrome_browser_web__applications_web__app__shortcut.h b/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h index e4c212a51b62..95ff8d0f3cba 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_web__app__shortcut.h +++ b/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h @@ -1,12 +1,12 @@ ---- chrome/browser/web_applications/web_app_shortcut.h.orig 2022-02-28 16:54:41 UTC -+++ chrome/browser/web_applications/web_app_shortcut.h +--- chrome/browser/web_applications/os_integration/web_app_shortcut.h.orig 2022-03-25 21:59:56 UTC ++++ chrome/browser/web_applications/os_integration/web_app_shortcut.h @@ -19,7 +19,7 @@ #include "ui/gfx/image/image_family.h" #include "url/gurl.h" -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "chrome/browser/web_applications/web_app_shortcut_linux.h" + #include "chrome/browser/web_applications/os_integration/web_app_shortcut_linux.h" #endif // BUILDFLAG(IS_LINUX) @@ -47,7 +47,7 @@ struct ScopedShortcutOverrideForTesting { diff --git a/www/chromium/files/patch-chrome_browser_web__applications_web__app__shortcut__manager.cc b/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut__manager.cc index edf893e6ed24..5ecbbf680c84 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_web__app__shortcut__manager.cc +++ b/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut__manager.cc @@ -1,5 +1,5 @@ ---- chrome/browser/web_applications/web_app_shortcut_manager.cc.orig 2022-02-28 16:54:41 UTC -+++ chrome/browser/web_applications/web_app_shortcut_manager.cc +--- chrome/browser/web_applications/os_integration/web_app_shortcut_manager.cc.orig 2022-03-25 21:59:56 UTC ++++ chrome/browser/web_applications/os_integration/web_app_shortcut_manager.cc @@ -35,7 +35,7 @@ namespace web_app { namespace { diff --git a/www/chromium/files/patch-chrome_browser_web__applications_web__app__install__task.cc b/www/chromium/files/patch-chrome_browser_web__applications_web__app__install__task.cc deleted file mode 100644 index 967e60092ef1..000000000000 --- a/www/chromium/files/patch-chrome_browser_web__applications_web__app__install__task.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/web_applications/web_app_install_task.cc.orig 2022-02-28 16:54:41 UTC -+++ chrome/browser/web_applications/web_app_install_task.cc -@@ -915,7 +915,7 @@ void WebAppInstallTask::OnInstallFinalizedCreateShortc - web_app->CanUserUninstallWebApp(); - } - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ - (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) - options.os_hooks[OsHookType::kUrlHandlers] = true; - #else diff --git a/www/chromium/files/patch-chrome_browser_web__applications_web__app__provider.cc b/www/chromium/files/patch-chrome_browser_web__applications_web__app__provider.cc index 883bdc4cb29b..c8adf7fc3093 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_web__app__provider.cc +++ b/www/chromium/files/patch-chrome_browser_web__applications_web__app__provider.cc @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/web_app_provider.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/browser/web_applications/web_app_provider.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/browser/web_applications/web_app_provider.cc -@@ -281,7 +281,7 @@ void WebAppProvider::CreateSubsystems(Profile* profile +@@ -289,7 +289,7 @@ void WebAppProvider::CreateSubsystems(Profile* profile protocol_handler_manager.get()); std::unique_ptr<UrlHandlerManager> url_handler_manager; diff --git a/www/chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc b/www/chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc new file mode 100644 index 000000000000..dbcce37ca6dd --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc @@ -0,0 +1,11 @@ +--- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig 2022-03-25 21:59:56 UTC ++++ chrome/browser/webauthn/chrome_authenticator_request_delegate.cc +@@ -749,7 +749,7 @@ bool ChromeAuthenticatorRequestDelegate::ShouldPermitC + // TODO(crbug.com/1052397): Revisit the macro expression once build flag + // switch of lacros-chrome is complete. If updating this, also update + // kWebAuthCableServerLink. +-#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + + // caBLEv1 is disabled on these platforms. It never launched on them because + // it causes problems in bluez. Rather than disabling caBLE completely, which diff --git a/www/chromium/files/patch-chrome_common_chrome__features.cc b/www/chromium/files/patch-chrome_common_chrome__features.cc index 687a0039eb93..bbc280979435 100644 --- a/www/chromium/files/patch-chrome_common_chrome__features.cc +++ b/www/chromium/files/patch-chrome_common_chrome__features.cc @@ -1,6 +1,6 @@ ---- chrome/common/chrome_features.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/common/chrome_features.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/common/chrome_features.cc -@@ -113,7 +113,7 @@ const base::Feature kAsyncDns { +@@ -105,7 +105,7 @@ const base::Feature kAsyncDns { }; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ // Enables or disables the Autofill survey triggered by opening a prompt to // save address info. const base::Feature kAutofillAddressSurvey{"AutofillAddressSurvey", -@@ -128,7 +128,7 @@ const base::Feature kAutofillPasswordSurvey{"AutofillP +@@ -120,7 +120,7 @@ const base::Feature kAutofillPasswordSurvey{"AutofillP base::FEATURE_DISABLED_BY_DEFAULT}; #endif @@ -18,7 +18,7 @@ // Enables the Restart background mode optimization. When all Chrome UI is // closed and it goes in the background, allows to restart the browser to // discard memory. -@@ -145,7 +145,7 @@ const base::Feature kBorealis{"Borealis", base::FEATUR +@@ -142,7 +142,7 @@ const base::Feature kBorealis{"Borealis", base::FEATUR const base::Feature kChangePictureVideoMode{"ChangePictureVideoMode", base::FEATURE_ENABLED_BY_DEFAULT}; @@ -27,16 +27,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. -@@ -258,7 +258,7 @@ const base::Feature kPreinstalledWebAppInstallation{ - #endif - - #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - // Enables Desktop PWAs shortcuts menu to be visible and executable in ChromeOS, - // MacOS and Linux. - const base::Feature kDesktopPWAsAppIconShortcutsMenuUI{ -@@ -305,7 +305,7 @@ const base::Feature kDesktopPWAsNotificationIconAndTit +@@ -298,7 +298,7 @@ const base::Feature kDesktopPWAsNotificationIconAndTit // Enables or disables Desktop PWAs to be auto-started on OS login. const base::Feature kDesktopPWAsRunOnOsLogin { "DesktopPWAsRunOnOsLogin", @@ -45,7 +36,16 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -339,7 +339,7 @@ const base::FeatureParam<int> kDisableHttpDiskCacheMem +@@ -320,7 +320,7 @@ const base::Feature kDesktopPWAsWebBundles{"DesktopPWA + base::FEATURE_DISABLED_BY_DEFAULT}; + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + // Serves web app settings at chrome://app-settings/<app-id>. + const base::Feature kDesktopPWAsWebAppSettingsPage{ + "DesktopPWAsWebAppSettingsPage", base::FEATURE_ENABLED_BY_DEFAULT}; +@@ -330,7 +330,7 @@ const base::Feature kDesktopPWAsWebAppSettingsPage{ const base::Feature kDnsOverHttps { "DnsOverHttps", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -54,7 +54,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -361,7 +361,7 @@ const base::FeatureParam<bool> kDnsOverHttpsFallbackPa +@@ -352,7 +352,7 @@ const base::FeatureParam<bool> kDnsOverHttpsFallbackPa const base::FeatureParam<bool> kDnsOverHttpsShowUiParam { &kDnsOverHttps, "ShowUi", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -63,16 +63,7 @@ true #else false -@@ -608,7 +608,7 @@ const base::Feature kImmersiveFullscreen{"ImmersiveFul - base::FEATURE_DISABLED_BY_DEFAULT}; - #endif - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - const base::Feature kImproveAccessibilityTreeUsingLocalML{ - "ImproveAccessibilityTreeUsingLocalML", base::FEATURE_DISABLED_BY_DEFAULT}; - #endif -@@ -645,7 +645,7 @@ const base::Feature kIncognitoNtpRevamp{"IncognitoNtpR +@@ -624,7 +624,7 @@ const base::Feature kIncognitoNtpRevamp{"IncognitoNtpR base::FEATURE_DISABLED_BY_DEFAULT}; #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ @@ -81,7 +72,7 @@ // When enabled, removes any theme or background customization done by the user // on the Incognito UI. const base::Feature kIncognitoBrandConsistencyForDesktop{ -@@ -681,7 +681,7 @@ const base::Feature kLinkCapturingUiUpdate{"LinkCaptur +@@ -658,7 +658,7 @@ const base::Feature kLinkCapturingUiUpdate{"LinkCaptur base::FEATURE_DISABLED_BY_DEFAULT}; #endif @@ -90,7 +81,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) const base::Feature kLinuxLowMemoryMonitor{"LinuxLowMemoryMonitor", base::FEATURE_DISABLED_BY_DEFAULT}; -@@ -694,7 +694,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit +@@ -671,7 +671,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit &kLinuxLowMemoryMonitor, "critical_level", 255}; #endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-chrome_common_chrome__features.h b/www/chromium/files/patch-chrome_common_chrome__features.h index d4dd4115b750..3b67fb09a8e2 100644 --- a/www/chromium/files/patch-chrome_common_chrome__features.h +++ b/www/chromium/files/patch-chrome_common_chrome__features.h @@ -1,6 +1,6 @@ ---- chrome/common/chrome_features.h.orig 2022-02-28 16:54:41 UTC +--- chrome/common/chrome_features.h.orig 2022-03-25 21:59:56 UTC +++ chrome/common/chrome_features.h -@@ -95,7 +95,7 @@ extern const base::Feature kArcPiGhostWindow; +@@ -90,7 +90,7 @@ extern const base::Feature kArcPiGhostWindow; COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kAsyncDns; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kAutofillAddressSurvey; COMPONENT_EXPORT(CHROME_FEATURES) -@@ -104,7 +104,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) +@@ -99,7 +99,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kAutofillPasswordSurvey; #endif @@ -27,25 +27,16 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kChromeAppsDeprecation; #endif -@@ -186,7 +186,7 @@ extern const base::Feature kPreinstalledWebAppInstalla - #endif +@@ -219,7 +219,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) + extern const base::Feature kDesktopPWAsWebBundles; - #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) COMPONENT_EXPORT(CHROME_FEATURES) - extern const base::Feature kDesktopPWAsAppIconShortcutsMenuUI; - #endif -@@ -410,7 +410,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) - extern const base::Feature kImmersiveFullscreen; - #endif - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - COMPONENT_EXPORT(CHROME_FEATURES) - extern const base::Feature kImproveAccessibilityTreeUsingLocalML; + extern const base::Feature kDesktopPWAsWebAppSettingsPage; #endif -@@ -435,7 +435,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) +@@ -425,7 +425,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kIncognitoNtpRevamp; #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ @@ -54,7 +45,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kIncognitoBrandConsistencyForDesktop; -@@ -462,7 +462,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) +@@ -452,7 +452,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kLinkCapturingUiUpdate; #endif @@ -63,7 +54,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kLinuxLowMemoryMonitor; COMPONENT_EXPORT(CHROME_FEATURES) -@@ -471,7 +471,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) +@@ -461,7 +461,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::FeatureParam<int> kLinuxLowMemoryMonitorCriticalLevel; #endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-chrome_common_chrome__paths.cc b/www/chromium/files/patch-chrome_common_chrome__paths.cc index b4e70028f87d..e1f38716831e 100644 --- a/www/chromium/files/patch-chrome_common_chrome__paths.cc +++ b/www/chromium/files/patch-chrome_common_chrome__paths.cc @@ -1,4 +1,4 @@ ---- chrome/common/chrome_paths.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/common/chrome_paths.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/common/chrome_paths.cc @@ -44,14 +44,14 @@ @@ -27,7 +27,7 @@ if (!GetUserDownloadsDirectorySafe(&cur)) return false; break; -@@ -411,10 +411,12 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -407,10 +407,12 @@ bool PathProvider(int key, base::FilePath* result) { if (!base::PathExists(cur)) // We don't want to create this return false; break; @@ -41,7 +41,7 @@ #else cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies")); #endif -@@ -426,7 +428,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -422,7 +424,7 @@ bool PathProvider(int key, base::FilePath* result) { #if BUILDFLAG(IS_CHROMEOS_ASH) || \ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ BUILDFLAG(CHROMIUM_BRANDING)) || \ @@ -50,7 +50,7 @@ case chrome::DIR_USER_EXTERNAL_EXTENSIONS: { if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) return false; -@@ -434,7 +436,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -430,7 +432,7 @@ bool PathProvider(int key, base::FilePath* result) { break; } #endif @@ -59,7 +59,7 @@ case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: { cur = base::FilePath(kFilepathSinglePrefExtensions); break; -@@ -479,7 +481,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -475,7 +477,7 @@ bool PathProvider(int key, base::FilePath* result) { break; #endif @@ -68,7 +68,7 @@ case chrome::DIR_NATIVE_MESSAGING: #if BUILDFLAG(IS_MAC) #if BUILDFLAG(GOOGLE_CHROME_BRANDING) -@@ -493,6 +495,9 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -489,6 +491,9 @@ bool PathProvider(int key, base::FilePath* result) { #if BUILDFLAG(GOOGLE_CHROME_BRANDING) cur = base::FilePath(FILE_PATH_LITERAL( "/etc/opt/chrome/native-messaging-hosts")); diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.cc b/www/chromium/files/patch-chrome_common_chrome__switches.cc index d210de79a0fa..ab6024cfaf34 100644 --- a/www/chromium/files/patch-chrome_common_chrome__switches.cc +++ b/www/chromium/files/patch-chrome_common_chrome__switches.cc @@ -1,6 +1,6 @@ ---- chrome/common/chrome_switches.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/common/chrome_switches.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/common/chrome_switches.cc -@@ -790,14 +790,14 @@ const char kAllowNaClSocketAPI[] = "allow-n +@@ -794,14 +794,14 @@ const char kAllowNaClSocketAPI[] = "allow-n #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.h b/www/chromium/files/patch-chrome_common_chrome__switches.h index ad091d68a2c5..829297f466f5 100644 --- a/www/chromium/files/patch-chrome_common_chrome__switches.h +++ b/www/chromium/files/patch-chrome_common_chrome__switches.h @@ -1,6 +1,6 @@ ---- chrome/common/chrome_switches.h.orig 2022-02-28 16:54:41 UTC +--- chrome/common/chrome_switches.h.orig 2022-03-25 21:59:56 UTC +++ chrome/common/chrome_switches.h -@@ -247,12 +247,12 @@ extern const char kAllowNaClSocketAPI[]; +@@ -248,12 +248,12 @@ extern const char kAllowNaClSocketAPI[]; #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/chromium/files/patch-chrome_common_extensions_command.cc b/www/chromium/files/patch-chrome_common_extensions_command.cc index 1bfcbdc3573a..aeafe29aa10f 100644 --- a/www/chromium/files/patch-chrome_common_extensions_command.cc +++ b/www/chromium/files/patch-chrome_common_extensions_command.cc @@ -1,6 +1,6 @@ ---- chrome/common/extensions/command.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/common/extensions/command.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/common/extensions/command.cc -@@ -294,7 +294,7 @@ std::string Command::CommandPlatform() { +@@ -295,7 +295,7 @@ std::string Command::CommandPlatform() { return values::kKeybindingPlatformMac; #elif BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) return values::kKeybindingPlatformChromeOs; diff --git a/www/chromium/files/patch-chrome_common_pref__names.cc b/www/chromium/files/patch-chrome_common_pref__names.cc index 5a5f6a362d4f..53d06c28dee5 100644 --- a/www/chromium/files/patch-chrome_common_pref__names.cc +++ b/www/chromium/files/patch-chrome_common_pref__names.cc @@ -1,6 +1,6 @@ ---- chrome/common/pref_names.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/common/pref_names.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/common/pref_names.cc -@@ -1194,7 +1194,7 @@ const char kUseAshProxy[] = "lacros.proxy.use_ash_prox +@@ -1188,7 +1188,7 @@ const char kUseAshProxy[] = "lacros.proxy.use_ash_prox // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ // Linux specific preference on whether we should match the system theme. const char kUsesSystemTheme[] = "extensions.theme.use_system"; #endif -@@ -1297,7 +1297,7 @@ const char kShowUpdatePromotionInfoBar[] = +@@ -1291,7 +1291,7 @@ const char kShowUpdatePromotionInfoBar[] = // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -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). const char kUseCustomChromeFrame[] = "browser.custom_chrome_frame"; -@@ -1776,7 +1776,7 @@ const char kDownloadDefaultDirectory[] = "download.def +@@ -1780,7 +1780,7 @@ const char kDownloadDefaultDirectory[] = "download.def const char kDownloadDirUpgraded[] = "download.directory_upgrade"; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -27,7 +27,7 @@ const char kOpenPdfDownloadInSystemReader[] = "download.open_pdf_in_system_reader"; #endif -@@ -2065,7 +2065,7 @@ const char kWebAppsPreferences[] = "web_apps.web_app_i +@@ -2069,7 +2069,7 @@ const char kWebAppsPreferences[] = "web_apps.web_app_i // its isolation requirements. const char kWebAppsIsolationState[] = "web_apps.isolation_state"; @@ -36,7 +36,7 @@ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) // Dictionary that maps origins to web apps that can act as URL handlers. const char kWebAppsUrlHandlerInfo[] = "web_apps.url_handler_info"; -@@ -2193,7 +2193,7 @@ const char kAmbientAuthenticationInPrivateModesEnabled +@@ -2199,7 +2199,7 @@ const char kAmbientAuthenticationInPrivateModesEnabled // requests. const char kBasicAuthOverHttpEnabled[] = "auth.basic_over_http_enabled"; @@ -45,7 +45,7 @@ // Boolean that specifies whether OK-AS-DELEGATE flag from KDC is respected // along with kAuthNegotiateDelegateAllowlist. const char kAuthNegotiateDelegateByKdcPolicy[] = -@@ -3117,7 +3117,7 @@ const char kBlockAutoplayEnabled[] = "media.block_auto +@@ -3129,7 +3129,7 @@ const char kBlockAutoplayEnabled[] = "media.block_auto const char kSandboxExternalProtocolBlocked[] = "profile.sandbox_external_protocol_blocked"; diff --git a/www/chromium/files/patch-chrome_common_pref__names.h b/www/chromium/files/patch-chrome_common_pref__names.h index 357f824911bc..fb5c6a3b3159 100644 --- a/www/chromium/files/patch-chrome_common_pref__names.h +++ b/www/chromium/files/patch-chrome_common_pref__names.h @@ -1,6 +1,6 @@ ---- chrome/common/pref_names.h.orig 2022-02-28 16:54:41 UTC +--- chrome/common/pref_names.h.orig 2022-03-25 21:59:56 UTC +++ chrome/common/pref_names.h -@@ -375,7 +375,7 @@ extern const char kUseAshProxy[]; +@@ -372,7 +372,7 @@ extern const char kUseAshProxy[]; #endif // BUILDFLAG(IS_CHROMEOS_LACROS) // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ extern const char kUsesSystemTheme[]; #endif extern const char kCurrentThemePackFilename[]; -@@ -404,7 +404,7 @@ extern const char kShowUpdatePromotionInfoBar[]; +@@ -401,7 +401,7 @@ extern const char kShowUpdatePromotionInfoBar[]; #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -18,7 +18,7 @@ extern const char kUseCustomChromeFrame[]; #endif #if BUILDFLAG(ENABLE_PLUGINS) -@@ -587,7 +587,7 @@ extern const char kDownloadExtensionsToOpenByPolicy[]; +@@ -584,7 +584,7 @@ extern const char kDownloadExtensionsToOpenByPolicy[]; extern const char kDownloadAllowedURLsForOpenByPolicy[]; extern const char kDownloadDirUpgraded[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -27,7 +27,7 @@ extern const char kOpenPdfDownloadInSystemReader[]; #endif #if BUILDFLAG(IS_ANDROID) -@@ -694,7 +694,7 @@ extern const char kWebAppsUninstalledDefaultChromeApps +@@ -691,7 +691,7 @@ extern const char kWebAppsUninstalledDefaultChromeApps extern const char kWebAppsPreferences[]; extern const char kWebAppsIsolationState[]; @@ -36,7 +36,7 @@ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) extern const char kWebAppsUrlHandlerInfo[]; #endif -@@ -834,7 +834,7 @@ extern const char kGloballyScopeHTTPAuthCacheEnabled[] +@@ -830,7 +830,7 @@ extern const char kGloballyScopeHTTPAuthCacheEnabled[] extern const char kAmbientAuthenticationInPrivateModesEnabled[]; extern const char kBasicAuthOverHttpEnabled[]; diff --git a/www/chromium/files/patch-chrome_common_webui__url__constants.cc b/www/chromium/files/patch-chrome_common_webui__url__constants.cc index d4d4fff2e595..dd1a55383bf2 100644 --- a/www/chromium/files/patch-chrome_common_webui__url__constants.cc +++ b/www/chromium/files/patch-chrome_common_webui__url__constants.cc @@ -1,6 +1,6 @@ ---- chrome/common/webui_url_constants.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/common/webui_url_constants.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/common/webui_url_constants.cc -@@ -428,18 +428,18 @@ const char kOsUIFlagsURL[] = "os://flags"; +@@ -434,18 +434,18 @@ const char kOsUIFlagsURL[] = "os://flags"; const char kOsUIVersionURL[] = "os://version"; #endif @@ -22,7 +22,7 @@ const char kChromeUIDiscardsHost[] = "discards"; const char kChromeUIDiscardsURL[] = "chrome://discards/"; #endif -@@ -454,14 +454,14 @@ const char kChromeUILinuxProxyConfigHost[] = "linux-pr +@@ -460,14 +460,14 @@ const char kChromeUILinuxProxyConfigHost[] = "linux-pr #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -39,7 +39,7 @@ const char kChromeUIBrowserSwitchHost[] = "browser-switch"; const char kChromeUIBrowserSwitchURL[] = "chrome://browser-switch/"; const char kChromeUIEnterpriseProfileWelcomeHost[] = -@@ -476,7 +476,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro +@@ -482,7 +482,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro const char kChromeUIProfilePickerStartupQuery[] = "startup"; #endif @@ -48,7 +48,16 @@ defined(TOOLKIT_VIEWS)) || \ defined(USE_AURA) const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog"; -@@ -668,18 +668,18 @@ const char* const kChromeHostURLs[] = { +@@ -554,7 +554,7 @@ const char kPrivacySandboxSubPagePath[] = "/privacySan + #endif + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + const char kChromeUIWebAppSettingsURL[] = "chrome://app-settings/"; + const char kChromeUIWebAppSettingsHost[] = "app-settings"; + #endif +@@ -678,21 +678,21 @@ const char* const kChromeHostURLs[] = { kChromeUIAssistantOptInHost, #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -61,6 +70,10 @@ + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) kChromeUIDiscardsHost, #endif +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + kChromeUIWebAppSettingsHost, + #endif #if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_ANDROID) kChromeUILinuxProxyConfigHost, #endif @@ -70,7 +83,7 @@ kChromeUISandboxHost, #endif #if BUILDFLAG(IS_WIN) -@@ -736,7 +736,7 @@ const char* const kChromeDebugURLs[] = { +@@ -749,7 +749,7 @@ const char* const kChromeDebugURLs[] = { blink::kChromeUIGpuJavaCrashURL, kChromeUIJavaCrashURL, #endif diff --git a/www/chromium/files/patch-chrome_common_webui__url__constants.h b/www/chromium/files/patch-chrome_common_webui__url__constants.h index 2c6b78cbd6b5..333baaec3462 100644 --- a/www/chromium/files/patch-chrome_common_webui__url__constants.h +++ b/www/chromium/files/patch-chrome_common_webui__url__constants.h @@ -1,6 +1,6 @@ ---- chrome/common/webui_url_constants.h.orig 2022-02-28 16:54:41 UTC +--- chrome/common/webui_url_constants.h.orig 2022-03-25 21:59:56 UTC +++ chrome/common/webui_url_constants.h -@@ -371,18 +371,18 @@ extern const char kOsUIFlagsURL[]; +@@ -371,24 +371,24 @@ extern const char kOsUIFlagsURL[]; extern const char kOsUIVersionURL[]; #endif @@ -22,7 +22,14 @@ extern const char kChromeUIDiscardsHost[]; extern const char kChromeUIDiscardsURL[]; #endif -@@ -397,14 +397,14 @@ extern const char kChromeUILinuxProxyConfigHost[]; + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + extern const char kChromeUIWebAppSettingsURL[]; + extern const char kChromeUIWebAppSettingsHost[]; + #endif +@@ -403,14 +403,14 @@ extern const char kChromeUILinuxProxyConfigHost[]; #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -39,7 +46,7 @@ extern const char kChromeUIBrowserSwitchHost[]; extern const char kChromeUIBrowserSwitchURL[]; extern const char kChromeUIEnterpriseProfileWelcomeHost[]; -@@ -416,7 +416,7 @@ extern const char kChromeUIProfilePickerUrl[]; +@@ -422,7 +422,7 @@ extern const char kChromeUIProfilePickerUrl[]; extern const char kChromeUIProfilePickerStartupQuery[]; #endif diff --git a/www/chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc b/www/chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc index 1aea771027f4..09b6a65ee30b 100644 --- a/www/chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc +++ b/www/chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc @@ -1,6 +1,6 @@ ---- chrome/services/printing/print_backend_service_impl.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/services/printing/print_backend_service_impl.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/services/printing/print_backend_service_impl.cc -@@ -484,7 +484,7 @@ void PrintBackendServiceImpl::UpdatePrintSettings( +@@ -510,7 +510,7 @@ void PrintBackendServiceImpl::UpdatePrintSettings( crash_keys_ = std::make_unique<crash_keys::ScopedPrinterInfo>( print_backend_->GetPrinterDriverInfo(printer_name)); diff --git a/www/chromium/files/patch-chrome_test_BUILD.gn b/www/chromium/files/patch-chrome_test_BUILD.gn index 37cdecf1bd06..ef240340c679 100644 --- a/www/chromium/files/patch-chrome_test_BUILD.gn +++ b/www/chromium/files/patch-chrome_test_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/test/BUILD.gn.orig 2022-02-28 16:54:41 UTC +--- chrome/test/BUILD.gn.orig 2022-03-25 21:59:56 UTC +++ chrome/test/BUILD.gn -@@ -8875,7 +8875,7 @@ test("chrome_app_unittests") { +@@ -9110,7 +9110,7 @@ test("chrome_app_unittests") { "//components/safe_browsing:buildflags", "//pdf:pdf_ppapi", ] diff --git a/www/chromium/files/patch-chrome_test_chromedriver_chrome__launcher.cc b/www/chromium/files/patch-chrome_test_chromedriver_chrome__launcher.cc index a920f49fe691..59ffc8813111 100644 --- a/www/chromium/files/patch-chrome_test_chromedriver_chrome__launcher.cc +++ b/www/chromium/files/patch-chrome_test_chromedriver_chrome__launcher.cc @@ -1,4 +1,4 @@ ---- chrome/test/chromedriver/chrome_launcher.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/test/chromedriver/chrome_launcher.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/test/chromedriver/chrome_launcher.cc @@ -65,6 +65,7 @@ #include <fcntl.h> @@ -6,5 +6,5 @@ #include <sys/types.h> +#include <sys/wait.h> #include <unistd.h> - #elif defined(OS_WIN) + #elif BUILDFLAG(IS_WIN) #include "chrome/test/chromedriver/keycode_text_conversion.h" diff --git a/www/chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc b/www/chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc index d41492804116..f138044f8a19 100644 --- a/www/chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc +++ b/www/chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc @@ -1,20 +1,20 @@ ---- chrome/test/chromedriver/chrome/chrome_finder.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/test/chromedriver/chrome/chrome_finder.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/test/chromedriver/chrome/chrome_finder.cc @@ -54,7 +54,7 @@ void GetApplicationDirs(std::vector<base::FilePath>* l installation_locations[i].Append(L"Chromium\\Application")); } } --#elif defined(OS_LINUX) || defined(OS_CHROMEOS) -+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) void GetApplicationDirs(std::vector<base::FilePath>* locations) { // TODO: Respect users' PATH variables. // Until then, we use an approximation of the most common defaults. @@ -139,7 +139,7 @@ bool FindChrome(base::FilePath* browser_exe) { base::FilePath browser_exes_array[] = { - #if defined(OS_WIN) || defined(OS_MAC) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) base::FilePath(chrome::kBrowserProcessExecutablePath), --#elif defined(OS_LINUX) || defined(OS_CHROMEOS) -+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) base::FilePath("google-chrome"), base::FilePath(chrome::kBrowserProcessExecutablePath), base::FilePath("chromium"), diff --git a/www/chromium/files/patch-chrome_test_chromedriver_key__converter__unittest.cc b/www/chromium/files/patch-chrome_test_chromedriver_key__converter__unittest.cc index 8ddfbfa1ce14..656e8e79e233 100644 --- a/www/chromium/files/patch-chrome_test_chromedriver_key__converter__unittest.cc +++ b/www/chromium/files/patch-chrome_test_chromedriver_key__converter__unittest.cc @@ -1,11 +1,11 @@ ---- chrome/test/chromedriver/key_converter_unittest.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/test/chromedriver/key_converter_unittest.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/test/chromedriver/key_converter_unittest.cc @@ -246,7 +246,7 @@ TEST(KeyConverter, ToggleModifiers) { CheckEventsReleaseModifiers(keys, key_events); } --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Fails on bots: crbug.com/174962 #define MAYBE_AllEnglishKeyboardSymbols DISABLED_AllEnglishKeyboardSymbols #else @@ -13,8 +13,8 @@ TEST(KeyConverter, AllSpecialWebDriverKeysOnEnglishKeyboard) { ui::ScopedKeyboardLayout keyboard_layout(ui::KEYBOARD_LAYOUT_ENGLISH_US); const char kTextForKeys[] = { --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) 0, 0, 0, 0, '\t', 0, '\r', '\r', 0, 0, 0, 0, 0, #else 0, 0, 0, 0, 0, 0, '\r', '\r', 0, 0, 0, 0, 0, diff --git a/www/chromium/files/patch-chrome_test_chromedriver_keycode__text__conversion__unittest.cc b/www/chromium/files/patch-chrome_test_chromedriver_keycode__text__conversion__unittest.cc index c0bf08adb434..1f0b694f1ee4 100644 --- a/www/chromium/files/patch-chrome_test_chromedriver_keycode__text__conversion__unittest.cc +++ b/www/chromium/files/patch-chrome_test_chromedriver_keycode__text__conversion__unittest.cc @@ -1,11 +1,11 @@ ---- chrome/test/chromedriver/keycode_text_conversion_unittest.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/test/chromedriver/keycode_text_conversion_unittest.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/test/chromedriver/keycode_text_conversion_unittest.cc @@ -64,7 +64,7 @@ std::string ConvertKeyCodeToTextNoError(ui::KeyboardCo // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) // Fails on bots: crbug.com/174962 #define MAYBE_KeyCodeToText DISABLED_KeyCodeToText #else @@ -13,8 +13,8 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) // Fails on bots: crbug.com/174962 #define MAYBE_CharToKeyCode DISABLED_CharToKeyCode #else diff --git a/www/chromium/files/patch-chrome_updater_app_app__install.cc b/www/chromium/files/patch-chrome_updater_app_app__install.cc index 5918f61e7b11..d423ee18e7ba 100644 --- a/www/chromium/files/patch-chrome_updater_app_app__install.cc +++ b/www/chromium/files/patch-chrome_updater_app_app__install.cc @@ -1,6 +1,6 @@ ---- chrome/updater/app/app_install.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/updater/app/app_install.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/updater/app/app_install.cc -@@ -155,7 +155,7 @@ void AppInstall::WakeCandidate() { +@@ -166,7 +166,7 @@ void AppInstall::WakeCandidate() { update_service_internal, base::WrapRefCounted(this))); } diff --git a/www/chromium/files/patch-chrome_updater_configurator.cc b/www/chromium/files/patch-chrome_updater_configurator.cc index b7adbc5066fc..2802860a344c 100644 --- a/www/chromium/files/patch-chrome_updater_configurator.cc +++ b/www/chromium/files/patch-chrome_updater_configurator.cc @@ -1,6 +1,6 @@ ---- chrome/updater/configurator.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/updater/configurator.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/updater/configurator.cc -@@ -37,7 +37,7 @@ +@@ -39,7 +39,7 @@ #include "chrome/updater/win/net/network.h" #elif BUILDFLAG(IS_MAC) #include "chrome/updater/mac/net/network.h" diff --git a/www/chromium/files/patch-chrome_updater_updater.cc b/www/chromium/files/patch-chrome_updater_updater.cc index a584273c3288..ef2077e3a396 100644 --- a/www/chromium/files/patch-chrome_updater_updater.cc +++ b/www/chromium/files/patch-chrome_updater_updater.cc @@ -1,6 +1,6 @@ ---- chrome/updater/updater.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/updater/updater.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/updater/updater.cc -@@ -38,7 +38,7 @@ +@@ -41,7 +41,7 @@ #include "chrome/updater/win/win_util.h" #elif BUILDFLAG(IS_MAC) #include "chrome/updater/app/server/mac/server.h" diff --git a/www/chromium/files/patch-chrome_updater_util.cc b/www/chromium/files/patch-chrome_updater_util.cc index aecad70b06c4..9bd0f87d8112 100644 --- a/www/chromium/files/patch-chrome_updater_util.cc +++ b/www/chromium/files/patch-chrome_updater_util.cc @@ -1,6 +1,6 @@ ---- chrome/updater/util.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/updater/util.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/updater/util.cc -@@ -219,7 +219,7 @@ GURL AppendQueryParameter(const GURL& url, +@@ -253,7 +253,7 @@ GURL AppendQueryParameter(const GURL& url, return url.ReplaceComponents(replacements); } diff --git a/www/chromium/files/patch-chrome_utility_services.cc b/www/chromium/files/patch-chrome_utility_services.cc index a39bda018943..85d42621c26b 100644 --- a/www/chromium/files/patch-chrome_utility_services.cc +++ b/www/chromium/files/patch-chrome_utility_services.cc @@ -1,6 +1,6 @@ ---- chrome/utility/services.cc.orig 2022-02-28 16:54:41 UTC +--- chrome/utility/services.cc.orig 2022-03-25 21:59:56 UTC +++ chrome/utility/services.cc -@@ -64,7 +64,7 @@ +@@ -63,7 +63,7 @@ #include "chrome/services/file_util/file_util_service.h" // nogncheck #endif @@ -9,7 +9,7 @@ #include "chrome/services/file_util/document_analysis_service.h" // nogncheck #endif -@@ -218,7 +218,7 @@ auto RunCupsIppParser( +@@ -216,7 +216,7 @@ auto RunCupsIppParser( } #endif diff --git a/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc b/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc index 8d74b6fbcf89..3ca48b9601e4 100644 --- a/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc +++ b/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc @@ -1,6 +1,6 @@ ---- chromecast/browser/cast_browser_main_parts.cc.orig 2022-02-28 16:54:41 UTC +--- chromecast/browser/cast_browser_main_parts.cc.orig 2022-03-25 21:59:56 UTC +++ chromecast/browser/cast_browser_main_parts.cc -@@ -94,7 +94,7 @@ +@@ -93,7 +93,7 @@ #include "ui/base/ui_base_switches.h" #include "ui/gl/gl_switches.h" @@ -9,7 +9,7 @@ #include <fontconfig/fontconfig.h> #include <signal.h> #include <sys/prctl.h> -@@ -149,7 +149,7 @@ +@@ -148,7 +148,7 @@ #include "extensions/browser/extension_prefs.h" // nogncheck #endif @@ -18,7 +18,7 @@ #include "chromecast/browser/exo/wayland_server_controller.h" #endif -@@ -285,7 +285,7 @@ class CastViewsDelegate : public views::ViewsDelegate +@@ -284,7 +284,7 @@ class CastViewsDelegate : public views::ViewsDelegate #endif // defined(USE_AURA) @@ -27,7 +27,7 @@ base::FilePath GetApplicationFontsDir() { std::unique_ptr<base::Environment> env(base::Environment::Create()); -@@ -331,7 +331,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { +@@ -330,7 +330,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { {cc::switches::kDisableThreadedAnimation, ""}, #endif // BUILDFLAG(IS_ANDROID) #endif // BUILDFLAG(IS_CAST_AUDIO_ONLY) @@ -36,7 +36,7 @@ #if defined(ARCH_CPU_X86_FAMILY) // This is needed for now to enable the x11 Ozone platform to work with // current Linux/NVidia OpenGL drivers. -@@ -523,7 +523,7 @@ void CastBrowserMainParts::ToolkitInitialized() { +@@ -522,7 +522,7 @@ void CastBrowserMainParts::ToolkitInitialized() { views_delegate_ = std::make_unique<CastViewsDelegate>(); #endif // defined(USE_AURA) @@ -45,7 +45,7 @@ base::FilePath dir_font = GetApplicationFontsDir(); const FcChar8 *dir_font_char8 = reinterpret_cast<const FcChar8*>(dir_font.value().data()); if (!FcConfigAppFontAddDir(gfx::GetGlobalFontConfig(), dir_font_char8)) { -@@ -757,7 +757,7 @@ int CastBrowserMainParts::PreMainMessageLoopRun() { +@@ -753,7 +753,7 @@ int CastBrowserMainParts::PreMainMessageLoopRun() { cast_browser_process_->browser_context()); #endif @@ -54,7 +54,7 @@ wayland_server_controller_ = std::make_unique<WaylandServerController>(window_manager_.get()); #endif -@@ -832,7 +832,7 @@ void CastBrowserMainParts::PostMainMessageLoopRun() { +@@ -828,7 +828,7 @@ void CastBrowserMainParts::PostMainMessageLoopRun() { cast_browser_process_->cast_service()->Stop(); diff --git a/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc b/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc index 143f7dc5e906..5528c5790596 100644 --- a/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc +++ b/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc @@ -1,6 +1,6 @@ ---- chromecast/browser/cast_content_browser_client.cc.orig 2022-02-28 16:54:41 UTC +--- chromecast/browser/cast_content_browser_client.cc.orig 2022-03-25 21:59:56 UTC +++ chromecast/browser/cast_content_browser_client.cc -@@ -133,7 +133,7 @@ +@@ -135,7 +135,7 @@ #include "extensions/common/constants.h" // nogncheck #endif diff --git a/www/chromium/files/patch-chromecast_browser_cast__content__browser__client__receiver__bindings.cc b/www/chromium/files/patch-chromecast_browser_cast__content__browser__client__receiver__bindings.cc index cc85c5c0e2da..c93e5a2299f5 100644 --- a/www/chromium/files/patch-chromecast_browser_cast__content__browser__client__receiver__bindings.cc +++ b/www/chromium/files/patch-chromecast_browser_cast__content__browser__client__receiver__bindings.cc @@ -1,4 +1,4 @@ ---- chromecast/browser/cast_content_browser_client_receiver_bindings.cc.orig 2022-02-28 16:54:41 UTC +--- chromecast/browser/cast_content_browser_client_receiver_bindings.cc.orig 2022-03-25 21:59:56 UTC +++ chromecast/browser/cast_content_browser_client_receiver_bindings.cc @@ -35,7 +35,7 @@ #include "media/mojo/services/media_service.h" // nogncheck @@ -9,7 +9,7 @@ #include "chromecast/browser/webview/js_channel_service.h" #include "chromecast/common/mojom/js_channel.mojom.h" #endif -@@ -227,7 +227,7 @@ void CastContentBrowserClient::RunServiceInstance( +@@ -234,7 +234,7 @@ void CastContentBrowserClient::RunServiceInstance( void CastContentBrowserClient::BindHostReceiverForRenderer( content::RenderProcessHost* render_process_host, mojo::GenericPendingReceiver receiver) { diff --git a/www/chromium/files/patch-chromecast_renderer_cast__content__renderer__client.cc b/www/chromium/files/patch-chromecast_renderer_cast__content__renderer__client.cc index 24d77aa10902..f9aa34f1cb55 100644 --- a/www/chromium/files/patch-chromecast_renderer_cast__content__renderer__client.cc +++ b/www/chromium/files/patch-chromecast_renderer_cast__content__renderer__client.cc @@ -1,6 +1,6 @@ ---- chromecast/renderer/cast_content_renderer_client.cc.orig 2022-02-28 16:54:41 UTC +--- chromecast/renderer/cast_content_renderer_client.cc.orig 2022-03-25 21:59:56 UTC +++ chromecast/renderer/cast_content_renderer_client.cc -@@ -193,7 +193,7 @@ void CastContentRendererClient::RenderFrameCreated( +@@ -194,7 +194,7 @@ void CastContentRendererClient::RenderFrameCreated( dispatcher->OnRenderFrameCreated(render_frame); #endif diff --git a/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc b/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc index 0eb22282bd0e..ad18ab3a2896 100644 --- a/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc +++ b/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc @@ -1,6 +1,6 @@ ---- components/autofill/core/browser/personal_data_manager.cc.orig 2022-02-28 16:54:41 UTC +--- components/autofill/core/browser/personal_data_manager.cc.orig 2022-03-25 21:59:56 UTC +++ components/autofill/core/browser/personal_data_manager.cc -@@ -2107,7 +2107,8 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp +@@ -1986,7 +1986,8 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ diff --git a/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc b/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc index 086f5b3bfaa3..43daab06c93c 100644 --- a/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc +++ b/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc @@ -1,6 +1,6 @@ ---- components/autofill/core/common/autofill_payments_features.cc.orig 2022-02-28 16:54:41 UTC +--- components/autofill/core/common/autofill_payments_features.cc.orig 2022-03-25 21:59:56 UTC +++ components/autofill/core/common/autofill_payments_features.cc -@@ -180,7 +180,7 @@ const base::Feature kAutofillUpstreamAllowAllEmailDoma +@@ -192,7 +192,7 @@ const base::Feature kAutofillUpstreamAllowAllEmailDoma bool ShouldShowImprovedUserConsentForCreditCardSave() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc b/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc index e06c94beb79b..1209be8e6a89 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc @@ -1,4 +1,4 @@ ---- components/feature_engagement/public/feature_configurations.cc.orig 2022-02-28 16:54:41 UTC +--- components/feature_engagement/public/feature_configurations.cc.orig 2022-03-25 21:59:56 UTC +++ components/feature_engagement/public/feature_configurations.cc @@ -35,7 +35,7 @@ FeatureConfig CreateAlwaysTriggerConfig(const base::Fe absl::optional<FeatureConfig> GetClientSideFeatureConfig( @@ -9,7 +9,7 @@ if (kIPHPasswordsAccountStorageFeature.name == feature->name) { absl::optional<FeatureConfig> config = FeatureConfig(); config->valid = true; -@@ -721,7 +721,8 @@ absl::optional<FeatureConfig> GetClientSideFeatureConf +@@ -834,7 +834,8 @@ absl::optional<FeatureConfig> GetClientSideFeatureConf #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc index b99b22929ef7..045eadf3725f 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc @@ -1,4 +1,4 @@ ---- components/feature_engagement/public/feature_constants.cc.orig 2022-02-28 16:54:41 UTC +--- components/feature_engagement/public/feature_constants.cc.orig 2022-03-25 21:59:56 UTC +++ components/feature_engagement/public/feature_constants.cc @@ -22,7 +22,7 @@ const base::Feature kIPHDummyFeature{"IPH_Dummy", base::FEATURE_DISABLED_BY_DEFAULT}; @@ -9,8 +9,8 @@ const base::Feature kIPHDesktopSharedHighlightingFeature{ "IPH_DesktopSharedHighlighting", base::FEATURE_DISABLED_BY_DEFAULT}; const base::Feature kIPHDesktopTabGroupsNewGroupFeature{ -@@ -274,7 +274,7 @@ const base::Feature kIPHDiscoverFeedHeaderFeature{ - "IPH_DiscoverFeedHeaderMenu", base::FEATURE_DISABLED_BY_DEFAULT}; +@@ -286,7 +286,7 @@ const base::Feature kIPHDefaultSiteViewFeature{ + "IPH_DefaultSiteView", base::FEATURE_DISABLED_BY_DEFAULT}; #endif // BUILDFLAG(IS_IOS) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h index bdd278b1f3b3..bece36b428e3 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h @@ -1,4 +1,4 @@ ---- components/feature_engagement/public/feature_constants.h.orig 2022-02-28 16:54:41 UTC +--- components/feature_engagement/public/feature_constants.h.orig 2022-03-25 21:59:56 UTC +++ components/feature_engagement/public/feature_constants.h @@ -30,7 +30,7 @@ extern const base::Feature kUseClientConfigIPH; extern const base::Feature kIPHDummyFeature; @@ -9,8 +9,8 @@ extern const base::Feature kIPHDesktopSharedHighlightingFeature; extern const base::Feature kIPHDesktopTabGroupsNewGroupFeature; extern const base::Feature kIPHFocusHelpBubbleScreenReaderPromoFeature; -@@ -169,7 +169,7 @@ extern const base::Feature kIPHBadgedTranslateManualTr - extern const base::Feature kIPHDiscoverFeedHeaderFeature; +@@ -174,7 +174,7 @@ extern const base::Feature kIPHDiscoverFeedHeaderFeatu + extern const base::Feature kIPHDefaultSiteViewFeature; #endif // BUILDFLAG(IS_IOS) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc b/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc index 66db364cfcf7..2104017f79d2 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc @@ -1,7 +1,7 @@ ---- components/feature_engagement/public/feature_list.cc.orig 2022-02-28 16:54:41 UTC +--- components/feature_engagement/public/feature_list.cc.orig 2022-03-25 21:59:56 UTC +++ components/feature_engagement/public/feature_list.cc -@@ -117,7 +117,7 @@ const base::Feature* const kAllFeatures[] = { - &kIPHDiscoverFeedHeaderFeature, +@@ -121,7 +121,7 @@ const base::Feature* const kAllFeatures[] = { + &kIPHDefaultSiteViewFeature, #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) @@ -9,7 +9,7 @@ &kIPHDesktopTabGroupsNewGroupFeature, &kIPHFocusHelpBubbleScreenReaderPromoFeature, &kIPHGMCCastStartStopFeature, -@@ -138,7 +138,8 @@ const base::Feature* const kAllFeatures[] = { +@@ -143,7 +143,8 @@ const base::Feature* const kAllFeatures[] = { // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__list.h b/www/chromium/files/patch-components_feature__engagement_public_feature__list.h index c037ef9cd66f..c69822ee6d85 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_feature__list.h +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__list.h @@ -1,6 +1,6 @@ ---- components/feature_engagement/public/feature_list.h.orig 2022-02-28 16:54:41 UTC +--- components/feature_engagement/public/feature_list.h.orig 2022-03-25 21:59:56 UTC +++ components/feature_engagement/public/feature_list.h -@@ -223,7 +223,7 @@ DEFINE_VARIATION_PARAM(kIPHDiscoverFeedHeaderFeature, +@@ -224,7 +224,7 @@ DEFINE_VARIATION_PARAM(kIPHDefaultSiteViewFeature, "IP #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ DEFINE_VARIATION_PARAM(kIPHDesktopTabGroupsNewGroupFeature, "IPH_DesktopTabGroupsNewGroup"); DEFINE_VARIATION_PARAM(kIPHFocusModeFeature, "IPH_FocusMode"); -@@ -252,7 +252,8 @@ DEFINE_VARIATION_PARAM(kIPHDesktopSharedHighlightingFe +@@ -254,7 +254,8 @@ DEFINE_VARIATION_PARAM(kIPHDesktopSharedHighlightingFe // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -19,16 +19,16 @@ DEFINE_VARIATION_PARAM(kIPHAutofillVirtualCardSuggestionFeature, "IPH_AutofillVirtualCardSuggestion"); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || -@@ -356,7 +357,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation - VARIATION_ENTRY(kIPHBadgedTranslateManualTriggerFeature), +@@ -359,7 +360,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation VARIATION_ENTRY(kIPHDiscoverFeedHeaderFeature), + VARIATION_ENTRY(kIPHDefaultSiteViewFeature), #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(kIPHDesktopTabGroupsNewGroupFeature), VARIATION_ENTRY(kIPHFocusModeFeature), VARIATION_ENTRY(kIPHGlobalMediaControls), -@@ -378,7 +379,8 @@ constexpr flags_ui::FeatureEntry::FeatureVariation +@@ -382,7 +383,8 @@ constexpr flags_ui::FeatureEntry::FeatureVariation // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-components_feed_core_v2_feed__network__impl__unittest.cc b/www/chromium/files/patch-components_feed_core_v2_feed__network__impl__unittest.cc new file mode 100644 index 000000000000..fe893d3cd63c --- /dev/null +++ b/www/chromium/files/patch-components_feed_core_v2_feed__network__impl__unittest.cc @@ -0,0 +1,13 @@ +--- components/feed/core/v2/feed_network_impl_unittest.cc.orig 2022-03-25 21:59:56 UTC ++++ components/feed/core/v2/feed_network_impl_unittest.cc +@@ -678,8 +678,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()); +- EXPECT_EQ(1, client_info.app_version().major()); +- EXPECT_EQ(2, client_info.app_version().minor()); ++ EXPECT_EQ(1, client_info.app_version().gmajor()); ++ EXPECT_EQ(2, client_info.app_version().gminor()); + EXPECT_EQ(3, client_info.app_version().build()); + EXPECT_EQ(4, client_info.app_version().revision()); + EXPECT_FALSE(client_info.chrome_client_info().start_surface()); diff --git a/www/chromium/files/patch-components_feed_core_v2_test_proto__printer.cc b/www/chromium/files/patch-components_feed_core_v2_test_proto__printer.cc index 1417eaed0cb7..edb981e358cd 100644 --- a/www/chromium/files/patch-components_feed_core_v2_test_proto__printer.cc +++ b/www/chromium/files/patch-components_feed_core_v2_test_proto__printer.cc @@ -1,6 +1,6 @@ ---- components/feed/core/v2/test/proto_printer.cc.orig 2022-02-28 16:54:41 UTC +--- components/feed/core/v2/test/proto_printer.cc.orig 2022-03-25 21:59:56 UTC +++ components/feed/core/v2/test/proto_printer.cc -@@ -158,8 +158,8 @@ class TextProtoPrinter { +@@ -157,8 +157,8 @@ class TextProtoPrinter { } TextProtoPrinter& operator<<(const feedwire::Version& v) { BeginMessage(); diff --git a/www/chromium/files/patch-components_flags__ui_flags__state.cc b/www/chromium/files/patch-components_flags__ui_flags__state.cc index 565a4fa973a8..9883288acc3f 100644 --- a/www/chromium/files/patch-components_flags__ui_flags__state.cc +++ b/www/chromium/files/patch-components_flags__ui_flags__state.cc @@ -1,6 +1,6 @@ ---- components/flags_ui/flags_state.cc.orig 2022-02-28 16:54:41 UTC +--- components/flags_ui/flags_state.cc.orig 2022-03-25 21:59:56 UTC +++ components/flags_ui/flags_state.cc -@@ -654,7 +654,7 @@ unsigned short FlagsState::GetCurrentPlatform() { +@@ -622,7 +622,7 @@ unsigned short FlagsState::GetCurrentPlatform() { #elif BUILDFLAG(IS_CHROMEOS_ASH) return kOsCrOS; #elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ diff --git a/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator__unittest.cc b/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator__unittest.cc index efed2428c33e..9eae1a5f4628 100644 --- a/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator__unittest.cc +++ b/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator__unittest.cc @@ -1,6 +1,6 @@ ---- components/network_session_configurator/browser/network_session_configurator_unittest.cc.orig 2022-02-28 16:54:41 UTC +--- components/network_session_configurator/browser/network_session_configurator_unittest.cc.orig 2022-03-25 21:59:56 UTC +++ components/network_session_configurator/browser/network_session_configurator_unittest.cc -@@ -775,7 +775,7 @@ TEST_F(NetworkSessionConfiguratorTest, HostRules) { +@@ -776,7 +776,7 @@ TEST_F(NetworkSessionConfiguratorTest, HostRules) { } TEST_F(NetworkSessionConfiguratorTest, DefaultCacheBackend) { diff --git a/www/chromium/files/patch-components_password__manager_core_browser_login__database.cc b/www/chromium/files/patch-components_password__manager_core_browser_login__database.cc index 29b53c8ff4a1..fa4bd12efa86 100644 --- a/www/chromium/files/patch-components_password__manager_core_browser_login__database.cc +++ b/www/chromium/files/patch-components_password__manager_core_browser_login__database.cc @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/login_database.cc.orig 2022-02-28 16:54:41 UTC +--- components/password_manager/core/browser/login_database.cc.orig 2022-03-25 21:59:56 UTC +++ components/password_manager/core/browser/login_database.cc -@@ -645,7 +645,7 @@ std::string GeneratePlaceholders(size_t count) { +@@ -664,7 +664,7 @@ std::string GeneratePlaceholders(size_t count) { return result; } @@ -9,7 +9,7 @@ // Fills |form| with necessary data required to be removed from the database // and returns it. PasswordForm GetFormForRemoval(sql::Statement& statement) { -@@ -662,7 +662,7 @@ PasswordForm GetFormForRemoval(sql::Statement& stateme +@@ -681,7 +681,7 @@ PasswordForm GetFormForRemoval(sql::Statement& stateme // Whether we should try to return the decryptable passwords while the // encryption service fails for some passwords. bool ShouldReturnPartialPasswords() { @@ -18,7 +18,7 @@ return base::FeatureList::IsEnabled(features::kSkipUndecryptablePasswords); #else return false; -@@ -1473,7 +1473,7 @@ bool LoginDatabase::DeleteAndRecreateDatabaseFile() { +@@ -1488,7 +1488,7 @@ bool LoginDatabase::DeleteAndRecreateDatabaseFile() { } DatabaseCleanupResult LoginDatabase::DeleteUndecryptableLogins() { diff --git a/www/chromium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc b/www/chromium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc index d69fe4423148..26498c7c7e42 100644 --- a/www/chromium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc +++ b/www/chromium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/sync/password_sync_bridge.cc.orig 2022-02-28 16:54:41 UTC +--- components/password_manager/core/browser/sync/password_sync_bridge.cc.orig 2022-03-25 21:59:56 UTC +++ components/password_manager/core/browser/sync/password_sync_bridge.cc -@@ -181,7 +181,7 @@ bool ShouldRecoverPasswordsDuringMerge() { +@@ -185,7 +185,7 @@ bool ShouldRecoverPasswordsDuringMerge() { // Delete the local undecryptable copy when this is MacOS only. #if BUILDFLAG(IS_MAC) return true; @@ -9,3 +9,12 @@ return base::FeatureList::IsEnabled( features::kSyncUndecryptablePasswordsLinux); #else +@@ -194,7 +194,7 @@ bool ShouldRecoverPasswordsDuringMerge() { + } + + bool ShouldCleanSyncMetadataDuringStartupWhenDecryptionFails() { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return ShouldRecoverPasswordsDuringMerge() && + base::FeatureList::IsEnabled( + features::kForceInitialSyncWhenDecryptionFails); diff --git a/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.cc b/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.cc index 90c56fa6a632..e65ec45dff2b 100644 --- a/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.cc +++ b/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.cc @@ -1,6 +1,15 @@ ---- components/password_manager/core/common/password_manager_features.cc.orig 2022-02-28 16:54:41 UTC +--- components/password_manager/core/common/password_manager_features.cc.orig 2022-03-25 21:59:56 UTC +++ components/password_manager/core/common/password_manager_features.cc -@@ -133,7 +133,7 @@ const base::Feature kReparseServerPredictionsFollowing +@@ -63,7 +63,7 @@ const base::Feature kFillingAcrossAffiliatedWebsites{ + const base::Feature kFillOnAccountSelect = {"fill-on-account-select", + base::FEATURE_DISABLED_BY_DEFAULT}; + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // When enabled, initial sync will be forced during startup if the password + // store has encryption service failures. + const base::Feature kForceInitialSyncWhenDecryptionFails = { +@@ -145,7 +145,7 @@ const base::Feature kReparseServerPredictionsFollowing const base::Feature kSecondaryServerFieldPredictions = { "SecondaryServerFieldPredictions", base::FEATURE_ENABLED_BY_DEFAULT}; @@ -9,7 +18,7 @@ // Displays at least the decryptable and never saved logins in the password // manager const base::Feature kSkipUndecryptablePasswords = { -@@ -145,7 +145,7 @@ const base::Feature kSkipUndecryptablePasswords = { +@@ -157,7 +157,7 @@ const base::Feature kSkipUndecryptablePasswords = { const base::Feature kSupportForAddPasswordsInSettings = { "SupportForAddPasswordsInSettings", base::FEATURE_DISABLED_BY_DEFAULT}; diff --git a/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.h b/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.h index 7015043a1e54..d0cc356e9793 100644 --- a/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.h +++ b/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.h @@ -1,6 +1,15 @@ ---- components/password_manager/core/common/password_manager_features.h.orig 2022-02-28 16:54:41 UTC +--- components/password_manager/core/common/password_manager_features.h.orig 2022-03-25 21:59:56 UTC +++ components/password_manager/core/common/password_manager_features.h -@@ -41,11 +41,11 @@ extern const base::Feature kPasswordScriptsFetching; +@@ -27,7 +27,7 @@ extern const base::Feature kEnablePasswordsAccountStor + extern const base::Feature KEnablePasswordGenerationForClearTextFields; + extern const base::Feature kFillingAcrossAffiliatedWebsites; + extern const base::Feature kFillOnAccountSelect; +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + extern const base::Feature kForceInitialSyncWhenDecryptionFails; + #endif + extern const base::Feature kInferConfirmationPasswordField; +@@ -46,11 +46,11 @@ extern const base::Feature kPasswordScriptsFetching; extern const base::Feature kRecoverFromNeverSaveAndroid; extern const base::Feature kReparseServerPredictionsFollowingFormChange; extern const base::Feature kSecondaryServerFieldPredictions; @@ -13,4 +22,4 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) extern const base::Feature kSyncUndecryptablePasswordsLinux; #endif - extern const base::Feature kTreatNewPasswordHeuristicsAsReliable; + #if BUILDFLAG(IS_ANDROID) diff --git a/www/chromium/files/patch-components_performance__manager_features.cc b/www/chromium/files/patch-components_performance__manager_features.cc index 2fe2b7ab26f1..7b2cf0e5cd42 100644 --- a/www/chromium/files/patch-components_performance__manager_features.cc +++ b/www/chromium/files/patch-components_performance__manager_features.cc @@ -1,6 +1,6 @@ ---- components/performance_manager/features.cc.orig 2022-02-28 16:54:41 UTC +--- components/performance_manager/features.cc.orig 2022-03-25 21:59:56 UTC +++ components/performance_manager/features.cc -@@ -22,7 +22,7 @@ const base::Feature kUrgentDiscardingFromPerformanceMa +@@ -21,7 +21,7 @@ const base::Feature kUrgentDiscardingFromPerformanceMa "UrgentDiscardingFromPerformanceManager", // Ash Chrome uses memory pressure evaluator instead of performance manager to // discard tabs. diff --git a/www/chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc b/www/chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc index bc5c13d1421c..0a9241a18d31 100644 --- a/www/chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc +++ b/www/chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc @@ -1,6 +1,6 @@ ---- components/policy/core/browser/policy_pref_mapping_test.cc.orig 2022-02-28 16:54:41 UTC +--- components/policy/core/browser/policy_pref_mapping_test.cc.orig 2022-03-25 21:59:56 UTC +++ components/policy/core/browser/policy_pref_mapping_test.cc -@@ -340,7 +340,7 @@ class PolicyTestCase { +@@ -342,7 +342,7 @@ class PolicyTestCase { const std::string os("chromeos_lacros"); #elif BUILDFLAG(IS_IOS) const std::string os("ios"); diff --git a/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc b/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc index 65851aa0cb0a..2e38c9d03cc8 100644 --- a/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc +++ b/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc @@ -1,6 +1,6 @@ ---- components/policy/core/common/cloud/cloud_policy_client.cc.orig 2022-02-28 16:54:41 UTC +--- components/policy/core/common/cloud/cloud_policy_client.cc.orig 2022-03-25 21:59:56 UTC +++ components/policy/core/common/cloud/cloud_policy_client.cc -@@ -419,7 +419,7 @@ void CloudPolicyClient::FetchPolicy() { +@@ -417,7 +417,7 @@ void CloudPolicyClient::FetchPolicy() { fetch_request->set_invalidation_payload(invalidation_payload_); } } diff --git a/www/chromium/files/patch-components_policy_resources_policy__templates.json b/www/chromium/files/patch-components_policy_resources_policy__templates.json index 2bf0187772d6..00a3ac1a04ec 100644 --- a/www/chromium/files/patch-components_policy_resources_policy__templates.json +++ b/www/chromium/files/patch-components_policy_resources_policy__templates.json @@ -1,6 +1,6 @@ ---- components/policy/resources/policy_templates.json.orig 2022-02-28 16:54:41 UTC +--- components/policy/resources/policy_templates.json.orig 2022-03-25 21:59:56 UTC +++ components/policy/resources/policy_templates.json -@@ -1410,7 +1410,7 @@ +@@ -1430,7 +1430,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -9,7 +9,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -2512,7 +2512,7 @@ +@@ -2534,7 +2534,7 @@ 'owners': ['file://remoting/OWNERS', 'jamiewalch@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -18,7 +18,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -4244,7 +4244,7 @@ +@@ -4300,7 +4300,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -27,7 +27,7 @@ 'features': { 'dynamic_refresh': False, 'per_profile': False, -@@ -4273,7 +4273,7 @@ +@@ -4329,7 +4329,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], 'type': 'string', 'schema': { 'type': 'string' }, @@ -36,7 +36,7 @@ 'features': { 'dynamic_refresh': False, 'per_profile': False, -@@ -5187,7 +5187,7 @@ +@@ -5262,7 +5262,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -45,7 +45,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -5248,7 +5248,7 @@ +@@ -5323,7 +5323,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], 'type': 'string', 'schema': { 'type': 'string' }, @@ -54,7 +54,7 @@ 'features': { 'dynamic_refresh': False, 'per_profile': False, -@@ -5314,7 +5314,7 @@ +@@ -5389,7 +5389,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -63,7 +63,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -10099,7 +10099,7 @@ +@@ -10460,7 +10460,7 @@ 'owners': ['file://net/cert/OWNERS', 'rsleevi@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -72,7 +72,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -10193,7 +10193,7 @@ +@@ -10554,7 +10554,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'pmarko@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -81,7 +81,7 @@ 'features': { 'dynamic_refresh': False, 'per_profile': False, -@@ -12163,7 +12163,7 @@ +@@ -12551,7 +12551,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'pmarko@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -90,7 +90,7 @@ 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -13021,7 +13021,7 @@ +@@ -13409,7 +13409,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -99,7 +99,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': True, -@@ -19891,7 +19891,7 @@ +@@ -20284,7 +20284,7 @@ 'items': { 'type': 'string' } }, # Spell checking is provided by macOS, so can't be controlled on Mac. @@ -108,7 +108,7 @@ 'features': { 'can_be_recommended': False, 'dynamic_refresh': True, -@@ -19922,7 +19922,7 @@ +@@ -20315,7 +20315,7 @@ 'items': { 'type': 'string' } }, # Spell checking is provided by macOS, so can't be controlled on Mac. @@ -117,7 +117,7 @@ 'deprecated': True, 'features': { 'can_be_recommended': False, -@@ -19956,7 +19956,7 @@ +@@ -20349,7 +20349,7 @@ 'items': { 'type': 'string' } }, # Spell checking is provided by macOS, so can't be controlled on Mac. @@ -126,7 +126,7 @@ 'features': { 'can_be_recommended': False, 'dynamic_refresh': True, -@@ -20694,7 +20694,7 @@ +@@ -21087,7 +21087,7 @@ 'owners': ['fbeaufort@chromium.org', 'beccahughes@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -135,7 +135,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': True, -@@ -24924,7 +24924,7 @@ +@@ -25361,7 +25361,7 @@ 'owners': ['file://services/audio/OWNERS', 'dalecurtis@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -144,7 +144,7 @@ 'features': { 'dynamic_refresh': False, 'per_profile': False, -@@ -26266,7 +26266,7 @@ If this policy is left unset, privacy screen is disabl +@@ -26703,7 +26703,7 @@ If this policy is left unset, privacy screen is disabl 'owners': ['file://chrome/browser/notifications/OWNERS', 'knollr@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -153,7 +153,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': True, -@@ -26290,7 +26290,7 @@ If set to False, <ph name="PRODUCT_NAME">$1<ex>Google +@@ -26727,7 +26727,7 @@ If set to False, <ph name="PRODUCT_NAME">$1<ex>Google 'owners': ['file://chrome/browser/notifications/OWNERS'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -162,7 +162,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': True, -@@ -27357,7 +27357,7 @@ If you disable this policy, web page scrolling to spec +@@ -27796,7 +27796,7 @@ If you disable this policy, web page scrolling to spec 'owners': ['asumaneev@google.com'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -171,7 +171,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -28593,7 +28593,7 @@ When this policy is set, <ph name="PRODUCT_OS_NAME">$2 +@@ -29032,7 +29032,7 @@ When this policy is set, <ph name="PRODUCT_OS_NAME">$2 }, ], 'default': True, @@ -180,7 +180,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': True, -@@ -28726,7 +28726,7 @@ When this policy is set, <ph name="PRODUCT_OS_NAME">$2 +@@ -29165,7 +29165,7 @@ When this policy is set, <ph name="PRODUCT_OS_NAME">$2 'owners': ['mattm@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, diff --git a/www/chromium/files/patch-components_policy_tools_generate__policy__source.py b/www/chromium/files/patch-components_policy_tools_generate__policy__source.py index 59fcf22771d0..c73eaa782933 100644 --- a/www/chromium/files/patch-components_policy_tools_generate__policy__source.py +++ b/www/chromium/files/patch-components_policy_tools_generate__policy__source.py @@ -1,6 +1,6 @@ ---- components/policy/tools/generate_policy_source.py.orig 2022-02-28 16:54:41 UTC +--- components/policy/tools/generate_policy_source.py.orig 2022-03-25 21:59:56 UTC +++ components/policy/tools/generate_policy_source.py -@@ -48,8 +48,10 @@ PLATFORM_STRINGS = { +@@ -49,8 +49,10 @@ PLATFORM_STRINGS = { 'ios': ['ios'], 'chrome.win': ['win'], 'chrome.linux': ['linux'], diff --git a/www/chromium/files/patch-components_safe__browsing_content_common_file__type__policies__unittest.cc b/www/chromium/files/patch-components_safe__browsing_content_common_file__type__policies__unittest.cc index 99528878ff75..92f539f394ef 100644 --- a/www/chromium/files/patch-components_safe__browsing_content_common_file__type__policies__unittest.cc +++ b/www/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 2022-02-28 16:54:41 UTC +--- components/safe_browsing/content/common/file_type_policies_unittest.cc.orig 2022-03-25 21:59:56 UTC +++ components/safe_browsing/content/common/file_type_policies_unittest.cc -@@ -137,7 +137,7 @@ TEST_F(FileTypePoliciesTest, UnpackResourceBundle) { +@@ -139,7 +139,7 @@ TEST_F(FileTypePoliciesTest, UnpackResourceBundle) { EXPECT_EQ(DownloadFileType::FULL_PING, file_type.ping_setting()); // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-components_translate_core_common_translate__util.cc b/www/chromium/files/patch-components_translate_core_common_translate__util.cc index a3eb057ee635..4900fdacbfee 100644 --- a/www/chromium/files/patch-components_translate_core_common_translate__util.cc +++ b/www/chromium/files/patch-components_translate_core_common_translate__util.cc @@ -1,11 +1,11 @@ ---- components/translate/core/common/translate_util.cc.orig 2022-02-28 16:54:41 UTC +--- components/translate/core/common/translate_util.cc.orig 2022-03-25 21:59:56 UTC +++ components/translate/core/common/translate_util.cc -@@ -29,7 +29,7 @@ const base::Feature kTranslateSubFrames{"TranslateSubF +@@ -34,7 +34,7 @@ const base::Feature kTranslateSubFrames{"TranslateSubF const base::Feature kTFLiteLanguageDetectionEnabled{ "TFLiteLanguageDetectionEnabled", #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ -- BUILDFLAG(IS_MAC) -+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT diff --git a/www/chromium/files/patch-components_viz_common_features.cc b/www/chromium/files/patch-components_viz_common_features.cc index 932c678c81ce..b02fcace4727 100644 --- a/www/chromium/files/patch-components_viz_common_features.cc +++ b/www/chromium/files/patch-components_viz_common_features.cc @@ -1,6 +1,6 @@ ---- components/viz/common/features.cc.orig 2022-02-28 16:54:41 UTC +--- components/viz/common/features.cc.orig 2022-03-25 21:59:56 UTC +++ components/viz/common/features.cc -@@ -64,7 +64,7 @@ const base::Feature kUseSkiaRenderer { +@@ -67,7 +67,7 @@ const base::Feature kUseSkiaRenderer { "UseSkiaRenderer", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || \ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc b/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc index bbc943db0a0b..469d430a5dbd 100644 --- a/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc +++ b/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc @@ -1,6 +1,6 @@ ---- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2022-02-28 16:54:41 UTC +--- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2022-03-25 21:59:56 UTC +++ components/viz/service/display_embedder/skia_output_surface_impl.cc -@@ -1162,7 +1162,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor +@@ -1171,7 +1171,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor ->GetDeviceQueue() ->GetVulkanPhysicalDevice(), VK_IMAGE_TILING_OPTIMAL, ycbcr_info); diff --git a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc index 766f57bd5ff3..c517b2b3498c 100644 --- a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc +++ b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc @@ -1,6 +1,6 @@ ---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2022-03-16 08:38:25 UTC +--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2022-03-25 21:59:56 UTC +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc -@@ -61,7 +61,7 @@ RootCompositorFrameSinkImpl::Create( +@@ -97,7 +97,7 @@ RootCompositorFrameSinkImpl::Create( // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -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); -@@ -526,7 +526,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw +@@ -569,7 +569,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw display_client_->DidCompleteSwapWithSize(pixel_size); // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h index de2571e33adf..d7edfe42c46e 100644 --- a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h +++ b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h @@ -1,6 +1,6 @@ ---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig 2022-02-28 16:54:41 UTC +--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig 2022-03-25 21:59:56 UTC +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h -@@ -189,7 +189,7 @@ class VIZ_SERVICE_EXPORT RootCompositorFrameSinkImpl +@@ -196,7 +196,7 @@ class VIZ_SERVICE_EXPORT RootCompositorFrameSinkImpl // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-content_app_content__main.cc b/www/chromium/files/patch-content_app_content__main.cc index eab8b277ef8a..55ca38650404 100644 --- a/www/chromium/files/patch-content_app_content__main.cc +++ b/www/chromium/files/patch-content_app_content__main.cc @@ -1,7 +1,7 @@ ---- content/app/content_main.cc.orig 2022-02-28 16:54:41 UTC +--- content/app/content_main.cc.orig 2022-03-25 21:59:56 UTC +++ content/app/content_main.cc -@@ -252,7 +252,7 @@ RunContentProcess(ContentMainParams params, - #endif +@@ -254,7 +254,7 @@ RunContentProcess(ContentMainParams params, + base::allocator::InstallDanglingRawPtrChecks(); base::EnableTerminationOnOutOfMemory(); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-content_app_content__main__runner__impl.cc b/www/chromium/files/patch-content_app_content__main__runner__impl.cc index e948fb0ebca3..a7f2d06d96eb 100644 --- a/www/chromium/files/patch-content_app_content__main__runner__impl.cc +++ b/www/chromium/files/patch-content_app_content__main__runner__impl.cc @@ -1,4 +1,4 @@ ---- content/app/content_main_runner_impl.cc.orig 2022-02-28 16:54:41 UTC +--- content/app/content_main_runner_impl.cc.orig 2022-03-25 21:59:56 UTC +++ content/app/content_main_runner_impl.cc @@ -130,13 +130,13 @@ #include "base/posix/global_descriptors.h" @@ -27,7 +27,7 @@ #if BUILDFLAG(IS_ANDROID) #include "base/system/sys_info.h" #include "components/power_scheduler/power_scheduler.h" -@@ -335,7 +339,7 @@ void InitializeZygoteSandboxForBrowserProcess( +@@ -340,7 +344,7 @@ void InitializeZygoteSandboxForBrowserProcess( } #endif // BUILDFLAG(USE_ZYGOTE_HANDLE) @@ -36,23 +36,16 @@ #if BUILDFLAG(ENABLE_PLUGINS) // Loads the (native) libraries but does not initialize them (i.e., does not -@@ -371,11 +375,14 @@ void PreloadLibraryCdms() { +@@ -376,7 +380,7 @@ void PreloadLibraryCdms() { } #endif // BUILDFLAG(ENABLE_LIBRARY_CDMS) -#if BUILDFLAG(USE_ZYGOTE_HANDLE) +#if BUILDFLAG(USE_ZYGOTE_HANDLE) || BUILDFLAG(IS_BSD) void PreSandboxInit() { -+ // arc4random -+#if !BUILDFLAG(IS_BSD) // Pre-acquire resources needed by BoringSSL. See // https://boringssl.googlesource.com/boringssl/+/HEAD/SANDBOXING.md - CRYPTO_pre_sandbox_init(); -+#endif - - #if BUILDFLAG(ENABLE_PLUGINS) - // Ensure access to the Pepper plugins before the sandbox is turned on. -@@ -387,6 +394,11 @@ void PreSandboxInit() { +@@ -392,6 +396,11 @@ void PreSandboxInit() { #endif InitializeWebRtcModule(); @@ -64,7 +57,7 @@ // Set the android SkFontMgr for blink. We need to ensure this is done // before the sandbox is initialized to allow the font manager to access // font configuration files on disk. -@@ -556,7 +568,7 @@ int NO_STACK_PROTECTOR RunZygote(ContentMainDelegate* +@@ -561,7 +570,7 @@ int NO_STACK_PROTECTOR RunZygote(ContentMainDelegate* delegate->ZygoteStarting(&zygote_fork_delegates); media::InitializeMediaLibrary(); @@ -73,7 +66,7 @@ PreSandboxInit(); #endif -@@ -732,11 +744,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -747,11 +756,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam kFieldTrialDescriptor + base::GlobalDescriptors::kBaseDescriptor); #endif // !BUILDFLAG(IS_ANDROID) @@ -87,7 +80,7 @@ #endif // !BUILDFLAG(IS_WIN) -@@ -925,6 +936,16 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -949,6 +957,16 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam } #endif @@ -104,7 +97,7 @@ delegate_->SandboxInitialized(process_type); #if BUILDFLAG(USE_ZYGOTE_HANDLE) -@@ -980,7 +1001,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { +@@ -1004,7 +1022,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { mojo::core::InitFeatures(); } @@ -113,7 +106,7 @@ // If dynamic Mojo Core is being used, ensure that it's loaded very early in // the child/zygote process, before any sandbox is initialized. The library // is not fully initialized with IPC support until a ChildProcess is later -@@ -1013,6 +1034,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { +@@ -1037,6 +1055,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { content_main_params_.reset(); RegisterMainThreadFactories(); diff --git a/www/chromium/files/patch-content_browser_BUILD.gn b/www/chromium/files/patch-content_browser_BUILD.gn index 945f6dd7e7a9..8b8917c871e7 100644 --- a/www/chromium/files/patch-content_browser_BUILD.gn +++ b/www/chromium/files/patch-content_browser_BUILD.gn @@ -1,6 +1,6 @@ ---- content/browser/BUILD.gn.orig 2022-02-28 16:54:41 UTC +--- content/browser/BUILD.gn.orig 2022-03-25 21:59:56 UTC +++ content/browser/BUILD.gn -@@ -2318,6 +2318,13 @@ source_set("browser") { +@@ -2331,6 +2331,13 @@ source_set("browser") { ] } diff --git a/www/chromium/files/patch-content_browser_browser__child__process__host__impl.cc b/www/chromium/files/patch-content_browser_browser__child__process__host__impl.cc index 3296411f0ee5..e599a1e02682 100644 --- a/www/chromium/files/patch-content_browser_browser__child__process__host__impl.cc +++ b/www/chromium/files/patch-content_browser_browser__child__process__host__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/browser_child_process_host_impl.cc.orig 2022-02-28 16:54:41 UTC +--- content/browser/browser_child_process_host_impl.cc.orig 2022-03-25 21:59:56 UTC +++ content/browser/browser_child_process_host_impl.cc -@@ -293,6 +293,7 @@ void BrowserChildProcessHostImpl::LaunchWithoutExtraCo +@@ -292,6 +292,7 @@ void BrowserChildProcessHostImpl::LaunchWithoutExtraCo switches::kDisableBestEffortTasks, switches::kDisableLogging, switches::kEnableLogging, diff --git a/www/chromium/files/patch-content_browser_browser__main__loop.cc b/www/chromium/files/patch-content_browser_browser__main__loop.cc index 416938efc96e..57e2deee4f31 100644 --- a/www/chromium/files/patch-content_browser_browser__main__loop.cc +++ b/www/chromium/files/patch-content_browser_browser__main__loop.cc @@ -1,6 +1,6 @@ ---- content/browser/browser_main_loop.cc.orig 2022-02-28 16:54:41 UTC +--- content/browser/browser_main_loop.cc.orig 2022-03-25 21:59:56 UTC +++ content/browser/browser_main_loop.cc -@@ -239,6 +239,12 @@ +@@ -240,6 +240,12 @@ #include "mojo/public/cpp/bindings/lib/test_random_mojo_delays.h" #endif @@ -13,7 +13,7 @@ // One of the linux specific headers defines this as a macro. #ifdef DestroyAll #undef DestroyAll -@@ -546,6 +552,12 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -547,6 +553,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 -@@ -573,7 +585,7 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -574,7 +586,7 @@ int BrowserMainLoop::EarlyInitialization() { // Up the priority of the UI thread unless it was already high (since Mac // and recent versions of Android (O+) do this automatically). @@ -35,7 +35,7 @@ if (base::FeatureList::IsEnabled( features::kBrowserUseDisplayThreadPriority) && base::PlatformThread::GetCurrentThreadPriority() < -@@ -584,7 +596,7 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -585,7 +597,7 @@ int BrowserMainLoop::EarlyInitialization() { #endif // !BUILDFLAG(IS_MAC) #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/chromium/files/patch-content_browser_compute__pressure_cpu__probe.cc b/www/chromium/files/patch-content_browser_compute__pressure_cpu__probe.cc index e19941607612..8ea22305922e 100644 --- a/www/chromium/files/patch-content_browser_compute__pressure_cpu__probe.cc +++ b/www/chromium/files/patch-content_browser_compute__pressure_cpu__probe.cc @@ -1,6 +1,6 @@ ---- content/browser/compute_pressure/cpu_probe.cc.orig 2022-02-28 16:54:41 UTC +--- content/browser/compute_pressure/cpu_probe.cc.orig 2022-03-25 21:59:56 UTC +++ content/browser/compute_pressure/cpu_probe.cc -@@ -52,6 +52,7 @@ std::unique_ptr<CpuProbe> CpuProbe::Create() { +@@ -53,6 +53,7 @@ std::unique_ptr<CpuProbe> CpuProbe::Create() { #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) return CpuProbeLinux::Create(); #else diff --git a/www/chromium/files/patch-content_browser_download_download__manager__impl.cc b/www/chromium/files/patch-content_browser_download_download__manager__impl.cc index 6c0935abc37e..722a9973f0e4 100644 --- a/www/chromium/files/patch-content_browser_download_download__manager__impl.cc +++ b/www/chromium/files/patch-content_browser_download_download__manager__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/download/download_manager_impl.cc.orig 2022-02-28 16:54:41 UTC +--- content/browser/download/download_manager_impl.cc.orig 2022-03-25 21:59:56 UTC +++ content/browser/download/download_manager_impl.cc -@@ -88,7 +88,7 @@ +@@ -89,7 +89,7 @@ #include "third_party/blink/public/common/storage_key/storage_key.h" #include "url/origin.h" @@ -9,7 +9,7 @@ #include "base/nix/xdg_util.h" #endif -@@ -235,7 +235,7 @@ class DownloadItemFactoryImpl : public download::Downl +@@ -217,7 +217,7 @@ class DownloadItemFactoryImpl : public download::Downl } }; @@ -18,7 +18,7 @@ base::FilePath GetTemporaryDownloadDirectory() { std::unique_ptr<base::Environment> env(base::Environment::Create()); return base::nix::GetXDGDirectory(env.get(), "XDG_DATA_HOME", ".local/share"); -@@ -591,7 +591,7 @@ bool DownloadManagerImpl::InterceptDownload( +@@ -653,7 +653,7 @@ bool DownloadManagerImpl::InterceptDownload( base::FilePath DownloadManagerImpl::GetDefaultDownloadDirectory() { base::FilePath default_download_directory; diff --git a/www/chromium/files/patch-content_browser_font__access_font__enumeration__cache.h b/www/chromium/files/patch-content_browser_font__access_font__enumeration__cache.h deleted file mode 100644 index 49353a16e924..000000000000 --- a/www/chromium/files/patch-content_browser_font__access_font__enumeration__cache.h +++ /dev/null @@ -1,11 +0,0 @@ ---- content/browser/font_access/font_enumeration_cache.h.orig 2022-02-28 16:54:41 UTC -+++ content/browser/font_access/font_enumeration_cache.h -@@ -24,7 +24,7 @@ - #include "third_party/blink/public/mojom/font_access/font_access.mojom.h" - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ -- BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - #define PLATFORM_HAS_LOCAL_FONT_ENUMERATION_IMPL 1 - #endif - diff --git a/www/chromium/files/patch-content_browser_font__access_font__enumeration__data__source.cc b/www/chromium/files/patch-content_browser_font__access_font__enumeration__data__source.cc new file mode 100644 index 000000000000..17bc66a73cb3 --- /dev/null +++ b/www/chromium/files/patch-content_browser_font__access_font__enumeration__data__source.cc @@ -0,0 +1,29 @@ +--- content/browser/font_access/font_enumeration_data_source.cc.orig 2022-03-25 21:59:56 UTC ++++ content/browser/font_access/font_enumeration_data_source.cc +@@ -16,7 +16,7 @@ + #include "content/browser/font_access/font_enumeration_data_source_win.h" + #elif BUILDFLAG(IS_MAC) + #include "content/browser/font_access/font_enumeration_data_source_mac.h" +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include "content/browser/font_access/font_enumeration_data_source_linux.h" + #endif // BUILDFLAG(IS_WIN) + +@@ -61,7 +61,7 @@ std::unique_ptr<FontEnumerationDataSource> FontEnumera + return std::make_unique<FontEnumerationDataSourceWin>(); + #elif BUILDFLAG(IS_MAC) + return std::make_unique<FontEnumerationDataSourceMac>(); +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + return std::make_unique<FontEnumerationDataSourceLinux>(); + #else + return std::make_unique<FontEnumerationDataSourceNull>(); +@@ -76,7 +76,7 @@ bool FontEnumerationDataSource::IsOsSupportedForTestin + return true; + #elif BUILDFLAG(IS_MAC) + return true; +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + return true; + #else + return false; diff --git a/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc b/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc deleted file mode 100644 index 0315e9024c30..000000000000 --- a/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2022-02-28 16:54:41 UTC -+++ content/browser/gpu/gpu_data_manager_impl_private.cc -@@ -1340,7 +1340,7 @@ void GpuDataManagerImplPrivate::AppendGpuCommandLine( - break; - case gpu::GpuMode::SWIFTSHADER: { - bool legacy_software_gl = true; --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - // This setting makes WebGL run on SwANGLE instead of SwiftShader GL. - legacy_software_gl = false; - #endif diff --git a/www/chromium/files/patch-content_browser_media_media__keys__listener__manager__impl.cc b/www/chromium/files/patch-content_browser_media_media__keys__listener__manager__impl.cc index 243da28c2a93..38782a596d7c 100644 --- a/www/chromium/files/patch-content_browser_media_media__keys__listener__manager__impl.cc +++ b/www/chromium/files/patch-content_browser_media_media__keys__listener__manager__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/media/media_keys_listener_manager_impl.cc.orig 2022-02-28 16:54:41 UTC +--- content/browser/media/media_keys_listener_manager_impl.cc.orig 2022-03-25 21:59:56 UTC +++ content/browser/media/media_keys_listener_manager_impl.cc -@@ -226,7 +226,7 @@ void MediaKeysListenerManagerImpl::StartListeningForMe +@@ -232,7 +232,7 @@ void MediaKeysListenerManagerImpl::StartListeningForMe // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ diff --git a/www/chromium/files/patch-content_browser_memory_swap__metrics__driver__impl__linux.cc b/www/chromium/files/patch-content_browser_memory_swap__metrics__driver__impl__linux.cc deleted file mode 100644 index 0ff52eb54e68..000000000000 --- a/www/chromium/files/patch-content_browser_memory_swap__metrics__driver__impl__linux.cc +++ /dev/null @@ -1,16 +0,0 @@ ---- content/browser/memory/swap_metrics_driver_impl_linux.cc.orig 2022-02-07 13:39:41 UTC -+++ content/browser/memory/swap_metrics_driver_impl_linux.cc -@@ -44,9 +44,13 @@ SwapMetricsDriverImplLinux::~SwapMetricsDriverImplLinu - SwapMetricsDriver::SwapMetricsUpdateResult - SwapMetricsDriverImplLinux::UpdateMetricsInternal(base::TimeDelta interval) { - base::VmStatInfo vmstat; -+#if !defined(OS_BSD) - if (!base::GetVmStatInfo(&vmstat)) { - return SwapMetricsDriver::SwapMetricsUpdateResult::kSwapMetricsUpdateFailed; - } -+#else -+ return SwapMetricsDriver::SwapMetricsUpdateResult::kSwapMetricsUpdateFailed; -+#endif - - uint64_t in_counts = vmstat.pswpin - last_pswpin_; - uint64_t out_counts = vmstat.pswpout - last_pswpout_; diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc index 1fd360656992..8ae018274219 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_process_host_impl.cc.orig 2022-02-28 16:54:41 UTC +--- content/browser/renderer_host/render_process_host_impl.cc.orig 2022-03-25 21:59:56 UTC +++ content/browser/renderer_host/render_process_host_impl.cc -@@ -206,7 +206,7 @@ +@@ -208,7 +208,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 -@@ -1226,7 +1226,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = +@@ -1228,7 +1228,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; -@@ -1313,7 +1313,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public +@@ -1315,7 +1315,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public return; } @@ -27,7 +27,7 @@ if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) { ConnectToFontService(std::move(font_receiver)); return; -@@ -3321,6 +3321,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin +@@ -3332,6 +3332,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin switches::kDisableSpeechAPI, switches::kDisableThreadedCompositing, switches::kDisableTouchDragDrop, diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h index cb3119b35d04..8a83d054fa11 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h +++ b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_process_host_impl.h.orig 2022-02-28 16:54:41 UTC +--- content/browser/renderer_host/render_process_host_impl.h.orig 2022-03-25 21:59:56 UTC +++ content/browser/renderer_host/render_process_host_impl.h -@@ -464,7 +464,7 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -465,7 +465,7 @@ class CONTENT_EXPORT RenderProcessHostImpl // Sets this RenderProcessHost to be guest only. For Testing only. void SetForGuestsOnlyForTesting(); diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc index 9158f197433d..4bab4e2ebd84 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc @@ -1,4 +1,4 @@ ---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2022-02-28 16:54:41 UTC +--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2022-03-25 21:59:56 UTC +++ content/browser/renderer_host/render_widget_host_view_aura.cc @@ -115,7 +115,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/linux/text_edit_key_bindings_delegate_auralinux.h" -@@ -429,7 +429,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge +@@ -453,7 +453,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge if (manager) return ToBrowserAccessibilityWin(manager->GetRoot())->GetCOM(); @@ -18,7 +18,7 @@ BrowserAccessibilityManager* manager = host()->GetOrCreateRootBrowserAccessibilityManager(); if (manager && manager->GetRoot()) -@@ -1552,7 +1552,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() { +@@ -1576,7 +1576,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() { return GetTextInputManager() && GetTextInputManager()->should_do_learning(); } @@ -27,7 +27,7 @@ bool RenderWidgetHostViewAura::SetCompositionFromExistingText( const gfx::Range& range, const std::vector<ui::ImeTextSpan>& ui_ime_text_spans) { -@@ -2369,7 +2369,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { +@@ -2412,7 +2412,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { } bool RenderWidgetHostViewAura::NeedsMouseCapture() { @@ -36,7 +36,7 @@ return NeedsInputGrab(); #else return false; -@@ -2546,7 +2546,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit +@@ -2604,7 +2604,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit if (!target_host) return; diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h index 2402532468e0..fa2816bbcf39 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h +++ b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_widget_host_view_aura.h.orig 2022-02-28 16:54:41 UTC +--- content/browser/renderer_host/render_widget_host_view_aura.h.orig 2022-03-25 21:59:56 UTC +++ content/browser/renderer_host/render_widget_host_view_aura.h -@@ -240,7 +240,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura +@@ -243,7 +243,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura ukm::SourceId GetClientSourceForMetrics() const override; bool ShouldDoLearning() override; diff --git a/www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc b/www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc index 18a0445bf99f..781760a7f4a7 100644 --- a/www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc +++ b/www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc @@ -1,4 +1,4 @@ ---- content/browser/web_contents/web_contents_view_aura.cc.orig 2022-02-28 16:54:41 UTC +--- content/browser/web_contents/web_contents_view_aura.cc.orig 2022-03-25 21:59:56 UTC +++ content/browser/web_contents/web_contents_view_aura.cc @@ -159,7 +159,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. -@@ -1312,7 +1312,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/chromium/files/patch-content_child_child__process.cc b/www/chromium/files/patch-content_child_child__process.cc index 90c3fb35a396..1444db342a4b 100644 --- a/www/chromium/files/patch-content_child_child__process.cc +++ b/www/chromium/files/patch-content_child_child__process.cc @@ -1,6 +1,6 @@ ---- content/child/child_process.cc.orig 2022-02-28 16:54:41 UTC +--- content/child/child_process.cc.orig 2022-03-25 21:59:56 UTC +++ content/child/child_process.cc -@@ -52,7 +52,7 @@ ChildProcess::ChildProcess(base::ThreadPriority io_thr +@@ -71,7 +71,7 @@ ChildProcess::ChildProcess(base::ThreadPriority io_thr DCHECK(!g_lazy_child_process_tls.Pointer()->Get()); g_lazy_child_process_tls.Pointer()->Set(this); diff --git a/www/chromium/files/patch-content_common_user__agent.cc b/www/chromium/files/patch-content_common_user__agent.cc index 4935bfa93679..3b82d95948ae 100644 --- a/www/chromium/files/patch-content_common_user__agent.cc +++ b/www/chromium/files/patch-content_common_user__agent.cc @@ -1,6 +1,6 @@ ---- content/common/user_agent.cc.orig 2022-02-28 16:54:41 UTC +--- content/common/user_agent.cc.orig 2022-03-25 21:59:56 UTC +++ content/common/user_agent.cc -@@ -244,6 +244,16 @@ std::string BuildOSCpuInfoFromOSVersionAndCpuType(cons +@@ -245,6 +245,16 @@ std::string BuildOSCpuInfoFromOSVersionAndCpuType(cons "Android %s", os_version.c_str() #elif BUILDFLAG(IS_FUCHSIA) "Fuchsia" diff --git a/www/chromium/files/patch-content_gpu_gpu__main.cc b/www/chromium/files/patch-content_gpu_gpu__main.cc index 95666e2f0bee..62bc81021cf9 100644 --- a/www/chromium/files/patch-content_gpu_gpu__main.cc +++ b/www/chromium/files/patch-content_gpu_gpu__main.cc @@ -1,6 +1,6 @@ ---- content/gpu/gpu_main.cc.orig 2022-02-28 16:54:41 UTC +--- content/gpu/gpu_main.cc.orig 2022-03-25 21:59:56 UTC +++ content/gpu/gpu_main.cc -@@ -83,7 +83,7 @@ +@@ -86,7 +86,7 @@ #include "sandbox/win/src/sandbox.h" #endif @@ -9,7 +9,7 @@ #include "content/gpu/gpu_sandbox_hook_linux.h" #include "sandbox/policy/linux/sandbox_linux.h" #include "sandbox/policy/sandbox_type.h" -@@ -105,7 +105,7 @@ namespace content { +@@ -108,7 +108,7 @@ namespace content { namespace { @@ -18,7 +18,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread*, const gpu::GPUInfo*, const gpu::GpuPreferences&); -@@ -167,7 +167,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel +@@ -170,7 +170,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel bool EnsureSandboxInitialized(gpu::GpuWatchdogThread* watchdog_thread, const gpu::GPUInfo* gpu_info, const gpu::GpuPreferences& gpu_prefs) override { @@ -27,7 +27,7 @@ return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs); #elif BUILDFLAG(IS_WIN) return StartSandboxWindows(sandbox_info_); -@@ -263,7 +263,7 @@ int GpuMain(MainFunctionParams parameters) { +@@ -266,7 +266,7 @@ int GpuMain(MainFunctionParams parameters) { std::make_unique<base::SingleThreadTaskExecutor>( gpu_preferences.message_pump_type); } @@ -36,7 +36,7 @@ #error "Unsupported Linux platform." #elif BUILDFLAG(IS_MAC) // Cross-process CoreAnimation requires a CFRunLoop to function at all, and -@@ -406,17 +406,19 @@ int GpuMain(MainFunctionParams parameters) { +@@ -409,17 +409,19 @@ int GpuMain(MainFunctionParams parameters) { namespace { @@ -57,7 +57,7 @@ // SandboxLinux::InitializeSandbox() must always be called // with only one thread. -@@ -437,11 +439,13 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo +@@ -454,11 +456,13 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo *base::CommandLine::ForCurrentProcess()), base::BindOnce(GpuProcessPreSandboxHook), sandbox_options); diff --git a/www/chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc b/www/chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc index 3a9a8f76b38a..88e68fd7a3c3 100644 --- a/www/chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc +++ b/www/chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc @@ -1,6 +1,6 @@ ---- content/gpu/gpu_sandbox_hook_linux.cc.orig 2022-02-28 16:54:41 UTC +--- content/gpu/gpu_sandbox_hook_linux.cc.orig 2022-03-25 21:59:56 UTC +++ content/gpu/gpu_sandbox_hook_linux.cc -@@ -101,6 +101,7 @@ static const char kLibV4lEncPluginPath[] = +@@ -104,6 +104,7 @@ static const char kLibV4lEncPluginPath[] = constexpr int dlopen_flag = RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE; @@ -8,7 +8,7 @@ void AddV4L2GpuPermissions( std::vector<BrokerFilePermission>* permissions, const sandbox::policy::SandboxSeccompBPF::Options& options) { -@@ -407,8 +408,10 @@ std::vector<BrokerFilePermission> FilePermissionsForGp +@@ -420,8 +421,10 @@ std::vector<BrokerFilePermission> FilePermissionsForGp AddStandardGpuPermissions(&permissions); return permissions; } @@ -19,7 +19,7 @@ // Preload the Mali library. if (UseChromecastSandboxAllowlist()) { for (const char* path : kAllowedChromecastPaths) { -@@ -450,6 +453,7 @@ void LoadArmGpuLibraries() { +@@ -463,6 +466,7 @@ void LoadArmGpuLibraries() { dlopen(driver_paths[i], dlopen_flag); } } @@ -27,7 +27,7 @@ } bool LoadAmdGpuLibraries() { -@@ -513,12 +517,14 @@ void LoadV4L2Libraries( +@@ -526,12 +530,14 @@ void LoadV4L2Libraries( } void LoadChromecastV4L2Libraries() { @@ -42,7 +42,7 @@ } bool LoadLibrariesForGpu( -@@ -545,6 +551,7 @@ bool LoadLibrariesForGpu( +@@ -558,6 +564,7 @@ bool LoadLibrariesForGpu( return true; } @@ -50,7 +50,7 @@ sandbox::syscall_broker::BrokerCommandSet CommandSetForGPU( const sandbox::policy::SandboxLinux::Options& options) { sandbox::syscall_broker::BrokerCommandSet command_set; -@@ -567,13 +574,17 @@ bool BrokerProcessPreSandboxHook( +@@ -580,13 +587,17 @@ bool BrokerProcessPreSandboxHook( SetProcessTitleFromCommandLine(nullptr); return true; } diff --git a/www/chromium/files/patch-content_public_common_common__param__traits__macros.h b/www/chromium/files/patch-content_public_common_common__param__traits__macros.h index 520813b67267..3aa00d157916 100644 --- a/www/chromium/files/patch-content_public_common_common__param__traits__macros.h +++ b/www/chromium/files/patch-content_public_common_common__param__traits__macros.h @@ -1,6 +1,6 @@ ---- content/public/common/common_param_traits_macros.h.orig 2022-02-28 16:54:41 UTC +--- content/public/common/common_param_traits_macros.h.orig 2022-03-25 21:59:56 UTC +++ content/public/common/common_param_traits_macros.h -@@ -127,7 +127,7 @@ IPC_STRUCT_TRAITS_BEGIN(blink::RendererPreferences) +@@ -128,7 +128,7 @@ IPC_STRUCT_TRAITS_BEGIN(blink::RendererPreferences) IPC_STRUCT_TRAITS_MEMBER(accept_languages) IPC_STRUCT_TRAITS_MEMBER(plugin_fullscreen_allowed) IPC_STRUCT_TRAITS_MEMBER(caret_browsing_enabled) diff --git a/www/chromium/files/patch-content_public_common_content__features.cc b/www/chromium/files/patch-content_public_common_content__features.cc index 9e34ea4a102a..1a4ee7abc241 100644 --- a/www/chromium/files/patch-content_public_common_content__features.cc +++ b/www/chromium/files/patch-content_public_common_content__features.cc @@ -1,4 +1,4 @@ ---- content/public/common/content_features.cc.orig 2022-02-28 16:54:41 UTC +--- content/public/common/content_features.cc.orig 2022-03-25 21:59:56 UTC +++ content/public/common/content_features.cc @@ -50,7 +50,7 @@ const base::Feature kAudioServiceOutOfProcess { "AudioServiceOutOfProcess", @@ -18,16 +18,16 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -987,7 +987,7 @@ const base::Feature kWebAssemblyBaseline{"WebAssemblyB +@@ -1030,7 +1030,7 @@ const base::Feature kWebAssemblyBaseline{"WebAssemblyB const base::Feature kWebAssemblyCodeProtection{ - "WebAssemblyCodeProtection", base::FEATURE_DISABLED_BY_DEFAULT}; + "WebAssemblyCodeProtection", base::FEATURE_ENABLED_BY_DEFAULT}; -#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(ARCH_CPU_X86_64) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_X86_64) // Use memory protection keys in userspace (PKU) (if available) to protect code // JITed for WebAssembly. Fall back to traditional memory protection if // WebAssemblyCodeProtection is also enabled. -@@ -1017,7 +1017,7 @@ const base::Feature kWebAssemblyTiering{"WebAssemblyTi +@@ -1060,7 +1060,7 @@ const base::Feature kWebAssemblyTiering{"WebAssemblyTi const base::Feature kWebAssemblyTrapHandler { "WebAssemblyTrapHandler", #if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ @@ -36,16 +36,7 @@ defined(ARCH_CPU_X86_64)) || \ (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) base::FEATURE_ENABLED_BY_DEFAULT -@@ -1039,7 +1039,7 @@ const base::Feature kWebAuthCable { - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. - // If updating this, also update kWebAuthCableServerLink. --#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - base::FEATURE_DISABLED_BY_DEFAULT - #else - base::FEATURE_ENABLED_BY_DEFAULT -@@ -1107,7 +1107,11 @@ const base::Feature kWebUIReportOnlyTrustedTypes{ +@@ -1146,7 +1146,11 @@ const base::Feature kWebUIReportOnlyTrustedTypes{ // Controls whether the WebUSB API is enabled: // https://wicg.github.io/webusb diff --git a/www/chromium/files/patch-content_public_common_content__features.h b/www/chromium/files/patch-content_public_common_content__features.h index c21d582cb4ef..8d9d438ee1d8 100644 --- a/www/chromium/files/patch-content_public_common_content__features.h +++ b/www/chromium/files/patch-content_public_common_content__features.h @@ -1,6 +1,6 @@ ---- content/public/common/content_features.h.orig 2022-02-28 16:54:41 UTC +--- content/public/common/content_features.h.orig 2022-03-25 21:59:56 UTC +++ content/public/common/content_features.h -@@ -249,7 +249,7 @@ CONTENT_EXPORT extern const base::Feature +@@ -258,7 +258,7 @@ CONTENT_EXPORT extern const base::Feature kV8VmFuture; CONTENT_EXPORT extern const base::Feature kWebAppWindowControlsOverlay; CONTENT_EXPORT extern const base::Feature kWebAssemblyBaseline; CONTENT_EXPORT extern const base::Feature kWebAssemblyCodeProtection; diff --git a/www/chromium/files/patch-content_public_common_content__switches.cc b/www/chromium/files/patch-content_public_common_content__switches.cc index aac07c5a0777..7b32ea15738e 100644 --- a/www/chromium/files/patch-content_public_common_content__switches.cc +++ b/www/chromium/files/patch-content_public_common_content__switches.cc @@ -1,4 +1,4 @@ ---- content/public/common/content_switches.cc.orig 2022-02-28 16:54:41 UTC +--- content/public/common/content_switches.cc.orig 2022-03-25 21:59:56 UTC +++ content/public/common/content_switches.cc @@ -383,6 +383,8 @@ const char kEnableGpuMemoryBufferVideoFrames[] = // 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. -@@ -991,7 +993,7 @@ const char kEnableAutomation[] = "enable-automation"; +@@ -981,7 +983,7 @@ const char kEnableAutomation[] = "enable-automation"; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-content_public_common_content__switches.h b/www/chromium/files/patch-content_public_common_content__switches.h index 6ce03c2ade27..da40df11d82d 100644 --- a/www/chromium/files/patch-content_public_common_content__switches.h +++ b/www/chromium/files/patch-content_public_common_content__switches.h @@ -1,14 +1,14 @@ ---- content/public/common/content_switches.h.orig 2022-02-28 16:54:41 UTC +--- content/public/common/content_switches.h.orig 2022-03-25 21:59:56 UTC +++ content/public/common/content_switches.h -@@ -114,6 +114,7 @@ CONTENT_EXPORT extern const char kEnableBlinkTestFeatu +@@ -120,6 +120,7 @@ CONTENT_EXPORT extern const char kEnableBlinkTestFeatu CONTENT_EXPORT extern const char kEnableGpuMemoryBufferVideoFrames[]; CONTENT_EXPORT extern const char kEnableLCDText[]; CONTENT_EXPORT extern const char kEnableLogging[]; +CONTENT_EXPORT extern const char kDisableUnveil[]; CONTENT_EXPORT extern const char kEnableNetworkInformationDownlinkMax[]; CONTENT_EXPORT extern const char kEnableCanvas2DLayers[]; - CONTENT_EXPORT extern const char kEnableCanvasContextLostInBackground[]; -@@ -272,7 +273,7 @@ CONTENT_EXPORT extern const char kRendererWaitForJavaD + CONTENT_EXPORT extern const char kEnableNewCanvas2DAPI[]; +@@ -267,7 +268,7 @@ CONTENT_EXPORT extern const char kRendererWaitForJavaD // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-content_renderer_render__thread__impl.cc b/www/chromium/files/patch-content_renderer_render__thread__impl.cc index 6f325abf06dd..979c13db3087 100644 --- a/www/chromium/files/patch-content_renderer_render__thread__impl.cc +++ b/www/chromium/files/patch-content_renderer_render__thread__impl.cc @@ -1,4 +1,4 @@ ---- content/renderer/render_thread_impl.cc.orig 2022-02-28 16:54:41 UTC +--- content/renderer/render_thread_impl.cc.orig 2022-03-25 21:59:56 UTC +++ content/renderer/render_thread_impl.cc @@ -189,7 +189,7 @@ @@ -27,7 +27,7 @@ if (base::FeatureList::IsEnabled( blink::features::kBlinkCompositorUseDisplayThreadPriority)) { render_message_filter()->SetThreadPriority( -@@ -1075,7 +1075,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1093,7 +1093,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: const bool enable_video_decode_accelerator = @@ -36,7 +36,7 @@ base::FeatureList::IsEnabled(media::kVaapiVideoDecodeLinux) && #else !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode) && -@@ -1086,7 +1086,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1104,7 +1104,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: const bool enable_video_encode_accelerator = diff --git a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc index 40ba7f66c1fb..4f2d42d5410a 100644 --- a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc +++ b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc @@ -1,6 +1,6 @@ ---- content/renderer/renderer_blink_platform_impl.cc.orig 2022-02-28 16:54:41 UTC +--- content/renderer/renderer_blink_platform_impl.cc.orig 2022-03-25 21:59:56 UTC +++ content/renderer/renderer_blink_platform_impl.cc -@@ -108,7 +108,7 @@ +@@ -109,7 +109,7 @@ #if BUILDFLAG(IS_MAC) #include "content/child/child_process_sandbox_support_impl_mac.h" @@ -9,7 +9,7 @@ #include "content/child/child_process_sandbox_support_impl_linux.h" #endif -@@ -177,7 +177,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -178,7 +178,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( main_thread_scheduler_(main_thread_scheduler) { // RenderThread may not exist in some tests. if (RenderThreadImpl::current()) { @@ -18,7 +18,7 @@ mojo::PendingRemote<font_service::mojom::FontService> font_service; RenderThreadImpl::current()->BindHostReceiver( font_service.InitWithNewPipeAndPassReceiver()); -@@ -187,7 +187,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -188,7 +188,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( #endif } @@ -27,7 +27,7 @@ if (sandboxEnabled()) { #if BUILDFLAG(IS_MAC) sandbox_support_ = std::make_unique<WebSandboxSupportMac>(); -@@ -261,7 +261,8 @@ RendererBlinkPlatformImpl::WrapSharedURLLoaderFactory( +@@ -283,7 +283,8 @@ RendererBlinkPlatformImpl::WrapSharedURLLoaderFactory( /*terminate_sync_load_event=*/nullptr); } @@ -37,7 +37,7 @@ void RendererBlinkPlatformImpl::SetDisplayThreadPriority( base::PlatformThreadId thread_id) { if (RenderThreadImpl* render_thread = RenderThreadImpl::current()) { -@@ -276,7 +277,7 @@ blink::BlameContext* RendererBlinkPlatformImpl::GetTop +@@ -298,7 +299,7 @@ blink::BlameContext* RendererBlinkPlatformImpl::GetTop } blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() { diff --git a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h index aee599a1807f..ec0508ae1454 100644 --- a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h +++ b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h @@ -1,6 +1,6 @@ ---- content/renderer/renderer_blink_platform_impl.h.orig 2022-02-28 16:54:41 UTC +--- content/renderer/renderer_blink_platform_impl.h.orig 2022-03-25 21:59:56 UTC +++ content/renderer/renderer_blink_platform_impl.h -@@ -29,7 +29,7 @@ +@@ -30,7 +30,7 @@ #include "third_party/blink/public/mojom/cache_storage/cache_storage.mojom.h" #include "third_party/blink/public/mojom/loader/code_cache.mojom.h" @@ -9,7 +9,7 @@ #include "components/services/font/public/cpp/font_loader.h" // nogncheck #include "third_party/skia/include/core/SkRefCnt.h" // nogncheck #endif -@@ -274,7 +274,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -276,7 +276,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi void Collect3DContextInformation(blink::Platform::GraphicsInfo* gl_info, const gpu::GPUInfo& gpu_info) const; @@ -18,9 +18,9 @@ std::unique_ptr<blink::WebSandboxSupport> sandbox_support_; #endif -@@ -298,7 +298,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi - mojo::SharedRemote<blink::mojom::CodeCacheHost> code_cache_host_ - GUARDED_BY(code_cache_host_lock_); +@@ -304,7 +304,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi + mutable base::WaitableEvent io_thread_id_ready_event_; + base::PlatformThreadId io_thread_id_ = base::kInvalidThreadId; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) diff --git a/www/chromium/files/patch-content_shell_BUILD.gn b/www/chromium/files/patch-content_shell_BUILD.gn index f261c872642e..aea21185750b 100644 --- a/www/chromium/files/patch-content_shell_BUILD.gn +++ b/www/chromium/files/patch-content_shell_BUILD.gn @@ -1,6 +1,6 @@ ---- content/shell/BUILD.gn.orig 2022-02-28 16:54:41 UTC +--- content/shell/BUILD.gn.orig 2022-03-25 21:59:56 UTC +++ content/shell/BUILD.gn -@@ -872,7 +872,7 @@ group("content_shell_crash_test") { +@@ -882,7 +882,7 @@ group("content_shell_crash_test") { if (is_win) { data_deps += [ "//build/win:copy_cdb_to_output" ] } diff --git a/www/chromium/files/patch-content_test_BUILD.gn b/www/chromium/files/patch-content_test_BUILD.gn index e65dae313f21..e2db5223fc7f 100644 --- a/www/chromium/files/patch-content_test_BUILD.gn +++ b/www/chromium/files/patch-content_test_BUILD.gn @@ -1,6 +1,6 @@ ---- content/test/BUILD.gn.orig 2022-02-28 16:54:41 UTC +--- content/test/BUILD.gn.orig 2022-03-25 21:59:56 UTC +++ content/test/BUILD.gn -@@ -1900,7 +1900,7 @@ static_library("run_all_unittests") { +@@ -1914,7 +1914,7 @@ static_library("run_all_unittests") { ":test_support", "//base/test:test_support", ] @@ -9,7 +9,7 @@ deps += [ "//content/common:set_process_title_linux" ] } } -@@ -2828,7 +2828,7 @@ test("content_unittests") { +@@ -2850,7 +2850,7 @@ test("content_unittests") { deps += [ "//third_party/boringssl" ] } diff --git a/www/chromium/files/patch-device_fido_features.cc b/www/chromium/files/patch-device_fido_features.cc deleted file mode 100644 index 028d19e45e69..000000000000 --- a/www/chromium/files/patch-device_fido_features.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- device/fido/features.cc.orig 2022-02-28 16:54:41 UTC -+++ device/fido/features.cc -@@ -24,7 +24,7 @@ extern const base::Feature kWebAuthCableSecondFactor { - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. - // If updating this, also update kWebAuthCableServerLink. --#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - base::FEATURE_DISABLED_BY_DEFAULT - #else - base::FEATURE_ENABLED_BY_DEFAULT diff --git a/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc b/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc index 6c557c1bb4f8..f10bd9435db8 100644 --- a/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc +++ b/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc @@ -1,4 +1,4 @@ ---- extensions/browser/api/messaging/message_service.cc.orig 2022-02-28 16:54:41 UTC +--- extensions/browser/api/messaging/message_service.cc.orig 2022-03-25 21:59:56 UTC +++ extensions/browser/api/messaging/message_service.cc @@ -74,7 +74,7 @@ namespace { const char kReceivingEndDoesntExistError[] = @@ -9,7 +9,7 @@ const char kMissingPermissionError[] = "Access to native messaging requires nativeMessaging permission."; const char kProhibitedByPoliciesError[] = -@@ -439,7 +439,7 @@ void MessageService::OpenChannelToNativeApp( +@@ -447,7 +447,7 @@ void MessageService::OpenChannelToNativeApp( return; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/chromium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc b/www/chromium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc index aa4d6c376ebd..24266e335de2 100644 --- a/www/chromium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc +++ b/www/chromium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc @@ -1,6 +1,6 @@ ---- extensions/browser/browser_context_keyed_service_factories.cc.orig 2022-02-28 16:54:41 UTC +--- extensions/browser/browser_context_keyed_service_factories.cc.orig 2022-03-25 21:59:56 UTC +++ extensions/browser/browser_context_keyed_service_factories.cc -@@ -91,7 +91,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() +@@ -89,7 +89,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() IdleManagerFactory::GetInstance(); ManagementAPI::GetFactoryInstance(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ diff --git a/www/chromium/files/patch-extensions_browser_extension__prefs.cc b/www/chromium/files/patch-extensions_browser_extension__prefs.cc index a8d0b2849b64..d8cb32174e6f 100644 --- a/www/chromium/files/patch-extensions_browser_extension__prefs.cc +++ b/www/chromium/files/patch-extensions_browser_extension__prefs.cc @@ -1,6 +1,6 @@ ---- extensions/browser/extension_prefs.cc.orig 2022-02-28 16:54:41 UTC +--- extensions/browser/extension_prefs.cc.orig 2022-03-25 21:59:56 UTC +++ extensions/browser/extension_prefs.cc -@@ -2265,7 +2265,7 @@ void ExtensionPrefs::RegisterProfilePrefs( +@@ -2269,7 +2269,7 @@ void ExtensionPrefs::RegisterProfilePrefs( registry->RegisterStringPref(pref_names::kLastChromeVersion, std::string()); registry->RegisterDictionaryPref(kInstallSignature); registry->RegisterListPref(kExternalUninstalls); diff --git a/www/chromium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc b/www/chromium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc index f02440d40794..2b9ce2494bab 100644 --- a/www/chromium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc +++ b/www/chromium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc @@ -1,11 +1,11 @@ ---- google_apis/gcm/engine/heartbeat_manager.cc.orig 2022-02-07 13:39:41 UTC +--- google_apis/gcm/engine/heartbeat_manager.cc.orig 2022-03-25 21:59:56 UTC +++ google_apis/gcm/engine/heartbeat_manager.cc @@ -32,7 +32,7 @@ const int kMinClientHeartbeatIntervalMs = 1000 * 30; // Minimum time spent sleeping before we force a new heartbeat. const int kMinSuspendTimeMs = 1000 * 10; // 10 seconds. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) // The period at which to check if the heartbeat time has passed. Used to // protect against platforms where the timer is delayed by the system being // suspended. Only needed on linux because the other OSes provide a standard @@ -13,8 +13,8 @@ base::BindRepeating(&HeartbeatManager::OnHeartbeatTriggered, weak_ptr_factory_.GetWeakPtr())); --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) // Windows, Mac, Android, iOS, and Chrome OS all provide a way to be notified // when the system is suspending or resuming. The only one that does not is // Linux so we need to poll to check for missed heartbeats. @@ -22,8 +22,8 @@ return; } --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) // Otherwise check again later. io_task_runner_->PostDelayedTask( FROM_HERE, diff --git a/www/chromium/files/patch-gpu_command__buffer_service_shared__image__backing__factory__angle__vulkan.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__image__backing__factory__angle__vulkan.cc index 3b49ed72e30f..ef674e1c8f71 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_shared__image__backing__factory__angle__vulkan.cc +++ b/www/chromium/files/patch-gpu_command__buffer_service_shared__image__backing__factory__angle__vulkan.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/shared_image_backing_factory_angle_vulkan.cc.orig 2022-02-28 16:54:41 UTC +--- gpu/command_buffer/service/shared_image_backing_factory_angle_vulkan.cc.orig 2022-03-25 21:59:56 UTC +++ gpu/command_buffer/service/shared_image_backing_factory_angle_vulkan.cc -@@ -573,7 +573,7 @@ bool SharedImageBackingFactoryAngleVulkan::CanUseAngle +@@ -574,7 +574,7 @@ bool SharedImageBackingFactoryAngleVulkan::CanUseAngle // TODO(penghuang): verify the scanout is the right usage for video playback. // crbug.com/1280798 constexpr auto kSupportedUsages = diff --git a/www/chromium/files/patch-gpu_command__buffer_service_shared__image__factory.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__image__factory.cc index ac36bf032db2..b12a153e058a 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_shared__image__factory.cc +++ b/www/chromium/files/patch-gpu_command__buffer_service_shared__image__factory.cc @@ -1,20 +1,21 @@ ---- gpu/command_buffer/service/shared_image_factory.cc.orig 2022-02-28 16:54:41 UTC +--- gpu/command_buffer/service/shared_image_factory.cc.orig 2022-03-25 21:59:56 UTC +++ gpu/command_buffer/service/shared_image_factory.cc -@@ -34,11 +34,11 @@ - #include "ui/gl/gl_switches.h" - #include "ui/gl/trace_util.h" +@@ -38,12 +38,12 @@ + #include "gpu/command_buffer/service/shared_image_backing_factory_angle_vulkan.h" + #endif -#if BUILDFLAG(IS_LINUX) && defined(USE_OZONE) && BUILDFLAG(ENABLE_VULKAN) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(USE_OZONE) && BUILDFLAG(ENABLE_VULKAN) #include "ui/ozone/public/ozone_platform.h" #endif --#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN)) && \ -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)) && \ - BUILDFLAG(ENABLE_VULKAN) + #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN)) && \ +- BUILDFLAG(ENABLE_VULKAN) ++ BUILDFLAG(ENABLE_VULKAN) || BUILDFLAG(IS_BSD) #include "gpu/command_buffer/service/external_vk_image_factory.h" - #include "gpu/command_buffer/service/shared_image_backing_factory_angle_vulkan.h" -@@ -75,7 +75,7 @@ + #elif BUILDFLAG(IS_ANDROID) && BUILDFLAG(ENABLE_VULKAN) + #include "gpu/command_buffer/service/external_vk_image_factory.h" +@@ -78,7 +78,7 @@ namespace gpu { @@ -23,12 +24,12 @@ !BUILDFLAG(IS_CHROMEOS_LACROS) && !BUILDFLAG(IS_CHROMECAST) && \ BUILDFLAG(ENABLE_VULKAN) -@@ -200,7 +200,7 @@ SharedImageFactory::SharedImageFactory( - // |gr_context_type|. - if (gr_context_type_ == GrContextType::kVulkan) { - #if BUILDFLAG(ENABLE_VULKAN) +@@ -240,7 +240,7 @@ SharedImageFactory::SharedImageFactory( + factories_.push_back(std::move(external_vk_image_factory)); + } + #elif defined(USE_OZONE) -#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ !BUILDFLAG(IS_CHROMEOS_LACROS) && !BUILDFLAG(IS_CHROMECAST) - // Desktop Linux, not ChromeOS. - if (base::FeatureList::IsEnabled(features::kVulkanFromANGLE)) { + // Desktop Linux, not ChromeOS. + if (gr_context_type_ == GrContextType::kVulkan && diff --git a/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc b/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc index 0c10f6fd150b..2b4f5dd1c683 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc +++ b/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2022-02-28 16:54:41 UTC +--- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2022-03-25 21:59:56 UTC +++ gpu/command_buffer/service/webgpu_decoder_impl.cc -@@ -1010,7 +1010,7 @@ error::Error WebGPUDecoderImpl::HandleRequestAdapter( +@@ -1498,7 +1498,7 @@ error::Error WebGPUDecoderImpl::HandleRequestAdapter( } if (gr_context_type_ != GrContextType::kVulkan) { diff --git a/www/chromium/files/patch-gpu_command__buffer_tests_gl__gpu__memory__buffer__unittest.cc b/www/chromium/files/patch-gpu_command__buffer_tests_gl__gpu__memory__buffer__unittest.cc new file mode 100644 index 000000000000..fa8050758e8d --- /dev/null +++ b/www/chromium/files/patch-gpu_command__buffer_tests_gl__gpu__memory__buffer__unittest.cc @@ -0,0 +1,29 @@ +--- gpu/command_buffer/tests/gl_gpu_memory_buffer_unittest.cc.orig 2022-03-25 21:59:56 UTC ++++ gpu/command_buffer/tests/gl_gpu_memory_buffer_unittest.cc +@@ -29,7 +29,7 @@ + #include "ui/gl/gl_image.h" + #include "ui/gl/test/gl_image_test_support.h" + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include "gpu/ipc/common/gpu_memory_buffer_impl_native_pixmap.h" + #include "ui/gfx/linux/client_native_pixmap_factory_dmabuf.h" + #endif +@@ -72,7 +72,7 @@ class GpuMemoryBufferTest : public testing::TestWithPa + GLManager gl_; + }; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + class GpuMemoryBufferTestEGL : public testing::Test, + public gpu::GpuCommandBufferTestEGL { + public: +@@ -364,7 +364,7 @@ TEST_P(GpuMemoryBufferTest, Lifecycle) { + glDeleteTextures(1, &texture_id); + } + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // Test glCreateImageCHROMIUM with gfx::NATIVE_PIXMAP. Basically the test + // reproduces the situation where some dmabuf fds are available outside the + // gpu process and the user wants to import them using glCreateImageCHROMIUM. diff --git a/www/chromium/files/patch-gpu_command__buffer_tests_gl__oes__egl__image__unittest.cc b/www/chromium/files/patch-gpu_command__buffer_tests_gl__oes__egl__image__unittest.cc new file mode 100644 index 000000000000..9e331c6eb5b2 --- /dev/null +++ b/www/chromium/files/patch-gpu_command__buffer_tests_gl__oes__egl__image__unittest.cc @@ -0,0 +1,20 @@ +--- gpu/command_buffer/tests/gl_oes_egl_image_unittest.cc.orig 2022-03-25 21:59:56 UTC ++++ gpu/command_buffer/tests/gl_oes_egl_image_unittest.cc +@@ -14,7 +14,7 @@ + #include "ui/gl/gl_image.h" + #include "ui/gl/init/gl_factory.h" + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include "ui/gl/gl_image_native_pixmap.h" + #endif + +@@ -43,7 +43,7 @@ class GpuOESEGLImageTest : public testing::Test, + bool egl_initialized_{false}; + }; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // TODO(crbug.com/835072): re-enable this test on ASAN once bugs are fixed. + #if !defined(ADDRESS_SANITIZER) + diff --git a/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc b/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc new file mode 100644 index 000000000000..b3f2484b9cd8 --- /dev/null +++ b/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc @@ -0,0 +1,20 @@ +--- gpu/command_buffer/tests/gl_test_utils.cc.orig 2022-03-25 21:59:56 UTC ++++ gpu/command_buffer/tests/gl_test_utils.cc +@@ -24,7 +24,7 @@ + #include "ui/gl/gl_version_info.h" + #include "ui/gl/init/gl_factory.h" + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include "ui/gl/gl_image_native_pixmap.h" + #endif + +@@ -453,7 +453,7 @@ void GpuCommandBufferTestEGL::RestoreGLDefault() { + window_system_binding_info_ = gl::GLWindowSystemBindingInfo(); + } + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + scoped_refptr<gl::GLImageNativePixmap> + GpuCommandBufferTestEGL::CreateGLImageNativePixmap(gfx::BufferFormat format, + gfx::Size size, diff --git a/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.h b/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.h new file mode 100644 index 000000000000..6afa4605bfc9 --- /dev/null +++ b/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.h @@ -0,0 +1,11 @@ +--- gpu/command_buffer/tests/gl_test_utils.h.orig 2022-03-25 21:59:56 UTC ++++ gpu/command_buffer/tests/gl_test_utils.h +@@ -120,7 +120,7 @@ class GpuCommandBufferTestEGL { + return gfx::HasExtension(gl_extensions_, extension); + } + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // Create GLImageNativePixmap filled in with the given pixels. + scoped_refptr<gl::GLImageNativePixmap> CreateGLImageNativePixmap( + gfx::BufferFormat format, diff --git a/www/chromium/files/patch-gpu_config_gpu__util.cc b/www/chromium/files/patch-gpu_config_gpu__util.cc deleted file mode 100644 index 5e7ba288dd6a..000000000000 --- a/www/chromium/files/patch-gpu_config_gpu__util.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- gpu/config/gpu_util.cc.orig 2022-02-28 16:54:41 UTC -+++ gpu/config/gpu_util.cc -@@ -754,7 +754,7 @@ bool EnableSwiftShaderIfNeeded(base::CommandLine* comm - gpu_feature_info.status_values[GPU_FEATURE_TYPE_ACCELERATED_GL] != - kGpuFeatureStatusEnabled) { - bool legacy_software_gl = true; --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - // This setting makes WebGL run on SwANGLE instead of SwiftShader GL. - legacy_software_gl = false; - #endif diff --git a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc index 6ea83eae1ce1..291f1791a3d3 100644 --- a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc +++ b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc @@ -1,33 +1,15 @@ ---- gpu/ipc/service/gpu_init.cc.orig 2022-02-28 16:54:41 UTC +--- gpu/ipc/service/gpu_init.cc.orig 2022-03-25 21:59:56 UTC +++ gpu/ipc/service/gpu_init.cc -@@ -122,7 +122,7 @@ void InitializePlatformOverlaySettings(GPUInfo* gpu_in - } - - #if BUILDFLAG(IS_CHROMEOS_LACROS) || \ -- (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMECAST)) -+ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMECAST)) && !BUILDFLAG(IS_BSD) - bool CanAccessNvidiaDeviceFile() { - bool res = true; - base::ScopedBlockingCall scoped_blocking_call(FROM_HERE, -@@ -220,7 +220,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL - device_perf_info_ = device_perf_info; - } - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) && !BUILDFLAG(IS_BSD) - if (gpu_info_.gpu.vendor_id == 0x10de && // NVIDIA - gpu_info_.gpu.driver_vendor == "NVIDIA" && !CanAccessNvidiaDeviceFile()) - return false; -@@ -284,7 +284,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL - delayed_watchdog_enable = true; +@@ -278,7 +278,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL + enable_watchdog = false; #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // PreSandbox is mainly for resource handling and not related to the GPU - // driver, it doesn't need the GPU watchdog. The loadLibrary may take long - // time that killing and restarting the GPU process will not help. -@@ -324,7 +324,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL + 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 +@@ -328,7 +328,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } bool attempted_startsandbox = false; @@ -36,8 +18,8 @@ // 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. -@@ -373,7 +373,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL - } +@@ -377,7 +377,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL + if (gl_initialized && gl_use_swiftshader_ && !gl::IsSoftwareGLImplementation(gl::GetGLImplementationParts())) { -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -45,7 +27,7 @@ VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly " << "on Linux"; return false; -@@ -407,7 +407,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -410,7 +410,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } } @@ -54,7 +36,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 -@@ -460,7 +460,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -469,7 +469,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL command_line, gpu_feature_info_, gpu_preferences_.disable_software_rasterizer, false); if (gl_use_swiftshader_) { @@ -63,7 +45,7 @@ VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly " << "on Linux"; return false; -@@ -566,7 +566,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -591,7 +591,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_); @@ -72,7 +54,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. -@@ -799,7 +799,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -822,7 +822,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_); diff --git a/www/chromium/files/patch-gpu_vulkan_vulkan__device__queue.cc b/www/chromium/files/patch-gpu_vulkan_vulkan__device__queue.cc index 8ff12aaa1b82..33814398b3d0 100644 --- a/www/chromium/files/patch-gpu_vulkan_vulkan__device__queue.cc +++ b/www/chromium/files/patch-gpu_vulkan_vulkan__device__queue.cc @@ -1,4 +1,4 @@ ---- gpu/vulkan/vulkan_device_queue.cc.orig 2022-02-28 16:54:41 UTC +--- gpu/vulkan/vulkan_device_queue.cc.orig 2022-03-25 21:59:56 UTC +++ gpu/vulkan/vulkan_device_queue.cc @@ -85,7 +85,7 @@ bool VulkanDeviceQueue::Initialize( @@ -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)) { -@@ -230,7 +230,7 @@ bool VulkanDeviceQueue::Initialize( +@@ -229,7 +229,7 @@ bool VulkanDeviceQueue::Initialize( enabled_device_features_2_ = {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2}; // Android, Fuchsia, and Linux(VaapiVideoDecoder) need YCbCr sampler support. diff --git a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc index af378f5b9e53..023ecf8bec3a 100644 --- a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc +++ b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc @@ -1,6 +1,6 @@ ---- gpu/vulkan/vulkan_function_pointers.cc.orig 2022-02-28 16:54:41 UTC +--- gpu/vulkan/vulkan_function_pointers.cc.orig 2022-03-25 21:59:56 UTC +++ gpu/vulkan/vulkan_function_pointers.cc -@@ -916,7 +916,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer +@@ -926,7 +926,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer } #endif // BUILDFLAG(IS_ANDROID) @@ -9,7 +9,7 @@ if (gfx::HasExtension(enabled_extensions, VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME)) { vkGetSemaphoreFdKHR = reinterpret_cast<PFN_vkGetSemaphoreFdKHR>( -@@ -961,7 +961,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer +@@ -971,7 +971,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer } #endif // BUILDFLAG(IS_WIN) @@ -18,7 +18,7 @@ if (gfx::HasExtension(enabled_extensions, VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME)) { vkGetMemoryFdKHR = reinterpret_cast<PFN_vkGetMemoryFdKHR>( -@@ -1131,7 +1131,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer +@@ -1141,7 +1141,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer } } diff --git a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h index 35d6ff42d006..af1ea9064200 100644 --- a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h +++ b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h @@ -1,6 +1,6 @@ ---- gpu/vulkan/vulkan_function_pointers.h.orig 2022-02-28 16:54:41 UTC +--- gpu/vulkan/vulkan_function_pointers.h.orig 2022-03-25 21:59:56 UTC +++ gpu/vulkan/vulkan_function_pointers.h -@@ -256,7 +256,7 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers +@@ -250,7 +250,7 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers vkGetAndroidHardwareBufferPropertiesANDROID; #endif // BUILDFLAG(IS_ANDROID) @@ -9,7 +9,7 @@ VulkanFunction<PFN_vkGetSemaphoreFdKHR> vkGetSemaphoreFdKHR; VulkanFunction<PFN_vkImportSemaphoreFdKHR> vkImportSemaphoreFdKHR; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || -@@ -268,7 +268,7 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers +@@ -262,7 +262,7 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers vkImportSemaphoreWin32HandleKHR; #endif // BUILDFLAG(IS_WIN) @@ -18,7 +18,7 @@ VulkanFunction<PFN_vkGetMemoryFdKHR> vkGetMemoryFdKHR; VulkanFunction<PFN_vkGetMemoryFdPropertiesKHR> vkGetMemoryFdPropertiesKHR; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || -@@ -309,7 +309,7 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers +@@ -303,7 +303,7 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers VulkanFunction<PFN_vkGetSwapchainImagesKHR> vkGetSwapchainImagesKHR; VulkanFunction<PFN_vkQueuePresentKHR> vkQueuePresentKHR; @@ -27,7 +27,7 @@ VulkanFunction<PFN_vkGetImageDrmFormatModifierPropertiesEXT> vkGetImageDrmFormatModifierPropertiesEXT; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -1030,7 +1030,7 @@ ALWAYS_INLINE VkResult vkGetAndroidHardwareBufferPrope +@@ -1033,7 +1033,7 @@ ALWAYS_INLINE VkResult vkGetAndroidHardwareBufferPrope } #endif // BUILDFLAG(IS_ANDROID) @@ -36,7 +36,7 @@ ALWAYS_INLINE VkResult vkGetSemaphoreFdKHR(VkDevice device, const VkSemaphoreGetFdInfoKHR* pGetFdInfo, -@@ -1064,7 +1064,7 @@ vkImportSemaphoreWin32HandleKHR(VkDevice device, +@@ -1067,7 +1067,7 @@ vkImportSemaphoreWin32HandleKHR(VkDevice device, } #endif // BUILDFLAG(IS_WIN) @@ -45,7 +45,7 @@ ALWAYS_INLINE VkResult vkGetMemoryFdKHR(VkDevice device, const VkMemoryGetFdInfoKHR* pGetFdInfo, int* pFd) { -@@ -1200,7 +1200,7 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR(VkQueue queue +@@ -1203,7 +1203,7 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR(VkQueue queue pPresentInfo); } @@ -54,7 +54,7 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierPropertiesEXT( VkDevice device, VkImage image, -@@ -1210,4 +1210,4 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierProp +@@ -1213,4 +1213,4 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierProp } #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-gpu_vulkan_x_vulkan__implementation__x11.cc b/www/chromium/files/patch-gpu_vulkan_x_vulkan__implementation__x11.cc deleted file mode 100644 index 07cb63f7e4e8..000000000000 --- a/www/chromium/files/patch-gpu_vulkan_x_vulkan__implementation__x11.cc +++ /dev/null @@ -1,14 +0,0 @@ ---- gpu/vulkan/x/vulkan_implementation_x11.cc.orig 2022-02-07 13:39:41 UTC -+++ gpu/vulkan/x/vulkan_implementation_x11.cc -@@ -72,7 +72,11 @@ bool VulkanImplementationX11::InitializeVulkanInstance - - path = path.Append("libvk_swiftshader.so"); - } else { -+#if defined(OS_BSD) -+ path = base::FilePath("libvulkan.so"); -+#else - path = base::FilePath("libvulkan.so.1"); -+#endif - } - - VulkanFunctionPointers* vulkan_function_pointers = diff --git a/www/chromium/files/patch-headless_lib_browser_headless__web__contents__impl.cc b/www/chromium/files/patch-headless_lib_browser_headless__web__contents__impl.cc index 13249594cb90..350201e1fb4c 100644 --- a/www/chromium/files/patch-headless_lib_browser_headless__web__contents__impl.cc +++ b/www/chromium/files/patch-headless_lib_browser_headless__web__contents__impl.cc @@ -1,6 +1,6 @@ ---- headless/lib/browser/headless_web_contents_impl.cc.orig 2022-02-28 16:54:41 UTC +--- headless/lib/browser/headless_web_contents_impl.cc.orig 2022-03-25 21:59:56 UTC +++ headless/lib/browser/headless_web_contents_impl.cc -@@ -57,7 +57,7 @@ namespace headless { +@@ -56,7 +56,7 @@ namespace headless { namespace { void UpdatePrefsFromSystemSettings(blink::RendererPreferences* prefs) { diff --git a/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc b/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc index a0273cc9be72..cec690e3e992 100644 --- a/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc +++ b/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc @@ -1,6 +1,6 @@ ---- headless/lib/headless_content_main_delegate.cc.orig 2022-02-28 16:54:41 UTC +--- headless/lib/headless_content_main_delegate.cc.orig 2022-03-25 21:59:56 UTC +++ headless/lib/headless_content_main_delegate.cc -@@ -331,7 +331,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( +@@ -336,7 +336,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( if (process_type != switches::kZygoteProcess) { g_headless_crash_client.Pointer()->set_crash_dumps_dir( options()->crash_dumps_dir); diff --git a/www/chromium/files/patch-headless_public_headless__browser.cc b/www/chromium/files/patch-headless_public_headless__browser.cc index f770a11b6fe0..fcecc9f8ea61 100644 --- a/www/chromium/files/patch-headless_public_headless__browser.cc +++ b/www/chromium/files/patch-headless_public_headless__browser.cc @@ -1,11 +1,11 @@ ---- headless/public/headless_browser.cc.orig 2022-02-28 16:54:41 UTC +--- headless/public/headless_browser.cc.orig 2022-03-25 21:59:56 UTC +++ headless/public/headless_browser.cc @@ -42,7 +42,7 @@ Options::Options(int argc, const char** argv) user_agent(content::BuildUserAgentFromProduct(product_name_and_version)), window_size(kDefaultWindowSize), font_render_hinting(kDefaultFontRenderHinting) { --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) gl_implementation = gl::kGLImplementationANGLEName; angle_implementation = gl::kANGLEImplementationSwiftShaderForWebGLName; #endif diff --git a/www/chromium/files/patch-ipc_ipc__message__utils.cc b/www/chromium/files/patch-ipc_ipc__message__utils.cc index 2ca87a761a4b..c56681bc15b7 100644 --- a/www/chromium/files/patch-ipc_ipc__message__utils.cc +++ b/www/chromium/files/patch-ipc_ipc__message__utils.cc @@ -1,6 +1,6 @@ ---- ipc/ipc_message_utils.cc.orig 2022-02-28 16:54:41 UTC +--- ipc/ipc_message_utils.cc.orig 2022-03-25 21:59:56 UTC +++ ipc/ipc_message_utils.cc -@@ -349,7 +349,7 @@ void ParamTraits<unsigned int>::Log(const param_type& +@@ -350,7 +350,7 @@ void ParamTraits<unsigned int>::Log(const param_type& } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/chromium/files/patch-ipc_ipc__message__utils.h b/www/chromium/files/patch-ipc_ipc__message__utils.h index d00e3395df55..0056c08eeec3 100644 --- a/www/chromium/files/patch-ipc_ipc__message__utils.h +++ b/www/chromium/files/patch-ipc_ipc__message__utils.h @@ -1,6 +1,6 @@ ---- ipc/ipc_message_utils.h.orig 2022-02-28 16:54:41 UTC +--- ipc/ipc_message_utils.h.orig 2022-03-25 21:59:56 UTC +++ ipc/ipc_message_utils.h -@@ -205,7 +205,7 @@ struct ParamTraits<unsigned int> { +@@ -214,7 +214,7 @@ struct ParamTraits<unsigned int> { // Since we want to support Android 32<>64 bit IPC, as long as we don't have // these traits for 32 bit ARM then that'll catch any errors. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/chromium/files/patch-media_audio_BUILD.gn b/www/chromium/files/patch-media_audio_BUILD.gn index a36f2fe174eb..03b517313c02 100644 --- a/www/chromium/files/patch-media_audio_BUILD.gn +++ b/www/chromium/files/patch-media_audio_BUILD.gn @@ -1,6 +1,6 @@ ---- media/audio/BUILD.gn.orig 2022-02-07 13:39:41 UTC +--- media/audio/BUILD.gn.orig 2022-03-25 21:59:56 UTC +++ media/audio/BUILD.gn -@@ -237,9 +237,20 @@ source_set("audio") { +@@ -245,9 +245,20 @@ source_set("audio") { ] } diff --git a/www/chromium/files/patch-media_base_media__switches.cc b/www/chromium/files/patch-media_base_media__switches.cc index 0bb0fb3f113c..5ef1cbdba015 100644 --- a/www/chromium/files/patch-media_base_media__switches.cc +++ b/www/chromium/files/patch-media_base_media__switches.cc @@ -1,4 +1,4 @@ ---- media/base/media_switches.cc.orig 2022-02-28 16:54:41 UTC +--- media/base/media_switches.cc.orig 2022-03-25 21:59:56 UTC +++ media/base/media_switches.cc @@ -9,7 +9,7 @@ #include "build/chromeos_buildflags.h" @@ -9,7 +9,7 @@ #include "base/cpu.h" #endif -@@ -397,7 +397,7 @@ const base::Feature kGav1VideoDecoder{"Gav1VideoDecode +@@ -402,7 +402,7 @@ const base::Feature kGav1VideoDecoder{"Gav1VideoDecode const base::Feature kGlobalMediaControls { "GlobalMediaControls", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -18,7 +18,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -429,7 +429,7 @@ constexpr base::FeatureParam<kCrosGlobalMediaControlsP +@@ -434,7 +434,7 @@ constexpr base::FeatureParam<kCrosGlobalMediaControlsP const base::Feature kGlobalMediaControlsPictureInPicture { "GlobalMediaControlsPictureInPicture", #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 -@@ -470,7 +470,7 @@ const base::Feature kUseR16Texture{"use-r16-texture", +@@ -475,7 +475,7 @@ const base::Feature kUseR16Texture{"use-r16-texture", const base::Feature kUnifiedAutoplay{"UnifiedAutoplay", base::FEATURE_ENABLED_BY_DEFAULT}; @@ -36,7 +36,7 @@ // Enable vaapi video decoding on linux. This is already enabled by default on // chromeos, but needs an experiment on linux. const base::Feature kVaapiVideoDecodeLinux{"VaapiVideoDecoder", -@@ -926,7 +926,7 @@ bool IsLiveCaptionFeatureEnabled() { +@@ -946,7 +946,7 @@ bool IsLiveCaptionFeatureEnabled() { return false; #endif diff --git a/www/chromium/files/patch-media_cdm_cdm__paths__unittest.cc b/www/chromium/files/patch-media_cdm_cdm__paths__unittest.cc index 6c8761f016c5..f7173cb2761c 100644 --- a/www/chromium/files/patch-media_cdm_cdm__paths__unittest.cc +++ b/www/chromium/files/patch-media_cdm_cdm__paths__unittest.cc @@ -1,15 +1,6 @@ ---- media/cdm/cdm_paths_unittest.cc.orig 2022-02-28 16:54:41 UTC +--- media/cdm/cdm_paths_unittest.cc.orig 2022-03-25 21:59:56 UTC +++ media/cdm/cdm_paths_unittest.cc -@@ -18,7 +18,7 @@ - // TODO(crbug.com/971433). Move the CDMs out of the install directory on - // ChromeOS. - #if (BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS_LACROS)) -+ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) - #define CDM_USE_PLATFORM_SPECIFIC_PATH - #endif - -@@ -39,7 +39,7 @@ const char kComponentPlatform[] = +@@ -27,7 +27,7 @@ const char kComponentPlatform[] = "win"; #elif BUILDFLAG(IS_CHROMEOS) "cros"; diff --git a/www/chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc b/www/chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc index 331f5b859b38..6e08ced6ba4f 100644 --- a/www/chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc +++ b/www/chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc @@ -1,6 +1,6 @@ ---- media/gpu/chromeos/video_decoder_pipeline.cc.orig 2022-02-28 16:54:41 UTC +--- media/gpu/chromeos/video_decoder_pipeline.cc.orig 2022-03-25 21:59:56 UTC +++ media/gpu/chromeos/video_decoder_pipeline.cc -@@ -647,7 +647,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -646,7 +646,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( } } diff --git a/www/chromium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc b/www/chromium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc index 0953c967096f..cd48a83fe02c 100644 --- a/www/chromium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc +++ b/www/chromium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc @@ -1,6 +1,6 @@ ---- media/gpu/vaapi/vaapi_wrapper.cc.orig 2022-02-28 16:54:41 UTC +--- media/gpu/vaapi/vaapi_wrapper.cc.orig 2022-03-25 21:59:56 UTC +++ media/gpu/vaapi/vaapi_wrapper.cc -@@ -567,7 +567,7 @@ VADisplayState::VADisplayState() +@@ -587,7 +587,7 @@ VADisplayState::VADisplayState() bool VADisplayState::Initialize() { base::AutoLock auto_lock(va_lock_); diff --git a/www/chromium/files/patch-media_video_video__encode__accelerator__adapter.cc b/www/chromium/files/patch-media_video_video__encode__accelerator__adapter.cc index 17c6287b96ab..3ef6e7cd3149 100644 --- a/www/chromium/files/patch-media_video_video__encode__accelerator__adapter.cc +++ b/www/chromium/files/patch-media_video_video__encode__accelerator__adapter.cc @@ -1,6 +1,6 @@ ---- media/video/video_encode_accelerator_adapter.cc.orig 2022-02-28 16:54:41 UTC +--- media/video/video_encode_accelerator_adapter.cc.orig 2022-03-25 21:59:56 UTC +++ media/video/video_encode_accelerator_adapter.cc -@@ -88,7 +88,7 @@ VideoEncodeAccelerator::Config SetUpVeaConfig( +@@ -96,7 +96,7 @@ VideoEncodeAccelerator::Config SetUpVeaConfig( if (is_rgb) config.input_format = PIXEL_FORMAT_I420; @@ -9,7 +9,7 @@ if (storage_type == VideoFrame::STORAGE_DMABUFS || storage_type == VideoFrame::STORAGE_GPU_MEMORY_BUFFER) { if (is_rgb) -@@ -227,7 +227,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal +@@ -235,7 +235,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal auto vea_config = SetUpVeaConfig(profile_, options_, format, first_frame->storage_type()); diff --git a/www/chromium/files/patch-media_video_video__encode__accelerator__adapter__test.cc b/www/chromium/files/patch-media_video_video__encode__accelerator__adapter__test.cc index d10c8d7ba0b9..8e7da0c3e3bf 100644 --- a/www/chromium/files/patch-media_video_video__encode__accelerator__adapter__test.cc +++ b/www/chromium/files/patch-media_video_video__encode__accelerator__adapter__test.cc @@ -1,6 +1,6 @@ ---- media/video/video_encode_accelerator_adapter_test.cc.orig 2022-02-28 16:54:41 UTC +--- media/video/video_encode_accelerator_adapter_test.cc.orig 2022-03-25 21:59:56 UTC +++ media/video/video_encode_accelerator_adapter_test.cc -@@ -349,7 +349,7 @@ TEST_P(VideoEncodeAcceleratorAdapterTest, TwoFramesRes +@@ -350,7 +350,7 @@ TEST_P(VideoEncodeAcceleratorAdapterTest, TwoFramesRes vea()->SetEncodingCallback(base::BindLambdaForTesting( [&](BitstreamBuffer&, bool keyframe, scoped_refptr<VideoFrame> frame) { diff --git a/www/chromium/files/patch-media_webrtc_audio__processor.cc b/www/chromium/files/patch-media_webrtc_audio__processor.cc index 046adadf70f2..437fff22f41a 100644 --- a/www/chromium/files/patch-media_webrtc_audio__processor.cc +++ b/www/chromium/files/patch-media_webrtc_audio__processor.cc @@ -1,6 +1,6 @@ ---- media/webrtc/audio_processor.cc.orig 2022-02-28 16:54:41 UTC +--- media/webrtc/audio_processor.cc.orig 2022-03-25 21:59:56 UTC +++ media/webrtc/audio_processor.cc -@@ -487,7 +487,7 @@ absl::optional<double> AudioProcessor::ProcessData( +@@ -428,7 +428,7 @@ absl::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/chromium/files/patch-media_webrtc_helpers__unittests.cc b/www/chromium/files/patch-media_webrtc_helpers__unittests.cc index afdf0f36248b..0f4283be3863 100644 --- a/www/chromium/files/patch-media_webrtc_helpers__unittests.cc +++ b/www/chromium/files/patch-media_webrtc_helpers__unittests.cc @@ -1,4 +1,4 @@ ---- media/webrtc/helpers_unittests.cc.orig 2022-02-28 16:54:41 UTC +--- media/webrtc/helpers_unittests.cc.orig 2022-03-25 21:59:56 UTC +++ media/webrtc/helpers_unittests.cc @@ -36,7 +36,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, CheckDefau EXPECT_FALSE(config.pre_amplifier.enabled); @@ -9,7 +9,7 @@ EXPECT_TRUE(config.gain_controller2.enabled); #else EXPECT_FALSE(config.gain_controller2.enabled); -@@ -95,7 +95,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, CheckDefau +@@ -94,7 +94,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, CheckDefau // Check that either AGC1 digital or AGC2 digital is used based on the // platforms where the Hybrid AGC is enabled by default. diff --git a/www/chromium/files/patch-mojo_public_c_system_thunks.cc b/www/chromium/files/patch-mojo_public_c_system_thunks.cc index 6ac3766ca400..fe26aa1cf5a8 100644 --- a/www/chromium/files/patch-mojo_public_c_system_thunks.cc +++ b/www/chromium/files/patch-mojo_public_c_system_thunks.cc @@ -1,24 +1,24 @@ ---- mojo/public/c/system/thunks.cc.orig 2022-02-28 16:54:41 UTC +--- mojo/public/c/system/thunks.cc.orig 2022-03-25 21:59:56 UTC +++ mojo/public/c/system/thunks.cc -@@ -19,7 +19,7 @@ - #include "mojo/public/c/system/core.h" +@@ -20,7 +20,7 @@ #include "mojo/public/c/system/macros.h" --#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + #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" -@@ -67,7 +67,7 @@ class CoreLibraryInitializer { - ~CoreLibraryInitializer() = default; +@@ -69,7 +69,7 @@ class CoreLibraryInitializer { MojoResult LoadLibrary(base::FilePath library_path) { --#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + #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; -@@ -81,7 +81,7 @@ class CoreLibraryInitializer { +@@ -83,7 +83,7 @@ class CoreLibraryInitializer { if (library_path.empty()) { // Default to looking for the library in the current working directory. @@ -26,13 +26,13 @@ +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) const base::FilePath::CharType kDefaultLibraryPathValue[] = FILE_PATH_LITERAL("./libmojo_core.so"); - #elif BUILDFLAG(IS_WIN) -@@ -131,7 +131,7 @@ class CoreLibraryInitializer { - } + #elif BUILDFLAG(IS_FUCHSIA) +@@ -139,7 +139,7 @@ class CoreLibraryInitializer { private: --#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) absl::optional<base::ScopedNativeLibrary> library_; #endif }; diff --git a/www/chromium/files/patch-mojo_public_js_mojo__bindings__resources.grd b/www/chromium/files/patch-mojo_public_js_mojo__bindings__resources.grd index fbbcb5ae12d1..77435d61975a 100644 --- a/www/chromium/files/patch-mojo_public_js_mojo__bindings__resources.grd +++ b/www/chromium/files/patch-mojo_public_js_mojo__bindings__resources.grd @@ -1,6 +1,6 @@ ---- mojo/public/js/mojo_bindings_resources.grd.orig 2022-02-28 16:54:41 UTC +--- mojo/public/js/mojo_bindings_resources.grd.orig 2022-03-25 21:59:56 UTC +++ mojo/public/js/mojo_bindings_resources.grd -@@ -110,7 +110,7 @@ +@@ -126,7 +126,7 @@ use_base_dir="false" resource_path="mojo/mojo/public/mojom/base/unguessable_token.mojom-webui.js" type="BINDATA" /> diff --git a/www/chromium/files/patch-net_BUILD.gn b/www/chromium/files/patch-net_BUILD.gn index 3d26c0584d04..c6f03b3bf9d0 100644 --- a/www/chromium/files/patch-net_BUILD.gn +++ b/www/chromium/files/patch-net_BUILD.gn @@ -1,6 +1,6 @@ ---- net/BUILD.gn.orig 2022-03-19 12:56:15 UTC +--- net/BUILD.gn.orig 2022-03-25 21:59:56 UTC +++ net/BUILD.gn -@@ -100,7 +100,7 @@ net_configs = [ +@@ -101,7 +101,7 @@ net_configs = [ "//build/config/compiler:wexit_time_destructors", ] @@ -9,7 +9,7 @@ net_configs += [ "//build/config/linux:libresolv" ] } -@@ -1087,6 +1087,7 @@ component("net") { +@@ -1096,6 +1096,7 @@ component("net") { "//net/dns:mdns_client", "//net/dns/public", "//net/third_party/quiche", @@ -17,7 +17,7 @@ ] allow_circular_includes_from = [ -@@ -1215,6 +1216,15 @@ component("net") { +@@ -1224,6 +1225,15 @@ component("net") { ] } @@ -28,12 +28,12 @@ + "base/network_change_notifier_linux.cc", + "base/network_interfaces_linux.cc", + ] -+ } ++ } + if (is_mac) { sources += [ "base/network_notification_thread_mac.cc", -@@ -1347,7 +1357,7 @@ component("net") { +@@ -1356,7 +1366,7 @@ component("net") { } } @@ -42,7 +42,7 @@ sources += [ "base/network_change_notifier_posix.cc", "base/network_change_notifier_posix.h", -@@ -1380,7 +1390,7 @@ component("net") { +@@ -1389,7 +1399,7 @@ component("net") { } # Use getifaddrs() on POSIX platforms, except Linux. @@ -51,7 +51,7 @@ sources += [ "base/network_interfaces_getifaddrs.cc", "base/network_interfaces_getifaddrs.h", -@@ -2451,7 +2461,7 @@ if (is_linux || is_chromeos || is_mac) { +@@ -2465,7 +2475,7 @@ if (is_linux || is_chromeos || is_mac) { } } @@ -60,7 +60,7 @@ static_library("epoll_server") { sources = [ "tools/epoll_server/platform/impl/epoll_bug_impl.h", -@@ -4445,7 +4455,7 @@ test("net_unittests") { +@@ -4459,7 +4469,7 @@ test("net_unittests") { ] } @@ -69,7 +69,7 @@ sources += [ "base/address_tracker_linux_unittest.cc", "base/network_interfaces_linux_unittest.cc", -@@ -4519,6 +4529,10 @@ test("net_unittests") { +@@ -4533,6 +4543,10 @@ test("net_unittests") { "//url:buildflags", ] @@ -80,7 +80,7 @@ allow_circular_includes_from = [ "//net/third_party/quiche:quiche_tests" ] if (enable_websockets) { -@@ -4566,7 +4580,7 @@ test("net_unittests") { +@@ -4580,7 +4594,7 @@ test("net_unittests") { ] } @@ -89,7 +89,7 @@ sources += [ "quic/platform/impl/quic_epoll_clock_test.cc", "quic/platform/impl/quic_flags_test.cc", -@@ -4712,7 +4726,7 @@ test("net_unittests") { +@@ -4728,7 +4742,7 @@ test("net_unittests") { } # Use getifaddrs() on POSIX platforms, except Linux. diff --git a/www/chromium/files/patch-net_base_network__change__notifier.cc b/www/chromium/files/patch-net_base_network__change__notifier.cc index 8b9b8f465c37..793700810596 100644 --- a/www/chromium/files/patch-net_base_network__change__notifier.cc +++ b/www/chromium/files/patch-net_base_network__change__notifier.cc @@ -1,6 +1,6 @@ ---- net/base/network_change_notifier.cc.orig 2022-02-28 16:54:41 UTC +--- net/base/network_change_notifier.cc.orig 2022-03-25 21:59:56 UTC +++ net/base/network_change_notifier.cc -@@ -38,7 +38,7 @@ +@@ -39,7 +39,7 @@ #include "net/base/network_change_notifier_linux.h" #elif BUILDFLAG(IS_APPLE) #include "net/base/network_change_notifier_mac.h" @@ -9,7 +9,7 @@ #include "net/base/network_change_notifier_posix.h" #elif BUILDFLAG(IS_FUCHSIA) #include "net/base/network_change_notifier_fuchsia.h" -@@ -320,6 +320,9 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo +@@ -321,6 +321,9 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo #elif BUILDFLAG(IS_FUCHSIA) return std::make_unique<NetworkChangeNotifierFuchsia>( /*require_wlan=*/false); diff --git a/www/chromium/files/patch-net_cert_cert__verify__proc.cc b/www/chromium/files/patch-net_cert_cert__verify__proc.cc index ec2e4a89ae7b..d9b2ded4bcaf 100644 --- a/www/chromium/files/patch-net_cert_cert__verify__proc.cc +++ b/www/chromium/files/patch-net_cert_cert__verify__proc.cc @@ -1,6 +1,6 @@ ---- net/cert/cert_verify_proc.cc.orig 2022-02-28 16:54:41 UTC +--- net/cert/cert_verify_proc.cc.orig 2022-03-25 21:59:56 UTC +++ net/cert/cert_verify_proc.cc -@@ -470,7 +470,7 @@ base::Value CertVerifyParams(X509Certificate* cert, +@@ -552,7 +552,7 @@ base::Value CertVerifyParams(X509Certificate* cert, } // namespace diff --git a/www/chromium/files/patch-net_cert_cert__verify__proc.h b/www/chromium/files/patch-net_cert_cert__verify__proc.h index a6fb7c8da9be..c73588b0ff78 100644 --- a/www/chromium/files/patch-net_cert_cert__verify__proc.h +++ b/www/chromium/files/patch-net_cert_cert__verify__proc.h @@ -1,7 +1,7 @@ ---- net/cert/cert_verify_proc.h.orig 2022-02-28 16:54:41 UTC +--- net/cert/cert_verify_proc.h.orig 2022-03-25 21:59:56 UTC +++ net/cert/cert_verify_proc.h -@@ -66,7 +66,7 @@ class NET_EXPORT CertVerifyProc - kMaxValue = kChainLengthOne +@@ -79,7 +79,7 @@ class NET_EXPORT CertVerifyProc + kMaxValue = kOther }; -#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) diff --git a/www/chromium/files/patch-net_cert_cert__verify__proc__unittest.cc b/www/chromium/files/patch-net_cert_cert__verify__proc__unittest.cc index 47824fcbe7e7..5be4d0055758 100644 --- a/www/chromium/files/patch-net_cert_cert__verify__proc__unittest.cc +++ b/www/chromium/files/patch-net_cert_cert__verify__proc__unittest.cc @@ -1,6 +1,6 @@ ---- net/cert/cert_verify_proc_unittest.cc.orig 2022-02-28 16:54:41 UTC +--- net/cert/cert_verify_proc_unittest.cc.orig 2022-03-25 21:59:56 UTC +++ net/cert/cert_verify_proc_unittest.cc -@@ -223,7 +223,7 @@ const std::vector<CertVerifyProcType> kAllCertVerifier +@@ -225,7 +225,7 @@ const std::vector<CertVerifyProcType> kAllCertVerifier CERT_VERIFY_PROC_MAC, CERT_VERIFY_PROC_BUILTIN #elif BUILDFLAG(IS_WIN) CERT_VERIFY_PROC_WIN diff --git a/www/chromium/files/patch-net_dns_BUILD.gn b/www/chromium/files/patch-net_dns_BUILD.gn index b0a6c631049a..5cd4ec92683f 100644 --- a/www/chromium/files/patch-net_dns_BUILD.gn +++ b/www/chromium/files/patch-net_dns_BUILD.gn @@ -1,6 +1,6 @@ ---- net/dns/BUILD.gn.orig 2022-02-28 16:54:41 UTC +--- net/dns/BUILD.gn.orig 2022-03-25 21:59:56 UTC +++ net/dns/BUILD.gn -@@ -112,7 +112,7 @@ source_set("dns") { +@@ -114,7 +114,7 @@ source_set("dns") { "dns_config_service_android.cc", "dns_config_service_android.h", ] @@ -9,7 +9,15 @@ sources += [ "dns_config_service_linux.cc", "dns_config_service_linux.h", -@@ -415,9 +415,9 @@ source_set("tests") { +@@ -155,6 +155,7 @@ source_set("dns") { + ":host_resolver_manager", + ":mdns_client", + "//net:net_public_deps", ++ "//printing/buildflags", + ] + + allow_circular_includes_from = [ +@@ -416,9 +417,9 @@ source_set("tests") { if (is_android) { sources += [ "dns_config_service_android_unittest.cc" ] diff --git a/www/chromium/files/patch-net_dns_address__sorter__posix.cc b/www/chromium/files/patch-net_dns_address__sorter__posix.cc index dda04a22f4b5..bd934f90b5d8 100644 --- a/www/chromium/files/patch-net_dns_address__sorter__posix.cc +++ b/www/chromium/files/patch-net_dns_address__sorter__posix.cc @@ -1,6 +1,6 @@ ---- net/dns/address_sorter_posix.cc.orig 2022-02-07 13:39:41 UTC +--- net/dns/address_sorter_posix.cc.orig 2022-03-25 21:59:56 UTC +++ net/dns/address_sorter_posix.cc -@@ -17,6 +17,7 @@ +@@ -18,6 +18,7 @@ #include <ifaddrs.h> #include <net/if.h> #include <netinet/in_var.h> diff --git a/www/chromium/files/patch-net_dns_dns__util.cc b/www/chromium/files/patch-net_dns_dns__util.cc index fd21a857ad0d..2b19d06cde92 100644 --- a/www/chromium/files/patch-net_dns_dns__util.cc +++ b/www/chromium/files/patch-net_dns_dns__util.cc @@ -1,8 +1,8 @@ ---- net/dns/dns_util.cc.orig 2022-02-28 16:54:41 UTC +--- net/dns/dns_util.cc.orig 2022-03-25 21:59:56 UTC +++ net/dns/dns_util.cc -@@ -28,6 +28,8 @@ +@@ -27,6 +27,8 @@ + #include "net/third_party/uri_template/uri_template.h" #include "third_party/abseil-cpp/absl/types/optional.h" - #include "url/url_canon.h" +#include <sys/socket.h> + diff --git a/www/chromium/files/patch-net_dns_host__resolver__manager.cc b/www/chromium/files/patch-net_dns_host__resolver__manager.cc index 6c58f20fcb6b..ada52d2db219 100644 --- a/www/chromium/files/patch-net_dns_host__resolver__manager.cc +++ b/www/chromium/files/patch-net_dns_host__resolver__manager.cc @@ -1,6 +1,6 @@ ---- net/dns/host_resolver_manager.cc.orig 2022-02-28 16:54:41 UTC +--- net/dns/host_resolver_manager.cc.orig 2022-03-25 21:59:56 UTC +++ net/dns/host_resolver_manager.cc -@@ -3014,7 +3014,7 @@ HostResolverManager::HostResolverManager( +@@ -2979,7 +2979,7 @@ HostResolverManager::HostResolverManager( NetworkChangeNotifier::AddConnectionTypeObserver(this); if (system_dns_config_notifier_) system_dns_config_notifier_->AddObserver(this); diff --git a/www/chromium/files/patch-net_dns_host__resolver__proc.cc b/www/chromium/files/patch-net_dns_host__resolver__proc.cc index b0d72b598594..e4872a750520 100644 --- a/www/chromium/files/patch-net_dns_host__resolver__proc.cc +++ b/www/chromium/files/patch-net_dns_host__resolver__proc.cc @@ -1,4 +1,4 @@ ---- net/dns/host_resolver_proc.cc.orig 2022-02-28 16:54:41 UTC +--- net/dns/host_resolver_proc.cc.orig 2022-03-25 21:59:56 UTC +++ net/dns/host_resolver_proc.cc @@ -19,10 +19,6 @@ #include "net/dns/dns_util.h" @@ -11,7 +11,7 @@ namespace net { HostResolverProc* HostResolverProc::default_proc_ = nullptr; -@@ -177,7 +173,7 @@ int SystemHostResolverCall(const std::string& host, +@@ -192,7 +188,7 @@ int SystemHostResolverCall(const std::string& host, base::BlockingType::WILL_BLOCK); #if BUILDFLAG(IS_POSIX) && \ @@ -19,4 +19,4 @@ + !(BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) || BUILDFLAG(IS_ANDROID)) DnsReloaderMaybeReload(); #endif - absl::optional<AddressInfo> ai; + auto [ai, err, os_error] = AddressInfo::Get(host, hints, nullptr, network); diff --git a/www/chromium/files/patch-net_dns_public_BUILD.gn b/www/chromium/files/patch-net_dns_public_BUILD.gn index 9444650053b6..47b7d860ad65 100644 --- a/www/chromium/files/patch-net_dns_public_BUILD.gn +++ b/www/chromium/files/patch-net_dns_public_BUILD.gn @@ -1,7 +1,7 @@ ---- net/dns/public/BUILD.gn.orig 2022-02-28 16:54:41 UTC +--- net/dns/public/BUILD.gn.orig 2022-03-25 21:59:56 UTC +++ net/dns/public/BUILD.gn -@@ -72,7 +72,7 @@ source_set("tests") { - "util_unittest.cc", +@@ -74,7 +74,7 @@ source_set("tests") { + "doh_provider_entry_unittest.cc", ] - if (is_posix && !is_android) { diff --git a/www/chromium/files/patch-net_socket_tcp__socket__posix.cc b/www/chromium/files/patch-net_socket_tcp__socket__posix.cc index 45fed897114b..f8d2ca748e33 100644 --- a/www/chromium/files/patch-net_socket_tcp__socket__posix.cc +++ b/www/chromium/files/patch-net_socket_tcp__socket__posix.cc @@ -1,6 +1,6 @@ ---- net/socket/tcp_socket_posix.cc.orig 2022-02-28 16:54:41 UTC +--- net/socket/tcp_socket_posix.cc.orig 2022-03-25 21:59:56 UTC +++ net/socket/tcp_socket_posix.cc -@@ -95,6 +95,17 @@ bool SetTCPKeepAlive(int fd, bool enable, int delay) { +@@ -96,6 +96,17 @@ bool SetTCPKeepAlive(int fd, bool enable, int delay) { PLOG(ERROR) << "Failed to set TCP_KEEPALIVE on fd: " << fd; return false; } diff --git a/www/chromium/files/patch-net_socket_udp__socket__posix.cc b/www/chromium/files/patch-net_socket_udp__socket__posix.cc index a1f355535c32..8f4d7d71c0c7 100644 --- a/www/chromium/files/patch-net_socket_udp__socket__posix.cc +++ b/www/chromium/files/patch-net_socket_udp__socket__posix.cc @@ -1,6 +1,6 @@ ---- net/socket/udp_socket_posix.cc.orig 2022-02-28 16:54:41 UTC +--- net/socket/udp_socket_posix.cc.orig 2022-03-25 21:59:56 UTC +++ net/socket/udp_socket_posix.cc -@@ -636,7 +636,7 @@ int UDPSocketPosix::SetDoNotFragment() { +@@ -574,7 +574,7 @@ int UDPSocketPosix::SetDoNotFragment() { } void UDPSocketPosix::SetMsgConfirm(bool confirm) { diff --git a/www/chromium/files/patch-net_socket_udp__socket__unittest.cc b/www/chromium/files/patch-net_socket_udp__socket__unittest.cc index 3bc86afc1222..c4eab5a25a6e 100644 --- a/www/chromium/files/patch-net_socket_udp__socket__unittest.cc +++ b/www/chromium/files/patch-net_socket_udp__socket__unittest.cc @@ -1,4 +1,4 @@ ---- net/socket/udp_socket_unittest.cc.orig 2022-02-28 16:54:41 UTC +--- net/socket/udp_socket_unittest.cc.orig 2022-03-25 21:59:56 UTC +++ net/socket/udp_socket_unittest.cc @@ -324,7 +324,7 @@ TEST_F(UDPSocketTest, PartialRecv) { EXPECT_EQ(second_packet, received); @@ -14,7 +14,7 @@ rv = client.SetDoNotFragment(); -#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FUCHSIA) -+#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) ++#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) // TODO(crbug.com/945590): IP_MTU_DISCOVER is not implemented on Fuchsia. EXPECT_THAT(rv, IsError(ERR_NOT_IMPLEMENTED)); #else @@ -23,7 +23,7 @@ rv = server.SetDoNotFragment(); -#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FUCHSIA) -+#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) ++#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) // TODO(crbug.com/945590): IP_MTU_DISCOVER is not implemented on Fuchsia. EXPECT_THAT(rv, IsError(ERR_NOT_IMPLEMENTED)); #else @@ -31,8 +31,8 @@ // TODO(https://crbug.com/947115): failing on device on iOS 12.2. // TODO(https://crbug.com/1227554): flaky on Mac 11. --#if BUILDFLAG(IS_IOS) || defined(OS_MAC) -+#if BUILDFLAG(IS_IOS) || defined(OS_MAC) || defined(IS_BSD) +-#if BUILDFLAG(IS_IOS) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_IOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) #define MAYBE_SharedMulticastAddress DISABLED_SharedMulticastAddress #else #define MAYBE_SharedMulticastAddress SharedMulticastAddress diff --git a/www/chromium/files/patch-net_third__party_quiche_BUILD.gn b/www/chromium/files/patch-net_third__party_quiche_BUILD.gn index c1c21bbe6826..0a679cd903f8 100644 --- a/www/chromium/files/patch-net_third__party_quiche_BUILD.gn +++ b/www/chromium/files/patch-net_third__party_quiche_BUILD.gn @@ -1,6 +1,6 @@ ---- net/third_party/quiche/BUILD.gn.orig 2022-02-28 16:54:41 UTC +--- net/third_party/quiche/BUILD.gn.orig 2022-03-25 21:59:56 UTC +++ net/third_party/quiche/BUILD.gn -@@ -706,7 +706,7 @@ proto_library("net_quic_test_tools_proto") { +@@ -708,7 +708,7 @@ proto_library("net_quic_test_tools_proto") { extra_configs = [ "//build/config/compiler:wexit_time_destructors" ] } @@ -9,7 +9,7 @@ source_set("epoll_server_core") { sources = [ "src/epoll_server/platform/api/epoll_bug.h", -@@ -1061,7 +1061,7 @@ source_set("quic_test_tools_core") { +@@ -1063,7 +1063,7 @@ source_set("quic_test_tools_core") { "//third_party/quic_trace:quic_trace_proto", ] @@ -18,7 +18,7 @@ sources += [ "src/epoll_server/fake_simple_epoll_server.cc", "src/epoll_server/fake_simple_epoll_server.h", -@@ -1526,10 +1526,10 @@ source_set("quiche_tests") { +@@ -1528,10 +1528,10 @@ source_set("quiche_tests") { ] public_deps = [] diff --git a/www/chromium/files/patch-net_url__request_url__fetcher.h b/www/chromium/files/patch-net_url__request_url__fetcher.h index 3cc317e29c46..2e9466c0dd77 100644 --- a/www/chromium/files/patch-net_url__request_url__fetcher.h +++ b/www/chromium/files/patch-net_url__request_url__fetcher.h @@ -1,6 +1,6 @@ ---- net/url_request/url_fetcher.h.orig 2022-02-28 16:54:41 UTC +--- net/url_request/url_fetcher.h.orig 2022-03-25 21:59:56 UTC +++ net/url_request/url_fetcher.h -@@ -354,7 +354,7 @@ class NET_EXPORT URLFetcher { +@@ -344,7 +344,7 @@ class NET_EXPORT URLFetcher { // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. #if (!BUILDFLAG(IS_WIN) && \ diff --git a/www/chromium/files/patch-net_url__request_url__request__context.cc b/www/chromium/files/patch-net_url__request_url__request__context.cc index 4065c571abd5..f4ce413f95b7 100644 --- a/www/chromium/files/patch-net_url__request_url__request__context.cc +++ b/www/chromium/files/patch-net_url__request_url__request__context.cc @@ -1,6 +1,6 @@ ---- net/url_request/url_request_context.cc.orig 2022-02-28 16:54:41 UTC +--- net/url_request/url_request_context.cc.orig 2022-03-25 21:59:56 UTC +++ net/url_request/url_request_context.cc -@@ -89,7 +89,7 @@ const HttpNetworkSessionContext* URLRequestContext::Ge +@@ -90,7 +90,7 @@ const HttpNetworkSessionContext* URLRequestContext::Ge // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. #if !BUILDFLAG(IS_WIN) && \ diff --git a/www/chromium/files/patch-net_url__request_url__request__context.h b/www/chromium/files/patch-net_url__request_url__request__context.h index afd5a144a82d..8b6ae8c4bff1 100644 --- a/www/chromium/files/patch-net_url__request_url__request__context.h +++ b/www/chromium/files/patch-net_url__request_url__request__context.h @@ -1,6 +1,6 @@ ---- net/url_request/url_request_context.h.orig 2022-02-28 16:54:41 UTC +--- net/url_request/url_request_context.h.orig 2022-03-25 21:59:56 UTC +++ net/url_request/url_request_context.h -@@ -82,7 +82,7 @@ class NET_EXPORT URLRequestContext { +@@ -83,7 +83,7 @@ class NET_EXPORT URLRequestContext { // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. #if !BUILDFLAG(IS_WIN) && \ diff --git a/www/chromium/files/patch-net_url__request_url__request__context__builder.cc b/www/chromium/files/patch-net_url__request_url__request__context__builder.cc index b028f9251b83..f39035c8be93 100644 --- a/www/chromium/files/patch-net_url__request_url__request__context__builder.cc +++ b/www/chromium/files/patch-net_url__request_url__request__context__builder.cc @@ -1,6 +1,6 @@ ---- net/url_request/url_request_context_builder.cc.orig 2022-02-28 16:54:41 UTC +--- net/url_request/url_request_context_builder.cc.orig 2022-03-25 21:59:56 UTC +++ net/url_request/url_request_context_builder.cc -@@ -427,7 +427,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu +@@ -492,7 +492,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu } if (!proxy_resolution_service_) { diff --git a/www/chromium/files/patch-printing_print__settings__conversion.cc b/www/chromium/files/patch-printing_print__settings__conversion.cc index 3199a832c226..a8f5c1c7691c 100644 --- a/www/chromium/files/patch-printing_print__settings__conversion.cc +++ b/www/chromium/files/patch-printing_print__settings__conversion.cc @@ -1,6 +1,6 @@ ---- printing/print_settings_conversion.cc.orig 2022-02-28 16:54:41 UTC +--- printing/print_settings_conversion.cc.orig 2022-03-25 21:59:56 UTC +++ printing/print_settings_conversion.cc -@@ -216,7 +216,7 @@ std::unique_ptr<PrintSettings> PrintSettingsFromJobSet +@@ -217,7 +217,7 @@ std::unique_ptr<PrintSettings> PrintSettingsFromJobSet settings->set_is_modifiable(is_modifiable.value()); } diff --git a/www/chromium/files/patch-remoting_host_host__main.cc b/www/chromium/files/patch-remoting_host_host__main.cc index 71415397194e..f058e97d773a 100644 --- a/www/chromium/files/patch-remoting_host_host__main.cc +++ b/www/chromium/files/patch-remoting_host_host__main.cc @@ -1,4 +1,4 @@ ---- remoting/host/host_main.cc.orig 2022-02-28 16:54:41 UTC +--- remoting/host/host_main.cc.orig 2022-03-25 21:59:56 UTC +++ remoting/host/host_main.cc @@ -50,7 +50,7 @@ int FileChooserMain(); int RdpDesktopSessionMain(); @@ -18,7 +18,7 @@ " --audio-pipe-name=<pipe> - Sets the pipe name to capture audio on " "Linux.\n" #endif // BUILDFLAG(IS_LINUX) -@@ -152,7 +152,7 @@ MainRoutineFn SelectMainRoutine(const std::string& pro +@@ -154,7 +154,7 @@ MainRoutineFn SelectMainRoutine(const std::string& pro } else if (process_type == kProcessTypeUrlForwarderConfigurator) { main_routine = &UrlForwarderConfiguratorMain; #endif // BUILDFLAG(IS_WIN) diff --git a/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc b/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc index ce0d6a17f7ad..987e63b4bcc6 100644 --- a/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc +++ b/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc @@ -1,6 +1,6 @@ ---- remoting/host/remoting_me2me_host.cc.orig 2022-02-28 16:54:41 UTC +--- remoting/host/remoting_me2me_host.cc.orig 2022-03-25 21:59:56 UTC +++ remoting/host/remoting_me2me_host.cc -@@ -123,7 +123,7 @@ +@@ -124,7 +124,7 @@ #include "remoting/host/mac/permission_utils.h" #endif // BUILDFLAG(IS_APPLE) @@ -9,7 +9,7 @@ #include <gtk/gtk.h> #include "base/linux_util.h" -@@ -167,7 +167,7 @@ const char kApplicationName[] = "chromoting"; +@@ -168,7 +168,7 @@ const char kApplicationName[] = "chromoting"; const char kStdinConfigPath[] = "-"; #endif // !defined(REMOTING_MULTI_PROCESS) @@ -18,7 +18,7 @@ // The command line switch used to pass name of the pipe to capture audio on // linux. const char kAudioPipeSwitchName[] = "audio-pipe-name"; -@@ -368,7 +368,7 @@ class HostProcess : public ConfigWatcher::Delegate, +@@ -373,7 +373,7 @@ class HostProcess : public ConfigWatcher::Delegate, std::unique_ptr<ChromotingHostContext> context_; @@ -27,7 +27,7 @@ // Watch for certificate changes and kill the host when changes occur std::unique_ptr<CertificateWatcher> cert_watcher_; #endif -@@ -741,7 +741,7 @@ void HostProcess::StartOnNetworkThread() { +@@ -747,7 +747,7 @@ void HostProcess::StartOnNetworkThread() { void HostProcess::ShutdownOnNetworkThread() { DCHECK(context_->network_task_runner()->BelongsToCurrentThread()); config_watcher_.reset(); @@ -36,7 +36,7 @@ cert_watcher_.reset(); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) } -@@ -800,7 +800,7 @@ void HostProcess::CreateAuthenticatorFactory() { +@@ -806,7 +806,7 @@ void HostProcess::CreateAuthenticatorFactory() { DCHECK(third_party_auth_config_.token_url.is_valid()); DCHECK(third_party_auth_config_.token_validation_url.is_valid()); @@ -45,7 +45,7 @@ if (!cert_watcher_) { cert_watcher_ = std::make_unique<CertificateWatcher>( base::BindRepeating(&HostProcess::ShutdownHost, -@@ -914,7 +914,7 @@ void HostProcess::StartOnUiThread() { +@@ -916,7 +916,7 @@ void HostProcess::StartOnUiThread() { base::BindRepeating(&HostProcess::OnPolicyUpdate, base::Unretained(this)), base::BindRepeating(&HostProcess::OnPolicyError, base::Unretained(this))); @@ -54,7 +54,7 @@ // If an audio pipe is specific on the command-line then initialize // AudioCapturerLinux to capture from it. base::FilePath audio_pipe_name = base::CommandLine::ForCurrentProcess()-> -@@ -975,7 +975,7 @@ void HostProcess::ShutdownOnUiThread() { +@@ -987,7 +987,7 @@ void HostProcess::ShutdownOnUiThread() { // It is now safe for the HostProcess to be deleted. self_ = nullptr; @@ -63,7 +63,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. -@@ -1685,7 +1685,7 @@ void HostProcess::StartHost() { +@@ -1697,7 +1697,7 @@ void HostProcess::StartHost() { // The feature is enabled for all Googlers using a supported platform. desktop_environment_options_.set_enable_remote_open_url(is_googler_); @@ -72,16 +72,16 @@ // Experimental feature. Enabled on Linux for easier testing. if (is_googler_) { desktop_environment_options_.set_enable_remote_webauthn(true); -@@ -1882,7 +1882,7 @@ void HostProcess::CrashHostProcess(const std::string& - int HostProcessMain() { +@@ -1897,7 +1897,7 @@ int HostProcessMain() { HOST_LOG << "Starting host process: version " << STRINGIZE(VERSION); + const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Initialize Xlib for multi-threaded use, allowing non-Chromium code to // use X11 safely (such as the WebRTC capturer, GTK ...) x11::InitXlib(); -@@ -1919,7 +1919,7 @@ int HostProcessMain() { +@@ -1941,7 +1941,7 @@ int HostProcessMain() { std::unique_ptr<net::NetworkChangeNotifier> network_change_notifier( net::NetworkChangeNotifier::CreateIfNeeded()); diff --git a/www/chromium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.cc b/www/chromium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.cc index 8e6a040a0010..6c7f986f32e7 100644 --- a/www/chromium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.cc +++ b/www/chromium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.cc @@ -1,6 +1,6 @@ ---- sandbox/policy/openbsd/sandbox_openbsd.cc.orig 2022-02-07 13:39:41 UTC +--- sandbox/policy/openbsd/sandbox_openbsd.cc.orig 2022-03-25 21:59:56 UTC +++ sandbox/policy/openbsd/sandbox_openbsd.cc -@@ -0,0 +1,394 @@ +@@ -0,0 +1,407 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -60,6 +60,8 @@ +#include "crypto/nss_util.h" +#endif + ++#include "third_party/boringssl/src/include/openssl/crypto.h" ++ +#include "ui/gfx/x/connection.h" +#include "ui/gfx/font_util.h" + @@ -80,7 +82,8 @@ +namespace policy { + +SandboxLinux::SandboxLinux() -+ : sandbox_status_flags_(kInvalid), ++ : unveil_initialized_(false), ++ sandbox_status_flags_(kInvalid), + pre_initialized_(false), + initialize_sandbox_ran_(false), + broker_process_(nullptr) { @@ -112,6 +115,7 @@ + + base::SysInfo::AmountOfPhysicalMemory(); + base::SysInfo::NumberOfProcessors(); ++ base::SysInfo::CPUModelName(); + +#if defined(USE_NSS_CERTS) + // The main process has to initialize the ~/.pki dir which won't work @@ -120,6 +124,9 @@ + crypto::EnsureNSSInit(); +#endif + ++ if (process_type.empty()) ++ CRYPTO_pre_sandbox_init(); ++ + // cache the XErrorDB by forcing a read on it + { + auto* connection = x11::Connection::Get(); @@ -269,9 +276,15 @@ + _exit(1); + } + ++ unveil_initialized_ = true; ++ + return true; +} + ++bool SandboxLinux::unveil_initialized() const { ++ return unveil_initialized_; ++} ++ +bool SandboxLinux::InitializeSandbox(sandbox::mojom::Sandbox sandbox_type, + SandboxLinux::PreSandboxHook hook, + const Options& options) { @@ -309,7 +322,7 @@ + } else if (process_type == switches::kRendererProcess) { + // prot_exec needed by v8 + // flock needed by sqlite3 locking -+ SetPledge("stdio flock prot_exec recvfd sendfd ps", NULL); ++ SetPledge("stdio rpath flock prot_exec recvfd sendfd ps", NULL); + } else if (process_type == switches::kGpuProcess) { + SetPledge("stdio rpath cpath wpath getpw drm prot_exec recvfd sendfd tmppath", NULL); + } else if (process_type == switches::kPpapiPluginProcess) { diff --git a/www/chromium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.h b/www/chromium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.h index 25ac98d7be0c..5e1af030852b 100644 --- a/www/chromium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.h +++ b/www/chromium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.h @@ -1,6 +1,6 @@ ---- sandbox/policy/openbsd/sandbox_openbsd.h.orig 2022-02-07 13:39:41 UTC +--- sandbox/policy/openbsd/sandbox_openbsd.h.orig 2022-03-25 21:59:56 UTC +++ sandbox/policy/openbsd/sandbox_openbsd.h -@@ -0,0 +1,278 @@ +@@ -0,0 +1,282 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -178,6 +178,9 @@ + // Returns true if we started Seccomp BPF. + bool seccomp_bpf_started() const; + ++ // Returns true if unveil(2) is used. ++ bool unveil_initialized() const; ++ + // Check the policy and eventually start the seccomp-bpf sandbox. This should + // never be called with threads started. If we detect that threads have + // started we will crash. @@ -261,6 +264,7 @@ + int proc_fd_; + + bool seccomp_bpf_started_; ++ bool unveil_initialized_; + // The value returned by GetStatus(). Gets computed once and then cached. + int sandbox_status_flags_; + // Did PreinitializeSandbox() run? diff --git a/www/chromium/files/patch-services_network_network__service.cc b/www/chromium/files/patch-services_network_network__service.cc index c87c21f075a7..5b6a4e94b1db 100644 --- a/www/chromium/files/patch-services_network_network__service.cc +++ b/www/chromium/files/patch-services_network_network__service.cc @@ -1,6 +1,6 @@ ---- services/network/network_service.cc.orig 2022-02-28 16:54:41 UTC +--- services/network/network_service.cc.orig 2022-03-25 21:59:56 UTC +++ services/network/network_service.cc -@@ -77,7 +77,7 @@ +@@ -82,7 +82,7 @@ #include "third_party/boringssl/src/include/openssl/cpu.h" #endif diff --git a/www/chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc b/www/chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc new file mode 100644 index 000000000000..8a5da112e475 --- /dev/null +++ b/www/chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc @@ -0,0 +1,65 @@ +--- services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc.orig 2022-03-25 21:59:56 UTC ++++ services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc +@@ -52,7 +52,7 @@ uint32_t CalculatePrivateFootprintKb(const mojom::RawO + uint32_t shared_resident_kb) { + DCHECK(os_dump.platform_private_footprint); + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + uint64_t rss_anon_bytes = os_dump.platform_private_footprint->rss_anon_bytes; + uint64_t vm_swap_bytes = os_dump.platform_private_footprint->vm_swap_bytes; + return (rss_anon_bytes + vm_swap_bytes) / 1024; +@@ -91,7 +91,7 @@ memory_instrumentation::mojom::OSMemDumpPtr CreatePubl + os_dump->is_peak_rss_resettable = internal_os_dump.is_peak_rss_resettable; + os_dump->private_footprint_kb = + CalculatePrivateFootprintKb(internal_os_dump, shared_resident_kb); +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + os_dump->private_footprint_swap_kb = + internal_os_dump.platform_private_footprint->vm_swap_bytes / 1024; + #endif +@@ -270,7 +270,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch( + + // On most platforms each process can dump data about their own process + // so ask each process to do so Linux is special see below. +-#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) ++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD) + request->pending_responses.insert({client_info.pid, ResponseType::kOSDump}); + client->RequestOSMemoryDump(request->memory_map_option(), + {base::kNullProcessId}, +@@ -285,7 +285,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch( + + // In some cases, OS stats can only be dumped from a privileged process to + // get around to sandboxing/selinux restrictions (see crbug.com/461788). +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + std::vector<base::ProcessId> pids; + mojom::ClientProcess* browser_client = nullptr; + base::ProcessId browser_client_pid = base::kNullProcessId; +@@ -331,7 +331,7 @@ void QueuedRequestDispatcher::SetUpAndDispatchVmRegion + const OsCallback& os_callback) { + // On Linux, OS stats can only be dumped from a privileged process to + // get around to sandboxing/selinux restrictions (see crbug.com/461788). +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + mojom::ClientProcess* browser_client = nullptr; + base::ProcessId browser_client_pid = 0; + for (const auto& client_info : clients) { +@@ -382,7 +382,7 @@ QueuedRequestDispatcher::FinalizeVmRegionRequest( + // each client process provides 1 OS dump, % the case where the client is + // disconnected mid dump. + OSMemDumpMap& extra_os_dumps = response.second.os_dumps; +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + for (auto& kv : extra_os_dumps) { + auto pid = kv.first == base::kNullProcessId ? original_pid : kv.first; + DCHECK(results.find(pid) == results.end()); +@@ -444,7 +444,7 @@ void QueuedRequestDispatcher::Finalize(QueuedRequest* + // crash). In the latter case (OS_LINUX) we expect the full map to come + // from the browser process response. + OSMemDumpMap& extra_os_dumps = response.second.os_dumps; +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + for (const auto& kv : extra_os_dumps) { + auto pid = kv.first == base::kNullProcessId ? original_pid : kv.first; + DCHECK_EQ(pid_to_os_dump[pid], nullptr); diff --git a/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_BUILD.gn b/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_BUILD.gn new file mode 100644 index 000000000000..ccccdb7c2c2d --- /dev/null +++ b/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_BUILD.gn @@ -0,0 +1,16 @@ +--- services/resource_coordinator/public/cpp/memory_instrumentation/BUILD.gn.orig 2022-03-25 21:59:56 UTC ++++ services/resource_coordinator/public/cpp/memory_instrumentation/BUILD.gn +@@ -29,8 +29,12 @@ component("memory_instrumentation") { + sources += [ "os_metrics_win.cc" ] + } + +- if (is_android || is_linux || is_chromeos) { ++ if ((is_android || is_linux || is_chromeos) && !is_bsd) { + sources += [ "os_metrics_linux.cc" ] ++ } ++ ++ if (is_bsd) { ++ sources += [ "os_metrics_bsd.cc" ] + } + + if (is_fuchsia) { diff --git a/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__bsd.cc b/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__bsd.cc new file mode 100644 index 000000000000..cec6a7646af2 --- /dev/null +++ b/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__bsd.cc @@ -0,0 +1,61 @@ +--- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_bsd.cc.orig 2022-03-25 21:59:56 UTC ++++ services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_bsd.cc +@@ -0,0 +1,58 @@ ++// Copyright 2022 The Chromium Authors. All rights reserved. ++// Use of this source code is governed by a BSD-style license that can be ++// found in the LICENSE file. ++ ++#include "services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h" ++ ++#include "base/memory/page_size.h" ++#include "base/process/process.h" ++#include "base/process/process_handle.h" ++ ++#include <sys/sysctl.h> ++ ++#include <vector> ++ ++#if BUILDFLAG(IS_OPENBSD) ++#define vm_rssize info.p_vm_rssize ++#elif BUILDFLAG(IS_FREEBSD) ++#include <sys/user.h> ++#define vm_rssize info.ki_rssize ++#endif ++ ++namespace memory_instrumentation { ++ ++// static ++bool OSMetrics::FillOSMemoryDump(base::ProcessId pid, ++ mojom::RawOSMemDump* dump) { ++ base::Process process = pid == base::kNullProcessId ++ ? base::Process::Current() ++ : base::Process::Open(pid); ++ const size_t kPageSize = base::GetPageSize(); ++ struct kinfo_proc info; ++ size_t length = sizeof(struct kinfo_proc); ++#if BUILDFLAG(IS_OPENBSD) ++ int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process.Handle(), ++ static_cast<int>(length), 1 }; ++#elif BUILDFLAG(IS_FREEBSD) ++ int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process.Handle() }; ++#endif ++ ++ if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0) ++ return false; ++ ++ dump->resident_set_kb = (vm_rssize * kPageSize) / 1024; ++ dump->platform_private_footprint->rss_anon_bytes = ++ vm_rssize * kPageSize; ++ dump->platform_private_footprint->vm_swap_bytes = 0; ++ ++ return true; ++} ++ ++// static ++std::vector<mojom::VmRegionPtr> OSMetrics::GetProcessMemoryMaps( ++ base::ProcessId) { ++ NOTIMPLEMENTED(); ++ return std::vector<mojom::VmRegionPtr>(); ++} ++ ++} // namespace memory_instrumentation diff --git a/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__linux.cc b/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__linux.cc deleted file mode 100644 index 0c02405f77a5..000000000000 --- a/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__linux.cc +++ /dev/null @@ -1,83 +0,0 @@ ---- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc.orig 2022-02-28 16:54:41 UTC -+++ services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc -@@ -5,7 +5,9 @@ - #include <dlfcn.h> - #include <fcntl.h> - #include <stdint.h> -+#if !defined(__OpenBSD__) && !defined(__FreeBSD__) - #include <sys/prctl.h> -+#endif - - #include <memory> - -@@ -26,8 +28,10 @@ - #include "build/build_config.h" - #include "services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h" - -+#if !defined(OS_BSD) - // Symbol with virtual address of the start of ELF header of the current binary. - extern char __ehdr_start; -+#endif - - namespace memory_instrumentation { - -@@ -39,6 +43,7 @@ using mojom::VmRegionPtr; - const char kClearPeakRssCommand[] = "5"; - const uint32_t kMaxLineSize = 4096; - -+#if !defined(OS_BSD) - // TODO(chiniforooshan): Many of the utility functions in this anonymous - // namespace should move to base/process/process_metrics_linux.cc to make the - // code a lot cleaner. However, we should do so after we made sure the metrics -@@ -267,6 +272,7 @@ class ScopedProcessSetDumpable { - - bool was_dumpable_; - }; -+#endif - - } // namespace - -@@ -280,6 +286,9 @@ void OSMetrics::SetProcSmapsForTesting(FILE* f) { - // static - bool OSMetrics::FillOSMemoryDump(base::ProcessId pid, - mojom::RawOSMemDump* dump) { -+#if defined(OS_BSD) -+ return false; -+#else - // TODO(chiniforooshan): There is no need to read both /statm and /status - // files. Refactor to get everything from /status using ProcessMetric. - auto statm_file = GetProcPidDir(pid).Append("statm"); -@@ -336,10 +345,12 @@ bool OSMetrics::FillOSMemoryDump(base::ProcessId pid, - #endif // BUILDFLAG(IS_ANDROID) - - return true; -+#endif - } - - // static - std::vector<VmRegionPtr> OSMetrics::GetProcessMemoryMaps(base::ProcessId pid) { -+#if !defined(OS_BSD) - std::vector<VmRegionPtr> maps; - uint32_t res = 0; - if (g_proc_smaps_for_testing) { -@@ -357,8 +368,13 @@ std::vector<VmRegionPtr> OSMetrics::GetProcessMemoryMa - return std::vector<VmRegionPtr>(); - - return maps; -+#else -+ NOTIMPLEMENTED(); -+ return std::vector<VmRegionPtr>(); -+#endif - } - -+#if !defined(OS_BSD) - // static - OSMetrics::MappedAndResidentPagesDumpState OSMetrics::GetMappedAndResidentPages( - const size_t start_address, -@@ -446,5 +462,6 @@ size_t OSMetrics::GetPeakResidentSetSize(base::Process - } - return 0; - } -+#endif - - } // namespace memory_instrumentation diff --git a/www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp b/www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp index 3c7526dc73b5..41c940e9e113 100644 --- a/www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp +++ b/www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp @@ -1,11 +1,11 @@ ---- skia/ext/SkMemory_new_handler.cpp.orig 2022-02-07 13:39:41 UTC +--- skia/ext/SkMemory_new_handler.cpp.orig 2022-03-25 21:59:56 UTC +++ skia/ext/SkMemory_new_handler.cpp -@@ -78,7 +78,7 @@ static void* malloc_nothrow(size_t size) { +@@ -79,7 +79,7 @@ static void* malloc_nothrow(size_t size) { // TODO(b.kelemen): we should always use UncheckedMalloc but currently it // doesn't work as intended everywhere. void* result; --#if defined(OS_IOS) -+#if defined(OS_IOS) || defined(OS_BSD) - result = malloc(size); +-#if BUILDFLAG(IS_IOS) ++#if BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD) + result = malloc(size); #else - // It's the responsibility of the caller to check the return value. + // It's the responsibility of the caller to check the return value. diff --git a/www/chromium/files/patch-third__party_angle_src_common_system__utils__posix.cpp b/www/chromium/files/patch-third__party_angle_src_common_system__utils__posix.cpp index 2a2c884e552f..9f56a5b88759 100644 --- a/www/chromium/files/patch-third__party_angle_src_common_system__utils__posix.cpp +++ b/www/chromium/files/patch-third__party_angle_src_common_system__utils__posix.cpp @@ -1,6 +1,6 @@ ---- third_party/angle/src/common/system_utils_posix.cpp.orig 2022-02-28 16:54:41 UTC +--- third_party/angle/src/common/system_utils_posix.cpp.orig 2022-03-25 21:59:56 UTC +++ third_party/angle/src/common/system_utils_posix.cpp -@@ -248,7 +248,9 @@ Library *OpenSharedLibraryWithExtensionAndGetError(con +@@ -197,7 +197,9 @@ void *OpenSystemLibraryWithExtensionAndGetError(const int extraFlags = 0; if (searchType == SearchType::AlreadyLoaded) { diff --git a/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp b/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp index 5ea43497f6f3..12ca6038d0f1 100644 --- a/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp +++ b/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp @@ -1,4 +1,4 @@ ---- third_party/angle/src/libANGLE/Display.cpp.orig 2022-02-28 16:54:41 UTC +--- third_party/angle/src/libANGLE/Display.cpp.orig 2022-03-25 21:59:56 UTC +++ third_party/angle/src/libANGLE/Display.cpp @@ -55,7 +55,7 @@ # include "libANGLE/renderer/gl/wgl/DisplayWGL.h" @@ -9,7 +9,7 @@ # include "libANGLE/renderer/gl/egl/DisplayEGL.h" # if defined(ANGLE_USE_GBM) # include "libANGLE/renderer/gl/egl/gbm/DisplayGbm.h" -@@ -313,7 +313,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di +@@ -320,7 +320,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di impl = rx::CreateDisplayCGLOrEAGL(state); break; @@ -18,16 +18,16 @@ # if defined(ANGLE_USE_GBM) if (platformType == 0) { -@@ -358,7 +358,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di +@@ -365,7 +365,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di #if defined(ANGLE_ENABLE_OPENGL) # if defined(ANGLE_PLATFORM_WINDOWS) impl = new rx::DisplayWGL(state); -# elif defined(ANGLE_PLATFORM_LINUX) +# elif defined(ANGLE_PLATFORM_LINUX) || defined(ANGLE_PLATFORM_BSD) # if defined(ANGLE_USE_GBM) - if (platformType == 0) - { -@@ -406,7 +406,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di + if (platformType == 0 || + platformType == EGL_PLATFORM_VULKAN_DISPLAY_MODE_HEADLESS_ANGLE) +@@ -416,7 +416,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di impl = rx::CreateVulkanWin32Display(state); } break; @@ -36,7 +36,7 @@ # if defined(ANGLE_USE_X11) if (platformType == EGL_PLATFORM_X11_EXT && rx::IsVulkanXcbDisplayAvailable()) { -@@ -1893,7 +1893,7 @@ static ClientExtensions GenerateClientExtensions() +@@ -1915,7 +1915,7 @@ static ClientExtensions GenerateClientExtensions() extensions.x11Visual = true; #endif diff --git a/www/chromium/files/patch-third__party_angle_src_libANGLE_formatutils.cpp b/www/chromium/files/patch-third__party_angle_src_libANGLE_formatutils.cpp new file mode 100644 index 000000000000..de6511913744 --- /dev/null +++ b/www/chromium/files/patch-third__party_angle_src_libANGLE_formatutils.cpp @@ -0,0 +1,11 @@ +--- third_party/angle/src/libANGLE/formatutils.cpp.orig 2022-03-25 21:59:56 UTC ++++ third_party/angle/src/libANGLE/formatutils.cpp +@@ -1388,7 +1388,7 @@ static InternalFormatInfoMap BuildInternalFormatInfoMa + AddYUVFormat(&map, GL_G8_B8R8_2PLANE_420_UNORM_ANGLE, true, 8, 8, 8, 0, 0, GL_G8_B8R8_2PLANE_420_UNORM_ANGLE, GL_UNSIGNED_BYTE, GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::yuvInternalFormatANGLE>, RequireExt<&Extensions::yuvInternalFormatANGLE>, RequireExt<&Extensions::yuvInternalFormatANGLE>, NeverSupported, NeverSupported); + AddYUVFormat(&map, GL_G8_B8_R8_3PLANE_420_UNORM_ANGLE, true, 8, 8, 8, 0, 0, GL_G8_B8_R8_3PLANE_420_UNORM_ANGLE, GL_UNSIGNED_BYTE, GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::yuvInternalFormatANGLE>, RequireExt<&Extensions::yuvInternalFormatANGLE>, RequireExt<&Extensions::yuvInternalFormatANGLE>, NeverSupported, NeverSupported); + +-#if defined(ANGLE_PLATFORM_LINUX) ++#if defined(ANGLE_PLATFORM_LINUX) || defined(ANGLE_PLATFORM_BSD) + // From GL_OES_required_internalformat + // The |shared| bit shouldn't be 2. But given this hits assertion when bits + // are checked, it's fine to have this bit set as 2 as a workaround. diff --git a/www/chromium/files/patch-third__party_blink_common_renderer__preferences_renderer__preferences__mojom__traits.cc b/www/chromium/files/patch-third__party_blink_common_renderer__preferences_renderer__preferences__mojom__traits.cc index b2639ae6d261..7ac18c48300c 100644 --- a/www/chromium/files/patch-third__party_blink_common_renderer__preferences_renderer__preferences__mojom__traits.cc +++ b/www/chromium/files/patch-third__party_blink_common_renderer__preferences_renderer__preferences__mojom__traits.cc @@ -1,11 +1,11 @@ ---- third_party/blink/common/renderer_preferences/renderer_preferences_mojom_traits.cc.orig 2021-04-14 18:41:08 UTC +--- third_party/blink/common/renderer_preferences/renderer_preferences_mojom_traits.cc.orig 2022-03-25 21:59:56 UTC +++ third_party/blink/common/renderer_preferences/renderer_preferences_mojom_traits.cc @@ -64,7 +64,7 @@ bool StructTraits<blink::mojom::RendererPreferencesDat if (!data.ReadAcceptLanguages(&out->accept_languages)) return false; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (!data.ReadSystemFontFamilyName(&out->system_font_family_name)) return false; #endif diff --git a/www/chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences.h b/www/chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences.h index fda961a3c939..38d43155bb49 100644 --- a/www/chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences.h +++ b/www/chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences.h @@ -1,11 +1,11 @@ ---- third_party/blink/public/common/renderer_preferences/renderer_preferences.h.orig 2021-05-12 22:06:00 UTC +--- third_party/blink/public/common/renderer_preferences/renderer_preferences.h.orig 2022-03-25 21:59:56 UTC +++ third_party/blink/public/common/renderer_preferences/renderer_preferences.h @@ -50,7 +50,7 @@ struct BLINK_COMMON_EXPORT RendererPreferences { bool webrtc_allow_legacy_tls_protocols{false}; UserAgentOverride user_agent_override; std::string accept_languages; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) std::string system_font_family_name; #endif - #if defined(OS_WIN) + #if BUILDFLAG(IS_WIN) diff --git a/www/chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h b/www/chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h index caf2ae4e539b..8a8cfffc0c32 100644 --- a/www/chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h +++ b/www/chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h @@ -1,11 +1,11 @@ ---- third_party/blink/public/common/renderer_preferences/renderer_preferences_mojom_traits.h.orig 2021-05-12 22:06:00 UTC +--- third_party/blink/public/common/renderer_preferences/renderer_preferences_mojom_traits.h.orig 2022-03-25 21:59:56 UTC +++ third_party/blink/public/common/renderer_preferences/renderer_preferences_mojom_traits.h @@ -157,7 +157,7 @@ struct BLINK_COMMON_EXPORT return data.accept_languages; } --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) static const std::string& system_font_family_name( const ::blink::RendererPreferences& data) { return data.system_font_family_name; diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc b/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc index 75593e01cc42..ff450056d5b0 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2022-02-28 16:54:41 UTC +--- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2022-03-25 21:59:56 UTC +++ third_party/blink/renderer/core/exported/web_view_impl.cc -@@ -401,7 +401,7 @@ SkFontHinting RendererPreferencesToSkiaHinting( +@@ -404,7 +404,7 @@ SkFontHinting RendererPreferencesToSkiaHinting( const blink::RendererPreferences& prefs) { // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. @@ -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' -@@ -3170,7 +3170,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs +@@ -3159,7 +3159,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs renderer_preferences_.use_subpixel_positioning); // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_html_forms_internal__popup__menu.cc b/www/chromium/files/patch-third__party_blink_renderer_core_html_forms_internal__popup__menu.cc index 6787f1bc9ad7..aa7f47bf2644 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_html_forms_internal__popup__menu.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_html_forms_internal__popup__menu.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/html/forms/internal_popup_menu.cc.orig 2022-02-28 16:54:41 UTC +--- third_party/blink/renderer/core/html/forms/internal_popup_menu.cc.orig 2022-03-25 21:59:56 UTC +++ third_party/blink/renderer/core/html/forms/internal_popup_menu.cc -@@ -159,7 +159,7 @@ class InternalPopupMenu::ItemIterationContext { +@@ -179,7 +179,7 @@ class InternalPopupMenu::ItemIterationContext { is_in_group_(false), buffer_(buffer) { DCHECK(buffer_); diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc b/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc index 47728e01b468..ae267ed8407b 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/layout/layout_view.cc.orig 2022-02-28 16:54:41 UTC +--- third_party/blink/renderer/core/layout/layout_view.cc.orig 2022-03-25 21:59:56 UTC +++ third_party/blink/renderer/core/layout/layout_view.cc -@@ -63,7 +63,7 @@ +@@ -64,7 +64,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 -@@ -357,7 +357,7 @@ void LayoutView::UpdateLayout() { +@@ -359,7 +359,7 @@ void LayoutView::UpdateLayout() { DCHECK(!layout_state_); LayoutState root_layout_state(*this); diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc index 278c182daa2e..ea7935ecbc9c 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig 2022-02-28 16:54:41 UTC +--- third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig 2022-03-25 21:59:56 UTC +++ third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc -@@ -291,7 +291,7 @@ TEST_F(MAYBE_WebRtcAudioRendererTest, DISABLED_VerifyS +@@ -293,7 +293,7 @@ TEST_F(MAYBE_WebRtcAudioRendererTest, DISABLED_VerifyS SetupRenderer(kDefaultOutputDeviceId); renderer_proxy_->Start(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn b/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn index fb505f4addde..2f64d52ae3ce 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/BUILD.gn.orig 2022-02-28 16:54:41 UTC +--- third_party/blink/renderer/platform/BUILD.gn.orig 2022-03-25 21:59:56 UTC +++ third_party/blink/renderer/platform/BUILD.gn -@@ -1902,7 +1902,7 @@ static_library("test_support") { +@@ -1904,7 +1904,7 @@ static_library("test_support") { ] # fuzzed_data_provider may not work with a custom toolchain. diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc index c9df7c0e0962..bc222f4b791a 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc @@ -1,20 +1,20 @@ ---- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2021-12-31 00:57:42 UTC +--- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2022-03-25 21:59:56 UTC +++ third_party/blink/renderer/platform/fonts/font_cache.cc @@ -87,7 +87,7 @@ extern const char kNotoColorEmojiCompat[] = "Noto Colo SkFontMgr* FontCache::static_font_manager_ = nullptr; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) float FontCache::device_scale_factor_ = 1.0; #endif -@@ -127,7 +127,7 @@ FontCache::FontCache() +@@ -120,7 +120,7 @@ FontCache::FontCache() : font_manager_(sk_ref_sp(stati FontPlatformData* FontCache::SystemFontPlatformData( const FontDescription& font_description) { const AtomicString& family = FontCache::SystemFontFamily(); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) if (family.IsEmpty() || family == font_family_names::kSystemUi) return nullptr; #else diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h index c3ea6d87a2a1..eee93679d010 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h @@ -1,47 +1,47 @@ ---- third_party/blink/renderer/platform/fonts/font_cache.h.orig 2022-02-07 13:39:41 UTC +--- third_party/blink/renderer/platform/fonts/font_cache.h.orig 2022-03-25 21:59:56 UTC +++ third_party/blink/renderer/platform/fonts/font_cache.h @@ -59,7 +59,7 @@ #include "third_party/skia/include/core/SkFontMgr.h" #include "third_party/skia/include/core/SkRefCnt.h" --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "ui/gfx/font_fallback_linux.h" #endif -@@ -192,7 +192,7 @@ class PLATFORM_EXPORT FontCache { +@@ -184,7 +184,7 @@ class PLATFORM_EXPORT FontCache final { static void PrewarmFamily(const AtomicString& family_name) {} #endif --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // These are needed for calling QueryRenderStyleForStrike, since // gfx::GetFontRenderParams makes distinctions based on DSF. static float DeviceScaleFactor() { return device_scale_factor_; } -@@ -275,7 +275,7 @@ class PLATFORM_EXPORT FontCache { +@@ -267,7 +267,7 @@ class PLATFORM_EXPORT FontCache final { const char* locale_family_name); - #endif // defined(OS_ANDROID) + #endif // BUILDFLAG(IS_ANDROID) --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) static bool GetFontForCharacter(UChar32, const char* preferred_locale, gfx::FallbackFontData*); -@@ -355,7 +355,7 @@ class PLATFORM_EXPORT FontCache { +@@ -388,7 +388,7 @@ class PLATFORM_EXPORT FontCache final { const FontFaceCreationParams&, std::string& name); --#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) static AtomicString GetFamilyNameForCharacter(SkFontMgr*, UChar32, const FontDescription&, -@@ -402,7 +402,7 @@ class PLATFORM_EXPORT FontCache { +@@ -430,7 +430,7 @@ class PLATFORM_EXPORT FontCache final { std::unique_ptr<FallbackFamilyStyleCache> fallback_params_cache_; - #endif // defined(OS_WIN) + #endif // BUILDFLAG(IS_WIN) --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) static float device_scale_factor_; #endif diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc index fefe7799edec..20600175b40f 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc @@ -1,11 +1,11 @@ ---- third_party/blink/renderer/platform/fonts/font_description.cc.orig 2022-02-28 16:54:41 UTC +--- third_party/blink/renderer/platform/fonts/font_description.cc.orig 2022-03-25 21:59:56 UTC +++ third_party/blink/renderer/platform/fonts/font_description.cc @@ -39,7 +39,7 @@ #include "third_party/blink/renderer/platform/wtf/text/string_hash.h" #include "third_party/blink/renderer/platform/wtf/text/string_hasher.h" --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) #include "third_party/blink/renderer/platform/fonts/font_cache.h" #endif @@ -13,8 +13,8 @@ static_cast<unsigned>(fields_.orientation_) << 1 | // bit 2-3 static_cast<unsigned>(fields_.subpixel_text_position_); // bit 1 --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) float device_scale_factor_for_key = FontCache::DeviceScaleFactor(); #else float device_scale_factor_for_key = 1.0f; diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__metrics.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__metrics.cc index f088cbe72cd7..d360fa692560 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__metrics.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__metrics.cc @@ -1,29 +1,29 @@ ---- third_party/blink/renderer/platform/fonts/font_metrics.cc.orig 2022-02-07 13:39:41 UTC +--- third_party/blink/renderer/platform/fonts/font_metrics.cc.orig 2022-03-25 21:59:56 UTC +++ third_party/blink/renderer/platform/fonts/font_metrics.cc @@ -39,7 +39,7 @@ namespace blink { - #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ -- defined(OS_FUCHSIA) -+ defined(OS_FUCHSIA) || defined(OS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) // This is the largest VDMX table which we'll try to load and parse. static const size_t kMaxVDMXTableSize = 1024 * 1024; // 1 MB #endif @@ -69,7 +69,7 @@ void FontMetrics::AscentDescentWithHacks( bool is_vdmx_valid = false; - #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ -- defined(OS_FUCHSIA) -+ defined(OS_FUCHSIA) || defined(OS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) // Manually digging up VDMX metrics is only applicable when bytecode hinting // using FreeType. With DirectWrite or CoreText, no bytecode hinting is ever // done. This code should be pushed into FreeType (hinted font metrics). @@ -117,7 +117,7 @@ void FontMetrics::AscentDescentWithHacks( if (descent < metrics.fDescent) { visual_overflow_inflation_for_descent = 1; - #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ -- defined(OS_FUCHSIA) -+ defined(OS_FUCHSIA) || defined(OS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) // When subpixel positioning is enabled, if the descent is rounded down, // the descent part of the glyph may be truncated when displayed in a // 'overflow: hidden' container. To avoid that, borrow 1 unit from the diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc index 7450661e5c84..957a508124f0 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc @@ -1,20 +1,20 @@ ---- third_party/blink/renderer/platform/fonts/font_unique_name_lookup.cc.orig 2021-09-14 01:52:03 UTC +--- third_party/blink/renderer/platform/fonts/font_unique_name_lookup.cc.orig 2022-03-25 21:59:56 UTC +++ third_party/blink/renderer/platform/fonts/font_unique_name_lookup.cc -@@ -7,7 +7,7 @@ - #if defined(OS_ANDROID) +@@ -9,7 +9,7 @@ + #if BUILDFLAG(IS_ANDROID) #include "third_party/blink/public/mojom/font_unique_name_lookup/font_unique_name_lookup.mojom-blink.h" #include "third_party/blink/renderer/platform/fonts/android/font_unique_name_lookup_android.h" --#elif defined(OS_LINUX) || defined(OS_CHROMEOS) -+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "third_party/blink/renderer/platform/fonts/linux/font_unique_name_lookup_linux.h" - #elif defined(OS_WIN) + #elif BUILDFLAG(IS_WIN) #include "third_party/blink/renderer/platform/fonts/win/font_unique_name_lookup_win.h" -@@ -22,7 +22,7 @@ std::unique_ptr<FontUniqueNameLookup> +@@ -24,7 +24,7 @@ std::unique_ptr<FontUniqueNameLookup> FontUniqueNameLookup::GetPlatformUniqueNameLookup() { - #if defined(OS_ANDROID) + #if BUILDFLAG(IS_ANDROID) return std::make_unique<FontUniqueNameLookupAndroid>(); --#elif defined(OS_LINUX) || defined(OS_CHROMEOS) -+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) return std::make_unique<FontUniqueNameLookupLinux>(); - #elif defined(OS_WIN) + #elif BUILDFLAG(IS_WIN) return std::make_unique<FontUniqueNameLookupWin>(); diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc index 03b84e6335d6..6af46f3fc269 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc @@ -1,29 +1,29 @@ ---- third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc.orig 2022-02-07 13:39:41 UTC +--- third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc.orig 2022-03-25 21:59:56 UTC +++ third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc @@ -60,7 +60,7 @@ AtomicString ToAtomicString(const SkString& str) { return AtomicString::FromUTF8(str.c_str(), str.size()); } --#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // This function is called on android or when we are emulating android fonts on // linux and the embedder has overriden the default fontManager with // WebFontRendering::setSkiaFontMgr. -@@ -235,7 +235,7 @@ sk_sp<SkTypeface> FontCache::CreateTypeface( +@@ -236,7 +236,7 @@ sk_sp<SkTypeface> FontCache::CreateTypeface( } #endif --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) // On linux if the fontManager has been overridden then we should be calling // the embedder provided font Manager rather than calling // SkTypeface::CreateFromName which may redirect the call to the default font -@@ -262,7 +262,7 @@ std::unique_ptr<FontPlatformData> FontCache::CreateFon +@@ -263,7 +263,7 @@ std::unique_ptr<FontPlatformData> FontCache::CreateFon std::string name; sk_sp<SkTypeface> typeface; --#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) bool noto_color_emoji_from_gmscore = false; - #if defined(OS_ANDROID) + #if BUILDFLAG(IS_ANDROID) // Use the unique local matching pathway for fetching Noto Color Emoji Compat diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc index b522e38b6256..b1724233430d 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc @@ -1,11 +1,11 @@ ---- third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig 2022-02-07 13:39:41 UTC +--- third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig 2022-03-25 21:59:56 UTC +++ third_party/blink/renderer/platform/graphics/video_frame_submitter.cc @@ -328,7 +328,7 @@ void VideoFrameSubmitter::OnBeginFrame( continue; auto& feedback = timing_details.find(frame_token)->value.presentation_feedback; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // TODO: On Linux failure flag is unreliable, and perfectly rendered frames // are reported as failures all the time. bool presentation_failure = false; diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_scheduler_common_thread.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_scheduler_common_thread.cc index fd5046f3737c..15b77f0efb40 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_scheduler_common_thread.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_scheduler_common_thread.cc @@ -1,12 +1,12 @@ ---- third_party/blink/renderer/platform/scheduler/common/thread.cc.orig 2022-02-07 13:39:41 UTC +--- third_party/blink/renderer/platform/scheduler/common/thread.cc.orig 2022-03-25 21:59:56 UTC +++ third_party/blink/renderer/platform/scheduler/common/thread.cc @@ -99,7 +99,8 @@ void Thread::CreateAndSetCompositorThread() { std::make_unique<scheduler::CompositorThread>(params); compositor_thread->Init(); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+// pledge -+#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(OS_OPENBSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++// pledge(2) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_OPENBSD) if (base::FeatureList::IsEnabled( features::kBlinkCompositorUseDisplayThreadPriority)) { compositor_thread->GetTaskRunner()->PostTaskAndReplyWithResult( diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_container__annotations.h b/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_container__annotations.h index 050c604c6d81..25658e65ff2b 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_container__annotations.h +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_container__annotations.h @@ -1,11 +1,11 @@ ---- third_party/blink/renderer/platform/wtf/container_annotations.h.orig 2022-02-07 13:39:41 UTC +--- third_party/blink/renderer/platform/wtf/container_annotations.h.orig 2022-03-25 21:59:56 UTC +++ third_party/blink/renderer/platform/wtf/container_annotations.h @@ -12,7 +12,7 @@ // TODO(ochang): Remove the ARCH_CPU_X86_64 condition to enable this for X86 // once the crashes there have been fixed: http://crbug.com/461406 - #if defined(ADDRESS_SANITIZER) && \ -- (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(ARCH_CPU_X86_64) -+ (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(ARCH_CPU_X86_64) - #define ANNOTATE_CONTIGUOUS_CONTAINER - #define ANNOTATE_NEW_BUFFER(buffer, capacity, newSize) \ - if (buffer) { \ + #if defined(ADDRESS_SANITIZER) && \ +- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \ ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && \ + defined(ARCH_CPU_X86_64) + + // Annotations require buffers to begin on an 8-byte boundary. See diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc index b9ee5558ba8e..12cba2eaeffb 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc @@ -1,10 +1,10 @@ ---- third_party/blink/renderer/platform/wtf/stack_util.cc.orig 2022-02-07 13:39:41 UTC +--- third_party/blink/renderer/platform/wtf/stack_util.cc.orig 2022-03-25 21:59:56 UTC +++ third_party/blink/renderer/platform/wtf/stack_util.cc @@ -18,6 +18,11 @@ extern "C" void* __libc_stack_end; // NOLINT #endif -+#if defined(OS_BSD) ++#if BUILDFLAG(IS_BSD) +#include <sys/signal.h> +#include <pthread_np.h> +#endif @@ -16,28 +16,22 @@ // low as 512k. // return 512 * 1024; -+#elif defined(OS_OPENBSD) ++#elif BUILDFLAG(IS_OPENBSD) + return 512 * 1024; - #elif defined(OS_MAC) + #elif BUILDFLAG(IS_MAC) // pthread_get_stacksize_np() returns too low a value for the main thread on // OSX 10.9, -@@ -98,12 +105,18 @@ return Threading::ThreadStackSize(); - - void* GetStackStart() { - #if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \ -- defined(OS_FUCHSIA) -+ defined(OS_FUCHSIA) || defined(OS_BSD) - pthread_attr_t attr; - int error; - #if defined(OS_FREEBSD) - pthread_attr_init(&attr); - error = pthread_attr_get_np(pthread_self(), &attr); -+#elif defined(OS_OPENBSD) +@@ -147,6 +154,13 @@ void* GetStackStart() { + ::GetCurrentThreadStackLimits(&lowLimit, &highLimit); + return reinterpret_cast<void*>(highLimit); + #endif ++#elif BUILDFLAG(IS_OPENBSD) + stack_t ss; + void *base; -+ error = pthread_stackseg_np(pthread_self(), &ss); ++ int error = pthread_stackseg_np(pthread_self(), &ss); ++ CHECK(!error); + base = (void*)((size_t) ss.ss_sp - ss.ss_size); + return reinterpret_cast<uint8_t*>(base) + ss.ss_size; #else - error = pthread_getattr_np(pthread_self(), &attr); + #error Unsupported getStackStart on this platform. #endif diff --git a/www/chromium/files/patch-third__party_boringssl_BUILD.generated.gni b/www/chromium/files/patch-third__party_boringssl_BUILD.generated.gni index 3950bc4e9899..2152c70c8c49 100644 --- a/www/chromium/files/patch-third__party_boringssl_BUILD.generated.gni +++ b/www/chromium/files/patch-third__party_boringssl_BUILD.generated.gni @@ -1,6 +1,14 @@ ---- third_party/boringssl/BUILD.generated.gni.orig 2022-02-28 16:54:41 UTC +--- third_party/boringssl/BUILD.generated.gni.orig 2022-03-25 21:59:56 UTC +++ third_party/boringssl/BUILD.generated.gni -@@ -184,6 +184,7 @@ crypto_sources = [ +@@ -81,6 +81,7 @@ crypto_sources = [ + "src/crypto/cpu_aarch64_apple.c", + "src/crypto/cpu_aarch64_fuchsia.c", + "src/crypto/cpu_aarch64_linux.c", ++ "src/crypto/cpu_aarch64_openbsd.c", + "src/crypto/cpu_aarch64_win.c", + "src/crypto/cpu_arm.c", + "src/crypto/cpu_arm_linux.c", +@@ -184,6 +185,7 @@ crypto_sources = [ "src/crypto/rand_extra/deterministic.c", "src/crypto/rand_extra/forkunsafe.c", "src/crypto/rand_extra/fuchsia.c", diff --git a/www/chromium/files/patch-third__party_boringssl_BUILD.gn b/www/chromium/files/patch-third__party_boringssl_BUILD.gn index bd397418d100..990e5f02025e 100644 --- a/www/chromium/files/patch-third__party_boringssl_BUILD.gn +++ b/www/chromium/files/patch-third__party_boringssl_BUILD.gn @@ -1,11 +1,11 @@ ---- third_party/boringssl/BUILD.gn.orig 2022-03-01 11:59:41 UTC +--- third_party/boringssl/BUILD.gn.orig 2022-03-25 21:59:56 UTC +++ third_party/boringssl/BUILD.gn @@ -92,7 +92,7 @@ if (is_win && !is_msan && current_cpu != "arm64") { public_configs = [ ":no_asm_config" ] } } else if (current_cpu == "arm64") { - if (is_linux || is_chromeos || is_android) { -+ if ((is_linux || is_chromeos || is_android) && !is_bsd) { ++ if ((is_linux || is_chromeos || is_android) && !is_freebsd) { sources += crypto_sources_linux_aarch64 } else if (is_apple) { - # TODO(davidben): Rename all the file lists, etc., upstream from mac + sources += crypto_sources_apple_aarch64 diff --git a/www/chromium/files/patch-third__party_boringssl_src_crypto_cpu__aarch64__openbsd.c b/www/chromium/files/patch-third__party_boringssl_src_crypto_cpu__aarch64__openbsd.c new file mode 100644 index 000000000000..b39339d2b999 --- /dev/null +++ b/www/chromium/files/patch-third__party_boringssl_src_crypto_cpu__aarch64__openbsd.c @@ -0,0 +1,60 @@ +--- third_party/boringssl/src/crypto/cpu_aarch64_openbsd.c.orig 2022-03-25 21:59:56 UTC ++++ third_party/boringssl/src/crypto/cpu_aarch64_openbsd.c +@@ -0,0 +1,57 @@ ++/* Copyright (c) 2022, Robert Nagy <robert@openbsd.org> ++ * ++ * Permission to use, copy, modify, and/or distribute this software for any ++ * purpose with or without fee is hereby granted, provided that the above ++ * copyright notice and this permission notice appear in all copies. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES ++ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF ++ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY ++ * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION ++ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN ++ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ ++ ++#include <openssl/cpu.h> ++ ++#if defined(OPENSSL_AARCH64) && defined(OPENSSL_OPENBSD) && \ ++ !defined(OPENSSL_STATIC_ARMCAP) ++ ++#include <sys/sysctl.h> ++#include <machine/cpu.h> ++#include <machine/armreg.h> ++#include <stdio.h> ++ ++#include <openssl/arm_arch.h> ++ ++#include "internal.h" ++ ++extern uint32_t OPENSSL_armcap_P; ++ ++void OPENSSL_cpuid_setup(void) { ++ int isar0_mib[] = { CTL_MACHDEP, CPU_ID_AA64ISAR0 }; ++ size_t len = sizeof(uint64_t); ++ uint64_t cpu_id = 0; ++ ++ if (sysctl(isar0_mib, 2, &cpu_id, &len, NULL, 0) < 0) ++ return; ++ ++ OPENSSL_armcap_P |= ARMV7_NEON; ++ ++ if (ID_AA64ISAR0_AES(cpu_id) >= ID_AA64ISAR0_AES_BASE) ++ OPENSSL_armcap_P |= ARMV8_AES; ++ ++ if (ID_AA64ISAR0_AES(cpu_id) >= ID_AA64ISAR0_AES_PMULL) ++ OPENSSL_armcap_P |= ARMV8_PMULL; ++ ++ if (ID_AA64ISAR0_SHA1(cpu_id) >= ID_AA64ISAR0_SHA1_BASE) ++ OPENSSL_armcap_P |= ARMV8_SHA1; ++ ++ if (ID_AA64ISAR0_SHA2(cpu_id) >= ID_AA64ISAR0_SHA2_BASE) ++ OPENSSL_armcap_P |= ARMV8_SHA256; ++ ++ if (ID_AA64ISAR0_SHA2(cpu_id) >= ID_AA64ISAR0_SHA2_512) ++ OPENSSL_armcap_P |= ARMV8_SHA512; ++} ++ ++#endif // OPENSSL_AARCH64 && OPENSSL_OPENBSD && !OPENSSL_STATIC_ARMCAP diff --git a/www/chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_rand_internal.h b/www/chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_rand_internal.h index 893182788c18..603745fa809c 100644 --- a/www/chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_rand_internal.h +++ b/www/chromium/files/patch-third__party_boringssl_src_crypto_fipsmodule_rand_internal.h @@ -1,6 +1,6 @@ ---- third_party/boringssl/src/crypto/fipsmodule/rand/internal.h.orig 2022-02-07 13:39:41 UTC +--- third_party/boringssl/src/crypto/fipsmodule/rand/internal.h.orig 2022-03-25 21:59:56 UTC +++ third_party/boringssl/src/crypto/fipsmodule/rand/internal.h -@@ -27,7 +27,8 @@ extern "C" { +@@ -26,7 +26,8 @@ extern "C" { #if !defined(OPENSSL_WINDOWS) && !defined(OPENSSL_FUCHSIA) && \ diff --git a/www/chromium/files/patch-third__party_dawn_include_dawn_native_VulkanBackend.h b/www/chromium/files/patch-third__party_dawn_include_dawn_native_VulkanBackend.h new file mode 100644 index 000000000000..5af75de3718d --- /dev/null +++ b/www/chromium/files/patch-third__party_dawn_include_dawn_native_VulkanBackend.h @@ -0,0 +1,11 @@ +--- third_party/dawn/include/dawn/native/VulkanBackend.h.orig 2022-03-25 21:59:56 UTC ++++ third_party/dawn/include/dawn/native/VulkanBackend.h +@@ -69,7 +69,7 @@ namespace dawn::native::vulkan { + }; + + // Can't use DAWN_PLATFORM_LINUX since header included in both Dawn and Chrome +-#ifdef __linux__ ++#if defined(__linux__) || defined(__OpenBSD__) || defined(__FreeBSD__) + + // Common properties of external images represented by FDs. On successful import the file + // descriptor's ownership is transferred to the Dawn implementation and they shouldn't be diff --git a/www/chromium/files/patch-third__party_dawn_src_common_Platform.h b/www/chromium/files/patch-third__party_dawn_src_dawn_common_Platform.h index 41db12be37f4..eb3a113089bc 100644 --- a/www/chromium/files/patch-third__party_dawn_src_common_Platform.h +++ b/www/chromium/files/patch-third__party_dawn_src_dawn_common_Platform.h @@ -1,6 +1,6 @@ ---- third_party/dawn/src/common/Platform.h.orig 2022-02-07 13:39:41 UTC -+++ third_party/dawn/src/common/Platform.h -@@ -26,6 +26,10 @@ +--- third_party/dawn/src/dawn/common/Platform.h.orig 2022-03-25 21:59:56 UTC ++++ third_party/dawn/src/dawn/common/Platform.h +@@ -26,6 +26,11 @@ # error "Unsupported Windows platform." # endif @@ -8,6 +8,7 @@ +# define DAWN_PLATFORM_BSD 1 +# define DAWN_PLATFORM_LINUX 1 +# define DAWN_PLATFORM_POSIX 1 ++ #elif defined(__linux__) # define DAWN_PLATFORM_LINUX 1 # define DAWN_PLATFORM_POSIX 1 diff --git a/www/chromium/files/patch-third__party_dawn_src_dawn__native_vulkan_BackendVk.cpp b/www/chromium/files/patch-third__party_dawn_src_dawn_native_vulkan_BackendVk.cpp index ae71cc3a0adf..a38aa8527d96 100644 --- a/www/chromium/files/patch-third__party_dawn_src_dawn__native_vulkan_BackendVk.cpp +++ b/www/chromium/files/patch-third__party_dawn_src_dawn_native_vulkan_BackendVk.cpp @@ -1,5 +1,5 @@ ---- third_party/dawn/src/dawn_native/vulkan/BackendVk.cpp.orig 2022-02-07 13:39:41 UTC -+++ third_party/dawn/src/dawn_native/vulkan/BackendVk.cpp +--- third_party/dawn/src/dawn/native/vulkan/BackendVk.cpp.orig 2022-03-25 21:59:56 UTC ++++ third_party/dawn/src/dawn/native/vulkan/BackendVk.cpp @@ -37,7 +37,7 @@ constexpr char kSwiftshaderLibName[] = "libvk_swiftsha #endif diff --git a/www/chromium/files/patch-third__party_dawn_src_include_dawn__native_VulkanBackend.h b/www/chromium/files/patch-third__party_dawn_src_include_dawn__native_VulkanBackend.h deleted file mode 100644 index eb2c1f59a696..000000000000 --- a/www/chromium/files/patch-third__party_dawn_src_include_dawn__native_VulkanBackend.h +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/dawn/src/include/dawn_native/VulkanBackend.h.orig 2022-02-28 16:54:41 UTC -+++ third_party/dawn/src/include/dawn_native/VulkanBackend.h -@@ -69,7 +69,7 @@ namespace dawn::native::vulkan { - }; - - // Can't use DAWN_PLATFORM_LINUX since header included in both Dawn and Chrome --#ifdef __linux__ -+#if defined(__linux__) || defined(__OpenBSD__) || defined(__FreeBSD__) - - // Common properties of external images represented by FDs. On successful import the file - // descriptor's ownership is transferred to the Dawn implementation and they shouldn't be diff --git a/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_arm64_config.h b/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_arm64_config.h index 88bd6742fec4..df7b315b1067 100644 --- a/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_arm64_config.h +++ b/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_arm64_config.h @@ -1,12 +1,12 @@ ---- third_party/ffmpeg/chromium/config/Chrome/openbsd/arm64/config.h.orig 2022-02-28 16:54:41 UTC +--- third_party/ffmpeg/chromium/config/Chrome/openbsd/arm64/config.h.orig 2022-03-25 21:59:56 UTC +++ third_party/ffmpeg/chromium/config/Chrome/openbsd/arm64/config.h -@@ -0,0 +1,2744 @@ +@@ -0,0 +1,2787 @@ +/* Automatically generated by configure - do not modify! */ +#ifndef FFMPEG_CONFIG_H +#define FFMPEG_CONFIG_H -+/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/jrummell/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags=-O2 --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=aarch64 --enable-armv8 --extra-cflags='-march=armv8-a' --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ ++/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --disable-linux-perf --x86asmexe=nasm --optflags=-O2 --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=aarch64 --enable-armv8 --extra-cflags='-march=armv8-a' --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ +#define FFMPEG_LICENSE "LGPL version 2.1 or later" -+#define CONFIG_THIS_YEAR 2021 ++#define CONFIG_THIS_YEAR 2022 +#define FFMPEG_DATADIR "/usr/local/share/ffmpeg" +#define AVCONV_DATADIR "/usr/local/share/ffmpeg" +#define CC_IDENT "OpenBSD clang version 13.0.0" @@ -26,6 +26,9 @@ +#define ARCH_AVR32_UC 0 +#define ARCH_BFIN 0 +#define ARCH_IA64 0 ++#define ARCH_LOONGARCH 0 ++#define ARCH_LOONGARCH32 0 ++#define ARCH_LOONGARCH64 0 +#define ARCH_M68K 0 +#define ARCH_MIPS 0 +#define ARCH_MIPS64 0 @@ -88,6 +91,8 @@ +#define HAVE_LOONGSON2 0 +#define HAVE_LOONGSON3 0 +#define HAVE_MMI 0 ++#define HAVE_LSX 0 ++#define HAVE_LASX 0 +#define HAVE_ARMV5TE_EXTERNAL 0 +#define HAVE_ARMV6_EXTERNAL 0 +#define HAVE_ARMV6T2_EXTERNAL 0 @@ -133,6 +138,8 @@ +#define HAVE_LOONGSON2_EXTERNAL 0 +#define HAVE_LOONGSON3_EXTERNAL 0 +#define HAVE_MMI_EXTERNAL 0 ++#define HAVE_LSX_EXTERNAL 0 ++#define HAVE_LASX_EXTERNAL 0 +#define HAVE_ARMV5TE_INLINE 0 +#define HAVE_ARMV6_INLINE 0 +#define HAVE_ARMV6T2_INLINE 0 @@ -178,6 +185,8 @@ +#define HAVE_LOONGSON2_INLINE 0 +#define HAVE_LOONGSON3_INLINE 0 +#define HAVE_MMI_INLINE 0 ++#define HAVE_LSX_INLINE 0 ++#define HAVE_LASX_INLINE 0 +#define HAVE_ALIGNED_STACK 1 +#define HAVE_FAST_64BIT 1 +#define HAVE_FAST_CLZ 1 @@ -359,7 +368,14 @@ +#define HAVE_XMM_CLOBBERS 0 +#define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +#define HAVE_KCMVIDEOCODECTYPE_HEVCWITHALPHA 0 ++#define HAVE_KCMVIDEOCODECTYPE_VP9 0 +#define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 ++#define HAVE_KCVPIXELFORMATTYPE_422YPCBCR8BIPLANARVIDEORANGE 0 ++#define HAVE_KCVPIXELFORMATTYPE_422YPCBCR10BIPLANARVIDEORANGE 0 ++#define HAVE_KCVPIXELFORMATTYPE_422YPCBCR16BIPLANARVIDEORANGE 0 ++#define HAVE_KCVPIXELFORMATTYPE_444YPCBCR8BIPLANARVIDEORANGE 0 ++#define HAVE_KCVPIXELFORMATTYPE_444YPCBCR10BIPLANARVIDEORANGE 0 ++#define HAVE_KCVPIXELFORMATTYPE_444YPCBCR16BIPLANARVIDEORANGE 0 +#define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_SMPTE_ST_2084_PQ 0 +#define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_ITU_R_2100_HLG 0 +#define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_LINEAR 0 @@ -483,12 +499,14 @@ +#define CONFIG_LIBOPENMPT 0 +#define CONFIG_LIBOPENVINO 0 +#define CONFIG_LIBOPUS 1 ++#define CONFIG_LIBPLACEBO 0 +#define CONFIG_LIBPULSE 0 +#define CONFIG_LIBRABBITMQ 0 +#define CONFIG_LIBRAV1E 0 +#define CONFIG_LIBRIST 0 +#define CONFIG_LIBRSVG 0 +#define CONFIG_LIBRTMP 0 ++#define CONFIG_LIBSHADERC 0 +#define CONFIG_LIBSHINE 0 +#define CONFIG_LIBSMBCLIENT 0 +#define CONFIG_LIBSNAPPY 0 @@ -530,6 +548,7 @@ +#define CONFIG_LIBXCB_XFIXES 0 +#define CONFIG_LZMA 0 +#define CONFIG_MEDIAFOUNDATION 0 ++#define CONFIG_METAL 0 +#define CONFIG_SCHANNEL 0 +#define CONFIG_SDL2 0 +#define CONFIG_SECURETRANSPORT 0 @@ -543,7 +562,6 @@ +#define CONFIG_MMAL 0 +#define CONFIG_OMX 0 +#define CONFIG_OPENCL 0 -+#define CONFIG_VULKAN 0 +#define CONFIG_AMF 0 +#define CONFIG_AUDIOTOOLBOX 0 +#define CONFIG_CRYSTALHD 0 @@ -558,6 +576,7 @@ +#define CONFIG_VAAPI 0 +#define CONFIG_VDPAU 0 +#define CONFIG_VIDEOTOOLBOX 0 ++#define CONFIG_VULKAN 0 +#define CONFIG_V4L2_M2M 0 +#define CONFIG_XVMC 0 +#define CONFIG_FTRAPV 0 @@ -638,6 +657,7 @@ +#define CONFIG_CBS_VP9 0 +#define CONFIG_DIRAC_PARSE 1 +#define CONFIG_DNN 0 ++#define CONFIG_DOVI_RPU 0 +#define CONFIG_DVPROFILE 0 +#define CONFIG_EXIF 0 +#define CONFIG_FAANDCT 0 @@ -679,7 +699,9 @@ +#define CONFIG_MPEGAUDIO 1 +#define CONFIG_MPEGAUDIODSP 1 +#define CONFIG_MPEGAUDIOHEADER 1 ++#define CONFIG_MPEG4AUDIO 1 +#define CONFIG_MPEGVIDEO 0 ++#define CONFIG_MPEGVIDEODEC 0 +#define CONFIG_MPEGVIDEOENC 0 +#define CONFIG_MSS34DSP 0 +#define CONFIG_PIXBLOCKDSP 0 @@ -1313,6 +1335,7 @@ +#define CONFIG_AVRP_ENCODER 0 +#define CONFIG_AVUI_ENCODER 0 +#define CONFIG_AYUV_ENCODER 0 ++#define CONFIG_BITPACKED_ENCODER 0 +#define CONFIG_BMP_ENCODER 0 +#define CONFIG_CFHD_ENCODER 0 +#define CONFIG_CINEPAK_ENCODER 0 @@ -1532,6 +1555,7 @@ +#define CONFIG_MPEG2_VAAPI_ENCODER 0 +#define CONFIG_MPEG4_OMX_ENCODER 0 +#define CONFIG_MPEG4_V4L2M2M_ENCODER 0 ++#define CONFIG_PRORES_VIDEOTOOLBOX_ENCODER 0 +#define CONFIG_VP8_V4L2M2M_ENCODER 0 +#define CONFIG_VP8_VAAPI_ENCODER 0 +#define CONFIG_VP9_VAAPI_ENCODER 0 @@ -1575,6 +1599,7 @@ +#define CONFIG_MPEG4_VAAPI_HWACCEL 0 +#define CONFIG_MPEG4_VDPAU_HWACCEL 0 +#define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0 ++#define CONFIG_PRORES_VIDEOTOOLBOX_HWACCEL 0 +#define CONFIG_VC1_D3D11VA_HWACCEL 0 +#define CONFIG_VC1_D3D11VA2_HWACCEL 0 +#define CONFIG_VC1_DXVA2_HWACCEL 0 @@ -1589,6 +1614,7 @@ +#define CONFIG_VP9_NVDEC_HWACCEL 0 +#define CONFIG_VP9_VAAPI_HWACCEL 0 +#define CONFIG_VP9_VDPAU_HWACCEL 0 ++#define CONFIG_VP9_VIDEOTOOLBOX_HWACCEL 0 +#define CONFIG_WMV3_D3D11VA_HWACCEL 0 +#define CONFIG_WMV3_D3D11VA2_HWACCEL 0 +#define CONFIG_WMV3_DXVA2_HWACCEL 0 @@ -1695,6 +1721,8 @@ +#define CONFIG_ADELAY_FILTER 0 +#define CONFIG_ADENORM_FILTER 0 +#define CONFIG_ADERIVATIVE_FILTER 0 ++#define CONFIG_ADYNAMICEQUALIZER_FILTER 0 ++#define CONFIG_ADYNAMICSMOOTH_FILTER 0 +#define CONFIG_AECHO_FILTER 0 +#define CONFIG_AEMPHASIS_FILTER 0 +#define CONFIG_AEVAL_FILTER 0 @@ -1720,6 +1748,7 @@ +#define CONFIG_AMULTIPLY_FILTER 0 +#define CONFIG_ANEQUALIZER_FILTER 0 +#define CONFIG_ANLMDN_FILTER 0 ++#define CONFIG_ANLMF_FILTER 0 +#define CONFIG_ANLMS_FILTER 0 +#define CONFIG_ANULL_FILTER 0 +#define CONFIG_APAD_FILTER 0 @@ -1743,6 +1772,7 @@ +#define CONFIG_ASHOWINFO_FILTER 0 +#define CONFIG_ASIDEDATA_FILTER 0 +#define CONFIG_ASOFTCLIP_FILTER 0 ++#define CONFIG_ASPECTRALSTATS_FILTER 0 +#define CONFIG_ASPLIT_FILTER 0 +#define CONFIG_ASR_FILTER 0 +#define CONFIG_ASTATS_FILTER 0 @@ -1762,7 +1792,6 @@ +#define CONFIG_BASS_FILTER 0 +#define CONFIG_BIQUAD_FILTER 0 +#define CONFIG_BS2B_FILTER 0 -+#define CONFIG_CHROMABER_VULKAN_FILTER 0 +#define CONFIG_CHANNELMAP_FILTER 0 +#define CONFIG_CHANNELSPLIT_FILTER 0 +#define CONFIG_CHORUS_FILTER 0 @@ -1835,11 +1864,13 @@ +#define CONFIG_BLACKDETECT_FILTER 0 +#define CONFIG_BLACKFRAME_FILTER 0 +#define CONFIG_BLEND_FILTER 0 ++#define CONFIG_BLEND_VULKAN_FILTER 0 +#define CONFIG_BM3D_FILTER 0 +#define CONFIG_BOXBLUR_FILTER 0 +#define CONFIG_BOXBLUR_OPENCL_FILTER 0 +#define CONFIG_BWDIF_FILTER 0 +#define CONFIG_CAS_FILTER 0 ++#define CONFIG_CHROMABER_VULKAN_FILTER 0 +#define CONFIG_CHROMAHOLD_FILTER 0 +#define CONFIG_CHROMAKEY_FILTER 0 +#define CONFIG_CHROMANR_FILTER 0 @@ -1918,6 +1949,7 @@ +#define CONFIG_FIELDORDER_FILTER 0 +#define CONFIG_FILLBORDERS_FILTER 0 +#define CONFIG_FIND_RECT_FILTER 0 ++#define CONFIG_FLIP_VULKAN_FILTER 0 +#define CONFIG_FLOODFILL_FILTER 0 +#define CONFIG_FORMAT_FILTER 0 +#define CONFIG_FPS_FILTER 0 @@ -1929,6 +1961,7 @@ +#define CONFIG_FREI0R_FILTER 0 +#define CONFIG_FSPP_FILTER 0 +#define CONFIG_GBLUR_FILTER 0 ++#define CONFIG_GBLUR_VULKAN_FILTER 0 +#define CONFIG_GEQ_FILTER 0 +#define CONFIG_GRADFUN_FILTER 0 +#define CONFIG_GRAPHMONITOR_FILTER 0 @@ -1937,6 +1970,7 @@ +#define CONFIG_GUIDED_FILTER 0 +#define CONFIG_HALDCLUT_FILTER 0 +#define CONFIG_HFLIP_FILTER 0 ++#define CONFIG_HFLIP_VULKAN_FILTER 0 +#define CONFIG_HISTEQ_FILTER 0 +#define CONFIG_HISTOGRAM_FILTER 0 +#define CONFIG_HQDN3D_FILTER 0 @@ -1963,6 +1997,7 @@ +#define CONFIG_LATENCY_FILTER 0 +#define CONFIG_LENSCORRECTION_FILTER 0 +#define CONFIG_LENSFUN_FILTER 0 ++#define CONFIG_LIBPLACEBO_FILTER 0 +#define CONFIG_LIBVMAF_FILTER 0 +#define CONFIG_LIMITDIFF_FILTER 0 +#define CONFIG_LIMITER_FILTER 0 @@ -2006,6 +2041,7 @@ +#define CONFIG_OVERLAY_FILTER 0 +#define CONFIG_OVERLAY_OPENCL_FILTER 0 +#define CONFIG_OVERLAY_QSV_FILTER 0 ++#define CONFIG_OVERLAY_VAAPI_FILTER 0 +#define CONFIG_OVERLAY_VULKAN_FILTER 0 +#define CONFIG_OVERLAY_CUDA_FILTER 0 +#define CONFIG_OWDENOISE_FILTER 0 @@ -2111,6 +2147,7 @@ +#define CONFIG_TRANSPOSE_NPP_FILTER 0 +#define CONFIG_TRANSPOSE_OPENCL_FILTER 0 +#define CONFIG_TRANSPOSE_VAAPI_FILTER 0 ++#define CONFIG_TRANSPOSE_VULKAN_FILTER 0 +#define CONFIG_TRIM_FILTER 0 +#define CONFIG_UNPREMULTIPLY_FILTER 0 +#define CONFIG_UNSHARP_FILTER 0 @@ -2122,6 +2159,7 @@ +#define CONFIG_VARBLUR_FILTER 0 +#define CONFIG_VECTORSCOPE_FILTER 0 +#define CONFIG_VFLIP_FILTER 0 ++#define CONFIG_VFLIP_VULKAN_FILTER 0 +#define CONFIG_VFRDET_FILTER 0 +#define CONFIG_VIBRANCE_FILTER 0 +#define CONFIG_VIDSTABDETECT_FILTER 0 @@ -2142,6 +2180,7 @@ +#define CONFIG_XSTACK_FILTER 0 +#define CONFIG_YADIF_FILTER 0 +#define CONFIG_YADIF_CUDA_FILTER 0 ++#define CONFIG_YADIF_VIDEOTOOLBOX_FILTER 0 +#define CONFIG_YAEPBLUR_FILTER 0 +#define CONFIG_ZMQ_FILTER 0 +#define CONFIG_ZOOMPAN_FILTER 0 @@ -2150,6 +2189,7 @@ +#define CONFIG_ALLYUV_FILTER 0 +#define CONFIG_CELLAUTO_FILTER 0 +#define CONFIG_COLOR_FILTER 0 ++#define CONFIG_COLORSPECTRUM_FILTER 0 +#define CONFIG_COREIMAGESRC_FILTER 0 +#define CONFIG_FREI0R_SRC_FILTER 0 +#define CONFIG_GRADIENTS_FILTER 0 @@ -2237,6 +2277,7 @@ +#define CONFIG_BINK_DEMUXER 0 +#define CONFIG_BINKA_DEMUXER 0 +#define CONFIG_BIT_DEMUXER 0 ++#define CONFIG_BITPACKED_DEMUXER 0 +#define CONFIG_BMV_DEMUXER 0 +#define CONFIG_BFSTM_DEMUXER 0 +#define CONFIG_BRSTM_DEMUXER 0 @@ -2311,6 +2352,7 @@ +#define CONFIG_IMAGE2PIPE_DEMUXER 0 +#define CONFIG_IMAGE2_ALIAS_PIX_DEMUXER 0 +#define CONFIG_IMAGE2_BRENDER_PIX_DEMUXER 0 ++#define CONFIG_IMF_DEMUXER 0 +#define CONFIG_INGENIENT_DEMUXER 0 +#define CONFIG_IPMOVIE_DEMUXER 0 +#define CONFIG_IPU_DEMUXER 0 @@ -2419,6 +2461,7 @@ +#define CONFIG_SBC_DEMUXER 0 +#define CONFIG_SBG_DEMUXER 0 +#define CONFIG_SCC_DEMUXER 0 ++#define CONFIG_SCD_DEMUXER 0 +#define CONFIG_SDP_DEMUXER 0 +#define CONFIG_SDR2_DEMUXER 0 +#define CONFIG_SDS_DEMUXER 0 diff --git a/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config.asm b/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config.asm index 98ddcbdebff3..2f4570f79a67 100644 --- a/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config.asm +++ b/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config.asm @@ -1,6 +1,6 @@ ---- third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.asm.orig 2022-02-28 16:54:41 UTC +--- third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.asm.orig 2022-03-25 21:59:56 UTC +++ third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.asm -@@ -0,0 +1,2727 @@ +@@ -0,0 +1,2770 @@ +; Automatically generated by configure - do not modify! +%define ARCH_AARCH64 0 +%define ARCH_ALPHA 0 @@ -10,6 +10,9 @@ +%define ARCH_AVR32_UC 0 +%define ARCH_BFIN 0 +%define ARCH_IA64 0 ++%define ARCH_LOONGARCH 0 ++%define ARCH_LOONGARCH32 0 ++%define ARCH_LOONGARCH64 0 +%define ARCH_M68K 0 +%define ARCH_MIPS 0 +%define ARCH_MIPS64 0 @@ -72,6 +75,8 @@ +%define HAVE_LOONGSON2 0 +%define HAVE_LOONGSON3 0 +%define HAVE_MMI 0 ++%define HAVE_LSX 0 ++%define HAVE_LASX 0 +%define HAVE_ARMV5TE_EXTERNAL 0 +%define HAVE_ARMV6_EXTERNAL 0 +%define HAVE_ARMV6T2_EXTERNAL 0 @@ -117,6 +122,8 @@ +%define HAVE_LOONGSON2_EXTERNAL 0 +%define HAVE_LOONGSON3_EXTERNAL 0 +%define HAVE_MMI_EXTERNAL 0 ++%define HAVE_LSX_EXTERNAL 0 ++%define HAVE_LASX_EXTERNAL 0 +%define HAVE_ARMV5TE_INLINE 0 +%define HAVE_ARMV6_INLINE 0 +%define HAVE_ARMV6T2_INLINE 0 @@ -162,6 +169,8 @@ +%define HAVE_LOONGSON2_INLINE 0 +%define HAVE_LOONGSON3_INLINE 0 +%define HAVE_MMI_INLINE 0 ++%define HAVE_LSX_INLINE 0 ++%define HAVE_LASX_INLINE 0 +%define HAVE_ALIGNED_STACK 1 +%define HAVE_FAST_64BIT 1 +%define HAVE_FAST_CLZ 1 @@ -343,7 +352,14 @@ +%define HAVE_XMM_CLOBBERS 1 +%define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +%define HAVE_KCMVIDEOCODECTYPE_HEVCWITHALPHA 0 ++%define HAVE_KCMVIDEOCODECTYPE_VP9 0 +%define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 ++%define HAVE_KCVPIXELFORMATTYPE_422YPCBCR8BIPLANARVIDEORANGE 0 ++%define HAVE_KCVPIXELFORMATTYPE_422YPCBCR10BIPLANARVIDEORANGE 0 ++%define HAVE_KCVPIXELFORMATTYPE_422YPCBCR16BIPLANARVIDEORANGE 0 ++%define HAVE_KCVPIXELFORMATTYPE_444YPCBCR8BIPLANARVIDEORANGE 0 ++%define HAVE_KCVPIXELFORMATTYPE_444YPCBCR10BIPLANARVIDEORANGE 0 ++%define HAVE_KCVPIXELFORMATTYPE_444YPCBCR16BIPLANARVIDEORANGE 0 +%define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_SMPTE_ST_2084_PQ 0 +%define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_ITU_R_2100_HLG 0 +%define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_LINEAR 0 @@ -467,12 +483,14 @@ +%define CONFIG_LIBOPENMPT 0 +%define CONFIG_LIBOPENVINO 0 +%define CONFIG_LIBOPUS 1 ++%define CONFIG_LIBPLACEBO 0 +%define CONFIG_LIBPULSE 0 +%define CONFIG_LIBRABBITMQ 0 +%define CONFIG_LIBRAV1E 0 +%define CONFIG_LIBRIST 0 +%define CONFIG_LIBRSVG 0 +%define CONFIG_LIBRTMP 0 ++%define CONFIG_LIBSHADERC 0 +%define CONFIG_LIBSHINE 0 +%define CONFIG_LIBSMBCLIENT 0 +%define CONFIG_LIBSNAPPY 0 @@ -514,6 +532,7 @@ +%define CONFIG_LIBXCB_XFIXES 0 +%define CONFIG_LZMA 0 +%define CONFIG_MEDIAFOUNDATION 0 ++%define CONFIG_METAL 0 +%define CONFIG_SCHANNEL 0 +%define CONFIG_SDL2 0 +%define CONFIG_SECURETRANSPORT 0 @@ -527,7 +546,6 @@ +%define CONFIG_MMAL 0 +%define CONFIG_OMX 0 +%define CONFIG_OPENCL 0 -+%define CONFIG_VULKAN 0 +%define CONFIG_AMF 0 +%define CONFIG_AUDIOTOOLBOX 0 +%define CONFIG_CRYSTALHD 0 @@ -542,6 +560,7 @@ +%define CONFIG_VAAPI 0 +%define CONFIG_VDPAU 0 +%define CONFIG_VIDEOTOOLBOX 0 ++%define CONFIG_VULKAN 0 +%define CONFIG_V4L2_M2M 0 +%define CONFIG_XVMC 0 +%define CONFIG_FTRAPV 0 @@ -622,6 +641,7 @@ +%define CONFIG_CBS_VP9 0 +%define CONFIG_DIRAC_PARSE 1 +%define CONFIG_DNN 0 ++%define CONFIG_DOVI_RPU 0 +%define CONFIG_DVPROFILE 0 +%define CONFIG_EXIF 0 +%define CONFIG_FAANDCT 0 @@ -663,7 +683,9 @@ +%define CONFIG_MPEGAUDIO 1 +%define CONFIG_MPEGAUDIODSP 1 +%define CONFIG_MPEGAUDIOHEADER 1 ++%define CONFIG_MPEG4AUDIO 1 +%define CONFIG_MPEGVIDEO 0 ++%define CONFIG_MPEGVIDEODEC 0 +%define CONFIG_MPEGVIDEOENC 0 +%define CONFIG_MSS34DSP 0 +%define CONFIG_PIXBLOCKDSP 0 @@ -1297,6 +1319,7 @@ +%define CONFIG_AVRP_ENCODER 0 +%define CONFIG_AVUI_ENCODER 0 +%define CONFIG_AYUV_ENCODER 0 ++%define CONFIG_BITPACKED_ENCODER 0 +%define CONFIG_BMP_ENCODER 0 +%define CONFIG_CFHD_ENCODER 0 +%define CONFIG_CINEPAK_ENCODER 0 @@ -1516,6 +1539,7 @@ +%define CONFIG_MPEG2_VAAPI_ENCODER 0 +%define CONFIG_MPEG4_OMX_ENCODER 0 +%define CONFIG_MPEG4_V4L2M2M_ENCODER 0 ++%define CONFIG_PRORES_VIDEOTOOLBOX_ENCODER 0 +%define CONFIG_VP8_V4L2M2M_ENCODER 0 +%define CONFIG_VP8_VAAPI_ENCODER 0 +%define CONFIG_VP9_VAAPI_ENCODER 0 @@ -1559,6 +1583,7 @@ +%define CONFIG_MPEG4_VAAPI_HWACCEL 0 +%define CONFIG_MPEG4_VDPAU_HWACCEL 0 +%define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0 ++%define CONFIG_PRORES_VIDEOTOOLBOX_HWACCEL 0 +%define CONFIG_VC1_D3D11VA_HWACCEL 0 +%define CONFIG_VC1_D3D11VA2_HWACCEL 0 +%define CONFIG_VC1_DXVA2_HWACCEL 0 @@ -1573,6 +1598,7 @@ +%define CONFIG_VP9_NVDEC_HWACCEL 0 +%define CONFIG_VP9_VAAPI_HWACCEL 0 +%define CONFIG_VP9_VDPAU_HWACCEL 0 ++%define CONFIG_VP9_VIDEOTOOLBOX_HWACCEL 0 +%define CONFIG_WMV3_D3D11VA_HWACCEL 0 +%define CONFIG_WMV3_D3D11VA2_HWACCEL 0 +%define CONFIG_WMV3_DXVA2_HWACCEL 0 @@ -1679,6 +1705,8 @@ +%define CONFIG_ADELAY_FILTER 0 +%define CONFIG_ADENORM_FILTER 0 +%define CONFIG_ADERIVATIVE_FILTER 0 ++%define CONFIG_ADYNAMICEQUALIZER_FILTER 0 ++%define CONFIG_ADYNAMICSMOOTH_FILTER 0 +%define CONFIG_AECHO_FILTER 0 +%define CONFIG_AEMPHASIS_FILTER 0 +%define CONFIG_AEVAL_FILTER 0 @@ -1704,6 +1732,7 @@ +%define CONFIG_AMULTIPLY_FILTER 0 +%define CONFIG_ANEQUALIZER_FILTER 0 +%define CONFIG_ANLMDN_FILTER 0 ++%define CONFIG_ANLMF_FILTER 0 +%define CONFIG_ANLMS_FILTER 0 +%define CONFIG_ANULL_FILTER 0 +%define CONFIG_APAD_FILTER 0 @@ -1727,6 +1756,7 @@ +%define CONFIG_ASHOWINFO_FILTER 0 +%define CONFIG_ASIDEDATA_FILTER 0 +%define CONFIG_ASOFTCLIP_FILTER 0 ++%define CONFIG_ASPECTRALSTATS_FILTER 0 +%define CONFIG_ASPLIT_FILTER 0 +%define CONFIG_ASR_FILTER 0 +%define CONFIG_ASTATS_FILTER 0 @@ -1746,7 +1776,6 @@ +%define CONFIG_BASS_FILTER 0 +%define CONFIG_BIQUAD_FILTER 0 +%define CONFIG_BS2B_FILTER 0 -+%define CONFIG_CHROMABER_VULKAN_FILTER 0 +%define CONFIG_CHANNELMAP_FILTER 0 +%define CONFIG_CHANNELSPLIT_FILTER 0 +%define CONFIG_CHORUS_FILTER 0 @@ -1819,11 +1848,13 @@ +%define CONFIG_BLACKDETECT_FILTER 0 +%define CONFIG_BLACKFRAME_FILTER 0 +%define CONFIG_BLEND_FILTER 0 ++%define CONFIG_BLEND_VULKAN_FILTER 0 +%define CONFIG_BM3D_FILTER 0 +%define CONFIG_BOXBLUR_FILTER 0 +%define CONFIG_BOXBLUR_OPENCL_FILTER 0 +%define CONFIG_BWDIF_FILTER 0 +%define CONFIG_CAS_FILTER 0 ++%define CONFIG_CHROMABER_VULKAN_FILTER 0 +%define CONFIG_CHROMAHOLD_FILTER 0 +%define CONFIG_CHROMAKEY_FILTER 0 +%define CONFIG_CHROMANR_FILTER 0 @@ -1902,6 +1933,7 @@ +%define CONFIG_FIELDORDER_FILTER 0 +%define CONFIG_FILLBORDERS_FILTER 0 +%define CONFIG_FIND_RECT_FILTER 0 ++%define CONFIG_FLIP_VULKAN_FILTER 0 +%define CONFIG_FLOODFILL_FILTER 0 +%define CONFIG_FORMAT_FILTER 0 +%define CONFIG_FPS_FILTER 0 @@ -1913,6 +1945,7 @@ +%define CONFIG_FREI0R_FILTER 0 +%define CONFIG_FSPP_FILTER 0 +%define CONFIG_GBLUR_FILTER 0 ++%define CONFIG_GBLUR_VULKAN_FILTER 0 +%define CONFIG_GEQ_FILTER 0 +%define CONFIG_GRADFUN_FILTER 0 +%define CONFIG_GRAPHMONITOR_FILTER 0 @@ -1921,6 +1954,7 @@ +%define CONFIG_GUIDED_FILTER 0 +%define CONFIG_HALDCLUT_FILTER 0 +%define CONFIG_HFLIP_FILTER 0 ++%define CONFIG_HFLIP_VULKAN_FILTER 0 +%define CONFIG_HISTEQ_FILTER 0 +%define CONFIG_HISTOGRAM_FILTER 0 +%define CONFIG_HQDN3D_FILTER 0 @@ -1947,6 +1981,7 @@ +%define CONFIG_LATENCY_FILTER 0 +%define CONFIG_LENSCORRECTION_FILTER 0 +%define CONFIG_LENSFUN_FILTER 0 ++%define CONFIG_LIBPLACEBO_FILTER 0 +%define CONFIG_LIBVMAF_FILTER 0 +%define CONFIG_LIMITDIFF_FILTER 0 +%define CONFIG_LIMITER_FILTER 0 @@ -1990,6 +2025,7 @@ +%define CONFIG_OVERLAY_FILTER 0 +%define CONFIG_OVERLAY_OPENCL_FILTER 0 +%define CONFIG_OVERLAY_QSV_FILTER 0 ++%define CONFIG_OVERLAY_VAAPI_FILTER 0 +%define CONFIG_OVERLAY_VULKAN_FILTER 0 +%define CONFIG_OVERLAY_CUDA_FILTER 0 +%define CONFIG_OWDENOISE_FILTER 0 @@ -2095,6 +2131,7 @@ +%define CONFIG_TRANSPOSE_NPP_FILTER 0 +%define CONFIG_TRANSPOSE_OPENCL_FILTER 0 +%define CONFIG_TRANSPOSE_VAAPI_FILTER 0 ++%define CONFIG_TRANSPOSE_VULKAN_FILTER 0 +%define CONFIG_TRIM_FILTER 0 +%define CONFIG_UNPREMULTIPLY_FILTER 0 +%define CONFIG_UNSHARP_FILTER 0 @@ -2106,6 +2143,7 @@ +%define CONFIG_VARBLUR_FILTER 0 +%define CONFIG_VECTORSCOPE_FILTER 0 +%define CONFIG_VFLIP_FILTER 0 ++%define CONFIG_VFLIP_VULKAN_FILTER 0 +%define CONFIG_VFRDET_FILTER 0 +%define CONFIG_VIBRANCE_FILTER 0 +%define CONFIG_VIDSTABDETECT_FILTER 0 @@ -2126,6 +2164,7 @@ +%define CONFIG_XSTACK_FILTER 0 +%define CONFIG_YADIF_FILTER 0 +%define CONFIG_YADIF_CUDA_FILTER 0 ++%define CONFIG_YADIF_VIDEOTOOLBOX_FILTER 0 +%define CONFIG_YAEPBLUR_FILTER 0 +%define CONFIG_ZMQ_FILTER 0 +%define CONFIG_ZOOMPAN_FILTER 0 @@ -2134,6 +2173,7 @@ +%define CONFIG_ALLYUV_FILTER 0 +%define CONFIG_CELLAUTO_FILTER 0 +%define CONFIG_COLOR_FILTER 0 ++%define CONFIG_COLORSPECTRUM_FILTER 0 +%define CONFIG_COREIMAGESRC_FILTER 0 +%define CONFIG_FREI0R_SRC_FILTER 0 +%define CONFIG_GRADIENTS_FILTER 0 @@ -2221,6 +2261,7 @@ +%define CONFIG_BINK_DEMUXER 0 +%define CONFIG_BINKA_DEMUXER 0 +%define CONFIG_BIT_DEMUXER 0 ++%define CONFIG_BITPACKED_DEMUXER 0 +%define CONFIG_BMV_DEMUXER 0 +%define CONFIG_BFSTM_DEMUXER 0 +%define CONFIG_BRSTM_DEMUXER 0 @@ -2295,6 +2336,7 @@ +%define CONFIG_IMAGE2PIPE_DEMUXER 0 +%define CONFIG_IMAGE2_ALIAS_PIX_DEMUXER 0 +%define CONFIG_IMAGE2_BRENDER_PIX_DEMUXER 0 ++%define CONFIG_IMF_DEMUXER 0 +%define CONFIG_INGENIENT_DEMUXER 0 +%define CONFIG_IPMOVIE_DEMUXER 0 +%define CONFIG_IPU_DEMUXER 0 @@ -2403,6 +2445,7 @@ +%define CONFIG_SBC_DEMUXER 0 +%define CONFIG_SBG_DEMUXER 0 +%define CONFIG_SCC_DEMUXER 0 ++%define CONFIG_SCD_DEMUXER 0 +%define CONFIG_SDP_DEMUXER 0 +%define CONFIG_SDR2_DEMUXER 0 +%define CONFIG_SDS_DEMUXER 0 diff --git a/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config.h b/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config.h index aa1e645f6ca5..f38df9e5a521 100644 --- a/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config.h +++ b/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config.h @@ -1,12 +1,12 @@ ---- third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.h.orig 2022-02-28 16:54:41 UTC +--- third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.h.orig 2022-03-25 21:59:56 UTC +++ third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.h -@@ -0,0 +1,2744 @@ +@@ -0,0 +1,2787 @@ +/* Automatically generated by configure - do not modify! */ +#ifndef FFMPEG_CONFIG_H +#define FFMPEG_CONFIG_H -+/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/jrummell/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-lto --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ ++/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/chcunningham/src/chrome/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-lto --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ +#define FFMPEG_LICENSE "LGPL version 2.1 or later" -+#define CONFIG_THIS_YEAR 2021 ++#define CONFIG_THIS_YEAR 2022 +#define FFMPEG_DATADIR "/usr/local/share/ffmpeg" +#define AVCONV_DATADIR "/usr/local/share/ffmpeg" +#define CC_IDENT "OpenBSD clang version 13.0.0" @@ -26,6 +26,9 @@ +#define ARCH_AVR32_UC 0 +#define ARCH_BFIN 0 +#define ARCH_IA64 0 ++#define ARCH_LOONGARCH 0 ++#define ARCH_LOONGARCH32 0 ++#define ARCH_LOONGARCH64 0 +#define ARCH_M68K 0 +#define ARCH_MIPS 0 +#define ARCH_MIPS64 0 @@ -88,6 +91,8 @@ +#define HAVE_LOONGSON2 0 +#define HAVE_LOONGSON3 0 +#define HAVE_MMI 0 ++#define HAVE_LSX 0 ++#define HAVE_LASX 0 +#define HAVE_ARMV5TE_EXTERNAL 0 +#define HAVE_ARMV6_EXTERNAL 0 +#define HAVE_ARMV6T2_EXTERNAL 0 @@ -133,6 +138,8 @@ +#define HAVE_LOONGSON2_EXTERNAL 0 +#define HAVE_LOONGSON3_EXTERNAL 0 +#define HAVE_MMI_EXTERNAL 0 ++#define HAVE_LSX_EXTERNAL 0 ++#define HAVE_LASX_EXTERNAL 0 +#define HAVE_ARMV5TE_INLINE 0 +#define HAVE_ARMV6_INLINE 0 +#define HAVE_ARMV6T2_INLINE 0 @@ -178,6 +185,8 @@ +#define HAVE_LOONGSON2_INLINE 0 +#define HAVE_LOONGSON3_INLINE 0 +#define HAVE_MMI_INLINE 0 ++#define HAVE_LSX_INLINE 0 ++#define HAVE_LASX_INLINE 0 +#define HAVE_ALIGNED_STACK 1 +#define HAVE_FAST_64BIT 1 +#define HAVE_FAST_CLZ 1 @@ -236,7 +245,7 @@ +#define HAVE_TERMIOS_H 1 +#define HAVE_UDPLITE_H 0 +#define HAVE_UNISTD_H 1 -+#define HAVE_VALGRIND_VALGRIND_H 0 /* #define HAVE_VALGRIND_VALGRIND_H 1 -- forced to 0. See https://crbug.com/590440 */ ++#define HAVE_VALGRIND_VALGRIND_H 0 /* #define HAVE_VALGRIND_VALGRIND_H 0 -- forced to 0. See https://crbug.com/590440 */ +#define HAVE_WINDOWS_H 0 +#define HAVE_WINSOCK2_H 0 +#define HAVE_INTRINSICS_NEON 0 @@ -359,7 +368,14 @@ +#define HAVE_XMM_CLOBBERS 1 +#define HAVE_KCMVIDEOCODECTYPE_HEVC 0 +#define HAVE_KCMVIDEOCODECTYPE_HEVCWITHALPHA 0 ++#define HAVE_KCMVIDEOCODECTYPE_VP9 0 +#define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 ++#define HAVE_KCVPIXELFORMATTYPE_422YPCBCR8BIPLANARVIDEORANGE 0 ++#define HAVE_KCVPIXELFORMATTYPE_422YPCBCR10BIPLANARVIDEORANGE 0 ++#define HAVE_KCVPIXELFORMATTYPE_422YPCBCR16BIPLANARVIDEORANGE 0 ++#define HAVE_KCVPIXELFORMATTYPE_444YPCBCR8BIPLANARVIDEORANGE 0 ++#define HAVE_KCVPIXELFORMATTYPE_444YPCBCR10BIPLANARVIDEORANGE 0 ++#define HAVE_KCVPIXELFORMATTYPE_444YPCBCR16BIPLANARVIDEORANGE 0 +#define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_SMPTE_ST_2084_PQ 0 +#define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_ITU_R_2100_HLG 0 +#define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_LINEAR 0 @@ -483,12 +499,14 @@ +#define CONFIG_LIBOPENMPT 0 +#define CONFIG_LIBOPENVINO 0 +#define CONFIG_LIBOPUS 1 ++#define CONFIG_LIBPLACEBO 0 +#define CONFIG_LIBPULSE 0 +#define CONFIG_LIBRABBITMQ 0 +#define CONFIG_LIBRAV1E 0 +#define CONFIG_LIBRIST 0 +#define CONFIG_LIBRSVG 0 +#define CONFIG_LIBRTMP 0 ++#define CONFIG_LIBSHADERC 0 +#define CONFIG_LIBSHINE 0 +#define CONFIG_LIBSMBCLIENT 0 +#define CONFIG_LIBSNAPPY 0 @@ -530,6 +548,7 @@ +#define CONFIG_LIBXCB_XFIXES 0 +#define CONFIG_LZMA 0 +#define CONFIG_MEDIAFOUNDATION 0 ++#define CONFIG_METAL 0 +#define CONFIG_SCHANNEL 0 +#define CONFIG_SDL2 0 +#define CONFIG_SECURETRANSPORT 0 @@ -543,7 +562,6 @@ +#define CONFIG_MMAL 0 +#define CONFIG_OMX 0 +#define CONFIG_OPENCL 0 -+#define CONFIG_VULKAN 0 +#define CONFIG_AMF 0 +#define CONFIG_AUDIOTOOLBOX 0 +#define CONFIG_CRYSTALHD 0 @@ -558,6 +576,7 @@ +#define CONFIG_VAAPI 0 +#define CONFIG_VDPAU 0 +#define CONFIG_VIDEOTOOLBOX 0 ++#define CONFIG_VULKAN 0 +#define CONFIG_V4L2_M2M 0 +#define CONFIG_XVMC 0 +#define CONFIG_FTRAPV 0 @@ -638,6 +657,7 @@ +#define CONFIG_CBS_VP9 0 +#define CONFIG_DIRAC_PARSE 1 +#define CONFIG_DNN 0 ++#define CONFIG_DOVI_RPU 0 +#define CONFIG_DVPROFILE 0 +#define CONFIG_EXIF 0 +#define CONFIG_FAANDCT 0 @@ -679,7 +699,9 @@ +#define CONFIG_MPEGAUDIO 1 +#define CONFIG_MPEGAUDIODSP 1 +#define CONFIG_MPEGAUDIOHEADER 1 ++#define CONFIG_MPEG4AUDIO 1 +#define CONFIG_MPEGVIDEO 0 ++#define CONFIG_MPEGVIDEODEC 0 +#define CONFIG_MPEGVIDEOENC 0 +#define CONFIG_MSS34DSP 0 +#define CONFIG_PIXBLOCKDSP 0 @@ -1313,6 +1335,7 @@ +#define CONFIG_AVRP_ENCODER 0 +#define CONFIG_AVUI_ENCODER 0 +#define CONFIG_AYUV_ENCODER 0 ++#define CONFIG_BITPACKED_ENCODER 0 +#define CONFIG_BMP_ENCODER 0 +#define CONFIG_CFHD_ENCODER 0 +#define CONFIG_CINEPAK_ENCODER 0 @@ -1532,6 +1555,7 @@ +#define CONFIG_MPEG2_VAAPI_ENCODER 0 +#define CONFIG_MPEG4_OMX_ENCODER 0 +#define CONFIG_MPEG4_V4L2M2M_ENCODER 0 ++#define CONFIG_PRORES_VIDEOTOOLBOX_ENCODER 0 +#define CONFIG_VP8_V4L2M2M_ENCODER 0 +#define CONFIG_VP8_VAAPI_ENCODER 0 +#define CONFIG_VP9_VAAPI_ENCODER 0 @@ -1575,6 +1599,7 @@ +#define CONFIG_MPEG4_VAAPI_HWACCEL 0 +#define CONFIG_MPEG4_VDPAU_HWACCEL 0 +#define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0 ++#define CONFIG_PRORES_VIDEOTOOLBOX_HWACCEL 0 +#define CONFIG_VC1_D3D11VA_HWACCEL 0 +#define CONFIG_VC1_D3D11VA2_HWACCEL 0 +#define CONFIG_VC1_DXVA2_HWACCEL 0 @@ -1589,6 +1614,7 @@ +#define CONFIG_VP9_NVDEC_HWACCEL 0 +#define CONFIG_VP9_VAAPI_HWACCEL 0 +#define CONFIG_VP9_VDPAU_HWACCEL 0 ++#define CONFIG_VP9_VIDEOTOOLBOX_HWACCEL 0 +#define CONFIG_WMV3_D3D11VA_HWACCEL 0 +#define CONFIG_WMV3_D3D11VA2_HWACCEL 0 +#define CONFIG_WMV3_DXVA2_HWACCEL 0 @@ -1695,6 +1721,8 @@ +#define CONFIG_ADELAY_FILTER 0 +#define CONFIG_ADENORM_FILTER 0 +#define CONFIG_ADERIVATIVE_FILTER 0 ++#define CONFIG_ADYNAMICEQUALIZER_FILTER 0 ++#define CONFIG_ADYNAMICSMOOTH_FILTER 0 +#define CONFIG_AECHO_FILTER 0 +#define CONFIG_AEMPHASIS_FILTER 0 +#define CONFIG_AEVAL_FILTER 0 @@ -1720,6 +1748,7 @@ +#define CONFIG_AMULTIPLY_FILTER 0 +#define CONFIG_ANEQUALIZER_FILTER 0 +#define CONFIG_ANLMDN_FILTER 0 ++#define CONFIG_ANLMF_FILTER 0 +#define CONFIG_ANLMS_FILTER 0 +#define CONFIG_ANULL_FILTER 0 +#define CONFIG_APAD_FILTER 0 @@ -1743,6 +1772,7 @@ +#define CONFIG_ASHOWINFO_FILTER 0 +#define CONFIG_ASIDEDATA_FILTER 0 +#define CONFIG_ASOFTCLIP_FILTER 0 ++#define CONFIG_ASPECTRALSTATS_FILTER 0 +#define CONFIG_ASPLIT_FILTER 0 +#define CONFIG_ASR_FILTER 0 +#define CONFIG_ASTATS_FILTER 0 @@ -1762,7 +1792,6 @@ +#define CONFIG_BASS_FILTER 0 +#define CONFIG_BIQUAD_FILTER 0 +#define CONFIG_BS2B_FILTER 0 -+#define CONFIG_CHROMABER_VULKAN_FILTER 0 +#define CONFIG_CHANNELMAP_FILTER 0 +#define CONFIG_CHANNELSPLIT_FILTER 0 +#define CONFIG_CHORUS_FILTER 0 @@ -1835,11 +1864,13 @@ +#define CONFIG_BLACKDETECT_FILTER 0 +#define CONFIG_BLACKFRAME_FILTER 0 +#define CONFIG_BLEND_FILTER 0 ++#define CONFIG_BLEND_VULKAN_FILTER 0 +#define CONFIG_BM3D_FILTER 0 +#define CONFIG_BOXBLUR_FILTER 0 +#define CONFIG_BOXBLUR_OPENCL_FILTER 0 +#define CONFIG_BWDIF_FILTER 0 +#define CONFIG_CAS_FILTER 0 ++#define CONFIG_CHROMABER_VULKAN_FILTER 0 +#define CONFIG_CHROMAHOLD_FILTER 0 +#define CONFIG_CHROMAKEY_FILTER 0 +#define CONFIG_CHROMANR_FILTER 0 @@ -1918,6 +1949,7 @@ +#define CONFIG_FIELDORDER_FILTER 0 +#define CONFIG_FILLBORDERS_FILTER 0 +#define CONFIG_FIND_RECT_FILTER 0 ++#define CONFIG_FLIP_VULKAN_FILTER 0 +#define CONFIG_FLOODFILL_FILTER 0 +#define CONFIG_FORMAT_FILTER 0 +#define CONFIG_FPS_FILTER 0 @@ -1929,6 +1961,7 @@ +#define CONFIG_FREI0R_FILTER 0 +#define CONFIG_FSPP_FILTER 0 +#define CONFIG_GBLUR_FILTER 0 ++#define CONFIG_GBLUR_VULKAN_FILTER 0 +#define CONFIG_GEQ_FILTER 0 +#define CONFIG_GRADFUN_FILTER 0 +#define CONFIG_GRAPHMONITOR_FILTER 0 @@ -1937,6 +1970,7 @@ +#define CONFIG_GUIDED_FILTER 0 +#define CONFIG_HALDCLUT_FILTER 0 +#define CONFIG_HFLIP_FILTER 0 ++#define CONFIG_HFLIP_VULKAN_FILTER 0 +#define CONFIG_HISTEQ_FILTER 0 +#define CONFIG_HISTOGRAM_FILTER 0 +#define CONFIG_HQDN3D_FILTER 0 @@ -1963,6 +1997,7 @@ +#define CONFIG_LATENCY_FILTER 0 +#define CONFIG_LENSCORRECTION_FILTER 0 +#define CONFIG_LENSFUN_FILTER 0 ++#define CONFIG_LIBPLACEBO_FILTER 0 +#define CONFIG_LIBVMAF_FILTER 0 +#define CONFIG_LIMITDIFF_FILTER 0 +#define CONFIG_LIMITER_FILTER 0 @@ -2006,6 +2041,7 @@ +#define CONFIG_OVERLAY_FILTER 0 +#define CONFIG_OVERLAY_OPENCL_FILTER 0 +#define CONFIG_OVERLAY_QSV_FILTER 0 ++#define CONFIG_OVERLAY_VAAPI_FILTER 0 +#define CONFIG_OVERLAY_VULKAN_FILTER 0 +#define CONFIG_OVERLAY_CUDA_FILTER 0 +#define CONFIG_OWDENOISE_FILTER 0 @@ -2111,6 +2147,7 @@ +#define CONFIG_TRANSPOSE_NPP_FILTER 0 +#define CONFIG_TRANSPOSE_OPENCL_FILTER 0 +#define CONFIG_TRANSPOSE_VAAPI_FILTER 0 ++#define CONFIG_TRANSPOSE_VULKAN_FILTER 0 +#define CONFIG_TRIM_FILTER 0 +#define CONFIG_UNPREMULTIPLY_FILTER 0 +#define CONFIG_UNSHARP_FILTER 0 @@ -2122,6 +2159,7 @@ +#define CONFIG_VARBLUR_FILTER 0 +#define CONFIG_VECTORSCOPE_FILTER 0 +#define CONFIG_VFLIP_FILTER 0 ++#define CONFIG_VFLIP_VULKAN_FILTER 0 +#define CONFIG_VFRDET_FILTER 0 +#define CONFIG_VIBRANCE_FILTER 0 +#define CONFIG_VIDSTABDETECT_FILTER 0 @@ -2142,6 +2180,7 @@ +#define CONFIG_XSTACK_FILTER 0 +#define CONFIG_YADIF_FILTER 0 +#define CONFIG_YADIF_CUDA_FILTER 0 ++#define CONFIG_YADIF_VIDEOTOOLBOX_FILTER 0 +#define CONFIG_YAEPBLUR_FILTER 0 +#define CONFIG_ZMQ_FILTER 0 +#define CONFIG_ZOOMPAN_FILTER 0 @@ -2150,6 +2189,7 @@ +#define CONFIG_ALLYUV_FILTER 0 +#define CONFIG_CELLAUTO_FILTER 0 +#define CONFIG_COLOR_FILTER 0 ++#define CONFIG_COLORSPECTRUM_FILTER 0 +#define CONFIG_COREIMAGESRC_FILTER 0 +#define CONFIG_FREI0R_SRC_FILTER 0 +#define CONFIG_GRADIENTS_FILTER 0 @@ -2237,6 +2277,7 @@ +#define CONFIG_BINK_DEMUXER 0 +#define CONFIG_BINKA_DEMUXER 0 +#define CONFIG_BIT_DEMUXER 0 ++#define CONFIG_BITPACKED_DEMUXER 0 +#define CONFIG_BMV_DEMUXER 0 +#define CONFIG_BFSTM_DEMUXER 0 +#define CONFIG_BRSTM_DEMUXER 0 @@ -2311,6 +2352,7 @@ +#define CONFIG_IMAGE2PIPE_DEMUXER 0 +#define CONFIG_IMAGE2_ALIAS_PIX_DEMUXER 0 +#define CONFIG_IMAGE2_BRENDER_PIX_DEMUXER 0 ++#define CONFIG_IMF_DEMUXER 0 +#define CONFIG_INGENIENT_DEMUXER 0 +#define CONFIG_IPMOVIE_DEMUXER 0 +#define CONFIG_IPU_DEMUXER 0 @@ -2419,6 +2461,7 @@ +#define CONFIG_SBC_DEMUXER 0 +#define CONFIG_SBG_DEMUXER 0 +#define CONFIG_SCC_DEMUXER 0 ++#define CONFIG_SCD_DEMUXER 0 +#define CONFIG_SDP_DEMUXER 0 +#define CONFIG_SDR2_DEMUXER 0 +#define CONFIG_SDS_DEMUXER 0 diff --git a/www/chromium/files/patch-third__party_libxml_linux_config.h b/www/chromium/files/patch-third__party_libxml_linux_config.h index 59d91455a6dd..bb8f23f56dda 100644 --- a/www/chromium/files/patch-third__party_libxml_linux_config.h +++ b/www/chromium/files/patch-third__party_libxml_linux_config.h @@ -1,8 +1,8 @@ ---- third_party/libxml/linux/config.h.orig 2022-02-28 16:54:41 UTC +--- third_party/libxml/linux/config.h.orig 2022-03-25 21:59:56 UTC +++ third_party/libxml/linux/config.h -@@ -118,6 +118,9 @@ - /* Define to 1 if you have the `rand' function. */ - #define HAVE_RAND 1 +@@ -81,6 +81,9 @@ + /* Define to 1 if you have the `putenv' function. */ + #define HAVE_PUTENV 1 +/* Define to 1 if you have the `arc4random' function. */ +#define HAVE_ARC4RANDOM 1 diff --git a/www/chromium/files/patch-third__party_libxml_src_dict.c b/www/chromium/files/patch-third__party_libxml_src_dict.c index a35e291f6462..982d436edd14 100644 --- a/www/chromium/files/patch-third__party_libxml_src_dict.c +++ b/www/chromium/files/patch-third__party_libxml_src_dict.c @@ -1,17 +1,6 @@ ---- third_party/libxml/src/dict.c.orig 2022-02-07 13:39:41 UTC +--- third_party/libxml/src/dict.c.orig 2022-03-25 21:59:56 UTC +++ third_party/libxml/src/dict.c -@@ -38,8 +38,8 @@ - * list we will use the BigKey algo as soon as the hash size grows - * over MIN_DICT_SIZE so this actually works - */ --#if defined(HAVE_RAND) && defined(HAVE_SRAND) && defined(HAVE_TIME) && \ -- !defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION) -+#if (defined(HAVE_RAND) && defined(HAVE_SRAND) && defined(HAVE_TIME) && \ -+ !defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION)) || defined(HAVE_ARC4RANDOM) - #define DICT_RANDOMIZATION - #endif - -@@ -140,7 +140,7 @@ static xmlRMutexPtr xmlDictMutex = NULL; +@@ -135,7 +135,7 @@ static xmlRMutexPtr xmlDictMutex = NULL; static int xmlDictInitialized = 0; #ifdef DICT_RANDOMIZATION @@ -20,7 +9,7 @@ /* * Internal data for random function, protected by xmlDictMutex */ -@@ -181,7 +181,7 @@ int __xmlInitializeDict(void) { +@@ -176,7 +176,7 @@ int __xmlInitializeDict(void) { return(0); xmlRMutexLock(xmlDictMutex); @@ -29,7 +18,7 @@ #ifdef HAVE_RAND_R rand_seed = time(NULL); rand_r(& rand_seed); -@@ -201,13 +201,17 @@ int __xmlRandom(void) { +@@ -196,13 +196,17 @@ int __xmlRandom(void) { if (xmlDictInitialized == 0) __xmlInitializeDict(); diff --git a/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc b/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc index d8b1dbac6eec..3763a61c54b5 100644 --- a/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc +++ b/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc @@ -1,6 +1,6 @@ ---- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2022-02-28 16:54:41 UTC +--- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2022-03-25 21:59:56 UTC +++ third_party/perfetto/src/tracing/core/tracing_service_impl.cc -@@ -3008,7 +3008,8 @@ bool TracingServiceImpl::SnapshotClocks( +@@ -3042,7 +3042,8 @@ bool TracingServiceImpl::SnapshotClocks( #if !PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) && \ !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN) && \ diff --git a/www/chromium/files/patch-third__party_swiftshader_src_WSI_libXCB.cpp b/www/chromium/files/patch-third__party_swiftshader_src_WSI_libXCB.cpp index e7c050a6e2af..8ad2f31ee5e3 100644 --- a/www/chromium/files/patch-third__party_swiftshader_src_WSI_libXCB.cpp +++ b/www/chromium/files/patch-third__party_swiftshader_src_WSI_libXCB.cpp @@ -1,6 +1,6 @@ ---- third_party/swiftshader/src/WSI/libXCB.cpp.orig 2022-02-28 16:54:41 UTC +--- third_party/swiftshader/src/WSI/libXCB.cpp.orig 2022-03-25 21:59:56 UTC +++ third_party/swiftshader/src/WSI/libXCB.cpp -@@ -53,7 +53,7 @@ LibXcbExports *LibXCB::loadExports() +@@ -55,7 +55,7 @@ LibXcbExports *LibXCB::loadExports() } else { diff --git a/www/chromium/files/patch-third__party_swiftshader_third__party_marl_src_thread.cpp b/www/chromium/files/patch-third__party_swiftshader_third__party_marl_src_thread.cpp index b810325ff295..e66e5c7a8e2b 100644 --- a/www/chromium/files/patch-third__party_swiftshader_third__party_marl_src_thread.cpp +++ b/www/chromium/files/patch-third__party_swiftshader_third__party_marl_src_thread.cpp @@ -1,6 +1,6 @@ ---- third_party/swiftshader/third_party/marl/src/thread.cpp.orig 2022-02-07 13:39:41 UTC +--- third_party/swiftshader/third_party/marl/src/thread.cpp.orig 2022-03-25 21:59:56 UTC +++ third_party/swiftshader/third_party/marl/src/thread.cpp -@@ -422,7 +422,7 @@ void Thread::setName(const char* fmt, ...) { +@@ -426,7 +426,7 @@ void Thread::setName(const char* fmt, ...) { pthread_setname_np(name); #elif defined(__FreeBSD__) pthread_set_name_np(pthread_self(), name); diff --git a/www/chromium/files/patch-third__party_test__fonts_fontconfig_fontconfig__util__linux.cc b/www/chromium/files/patch-third__party_test__fonts_fontconfig_fontconfig__util__linux.cc new file mode 100644 index 000000000000..ffd8c2c19312 --- /dev/null +++ b/www/chromium/files/patch-third__party_test__fonts_fontconfig_fontconfig__util__linux.cc @@ -0,0 +1,27 @@ +--- third_party/test_fonts/fontconfig/fontconfig_util_linux.cc.orig 2022-03-25 21:59:56 UTC ++++ third_party/test_fonts/fontconfig/fontconfig_util_linux.cc +@@ -2,6 +2,8 @@ + // Use of this source code is governed by a BSD-style license that can be + // found in the LICENSE file. + ++#include "build/build_config.h" ++ + #include "third_party/test_fonts/fontconfig/fontconfig_util_linux.h" + + #include <fontconfig/fontconfig.h> +@@ -15,11 +17,15 @@ + namespace test_fonts { + + std::string GetSysrootDir() { ++#if BUILDFLAG(IS_BSD) ++ return std::string("."); ++#else + char buf[PATH_MAX + 1]; + auto count = readlink("/proc/self/exe", buf, PATH_MAX); + assert(count > 0); + buf[count] = '\0'; + return dirname(buf); ++#endif + } + + void SetUpFontconfig() { diff --git a/www/chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_BUILD.gn b/www/chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_BUILD.gn new file mode 100644 index 000000000000..1ce08ad128dc --- /dev/null +++ b/www/chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_BUILD.gn @@ -0,0 +1,11 @@ +--- third_party/vulkan-deps/vulkan-loader/src/BUILD.gn.orig 2022-03-25 21:59:56 UTC ++++ third_party/vulkan-deps/vulkan-loader/src/BUILD.gn +@@ -61,7 +61,7 @@ config("vulkan_internal_config") { + defines += [ + "SYSCONFDIR=\"/etc\"", + "FALLBACK_CONFIG_DIRS=\"/etc/xdg\"", +- "FALLBACK_DATA_DIRS=\"/usr/local/share:/usr/share\"", ++ "FALLBACK_DATA_DIRS=\"/usr/X11R6/share:/usr/local/share:/usr/share\"", + ] + } + } diff --git a/www/chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h b/www/chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h index 2970858e97cd..b75bc39960b3 100644 --- a/www/chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h +++ b/www/chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h @@ -1,4 +1,4 @@ ---- third_party/vulkan-deps/vulkan-loader/src/loader/vk_loader_platform.h.orig 2022-02-07 13:39:41 UTC +--- third_party/vulkan-deps/vulkan-loader/src/loader/vk_loader_platform.h.orig 2022-03-25 21:59:56 UTC +++ third_party/vulkan-deps/vulkan-loader/src/loader/vk_loader_platform.h @@ -42,7 +42,7 @@ #include "dlopen_fuchsia.h" @@ -18,12 +18,19 @@ /* Linux-specific common code: */ // VK Library Filenames, Paths, etc.: -@@ -195,7 +195,7 @@ static inline char *loader_platform_executable_path(ch +@@ -192,6 +192,15 @@ static inline char *loader_platform_executable_path(ch + }; + if (sysctl(mib, sizeof(mib) / sizeof(mib[0]), buffer, &size, NULL, 0) < 0) + return NULL; ++ ++ return buffer; ++} ++#elif defined(__OpenBSD__) ++static inline char *loader_platform_executable_path(char *buffer, size_t size) { ++ if ((buffer = getenv("CHROME_EXE_PATH")) != NULL) ++ return buffer; ++ else ++ buffer = "/usr/local/chrome/chrome"; return buffer; } --#elif defined(__Fuchsia__) -+#elif defined(__Fuchsia__) || defined(__OpenBSD__) || defined(__FreeBSD__) - static inline char *loader_platform_executable_path(char *buffer, size_t size) { return NULL; } - #elif defined(__QNXNTO__) - diff --git a/www/chromium/files/patch-third__party_webrtc_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_BUILD.gn index d235f23fe476..293c15b2de30 100644 --- a/www/chromium/files/patch-third__party_webrtc_BUILD.gn +++ b/www/chromium/files/patch-third__party_webrtc_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/webrtc/BUILD.gn.orig 2022-02-07 13:39:41 UTC +--- third_party/webrtc/BUILD.gn.orig 2022-03-25 21:59:56 UTC +++ third_party/webrtc/BUILD.gn -@@ -191,6 +191,9 @@ config("common_inherited_config") { +@@ -196,6 +196,9 @@ config("common_inherited_config") { if (is_linux || is_chromeos) { defines += [ "WEBRTC_LINUX" ] } diff --git a/www/chromium/files/patch-third__party_webrtc_rtc__base_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_rtc__base_BUILD.gn index c9de4bee5d61..685a4bee8a45 100644 --- a/www/chromium/files/patch-third__party_webrtc_rtc__base_BUILD.gn +++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/webrtc/rtc_base/BUILD.gn.orig 2022-02-28 16:54:41 UTC +--- third_party/webrtc/rtc_base/BUILD.gn.orig 2022-03-25 21:59:56 UTC +++ third_party/webrtc/rtc_base/BUILD.gn -@@ -1084,7 +1084,7 @@ rtc_library("rtc_base") { +@@ -1087,7 +1087,7 @@ rtc_library("rtc_base") { sources += [ "mac_ifaddrs_converter.cc" ] } diff --git a/www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc b/www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc index 34f67f94b4b7..b568d9f07b0b 100644 --- a/www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc +++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc @@ -1,6 +1,6 @@ ---- third_party/webrtc/rtc_base/network.cc.orig 2022-02-28 16:54:41 UTC +--- third_party/webrtc/rtc_base/network.cc.orig 2022-03-25 21:59:56 UTC +++ third_party/webrtc/rtc_base/network.cc -@@ -260,7 +260,12 @@ AdapterType GetAdapterTypeFromName(const char* network +@@ -258,7 +258,12 @@ AdapterType GetAdapterTypeFromName(const char* network } #endif diff --git a/www/chromium/files/patch-tools_json__schema__compiler_cpp__bundle__generator.py b/www/chromium/files/patch-tools_json__schema__compiler_cpp__bundle__generator.py index 488f666a4aad..4b50c6c1587f 100644 --- a/www/chromium/files/patch-tools_json__schema__compiler_cpp__bundle__generator.py +++ b/www/chromium/files/patch-tools_json__schema__compiler_cpp__bundle__generator.py @@ -1,11 +1,11 @@ ---- tools/json_schema_compiler/cpp_bundle_generator.py.orig 2022-02-07 13:39:41 UTC +--- tools/json_schema_compiler/cpp_bundle_generator.py.orig 2022-03-25 21:59:56 UTC +++ tools/json_schema_compiler/cpp_bundle_generator.py @@ -154,7 +154,7 @@ class CppBundleGenerator(object): - # defined(OS_CHROMEOS) && BUILDFLAG(IS_CHROMEOS_LACROS). + # BUILDFLAG(IS_CHROMEOS) && BUILDFLAG(IS_CHROMEOS_LACROS). ifdefs.append('BUILDFLAG(IS_CHROMEOS_LACROS)') elif platform == Platforms.LINUX: -- ifdefs.append('(defined(OS_LINUX) && !defined(OS_CHROMEOS))') -+ ifdefs.append('(defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)') +- ifdefs.append('BUILDFLAG(IS_LINUX)') ++ ifdefs.append('BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)') elif platform == Platforms.MAC: - ifdefs.append('defined(OS_MAC)') + ifdefs.append('BUILDFLAG(IS_MAC)') elif platform == Platforms.WIN: diff --git a/www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py b/www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py index 1b7f4e045f47..7b2c424e919e 100644 --- a/www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py +++ b/www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py @@ -1,6 +1,6 @@ ---- tools/json_schema_compiler/feature_compiler.py.orig 2022-02-07 13:39:41 UTC +--- tools/json_schema_compiler/feature_compiler.py.orig 2022-03-25 21:59:56 UTC +++ tools/json_schema_compiler/feature_compiler.py -@@ -264,6 +264,7 @@ FEATURE_GRAMMAR = ({ +@@ -267,6 +267,7 @@ FEATURE_GRAMMAR = ({ 'mac': 'Feature::MACOSX_PLATFORM', 'win': 'Feature::WIN_PLATFORM', 'fuchsia': 'Feature::FUCHSIA_PLATFORM', diff --git a/www/chromium/files/patch-ui_base_clipboard_clipboard__constants.cc b/www/chromium/files/patch-ui_base_clipboard_clipboard__constants.cc index 2d068ccc9dd5..61f01c13cd6a 100644 --- a/www/chromium/files/patch-ui_base_clipboard_clipboard__constants.cc +++ b/www/chromium/files/patch-ui_base_clipboard_clipboard__constants.cc @@ -1,8 +1,8 @@ ---- ui/base/clipboard/clipboard_constants.cc.orig 2022-02-28 16:54:41 UTC +--- ui/base/clipboard/clipboard_constants.cc.orig 2022-03-25 21:59:56 UTC +++ ui/base/clipboard/clipboard_constants.cc -@@ -22,7 +22,7 @@ const char kMimeTypePNG[] = "image/png"; - // Used for image drag & drop from LaCrOS. - const char kMimeTypeOctetStream[] = "application/octet-stream"; +@@ -24,7 +24,7 @@ const char kMimeTypeOctetStream[] = "application/octet + // Used for window dragging on some platforms. + const char kMimeTypeWindowDrag[] = "chromium/x-window-drag"; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) diff --git a/www/chromium/files/patch-ui_base_clipboard_clipboard__constants.h b/www/chromium/files/patch-ui_base_clipboard_clipboard__constants.h index c47ad7f58b66..9232742bbece 100644 --- a/www/chromium/files/patch-ui_base_clipboard_clipboard__constants.h +++ b/www/chromium/files/patch-ui_base_clipboard_clipboard__constants.h @@ -1,6 +1,6 @@ ---- ui/base/clipboard/clipboard_constants.h.orig 2022-02-28 16:54:41 UTC +--- ui/base/clipboard/clipboard_constants.h.orig 2022-03-25 21:59:56 UTC +++ ui/base/clipboard/clipboard_constants.h -@@ -44,7 +44,7 @@ extern const char kMimeTypeDataTransferEndpoint[]; +@@ -46,7 +46,7 @@ extern const char kMimeTypeDataTransferEndpoint[]; #endif // BUILDFLAG(IS_CHROMEOS) // Linux-specific MIME type constants (also used in Fuchsia). diff --git a/www/chromium/files/patch-ui_base_cursor_cursor__factory.cc b/www/chromium/files/patch-ui_base_cursor_cursor__factory.cc index e48df94619cc..824b8a5f5ed7 100644 --- a/www/chromium/files/patch-ui_base_cursor_cursor__factory.cc +++ b/www/chromium/files/patch-ui_base_cursor_cursor__factory.cc @@ -1,6 +1,6 @@ ---- ui/base/cursor/cursor_factory.cc.orig 2022-02-28 16:54:41 UTC +--- ui/base/cursor/cursor_factory.cc.orig 2022-03-25 21:59:56 UTC +++ ui/base/cursor/cursor_factory.cc -@@ -81,7 +81,7 @@ void CursorFactory::ObserveThemeChanges() { +@@ -82,7 +82,7 @@ void CursorFactory::ObserveThemeChanges() { void CursorFactory::SetDeviceScaleFactor(float scale) {} diff --git a/www/chromium/files/patch-ui_base_resource_resource__bundle.cc b/www/chromium/files/patch-ui_base_resource_resource__bundle.cc index 447e9146bc22..35186dec9b77 100644 --- a/www/chromium/files/patch-ui_base_resource_resource__bundle.cc +++ b/www/chromium/files/patch-ui_base_resource_resource__bundle.cc @@ -1,6 +1,6 @@ ---- ui/base/resource/resource_bundle.cc.orig 2022-02-28 16:54:41 UTC +--- ui/base/resource/resource_bundle.cc.orig 2022-03-25 21:59:56 UTC +++ ui/base/resource/resource_bundle.cc -@@ -849,7 +849,7 @@ void ResourceBundle::ReloadFonts() { +@@ -878,7 +878,7 @@ void ResourceBundle::ReloadFonts() { } ResourceScaleFactor ResourceBundle::GetMaxResourceScaleFactor() const { diff --git a/www/chromium/files/patch-ui_base_ui__base__features.cc b/www/chromium/files/patch-ui_base_ui__base__features.cc index 3cdc6ea01e23..e07dff21e794 100644 --- a/www/chromium/files/patch-ui_base_ui__base__features.cc +++ b/www/chromium/files/patch-ui_base_ui__base__features.cc @@ -1,6 +1,6 @@ ---- ui/base/ui_base_features.cc.orig 2022-02-28 16:54:41 UTC +--- ui/base/ui_base_features.cc.orig 2022-03-25 21:59:56 UTC +++ ui/base/ui_base_features.cc -@@ -148,7 +148,7 @@ const base::Feature kExperimentalFlingAnimation { +@@ -159,7 +159,7 @@ const base::Feature kExperimentalFlingAnimation { // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ @@ -9,7 +9,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -244,7 +244,7 @@ bool IsForcedColorsEnabled() { +@@ -255,7 +255,7 @@ bool IsForcedColorsEnabled() { // milestones. const base::Feature kEyeDropper { "EyeDropper", diff --git a/www/chromium/files/patch-ui_color_color__id.h b/www/chromium/files/patch-ui_color_color__id.h new file mode 100644 index 000000000000..b13abb392c69 --- /dev/null +++ b/www/chromium/files/patch-ui_color_color__id.h @@ -0,0 +1,11 @@ +--- ui/color/color_id.h.orig 2022-03-25 21:59:56 UTC ++++ ui/color/color_id.h +@@ -191,7 +191,7 @@ + E_CPONLY(kColorNativeColor6) \ + E_CPONLY(kColorNativeBaseColor) \ + E_CPONLY(kColorNativeSecondaryColor) +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #define PLATFORM_SPECIFIC_COLOR_IDS \ + E_CPONLY(kColorNativeButtonBackground) \ + E_CPONLY(kColorNativeButtonBackgroundDisabled) \ diff --git a/www/chromium/files/patch-ui_color_native__color__mixers.cc b/www/chromium/files/patch-ui_color_native__color__mixers.cc new file mode 100644 index 000000000000..89e008f860f4 --- /dev/null +++ b/www/chromium/files/patch-ui_color_native__color__mixers.cc @@ -0,0 +1,17 @@ +--- ui/color/native_color_mixers.cc.orig 2022-03-25 21:59:56 UTC ++++ ui/color/native_color_mixers.cc +@@ -10,12 +10,12 @@ + namespace ui { + + #if !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_MAC) && \ +- !BUILDFLAG(IS_WIN) ++ !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_BSD) + void AddNativeCoreColorMixer(ColorProvider* provider, + const ColorProviderManager::Key& key) {} + #endif + +-#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_WIN) ++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_BSD) + void AddNativeUiColorMixer(ColorProvider* provider, + const ColorProviderManager::Key& key) {} + #endif diff --git a/www/chromium/files/patch-ui_compositor_compositor.cc b/www/chromium/files/patch-ui_compositor_compositor.cc index dec86bbe8a09..e690af53929c 100644 --- a/www/chromium/files/patch-ui_compositor_compositor.cc +++ b/www/chromium/files/patch-ui_compositor_compositor.cc @@ -1,6 +1,6 @@ ---- ui/compositor/compositor.cc.orig 2022-02-28 16:54:41 UTC +--- ui/compositor/compositor.cc.orig 2022-03-25 21:59:56 UTC +++ ui/compositor/compositor.cc -@@ -839,7 +839,7 @@ void Compositor::OnResume() { +@@ -860,7 +860,7 @@ void Compositor::OnResume() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-ui_compositor_compositor.h b/www/chromium/files/patch-ui_compositor_compositor.h index 95e89938a1aa..01d80e8fcb0a 100644 --- a/www/chromium/files/patch-ui_compositor_compositor.h +++ b/www/chromium/files/patch-ui_compositor_compositor.h @@ -1,6 +1,6 @@ ---- ui/compositor/compositor.h.orig 2022-02-28 16:54:41 UTC +--- ui/compositor/compositor.h.orig 2022-03-25 21:59:56 UTC +++ ui/compositor/compositor.h -@@ -388,7 +388,7 @@ class COMPOSITOR_EXPORT Compositor : public base::Powe +@@ -402,7 +402,7 @@ class COMPOSITOR_EXPORT Compositor : public base::Powe // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-ui_events_event.cc b/www/chromium/files/patch-ui_events_event.cc index 864c93821158..4c588c77b542 100644 --- a/www/chromium/files/patch-ui_events_event.cc +++ b/www/chromium/files/patch-ui_events_event.cc @@ -1,6 +1,6 @@ ---- ui/events/event.cc.orig 2022-02-28 16:54:41 UTC +--- ui/events/event.cc.orig 2022-03-25 21:59:56 UTC +++ ui/events/event.cc -@@ -452,7 +452,7 @@ std::string LocatedEvent::ToString() const { +@@ -453,7 +453,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)) { -@@ -934,7 +934,7 @@ void KeyEvent::InitializeNative() { +@@ -935,7 +935,7 @@ void KeyEvent::InitializeNative() { if (synthesize_key_repeat_enabled_ && IsRepeated(GetLastKeyEvent())) set_flags(flags() | EF_IS_REPEAT); diff --git a/www/chromium/files/patch-ui_gfx_BUILD.gn b/www/chromium/files/patch-ui_gfx_BUILD.gn index 57c0f7b02148..e5fcc3cbf988 100644 --- a/www/chromium/files/patch-ui_gfx_BUILD.gn +++ b/www/chromium/files/patch-ui_gfx_BUILD.gn @@ -1,6 +1,6 @@ ---- ui/gfx/BUILD.gn.orig 2022-02-28 16:54:41 UTC +--- ui/gfx/BUILD.gn.orig 2022-03-25 21:59:56 UTC +++ ui/gfx/BUILD.gn -@@ -584,7 +584,7 @@ source_set("memory_buffer_sources") { +@@ -583,7 +583,7 @@ source_set("memory_buffer_sources") { deps += [ "//build/config/linux/libdrm" ] } diff --git a/www/chromium/files/patch-ui_gfx_font__fallback__linux.cc b/www/chromium/files/patch-ui_gfx_font__fallback__linux.cc index f436545d841e..517205abf2d5 100644 --- a/www/chromium/files/patch-ui_gfx_font__fallback__linux.cc +++ b/www/chromium/files/patch-ui_gfx_font__fallback__linux.cc @@ -1,6 +1,6 @@ ---- ui/gfx/font_fallback_linux.cc.orig 2022-02-07 13:39:41 UTC +--- ui/gfx/font_fallback_linux.cc.orig 2022-03-25 21:59:56 UTC +++ ui/gfx/font_fallback_linux.cc -@@ -24,6 +24,8 @@ +@@ -25,6 +25,8 @@ #include "ui/gfx/linux/fontconfig_util.h" #include "ui/gfx/platform_font.h" diff --git a/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h b/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h index e2762451c4e0..2d4b542ed95d 100644 --- a/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h +++ b/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h @@ -1,4 +1,4 @@ ---- ui/gfx/gpu_memory_buffer.h.orig 2022-02-28 16:54:41 UTC +--- ui/gfx/gpu_memory_buffer.h.orig 2022-03-25 21:59:56 UTC +++ ui/gfx/gpu_memory_buffer.h @@ -16,7 +16,7 @@ #include "ui/gfx/gfx_export.h" @@ -9,7 +9,7 @@ #include "ui/gfx/native_pixmap_handle.h" #elif BUILDFLAG(IS_MAC) #include "ui/gfx/mac/io_surface.h" -@@ -76,7 +76,7 @@ struct GFX_EXPORT GpuMemoryBufferHandle { +@@ -78,7 +78,7 @@ struct GFX_EXPORT GpuMemoryBufferHandle { base::UnsafeSharedMemoryRegion region; uint32_t offset = 0; int32_t stride = 0; diff --git a/www/chromium/files/patch-ui_gl_gl__context.cc b/www/chromium/files/patch-ui_gl_gl__context.cc index b77cfee35772..cac247cc19ed 100644 --- a/www/chromium/files/patch-ui_gl_gl__context.cc +++ b/www/chromium/files/patch-ui_gl_gl__context.cc @@ -1,6 +1,6 @@ ---- ui/gl/gl_context.cc.orig 2022-03-19 12:56:15 UTC +--- ui/gl/gl_context.cc.orig 2022-03-25 21:59:56 UTC +++ ui/gl/gl_context.cc -@@ -414,7 +414,7 @@ bool GLContext::MakeVirtuallyCurrent( +@@ -416,7 +416,7 @@ bool GLContext::MakeVirtuallyCurrent( DCHECK(virtual_context->IsCurrent(surface)); if (switched_real_contexts || virtual_context != current_virtual_context_) { diff --git a/www/chromium/files/patch-ui_gl_gl__features.cc b/www/chromium/files/patch-ui_gl_gl__features.cc index 9a3e22f8834d..1f137618db95 100644 --- a/www/chromium/files/patch-ui_gl_gl__features.cc +++ b/www/chromium/files/patch-ui_gl_gl__features.cc @@ -1,11 +1,11 @@ ---- ui/gl/gl_features.cc.orig 2022-02-28 16:54:41 UTC +--- ui/gl/gl_features.cc.orig 2022-03-25 21:59:56 UTC +++ ui/gl/gl_features.cc -@@ -72,7 +72,7 @@ bool IsDeviceBlocked(const char* field, const std::str +@@ -76,7 +76,7 @@ bool IsDeviceBlocked(const char* field, const std::str const base::Feature kDefaultPassthroughCommandDecoder { "DefaultPassthroughCommandDecoder", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || \ - ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ + ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) && \ - !defined(CHROMECAST_BUILD)) + !defined(CHROMECAST_BUILD)) || \ + BUILDFLAG(IS_MAC) base::FEATURE_ENABLED_BY_DEFAULT - #else diff --git a/www/chromium/files/patch-ui_gl_gl__implementation.cc b/www/chromium/files/patch-ui_gl_gl__implementation.cc new file mode 100644 index 000000000000..82e9a5d1322e --- /dev/null +++ b/www/chromium/files/patch-ui_gl_gl__implementation.cc @@ -0,0 +1,11 @@ +--- ui/gl/gl_implementation.cc.orig 2022-03-25 21:59:56 UTC ++++ ui/gl/gl_implementation.cc +@@ -294,7 +294,7 @@ GLImplementationParts GetSoftwareGLImplementation() { + + GLImplementationParts GetSoftwareGLImplementationForPlatform() { + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + return GetSoftwareGLImplementation(); + #else + return GetLegacySoftwareGLImplementation(); diff --git a/www/chromium/files/patch-ui_gl_init_gl__factory.cc b/www/chromium/files/patch-ui_gl_init_gl__factory.cc deleted file mode 100644 index 168c103f8381..000000000000 --- a/www/chromium/files/patch-ui_gl_init_gl__factory.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- ui/gl/init/gl_factory.cc.orig 2022-02-28 16:54:41 UTC -+++ ui/gl/init/gl_factory.cc -@@ -171,7 +171,7 @@ bool InitializeGLOneOffPlatformHelper(bool init_extens - } // namespace - - GLImplementationParts GetSoftwareGLImplementationForPlatform() { --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - return GetSoftwareGLImplementation(); - #else - return GetLegacySoftwareGLImplementation(); diff --git a/www/chromium/files/patch-ui_native__theme_native__theme.h b/www/chromium/files/patch-ui_native__theme_native__theme.h index 9a601d501c05..45777fb7c008 100644 --- a/www/chromium/files/patch-ui_native__theme_native__theme.h +++ b/www/chromium/files/patch-ui_native__theme_native__theme.h @@ -1,6 +1,6 @@ ---- ui/native_theme/native_theme.h.orig 2022-02-28 16:54:41 UTC +--- ui/native_theme/native_theme.h.orig 2022-03-25 21:59:56 UTC +++ ui/native_theme/native_theme.h -@@ -57,7 +57,7 @@ class NATIVE_THEME_EXPORT NativeTheme { +@@ -59,7 +59,7 @@ class NATIVE_THEME_EXPORT NativeTheme { kCheckbox, // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-ui_ozone_platform_wayland_gpu_vulkan__implementation__wayland.cc b/www/chromium/files/patch-ui_ozone_platform_wayland_gpu_vulkan__implementation__wayland.cc new file mode 100644 index 000000000000..b238570624d8 --- /dev/null +++ b/www/chromium/files/patch-ui_ozone_platform_wayland_gpu_vulkan__implementation__wayland.cc @@ -0,0 +1,14 @@ +--- ui/ozone/platform/wayland/gpu/vulkan_implementation_wayland.cc.orig 2022-03-25 21:59:56 UTC ++++ ui/ozone/platform/wayland/gpu/vulkan_implementation_wayland.cc +@@ -38,7 +38,11 @@ bool VulkanImplementationWayland::InitializeVulkanInst + + path = path.Append("libvk_swiftshader.so"); + } else { ++#if BUILDFLAG(IS_BSD) ++ path = base::FilePath("libvulkan.so"); ++#else + path = base::FilePath("libvulkan.so.1"); ++#endif + } + + return vulkan_instance_.Initialize(path, required_extensions, {}); diff --git a/www/chromium/files/patch-ui_ozone_platform_x11_vulkan__implementation__x11.cc b/www/chromium/files/patch-ui_ozone_platform_x11_vulkan__implementation__x11.cc new file mode 100644 index 000000000000..ab67e875d327 --- /dev/null +++ b/www/chromium/files/patch-ui_ozone_platform_x11_vulkan__implementation__x11.cc @@ -0,0 +1,14 @@ +--- ui/ozone/platform/x11/vulkan_implementation_x11.cc.orig 2022-03-25 21:59:56 UTC ++++ ui/ozone/platform/x11/vulkan_implementation_x11.cc +@@ -58,7 +58,11 @@ bool VulkanImplementationX11::InitializeVulkanInstance + + path = path.Append("libvk_swiftshader.so"); + } else { ++#if BUILDFLAG(IS_BSD) ++ path = base::FilePath("libvulkan.so"); ++#else + path = base::FilePath("libvulkan.so.1"); ++#endif + } + + return vulkan_instance_.Initialize(path, required_extensions, {}); diff --git a/www/chromium/files/patch-ui_platform__window_platform__window__init__properties.h b/www/chromium/files/patch-ui_platform__window_platform__window__init__properties.h index 0176530403dc..cdd81253a07c 100644 --- a/www/chromium/files/patch-ui_platform__window_platform__window__init__properties.h +++ b/www/chromium/files/patch-ui_platform__window_platform__window__init__properties.h @@ -1,20 +1,20 @@ ---- ui/platform_window/platform_window_init_properties.h.orig 2022-02-07 13:39:41 UTC +--- ui/platform_window/platform_window_init_properties.h.orig 2022-03-25 21:59:56 UTC +++ ui/platform_window/platform_window_init_properties.h -@@ -53,7 +53,7 @@ class WorkspaceExtensionDelegate; +@@ -54,7 +54,7 @@ class WorkspaceExtensionDelegate; class ScenicWindowDelegate; #endif --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) class X11ExtensionDelegate; #endif -@@ -112,7 +112,7 @@ struct COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindo +@@ -116,7 +116,7 @@ struct COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindo PlatformWindowShadowType shadow_type = PlatformWindowShadowType::kDefault; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) bool prefer_dark_theme = false; gfx::ImageSkia* icon = nullptr; absl::optional<int> background_color; diff --git a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc index db36bbb89acd..7b7eb8a2a0ef 100644 --- a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc +++ b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc @@ -1,4 +1,4 @@ ---- ui/views/controls/textfield/textfield.cc.orig 2022-02-28 16:54:41 UTC +--- ui/views/controls/textfield/textfield.cc.orig 2022-03-25 21:59:56 UTC +++ ui/views/controls/textfield/textfield.cc @@ -73,7 +73,7 @@ @@ -18,7 +18,7 @@ return flags & ui::EF_CONTROL_DOWN; #else return false; -@@ -713,7 +713,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event +@@ -715,7 +715,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -27,7 +27,7 @@ ui::TextEditKeyBindingsDelegateAuraLinux* delegate = ui::GetTextEditKeyBindingsDelegate(); std::vector<ui::TextEditCommandAuraLinux> commands; -@@ -859,7 +859,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo +@@ -861,7 +861,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -36,7 +36,7 @@ // Skip any accelerator handling that conflicts with custom keybindings. ui::TextEditKeyBindingsDelegateAuraLinux* delegate = ui::GetTextEditKeyBindingsDelegate(); -@@ -1722,7 +1722,7 @@ bool Textfield::ShouldDoLearning() { +@@ -1721,7 +1721,7 @@ bool Textfield::ShouldDoLearning() { return false; } @@ -45,7 +45,7 @@ // TODO(https://crbug.com/952355): Implement this method to support Korean IME // reconversion feature on native text fields (e.g. find bar). bool Textfield::SetCompositionFromExistingText( -@@ -2221,14 +2221,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( +@@ -2220,14 +2220,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( #endif return ui::TextEditCommand::DELETE_BACKWARD; } diff --git a/www/chromium/files/patch-ui_views_controls_textfield_textfield.h b/www/chromium/files/patch-ui_views_controls_textfield_textfield.h index cc6139e939ef..b1d4bb997fc4 100644 --- a/www/chromium/files/patch-ui_views_controls_textfield_textfield.h +++ b/www/chromium/files/patch-ui_views_controls_textfield_textfield.h @@ -1,6 +1,6 @@ ---- ui/views/controls/textfield/textfield.h.orig 2022-02-28 16:54:41 UTC +--- ui/views/controls/textfield/textfield.h.orig 2022-03-25 21:59:56 UTC +++ ui/views/controls/textfield/textfield.h -@@ -445,7 +445,7 @@ class VIEWS_EXPORT Textfield : public View, +@@ -443,7 +443,7 @@ class VIEWS_EXPORT Textfield : public View, // Set whether the text should be used to improve typing suggestions. void SetShouldDoLearning(bool value) { should_do_learning_ = value; } diff --git a/www/chromium/files/patch-ui_views_linux__ui_linux__ui.cc b/www/chromium/files/patch-ui_views_linux__ui_linux__ui.cc new file mode 100644 index 000000000000..86800bb0a12d --- /dev/null +++ b/www/chromium/files/patch-ui_views_linux__ui_linux__ui.cc @@ -0,0 +1,11 @@ +--- ui/views/linux_ui/linux_ui.cc.orig 2022-03-25 21:59:56 UTC ++++ ui/views/linux_ui/linux_ui.cc +@@ -21,7 +21,7 @@ void LinuxUI::SetInstance(std::unique_ptr<LinuxUI> ins + g_linux_ui = instance.release(); + + SkiaFontDelegate::SetInstance(g_linux_ui); +-#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMECAST) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMECAST) + ShellDialogLinux::SetInstance(g_linux_ui); + #endif + ui::SetTextEditKeyBindingsDelegate(g_linux_ui); diff --git a/www/chromium/files/patch-ui_views_linux__ui_linux__ui.h b/www/chromium/files/patch-ui_views_linux__ui_linux__ui.h new file mode 100644 index 000000000000..aa233791b9a8 --- /dev/null +++ b/www/chromium/files/patch-ui_views_linux__ui_linux__ui.h @@ -0,0 +1,20 @@ +--- ui/views/linux_ui/linux_ui.h.orig 2022-03-25 21:59:56 UTC ++++ ui/views/linux_ui/linux_ui.h +@@ -21,7 +21,7 @@ + #include "ui/views/controls/button/button.h" + #include "ui/views/views_export.h" + +-#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMECAST) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMECAST) + #include "ui/shell_dialogs/shell_dialog_linux.h" + #endif + +@@ -57,7 +57,7 @@ class WindowFrameProvider; + // project that wants to do linux desktop native rendering. + class VIEWS_EXPORT LinuxUI : public ui::LinuxInputMethodContextFactory, + public gfx::SkiaFontDelegate, +-#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMECAST) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMECAST) + public ui::ShellDialogLinux, + #endif + public ui::TextEditKeyBindingsDelegateAuraLinux, diff --git a/www/chromium/files/patch-ui_views_widget_widget.cc b/www/chromium/files/patch-ui_views_widget_widget.cc index b03b0b1a7d23..721bb2c80b08 100644 --- a/www/chromium/files/patch-ui_views_widget_widget.cc +++ b/www/chromium/files/patch-ui_views_widget_widget.cc @@ -1,6 +1,6 @@ ---- ui/views/widget/widget.cc.orig 2022-02-28 16:54:41 UTC +--- ui/views/widget/widget.cc.orig 2022-03-25 21:59:56 UTC +++ ui/views/widget/widget.cc -@@ -51,7 +51,7 @@ +@@ -48,7 +48,7 @@ #include "ui/views/window/custom_frame_view.h" #include "ui/views/window/dialog_delegate.h" @@ -9,8 +9,8 @@ #include "ui/views/linux_ui/linux_ui.h" #endif -@@ -1785,7 +1785,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const - parent_) +@@ -1791,7 +1791,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const + if (parent_) return parent_->GetNativeTheme(); -#if BUILDFLAG(IS_LINUX) diff --git a/www/chromium/files/patch-v8_BUILD.gn b/www/chromium/files/patch-v8_BUILD.gn index 35a4f184c936..85681223e9ea 100644 --- a/www/chromium/files/patch-v8_BUILD.gn +++ b/www/chromium/files/patch-v8_BUILD.gn @@ -1,6 +1,6 @@ ---- v8/BUILD.gn.orig 2022-02-28 16:54:41 UTC +--- v8/BUILD.gn.orig 2022-03-25 21:59:56 UTC +++ v8/BUILD.gn -@@ -1198,6 +1198,14 @@ config("toolchain") { +@@ -1217,6 +1217,14 @@ config("toolchain") { } else if (target_os == "win") { defines += [ "V8_HAVE_TARGET_OS" ] defines += [ "V8_TARGET_OS_WIN" ] @@ -14,8 +14,8 @@ + defines += [ "V8_TARGET_OS_BSD" ] } - # TODO(jochen): Support v8_enable_prof on Windows. -@@ -5117,7 +5125,7 @@ v8_component("v8_libbase") { + # TODO(infra): Support v8_enable_prof on Windows. +@@ -5156,7 +5164,7 @@ v8_component("v8_libbase") { } } @@ -24,7 +24,7 @@ sources += [ "src/base/debug/stack_trace_posix.cc", "src/base/platform/platform-linux.cc", -@@ -5127,6 +5135,18 @@ v8_component("v8_libbase") { +@@ -5166,6 +5174,18 @@ v8_component("v8_libbase") { "dl", "rt", ] diff --git a/www/chromium/files/patch-v8_src_api_api.cc b/www/chromium/files/patch-v8_src_api_api.cc index 28645cdb88d1..4aadc480cd31 100644 --- a/www/chromium/files/patch-v8_src_api_api.cc +++ b/www/chromium/files/patch-v8_src_api_api.cc @@ -1,6 +1,6 @@ ---- v8/src/api/api.cc.orig 2022-02-28 16:54:41 UTC +--- v8/src/api/api.cc.orig 2022-03-25 21:59:56 UTC +++ v8/src/api/api.cc -@@ -140,7 +140,7 @@ +@@ -139,7 +139,7 @@ #include "src/wasm/wasm-serialization.h" #endif // V8_ENABLE_WEBASSEMBLY @@ -9,7 +9,7 @@ #include <signal.h> #include "include/v8-wasm-trap-handler-posix.h" #include "src/trap-handler/handler-inside-posix.h" -@@ -6155,7 +6155,7 @@ bool v8::V8::Initialize(const int build_config) { +@@ -6060,7 +6060,7 @@ bool v8::V8::Initialize(const int build_config) { return true; } diff --git a/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc b/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc index 3c6b60703e50..a3f4ed349b58 100644 --- a/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc +++ b/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc @@ -1,4 +1,4 @@ ---- v8/src/base/platform/platform-posix.cc.orig 2022-02-28 16:54:41 UTC +--- v8/src/base/platform/platform-posix.cc.orig 2022-03-25 21:59:56 UTC +++ v8/src/base/platform/platform-posix.cc @@ -65,7 +65,7 @@ #include <sys/syscall.h> @@ -9,7 +9,7 @@ #define MAP_ANONYMOUS MAP_ANON #endif -@@ -285,8 +285,15 @@ void OS::SetRandomMmapSeed(int64_t seed) { +@@ -291,8 +291,15 @@ void OS::SetRandomMmapSeed(int64_t seed) { } } @@ -25,7 +25,7 @@ uintptr_t raw_addr; { MutexGuard guard(rng_mutex.Pointer()); -@@ -377,6 +384,7 @@ void* OS::GetRandomMmapAddr() { +@@ -383,6 +390,7 @@ void* OS::GetRandomMmapAddr() { #endif return reinterpret_cast<void*>(raw_addr); } @@ -33,7 +33,7 @@ // TODO(bbudge) Move Cygwin and Fuchsia stuff into platform-specific files. #if !V8_OS_CYGWIN && !V8_OS_FUCHSIA -@@ -545,7 +553,7 @@ bool OS::FreeAddressSpaceReservation(AddressSpaceReser +@@ -598,7 +606,7 @@ void OS::DestroySharedMemoryHandle(PlatformSharedMemor // static bool OS::HasLazyCommits() { @@ -42,7 +42,7 @@ return true; #else // TODO(bbudge) Return true for all POSIX platforms. -@@ -1138,7 +1146,7 @@ void Thread::SetThreadLocal(LocalStorageKey key, void* +@@ -1217,7 +1225,7 @@ void Thread::SetThreadLocal(LocalStorageKey key, void* // keep this version in POSIX as most Linux-compatible derivatives will // support it. MacOS and FreeBSD are different here. #if !defined(V8_OS_FREEBSD) && !defined(V8_OS_MACOSX) && !defined(_AIX) && \ diff --git a/www/chromium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32.h b/www/chromium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32.h index fd178c8c2f4d..961bf0596d1f 100644 --- a/www/chromium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32.h +++ b/www/chromium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32.h @@ -1,6 +1,6 @@ ---- v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h.orig 2022-02-07 13:39:41 UTC +--- v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h.orig 2022-03-25 21:59:56 UTC +++ v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h -@@ -433,7 +433,7 @@ void LiftoffAssembler::StoreTaggedPointer(Register dst +@@ -434,7 +434,7 @@ void LiftoffAssembler::StoreTaggedPointer(Register dst } void LiftoffAssembler::Load(LiftoffRegister dst, Register src_addr, @@ -9,7 +9,7 @@ LoadType type, LiftoffRegList pinned, uint32_t* protected_load_pc, bool is_load_mem, bool i64_offset) { -@@ -510,7 +510,7 @@ void LiftoffAssembler::Load(LiftoffRegister dst, Regis +@@ -511,7 +511,7 @@ void LiftoffAssembler::Load(LiftoffRegister dst, Regis } void LiftoffAssembler::Store(Register dst_addr, Register offset_reg, @@ -18,7 +18,7 @@ StoreType type, LiftoffRegList pinned, uint32_t* protected_store_pc, bool is_store_mem) { DCHECK_EQ(type.value_type() == kWasmI64, src.is_gp_pair()); -@@ -578,7 +578,7 @@ void LiftoffAssembler::Store(Register dst_addr, Regist +@@ -579,7 +579,7 @@ void LiftoffAssembler::Store(Register dst_addr, Regist } void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, Register src_addr, @@ -27,7 +27,7 @@ LoadType type, LiftoffRegList pinned) { if (type.value() != LoadType::kI64Load) { Load(dst, src_addr, offset_reg, offset_imm, type, pinned, nullptr, true); -@@ -597,7 +597,7 @@ void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, +@@ -598,7 +598,7 @@ void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, } void LiftoffAssembler::AtomicStore(Register dst_addr, Register offset_reg, @@ -36,7 +36,7 @@ StoreType type, LiftoffRegList pinned) { DCHECK_NE(offset_reg, no_reg); DCHECK_LE(offset_imm, std::numeric_limits<int32_t>::max()); -@@ -939,7 +939,7 @@ inline void AtomicBinop64(LiftoffAssembler* lasm, Bino +@@ -940,7 +940,7 @@ inline void AtomicBinop64(LiftoffAssembler* lasm, Bino } // namespace liftoff void LiftoffAssembler::AtomicAdd(Register dst_addr, Register offset_reg, @@ -45,7 +45,7 @@ LiftoffRegister result, StoreType type) { if (type.value() == StoreType::kI64Store) { liftoff::AtomicBinop64(this, liftoff::kAdd, dst_addr, offset_reg, -@@ -952,7 +952,7 @@ void LiftoffAssembler::AtomicAdd(Register dst_addr, Re +@@ -953,7 +953,7 @@ void LiftoffAssembler::AtomicAdd(Register dst_addr, Re } void LiftoffAssembler::AtomicSub(Register dst_addr, Register offset_reg, @@ -54,7 +54,7 @@ LiftoffRegister result, StoreType type) { if (type.value() == StoreType::kI64Store) { liftoff::AtomicBinop64(this, liftoff::kSub, dst_addr, offset_reg, -@@ -964,7 +964,7 @@ void LiftoffAssembler::AtomicSub(Register dst_addr, Re +@@ -965,7 +965,7 @@ void LiftoffAssembler::AtomicSub(Register dst_addr, Re } void LiftoffAssembler::AtomicAnd(Register dst_addr, Register offset_reg, @@ -63,7 +63,7 @@ LiftoffRegister result, StoreType type) { if (type.value() == StoreType::kI64Store) { liftoff::AtomicBinop64(this, liftoff::kAnd, dst_addr, offset_reg, -@@ -977,7 +977,7 @@ void LiftoffAssembler::AtomicAnd(Register dst_addr, Re +@@ -978,7 +978,7 @@ void LiftoffAssembler::AtomicAnd(Register dst_addr, Re } void LiftoffAssembler::AtomicOr(Register dst_addr, Register offset_reg, @@ -72,7 +72,7 @@ LiftoffRegister result, StoreType type) { if (type.value() == StoreType::kI64Store) { liftoff::AtomicBinop64(this, liftoff::kOr, dst_addr, offset_reg, offset_imm, -@@ -990,7 +990,7 @@ void LiftoffAssembler::AtomicOr(Register dst_addr, Reg +@@ -991,7 +991,7 @@ void LiftoffAssembler::AtomicOr(Register dst_addr, Reg } void LiftoffAssembler::AtomicXor(Register dst_addr, Register offset_reg, @@ -81,7 +81,7 @@ LiftoffRegister result, StoreType type) { if (type.value() == StoreType::kI64Store) { liftoff::AtomicBinop64(this, liftoff::kXor, dst_addr, offset_reg, -@@ -1003,7 +1003,7 @@ void LiftoffAssembler::AtomicXor(Register dst_addr, Re +@@ -1004,7 +1004,7 @@ void LiftoffAssembler::AtomicXor(Register dst_addr, Re } void LiftoffAssembler::AtomicExchange(Register dst_addr, Register offset_reg, @@ -90,7 +90,7 @@ LiftoffRegister value, LiftoffRegister result, StoreType type) { if (type.value() == StoreType::kI64Store) { -@@ -1017,7 +1017,7 @@ void LiftoffAssembler::AtomicExchange(Register dst_add +@@ -1018,7 +1018,7 @@ void LiftoffAssembler::AtomicExchange(Register dst_add } void LiftoffAssembler::AtomicCompareExchange( diff --git a/www/chromium/files/patch-weblayer_browser_browser__main__parts__impl.cc b/www/chromium/files/patch-weblayer_browser_browser__main__parts__impl.cc index 4779b4ac8a15..29b4e399f51b 100644 --- a/www/chromium/files/patch-weblayer_browser_browser__main__parts__impl.cc +++ b/www/chromium/files/patch-weblayer_browser_browser__main__parts__impl.cc @@ -1,20 +1,20 @@ ---- weblayer/browser/browser_main_parts_impl.cc.orig 2021-12-14 11:45:40 UTC +--- weblayer/browser/browser_main_parts_impl.cc.orig 2022-03-25 21:59:56 UTC +++ weblayer/browser/browser_main_parts_impl.cc -@@ -77,7 +77,7 @@ +@@ -78,7 +78,7 @@ // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. --#if defined(USE_AURA) && (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+#if defined(USE_AURA) && (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) +-#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) #include "ui/base/ime/init/input_method_initializer.h" #endif -@@ -195,7 +195,7 @@ int BrowserMainPartsImpl::PreEarlyInitialization() { +@@ -196,7 +196,7 @@ int BrowserMainPartsImpl::PreEarlyInitialization() { // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. --#if defined(USE_AURA) && (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+#if defined(USE_AURA) && (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) +-#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) ui::InitializeInputMethodForTesting(); #endif - #if defined(OS_ANDROID) + #if BUILDFLAG(IS_ANDROID) diff --git a/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.cc b/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.cc index 0118f611e1e2..36ab2cdb6c94 100644 --- a/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.cc +++ b/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.cc @@ -1,20 +1,20 @@ ---- weblayer/browser/content_browser_client_impl.cc.orig 2022-02-28 16:54:41 UTC +--- weblayer/browser/content_browser_client_impl.cc.orig 2022-03-25 21:59:56 UTC +++ weblayer/browser/content_browser_client_impl.cc -@@ -152,7 +152,7 @@ - +@@ -153,7 +153,7 @@ // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_ANDROID) || defined(OS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ +- BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) #include "content/public/common/content_descriptors.h" #endif -@@ -994,7 +994,7 @@ SafeBrowsingService* ContentBrowserClientImpl::GetSafe - +@@ -1000,7 +1000,7 @@ SafeBrowsingService* ContentBrowserClientImpl::GetSafe // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_ANDROID) || defined(OS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ +- BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) void ContentBrowserClientImpl::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, diff --git a/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.h b/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.h index 194921f755f3..08299a0ffaea 100644 --- a/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.h +++ b/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.h @@ -1,11 +1,11 @@ ---- weblayer/browser/content_browser_client_impl.h.orig 2022-02-28 16:54:41 UTC +--- weblayer/browser/content_browser_client_impl.h.orig 2022-03-25 21:59:56 UTC +++ weblayer/browser/content_browser_client_impl.h -@@ -177,7 +177,7 @@ class ContentBrowserClientImpl : public content::Conte - override; +@@ -179,7 +179,7 @@ class ContentBrowserClientImpl : public content::Conte // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_ANDROID) || defined(OS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ +- BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) void GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, diff --git a/www/chromium/files/patch-weblayer_browser_system__network__context__manager.cc b/www/chromium/files/patch-weblayer_browser_system__network__context__manager.cc index b7e010126799..7c1a12d7c5e1 100644 --- a/www/chromium/files/patch-weblayer_browser_system__network__context__manager.cc +++ b/www/chromium/files/patch-weblayer_browser_system__network__context__manager.cc @@ -1,11 +1,11 @@ ---- weblayer/browser/system_network_context_manager.cc.orig 2022-02-07 13:39:41 UTC +--- weblayer/browser/system_network_context_manager.cc.orig 2022-03-25 21:59:56 UTC +++ weblayer/browser/system_network_context_manager.cc @@ -69,7 +69,7 @@ void SystemNetworkContextManager::ConfigureDefaultNetw network_context_params->user_agent = user_agent; // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_WIN) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_WIN) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) // We're not configuring the cookie encryption on these platforms yet. network_context_params->enable_encrypted_cookies = false; - #endif // (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || + #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || diff --git a/www/chromium/files/patch-weblayer_common_weblayer__paths.cc b/www/chromium/files/patch-weblayer_common_weblayer__paths.cc index 436cecfa6384..ba512c1227d7 100644 --- a/www/chromium/files/patch-weblayer_common_weblayer__paths.cc +++ b/www/chromium/files/patch-weblayer_common_weblayer__paths.cc @@ -1,11 +1,11 @@ ---- weblayer/common/weblayer_paths.cc.orig 2021-04-14 18:41:39 UTC +--- weblayer/common/weblayer_paths.cc.orig 2022-03-25 21:59:56 UTC +++ weblayer/common/weblayer_paths.cc @@ -18,7 +18,7 @@ - #if defined(OS_WIN) + #if BUILDFLAG(IS_WIN) #include "base/base_paths_win.h" --#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) #include "base/nix/xdg_util.h" #endif @@ -13,8 +13,8 @@ return false; *result = result->AppendASCII("weblayer"); return true; --#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) std::unique_ptr<base::Environment> env(base::Environment::Create()); base::FilePath config_dir(base::nix::GetXDGDirectory( env.get(), base::nix::kXdgConfigHomeEnvVar, base::nix::kDotConfigDir)); diff --git a/www/chromium/pkg-plist b/www/chromium/pkg-plist index 2aa267c1c49c..807e4d307a36 100644 --- a/www/chromium/pkg-plist +++ b/www/chromium/pkg-plist @@ -3,7 +3,8 @@ bin/chrome %%DATADIR%%/chrome-wrapper %%DATADIR%%/chrome_100_percent.pak %%DATADIR%%/chrome_200_percent.pak -%%DATADIR%%/headless_lib.pak +%%DATADIR%%/headless_lib_data.pak +%%DATADIR%%/headless_lib_strings.pak %%DATADIR%%/icudtl.dat %%DATADIR%%/libEGL.so %%DATADIR%%/libGLESv2.so |