kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

www/chromium: update to 97.0.4692.99

Browse source 
Note that the port is currently broken on i386 as it does not compile there.
Security:	https://vuxml.freebsd.org/freebsd/51496cbc-7a0e-11ec-a323-3065ec8fd3ec.html
Security:	https://vuxml.freebsd.org/freebsd/9eeccbf3-6e26-11ec-bb10-3065ec8fd3ec.html
Security:	https://vuxml.freebsd.org/freebsd/fb9ba490-5cc4-11ec-aac7-3065ec8fd3ec.html
Security:	https://vuxml.freebsd.org/freebsd/18ac074c-579f-11ec-aac7-3065ec8fd3ec.html
Security:	https://vuxml.freebsd.org/freebsd/b8c0cbca-472d-11ec-83dc-3065ec8fd3ec.html
Security:	https://vuxml.freebsd.org/freebsd/976d7bf9-38ea-11ec-b3b0-3065ec8fd3ec.html
Security:	https://vuxml.freebsd.org/freebsd/bdaecfad-3117-11ec-b3b0-3065ec8fd3ec.html
This commit is contained in:
Matthias Wolf 2022-02-01 18:38:49 +01:00 committed by Rene Ladan
parent 6d3db655f8
commit aa70a996ea
567 changed files with 3325 additions and 2649 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
www/chromium/Makefile
View file

@ -1,8 +1,7 @@
# Created by: Florent Thoumie <flz@FreeBSD.org>
PORTNAME= chromium
PORTVERSION= 94.0.4606.81
PORTREVISION= 3
PORTVERSION= 97.0.4692.99
CATEGORIES= www
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \
LOCAL/rene/chromium/:fonts
@ -15,6 +14,7 @@ LICENSE= BSD3CLAUSE LGPL21 MPL11
LICENSE_COMB= multi
ONLY_FOR_ARCHS= aarch64 amd64 i386
BROKEN_i386= Does not compile, __ElfN macros unknown
BUILD_DEPENDS= bash:shells/bash \
${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \

10
www/chromium/distinfo
View file

@ -1,7 +1,7 @@
TIMESTAMP = 1633682206
SHA256 (chromium-94.0.4606.81.tar.xz) = 7071aa2b2caf48094c2ae816395948b4daec940606f4982ad5bbf68e5d2de598
SIZE (chromium-94.0.4606.81.tar.xz) = 1039841108
SHA256 (chromium-94.0.4606.81-testdata.tar.xz) = 6cddfe2fe7a36c79770c165d08f3ef9d778f78ed5e0c0e98b3eaa2e54884df03
SIZE (chromium-94.0.4606.81-testdata.tar.xz) = 257006276
TIMESTAMP = 1642767718
SHA256 (chromium-97.0.4692.99.tar.xz) = c91bae205705b367f2cfc1f72ce1ee99b2ceb5edfc584e15c60a6ab5ff01ecba
SIZE (chromium-97.0.4692.99.tar.xz) = 1213731872
SHA256 (chromium-97.0.4692.99-testdata.tar.xz) = 4d27100d2a5dda623231fb341a53c5f71fb52a5e2eeec37ccee8f6dfd568d139
SIZE (chromium-97.0.4692.99-testdata.tar.xz) = 259732316
SHA256 (test_fonts-85.tar.xz) = f22b61b3639acb147c98ec2e2305d8b96f0b55c8c74c40e2ea696402fae8cef9
SIZE (test_fonts-85.tar.xz) = 9511984

2
www/chromium/files/extra-patch-build_config_compiler_pgo_pgo.gni
View file

@ -1,4 +1,4 @@
--- build/config/compiler/pgo/pgo.gni.orig 2021-10-08 06:25:34 UTC
--- build/config/compiler/pgo/pgo.gni.orig 2022-01-20 10:35:46 UTC
+++ build/config/compiler/pgo/pgo.gni
@@ -16,7 +16,7 @@ declare_args() {
# TODO(crbug.com/1052397): Remove chromeos_is_browser_only once

2
www/chromium/files/patch-3p-pdfium_3p_base_allocator_partition__allocator_page__allocator__internals__posix.h
View file

@ -1,4 +1,4 @@
--- third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2021-10-08 06:29:18 UTC
--- third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2022-01-20 10:37:51 UTC
+++ third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h
@@ -16,7 +16,7 @@
#if defined(OS_ANDROID)

53
www/chromium/files/patch-BUILD.gn
View file

@ -1,6 +1,6 @@
--- BUILD.gn.orig 2021-09-24 04:25:55 UTC
--- BUILD.gn.orig 2021-12-31 00:57:15 UTC
+++ BUILD.gn
@@ -449,7 +449,7 @@ group("gn_all") {
@@ -454,7 +454,7 @@ group("gn_all") {
]
}
@ -9,7 +9,7 @@
deps += [
"//third_party/breakpad:breakpad_unittests",
"//third_party/breakpad:core-2-minidump",
@@ -494,8 +494,6 @@ group("gn_all") {
@@ -500,8 +500,6 @@ group("gn_all") {
"//net:disk_cache_memory_test",
"//net:quic_client",
"//net:quic_server",
@ -18,7 +18,7 @@
"//testing:empty_main",
]
@@ -506,7 +504,7 @@ group("gn_all") {
@@ -512,7 +510,7 @@ group("gn_all") {
]
}
@ -27,7 +27,7 @@
# TODO(dpranke): add the linux_dump_symbols flag?
deps += [ "//chrome:linux_symbols" ]
}
@@ -550,10 +548,6 @@ group("gn_all") {
@@ -556,10 +554,6 @@ group("gn_all") {
"//chrome/test:load_library_perf_tests",
"//chrome/test:sync_performance_tests",
"//chrome/test/chromedriver:chromedriver",
@ -38,7 +38,7 @@
"//media/cast:generate_barcode_video",
"//media/cast:generate_timecode_audio",
"//net:crash_cache",
@@ -612,10 +606,6 @@ group("gn_all") {
@@ -618,10 +612,6 @@ group("gn_all") {
"//mojo:mojo_perftests",
"//services/service_manager/public/cpp",
"//testing/gmock:gmock_main",
@ -49,7 +49,7 @@
]
if (!is_android) {
@@ -693,7 +683,7 @@ group("gn_all") {
@@ -699,7 +689,7 @@ group("gn_all") {
host_os == "win") {
deps += [ "//chrome/test/mini_installer:mini_installer_tests" ]
}
@ -58,7 +58,7 @@
deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
}
@@ -708,7 +698,7 @@ group("gn_all") {
@@ -715,7 +705,7 @@ group("gn_all") {
}
}
@ -67,15 +67,34 @@
deps += [
"//third_party/crashpad/crashpad:crashpad_tests",
"//third_party/crashpad/crashpad/handler:crashpad_handler",
@@ -825,7 +815,6 @@ group("gn_all") {
"//chrome/browser/vr:vr_common_perftests",
@@ -829,15 +819,17 @@ group("gn_all") {
"//chrome/browser/vr:vr_common_unittests",
"//chrome/browser/vr:vr_pixeltests",
- "//tools/perf/contrib/vr_benchmarks:vr_perf_tests",
]
if (is_android) {
deps += [ "//chrome/browser/android/vr:vr_android_unittests" ]
@@ -1131,7 +1120,7 @@ if (!is_ios) {
- if (!is_android) {
- deps += [ "//tools/perf/contrib/vr_benchmarks:vr_perf_tests" ]
- } else {
- deps += [ "//chrome/browser/android/vr:vr_android_unittests" ]
- import("//tools/perf/chrome_telemetry_build/android_browser_types.gni")
- foreach(_target_suffix, telemetry_android_browser_target_suffixes) {
- deps += [
- "//tools/perf/contrib/vr_benchmarks:vr_perf_tests${_target_suffix}",
- ]
+ if (!is_bsd) {
+ if (!is_android) {
+ deps += [ "//tools/perf/contrib/vr_benchmarks:vr_perf_tests" ]
+ } else {
+ deps += [ "//chrome/browser/android/vr:vr_android_unittests" ]
+ import("//tools/perf/chrome_telemetry_build/android_browser_types.gni")
+ foreach(_target_suffix, telemetry_android_browser_target_suffixes) {
+ deps += [
+ "//tools/perf/contrib/vr_benchmarks:vr_perf_tests${_target_suffix}",
+ ]
+ }
}
}
}
@@ -1140,7 +1132,7 @@ if (!is_ios) {
data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ]
}
@ -84,7 +103,7 @@
data_deps +=
[ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
}
@@ -1140,7 +1129,7 @@ if (!is_ios) {
@@ -1149,7 +1141,7 @@ if (!is_ios) {
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}
@ -93,7 +112,7 @@
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}
@@ -1374,7 +1363,7 @@ group("chromium_builder_perf") {
@@ -1518,7 +1510,7 @@ group("chromium_builder_perf") {
data_deps += [ "//chrome/test:performance_browser_tests" ]
}
if (is_linux || is_chromeos_lacros) {
@ -102,7 +121,7 @@
# In GN builds, this is controlled by the 'linux_dump_symbols'
# flag, which defaults to 1 for official builds. For now,
# we skip the separate flag and just key off of is_official_build.
@@ -1386,9 +1375,6 @@ group("chromium_builder_perf") {
@@ -1530,9 +1522,6 @@ group("chromium_builder_perf") {
if (is_win) {
data_deps += [ "//chrome/installer/mini_installer:mini_installer" ]

4
www/chromium/files/patch-apps_app__restore__service__browsertest.cc
View file

@ -1,6 +1,6 @@
--- apps/app_restore_service_browsertest.cc.orig 2021-04-14 18:40:47 UTC
--- apps/app_restore_service_browsertest.cc.orig 2021-12-14 11:44:54 UTC
+++ apps/app_restore_service_browsertest.cc
@@ -148,7 +148,7 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, FileAcc
@@ -140,7 +140,7 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, FileAcc
}
// Flaky: crbug.com/269613

4
www/chromium/files/patch-ash_display_mirror__window__controller.cc
View file

@ -1,6 +1,6 @@
--- ash/display/mirror_window_controller.cc.orig 2021-07-19 18:45:04 UTC
--- ash/display/mirror_window_controller.cc.orig 2021-12-31 00:57:16 UTC
+++ ash/display/mirror_window_controller.cc
@@ -287,7 +287,11 @@ void MirrorWindowController::UpdateWindow(
@@ -284,7 +284,11 @@ void MirrorWindowController::UpdateWindow(
return info.id() == iter->first;
}) == display_info_list.end()) {
CloseAndDeleteHost(iter->second, true);

16
www/chromium/files/patch-base_BUILD.gn
View file

@ -1,6 +1,6 @@
--- base/BUILD.gn.orig 2021-09-24 04:25:55 UTC
--- base/BUILD.gn.orig 2021-12-31 00:57:18 UTC
+++ base/BUILD.gn
@@ -935,7 +935,7 @@ component("base") {
@@ -954,7 +954,7 @@ component("base") {
"timer/hi_res_timer_manager_posix.cc",
]
@ -9,7 +9,7 @@
sources += [
"cpu_affinity_posix.cc",
"cpu_affinity_posix.h",
@@ -946,6 +946,11 @@ component("base") {
@@ -965,6 +965,11 @@ component("base") {
"profiler/thread_delegate_posix.h",
]
}
@ -21,7 +21,7 @@
}
if (is_win) {
@@ -1367,7 +1372,7 @@ component("base") {
@@ -1391,7 +1396,7 @@ component("base") {
# building inside the cros_sdk environment - use host_toolchain as a
# more robust check for this.
if (!use_sysroot &&
@ -30,7 +30,7 @@
host_toolchain != "//build/toolchain/cros:host") {
libs += [ "atomic" ]
}
@@ -1420,7 +1425,7 @@ component("base") {
@@ -1444,7 +1449,7 @@ component("base") {
"allocator/allocator_shim_default_dispatch_to_mac_zoned_malloc.cc",
]
}
@ -39,7 +39,7 @@
sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ]
}
if (is_win) {
@@ -2099,6 +2104,34 @@ component("base") {
@@ -2142,6 +2147,34 @@ component("base") {
}
}
@ -74,7 +74,7 @@
# iOS
if (is_ios) {
sources -= [
@@ -3292,7 +3325,7 @@ test("base_unittests") {
@@ -3359,7 +3392,7 @@ test("base_unittests") {
}
}
@ -83,7 +83,7 @@
sources += [
"debug/proc_maps_linux_unittest.cc",
"files/scoped_file_linux_unittest.cc",
@@ -3339,7 +3372,7 @@ test("base_unittests") {
@@ -3406,7 +3439,7 @@ test("base_unittests") {
"posix/unix_domain_socket_unittest.cc",
"task/thread_pool/task_tracker_posix_unittest.cc",
]

42
www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc
View file

@ -1,7 +1,7 @@
--- base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig 2021-04-14 18:40:48 UTC
--- base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig 2021-12-14 11:44:55 UTC
+++ base/allocator/allocator_shim_default_dispatch_to_glibc.cc
@@ -6,18 +6,28 @@
#include "base/compiler_specific.h"
@@ -10,18 +10,28 @@
#include "base/process/memory.h"
#include <dlfcn.h>
-#include <malloc.h>
@ -36,34 +36,46 @@
} // extern "C"
namespace {
@@ -25,32 +35,32 @@ namespace {
using base::allocator::AllocatorDispatch;
@@ -39,7 +49,7 @@ void* GlibcMalloc(const AllocatorDispatch*, size_t siz
if (UNLIKELY(size >= kMaxAllowedSize))
base::TerminateBecauseOutOfMemory(size);
- return __libc_malloc(size);
+ return __malloc(size);
}
void* GlibcUncheckedMalloc(const AllocatorDispatch*,
@@ -48,7 +58,7 @@ void* GlibcUncheckedMalloc(const AllocatorDispatch*,
if (UNLIKELY(size >= kMaxAllowedSize))
return nullptr;
void* GlibcMalloc(const AllocatorDispatch*, size_t size, void* context) {
- return __libc_malloc(size);
+ return __malloc(size);
}
void* GlibcCalloc(const AllocatorDispatch*,
size_t n,
size_t size,
void* context) {
@@ -59,7 +69,7 @@ void* GlibcCalloc(const AllocatorDispatch*,
if (UNLIKELY(!total.IsValid() || total.ValueOrDie() >= kMaxAllowedSize))
base::TerminateBecauseOutOfMemory(size * n);
- return __libc_calloc(n, size);
+ return __calloc(n, size);
}
void* GlibcRealloc(const AllocatorDispatch*,
void* address,
size_t size,
void* context) {
@@ -69,7 +79,7 @@ void* GlibcRealloc(const AllocatorDispatch*,
if (UNLIKELY(size >= kMaxAllowedSize))
base::TerminateBecauseOutOfMemory(size);
- return __libc_realloc(address, size);
+ return __realloc(address, size);
}
void* GlibcMemalign(const AllocatorDispatch*,
size_t alignment,
size_t size,
void* context) {
@@ -79,11 +89,11 @@ void* GlibcMemalign(const AllocatorDispatch*,
if (UNLIKELY(size >= kMaxAllowedSize))
base::TerminateBecauseOutOfMemory(size);
- return __libc_memalign(alignment, size);
+ return __memalign(alignment, size);
}

6
www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc
View file

@ -1,4 +1,4 @@
--- base/allocator/allocator_shim_unittest.cc.orig 2021-09-14 01:51:47 UTC
--- base/allocator/allocator_shim_unittest.cc.orig 2021-12-14 11:44:55 UTC
+++ base/allocator/allocator_shim_unittest.cc
@@ -369,7 +369,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) {
@ -11,7 +11,7 @@
ASSERT_EQ(0u, reinterpret_cast<uintptr_t>(memalign_ptr) % 128);
@@ -385,7 +385,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) {
ASSERT_GE(aligned_allocs_intercepted_by_size[kPageSize], 1u);
#endif // !defined(OS_ANDROID)
#endif // defined(OS_POSIX) && !defined(OS_ANDROID)
-#endif // !OS_WIN && !OS_APPLE
+#endif // !OS_WIN && !OS_APPLE && !OS_BSD
@ -29,7 +29,7 @@
@@ -421,7 +421,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) {
ASSERT_GE(frees_intercepted_by_addr[Hash(pvalloc_ptr)], 1u);
#endif // !defined(OS_ANDROID)
#endif // defined(OS_POSIX) && !defined(OS_ANDROID)
-#endif // !OS_WIN && !OS_APPLE
+#endif // !OS_WIN && !OS_APPLE && !OS_BSD

17
www/chromium/files/patch-base_allocator_partition__allocator_address__pool__manager.cc
View file

@ -1,4 +1,4 @@
--- base/allocator/partition_allocator/address_pool_manager.cc.orig 2021-07-19 18:45:05 UTC
--- base/allocator/partition_allocator/address_pool_manager.cc.orig 2021-12-14 11:44:55 UTC
+++ base/allocator/partition_allocator/address_pool_manager.cc
@@ -8,6 +8,13 @@
#include <sys/mman.h>
@ -14,18 +14,3 @@
#include <algorithm>
#include <limits>
@@ -50,6 +57,14 @@ void DecommitPages(void* address, size_t size) {
void* ptr = mmap(address, size, PROT_NONE,
MAP_FIXED | MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
PA_CHECK(ptr == address);
+#elif defined(OS_FREEBSD)
+ int fd = HANDLE_EINTR(open("/dev/zero", O_RDONLY));
+ PA_CHECK(fd != -1);
+
+ void *ptr = mmap(address, size, PROT_NONE,
+ MAP_FIXED | MAP_PRIVATE, fd, 0);
+ PA_PCHECK(ptr == address);
+ HANDLE_EINTR(close(fd));
#else
static_assert(DecommittedMemoryIsAlwaysZeroed(), "");
DecommitSystemPages(address, size, PageUpdatePermissions);

11
www/chromium/files/patch-base_allocator_partition__allocator_page__allocator.h Normal file
View file

@ -0,0 +1,11 @@
--- base/allocator/partition_allocator/page_allocator.h.orig 2021-12-14 11:44:55 UTC
+++ base/allocator/partition_allocator/page_allocator.h
@@ -170,7 +170,7 @@ BASE_EXPORT void DecommitAndZeroSystemPages(void* addr
// Whether decommitted memory is guaranteed to be zeroed when it is
// recommitted. Do not assume that this will not change over time.
constexpr BASE_EXPORT bool DecommittedMemoryIsAlwaysZeroed() {
-#if defined(OS_APPLE)
+#if defined(OS_APPLE) || defined(OS_FREEBSD)
return false;
#else
return true;

6
www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h
View file

@ -1,4 +1,4 @@
--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2021-07-19 18:45:05 UTC
--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2021-12-14 11:44:55 UTC
+++ base/allocator/partition_allocator/page_allocator_internals_posix.h
@@ -28,10 +28,14 @@
#if defined(OS_ANDROID)
@ -34,7 +34,7 @@
int map_flags = MAP_ANONYMOUS | MAP_PRIVATE;
+#endif
#if defined(OS_APPLE)
#if defined(OS_MAC)
// On macOS 10.14 and higher, executables that are code signed with the
@@ -183,6 +194,8 @@ void* SystemAllocPagesInternal(void* hint,
prctl(PR_SET_VMA, PR_SET_VMA_ANON_NAME, ret, length,
@ -45,7 +45,7 @@
#endif
return ret;
@@ -334,6 +347,8 @@ void DiscardSystemPagesInternal(void* address, size_t
@@ -346,6 +359,8 @@ void DiscardSystemPagesInternal(void* address, size_t
ret = madvise(address, length, MADV_DONTNEED);
}
PA_PCHECK(ret == 0);

4
www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.cc
View file

@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/partition_alloc.cc.orig 2021-09-24 04:25:55 UTC
--- base/allocator/partition_allocator/partition_alloc.cc.orig 2021-12-31 00:57:18 UTC
+++ base/allocator/partition_allocator/partition_alloc.cc
@@ -57,7 +57,12 @@ void PartitionAllocGlobalInit(OomFunction on_out_of_me
@@ -56,7 +56,12 @@ void PartitionAllocGlobalInit(OomFunction on_out_of_me
"maximum direct mapped allocation");
// Check that some of our zanier calculations worked out as expected.

21
www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h
View file

@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/partition_alloc_config.h.orig 2021-09-24 04:25:55 UTC
--- base/allocator/partition_allocator/partition_alloc_config.h.orig 2021-12-31 00:57:18 UTC
+++ base/allocator/partition_allocator/partition_alloc_config.h
@@ -61,9 +61,13 @@ static_assert(sizeof(void*) != 8, "");
@@ -59,6 +59,10 @@ static_assert(sizeof(void*) != 8, "");
#define PA_HAS_LINUX_KERNEL
#endif
@ -8,10 +8,15 @@
+#define PA_HAS_FREEBSD_KERNEL
+#endif
+
// SpinningMutex uses either futex(2) on Linux, or a fast userspace "try"
// operation, which is available on Windows.
-#if defined(PA_HAS_LINUX_KERNEL) || defined(OS_WIN)
+#if defined(PA_HAS_LINUX_KERNEL) || defined(PA_HAS_FREEBSD_KERNEL) || defined(OS_WIN)
#define PA_HAS_SPINNING_MUTEX
// On some platforms, we implement locking by spinning in userspace, then going
// into the kernel only if there is contention. This requires platform support,
// namely:
@@ -73,7 +77,7 @@ static_assert(sizeof(void*) != 8, "");
// assume that pthread_mutex_trylock() is suitable.
//
// Otherwise, a userspace spinlock implementation is used.
-#if defined(PA_HAS_LINUX_KERNEL) || defined(OS_WIN) || \
+#if defined(PA_HAS_LINUX_KERNEL) || defined(PA_HAS_FREEBSD_KERNEL) || defined(OS_WIN) || \
(defined(OS_POSIX) && !defined(OS_APPLE)) || defined(OS_FUCHSIA)
#define PA_HAS_FAST_MUTEX
#endif

11
www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h Normal file
View file

@ -0,0 +1,11 @@
--- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2022-01-21 12:58:23 UTC
+++ base/allocator/partition_allocator/partition_alloc_constants.h
@@ -349,7 +349,7 @@ constexpr size_t kBitsPerSizeT = sizeof(void*) * CHAR_
// PartitionPurgeDecommitEmptySlotSpans flag will eagerly decommit all entries
// in the ring buffer, so with periodic purge enabled, this typically happens
// every few seconds.
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
// Set to a higher value on Linux, to assess impact on performance bots. This
// roughly halves the number of syscalls done during a speedometer 2.0 run on
// this platform.

6
www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__unittest.cc
View file

@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/partition_alloc_unittest.cc.orig 2021-09-24 04:25:55 UTC
--- base/allocator/partition_allocator/partition_alloc_unittest.cc.orig 2021-12-31 00:57:18 UTC
+++ base/allocator/partition_allocator/partition_alloc_unittest.cc
@@ -1755,7 +1755,7 @@ TEST_F(PartitionAllocTest, LostFreeSlotSpansBug) {
@@ -1803,7 +1803,7 @@ TEST_F(PartitionAllocTest, LostFreeSlotSpansBug) {
// cause flake.
#if !defined(OS_WIN) && \
(!defined(ARCH_CPU_64_BITS) || \
@ -9,7 +9,7 @@
// The following four tests wrap a called function in an expect death statement
// to perform their test, because they are non-hermetic. Specifically they are
@@ -1806,7 +1806,7 @@ TEST_F(PartitionAllocDeathTest, DISABLED_RepeatedTryRe
@@ -1869,7 +1869,7 @@ TEST_F(PartitionAllocDeathTest, DISABLED_RepeatedTryRe
}
#endif // !defined(ARCH_CPU_64_BITS) || (defined(OS_POSIX) &&

12
www/chromium/files/patch-base_allocator_partition__allocator_partition__root.cc
View file

@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/partition_root.cc.orig 2021-09-14 01:51:47 UTC
--- base/allocator/partition_allocator/partition_root.cc.orig 2021-12-31 00:57:18 UTC
+++ base/allocator/partition_allocator/partition_root.cc
@@ -27,7 +27,7 @@
@@ -28,7 +28,7 @@
#include "wow64apiset.h"
#endif
@ -9,7 +9,7 @@
#include <pthread.h>
#endif
@@ -41,7 +41,7 @@ namespace base {
@@ -42,7 +42,7 @@ namespace base {
namespace {
@ -18,7 +18,7 @@
// NO_THREAD_SAFETY_ANALYSIS: acquires the lock and doesn't release it, by
// design.
@@ -94,7 +94,7 @@ void AfterForkInChild() {
@@ -111,7 +111,7 @@ void AfterForkInChild() {
internal::ThreadCacheRegistry::Instance()
.ForcePurgeAllThreadAfterForkUnsafe();
}
@ -27,7 +27,7 @@
std::atomic<bool> g_global_init_called;
void PartitionAllocMallocInitOnce() {
@@ -104,7 +104,7 @@ void PartitionAllocMallocInitOnce() {
@@ -121,7 +121,7 @@ void PartitionAllocMallocInitOnce() {
if (!g_global_init_called.compare_exchange_strong(expected, true))
return;
@ -36,7 +36,7 @@
// When fork() is called, only the current thread continues to execute in the
// child process. If the lock is held, but *not* by this thread when fork() is
// called, we have a deadlock.
@@ -129,7 +129,7 @@ void PartitionAllocMallocInitOnce() {
@@ -146,7 +146,7 @@ void PartitionAllocMallocInitOnce() {
int err =
pthread_atfork(BeforeForkInParent, AfterForkInParent, AfterForkInChild);
PA_CHECK(err == 0);

19
www/chromium/files/patch-base_allocator_partition__allocator_spinning__mutex.cc
View file

@ -1,6 +1,6 @@
--- base/allocator/partition_allocator/spinning_mutex.cc.orig 2021-09-14 01:51:47 UTC
--- base/allocator/partition_allocator/spinning_mutex.cc.orig 2021-12-14 11:44:55 UTC
+++ base/allocator/partition_allocator/spinning_mutex.cc
@@ -20,9 +20,16 @@
@@ -22,6 +22,13 @@
#include <unistd.h>
#endif // defined(PA_HAS_LINUX_KERNEL)
@ -9,16 +9,21 @@
+#include <sys/types.h>
+#include <sys/thr.h>
+#include <sys/umtx.h>
+#endif // defined(PA_HAS_FREEBSD_KERNEL)
+#endif // defined(PA_HAS_FREEBSD_KERNEL)
+
namespace base {
namespace internal {
#if !defined(PA_HAS_FAST_MUTEX)
#include "base/threading/platform_thread.h"
@@ -43,7 +50,7 @@ namespace internal {
#if defined(PA_HAS_FAST_MUTEX)
-#if defined(PA_HAS_LINUX_KERNEL)
+#if defined(PA_HAS_LINUX_KERNEL) || defined(PA_HAS_FREEBSD_KERNEL)
void SpinningMutex::FutexWait() {
// Save and restore errno.
@@ -46,8 +53,13 @@ void SpinningMutex::FutexWait() {
@@ -67,8 +74,13 @@ void SpinningMutex::FutexWait() {
// |kLockedContended| anymore. Note that even without spurious wakeups, the
// value of |state_| is not guaranteed when this returns, as another thread
// may get the lock before we get to run.
@ -32,7 +37,7 @@
if (err) {
// These are programming error, check them.
@@ -59,8 +71,14 @@ void SpinningMutex::FutexWait() {
@@ -80,8 +92,14 @@ void SpinningMutex::FutexWait() {
void SpinningMutex::FutexWake() {
int saved_errno = errno;

12
www/chromium/files/patch-base_allocator_partition__allocator_spinning__mutex.h
View file

@ -1,17 +1,17 @@
--- base/allocator/partition_allocator/spinning_mutex.h.orig 2021-05-12 22:05:40 UTC
--- base/allocator/partition_allocator/spinning_mutex.h.orig 2021-12-14 11:44:55 UTC
+++ base/allocator/partition_allocator/spinning_mutex.h
@@ -59,7 +59,7 @@ class LOCKABLE BASE_EXPORT SpinningMutex {
// as the slow path has better characteristics than SpinLocks's.
static constexpr int kSpinCount = 1000;
@@ -106,7 +106,7 @@ class LOCKABLE BASE_EXPORT SpinningMutex {
#if defined(PA_HAS_FAST_MUTEX)
-#if defined(PA_HAS_LINUX_KERNEL)
+#if defined(PA_HAS_LINUX_KERNEL) || defined(PA_HAS_FREEBSD_KERNEL)
void FutexWait();
void FutexWake();
@@ -104,7 +104,7 @@ ALWAYS_INLINE void SpinningMutex::Acquire() {
@@ -176,7 +176,7 @@ inline constexpr SpinningMutex::SpinningMutex() = defa
inline constexpr SpinningMutex::SpinningMutex() = default;
#if defined(PA_HAS_FAST_MUTEX)
-#if defined(PA_HAS_LINUX_KERNEL)
+#if defined(PA_HAS_LINUX_KERNEL) || defined(PA_HAS_FREEBSD_KERNEL)

11
www/chromium/files/patch-base_allocator_partition__allocator_starscan_pcscan__internal.cc
View file

@ -1,11 +0,0 @@
--- base/allocator/partition_allocator/starscan/pcscan_internal.cc.orig 2021-09-24 04:25:55 UTC
+++ base/allocator/partition_allocator/starscan/pcscan_internal.cc
@@ -59,7 +59,7 @@ namespace internal {
namespace {
-#if DCHECK_IS_ON() && defined(OS_LINUX)
+#if DCHECK_IS_ON() && (defined(OS_LINUX) || defined(OS_BSD))
// Currently, check reentracy only on Linux. On Android TLS is emulated by the
// runtime lib, which can allocate and therefore cause reentrancy.
struct ReentrantScannerGuard final {

8
www/chromium/files/patch-base_cpu.cc
View file

@ -1,8 +1,8 @@
--- base/cpu.cc.orig 2021-09-14 01:51:47 UTC
--- base/cpu.cc.orig 2021-12-14 11:44:55 UTC
+++ base/cpu.cc
@@ -16,7 +16,7 @@
@@ -17,7 +17,7 @@
#include "base/cxx17_backports.h"
#include "base/no_destructor.h"
-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \
+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) || \
@ -24,7 +24,7 @@
#endif // defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) ||
// defined(OS_LINUX) || defined(OS_CHROMEOS))
@@ -357,6 +365,8 @@ void CPU::Initialize(bool require_branding) {
@@ -358,6 +366,8 @@ void CPU::Initialize(bool require_branding) {
has_bti_ = hwcap2 & HWCAP2_BTI;
#endif

6
www/chromium/files/patch-base_cpu.h
View file

@ -1,6 +1,6 @@
--- base/cpu.h.orig 2021-07-19 18:45:05 UTC
--- base/cpu.h.orig 2021-12-14 11:44:55 UTC
+++ base/cpu.h
@@ -96,7 +96,7 @@ class BASE_EXPORT CPU final {
@@ -103,7 +103,7 @@ class BASE_EXPORT CPU final {
IntelMicroArchitecture GetIntelMicroArchitecture() const;
const std::string& cpu_brand() const { return cpu_brand_; }
@ -9,7 +9,7 @@
defined(OS_AIX)
enum class CoreType {
kUnknown = 0,
@@ -147,7 +147,7 @@ class BASE_EXPORT CPU final {
@@ -154,7 +154,7 @@ class BASE_EXPORT CPU final {
// cpuidle driver.
using CoreIdleTimes = std::vector<TimeDelta>;
static bool GetCumulativeCoreIdleTimes(CoreIdleTimes&);

6
www/chromium/files/patch-base_debug_debugger__posix.cc
View file

@ -1,6 +1,6 @@
--- base/debug/debugger_posix.cc.orig 2021-09-24 04:25:55 UTC
--- base/debug/debugger_posix.cc.orig 2021-12-14 11:44:55 UTC
+++ base/debug/debugger_posix.cc
@@ -92,7 +92,7 @@ bool BeingDebugged() {
@@ -87,7 +87,7 @@ bool BeingDebugged() {
KERN_PROC,
KERN_PROC_PID,
getpid()
@ -9,7 +9,7 @@
, sizeof(struct kinfo_proc),
0
#endif
@@ -100,33 +100,35 @@ bool BeingDebugged() {
@@ -95,33 +95,35 @@ bool BeingDebugged() {
// Caution: struct kinfo_proc is marked __APPLE_API_UNSTABLE. The source and
// binary interfaces may change.

6
www/chromium/files/patch-base_debug_stack__trace.h
View file

@ -1,6 +1,6 @@
--- base/debug/stack_trace.h.orig 2021-09-24 04:25:55 UTC
--- base/debug/stack_trace.h.orig 2021-12-14 11:44:55 UTC
+++ base/debug/stack_trace.h
@@ -19,6 +19,7 @@
@@ -18,6 +18,7 @@
#if !defined(OS_NACL)
#include <signal.h>
#endif
@ -8,7 +8,7 @@
#include <unistd.h>
#endif
@@ -156,7 +157,7 @@ BASE_EXPORT size_t CollectStackTrace(void** trace, siz
@@ -155,7 +156,7 @@ BASE_EXPORT size_t CollectStackTrace(void** trace, siz
// scanning area at the origin of the stack, wasting time and not finding any
// frames (since Android libraries don't have frame pointers). Scanning is not
// enabled on other posix platforms due to legacy reasons.

12
www/chromium/files/patch-base_debug_stack__trace__posix.cc
View file

@ -1,4 +1,4 @@
--- base/debug/stack_trace_posix.cc.orig 2021-09-24 04:25:55 UTC
--- base/debug/stack_trace_posix.cc.orig 2021-12-14 11:44:55 UTC
+++ base/debug/stack_trace_posix.cc
@@ -35,7 +35,7 @@
#include <AvailabilityMacros.h>
@ -9,7 +9,7 @@
#include "base/debug/proc_maps_linux.h"
#endif
@@ -424,7 +424,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf
@@ -446,7 +446,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf
if (::signal(signal, SIG_DFL) == SIG_ERR) {
_exit(EXIT_FAILURE);
}
@ -18,7 +18,7 @@
// For all operating systems but Linux we do not reraise the signal that
// brought us here but terminate the process immediately.
// Otherwise various tests break on different operating systems, see
@@ -432,7 +432,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf
@@ -454,7 +454,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf
PrintToStderr(
"Calling _exit(EXIT_FAILURE). Core file will not be generated.\n");
_exit(EXIT_FAILURE);
@ -27,7 +27,7 @@
// After leaving this handler control flow returns to the point where the
// signal was raised, raising the current signal once again but executing the
@@ -667,13 +667,21 @@ class SandboxSymbolizeHelper {
@@ -695,13 +695,21 @@ class SandboxSymbolizeHelper {
// Reads /proc/self/maps.
std::string contents;
if (!ReadProcMaps(&contents)) {
@ -49,7 +49,7 @@
return false;
}
@@ -704,7 +712,11 @@ class SandboxSymbolizeHelper {
@@ -732,7 +740,11 @@ class SandboxSymbolizeHelper {
// Skip regions with empty file names.
continue;
}
@ -61,7 +61,7 @@
// Skip pseudo-paths, like [stack], [vdso], [heap], etc ...
continue;
}
@@ -801,9 +813,9 @@ bool EnableInProcessStackDumping() {
@@ -827,9 +839,9 @@ bool EnableInProcessStackDumping() {
success &= (sigaction(SIGBUS, &action, nullptr) == 0);
success &= (sigaction(SIGSEGV, &action, nullptr) == 0);
// On Linux, SIGSYS is reserved by the kernel for seccomp-bpf sandboxing.

4
www/chromium/files/patch-base_files_file__path__unittest.cc
View file

@ -1,6 +1,6 @@
--- base/files/file_path_unittest.cc.orig 2021-09-24 04:25:55 UTC
--- base/files/file_path_unittest.cc.orig 2021-12-14 11:44:55 UTC
+++ base/files/file_path_unittest.cc
@@ -1188,7 +1188,7 @@ TEST_F(FilePathTest, FromUTF8Unsafe_And_AsUTF8Unsafe)
@@ -1202,7 +1202,7 @@ TEST_F(FilePathTest, FromUTF8Unsafe_And_AsUTF8Unsafe)
"\xEF\xBC\xA1\xEF\xBC\xA2\xEF\xBC\xA3.txt" },
};

11
www/chromium/files/patch-base_files_file__util.cc
View file

@ -1,11 +0,0 @@
--- base/files/file_util.cc.orig 2021-09-24 04:25:55 UTC
+++ base/files/file_util.cc
@@ -57,7 +57,7 @@ bool Move(const FilePath& from_path, const FilePath& t
}
bool CopyFileContents(File& infile, File& outfile) {
-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD)
bool retry_slow = false;
bool res =
internal::CopyFileContentsWithSendfile(infile, outfile, retry_slow);

6
www/chromium/files/patch-base_files_file__util__unittest.cc
View file

@ -1,4 +1,4 @@
--- base/files/file_util_unittest.cc.orig 2021-09-14 01:51:47 UTC
--- base/files/file_util_unittest.cc.orig 2021-12-31 00:57:18 UTC
+++ base/files/file_util_unittest.cc
@@ -1640,7 +1640,7 @@ TEST_F(FileUtilTest, DeleteDirRecursiveWithOpenFile) {
#endif
@ -18,7 +18,7 @@
TEST_F(FileUtilTest, MoveFileNew) {
// Create a file
@@ -3508,7 +3508,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) {
@@ -3509,7 +3509,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) {
}
#endif // defined(OS_WIN)
@ -27,7 +27,7 @@
TEST_F(FileUtilTest, ReadFileToStringWithProcFileSystem) {
FilePath file_path("/proc/cpuinfo");
std::string data = "temp";
@@ -3526,7 +3526,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithProcFileSyste
@@ -3527,7 +3527,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithProcFileSyste
EXPECT_FALSE(ReadFileToStringWithMaxSize(file_path, nullptr, 4));
}

4
www/chromium/files/patch-base_location__unittest.cc
View file

@ -1,6 +1,6 @@
--- base/location_unittest.cc.orig 2021-04-14 18:40:48 UTC
--- base/location_unittest.cc.orig 2021-12-14 11:44:55 UTC
+++ base/location_unittest.cc
@@ -32,7 +32,7 @@ TEST(LocationTest, CurrentYieldsCorrectValue) {
@@ -37,7 +37,7 @@ TEST(LocationTest, CurrentYieldsCorrectValue) {
EXPECT_EQ(here.line_number(), previous_line + 1);
EXPECT_STREQ("TestBody", here.function_name());
#endif

4
www/chromium/files/patch-base_logging__unittest.cc
View file

@ -1,4 +1,4 @@
--- base/logging_unittest.cc.orig 2021-07-19 18:45:05 UTC
--- base/logging_unittest.cc.orig 2021-12-31 00:57:18 UTC
+++ base/logging_unittest.cc
@@ -33,7 +33,7 @@
#include "base/posix/eintr_wrapper.h"
@ -9,7 +9,7 @@
#include <ucontext.h>
#endif
@@ -559,7 +559,7 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo
@@ -553,7 +553,7 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo
// need the arch-specific boilerplate below, which is inspired by breakpad.
// At the same time, on OSX, ucontext.h is deprecated but si_addr works fine.
uintptr_t crash_addr = 0;

8
www/chromium/files/patch-base_memory_platform__shared__memory__region.h
View file

@ -1,6 +1,6 @@
--- base/memory/platform_shared_memory_region.h.orig 2021-07-19 18:45:05 UTC
--- base/memory/platform_shared_memory_region.h.orig 2021-12-14 11:44:55 UTC
+++ base/memory/platform_shared_memory_region.h
@@ -25,7 +25,7 @@
@@ -24,7 +24,7 @@
#include "base/files/scoped_file.h"
#endif
@ -9,7 +9,7 @@
namespace content {
class SandboxIPCHandler;
}
@@ -118,7 +118,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion {
@@ -117,7 +117,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion {
kMaxValue = GET_SHMEM_TEMP_DIR_FAILURE
};
@ -18,7 +18,7 @@
// Structure to limit access to executable region creation.
struct ExecutableRegion {
private:
@@ -262,7 +262,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion {
@@ -264,7 +264,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion {
CheckPlatformHandlePermissionsCorrespondToMode);
static PlatformSharedMemoryRegion Create(Mode mode,
size_t size

11
www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc
View file

@ -1,4 +1,4 @@
--- base/memory/platform_shared_memory_region_posix.cc.orig 2021-04-14 18:40:48 UTC
--- base/memory/platform_shared_memory_region_posix.cc.orig 2022-01-20 10:35:46 UTC
+++ base/memory/platform_shared_memory_region_posix.cc
@@ -23,7 +23,11 @@ struct ScopedPathUnlinkerTraits {
static const FilePath* InvalidValue() { return nullptr; }
@ -39,6 +39,15 @@
,
bool executable
#endif
@@ -233,7 +237,7 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion:
// flag.
FilePath directory;
if (!GetShmemTempDir(
-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
executable,
#else
false /* executable */,
@@ -242,6 +246,22 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion:
return {};
}

8
www/chromium/files/patch-base_path__service__unittest.cc
View file

@ -1,11 +1,11 @@
--- base/path_service_unittest.cc.orig 2021-04-14 18:40:48 UTC
--- base/path_service_unittest.cc.orig 2021-12-31 00:57:18 UTC
+++ base/path_service_unittest.cc
@@ -38,7 +38,7 @@ bool ReturnsValidPath(int dir_type) {
if (dir_type == DIR_CACHE)
@@ -46,7 +46,7 @@ bool ReturnsValidPath(int key) {
if (key == DIR_CACHE)
check_path_exists = false;
#endif
-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
// On the linux try-bots: a path is returned (e.g. /home/chrome-bot/Desktop),
// but it doesn't exist.
if (dir_type == DIR_USER_DESKTOP)
if (key == DIR_USER_DESKTOP)

8
www/chromium/files/patch-base_process_internal__linux.h
View file

@ -1,6 +1,6 @@
--- base/process/internal_linux.h.orig 2021-04-14 18:40:48 UTC
--- base/process/internal_linux.h.orig 2021-12-14 11:44:55 UTC
+++ base/process/internal_linux.h
@@ -18,6 +18,8 @@
@@ -20,6 +20,8 @@
#include "base/strings/string_number_conversions.h"
#include "base/threading/platform_thread.h"
@ -9,7 +9,7 @@
namespace base {
class Time;
@@ -59,6 +61,14 @@ bool ParseProcStats(const std::string& stats_data,
@@ -61,6 +63,14 @@ bool ParseProcStats(const std::string& stats_data,
// If the ordering ever changes, carefully review functions that use these
// values.
enum ProcStatsFields {
@ -24,7 +24,7 @@
VM_COMM = 1, // Filename of executable, without parentheses.
VM_STATE = 2, // Letter indicating the state of the process.
VM_PPID = 3, // PID of the parent.
@@ -71,6 +81,7 @@ enum ProcStatsFields {
@@ -73,6 +83,7 @@ enum ProcStatsFields {
VM_STARTTIME = 21, // The time the process started in clock ticks.
VM_VSIZE = 22, // Virtual memory size in bytes.
VM_RSS = 23, // Resident Set Size in pages.

8
www/chromium/files/patch-base_process_kill__posix.cc
View file

@ -1,7 +1,7 @@
--- base/process/kill_posix.cc.orig 2021-04-14 18:40:48 UTC
--- base/process/kill_posix.cc.orig 2021-12-14 11:44:55 UTC
+++ base/process/kill_posix.cc
@@ -160,7 +160,7 @@ void EnsureProcessTerminated(Process process) {
0, new BackgroundReaper(std::move(process), TimeDelta::FromSeconds(2)));
@@ -162,7 +162,7 @@ void EnsureProcessTerminated(Process process) {
0, new BackgroundReaper(std::move(process), Seconds(2)));
}
-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
@ -9,7 +9,7 @@
void EnsureProcessGetsReaped(Process process) {
DCHECK(!process.is_current());
@@ -171,7 +171,7 @@ void EnsureProcessGetsReaped(Process process) {
@@ -173,7 +173,7 @@ void EnsureProcessGetsReaped(Process process) {
PlatformThread::CreateNonJoinable(
0, new BackgroundReaper(std::move(process), TimeDelta()));
}

8
www/chromium/files/patch-base_process_launch.h
View file

@ -1,6 +1,6 @@
--- base/process/launch.h.orig 2021-07-19 18:45:05 UTC
--- base/process/launch.h.orig 2021-12-14 11:44:55 UTC
+++ base/process/launch.h
@@ -191,7 +191,7 @@ struct BASE_EXPORT LaunchOptions {
@@ -192,7 +192,7 @@ struct BASE_EXPORT LaunchOptions {
bool clear_environment = false;
#endif // OS_WIN || OS_POSIX || OS_FUCHSIA
@ -9,7 +9,7 @@
// If non-zero, start the process using clone(), using flags as provided.
// Unlike in clone, clone_flags may not contain a custom termination signal
// that is sent to the parent when the child dies. The termination signal will
@@ -204,7 +204,7 @@ struct BASE_EXPORT LaunchOptions {
@@ -205,7 +205,7 @@ struct BASE_EXPORT LaunchOptions {
// Sets parent process death signal to SIGKILL.
bool kill_on_parent_death = false;
@ -18,7 +18,7 @@
#if defined(OS_MAC)
// Mach ports that will be accessible to the child process. These are not
@@ -416,7 +416,7 @@ BASE_EXPORT void RaiseProcessToHighPriority();
@@ -417,7 +417,7 @@ BASE_EXPORT void RaiseProcessToHighPriority();
// binary. This should not be called in production/released code.
BASE_EXPORT LaunchOptions LaunchOptionsForTest();

27
www/chromium/files/patch-base_process_memory__unittest.cc
View file

@ -1,6 +1,6 @@
--- base/process/memory_unittest.cc.orig 2021-07-19 18:45:05 UTC
--- base/process/memory_unittest.cc.orig 2021-12-14 11:44:55 UTC
+++ base/process/memory_unittest.cc
@@ -37,6 +37,8 @@
@@ -38,6 +38,8 @@
#if defined(OS_LINUX) || defined(OS_CHROMEOS)
#include <malloc.h>
#include "base/test/malloc_wrapper.h"
@ -9,7 +9,7 @@
#endif
#if defined(OS_ANDROID)
#include "base/android/build_info.h"
@@ -112,9 +114,9 @@ TEST(MemoryTest, AllocatorShimWorking) {
@@ -113,9 +115,9 @@ TEST(MemoryTest, AllocatorShimWorking) {
#endif
}
@ -21,7 +21,7 @@
!defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
namespace {
@@ -336,7 +338,7 @@ TEST_F(OutOfMemoryDeathTest, SecurityAlignedRealloc) {
@@ -338,7 +340,7 @@ TEST_F(OutOfMemoryDeathTest, SecurityAlignedRealloc) {
#endif // defined(OS_WIN)
#endif // !defined(OS_MAC) && !defined(OS_ANDROID)
@ -30,7 +30,7 @@
TEST_F(OutOfMemoryDeathTest, Valloc) {
ASSERT_OOM_DEATH({
@@ -382,7 +384,7 @@ TEST_F(OutOfMemoryDeathTest, ViaSharedLibraries) {
@@ -384,7 +386,7 @@ TEST_F(OutOfMemoryDeathTest, ViaSharedLibraries) {
value_ = MallocWrapper(test_size_);
});
}
@ -39,7 +39,7 @@
// Android doesn't implement posix_memalign().
#if defined(OS_POSIX) && !defined(OS_ANDROID)
@@ -533,7 +535,7 @@ TEST_F(OutOfMemoryTest, TerminateBecauseOutOfMemoryRep
@@ -535,7 +537,7 @@ TEST_F(OutOfMemoryTest, TerminateBecauseOutOfMemoryRep
#endif // OS_WIN
#if defined(ARCH_CPU_32_BITS) && \
@ -48,7 +48,7 @@
void TestAllocationsReleaseReservation(void* (*alloc_fn)(size_t),
void (*free_fn)(void*)) {
@@ -591,7 +593,7 @@ TEST_F(OutOfMemoryHandledTest, NewReleasesReservation)
@@ -593,7 +595,7 @@ TEST_F(OutOfMemoryHandledTest, NewReleasesReservation)
[](size_t size) { return static_cast<void*>(new char[size]); },
[](void* ptr) { delete[] static_cast<char*>(ptr); });
}
@ -56,11 +56,12 @@
+#endif // defined(ARCH_CPU_32_BITS) && (defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) ||
// defined(OS_CHROMEOS))
// See the comment in |UncheckedMalloc()|, it behaves as malloc() in these
@@ -653,5 +655,5 @@ TEST_F(OutOfMemoryHandledTest, UncheckedCalloc) {
#if defined(OS_ANDROID) || defined(OS_FUCHSIA)
@@ -654,7 +656,6 @@ TEST_F(OutOfMemoryHandledTest, UncheckedCalloc) {
EXPECT_EQ(0, bytes[i]);
free(value_);
#endif // BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) || defined(OS_ANDROID)
- EXPECT_FALSE(base::UncheckedCalloc(1, test_size_, &value_));
EXPECT_TRUE(value_ == nullptr);
}
-#endif // !defined(OS_OPENBSD) && BUILDFLAG(USE_ALLOCATOR_SHIM) &&
+#endif // !defined(OS_BSD) && BUILDFLAG(USE_ALLOCATOR_SHIM) &&
// !defined(MEMORY_TOOL_REPLACES_ALLOCATOR)

30
www/chromium/files/patch-base_process_process__metrics.h
View file

@ -1,4 +1,4 @@
--- base/process/process_metrics.h.orig 2021-09-14 01:51:47 UTC
--- base/process/process_metrics.h.orig 2021-12-14 11:44:55 UTC
+++ base/process/process_metrics.h
@@ -37,7 +37,7 @@
#include "base/win/windows_types.h"
@ -27,7 +27,7 @@
// Convert a POSIX timeval to microseconds.
BASE_EXPORT int64_t TimeValToMicroseconds(const struct timeval& tv);
@@ -105,7 +105,7 @@ class BASE_EXPORT ProcessMetrics {
@@ -108,7 +108,7 @@ class BASE_EXPORT ProcessMetrics {
// convenience wrapper for CreateProcessMetrics().
static std::unique_ptr<ProcessMetrics> CreateCurrentProcessMetrics();
@ -36,7 +36,7 @@
// Resident Set Size is a Linux/Android specific memory concept. Do not
// attempt to extend this to other platforms.
BASE_EXPORT size_t GetResidentSetSize() const;
@@ -131,7 +131,7 @@ class BASE_EXPORT ProcessMetrics {
@@ -134,7 +134,7 @@ class BASE_EXPORT ProcessMetrics {
// will result in a time delta of 2 seconds/per 1 wall-clock second.
TimeDelta GetCumulativeCPUUsage() WARN_UNUSED_RESULT;
@ -45,7 +45,7 @@
defined(OS_AIX)
// Emits the cumulative CPU usage for all currently active threads since they
// were started into the output parameter (replacing its current contents).
@@ -166,7 +166,7 @@ class BASE_EXPORT ProcessMetrics {
@@ -169,7 +169,7 @@ class BASE_EXPORT ProcessMetrics {
bool ParseProcTimeInState(const std::string& content,
PlatformThreadId tid,
TimeInStatePerThread& time_in_state_per_thread);
@ -54,7 +54,7 @@
// defined(OS_AIX)
// Returns the number of average idle cpu wakeups per second since the last
@@ -215,14 +215,14 @@ class BASE_EXPORT ProcessMetrics {
@@ -218,14 +218,14 @@ class BASE_EXPORT ProcessMetrics {
int GetOpenFdSoftLimit() const;
#endif // defined(OS_POSIX)
@ -71,7 +71,7 @@
// Returns total memory usage of malloc.
size_t GetMallocUsage();
@@ -234,7 +234,7 @@ class BASE_EXPORT ProcessMetrics {
@@ -237,7 +237,7 @@ class BASE_EXPORT ProcessMetrics {
ProcessMetrics(ProcessHandle process, PortProvider* port_provider);
#endif // !defined(OS_MAC)
@ -80,7 +80,7 @@
defined(OS_AIX)
int CalculateIdleWakeupsPerSecond(uint64_t absolute_idle_wakeups);
#endif
@@ -245,10 +245,10 @@ class BASE_EXPORT ProcessMetrics {
@@ -248,10 +248,10 @@ class BASE_EXPORT ProcessMetrics {
uint64_t absolute_package_idle_wakeups);
#endif
@ -93,7 +93,7 @@
// defined(OS_AIX)
#if defined(OS_WIN)
@@ -270,7 +270,7 @@ class BASE_EXPORT ProcessMetrics {
@@ -273,7 +273,7 @@ class BASE_EXPORT ProcessMetrics {
// Number of bytes transferred to/from disk in bytes.
uint64_t last_cumulative_disk_usage_ = 0;
@ -102,7 +102,7 @@
defined(OS_AIX)
// Same thing for idle wakeups.
TimeTicks last_idle_wakeups_time_;
@@ -314,7 +314,7 @@ BASE_EXPORT size_t GetHandleLimit();
@@ -315,7 +315,7 @@ BASE_EXPORT size_t GetHandleLimit();
BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_descriptors);
#endif // defined(OS_POSIX)
@ -111,7 +111,7 @@
defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_AIX) || \
defined(OS_FUCHSIA)
// Data about system-wide memory consumption. Values are in KB. Available on
@@ -350,7 +350,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
@@ -351,7 +351,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
int avail_phys = 0;
#endif
@ -120,7 +120,7 @@
defined(OS_AIX)
// This provides an estimate of available memory as described here:
// https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=34e431b0ae398fc54ea69ff85ec700722c9da773
@@ -365,7 +365,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
@@ -366,7 +366,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
int swap_free = 0;
#endif
@ -129,7 +129,7 @@
defined(OS_AIX) || defined(OS_FUCHSIA)
int buffers = 0;
int cached = 0;
@@ -375,7 +375,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
@@ -376,7 +376,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
int inactive_file = 0;
int dirty = 0;
int reclaimable = 0;
@ -138,7 +138,7 @@
// defined(OS_AIX) defined(OS_FUCHSIA)
#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
@@ -398,11 +398,11 @@ struct BASE_EXPORT SystemMemoryInfoKB {
@@ -399,11 +399,11 @@ struct BASE_EXPORT SystemMemoryInfoKB {
// Exposed for memory debugging widget.
BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoKB* meminfo);
@ -152,7 +152,7 @@
defined(OS_AIX)
// Parse the data found in /proc/<pid>/stat and return the sum of the
// CPU-related ticks. Returns -1 on parse error.
@@ -478,7 +478,7 @@ BASE_EXPORT bool GetSystemDiskInfo(SystemDiskInfo* dis
@@ -479,7 +479,7 @@ BASE_EXPORT bool GetSystemDiskInfo(SystemDiskInfo* dis
// Returns the amount of time spent in user space since boot across all CPUs.
BASE_EXPORT TimeDelta GetUserCpuTimeSinceBoot();
@ -161,7 +161,7 @@
// defined(OS_AIX)
#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
@@ -590,7 +590,7 @@ class BASE_EXPORT SystemMetrics {
@@ -591,7 +591,7 @@ class BASE_EXPORT SystemMetrics {
FRIEND_TEST_ALL_PREFIXES(SystemMetricsTest, SystemMetrics);
size_t committed_memory_;

4
www/chromium/files/patch-base_process_process__util__unittest.cc
View file

@ -1,6 +1,6 @@
--- base/process/process_util_unittest.cc.orig 2021-09-14 01:51:47 UTC
--- base/process/process_util_unittest.cc.orig 2021-12-14 11:44:55 UTC
+++ base/process/process_util_unittest.cc
@@ -1336,11 +1336,11 @@ std::string TestLaunchProcess(const CommandLine& cmdli
@@ -1342,11 +1342,11 @@ std::string TestLaunchProcess(const CommandLine& cmdli
options.fds_to_remap.emplace_back(fds[1], STDOUT_FILENO);
#endif // defined(OS_WIN)

6
www/chromium/files/patch-base_security__unittest.cc
View file

@ -1,4 +1,4 @@
--- base/security_unittest.cc.orig 2021-04-14 18:40:48 UTC
--- base/security_unittest.cc.orig 2021-12-14 11:44:55 UTC
+++ base/security_unittest.cc
@@ -61,7 +61,7 @@ NOINLINE Type HideValueFromCompiler(volatile Type valu
void OverflowTestsSoftExpectTrue(bool overflow_detected) {
@ -9,7 +9,7 @@
// Sadly, on Linux, Android, and OSX we don't have a good story yet. Don't
// fail the test, but report.
printf("Platform has overflow: %s\n",
@@ -123,7 +123,7 @@ TEST(SecurityTest, MAYBE_NewOverflow) {
@@ -121,7 +121,7 @@ TEST(SecurityTest, MAYBE_NewOverflow) {
#endif // !defined(OS_WIN) || !defined(ARCH_CPU_64_BITS)
}
@ -18,7 +18,7 @@
// Check if ptr1 and ptr2 are separated by less than size chars.
bool ArePointersToSameArea(void* ptr1, void* ptr2, size_t size) {
ptrdiff_t ptr_diff = reinterpret_cast<char*>(std::max(ptr1, ptr2)) -
@@ -177,6 +177,6 @@ TEST(SecurityTest, MALLOC_OVERFLOW_TEST(RandomMemoryAl
@@ -175,6 +175,6 @@ TEST(SecurityTest, MALLOC_OVERFLOW_TEST(RandomMemoryAl
EXPECT_FALSE(impossible_random_address);
}

10
www/chromium/files/patch-base_synchronization_lock__impl.h
View file

@ -1,15 +1,15 @@
--- base/synchronization/lock_impl.h.orig 2021-04-14 18:40:48 UTC
--- base/synchronization/lock_impl.h.orig 2021-12-14 11:44:55 UTC
+++ base/synchronization/lock_impl.h
@@ -105,6 +105,8 @@ void LockImpl::Unlock() {
@@ -107,6 +107,8 @@ void LockImpl::Unlock() {
}
#elif defined(OS_POSIX) || defined(OS_FUCHSIA)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wthread-safety-analysis"
bool LockImpl::Try() {
int rv = pthread_mutex_trylock(&native_handle_);
@@ -116,6 +118,7 @@ void LockImpl::Unlock() {
BASE_EXPORT std::string SystemErrorCodeToString(int error_code);
@@ -121,6 +123,7 @@ void LockImpl::Unlock() {
int rv = pthread_mutex_unlock(&native_handle_);
DCHECK_EQ(rv, 0) << ". " << strerror(rv);
}

4
www/chromium/files/patch-base_syslog__logging.cc
View file

@ -1,4 +1,4 @@
--- base/syslog_logging.cc.orig 2021-04-14 18:40:48 UTC
--- base/syslog_logging.cc.orig 2021-12-31 00:57:18 UTC
+++ base/syslog_logging.cc
@@ -13,7 +13,7 @@
#include "base/strings/string_util.h"
@ -9,7 +9,7 @@
// <syslog.h> defines LOG_INFO, LOG_WARNING macros that could conflict with
// base::LOG_INFO, base::LOG_WARNING.
#include <syslog.h>
@@ -134,7 +134,7 @@ EventLogMessage::~EventLogMessage() {
@@ -145,7 +145,7 @@ EventLogMessage::~EventLogMessage() {
if (user_sid != nullptr)
::LocalFree(user_sid);

4
www/chromium/files/patch-base_system_sys__info.cc
View file

@ -1,6 +1,6 @@
--- base/system/sys_info.cc.orig 2021-09-14 01:51:47 UTC
--- base/system/sys_info.cc.orig 2021-12-14 11:44:55 UTC
+++ base/system/sys_info.cc
@@ -91,7 +91,7 @@ void SysInfo::GetHardwareInfo(base::OnceCallback<void(
@@ -92,7 +92,7 @@ void SysInfo::GetHardwareInfo(base::OnceCallback<void(
#if defined(OS_WIN) || defined(OS_ANDROID) || defined(OS_APPLE)
base::ThreadPool::PostTaskAndReplyWithResult(
FROM_HERE, {}, base::BindOnce(&GetHardwareInfoSync), std::move(callback));

10
www/chromium/files/patch-base_system_sys__info__unittest.cc
View file

@ -1,6 +1,6 @@
--- base/system/sys_info_unittest.cc.orig 2021-04-14 18:40:48 UTC
--- base/system/sys_info_unittest.cc.orig 2021-12-31 00:57:18 UTC
+++ base/system/sys_info_unittest.cc
@@ -63,13 +63,13 @@ TEST_F(SysInfoTest, AmountOfMem) {
@@ -64,13 +64,13 @@ TEST_F(SysInfoTest, AmountOfMem) {
EXPECT_GE(SysInfo::AmountOfVirtualMemory(), 0);
}
@ -17,7 +17,7 @@
TEST_F(SysInfoTest, MAYBE_AmountOfAvailablePhysicalMemory) {
// Note: info is in _K_bytes.
SystemMemoryInfoKB info;
@@ -100,7 +100,7 @@ TEST_F(SysInfoTest, MAYBE_AmountOfAvailablePhysicalMem
@@ -101,7 +101,7 @@ TEST_F(SysInfoTest, MAYBE_AmountOfAvailablePhysicalMem
EXPECT_GT(amount, static_cast<int64_t>(info.free) * 1024);
EXPECT_LT(amount / 1024, info.total);
}
@ -26,7 +26,7 @@
TEST_F(SysInfoTest, AmountOfFreeDiskSpace) {
// We aren't actually testing that it's correct, just that it's sane.
@@ -150,7 +150,7 @@ TEST_F(SysInfoTest, NestedVolumesAmountOfTotalDiskSpac
@@ -141,7 +141,7 @@ TEST_F(SysInfoTest, NestedVolumesAmountOfTotalDiskSpac
}
#endif // defined(OS_FUCHSIA)
@ -35,7 +35,7 @@
defined(OS_CHROMEOS) || defined(OS_FUCHSIA)
TEST_F(SysInfoTest, OperatingSystemVersionNumbers) {
int32_t os_major_version = -1;
@@ -236,7 +236,7 @@ TEST_F(SysInfoTest, GetHardwareInfo) {
@@ -227,7 +227,7 @@ TEST_F(SysInfoTest, GetHardwareInfo) {
EXPECT_TRUE(IsStringUTF8(hardware_info->model));
bool empty_result_expected =
#if defined(OS_ANDROID) || defined(OS_APPLE) || defined(OS_WIN) || \

8
www/chromium/files/patch-base_test_launcher_test__launcher.cc
View file

@ -1,6 +1,6 @@
--- base/test/launcher/test_launcher.cc.orig 2021-09-14 01:51:47 UTC
--- base/test/launcher/test_launcher.cc.orig 2021-12-14 11:44:55 UTC
+++ base/test/launcher/test_launcher.cc
@@ -61,6 +61,7 @@
@@ -62,6 +62,7 @@
#include "testing/gtest/include/gtest/gtest.h"
#if defined(OS_POSIX)
@ -8,7 +8,7 @@
#include <fcntl.h>
#include "base/files/file_descriptor_watcher_posix.h"
@@ -607,7 +608,7 @@ ChildProcessResults DoLaunchChildTestProcess(
@@ -620,7 +621,7 @@ ChildProcessResults DoLaunchChildTestProcess(
#if !defined(OS_FUCHSIA)
options.new_process_group = true;
#endif
@ -17,7 +17,7 @@
options.kill_on_parent_death = true;
#endif
@@ -1529,7 +1530,7 @@ bool TestLauncher::Init(CommandLine* command_line) {
@@ -1571,7 +1572,7 @@ bool TestLauncher::Init(CommandLine* command_line) {
results_tracker_.AddGlobalTag("OS_IOS");
#endif

41
www/chromium/files/patch-base_test_test__suite.cc
View file

@ -1,15 +1,6 @@
--- base/test/test_suite.cc.orig 2021-09-14 01:51:47 UTC
--- base/test/test_suite.cc.orig 2022-01-05 13:32:44 UTC
+++ base/test/test_suite.cc
@@ -68,7 +68,7 @@
#include "base/test/test_support_android.h"
#endif
-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
#include "base/test/fontconfig_util_linux.h"
#endif
@@ -217,7 +217,7 @@ class CheckForLeakedGlobals : public testing::EmptyTes
@@ -221,7 +221,7 @@ class CheckForLeakedGlobals : public testing::EmptyTes
};
// base::Process is not available on iOS
@ -18,33 +9,7 @@
class CheckProcessPriority : public testing::EmptyTestEventListener {
public:
CheckProcessPriority() { CHECK(!IsProcessBackgrounded()); }
@@ -354,14 +354,14 @@ void TestSuite::PreInitialize() {
testing::GTEST_FLAG(catch_exceptions) = false;
#endif
EnableTerminationOnHeapCorruption();
-#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(USE_AURA)
+#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(USE_AURA)
// When calling native char conversion functions (e.g wrctomb) we need to
// have the locale set. In the absence of such a call the "C" locale is the
// default. In the gtk code (below) gtk_init() implicitly sets a locale.
setlocale(LC_ALL, "");
// We still need number to string conversions to be locale insensitive.
setlocale(LC_NUMERIC, "C");
-#endif // (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(USE_AURA)
+#endif // (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(USE_AURA)
// On Android, AtExitManager is created in
// testing/android/native_test_wrapper.cc before main() is called.
@@ -635,7 +635,7 @@ void TestSuite::Initialize() {
// TODO(jshin): Should we set the locale via an OS X locale API here?
i18n::SetICUDefaultLocale("en_US");
-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
SetUpFontconfig();
#endif
@@ -648,7 +648,7 @@ void TestSuite::Initialize() {
@@ -634,7 +634,7 @@ void TestSuite::Initialize() {
if (check_for_leaked_globals_)
listeners.Append(new CheckForLeakedGlobals);
if (check_for_thread_and_process_priority_) {

6
www/chromium/files/patch-base_threading_platform__thread.h
View file

@ -1,7 +1,7 @@
--- base/threading/platform_thread.h.orig 2021-09-24 04:25:56 UTC
--- base/threading/platform_thread.h.orig 2021-12-31 00:57:18 UTC
+++ base/threading/platform_thread.h
@@ -240,7 +240,7 @@ class BASE_EXPORT PlatformThread {
// Returns a realtime period provided by |delegate|.
@@ -244,7 +244,7 @@ class BASE_EXPORT PlatformThread {
// Returns a realtime period provided by `delegate`.
static TimeDelta GetRealtimePeriod(Delegate* delegate);
-#if defined(OS_LINUX) || defined(OS_CHROMEOS)

4
www/chromium/files/patch-base_threading_platform__thread__internal__posix.h
View file

@ -1,6 +1,6 @@
--- base/threading/platform_thread_internal_posix.h.orig 2021-07-19 18:45:05 UTC
--- base/threading/platform_thread_internal_posix.h.orig 2021-12-31 00:57:18 UTC
+++ base/threading/platform_thread_internal_posix.h
@@ -47,13 +47,13 @@ bool SetCurrentThreadPriorityForPlatform(ThreadPriorit
@@ -46,13 +46,13 @@ bool SetCurrentThreadPriorityForPlatform(ThreadPriorit
// of CanIncreaseThreadPriority().
absl::optional<ThreadPriority> GetCurrentThreadPriorityForPlatform();

60
www/chromium/files/patch-base_threading_platform__thread__linux.cc
View file

@ -1,4 +1,4 @@
--- base/threading/platform_thread_linux.cc.orig 2021-10-01 01:36:37 UTC
--- base/threading/platform_thread_linux.cc.orig 2022-01-20 10:35:46 UTC
+++ base/threading/platform_thread_linux.cc
@@ -29,7 +29,9 @@
@ -10,8 +10,21 @@
#include <sys/resource.h>
#include <sys/time.h>
#include <sys/types.h>
@@ -132,7 +134,7 @@ int sched_setattr(pid_t pid,
#endif // !defined(OS_NACL) && !defined(OS_AIX)
@@ -61,7 +63,7 @@ int g_scheduler_boost_adj;
int g_scheduler_limit_adj;
bool g_scheduler_use_latency_tune_adj;
-#if !defined(OS_NACL) && !defined(OS_AIX)
+#if !defined(OS_NACL) && !defined(OS_AIX) && !defined(OS_BSD)
// Defined by linux uclamp ABI of sched_setattr().
const uint32_t kSchedulerUclampMin = 0;
@@ -129,10 +131,10 @@ int sched_setattr(pid_t pid,
unsigned int flags) {
return syscall(__NR_sched_setattr, pid, attr, flags);
}
-#endif // !defined(OS_NACL) && !defined(OS_AIX)
+#endif // !defined(OS_NACL) && !defined(OS_AIX) && !defined(OS_BSD)
#endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
-#if !defined(OS_NACL)
@ -19,16 +32,25 @@
const FilePath::CharType kCgroupDirectory[] =
FILE_PATH_LITERAL("/sys/fs/cgroup");
@@ -300,7 +302,7 @@ const ThreadPriorityToNiceValuePair kThreadPriorityToN
@@ -286,7 +288,7 @@ void SetThreadCgroupsForThreadPriority(PlatformThreadI
namespace internal {
absl::optional<bool> CanIncreaseCurrentThreadPriorityForPlatform(
ThreadPriority priority) {
namespace {
-#if !defined(OS_NACL)
+#if !defined(OS_NACL) && !defined(OS_BSD)
const struct sched_param kRealTimePrio = {8};
#endif
} // namespace
@@ -299,7 +301,7 @@ const ThreadPriorityToNiceValuePair kThreadPriorityToN
};
bool CanSetThreadPriorityToRealtimeAudio() {
-#if !defined(OS_NACL)
+#if !defined(OS_NACL) && !defined(OS_BSD)
// A non-zero soft-limit on RLIMIT_RTPRIO is required to be allowed to invoke
// pthread_setschedparam in SetCurrentThreadPriorityForPlatform().
struct rlimit rlim;
@@ -313,7 +315,7 @@ absl::optional<bool> CanIncreaseCurrentThreadPriorityF
@@ -310,7 +312,7 @@ bool CanSetThreadPriorityToRealtimeAudio() {
}
bool SetCurrentThreadPriorityForPlatform(ThreadPriority priority) {
@ -37,7 +59,16 @@
// For legacy schedtune interface
SetThreadCgroupsForThreadPriority(PlatformThread::CurrentId(), priority);
@@ -350,7 +352,7 @@ absl::optional<ThreadPriority> GetCurrentThreadPriorit
@@ -328,7 +330,7 @@ bool SetCurrentThreadPriorityForPlatform(ThreadPriorit
}
absl::optional<ThreadPriority> GetCurrentThreadPriorityForPlatform() {
-#if !defined(OS_NACL)
+#if !defined(OS_NACL) && !defined(OS_BSD)
int maybe_sched_rr = 0;
struct sched_param maybe_realtime_prio = {0};
if (pthread_getschedparam(pthread_self(), &maybe_sched_rr,
@@ -347,7 +349,7 @@ absl::optional<ThreadPriority> GetCurrentThreadPriorit
void PlatformThread::SetName(const std::string& name) {
ThreadIdNameManager::GetInstance()->SetName(name);
@ -46,7 +77,16 @@
// On linux we can get the thread names to show up in the debugger by setting
// the process name for the LWP. We don't want to do this for the main
// thread because that would rename the process, causing tools like killall
@@ -380,8 +382,10 @@ void PlatformThread::SetThreadPriority(ProcessId proce
@@ -364,7 +366,7 @@ void PlatformThread::SetName(const std::string& name)
// We expect EPERM failures in sandboxed processes, just ignore those.
if (err < 0 && errno != EPERM)
DPLOG(ERROR) << "prctl(PR_SET_NAME)";
-#endif // !defined(OS_NACL) && !defined(OS_AIX)
+#endif // !defined(OS_NACL) && !defined(OS_AIX) && !defined(OS_BSD)
}
#if !defined(OS_NACL) && !defined(OS_AIX)
@@ -377,8 +379,10 @@ void PlatformThread::SetThreadPriority(ProcessId proce
// priority.
CHECK_NE(thread_id, process_id);
@ -57,7 +97,7 @@
#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
// For upstream uclamp interface. We try both legacy (schedtune, as done
@@ -438,7 +442,9 @@ void InitThreading() {}
@@ -435,7 +439,9 @@ void InitThreading() {}
void TerminateOnThread() {}
size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) {

6
www/chromium/files/patch-base_threading_platform__thread__posix.cc
View file

@ -1,6 +1,6 @@
--- base/threading/platform_thread_posix.cc.orig 2021-09-14 01:51:47 UTC
--- base/threading/platform_thread_posix.cc.orig 2021-12-14 11:44:55 UTC
+++ base/threading/platform_thread_posix.cc
@@ -32,6 +32,10 @@
@@ -33,6 +33,10 @@
#include <sys/syscall.h>
#endif
@ -11,7 +11,7 @@
#if defined(OS_FUCHSIA)
#include <zircon/process.h>
#else
@@ -193,6 +197,8 @@ PlatformThreadId PlatformThread::CurrentId() {
@@ -194,6 +198,8 @@ PlatformThreadId PlatformThread::CurrentId() {
// into the kernel.
#if defined(OS_APPLE)
return pthread_mach_thread_np(pthread_self());

8
www/chromium/files/patch-base_threading_platform__thread__unittest.cc
View file

@ -1,15 +1,15 @@
--- base/threading/platform_thread_unittest.cc.orig 2021-09-14 01:51:47 UTC
--- base/threading/platform_thread_unittest.cc.orig 2022-01-20 10:35:46 UTC
+++ base/threading/platform_thread_unittest.cc
@@ -313,7 +313,7 @@ TEST(PlatformThreadTest,
@@ -311,7 +311,7 @@ TEST(PlatformThreadTest,
// and hardcodes what we know. Please inform scheduler-dev@chromium.org if this
// proprerty changes for a given platform.
TEST(PlatformThreadTest, CanIncreaseThreadPriority) {
TEST(PlatformThreadTest, CanChangeThreadPriority) {
-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
// On Ubuntu, RLIMIT_NICE and RLIMIT_RTPRIO are 0 by default, so we won't be
// able to increase priority to any level.
constexpr bool kCanIncreasePriority = false;
@@ -404,9 +404,9 @@ TEST(PlatformThreadTest, SetHugeThreadName) {
@@ -409,9 +409,9 @@ TEST(PlatformThreadTest, SetHugeThreadName) {
TEST(PlatformThreadTest, GetDefaultThreadStackSize) {
size_t stack_size = PlatformThread::GetDefaultThreadStackSize();

6
www/chromium/files/patch-base_threading_scoped__blocking__call__unittest.cc
View file

@ -1,6 +1,6 @@
--- base/threading/scoped_blocking_call_unittest.cc.orig 2021-09-14 01:51:47 UTC
--- base/threading/scoped_blocking_call_unittest.cc.orig 2021-12-14 11:44:55 UTC
+++ base/threading/scoped_blocking_call_unittest.cc
@@ -302,7 +302,7 @@ TEST_F(ScopedBlockingCallIOJankMonitoringTest, ManyInA
@@ -282,7 +282,7 @@ TEST_F(ScopedBlockingCallIOJankMonitoringTest, ManyInA
}
TEST_F(ScopedBlockingCallIOJankMonitoringTest, OverlappingMultipleWindows) {
@ -9,7 +9,7 @@
internal::IOJankMonitoringWindow::kMonitoringWindow * 3 +
internal::IOJankMonitoringWindow::kIOJankInterval * 5;
@@ -559,7 +559,7 @@ TEST_F(ScopedBlockingCallIOJankMonitoringTest, MultiTh
@@ -538,7 +538,7 @@ TEST_F(ScopedBlockingCallIOJankMonitoringTest, MultiTh
// First one starting at 10 seconds (can't start later than that or we'll trip
// the kTimeDiscrepancyTimeout per TaskEnvironment's inability to RunUntilIdle()
// with pending blocked tasks).

8
www/chromium/files/patch-base_threading_thread__task__runner__handle.cc
View file

@ -1,4 +1,4 @@
--- base/threading/thread_task_runner_handle.cc.orig 2021-04-14 18:40:48 UTC
--- base/threading/thread_task_runner_handle.cc.orig 2021-12-14 11:44:55 UTC
+++ base/threading/thread_task_runner_handle.cc
@@ -8,6 +8,7 @@
#include <utility>
@ -6,9 +6,9 @@
#include "base/bind.h"
+#include "base/callback_helpers.h"
#include "base/check_op.h"
#include "base/dcheck_is_on.h"
#include "base/lazy_instance.h"
#include "base/run_loop.h"
@@ -33,6 +34,7 @@ const scoped_refptr<SingleThreadTaskRunner>& ThreadTas
@@ -40,6 +41,7 @@ const scoped_refptr<SingleThreadTaskRunner>& ThreadTas
return current->task_runner_;
}
@ -16,7 +16,7 @@
// static
bool ThreadTaskRunnerHandle::IsSet() {
return !!thread_task_runner_tls.Pointer()->Get();
@@ -80,6 +82,7 @@ ThreadTaskRunnerHandleOverride::ThreadTaskRunnerHandle
@@ -87,6 +89,7 @@ ThreadTaskRunnerHandleOverride::ThreadTaskRunnerHandle
if (!allow_nested_runloop)
no_running_during_override_.emplace();
}

4
www/chromium/files/patch-base_trace__event_heap__profiler__allocation__context__tracker.cc
View file

@ -1,4 +1,4 @@
--- base/trace_event/heap_profiler_allocation_context_tracker.cc.orig 2021-07-19 18:45:05 UTC
--- base/trace_event/heap_profiler_allocation_context_tracker.cc.orig 2021-12-14 11:44:55 UTC
+++ base/trace_event/heap_profiler_allocation_context_tracker.cc
@@ -30,6 +30,10 @@
#include <sys/prctl.h>
@ -30,7 +30,7 @@
if (!err) {
+ return strdup(name);
+ }
+#elif defined(OS_BSD) && __FreeBSD__ >= 12
+#elif defined(OS_BSD)
+ pthread_get_name_np(pthread_self(), name, kBufferLen);
+ if (*name != '\0') {
return strdup(name);

4
www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc
View file

@ -1,4 +1,4 @@
--- base/trace_event/malloc_dump_provider.cc.orig 2021-09-24 04:25:56 UTC
--- base/trace_event/malloc_dump_provider.cc.orig 2021-12-14 11:44:55 UTC
+++ base/trace_event/malloc_dump_provider.cc
@@ -23,6 +23,8 @@
@ -9,7 +9,7 @@
#else
#include <malloc.h>
#endif
@@ -213,6 +215,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump
@@ -217,6 +219,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump
&allocated_objects_count);
#elif defined(OS_FUCHSIA)
// TODO(fuchsia): Port, see https://crbug.com/706592.

8
www/chromium/files/patch-build_config_BUILDCONFIG.gn
View file

@ -1,6 +1,6 @@
--- build/config/BUILDCONFIG.gn.orig 2021-05-12 22:05:40 UTC
--- build/config/BUILDCONFIG.gn.orig 2021-12-31 00:57:18 UTC
+++ build/config/BUILDCONFIG.gn
@@ -184,8 +184,8 @@ if (host_toolchain == "") {
@@ -189,8 +189,8 @@ if (host_toolchain == "") {
# TODO(dpranke): Add some sort of assert here that verifies that
# no toolchain omitted host_toolchain from its toolchain_args().
@ -11,7 +11,7 @@
host_toolchain = "//build/toolchain/linux:clang_$host_cpu"
} else if (is_clang) {
host_toolchain = "//build/toolchain/linux:clang_$host_cpu"
@@ -222,7 +222,7 @@ if (target_os == "android") {
@@ -229,7 +229,7 @@ if (target_os == "android") {
assert(host_os == "linux" || host_os == "mac",
"Android builds are only supported on Linux and Mac hosts.")
_default_toolchain = "//build/toolchain/android:android_clang_$target_cpu"
@ -20,7 +20,7 @@
# See comments in build/toolchain/cros/BUILD.gn about board compiles.
if (is_clang) {
_default_toolchain = "//build/toolchain/linux:clang_$target_cpu"
@@ -284,10 +284,11 @@ if (custom_toolchain != "") {
@@ -293,10 +293,11 @@ if (custom_toolchain != "") {
# current_os value directly.
is_android = current_os == "android"

68
www/chromium/files/patch-build_config_compiler_BUILD.gn
View file

@ -1,6 +1,6 @@
--- build/config/compiler/BUILD.gn.orig 2021-09-24 04:25:56 UTC
--- build/config/compiler/BUILD.gn.orig 2021-12-31 00:57:18 UTC
+++ build/config/compiler/BUILD.gn
@@ -139,7 +139,7 @@ declare_args() {
@@ -140,7 +140,7 @@ declare_args() {
#
# TODO(crbug.com/1131993): Enabling this when 'is_android' is true breaks
# content_shell_test_apk on both ARM and x86.
@ -9,7 +9,7 @@
# This argument is to control whether enabling text section splitting in the
# final binary. When enabled, the separated text sections with prefix
@@ -238,7 +238,7 @@ config("default_include_dirs") {
@@ -241,7 +241,7 @@ config("default_include_dirs") {
# Compiler instrumentation can introduce dependencies in DSOs to symbols in
# the executable they are loaded into, so they are unresolved at link-time.
config("no_unresolved_symbols") {
@ -18,25 +18,25 @@
(is_linux || is_chromeos || is_android || is_fuchsia)) {
ldflags = [
"-Wl,-z,defs",
@@ -354,7 +354,7 @@ config("compiler") {
@@ -361,7 +361,7 @@ config("compiler") {
}
# Linker warnings.
- if (fatal_linker_warnings && !is_apple && current_os != "aix") {
+ if (fatal_linker_warnings && !is_apple && !is_bsd && current_os != "aix") {
- if (fatal_linker_warnings && !is_apple && current_os != "aix" &&
+ if (fatal_linker_warnings && !is_apple && !is_bsd && current_os != "aix" &&
current_os != "zos") {
ldflags += [ "-Wl,--fatal-warnings" ]
}
if (fatal_linker_warnings && is_apple) {
@@ -530,7 +530,7 @@ config("compiler") {
@@ -539,7 +539,7 @@ config("compiler") {
ldflags += [ "-Wl,-z,keep-text-section-prefix" ]
}
- if (is_clang && !is_nacl && !use_xcode_clang) {
+ if (is_clang && !is_nacl && !use_xcode_clang && !is_bsd) {
- if (is_clang && !is_nacl && !use_xcode_clang && current_os != "zos") {
+ if (is_clang && !is_nacl && !is_bsd && !use_xcode_clang && current_os != "zos") {
cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ]
# TODO(hans): Remove this once Clang generates better optimized debug info
@@ -680,7 +680,12 @@ config("compiler") {
@@ -682,7 +682,12 @@ config("compiler") {
# and let it use all cores.
# TODO(thakis): Check if '=0' (that is, number of cores, instead
# of "all" which means number of hardware threads) is faster.
@ -50,7 +50,7 @@
if (is_mac) {
ldflags +=
[ "-Wl,-cache_path_lto," +
@@ -879,7 +884,7 @@ config("compiler_cpu_abi") {
@@ -910,7 +915,7 @@ config("compiler_cpu_abi") {
cflags += [ "-mtune=$arm_tune" ]
}
} else if (current_cpu == "arm64") {
@ -59,7 +59,7 @@
cflags += [ "--target=aarch64-linux-gnu" ]
ldflags += [ "--target=aarch64-linux-gnu" ]
}
@@ -1231,6 +1236,9 @@ config("compiler_deterministic") {
@@ -1266,6 +1271,9 @@ config("compiler_deterministic") {
"-Xclang",
".",
]
@ -69,16 +69,16 @@
} else {
# -ffile-compilation-dir is an alias for both -fdebug-compilation-dir=
# and -fcoverage-compilation-dir=.
@@ -1610,7 +1618,7 @@ config("default_warnings") {
@@ -1519,7 +1527,7 @@ config("default_warnings") {
cflags += [ "-Wno-null-pointer-subtraction" ]
}
- if (current_toolchain == host_toolchain || !use_xcode_clang) {
+ if ((current_toolchain == host_toolchain || !use_xcode_clang) && !is_bsd) {
# Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not
# recognize.
# Flags Xcode 9.2 (Clang clang-900.0.39.2) does not recognize.
cflags += [
@@ -1643,6 +1651,18 @@ config("default_warnings") {
"-Wenum-compare-conditional",
@@ -1549,6 +1557,18 @@ config("default_warnings") {
cflags += [ "-Wmax-tokens" ]
}
}
@ -97,16 +97,16 @@
}
}
}
@@ -1781,7 +1801,7 @@ config("no_chromium_code") {
@@ -1684,7 +1704,7 @@ config("no_chromium_code") {
# third-party libraries.
"-Wno-c++11-narrowing",
]
- if (!is_nacl && (current_toolchain == host_toolchain || !use_xcode_clang)) {
+ if (!is_nacl && (current_toolchain == host_toolchain || !use_xcode_clang) && !is_bsd) {
cflags += [
# TODO(https://crbug.com/1202159): Clean up and enable.
"-Wno-misleading-indentation",
@@ -1861,7 +1881,7 @@ config("thin_archive") {
# Disabled for similar reasons as -Wunused-variable.
"-Wno-unused-but-set-variable",
@@ -1767,7 +1787,7 @@ config("thin_archive") {
# archives.
# TODO(crbug.com/1221615): Enable on is_apple if use_lld once that no longer
# confuses lldb.
@ -115,21 +115,25 @@
arflags = [ "-T" ]
} else if (is_win && use_lld) {
arflags = [ "/llvmlibthin" ]
@@ -2353,7 +2373,7 @@ config("symbols") {
@@ -2267,7 +2287,11 @@ config("symbols") {
# flag, so we can use use -g1 for pnacl and nacl-clang compiles.
# gcc nacl is is_nacl && !is_clang, pnacl and nacl-clang are && is_clang.
if (!is_nacl || is_clang) {
if ((!is_nacl || is_clang) && current_os != "zos") {
- cflags += [ "-g2" ]
+ cflags += [ "-g0" ]
+ if (is_bsd) {
+ cflags += [ "-g0" ]
+ } else {
+ cflags += [ "-g2" ]
+ }
}
if (is_apple) {
@@ -2378,7 +2398,7 @@ config("symbols") {
# Since only one of the build options -gdwarf-aranges and -fembed-bitcode
@@ -2307,7 +2331,7 @@ config("symbols") {
# DWARF info may be corrupt; offsets in a range list entry are in different
# sections" there. Maybe just a bug in nacl_switch_32.S.
if (!is_apple && !is_nacl && current_cpu != "x86" &&
- (use_gold || use_lld)) {
+ (use_gold || use_lld) && !is_bsd) {
if (is_clang) {
# This flag enables the GNU-format pubnames and pubtypes sections,
# which lld needs in order to generate a correct GDB index.
_enable_gdb_index =
- symbol_level == 2 && !is_apple && !is_nacl && current_cpu != "x86" &&
+ symbol_level == 2 && !is_apple && !is_nacl && !is_bsd && current_cpu != "x86" &&
current_os != "zos" && (use_gold || use_lld) &&
# Disable on non-fission 32-bit Android because it pushes
# libcomponents_unittests over the 4gb size limit.

4
www/chromium/files/patch-build_config_compiler_compiler.gni
View file

@ -1,6 +1,6 @@
--- build/config/compiler/compiler.gni.orig 2021-09-14 01:51:47 UTC
--- build/config/compiler/compiler.gni.orig 2021-12-31 00:57:18 UTC
+++ build/config/compiler/compiler.gni
@@ -205,7 +205,7 @@ declare_args() {
@@ -219,7 +219,7 @@ declare_args() {
declare_args() {
# Whether to use the gold linker from binutils instead of lld or bfd.

4
www/chromium/files/patch-build_config_ozone.gni
View file

@ -1,6 +1,6 @@
--- build/config/ozone.gni.orig 2021-09-24 04:25:56 UTC
--- build/config/ozone.gni.orig 2021-12-14 11:44:55 UTC
+++ build/config/ozone.gni
@@ -85,6 +85,9 @@ declare_args() {
@@ -91,6 +91,9 @@ declare_args() {
} else if (is_chromeos_lacros) {
ozone_platform = "wayland"
ozone_platform_wayland = true

11
www/chromium/files/patch-build_config_rust.gni Normal file
View file

@ -0,0 +1,11 @@
--- build/config/rust.gni.orig 2021-12-31 00:57:18 UTC
+++ build/config/rust.gni
@@ -67,7 +67,7 @@ toolchain_has_official_rust =
(!is_nacl &&
(is_android && (current_cpu == "arm" || current_cpu == "arm64" ||
current_cpu == "x64" || current_cpu == "x86"))) ||
- (is_linux && current_cpu == "x64")
+ ((is_linux && !is_bsd) && current_cpu == "x64")
toolchain_has_rust = enable_rust && (toolchain_has_official_rust ||
use_unverified_rust_toolchain)

4
www/chromium/files/patch-build_linux_unbundle_replace__gn__files.py
View file

@ -1,6 +1,6 @@
--- build/linux/unbundle/replace_gn_files.py.orig 2021-04-14 18:40:48 UTC
--- build/linux/unbundle/replace_gn_files.py.orig 2021-12-14 11:44:55 UTC
+++ build/linux/unbundle/replace_gn_files.py
@@ -27,6 +27,7 @@ REPLACEMENTS = {
@@ -25,6 +25,7 @@ REPLACEMENTS = {
'libevent': 'base/third_party/libevent/BUILD.gn',
'libjpeg': 'third_party/libjpeg.gni',
'libpng': 'third_party/libpng/BUILD.gn',

31
www/chromium/files/patch-build_toolchain_gcc__toolchain.gni
View file

@ -1,6 +1,6 @@
--- build/toolchain/gcc_toolchain.gni.orig 2021-09-14 01:51:47 UTC
--- build/toolchain/gcc_toolchain.gni.orig 2022-01-20 10:35:46 UTC
+++ build/toolchain/gcc_toolchain.gni
@@ -48,6 +48,11 @@ if (enable_resource_allowlist_generation) {
@@ -49,6 +49,11 @@ if (enable_resource_allowlist_generation) {
"enable_resource_allowlist_generation=true does not work for target_os=$target_os")
}
@ -12,28 +12,15 @@
# This template defines a toolchain for something that works like gcc
# (including clang).
#
@@ -666,20 +671,32 @@ template("gcc_toolchain") {
# actually just be doing a native compile. The invoker can optionally override
@@ -731,13 +736,23 @@ template("gcc_toolchain") {
# use_gold too.
template("clang_toolchain") {
- if (defined(invoker.toolprefix)) {
- toolprefix = invoker.toolprefix
- } else {
- toolprefix = ""
+ if (!is_bsd) {
+ if (defined(invoker.toolprefix)) {
+ toolprefix = invoker.toolprefix
+ } else {
+ toolprefix = ""
+ }
}
gcc_toolchain(target_name) {
- prefix = rebase_path("$clang_base_path/bin", root_build_dir)
- cc = "$prefix/clang"
- cxx = "$prefix/clang++"
- cc = "${prefix}/clang"
- cxx = "${prefix}/clang++"
- ld = cxx
- readelf = "${toolprefix}readelf"
- readelf = "${prefix}/llvm-readelf"
- ar = "${prefix}/llvm-ar"
- nm = "${prefix}/llvm-nm"
+ if (is_bsd) {
@ -46,10 +33,10 @@
+ nm = "${prefix}/nm"
+ } else {
+ prefix = rebase_path("$clang_base_path/bin", root_build_dir)
+ cc = "$prefix/clang"
+ cxx = "$prefix/clang++"
+ cc = "${prefix}/clang"
+ cxx = "${prefix}/clang++"
+ ld = cxx
+ readelf = "${toolprefix}readelf"
+ readelf = "${prefix}/llvm-readelf"
+ ar = "${prefix}/llvm-ar"
+ nm = "${prefix}/llvm-nm"
+ }

21
www/chromium/files/patch-build_toolchain_linux_BUILD.gn
View file

@ -1,21 +0,0 @@
--- build/toolchain/linux/BUILD.gn.orig 2021-06-09 22:13:52 UTC
+++ build/toolchain/linux/BUILD.gn
@@ -15,7 +15,9 @@ clang_toolchain("clang_ppc64") {
}
clang_toolchain("clang_arm") {
- toolprefix = "arm-linux-gnueabihf-"
+ if (!is_bsd) {
+ toolprefix = "arm-linux-gnueabihf-"
+ }
toolchain_args = {
current_cpu = "arm"
current_os = "linux"
@@ -23,7 +25,6 @@ clang_toolchain("clang_arm") {
}
clang_toolchain("clang_arm64") {
- toolprefix = "aarch64-linux-gnu-"
toolchain_args = {
current_cpu = "arm64"
current_os = "linux"

6
www/chromium/files/patch-cc_BUILD.gn
View file

@ -1,6 +1,6 @@
--- cc/BUILD.gn.orig 2021-09-24 04:25:56 UTC
--- cc/BUILD.gn.orig 2021-12-31 00:57:18 UTC
+++ cc/BUILD.gn
@@ -646,7 +646,7 @@ cc_test_static_library("test_support") {
@@ -655,7 +655,7 @@ cc_test_static_library("test_support") {
if (enable_vulkan) {
deps += [ "//gpu/vulkan/init" ]
}
@ -9,7 +9,7 @@
data_deps = [ "//third_party/mesa_headers" ]
}
}
@@ -864,7 +864,6 @@ cc_test("cc_unittests") {
@@ -879,7 +879,6 @@ cc_test("cc_unittests") {
]
data_deps = [
"//testing/buildbot/filters:cc_unittests_filters",

4
www/chromium/files/patch-cc_layers_scrollbar__layer__impl__base.cc
View file

@ -1,6 +1,6 @@
--- cc/layers/scrollbar_layer_impl_base.cc.orig 2021-09-24 04:25:56 UTC
--- cc/layers/scrollbar_layer_impl_base.cc.orig 2021-12-14 11:44:55 UTC
+++ cc/layers/scrollbar_layer_impl_base.cc
@@ -221,8 +221,8 @@ gfx::Rect ScrollbarLayerImplBase::ComputeThumbQuadRect
@@ -223,8 +223,8 @@ gfx::Rect ScrollbarLayerImplBase::ComputeThumbQuadRect
int thumb_offset = TrackStart();
if (maximum > 0) {
float ratio = clamped_current_pos / maximum;

4
www/chromium/files/patch-cc_test_layer__tree__test.cc
View file

@ -1,6 +1,6 @@
--- cc/test/layer_tree_test.cc.orig 2021-09-14 01:51:47 UTC
--- cc/test/layer_tree_test.cc.orig 2021-12-31 00:57:18 UTC
+++ cc/test/layer_tree_test.cc
@@ -674,7 +674,7 @@ LayerTreeTest::LayerTreeTest(viz::RendererType rendere
@@ -681,7 +681,7 @@ LayerTreeTest::LayerTreeTest(viz::RendererType rendere
init_vulkan = true;
} else if (renderer_type_ == viz::RendererType::kSkiaDawn) {
scoped_feature_list_.InitAndEnableFeature(features::kSkiaDawn);

12
www/chromium/files/patch-cc_trees_property__tree.cc
View file

@ -1,19 +1,19 @@
--- cc/trees/property_tree.cc.orig 2021-04-14 18:40:48 UTC
--- cc/trees/property_tree.cc.orig 2021-12-14 11:44:55 UTC
+++ cc/trees/property_tree.cc
@@ -1299,13 +1299,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro
@@ -1299,13 +1299,13 @@ gfx::Vector2dF ScrollTree::MaxScrollOffset(int scroll_
gfx::Size clip_layer_bounds = container_bounds(scroll_node->id);
- gfx::ScrollOffset max_offset(
+ gfx::ScrollOffset _max_offset(
- gfx::Vector2dF max_offset(
+ gfx::Vector2dF _max_offset(
scaled_scroll_bounds.width() - clip_layer_bounds.width(),
scaled_scroll_bounds.height() - clip_layer_bounds.height());
- max_offset.Scale(1 / scale_factor);
- max_offset.SetToMax(gfx::ScrollOffset());
- max_offset.SetToMax(gfx::Vector2dF());
- return max_offset;
+ _max_offset.Scale(1 / scale_factor);
+ _max_offset.SetToMax(gfx::ScrollOffset());
+ _max_offset.SetToMax(gfx::Vector2dF());
+ return _max_offset;
}

8
www/chromium/files/patch-chrome_BUILD.gn
View file

@ -1,6 +1,6 @@
--- chrome/BUILD.gn.orig 2021-09-24 04:25:56 UTC
--- chrome/BUILD.gn.orig 2021-12-31 00:57:18 UTC
+++ chrome/BUILD.gn
@@ -276,7 +276,9 @@ if (!is_android && !is_mac) {
@@ -283,7 +283,9 @@ if (!is_android && !is_mac) {
":xdg_mime", # Needs to be public for installer to consume files.
]
@ -11,7 +11,7 @@
}
ldflags = []
@@ -1366,7 +1368,7 @@ group("browser_dependencies") {
@@ -1392,7 +1394,7 @@ group("browser_dependencies") {
]
}
@ -20,7 +20,7 @@
public_deps += [ "//components/crash/core/app" ]
}
@@ -1686,7 +1688,7 @@ if (enable_resource_allowlist_generation) {
@@ -1715,7 +1717,7 @@ if (is_win && enable_resource_allowlist_generation) {
}
if (is_linux || is_chromeos) {

6
www/chromium/files/patch-chrome_app_BUILD.gn
View file

@ -1,8 +1,8 @@
--- chrome/app/BUILD.gn.orig 2021-09-24 04:25:56 UTC
--- chrome/app/BUILD.gn.orig 2021-12-31 00:57:19 UTC
+++ chrome/app/BUILD.gn
@@ -154,7 +154,7 @@ static_library("test_support") {
"//v8:v8_headers",
@@ -184,7 +184,7 @@ static_library("test_support") {
]
public_deps = []
- if (!is_fuchsia) {
+ if (!is_fuchsia && !is_bsd) {

40
www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
View file

@ -1,6 +1,6 @@
--- chrome/app/chrome_main_delegate.cc.orig 2021-10-01 01:36:38 UTC
--- chrome/app/chrome_main_delegate.cc.orig 2021-12-31 00:57:19 UTC
+++ chrome/app/chrome_main_delegate.cc
@@ -153,15 +153,17 @@
@@ -155,15 +155,17 @@
#include "v8/include/v8.h"
#endif
@ -20,7 +20,7 @@
#if BUILDFLAG(ENABLE_NACL)
#include "components/nacl/common/nacl_switches.h"
@@ -265,7 +267,7 @@ void SetUpExtendedCrashReporting(bool is_browser_proce
@@ -267,7 +269,7 @@ void SetUpExtendedCrashReporting(bool is_browser_proce
#endif // defined(OS_WIN)
@ -29,7 +29,7 @@
void AdjustLinuxOOMScore(const std::string& process_type) {
int score = -1;
@@ -300,7 +302,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty
@@ -302,7 +304,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty
if (score > -1)
base::AdjustOOMScore(base::GetCurrentProcId(), score);
}
@ -38,7 +38,7 @@
// Returns true if this subprocess type needs the ResourceBundle initialized
// and resources loaded.
@@ -346,7 +348,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
@@ -348,7 +350,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -47,7 +47,7 @@
// Show the man page if --help or -h is on the command line.
void HandleHelpSwitches(const base::CommandLine& command_line) {
if (command_line.HasSwitch(switches::kHelp) ||
@@ -356,7 +358,7 @@ void HandleHelpSwitches(const base::CommandLine& comma
@@ -358,7 +360,7 @@ void HandleHelpSwitches(const base::CommandLine& comma
PLOG(FATAL) << "execlp failed";
}
}
@ -56,7 +56,7 @@
#if !defined(OS_MAC) && !defined(OS_ANDROID)
void SIGTERMProfilingShutdown(int signal) {
@@ -410,7 +412,7 @@ void InitializeUserDataDir(base::CommandLine* command_
@@ -412,7 +414,7 @@ void InitializeUserDataDir(base::CommandLine* command_
std::string process_type =
command_line->GetSwitchValueASCII(switches::kProcessType);
@ -65,7 +65,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.
@@ -422,7 +424,7 @@ void InitializeUserDataDir(base::CommandLine* command_
@@ -424,7 +426,7 @@ void InitializeUserDataDir(base::CommandLine* command_
user_data_dir = base::FilePath::FromUTF8Unsafe(user_data_dir_string);
}
}
@ -74,7 +74,7 @@
#if defined(OS_MAC)
policy::path_parser::CheckUserDataDirPolicy(&user_data_dir);
#endif // OS_MAC
@@ -493,7 +495,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat
@@ -495,7 +497,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat
startup_metric_utils::RecordApplicationStartTime(now);
#endif
@ -83,7 +83,7 @@
defined(OS_CHROMEOS)
// Record the startup process creation time on supported platforms. On Android
// this is recorded in ChromeMainDelegateAndroid.
@@ -673,6 +675,8 @@ void ChromeMainDelegate::PostFieldTrialInitialization(
@@ -679,6 +681,8 @@ void ChromeMainDelegate::PostFieldTrialInitialization(
// not always enabled on Linux/ChromeOS.
#if defined(OS_LINUX) || defined(OS_CHROMEOS)
bool enable_gwp_asan = crash_reporter::IsCrashpadEnabled();
@ -92,7 +92,7 @@
#else
bool enable_gwp_asan = true;
#endif
@@ -781,7 +785,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
@@ -790,7 +794,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
v8_crashpad_support::SetUp();
#endif
@ -101,7 +101,7 @@
if (!crash_reporter::IsCrashpadEnabled()) {
breakpad::SetFirstChanceExceptionHandler(v8::TryHandleWebAssemblyTrapPosix);
}
@@ -794,7 +798,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
@@ -803,7 +807,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
}
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -110,7 +110,7 @@
// This will directly exit if the user asked for help.
HandleHelpSwitches(command_line);
#endif
@@ -1005,7 +1009,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
@@ -1014,7 +1018,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
crash_reporter::InitializeCrashKeys();
@ -119,7 +119,7 @@
ChromeCrashReporterClient::Create();
#endif
@@ -1018,7 +1022,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
@@ -1027,7 +1031,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
child_process_logging::Init();
#endif
#if defined(ARCH_CPU_ARM_FAMILY) && \
@ -128,7 +128,7 @@
// Create an instance of the CPU class to parse /proc/cpuinfo and cache
// cpu_brand info.
base::CPU cpu_info;
@@ -1136,7 +1140,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
@@ -1148,7 +1152,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
locale;
}
@ -137,7 +137,7 @@
// Zygote needs to call InitCrashReporter() in RunZygote().
if (process_type != switches::kZygoteProcess) {
#if defined(OS_ANDROID)
@@ -1157,7 +1161,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
@@ -1169,7 +1173,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
}
#endif // defined(OS_ANDROID)
}
@ -146,7 +146,7 @@
#if defined(OS_ANDROID)
CHECK_EQ(base::android::GetLibraryProcessType(),
@@ -1177,7 +1181,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
@@ -1189,7 +1193,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
void ChromeMainDelegate::SandboxInitialized(const std::string& process_type) {
// Note: If you are adding a new process type below, be sure to adjust the
// AdjustLinuxOOMScore function too.
@ -155,7 +155,7 @@
AdjustLinuxOOMScore(process_type);
#endif
#if defined(OS_WIN)
@@ -1219,7 +1223,7 @@ int ChromeMainDelegate::RunProcess(
@@ -1231,7 +1235,7 @@ int ChromeMainDelegate::RunProcess(
// This entry is not needed on Linux, where the NaCl loader
// process is launched via nacl_helper instead.
@ -164,7 +164,7 @@
{switches::kNaClLoaderProcess, NaClMain},
#else
{"<invalid>", nullptr}, // To avoid constant array of size 0
@@ -1247,7 +1251,7 @@ void ChromeMainDelegate::ProcessExiting(const std::str
@@ -1259,7 +1263,7 @@ void ChromeMainDelegate::ProcessExiting(const std::str
#endif // !defined(OS_ANDROID)
}
@ -173,7 +173,7 @@
void ChromeMainDelegate::ZygoteStarting(
std::vector<std::unique_ptr<content::ZygoteForkDelegate>>* delegates) {
#if BUILDFLAG(IS_CHROMEOS_ASH)
@@ -1284,7 +1288,7 @@ void ChromeMainDelegate::ZygoteForked() {
@@ -1296,7 +1300,7 @@ void ChromeMainDelegate::ZygoteForked() {
crash_keys::SetCrashKeysFromCommandLine(*command_line);
}

10
www/chromium/files/patch-chrome_app_chromium__strings.grd
View file

@ -1,15 +1,15 @@
--- chrome/app/chromium_strings.grd.orig 2021-09-14 01:51:48 UTC
--- chrome/app/chromium_strings.grd.orig 2021-12-31 00:57:19 UTC
+++ chrome/app/chromium_strings.grd
@@ -722,7 +722,7 @@ Chromium is unable to recover your settings.
@@ -802,7 +802,7 @@ Chromium is unable to recover your settings.
</if>
<!-- about:browser-switch strings -->
- <if expr="is_win or is_macosx or (is_linux and not chromeos)">
+ <if expr="is_win or is_macosx or (is_posix and not chromeos)">
- <if expr="is_win or is_macosx or is_fuchsia or (is_linux and not chromeos)">
+ <if expr="is_win or is_macosx or is_fuchsia or (is_linux and not chromeos) or is_bsd">
<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>
@@ -846,7 +846,7 @@ Chromium is unable to recover your settings.
@@ -926,7 +926,7 @@ Chromium is unable to recover your settings.
</message>
<!-- ProcessSingleton -->

22
www/chromium/files/patch-chrome_app_generated__resources.grd
View file

@ -1,24 +1,24 @@
--- chrome/app/generated_resources.grd.orig 2021-09-24 04:25:56 UTC
--- chrome/app/generated_resources.grd.orig 2021-12-31 00:57:19 UTC
+++ chrome/app/generated_resources.grd
@@ -296,7 +296,7 @@ are declared in tools/grit/grit_rule.gni.
<if expr="not is_android">
<part file="protocol_handler_intent_picker_strings.grdp" />
</if>
@@ -293,7 +293,7 @@ are declared in tools/grit/grit_rule.gni.
<part file="profiles_strings.grdp" />
<!-- Web app intent picker strings -->
- <if expr="is_win or is_macosx or is_linux">
+ <if expr="is_win or is_macosx or is_linux or is_posix">
+ <if expr="is_win or is_macosx or is_linux or is_bsd">
<part file="url_handler_intent_picker_strings.grdp" />
</if>
@@ -5453,7 +5453,7 @@ Keep your key file in a safe place. You will need it t
@@ -5524,7 +5524,7 @@ Keep your key file in a safe place. You will need it t
</if>
<!-- chrome://browser-switch strings -->
- <if expr="is_win or is_macosx or (is_linux and not chromeos)">
+ <if expr="is_win or is_macosx or (is_posix and not chromeos)">
- <if expr="is_win or is_macosx or is_fuchsia or (is_linux and not chromeos)">
+ <if expr="is_win or is_macosx or is_fuchsia or (is_linux and not chromeos) or is_bsd">
<message name="IDS_ABOUT_BROWSER_SWITCH_TITLE" desc="about:browser-switch page title">
Legacy Browser Support
</message>
@@ -7731,7 +7731,7 @@ Keep your key file in a safe place. You will need it t
@@ -7921,7 +7921,7 @@ Keep your key file in a safe place. You will need it t
Google Pay
</message>
@ -27,7 +27,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>
@@ -8795,7 +8795,7 @@ Please help our engineers fix this problem. Tell us wh
@@ -8995,7 +8995,7 @@ Please help our engineers fix this problem. Tell us wh
Set as default
</message>

10
www/chromium/files/patch-chrome_app_google__chrome__strings.grd
View file

@ -1,15 +1,15 @@
--- chrome/app/google_chrome_strings.grd.orig 2021-09-14 01:51:48 UTC
--- chrome/app/google_chrome_strings.grd.orig 2021-12-31 00:57:19 UTC
+++ chrome/app/google_chrome_strings.grd
@@ -730,7 +730,7 @@ Google Chrome is unable to recover your settings.
@@ -810,7 +810,7 @@ Google Chrome is unable to recover your settings.
</if>
<!-- about:browser-switch strings -->
- <if expr="is_win or is_macosx or (is_linux and not chromeos)">
+ <if expr="is_win or is_macosx or (is_posix and not chromeos)">
- <if expr="is_win or is_macosx or is_fuchsia or (is_linux and not chromeos)">
+ <if expr="is_win or is_macosx or is_fuchsia or (is_linux and not chromeos) or is_bsd">
<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>
@@ -854,7 +854,7 @@ Google Chrome is unable to recover your settings.
@@ -934,7 +934,7 @@ Google Chrome is unable to recover your settings.
</message>
<!-- ProcessSingleton -->

23
www/chromium/files/patch-chrome_browser_BUILD.gn
View file

@ -1,8 +1,8 @@
--- chrome/browser/BUILD.gn.orig 2021-09-24 04:25:57 UTC
--- chrome/browser/BUILD.gn.orig 2021-12-31 00:57:21 UTC
+++ chrome/browser/BUILD.gn
@@ -2458,9 +2458,18 @@ static_library("browser") {
deps += [ "//chromeos/services/libassistant/public/mojom" ]
}
@@ -2520,9 +2520,18 @@ static_library("browser") {
"policy/messaging_layer/util/heartbeat_event_factory.h",
]
}
- if (is_linux || is_chromeos) {
+ if ((is_linux || is_chromeos) && !is_bsd) {
@ -20,7 +20,16 @@
if (use_ozone) {
deps += [
"//ui/events/ozone",
@@ -5515,6 +5524,17 @@ static_library("browser") {
@@ -5702,7 +5711,7 @@ static_library("browser") {
}
}
- if (is_linux && use_dbus) {
+ if ((is_linux && !is_bsd) && use_dbus) {
sources += [
"dbus_memory_pressure_evaluator_linux.cc",
"dbus_memory_pressure_evaluator_linux.h",
@@ -5801,6 +5810,17 @@ static_library("browser") {
]
}
@ -38,8 +47,8 @@
if (is_posix) {
sources += [
"shutdown_signal_handlers_posix.cc",
@@ -5675,7 +5695,7 @@ static_library("browser") {
]
@@ -5966,7 +5986,7 @@ static_library("browser") {
deps += [ "//chromeos/ui/base" ]
}
- if (is_posix && !is_mac) {

127
www/chromium/files/patch-chrome_browser_about__flags.cc
View file

@ -1,16 +1,38 @@
--- chrome/browser/about_flags.cc.orig 2021-09-24 04:25:57 UTC
--- chrome/browser/about_flags.cc.orig 2021-12-31 00:57:21 UTC
+++ chrome/browser/about_flags.cc
@@ -195,7 +195,7 @@
#include "ui/gl/gl_switches.h"
@@ -204,7 +204,7 @@
#include "ui/native_theme/native_theme_features.h"
#include "ui/ui_features.h"
-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
#include "base/allocator/buildflags.h"
#endif
@@ -966,7 +966,7 @@ const FeatureEntry::FeatureVariation kMemoriesVariatio
base::size(kMemoryVariationRemote), nullptr},
@@ -272,10 +272,10 @@
#include "chrome/browser/supervised_user/supervised_user_features/supervised_user_features.h"
#endif // ENABLE_SUPERVISED_USERS
-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_BSD)
#include "ui/ozone/buildflags.h"
#include "ui/ozone/public/ozone_switches.h"
-#endif // OS_LINUX || BUILDFLAG(IS_CHROMEOS_ASH)
+#endif // OS_LINUX || BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_BSD)
#if defined(OS_WIN)
#include "base/win/windows_version.h"
@@ -385,7 +385,7 @@ const FeatureEntry::Choice kUseAngleChoicesMac[] = {
gl::kANGLEImplementationMetalName}};
#endif
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = {
{flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""},
{flag_descriptions::kOzonePlatformHintChoiceAuto,
@@ -985,7 +985,7 @@ const FeatureEntry::FeatureVariation kPageContentAnnot
base::size(kPageContentAnnotationsTitleParams), nullptr},
};
-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \
@ -18,7 +40,7 @@
defined(OS_WIN)
const FeatureEntry::FeatureParam kOmniboxDocumentProviderServerScoring[] = {
{"DocumentUseServerScore", "true"},
@@ -1164,7 +1164,7 @@ const FeatureEntry::FeatureVariation kOmniboxBookmarkP
@@ -1193,7 +1193,7 @@ const FeatureEntry::FeatureVariation kOmniboxBookmarkP
{"Dynamic Replace URL (Title - Path|URL)",
kOmniboxBookmarkPathsDynamicReplaceUrl,
base::size(kOmniboxBookmarkPathsDynamicReplaceUrl), nullptr}};
@ -27,8 +49,8 @@
// defined(OS_WIN)
const FeatureEntry::FeatureVariation
@@ -3131,7 +3131,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(media::kDeprecateLowUsageCodecs)},
@@ -3296,7 +3296,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(chromeos::kLacrosTtsSupport)},
#endif // defined(OS_CHROMEOS)
-#if defined(OS_LINUX)
@ -36,7 +58,7 @@
{
"enable-accelerated-video-decode",
flag_descriptions::kAcceleratedVideoDecodeName,
@@ -3149,7 +3149,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -3314,7 +3314,7 @@ const FeatureEntry kFeatureEntries[] = {
kOsMac | kOsWin | kOsCrOS | kOsAndroid | kOsLinux,
SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
},
@ -45,7 +67,7 @@
{
"disable-accelerated-video-encode",
flag_descriptions::kAcceleratedVideoEncodeName,
@@ -3511,7 +3511,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -3685,7 +3685,7 @@ const FeatureEntry kFeatureEntries[] = {
{"enable-login-detection", flag_descriptions::kEnableLoginDetectionName,
flag_descriptions::kEnableLoginDetectionDescription, kOsAll,
FEATURE_VALUE_TYPE(login_detection::kLoginDetection)},
@ -54,16 +76,25 @@
{"enable-save-data", flag_descriptions::kEnableSaveDataName,
flag_descriptions::kEnableSaveDataDescription, kOsCrOS | kOsLinux,
SINGLE_VALUE_TYPE(
@@ -3521,7 +3521,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -3695,7 +3695,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kEnableNavigationPredictorDescription,
kOsCrOS | kOsLinux,
FEATURE_VALUE_TYPE(blink::features::kNavigationPredictor)},
-#endif // BUILDFLAG(IS_CHROMEOS_ASH) || OS_LINUX
+#endif // BUILDFLAG(IS_CHROMEOS_ASH) || OS_LINUX || OS_BSD
-#endif // BUILDFLAG(IS_CHROMEOS) || OS_LINUX
+#endif // BUILDFLAG(IS_CHROMEOS) || OS_LINUX || OS_BSD
{"enable-preconnect-to-search",
flag_descriptions::kEnablePreconnectToSearchName,
flag_descriptions::kEnablePreconnectToSearchDescription, kOsAll,
@@ -4326,7 +4326,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -3873,7 +3873,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kWebShare)},
#endif // BUILDFLAG(IS_CHROMEOS_ASH) || OS_WIN || OS_MAC
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
{"ozone-platform-hint", flag_descriptions::kOzonePlatformHintName,
flag_descriptions::kOzonePlatformHintDescription, kOsLinux,
MULTI_VALUE_TYPE(kOzonePlatformHintRuntimeChoices)},
@@ -4567,7 +4567,7 @@ const FeatureEntry kFeatureEntries[] = {
kOsAll,
FEATURE_VALUE_TYPE(omnibox::kOmniboxTrendingZeroPrefixSuggestionsOnNTP)},
@ -72,7 +103,7 @@
defined(OS_WIN)
{"omnibox-experimental-keyword-mode",
flag_descriptions::kOmniboxExperimentalKeywordModeName,
@@ -4438,7 +4438,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -4676,7 +4676,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kOmniboxPreserveLongerShortcutsTextName,
flag_descriptions::kOmniboxPreserveLongerShortcutsTextDescription,
kOsDesktop, FEATURE_VALUE_TYPE(omnibox::kPreserveLongerShortcutsText)},
@ -81,7 +112,7 @@
// defined(OS_WIN)
#if BUILDFLAG(IS_CHROMEOS_ASH)
@@ -4707,12 +4707,12 @@ const FeatureEntry kFeatureEntries[] = {
@@ -4952,12 +4952,12 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(chrome::android::kReaderModeInCCT)},
#endif // !defined(OS_ANDROID)
@ -96,7 +127,7 @@
// defined(OS_CHROMEOS)
#if !defined(OS_ANDROID)
@@ -5322,7 +5322,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -5577,7 +5577,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kSharingSendViaSyncDescription, kOsAll,
FEATURE_VALUE_TYPE(kSharingSendViaSync)},
@ -105,7 +136,7 @@
{"sharing-hub-desktop-app-menu",
flag_descriptions::kSharingHubDesktopAppMenuName,
flag_descriptions::kSharingHubDesktopAppMenuDescription, kOsDesktop,
@@ -5331,7 +5331,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -5586,7 +5586,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kSharingHubDesktopOmniboxName,
flag_descriptions::kSharingHubDesktopOmniboxDescription, kOsDesktop,
FEATURE_VALUE_TYPE(sharing_hub::kSharingHubDesktopOmnibox)},
@ -114,26 +145,25 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
{"ash-enable-pip-rounded-corners",
@@ -5805,7 +5805,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -6011,14 +6011,14 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kMouseSubframeNoImplicitCaptureDescription, kOsAll,
FEATURE_VALUE_TYPE(features::kMouseSubframeNoImplicitCapture)},
-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \
defined(OS_CHROMEOS)
{"global-media-controls", flag_descriptions::kGlobalMediaControlsName,
flag_descriptions::kGlobalMediaControlsDescription,
@@ -5846,7 +5846,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kGlobalMediaControlsOverlayControlsDescription,
kOsWin | kOsMac | kOsLinux,
FEATURE_VALUE_TYPE(media::kGlobalMediaControlsOverlayControls)},
{"global-media-controls-modern-ui",
flag_descriptions::kGlobalMediaControlsModernUIName,
flag_descriptions::kGlobalMediaControlsModernUIDescription,
kOsWin | kOsMac | kOsLinux | kOsCrOS,
FEATURE_VALUE_TYPE(media::kGlobalMediaControlsModernUI)},
-#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) ||
+#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) ||
// defined(OS_CHROMEOS)
{"safety-tips", flag_descriptions::kSafetyTipName,
@@ -6648,7 +6648,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kIncognitoReauthenticationForAndroid)},
@@ -6734,7 +6734,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(chrome::android::kIncognitoReauthenticationForAndroid)},
#endif
-#if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || \
@ -141,7 +171,7 @@
defined(OS_CHROMEOS) || defined(OS_FUCHSIA)
{"incognito-brand-consistency-for-desktop",
flag_descriptions::kIncognitoBrandConsistencyForDesktopName,
@@ -6667,7 +6667,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -6753,7 +6753,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kInheritNativeThemeFromParentWidgetDescription,
kOsDesktop,
FEATURE_VALUE_TYPE(views::features::kInheritNativeThemeFromParentWidget)},
@ -149,8 +179,8 @@
+#endif // defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) ||
// defined(OS_CHROMEOS) || defined(OS_FUCHSIA)
{"content-settings-redesign",
@@ -6778,7 +6778,7 @@ const FeatureEntry kFeatureEntries[] = {
{"consolidated-site-storage-controls",
@@ -6867,7 +6867,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(language::kForceAppLanguagePrompt)},
#endif
@ -159,36 +189,16 @@
{"commander", flag_descriptions::kCommanderName,
flag_descriptions::kCommanderDescription, kOsDesktop,
FEATURE_VALUE_TYPE(features::kCommander)},
@@ -6805,8 +6805,8 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kSyncAutofillWalletOfferDataDescription, kOsAll,
FEATURE_VALUE_TYPE(switches::kSyncAutofillWalletOfferData)},
-#if (defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
- defined(OS_CHROMEOS)) && \
+#if (defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \
+ defined(OS_CHROMEOS)) && \
BUILDFLAG(ENABLE_PRINTING)
{"enable-oop-print-drivers", flag_descriptions::kEnableOopPrintDriversName,
flag_descriptions::kEnableOopPrintDriversDescription, kOsDesktop,
@@ -7091,7 +7091,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(media::kVaapiVp9kSVCHWEncoding)},
#endif // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS_ASH)
@@ -7121,7 +7121,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kVp9kSVCHWDecodingDescription, kOsAll,
FEATURE_VALUE_TYPE(media::kVp9kSVCHWDecoding)},
-#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
+#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) || \
defined(OS_MAC)
{
"ui-debug-tools",
@@ -7181,7 +7181,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(metrics::structured::kBluetoothSessionizedMetrics)},
#endif
-#if defined(OS_LINUX) && defined(USE_OZONE)
+#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_OZONE)
{"use-ozone-platform", flag_descriptions::kUseOzonePlatformName,
flag_descriptions::kUseOzonePlatformDescription, kOsLinux,
FEATURE_VALUE_TYPE(features::kUseOzonePlatform)},
@@ -7224,7 +7224,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -7259,7 +7259,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(chromeos::features::kLauncherAppSort)},
#endif
@ -197,12 +207,3 @@
{"enable-desktop-pwas-app-icon-shortcuts-menu-ui",
flag_descriptions::kDesktopPWAsAppIconShortcutsMenuUIName,
flag_descriptions::kDesktopPWAsAppIconShortcutsMenuUIDescription,
@@ -7487,7 +7487,7 @@ const FeatureEntry kFeatureEntries[] = {
ash::features::kHoldingSpaceInProgressDownloadsIntegration)},
#endif
-#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
+#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) || \
defined(OS_MAC) || (defined(OS_ANDROID))
{"omnibox-updated-connection-security-indicators",
flag_descriptions::kOmniboxUpdatedConnectionSecurityIndicatorsName,

8
www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc
View file

@ -1,4 +1,4 @@
--- chrome/browser/after_startup_task_utils.cc.orig 2021-07-19 18:45:07 UTC
--- chrome/browser/after_startup_task_utils.cc.orig 2021-12-31 00:57:21 UTC
+++ chrome/browser/after_startup_task_utils.cc
@@ -22,7 +22,7 @@
@ -9,7 +9,7 @@
#include "ui/views/linux_ui/linux_ui.h"
#endif
@@ -103,7 +103,7 @@ void SetBrowserStartupIsComplete() {
@@ -107,7 +107,7 @@ void SetBrowserStartupIsComplete() {
return;
g_startup_complete_flag.Get().Set();
@ -18,7 +18,7 @@
defined(OS_CHROMEOS)
// Process::Current().CreationTime() is not available on all platforms.
const base::Time process_creation_time =
@@ -112,7 +112,7 @@ void SetBrowserStartupIsComplete() {
@@ -116,7 +116,7 @@ void SetBrowserStartupIsComplete() {
UMA_HISTOGRAM_LONG_TIMES("Startup.AfterStartupTaskDelayedUntilTime",
base::Time::Now() - process_creation_time);
}
@ -27,7 +27,7 @@
// defined(OS_CHROMEOS)
UMA_HISTOGRAM_COUNTS_10000("Startup.AfterStartupTaskCount",
g_after_startup_tasks.Get().size());
@@ -123,7 +123,7 @@ void SetBrowserStartupIsComplete() {
@@ -127,7 +127,7 @@ void SetBrowserStartupIsComplete() {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.

6
www/chromium/files/patch-chrome_browser_apps_platform__apps_api_media__galleries_media__galleries__apitest.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/apps/platform_apps/api/media_galleries/media_galleries_apitest.cc.orig 2021-05-12 22:05:43 UTC
--- chrome/browser/apps/platform_apps/api/media_galleries/media_galleries_apitest.cc.orig 2021-12-31 00:57:21 UTC
+++ chrome/browser/apps/platform_apps/api/media_galleries/media_galleries_apitest.cc
@@ -299,7 +299,7 @@ IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppPpapiT
@@ -298,7 +298,7 @@ IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppPpapiT
// Test is flaky, it fails on certain bots, namely WinXP Tests(1) and Linux
// (dbg)(1)(32). See crbug.com/354425.
@ -9,7 +9,7 @@
#define MAYBE_MediaGalleriesNoAccess DISABLED_MediaGalleriesNoAccess
#else
#define MAYBE_MediaGalleriesNoAccess MediaGalleriesNoAccess
@@ -337,7 +337,7 @@ IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowse
@@ -336,7 +336,7 @@ IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowse
// Test is flaky, it fails on certain bots, namely WinXP Tests(1) and Linux
// (dbg)(1)(32). See crbug.com/354425.

4
www/chromium/files/patch-chrome_browser_browsing__data_chrome__browsing__data__remover__delegate.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc.orig 2021-09-24 04:25:58 UTC
--- chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc.orig 2021-12-14 11:44:57 UTC
+++ chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
@@ -639,7 +639,9 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedder
@@ -608,7 +608,9 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedder
}
#endif

35
www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc
View file

@ -1,7 +1,16 @@
--- chrome/browser/chrome_browser_interface_binders.cc.orig 2021-09-24 04:25:58 UTC
--- chrome/browser/chrome_browser_interface_binders.cc.orig 2021-12-31 00:57:22 UTC
+++ chrome/browser/chrome_browser_interface_binders.cc
@@ -155,7 +155,7 @@
#include "ui/webui/resources/cr_components/most_visited/most_visited.mojom.h"
@@ -94,7 +94,7 @@
#include "chrome/browser/ui/webui/reset_password/reset_password_ui.h"
#endif // BUILDFLAG(FULL_SAFE_BROWSING)
-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \
BUILDFLAG(IS_CHROMEOS_ASH)
#include "chrome/browser/ui/webui/connectors_internals/connectors_internals.mojom.h"
#include "chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.h"
@@ -159,7 +159,7 @@
#include "ui/webui/resources/js/browser_command/browser_command.mojom.h"
#endif // defined(OS_ANDROID)
-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
@ -9,15 +18,16 @@
defined(OS_CHROMEOS)
#include "chrome/browser/ui/webui/discards/discards.mojom.h"
#include "chrome/browser/ui/webui/discards/discards_ui.h"
@@ -637,14 +637,14 @@ void PopulateChromeFrameBinders(
@@ -648,7 +648,7 @@ void PopulateChromeFrameBinders(
base::BindRepeating(&BindSpeechRecognitionRecognizerClientHandler));
#endif
-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD)
-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \
defined(OS_CHROMEOS)
if (!render_frame_host->GetParent()) {
map->Add<chrome::mojom::DraggableRegions>(
base::BindRepeating(&DraggableRegionsHostImpl::CreateIfAllowed));
@@ -656,7 +656,7 @@ void PopulateChromeFrameBinders(
}
#endif
@ -26,7 +36,16 @@
defined(OS_WIN)
if (base::FeatureList::IsEnabled(blink::features::kDesktopPWAsSubApps) &&
!render_frame_host->GetParent()) {
@@ -952,7 +952,7 @@ void PopulateChromeWebUIFrameBinders(
@@ -691,7 +691,7 @@ void PopulateChromeWebUIFrameBinders(
RegisterWebUIControllerInterfaceBinder<federated_learning::mojom::PageHandler,
FlocInternalsUI>(map);
-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \
BUILDFLAG(IS_CHROMEOS_ASH)
RegisterWebUIControllerInterfaceBinder<
connectors_internals::mojom::PageHandler,
@@ -981,7 +981,7 @@ void PopulateChromeWebUIFrameBinders(
}
#endif

16
www/chromium/files/patch-chrome_browser_chrome__browser__main.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/chrome_browser_main.cc.orig 2021-09-24 04:25:58 UTC
--- chrome/browser/chrome_browser_main.cc.orig 2021-12-14 11:44:57 UTC
+++ chrome/browser/chrome_browser_main.cc
@@ -260,7 +260,7 @@
@@ -261,7 +261,7 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
#if defined(OS_WIN) || defined(OS_MAC) || \
@ -9,7 +9,7 @@
#include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h"
#include "chrome/browser/metrics/desktop_session_duration/touch_mode_stats_tracker.h"
#include "chrome/browser/profiles/profile_activity_metrics_recorder.h"
@@ -942,7 +942,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
@@ -951,7 +951,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
AddFirstRunNewTabs(browser_creator_.get(), master_prefs_->new_tabs);
}
@ -18,7 +18,7 @@
// Create directory for user-level Native Messaging manifest files. This
// makes it less likely that the directory will be created by third-party
// software with incorrect owner or permission. See crbug.com/725513 .
@@ -951,7 +951,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
@@ -960,7 +960,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
&user_native_messaging_dir));
if (!base::PathExists(user_native_messaging_dir))
base::CreateDirectory(user_native_messaging_dir);
@ -27,7 +27,7 @@
}
#endif // !defined(OS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH)
@@ -976,7 +976,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
@@ -985,7 +985,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
#if defined(OS_WIN) || defined(OS_MAC) || \
@ -36,15 +36,15 @@
metrics::DesktopSessionDurationTracker::Initialize();
ProfileActivityMetricsRecorder::Initialize();
TouchModeStatsTracker::Initialize(
@@ -1146,6 +1146,7 @@ void ChromeBrowserMainParts::PostBrowserStart() {
base::TimeDelta::FromMinutes(1));
@@ -1177,6 +1177,7 @@ void ChromeBrowserMainParts::PostBrowserStart() {
base::Minutes(1));
#if !defined(OS_ANDROID)
+#if !defined(OS_BSD)
if (base::FeatureList::IsEnabled(features::kWebUsb)) {
web_usb_detector_ = std::make_unique<WebUsbDetector>();
content::GetUIThreadTaskRunner({base::TaskPriority::BEST_EFFORT})
@@ -1153,6 +1154,7 @@ void ChromeBrowserMainParts::PostBrowserStart() {
@@ -1184,6 +1185,7 @@ void ChromeBrowserMainParts::PostBrowserStart() {
base::BindOnce(&WebUsbDetector::Initialize,
base::Unretained(web_usb_detector_.get())));
}

20
www/chromium/files/patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc Normal file
View file

@ -0,0 +1,20 @@
--- chrome/browser/chrome_browser_main_extra_parts_linux.cc.orig 2022-01-21 13:07:37 UTC
+++ chrome/browser/chrome_browser_main_extra_parts_linux.cc
@@ -120,7 +120,7 @@ ChromeBrowserMainExtraPartsLinux::ChromeBrowserMainExt
ChromeBrowserMainExtraPartsLinux::~ChromeBrowserMainExtraPartsLinux() = default;
void ChromeBrowserMainExtraPartsLinux::PreEarlyInitialization() {
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
// On the desktop, we fix the platform name if necessary.
// See https://crbug.com/1246928.
auto* const command_line = base::CommandLine::ForCurrentProcess();
@@ -132,7 +132,7 @@ void ChromeBrowserMainExtraPartsLinux::PreEarlyInitial
switches::kOzonePlatform, MaybeFixPlatformName(ozone_platform_hint));
}
}
-#endif // defined(OS_LINUX)
+#endif // defined(OS_LINUX) || defined(OS_BSD)
ChromeBrowserMainExtraPartsOzone::PreEarlyInitialization();
}

37
www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc
View file

@ -1,15 +1,30 @@
--- chrome/browser/chrome_browser_main_linux.cc.orig 2021-07-19 18:45:08 UTC
--- chrome/browser/chrome_browser_main_linux.cc.orig 2022-01-20 10:35:49 UTC
+++ chrome/browser/chrome_browser_main_linux.cc
@@ -47,7 +47,7 @@ ChromeBrowserMainPartsLinux::~ChromeBrowserMainPartsLi
}
@@ -30,7 +30,7 @@
#include "chrome/installer/util/google_update_settings.h"
#endif
-#if defined(USE_DBUS) && !defined(OS_CHROMEOS)
+#if defined(USE_DBUS) && !defined(OS_CHROMEOS) && !defined(OS_BSD)
#include "chrome/browser/dbus_memory_pressure_evaluator_linux.h"
#endif
@@ -54,12 +54,14 @@ ChromeBrowserMainPartsLinux::~ChromeBrowserMainPartsLi
void ChromeBrowserMainPartsLinux::PreProfileInit() {
-#if !BUILDFLAG(IS_CHROMEOS_ASH)
+#if !BUILDFLAG(IS_CHROMEOS_ASH) && !defined(OS_BSD)
#if !BUILDFLAG(IS_CHROMEOS_ASH)
+#if !defined(OS_BSD)
// Needs to be called after we have chrome::DIR_USER_DATA and
// g_browser_process. This happens in PreCreateThreads.
// base::GetLinuxDistro() will initialize its value if needed.
@@ -78,7 +78,7 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() {
base::ThreadPool::PostTask(
FROM_HERE, {base::MayBlock(), base::TaskPriority::BEST_EFFORT},
base::BindOnce(base::IgnoreResult(&base::GetLinuxDistro)));
+#endif
// Set up crypt config. This should be kept in sync with the OSCrypt parts of
// SystemNetworkContextManager::OnNetworkServiceCreated.
@@ -82,14 +84,14 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() {
}
void ChromeBrowserMainPartsLinux::PostCreateMainMessageLoop() {
@ -18,9 +33,17 @@
bluez::BluezDBusManager::Initialize(nullptr /* system_bus */);
#endif
@@ -86,7 +86,7 @@ void ChromeBrowserMainPartsLinux::PostCreateMainMessag
ChromeBrowserMainPartsPosix::PostCreateMainMessageLoop();
}
-#if defined(USE_DBUS) && !defined(OS_CHROMEOS)
+#if defined(USE_DBUS) && !defined(OS_CHROMEOS) && !defined(OS_BSD)
void ChromeBrowserMainPartsLinux::PostBrowserStart() {
// static_cast is safe because this is the only implementation of
// MemoryPressureMonitor.
@@ -108,7 +110,7 @@ void ChromeBrowserMainPartsLinux::PostBrowserStart() {
#endif
void ChromeBrowserMainPartsLinux::PostDestroyThreads() {
-#if !BUILDFLAG(IS_CHROMEOS_ASH)
+#if !BUILDFLAG(IS_CHROMEOS_ASH) && !defined(OS_BSD)

11
www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.h Normal file
View file

@ -0,0 +1,11 @@
--- chrome/browser/chrome_browser_main_linux.h.orig 2022-01-04 12:26:19 UTC
+++ chrome/browser/chrome_browser_main_linux.h
@@ -25,7 +25,7 @@ class ChromeBrowserMainPartsLinux : public ChromeBrows
// ChromeBrowserMainParts overrides.
void PreProfileInit() override;
void PostCreateMainMessageLoop() override;
-#if defined(USE_DBUS) && !defined(OS_CHROMEOS)
+#if defined(USE_DBUS) && !defined(OS_CHROMEOS) && !defined(OS_BSD)
// Only needed for native Linux, to set up the low-memory-monitor-based memory
// monitoring (which depends on D-Bus).
void PostBrowserStart() override;

4
www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/chrome_browser_main_posix.cc.orig 2021-04-14 18:40:52 UTC
--- chrome/browser/chrome_browser_main_posix.cc.orig 2021-12-14 11:44:57 UTC
+++ chrome/browser/chrome_browser_main_posix.cc
@@ -72,7 +72,7 @@ void ExitHandler::ExitWhenPossibleOnUIThread(int signa
@@ -73,7 +73,7 @@ void ExitHandler::ExitWhenPossibleOnUIThread(int signa
} else {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.

40
www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/chrome_content_browser_client.cc.orig 2021-09-24 04:25:58 UTC
--- chrome/browser/chrome_content_browser_client.cc.orig 2022-01-20 10:35:49 UTC
+++ chrome/browser/chrome_content_browser_client.cc
@@ -361,7 +361,7 @@
@@ -368,7 +368,7 @@
#include "components/user_manager/user_manager.h"
#include "services/service_manager/public/mojom/interface_provider_spec.mojom.h"
#include "storage/browser/file_system/external_mount_points.h"
@ -9,7 +9,7 @@
#include "chrome/browser/chrome_browser_main_linux.h"
#elif defined(OS_ANDROID)
#include "base/android/application_status_listener.h"
@@ -425,7 +425,7 @@
@@ -432,7 +432,7 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
#if defined(OS_WIN) || defined(OS_MAC) || \
@ -18,7 +18,7 @@
#include "chrome/browser/browser_switcher/browser_switcher_navigation_throttle.h"
#endif
@@ -442,10 +442,10 @@
@@ -449,10 +449,10 @@
#include "components/crash/content/browser/crash_handler_host_linux.h"
#endif
@ -31,7 +31,7 @@
// BUILDFLAG(IS_CHROMEOS_ASH)
// TODO(crbug.com/939205): Once the upcoming App Service is available, use a
@@ -464,7 +464,7 @@
@@ -471,11 +471,11 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -40,7 +40,12 @@
#include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h"
#endif
@@ -860,11 +860,13 @@ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHos
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
#include "chrome/browser/chrome_browser_main_extra_parts_linux.h"
#elif defined(USE_OZONE)
#include "chrome/browser/chrome_browser_main_extra_parts_ozone.h"
@@ -875,11 +875,13 @@ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHos
}
int GetCrashSignalFD(const base::CommandLine& command_line) {
@ -54,7 +59,7 @@
// Extensions have the same process type as renderers.
if (command_line.HasSwitch(extensions::switches::kExtensionProcess)) {
@@ -1255,7 +1257,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
@@ -1349,7 +1351,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
#elif BUILDFLAG(IS_CHROMEOS_LACROS)
main_parts = std::make_unique<ChromeBrowserMainPartsLacros>(parameters,
&startup_data_);
@ -63,7 +68,7 @@
main_parts =
std::make_unique<ChromeBrowserMainPartsLinux>(parameters, &startup_data_);
#elif defined(OS_ANDROID)
@@ -1289,7 +1291,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
@@ -1383,7 +1385,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
std::make_unique<ChromeBrowserMainExtraPartsViewsLacros>());
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@ -72,7 +77,16 @@
main_parts->AddParts(
std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>());
#else
@@ -2058,7 +2060,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
@@ -1400,7 +1402,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLacros>());
#endif
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>());
#elif defined(USE_OZONE)
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>());
@@ -2176,7 +2178,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
command_line->AppendSwitchASCII(switches::kMetricsClientID,
client_info->client_id);
}
@ -81,7 +95,7 @@
#if defined(OS_ANDROID)
bool enable_crash_reporter = true;
#else
@@ -3649,7 +3651,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
@@ -3834,7 +3836,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
}
}
@ -90,7 +104,7 @@
void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
const base::CommandLine& command_line,
int child_process_id,
@@ -3684,7 +3686,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFi
@@ -3869,7 +3871,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFi
mappings->Share(kCrashDumpSignal, crash_signal_fd);
}
}
@ -99,7 +113,7 @@
#if defined(OS_WIN)
std::wstring ChromeContentBrowserClient::GetAppContainerSidForSandboxType(
@@ -4067,12 +4069,12 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
@@ -4242,12 +4244,12 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
&throttles);
}
@ -114,7 +128,7 @@
// BUILDFLAG(IS_CHROMEOS_ASH)
#if !defined(OS_ANDROID)
@@ -4101,7 +4103,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
@@ -4277,7 +4279,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
#if defined(OS_WIN) || defined(OS_MAC) || \

6
www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h
View file

@ -1,6 +1,6 @@
--- chrome/browser/chrome_content_browser_client.h.orig 2021-09-24 04:25:58 UTC
--- chrome/browser/chrome_content_browser_client.h.orig 2021-12-31 00:57:22 UTC
+++ chrome/browser/chrome_content_browser_client.h
@@ -402,12 +402,12 @@ class ChromeContentBrowserClient : public content::Con
@@ -405,12 +405,12 @@ class ChromeContentBrowserClient : public content::Con
void OverridePageVisibilityState(
content::RenderFrameHost* render_frame_host,
content::PageVisibilityState* visibility_state) override;
@ -14,4 +14,4 @@
+#endif // defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_BSD)
#if defined(OS_WIN)
bool PreSpawnChild(sandbox::TargetPolicy* policy,
sandbox::policy::SandboxType sandbox_type,
sandbox::mojom::Sandbox sandbox_type,

4
www/chromium/files/patch-chrome_browser_defaults.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/defaults.cc.orig 2021-04-14 18:40:53 UTC
--- chrome/browser/defaults.cc.orig 2021-12-14 11:44:58 UTC
+++ chrome/browser/defaults.cc
@@ -46,7 +46,7 @@ const bool kSyncAutoStarts = false;
@@ -50,7 +50,7 @@ const bool kSyncAutoStarts = false;
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.

8
www/chromium/files/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc
View file

@ -1,11 +1,11 @@
--- chrome/browser/device_identity/device_oauth2_token_service_factory.cc.orig 2021-09-14 01:51:50 UTC
--- chrome/browser/device_identity/device_oauth2_token_service_factory.cc.orig 2021-12-31 00:57:22 UTC
+++ chrome/browser/device_identity/device_oauth2_token_service_factory.cc
@@ -29,7 +29,7 @@ std::unique_ptr<DeviceOAuth2TokenStore> CreatePlatform
@@ -28,7 +28,7 @@ std::unique_ptr<DeviceOAuth2TokenStore> CreatePlatform
return std::make_unique<chromeos::DeviceOAuth2TokenStoreChromeOS>(
local_state);
#elif defined(OS_WIN) || defined(OS_MAC) || \
- (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
+ (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD)
DCHECK(
base::FeatureList::IsEnabled(policy::features::kCBCMPolicyInvalidations));
return std::make_unique<DeviceOAuth2TokenStoreDesktop>(local_state);
#else
NOTREACHED();

4
www/chromium/files/patch-chrome_browser_devtools_devtools__eye__dropper.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/devtools/devtools_eye_dropper.cc.orig 2021-09-14 01:51:50 UTC
--- chrome/browser/devtools/devtools_eye_dropper.cc.orig 2021-12-14 11:44:58 UTC
+++ chrome/browser/devtools/devtools_eye_dropper.cc
@@ -188,7 +188,7 @@ void DevToolsEyeDropper::UpdateCursor() {
@@ -187,7 +187,7 @@ void DevToolsEyeDropper::UpdateCursor() {
// magnified projection only with centered hotspot.
// Mac Retina requires cursor to be > 120px in order to render smoothly.

19
www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2021-09-24 04:25:58 UTC
--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2021-12-31 00:57:22 UTC
+++ chrome/browser/download/chrome_download_manager_delegate.cc
@@ -1395,7 +1395,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
@@ -1540,7 +1540,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
@@ -1450,7 +1450,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
@@ -1608,7 +1608,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile(
const base::FilePath& path) {
@ -18,7 +18,7 @@
defined(OS_MAC)
if (path.MatchesExtension(FILE_PATH_LITERAL(".pdf"))) {
return !download_prefs_->ShouldOpenPdfInSystemReader();
@@ -1554,7 +1554,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow
@@ -1716,7 +1716,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow
bool content_initiated,
content::CheckDownloadAllowedCallback check_download_allowed_cb) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
@ -27,7 +27,7 @@
defined(OS_MAC)
// 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.
@@ -1596,7 +1596,7 @@ ChromeDownloadManagerDelegate::GetQuarantineConnection
@@ -1758,7 +1758,7 @@ ChromeDownloadManagerDelegate::GetQuarantineConnection
std::unique_ptr<download::DownloadItemRenameHandler>
ChromeDownloadManagerDelegate::GetRenameHandlerForDownload(
download::DownloadItem* download_item) {
@ -36,3 +36,12 @@
defined(OS_MAC)
return enterprise_connectors::FileSystemRenameHandler::CreateIfNeeded(
download_item);
@@ -1774,7 +1774,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl
DCHECK(download_item);
DCHECK(download_item->IsSavePackageDownload());
-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \
defined(OS_MAC)
if (!base::FeatureList::IsEnabled(
download::features::kAllowSavePackageScanning)) {

6
www/chromium/files/patch-chrome_browser_download_download__commands.cc
View file

@ -1,4 +1,4 @@
--- chrome/browser/download/download_commands.cc.orig 2021-09-24 04:25:58 UTC
--- chrome/browser/download/download_commands.cc.orig 2021-12-14 11:44:58 UTC
+++ chrome/browser/download/download_commands.cc
@@ -27,7 +27,7 @@
#include "net/base/url_util.h"
@ -9,7 +9,7 @@
defined(OS_MAC) || defined(OS_FUCHSIA)
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_finder.h"
@@ -165,7 +165,7 @@ void DownloadCommands::ExecuteCommand(Command command)
@@ -168,7 +168,7 @@ void DownloadCommands::ExecuteCommand(Command command)
model_->ExecuteCommand(this, command);
}
@ -18,7 +18,7 @@
defined(OS_CHROMEOS) || defined(OS_FUCHSIA)
Browser* DownloadCommands::GetBrowser() const {
@@ -200,7 +200,7 @@ bool DownloadCommands::CanOpenPdfInSystemViewer() cons
@@ -203,7 +203,7 @@ bool DownloadCommands::CanOpenPdfInSystemViewer() cons
#endif
}

4
www/chromium/files/patch-chrome_browser_download_download__commands.h
View file

@ -1,6 +1,6 @@
--- chrome/browser/download/download_commands.h.orig 2021-09-24 04:25:58 UTC
--- chrome/browser/download/download_commands.h.orig 2021-12-14 11:44:58 UTC
+++ chrome/browser/download/download_commands.h
@@ -48,7 +48,7 @@ class DownloadCommands {
@@ -53,7 +53,7 @@ class DownloadCommands {
bool IsCommandVisible(Command command) const;
void ExecuteCommand(Command command);

6
www/chromium/files/patch-chrome_browser_download_download__item__model.cc
View file

@ -1,6 +1,6 @@
--- chrome/browser/download/download_item_model.cc.orig 2021-09-24 04:25:58 UTC
--- chrome/browser/download/download_item_model.cc.orig 2021-12-14 11:44:58 UTC
+++ chrome/browser/download/download_item_model.cc
@@ -625,7 +625,7 @@ bool DownloadItemModel::IsCommandChecked(
@@ -634,7 +634,7 @@ bool DownloadItemModel::IsCommandChecked(
return download_->GetOpenWhenComplete() ||
download_crx_util::IsExtensionDownload(*download_);
case DownloadCommands::ALWAYS_OPEN_TYPE:
@ -9,7 +9,7 @@
defined(OS_MAC)
if (download_commands->CanOpenPdfInSystemViewer()) {
DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile());
@@ -666,7 +666,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand
@@ -675,7 +675,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand
bool is_checked = IsCommandChecked(download_commands,
DownloadCommands::ALWAYS_OPEN_TYPE);
DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile());

14
www/chromium/files/patch-chrome_browser_download_download__prefs.cc
View file

@ -1,4 +1,4 @@
--- chrome/browser/download/download_prefs.cc.orig 2021-09-14 01:51:50 UTC
--- chrome/browser/download/download_prefs.cc.orig 2021-12-31 00:57:22 UTC
+++ chrome/browser/download/download_prefs.cc
@@ -70,7 +70,7 @@ namespace {
// Consider downloads 'dangerous' if they go to the home directory on Linux and
@ -9,7 +9,7 @@
base::FilePath home_dir = base::GetHomeDir();
if (download_path == home_dir) {
return true;
@@ -175,7 +175,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi
@@ -167,7 +167,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi
GetDefaultDownloadDirectoryForProfile()));
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@ -18,7 +18,7 @@
defined(OS_MAC)
should_open_pdf_in_system_reader_ =
prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader);
@@ -294,7 +294,7 @@ void DownloadPrefs::RegisterProfilePrefs(
@@ -286,7 +286,7 @@ void DownloadPrefs::RegisterProfilePrefs(
default_download_path);
registry->RegisterFilePathPref(prefs::kSaveFileDefaultDirectory,
default_download_path);
@ -27,7 +27,7 @@
defined(OS_MAC)
registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false);
#endif
@@ -428,7 +428,7 @@ bool DownloadPrefs::IsDownloadPathManaged() const {
@@ -420,7 +420,7 @@ bool DownloadPrefs::IsDownloadPathManaged() const {
}
bool DownloadPrefs::IsAutoOpenByUserUsed() const {
@ -36,7 +36,7 @@
defined(OS_MAC)
if (ShouldOpenPdfInSystemReader())
return true;
@@ -443,7 +443,7 @@ bool DownloadPrefs::IsAutoOpenEnabled(const GURL& url,
@@ -435,7 +435,7 @@ bool DownloadPrefs::IsAutoOpenEnabled(const GURL& url,
return false;
DCHECK(extension[0] == base::FilePath::kExtensionSeparator);
extension.erase(0, 1);
@ -45,7 +45,7 @@
defined(OS_MAC)
if (base::FilePath::CompareEqualIgnoreCase(extension,
FILE_PATH_LITERAL("pdf")) &&
@@ -498,7 +498,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens
@@ -490,7 +490,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens
SaveAutoOpenState();
}
@ -54,7 +54,7 @@
defined(OS_MAC)
void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) {
if (should_open_pdf_in_system_reader_ == should_open)
@@ -520,7 +520,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons
@@ -512,7 +512,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons
#endif
void DownloadPrefs::ResetAutoOpenByUser() {

6
www/chromium/files/patch-chrome_browser_download_download__prefs.h
View file

@ -1,6 +1,6 @@
--- chrome/browser/download/download_prefs.h.orig 2021-04-14 18:40:53 UTC
--- chrome/browser/download/download_prefs.h.orig 2021-12-14 11:44:58 UTC
+++ chrome/browser/download/download_prefs.h
@@ -117,7 +117,7 @@ class DownloadPrefs {
@@ -121,7 +121,7 @@ class DownloadPrefs {
// Disables auto-open based on file extension.
void DisableAutoOpenByUserBasedOnExtension(const base::FilePath& file_name);
@ -9,7 +9,7 @@
defined(OS_MAC)
// Store the user preference to disk. If |should_open| is true, also disable
// the built-in PDF plugin. If |should_open| is false, enable the PDF plugin.
@@ -176,7 +176,7 @@ class DownloadPrefs {
@@ -180,7 +180,7 @@ class DownloadPrefs {
std::unique_ptr<policy::URLBlocklist> auto_open_allowed_by_urls_;

10
www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc
View file

@ -1,14 +1,14 @@
--- chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc.orig 2021-09-24 18:20:01 UTC
--- chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc.orig 2021-12-31 00:57:22 UTC
+++ chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc
@@ -13,9 +13,9 @@
#include "components/keyed_service/content/browser_context_dependency_manager.h"
#include "components/keyed_service/core/keyed_service.h"
@@ -19,9 +19,9 @@
#include "components/policy/content/policy_blocklist_service.h"
#include "content/public/browser/browser_context.h"
-#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC)
+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD)
#include "chrome/browser/enterprise/connectors/device_trust/attestation/desktop/desktop_attestation_service.h"
-#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC)
+#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD)
#if BUILDFLAG(IS_CHROMEOS_ASH)
#include "chrome/browser/enterprise/connectors/device_trust/attestation/ash/ash_attestation_service.h"
#endif // BUILDFLAG(IS_CHROMEOS_ASH)

20
www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_core_persistence_key__persistence__delegate__factory.cc Normal file
View file

@ -0,0 +1,20 @@
--- chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/key_persistence_delegate_factory.cc.orig 2022-01-21 13:09:59 UTC
+++ chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/key_persistence_delegate_factory.cc
@@ -13,7 +13,7 @@
#include "chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/win_key_persistence_delegate.h"
#elif defined(OS_MAC)
#include "chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/mac_key_persistence_delegate.h"
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_BSD)
#include "chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/linux_key_persistence_delegate.h"
#endif
@@ -44,7 +44,7 @@ KeyPersistenceDelegateFactory::CreateKeyPersistenceDel
return std::make_unique<WinKeyPersistenceDelegate>();
#elif defined(OS_MAC)
return std::make_unique<MacKeyPersistenceDelegate>();
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_BSD)
return std::make_unique<LinuxKeyPersistenceDelegate>();
#else
NOTREACHED();

38
www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc Normal file
View file

@ -0,0 +1,38 @@
--- chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc.orig 2021-12-31 00:57:22 UTC
+++ chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc
@@ -14,7 +14,7 @@
#include "chrome/browser/enterprise/connectors/device_trust/signals/signals_service_impl.h"
#include "chrome/browser/profiles/profile.h"
-#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC)
+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD)
#include "base/check.h"
#include "chrome/browser/enterprise/connectors/device_trust/signals/decorators/browser/browser_signals_decorator.h"
#include "chrome/browser/enterprise/signals/device_info_fetcher.h"
@@ -22,7 +22,7 @@
#include "components/enterprise/browser/controller/browser_dm_token_storage.h"
#include "components/policy/core/common/cloud/machine_level_user_cloud_policy_manager.h"
#include "components/policy/core/common/cloud/machine_level_user_cloud_policy_store.h"
-#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC)
+#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD)
#if BUILDFLAG(IS_CHROMEOS_ASH)
#include "chrome/browser/browser_process_platform_part.h"
@@ -45,7 +45,7 @@ std::unique_ptr<SignalsService> CreateSignalsService(
decorators.push_back(
std::make_unique<ContentSignalsDecorator>(policy_blocklist_service));
-#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC)
+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD)
policy::ChromeBrowserPolicyConnector* browser_policy_connector =
g_browser_process->browser_policy_connector();
DCHECK(browser_policy_connector);
@@ -55,7 +55,7 @@ std::unique_ptr<SignalsService> CreateSignalsService(
browser_policy_connector->machine_level_user_cloud_policy_manager()
->store(),
enterprise_signals::DeviceInfoFetcher::CreateInstance()));
-#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC)
+#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD)
#if BUILDFLAG(IS_CHROMEOS_ASH)
decorators.push_back(std::make_unique<AshSignalsDecorator>(

4
www/chromium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher.cc
View file

@ -1,4 +1,4 @@
--- chrome/browser/enterprise/signals/device_info_fetcher.cc.orig 2021-07-19 18:45:08 UTC
--- chrome/browser/enterprise/signals/device_info_fetcher.cc.orig 2021-12-14 11:44:58 UTC
+++ chrome/browser/enterprise/signals/device_info_fetcher.cc
@@ -12,6 +12,8 @@
#include "chrome/browser/enterprise/signals/device_info_fetcher_win.h"
@ -9,7 +9,7 @@
#endif
namespace enterprise_signals {
@@ -61,6 +63,8 @@ std::unique_ptr<DeviceInfoFetcher> DeviceInfoFetcher::
@@ -71,6 +73,8 @@ std::unique_ptr<DeviceInfoFetcher> DeviceInfoFetcher::
return std::make_unique<DeviceInfoFetcherWin>();
#elif defined(OS_LINUX) || defined(OS_CHROMEOS)
return std::make_unique<DeviceInfoFetcherLinux>();

Some files were not shown because too many files have changed in this diff Show more