diff options
| author | Joseph Mingrone <jrm@FreeBSD.org> | 2020-10-23 04:29:32 +0000 |
|---|---|---|
| committer | Joseph Mingrone <jrm@FreeBSD.org> | 2020-10-23 04:29:32 +0000 |
| commit | 40c48efc97e1692154f38e01ef1739bbef1e4728 (patch) | |
| tree | 80245efab86b6f22f00a53b43568f0fd51edfb14 /www/chromium/files | |
| parent | deskutils/ultralist: Update to 1.6.1 (diff) | |
www/chromium: Update to version 85.0.4183.121
Submitted by: cem, rene
Obtained from: some patches from OpenBSD port
Notes
Notes:
svn path=/head/; revision=553068
Diffstat (limited to 'www/chromium/files')
308 files changed, 1524 insertions, 1585 deletions
diff --git a/www/chromium/files/patch-BUILD.gn b/www/chromium/files/patch-BUILD.gn index 0b6c77a3ab72..f730601842d4 100644 --- a/www/chromium/files/patch-BUILD.gn +++ b/www/chromium/files/patch-BUILD.gn @@ -1,6 +1,6 @@ ---- BUILD.gn.orig 2020-07-07 21:58:11 UTC +--- BUILD.gn.orig 2020-09-21 18:38:58 UTC +++ BUILD.gn -@@ -417,7 +417,7 @@ group("gn_all") { +@@ -427,7 +427,7 @@ group("gn_all") { ] } @@ -9,7 +9,7 @@ deps += [ "//third_party/breakpad:breakpad_unittests", "//third_party/breakpad:core-2-minidump", -@@ -459,8 +459,6 @@ group("gn_all") { +@@ -469,8 +469,6 @@ group("gn_all") { "//net:disk_cache_memory_test", "//net:quic_client", "//net:quic_server", @@ -18,7 +18,7 @@ "//testing:empty_main", ] -@@ -515,10 +513,6 @@ group("gn_all") { +@@ -525,10 +523,6 @@ group("gn_all") { "//chrome/test:load_library_perf_tests", "//chrome/test:sync_performance_tests", "//chrome/test/chromedriver:chromedriver", @@ -29,7 +29,7 @@ "//media/cast:generate_barcode_video", "//media/cast:generate_timecode_audio", "//net:crash_cache", -@@ -578,10 +572,6 @@ group("gn_all") { +@@ -588,10 +582,6 @@ group("gn_all") { "//mojo:mojo_perftests", "//services/service_manager/public/cpp", "//testing/gmock:gmock_main", @@ -40,7 +40,7 @@ ] if (!is_android) { -@@ -655,7 +645,7 @@ group("gn_all") { +@@ -665,7 +655,7 @@ group("gn_all") { host_os == "win") { deps += [ "//chrome/test/mini_installer:mini_installer_tests" ] } @@ -49,7 +49,7 @@ deps += [ "//third_party/breakpad:symupload($host_toolchain)" ] } -@@ -788,7 +778,6 @@ group("gn_all") { +@@ -798,7 +788,6 @@ group("gn_all") { "//chrome/browser/vr:vr_common_perftests", "//chrome/browser/vr:vr_common_unittests", "//chrome/browser/vr:vr_pixeltests", @@ -57,7 +57,7 @@ ] if (is_desktop_linux && use_ozone) { deps += [ "//chrome/browser/vr/testapp:vr_testapp" ] -@@ -1074,7 +1063,7 @@ if (!is_ios) { +@@ -1085,7 +1074,7 @@ if (!is_ios) { ] } @@ -66,7 +66,7 @@ data_deps += [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } -@@ -1083,7 +1072,7 @@ if (!is_ios) { +@@ -1094,7 +1083,7 @@ if (!is_ios) { data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } @@ -75,7 +75,7 @@ data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } -@@ -1276,9 +1265,6 @@ group("chromium_builder_perf") { +@@ -1292,9 +1281,6 @@ group("chromium_builder_perf") { if (is_win) { data_deps += [ "//chrome/installer/mini_installer:mini_installer" ] diff --git a/www/chromium/files/patch-base_BUILD.gn b/www/chromium/files/patch-base_BUILD.gn index 15bb859a84f8..407989aacea0 100644 --- a/www/chromium/files/patch-base_BUILD.gn +++ b/www/chromium/files/patch-base_BUILD.gn @@ -1,4 +1,4 @@ ---- base/BUILD.gn.orig 2020-07-07 21:58:11 UTC +--- base/BUILD.gn.orig 2020-09-08 19:13:57 UTC +++ base/BUILD.gn @@ -60,7 +60,7 @@ declare_args() { # replacement base::Location::Current(). On by default in non-official builds @@ -9,7 +9,7 @@ # Unsafe developer build. Has developer-friendly features that may weaken or # disable security measures like sandboxing or ASLR. -@@ -936,7 +936,7 @@ jumbo_component("base") { +@@ -887,7 +887,7 @@ jumbo_component("base") { "timer/hi_res_timer_manager_posix.cc", ] @@ -18,12 +18,12 @@ sources += [ "profiler/stack_copier_signal.cc", "profiler/stack_copier_signal.h", -@@ -945,6 +945,12 @@ jumbo_component("base") { +@@ -896,6 +896,12 @@ jumbo_component("base") { "profiler/thread_delegate_posix.h", ] } + -+ if (is_bsd) { ++ if (is_freebsd) { + sources += [ + "profiler/stack_sampler_posix.cc", + ] @@ -31,7 +31,7 @@ } if (is_win) { -@@ -1329,7 +1335,7 @@ jumbo_component("base") { +@@ -1287,7 +1293,7 @@ jumbo_component("base") { # Needed for <atomic> if using newer C++ library than sysroot, except if # building inside the cros_sdk environment - use host_toolchain as a # more robust check for this. @@ -40,20 +40,20 @@ host_toolchain != "//build/toolchain/cros:host") { libs += [ "atomic" ] } -@@ -1355,7 +1361,7 @@ jumbo_component("base") { +@@ -1313,7 +1319,7 @@ jumbo_component("base") { "allocator/allocator_shim_override_glibc_weak_symbols.h", ] deps += [ "//base/allocator:tcmalloc" ] - } else if (is_linux && use_allocator == "none") { + } else if ((is_linux && !is_bsd) && use_allocator == "none") { sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ] - } else if (is_android && use_allocator == "none") { - sources += [ -@@ -1952,6 +1958,33 @@ jumbo_component("base") { + } else if ((is_linux || is_android) && use_allocator == "partition") { + # Cannot use the same dispatching for host-side binaries. +@@ -1925,6 +1931,33 @@ jumbo_component("base") { } } -+ if (is_bsd) { ++ if (is_freebsd) { + sources -= [ + "files/file_path_watcher_linux.cc", + "files/file_util_linux.cc", @@ -83,7 +83,7 @@ # iOS if (is_ios) { sources -= [ -@@ -2946,7 +2979,7 @@ test("base_unittests") { +@@ -3026,7 +3059,7 @@ test("base_unittests") { "posix/unix_domain_socket_unittest.cc", "task/thread_pool/task_tracker_posix_unittest.cc", ] @@ -92,7 +92,7 @@ sources += [ "profiler/stack_copier_signal_unittest.cc" ] } } -@@ -3154,6 +3187,12 @@ test("base_unittests") { +@@ -3240,6 +3273,12 @@ test("base_unittests") { manifest = "//build/config/fuchsia/tests.cmx" } diff --git a/www/chromium/files/patch-base_allocator_allocator__shim.cc b/www/chromium/files/patch-base_allocator_allocator__shim.cc deleted file mode 100644 index 208a8d93617a..000000000000 --- a/www/chromium/files/patch-base_allocator_allocator__shim.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- base/allocator/allocator_shim.cc.orig 2019-10-21 19:06:18 UTC -+++ base/allocator/allocator_shim.cc -@@ -71,7 +71,7 @@ inline const base::allocator::AllocatorDispatch* GetCh - // Unfortunately due to that bug NoBarrier_Load() is mistakenly fully - // barriered on Linux+Clang, and that causes visible perf regressons. - return reinterpret_cast<const base::allocator::AllocatorDispatch*>( --#if defined(OS_LINUX) && defined(__clang__) -+#if (defined(OS_BSD) || defined(OS_LINUX)) && defined(__clang__) - *static_cast<const volatile base::subtle::AtomicWord*>(&g_chain_head) - #else - base::subtle::NoBarrier_Load(&g_chain_head) diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h index 07ed8ef2f09e..152766f6bc82 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h +++ b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2020-05-13 18:39:35 UTC +--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2020-09-08 19:13:57 UTC +++ base/allocator/partition_allocator/page_allocator_internals_posix.h -@@ -22,7 +22,7 @@ +@@ -24,7 +24,7 @@ #if defined(OS_ANDROID) #include <sys/prctl.h> #endif diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h new file mode 100644 index 000000000000..6f96f1b873e1 --- /dev/null +++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h @@ -0,0 +1,16 @@ +--- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2020-10-22 20:49:28 UTC ++++ base/allocator/partition_allocator/partition_alloc_constants.h +@@ -150,8 +150,13 @@ static_assert(alignof(std::max_align_t) <= 16, + // + // In practice, this means 8 bytes alignment on 32 bit architectures, and 16 + // bytes on 64 bit ones. ++// On FreeBSD i386 alignof(std::max_align_t) is only 4. ++#if defined(__i386__) && defined(OS_FREEBSD) ++static const size_t kGenericMinBucketedOrder = 3; ++#else + static const size_t kGenericMinBucketedOrder = + alignof(std::max_align_t) == 16 ? 5 : 4; // 2^(order - 1), that is 16 or 8. ++#endif + // The largest bucketed order is 1 << (20 - 1), storing [512 KiB, 1 MiB): + static const size_t kGenericMaxBucketedOrder = 20; + static const size_t kGenericNumBucketedOrders = diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__unittest.cc b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__unittest.cc index fdfc9604fefd..d7bd8959b122 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__unittest.cc +++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__unittest.cc @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/partition_alloc_unittest.cc.orig 2020-07-07 21:58:11 UTC +--- base/allocator/partition_allocator/partition_alloc_unittest.cc.orig 2020-09-08 19:13:57 UTC +++ base/allocator/partition_allocator/partition_alloc_unittest.cc -@@ -307,9 +307,13 @@ void FreeFullPage(PartitionRoot* root, PartitionRoot:: +@@ -313,9 +313,13 @@ void FreeFullPage(PartitionRoot<base::internal::Thread } } diff --git a/www/chromium/files/patch-base_base__switches.cc b/www/chromium/files/patch-base_base__switches.cc index 92ed9217882d..959396be6ffa 100644 --- a/www/chromium/files/patch-base_base__switches.cc +++ b/www/chromium/files/patch-base_base__switches.cc @@ -1,4 +1,4 @@ ---- base/base_switches.cc.orig 2019-10-21 19:06:18 UTC +--- base/base_switches.cc.orig 2020-09-08 19:13:57 UTC +++ base/base_switches.cc @@ -117,7 +117,7 @@ const char kDisableHighResTimer[] = "disable-highres-t const char kDisableUsbKeyboardDetect[] = "disable-usb-keyboard-detect"; @@ -9,8 +9,8 @@ // The /dev/shm partition is too small in certain VM environments, causing // Chrome to fail or crash (see http://crbug.com/715363). Use this flag to // work-around this issue (a temporary directory will always be used to create -@@ -138,7 +138,7 @@ const char kEnableCrashReporterForTesting[] = - const char kEnableReachedCodeProfiler[] = "enable-reached-code-profiler"; +@@ -142,7 +142,7 @@ const char kReachedCodeSamplingIntervalUs[] = + "reached-code-sampling-interval-us"; #endif -#if defined(OS_LINUX) diff --git a/www/chromium/files/patch-base_base__switches.h b/www/chromium/files/patch-base_base__switches.h index f2be6f05c697..d5669c6e17e8 100644 --- a/www/chromium/files/patch-base_base__switches.h +++ b/www/chromium/files/patch-base_base__switches.h @@ -1,4 +1,4 @@ ---- base/base_switches.h.orig 2019-10-21 19:06:18 UTC +--- base/base_switches.h.orig 2020-09-08 19:13:57 UTC +++ base/base_switches.h @@ -38,7 +38,7 @@ extern const char kDisableHighResTimer[]; extern const char kDisableUsbKeyboardDetect[]; @@ -9,7 +9,7 @@ extern const char kDisableDevShmUsage[]; #endif -@@ -51,7 +51,7 @@ extern const char kEnableReachedCodeProfiler[]; +@@ -52,7 +52,7 @@ extern const char kReachedCodeSamplingIntervalUs[]; extern const char kOrderfileMemoryOptimization[]; #endif diff --git a/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc b/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc index ba8a788b98a9..9994912b021f 100644 --- a/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc +++ b/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc @@ -1,6 +1,6 @@ ---- base/files/file_path_watcher_unittest.cc.orig 2020-07-07 21:58:11 UTC +--- base/files/file_path_watcher_unittest.cc.orig 2020-09-08 19:13:57 UTC +++ base/files/file_path_watcher_unittest.cc -@@ -424,7 +424,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) { +@@ -425,7 +425,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) { VLOG(1) << "Waiting for file1 creation"; ASSERT_TRUE(WaitForEvents()); @@ -9,7 +9,7 @@ // Mac implementation does not detect files modified in a directory. ASSERT_TRUE(WriteFile(file1, "content v2")); VLOG(1) << "Waiting for file1 modification"; -@@ -797,7 +797,7 @@ enum Permission { +@@ -798,7 +798,7 @@ enum Permission { Execute }; @@ -18,7 +18,7 @@ bool ChangeFilePermissions(const FilePath& path, Permission perm, bool allow) { struct stat stat_buf; -@@ -826,9 +826,9 @@ bool ChangeFilePermissions(const FilePath& path, Permi +@@ -827,9 +827,9 @@ bool ChangeFilePermissions(const FilePath& path, Permi } return chmod(path.value().c_str(), stat_buf.st_mode) == 0; } @@ -30,7 +30,7 @@ // Linux implementation of FilePathWatcher doesn't catch attribute changes. // http://crbug.com/78043 // Windows implementation of FilePathWatcher catches attribute changes that -@@ -863,7 +863,7 @@ TEST_F(FilePathWatcherTest, DirAttributesChanged) { +@@ -864,7 +864,7 @@ TEST_F(FilePathWatcherTest, DirAttributesChanged) { ASSERT_TRUE(ChangeFilePermissions(test_dir1, Execute, true)); } diff --git a/www/chromium/files/patch-base_files_file__util.h b/www/chromium/files/patch-base_files_file__util.h index 7b393a0021a0..a2b4efffe321 100644 --- a/www/chromium/files/patch-base_files_file__util.h +++ b/www/chromium/files/patch-base_files_file__util.h @@ -1,6 +1,6 @@ ---- base/files/file_util.h.orig 2020-07-07 21:58:11 UTC +--- base/files/file_util.h.orig 2020-09-08 19:13:57 UTC +++ base/files/file_util.h -@@ -552,7 +552,7 @@ BASE_EXPORT bool VerifyPathControlledByAdmin(const bas +@@ -582,7 +582,7 @@ BASE_EXPORT bool VerifyPathControlledByAdmin(const bas // the directory |path|, in the number of FilePath::CharType, or -1 on failure. BASE_EXPORT int GetMaximumPathComponentLength(const base::FilePath& path); diff --git a/www/chromium/files/patch-base_files_file__util__posix.cc b/www/chromium/files/patch-base_files_file__util__posix.cc index 4342a618c454..483823c92c61 100644 --- a/www/chromium/files/patch-base_files_file__util__posix.cc +++ b/www/chromium/files/patch-base_files_file__util__posix.cc @@ -1,6 +1,6 @@ ---- base/files/file_util_posix.cc.orig 2020-02-03 21:52:37 UTC +--- base/files/file_util_posix.cc.orig 2020-09-08 19:13:57 UTC +++ base/files/file_util_posix.cc -@@ -411,7 +411,7 @@ bool CreatePipe(ScopedFD* read_fd, ScopedFD* write_fd, +@@ -415,7 +415,7 @@ bool CreatePipe(ScopedFD* read_fd, ScopedFD* write_fd, } bool CreateLocalNonBlockingPipe(int fds[2]) { diff --git a/www/chromium/files/patch-base_files_file__util__unittest.cc b/www/chromium/files/patch-base_files_file__util__unittest.cc index 8b5814ae79df..cd967071973b 100644 --- a/www/chromium/files/patch-base_files_file__util__unittest.cc +++ b/www/chromium/files/patch-base_files_file__util__unittest.cc @@ -1,6 +1,6 @@ ---- base/files/file_util_unittest.cc.orig 2020-07-07 21:58:11 UTC +--- base/files/file_util_unittest.cc.orig 2020-09-08 19:13:57 UTC +++ base/files/file_util_unittest.cc -@@ -3465,7 +3465,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) { +@@ -3501,7 +3501,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) { } #endif // defined(OS_WIN) @@ -9,7 +9,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithProcFileSystem) { FilePath file_path("/proc/cpuinfo"); std::string data = "temp"; -@@ -3483,7 +3483,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithProcFileSyste +@@ -3519,7 +3519,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithProcFileSyste EXPECT_FALSE(ReadFileToStringWithMaxSize(file_path, nullptr, 4)); } diff --git a/www/chromium/files/patch-base_linux__util.cc b/www/chromium/files/patch-base_linux__util.cc index 97ea99e3d97b..a6f77dbda278 100644 --- a/www/chromium/files/patch-base_linux__util.cc +++ b/www/chromium/files/patch-base_linux__util.cc @@ -1,6 +1,14 @@ ---- base/linux_util.cc.orig 2020-05-13 18:39:35 UTC +--- base/linux_util.cc.orig 2020-09-08 19:13:57 UTC +++ base/linux_util.cc -@@ -78,6 +78,9 @@ class DistroNameGetter { +@@ -15,6 +15,7 @@ + + #include <iomanip> + #include <memory> ++#include <sstream> + + #include "base/files/dir_reader_posix.h" + #include "base/files/file_util.h" +@@ -78,6 +79,9 @@ class DistroNameGetter { public: DistroNameGetter() { static const char* const kFilesToCheck[] = {"/etc/os-release", @@ -10,3 +18,21 @@ "/usr/lib/os-release"}; for (const char* file : kFilesToCheck) { if (ReadDistroFromOSReleaseFile(file)) +@@ -134,6 +138,9 @@ void SetLinuxDistro(const std::string& distro) { + } + + bool GetThreadsForProcess(pid_t pid, std::vector<pid_t>* tids) { ++#if defined(OS_BSD) ++ return false; ++#else + // 25 > strlen("/proc//task") + strlen(std::to_string(INT_MAX)) + 1 = 22 + char buf[25]; + strings::SafeSPrintf(buf, "/proc/%d/task", pid); +@@ -153,6 +160,7 @@ bool GetThreadsForProcess(pid_t pid, std::vector<pid_t + } + + return true; ++#endif + } + + pid_t FindThreadIDWithSyscall(pid_t pid, const std::string& expected_data, diff --git a/www/chromium/files/patch-base_memory_madv__free__discardable__memory__posix.cc b/www/chromium/files/patch-base_memory_madv__free__discardable__memory__posix.cc index 5368440e775b..7d126337da24 100644 --- a/www/chromium/files/patch-base_memory_madv__free__discardable__memory__posix.cc +++ b/www/chromium/files/patch-base_memory_madv__free__discardable__memory__posix.cc @@ -1,6 +1,6 @@ ---- base/memory/madv_free_discardable_memory_posix.cc.orig 2020-03-16 18:39:41 UTC +--- base/memory/madv_free_discardable_memory_posix.cc.orig 2020-09-08 19:13:57 UTC +++ base/memory/madv_free_discardable_memory_posix.cc -@@ -282,7 +282,7 @@ void MadvFreeDiscardableMemoryPosix::SetKeepMemoryForT +@@ -292,7 +292,7 @@ void MadvFreeDiscardableMemoryPosix::SetKeepMemoryForT bool MadvFreeDiscardableMemoryPosix::IsResident() const { DFAKE_SCOPED_RECURSIVE_LOCK(thread_collision_warner_); diff --git a/www/chromium/files/patch-base_posix_unix__domain__socket.cc b/www/chromium/files/patch-base_posix_unix__domain__socket.cc index 8820cb063006..f4c4664480c5 100644 --- a/www/chromium/files/patch-base_posix_unix__domain__socket.cc +++ b/www/chromium/files/patch-base_posix_unix__domain__socket.cc @@ -1,4 +1,4 @@ ---- base/posix/unix_domain_socket.cc.orig 2019-03-11 22:00:51 UTC +--- base/posix/unix_domain_socket.cc.orig 2020-09-08 19:13:57 UTC +++ base/posix/unix_domain_socket.cc @@ -5,7 +5,10 @@ #include "base/posix/unix_domain_socket.h" @@ -11,7 +11,7 @@ #if !defined(OS_NACL_NONSFI) #include <sys/un.h> #endif -@@ -28,6 +31,14 @@ namespace base { +@@ -29,6 +32,14 @@ namespace base { const size_t UnixDomainSocket::kMaxFileDescriptors = 16; @@ -26,7 +26,7 @@ #if !defined(OS_NACL_NONSFI) bool CreateSocketPair(ScopedFD* one, ScopedFD* two) { int raw_socks[2]; -@@ -150,7 +161,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, +@@ -151,7 +162,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, #if !defined(OS_NACL_NONSFI) && !defined(OS_MACOSX) // The PNaCl toolchain for Non-SFI binary build and macOS do not support // ucred. macOS supports xucred, but this structure is insufficient. @@ -35,7 +35,7 @@ #endif // OS_NACL_NONSFI or OS_MACOSX ; char control_buffer[kControlBufferSize]; -@@ -180,9 +191,9 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, +@@ -181,9 +192,9 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, // SCM_CREDENTIALS. if (cmsg->cmsg_level == SOL_SOCKET && cmsg->cmsg_type == SCM_CREDENTIALS) { diff --git a/www/chromium/files/patch-base_process_internal__linux.cc b/www/chromium/files/patch-base_process_internal__linux.cc index abfff7cd44ce..5c981ae62d2b 100644 --- a/www/chromium/files/patch-base_process_internal__linux.cc +++ b/www/chromium/files/patch-base_process_internal__linux.cc @@ -1,6 +1,6 @@ ---- base/process/internal_linux.cc.orig 2020-03-16 18:39:41 UTC +--- base/process/internal_linux.cc.orig 2020-09-08 19:13:57 UTC +++ base/process/internal_linux.cc -@@ -29,7 +29,11 @@ namespace internal { +@@ -30,7 +30,11 @@ namespace internal { const char kProcDir[] = "/proc"; @@ -12,7 +12,7 @@ FilePath GetProcPidDir(pid_t pid) { return FilePath(kProcDir).Append(NumberToString(pid)); -@@ -64,6 +68,7 @@ bool ReadProcFile(const FilePath& file, std::string* b +@@ -66,6 +70,7 @@ bool ReadProcFile(const FilePath& file, std::string* b DLOG(WARNING) << "Failed to read " << file.MaybeAsASCII(); return false; } @@ -20,7 +20,7 @@ return !buffer->empty(); } -@@ -79,6 +84,22 @@ bool ParseProcStats(const std::string& stats_data, +@@ -81,6 +86,22 @@ bool ParseProcStats(const std::string& stats_data, if (stats_data.empty()) return false; @@ -43,7 +43,7 @@ // The stat file is formatted as: // pid (process name) data1 data2 .... dataN // Look for the closing paren by scanning backwards, to avoid being fooled by -@@ -108,6 +129,7 @@ bool ParseProcStats(const std::string& stats_data, +@@ -110,6 +131,7 @@ bool ParseProcStats(const std::string& stats_data, base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); for (const auto& i : other_stats) proc_stats->push_back(i); @@ -51,7 +51,7 @@ return true; } -@@ -155,7 +177,11 @@ int64_t ReadProcStatsAndGetFieldAsInt64(pid_t pid, Pro +@@ -157,7 +179,11 @@ int64_t ReadProcStatsAndGetFieldAsInt64(pid_t pid, Pro } int64_t ReadProcSelfStatsAndGetFieldAsInt64(ProcStatsFields field_num) { @@ -63,7 +63,7 @@ return ReadStatFileAndGetFieldAsInt64(stat_file, field_num); } -@@ -171,6 +197,9 @@ size_t ReadProcStatsAndGetFieldAsSizeT(pid_t pid, +@@ -173,6 +199,9 @@ size_t ReadProcStatsAndGetFieldAsSizeT(pid_t pid, } Time GetBootTime() { @@ -73,7 +73,7 @@ FilePath path("/proc/stat"); std::string contents; if (!ReadProcFile(path, &contents)) -@@ -184,9 +213,13 @@ Time GetBootTime() { +@@ -186,9 +215,13 @@ Time GetBootTime() { if (!StringToInt(btime_it->second, &btime)) return Time(); return Time::FromTimeT(btime); @@ -87,7 +87,7 @@ FilePath path("/proc/stat"); std::string contents; if (!ReadProcFile(path, &contents)) -@@ -210,6 +243,7 @@ TimeDelta GetUserCpuTimeSinceBoot() { +@@ -212,6 +245,7 @@ TimeDelta GetUserCpuTimeSinceBoot() { return TimeDelta(); return ClockTicksToTimeDelta(user + nice); diff --git a/www/chromium/files/patch-base_process_internal__linux.h b/www/chromium/files/patch-base_process_internal__linux.h index bfa9c8630afd..bc5329b84271 100644 --- a/www/chromium/files/patch-base_process_internal__linux.h +++ b/www/chromium/files/patch-base_process_internal__linux.h @@ -1,4 +1,4 @@ ---- base/process/internal_linux.h.orig 2020-03-16 18:39:41 UTC +--- base/process/internal_linux.h.orig 2020-09-08 19:13:57 UTC +++ base/process/internal_linux.h @@ -14,6 +14,8 @@ @@ -9,7 +9,7 @@ namespace base { class Time; -@@ -50,6 +52,14 @@ bool ParseProcStats(const std::string& stats_data, +@@ -55,6 +57,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. -@@ -62,6 +72,7 @@ enum ProcStatsFields { +@@ -67,6 +77,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. diff --git a/www/chromium/files/patch-base_process_launch__posix.cc b/www/chromium/files/patch-base_process_launch__posix.cc index ce6054a8ff79..babfecc41ee0 100644 --- a/www/chromium/files/patch-base_process_launch__posix.cc +++ b/www/chromium/files/patch-base_process_launch__posix.cc @@ -1,4 +1,4 @@ ---- base/process/launch_posix.cc.orig 2019-06-04 18:55:15 UTC +--- base/process/launch_posix.cc.orig 2020-09-08 19:13:57 UTC +++ base/process/launch_posix.cc @@ -65,6 +65,7 @@ #error "macOS should use launch_mac.cc" @@ -8,3 +8,32 @@ extern char** environ; namespace base { +@@ -228,6 +229,28 @@ + DirReaderPosix fd_dir(kFDDir); + if (!fd_dir.IsValid()) { + // Fallback case: Try every possible fd. ++ ++#if defined(OS_FREEBSD) ++ // CEM: blast away most of the range with closefrom(). A common use case ++ // of this function only maps STDIN/STDOUT/STDERR and closefrom(3) is much ++ // cheaper than x00,000 close(2) invocations with a high RLIMIT_NOFILE. ++ // ++ // In the other caller, it is still very likely that the fds we care about ++ // are in relatively low number space and we can save hundreds of thousands ++ // of syscalls. ++ int max_valid_fd = -1; ++ for (size_t j = 0; j < saved_mapping.size(); j++) { ++ int fd = saved_mapping[j].dest; ++ if (fd > max_valid_fd) ++ max_valid_fd = fd; ++ } ++ if (max_valid_fd < STDERR_FILENO) ++ max_valid_fd = STDERR_FILENO; ++ ++ closefrom(max_valid_fd + 1); ++ max_fds = static_cast<size_t>(max_valid_fd) + 1; ++#endif ++ + for (size_t i = 0; i < max_fds; ++i) { + const int fd = static_cast<int>(i); + if (fd == STDIN_FILENO || fd == STDOUT_FILENO || fd == STDERR_FILENO) diff --git a/www/chromium/files/patch-base_process_process__handle.cc b/www/chromium/files/patch-base_process_process__handle.cc index 13812613f73f..e76fd1320648 100644 --- a/www/chromium/files/patch-base_process_process__handle.cc +++ b/www/chromium/files/patch-base_process_process__handle.cc @@ -1,6 +1,6 @@ ---- base/process/process_handle.cc.orig 2019-10-21 19:06:18 UTC +--- base/process/process_handle.cc.orig 2020-09-08 19:13:57 UTC +++ base/process/process_handle.cc -@@ -28,7 +28,7 @@ UniqueProcId GetUniqueIdForProcess() { +@@ -30,7 +30,7 @@ UniqueProcId GetUniqueIdForProcess() { : UniqueProcId(GetCurrentProcId()); } diff --git a/www/chromium/files/patch-base_process_process__metrics.h b/www/chromium/files/patch-base_process_process__metrics.h index 420d563e5b29..2291a54d32e0 100644 --- a/www/chromium/files/patch-base_process_process__metrics.h +++ b/www/chromium/files/patch-base_process_process__metrics.h @@ -1,6 +1,6 @@ ---- base/process/process_metrics.h.orig 2019-10-21 19:06:18 UTC +--- base/process/process_metrics.h.orig 2020-09-08 19:13:57 UTC +++ base/process/process_metrics.h -@@ -41,7 +41,7 @@ namespace base { +@@ -44,7 +44,7 @@ namespace base { // Full declaration is in process_metrics_iocounters.h. struct IoCounters; @@ -9,7 +9,7 @@ // Minor and major page fault counts since the process creation. // Both counts are process-wide, and exclude child processes. // -@@ -51,7 +51,7 @@ struct PageFaultCounts { +@@ -54,7 +54,7 @@ struct PageFaultCounts { int64_t minor; int64_t major; }; @@ -18,7 +18,7 @@ // Convert a POSIX timeval to microseconds. BASE_EXPORT int64_t TimeValToMicroseconds(const struct timeval& tv); -@@ -92,7 +92,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -95,7 +95,7 @@ class BASE_EXPORT ProcessMetrics { // convenience wrapper for CreateProcessMetrics(). static std::unique_ptr<ProcessMetrics> CreateCurrentProcessMetrics(); @@ -27,7 +27,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; -@@ -172,14 +172,14 @@ class BASE_EXPORT ProcessMetrics { +@@ -186,14 +186,14 @@ class BASE_EXPORT ProcessMetrics { int GetOpenFdSoftLimit() const; #endif // defined(OS_POSIX) @@ -44,7 +44,7 @@ // Returns total memory usage of malloc. size_t GetMallocUsage(); -@@ -191,7 +191,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -205,7 +205,7 @@ class BASE_EXPORT ProcessMetrics { ProcessMetrics(ProcessHandle process, PortProvider* port_provider); #endif // !defined(OS_MACOSX) || defined(OS_IOS) @@ -53,7 +53,7 @@ int CalculateIdleWakeupsPerSecond(uint64_t absolute_idle_wakeups); #endif #if defined(OS_MACOSX) -@@ -220,7 +220,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -234,7 +234,7 @@ class BASE_EXPORT ProcessMetrics { // Number of bytes transferred to/from disk in bytes. uint64_t last_cumulative_disk_usage_ = 0; @@ -62,7 +62,7 @@ // Same thing for idle wakeups. TimeTicks last_idle_wakeups_time_; uint64_t last_absolute_idle_wakeups_; -@@ -271,7 +271,7 @@ BASE_EXPORT size_t GetHandleLimit(); +@@ -285,7 +285,7 @@ BASE_EXPORT size_t GetHandleLimit(); BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_descriptors); #endif // defined(OS_POSIX) @@ -71,7 +71,7 @@ defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA) // Data about system-wide memory consumption. Values are in KB. Available on // Windows, Mac, Linux, Android and Chrome OS. -@@ -305,7 +305,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -319,7 +319,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { int avail_phys = 0; #endif @@ -80,7 +80,7 @@ // This provides an estimate of available memory as described here: // https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=34e431b0ae398fc54ea69ff85ec700722c9da773 // NOTE: this is ONLY valid in kernels 3.14 and up. Its value will always -@@ -319,7 +319,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -333,7 +333,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { int swap_free = 0; #endif @@ -89,7 +89,7 @@ defined(OS_FUCHSIA) int buffers = 0; int cached = 0; -@@ -329,7 +329,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -343,7 +343,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { int inactive_file = 0; int dirty = 0; int reclaimable = 0; @@ -98,7 +98,7 @@ // defined(OS_FUCHSIA) #if defined(OS_CHROMEOS) -@@ -355,10 +355,10 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -369,10 +369,10 @@ struct BASE_EXPORT SystemMemoryInfoKB { // Exposed for memory debugging widget. BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoKB* meminfo); @@ -111,7 +111,7 @@ // Parse the data found in /proc/<pid>/stat and return the sum of the // CPU-related ticks. Returns -1 on parse error. // Exposed for testing. -@@ -431,7 +431,7 @@ BASE_EXPORT bool GetSystemDiskInfo(SystemDiskInfo* dis +@@ -445,7 +445,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(); @@ -120,7 +120,7 @@ #if defined(OS_CHROMEOS) // Data from files in directory /sys/block/zram0 about ZRAM usage. -@@ -526,7 +526,7 @@ class BASE_EXPORT SystemMetrics { +@@ -540,7 +540,7 @@ class BASE_EXPORT SystemMetrics { FRIEND_TEST_ALL_PREFIXES(SystemMetricsTest, SystemMetrics); size_t committed_memory_; diff --git a/www/chromium/files/patch-base_process_process__metrics__freebsd.cc b/www/chromium/files/patch-base_process_process__metrics__freebsd.cc index 1dc5323f3252..1615429acb40 100644 --- a/www/chromium/files/patch-base_process_process__metrics__freebsd.cc +++ b/www/chromium/files/patch-base_process_process__metrics__freebsd.cc @@ -1,14 +1,17 @@ ---- base/process/process_metrics_freebsd.cc.orig 2019-07-24 18:58:02 UTC +--- base/process/process_metrics_freebsd.cc.orig 2020-09-08 19:13:57 UTC +++ base/process/process_metrics_freebsd.cc -@@ -5,6 +5,7 @@ +@@ -3,8 +3,10 @@ + // found in the LICENSE file. + #include "base/process/process_metrics.h" ++#include "base/notreached.h" #include <stddef.h> +#include <sys/types.h> #include <sys/sysctl.h> #include <sys/user.h> #include <unistd.h> -@@ -14,11 +15,29 @@ +@@ -14,11 +16,29 @@ #include "base/process/process_metrics_iocounters.h" #include "base/stl_util.h" @@ -40,7 +43,7 @@ // static std::unique_ptr<ProcessMetrics> ProcessMetrics::CreateProcessMetrics( -@@ -69,4 +88,216 @@ size_t GetSystemCommitCharge() { +@@ -74,4 +94,216 @@ size_t GetSystemCommitCharge() { return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize); } diff --git a/www/chromium/files/patch-base_profiler_stack__copier__signal.cc b/www/chromium/files/patch-base_profiler_stack__copier__signal.cc index fcbc9bacbce2..19fa0cec22dd 100644 --- a/www/chromium/files/patch-base_profiler_stack__copier__signal.cc +++ b/www/chromium/files/patch-base_profiler_stack__copier__signal.cc @@ -1,4 +1,4 @@ ---- base/profiler/stack_copier_signal.cc.orig 2020-05-13 18:40:16 UTC +--- base/profiler/stack_copier_signal.cc.orig 2020-09-08 19:13:57 UTC +++ base/profiler/stack_copier_signal.cc @@ -4,7 +4,14 @@ @@ -15,7 +15,7 @@ #include <signal.h> #include <sys/ucontext.h> #include <syscall.h> -@@ -33,8 +40,13 @@ class AsyncSafeWaitableEvent { +@@ -34,8 +41,13 @@ class AsyncSafeWaitableEvent { // for a pthread mutex. So, also check the condition. while (true) { int res = @@ -29,7 +29,7 @@ if (futex_.load(std::memory_order_acquire) != 0) return true; if (res != 0) -@@ -44,8 +56,12 @@ class AsyncSafeWaitableEvent { +@@ -45,8 +57,12 @@ class AsyncSafeWaitableEvent { void Signal() { futex_.store(1, std::memory_order_release); @@ -42,7 +42,7 @@ } private: -@@ -215,11 +231,18 @@ bool StackCopierSignal::CopyStack(StackBuffer* stack_b +@@ -216,11 +232,18 @@ bool StackCopierSignal::CopyStack(StackBuffer* stack_b if (!scoped_sigaction.succeeded()) return false; diff --git a/www/chromium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc b/www/chromium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc index 5547d3a09a32..f201215cb98a 100644 --- a/www/chromium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc +++ b/www/chromium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc @@ -1,6 +1,6 @@ ---- base/profiler/stack_sampling_profiler_test_util.cc.orig 2020-07-13 13:09:53 UTC +--- base/profiler/stack_sampling_profiler_test_util.cc.orig 2020-09-08 19:13:57 UTC +++ base/profiler/stack_sampling_profiler_test_util.cc -@@ -23,7 +23,7 @@ +@@ -30,7 +30,7 @@ // Fortunately, it provides _alloca, which functions identically. #include <malloc.h> #define alloca _alloca diff --git a/www/chromium/files/patch-base_stl__util.h b/www/chromium/files/patch-base_stl__util.h deleted file mode 100644 index b203dbd723ef..000000000000 --- a/www/chromium/files/patch-base_stl__util.h +++ /dev/null @@ -1,47 +0,0 @@ ---- base/stl_util.h.orig 2020-05-18 14:07:28 UTC -+++ base/stl_util.h -@@ -561,14 +561,6 @@ size_t EraseIf(std::vector<T, Allocator>& container, P - return removed; - } - --template <class T, class Allocator, class Value> --size_t Erase(std::forward_list<T, Allocator>& container, const Value& value) { -- // Unlike std::forward_list::remove, this function template accepts -- // heterogeneous types and does not force a conversion to the container's -- // value type before invoking the == operator. -- return EraseIf(container, [&](const T& cur) { return cur == value; }); --} -- - template <class T, class Allocator, class Predicate> - size_t EraseIf(std::forward_list<T, Allocator>& container, Predicate pred) { - // Note: std::forward_list does not have a size() API, thus we need to use the -@@ -580,10 +572,10 @@ size_t EraseIf(std::forward_list<T, Allocator>& contai - } - - template <class T, class Allocator, class Value> --size_t Erase(std::list<T, Allocator>& container, const Value& value) { -- // Unlike std::list::remove, this function template accepts heterogeneous -- // types and does not force a conversion to the container's value type before -- // invoking the == operator. -+size_t Erase(std::forward_list<T, Allocator>& container, const Value& value) { -+ // Unlike std::forward_list::remove, this function template accepts -+ // heterogeneous types and does not force a conversion to the container's -+ // value type before invoking the == operator. - return EraseIf(container, [&](const T& cur) { return cur == value; }); - } - -@@ -592,6 +584,14 @@ size_t EraseIf(std::list<T, Allocator>& container, Pre - size_t old_size = container.size(); - container.remove_if(pred); - return old_size - container.size(); -+} -+ -+template <class T, class Allocator, class Value> -+size_t Erase(std::list<T, Allocator>& container, const Value& value) { -+ // Unlike std::list::remove, this function template accepts heterogeneous -+ // types and does not force a conversion to the container's value type before -+ // invoking the == operator. -+ return EraseIf(container, [&](const T& cur) { return cur == value; }); - } - - template <class Key, class T, class Compare, class Allocator, class Predicate> diff --git a/www/chromium/files/patch-base_system_sys__info.h b/www/chromium/files/patch-base_system_sys__info.h index f35e63c372a9..226724ae36ae 100644 --- a/www/chromium/files/patch-base_system_sys__info.h +++ b/www/chromium/files/patch-base_system_sys__info.h @@ -1,6 +1,6 @@ ---- base/system/sys_info.h.orig 2020-05-13 18:39:35 UTC +--- base/system/sys_info.h.orig 2020-09-08 19:13:57 UTC +++ base/system/sys_info.h -@@ -197,6 +197,8 @@ class BASE_EXPORT SysInfo { +@@ -201,6 +201,8 @@ class BASE_EXPORT SysInfo { // On Desktop this returns true when memory <= 512MB. static bool IsLowEndDevice(); @@ -9,7 +9,7 @@ private: FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory); FRIEND_TEST_ALL_PREFIXES(debug::SystemMetricsTest, ParseMeminfo); -@@ -206,7 +208,7 @@ class BASE_EXPORT SysInfo { +@@ -210,7 +212,7 @@ class BASE_EXPORT SysInfo { static bool IsLowEndDeviceImpl(); static HardwareInfo GetHardwareInfoSync(); diff --git a/www/chromium/files/patch-base_test_BUILD.gn b/www/chromium/files/patch-base_test_BUILD.gn index c2b8e3134a48..80f87376d5f2 100644 --- a/www/chromium/files/patch-base_test_BUILD.gn +++ b/www/chromium/files/patch-base_test_BUILD.gn @@ -1,6 +1,6 @@ ---- base/test/BUILD.gn.orig 2020-07-13 15:42:25 UTC +--- base/test/BUILD.gn.orig 2020-09-08 19:13:57 UTC +++ base/test/BUILD.gn -@@ -408,7 +408,11 @@ if (is_linux) { +@@ -418,7 +418,11 @@ if (is_linux) { copy("fonts_conf") { sources = [ "fonts.conf" ] diff --git a/www/chromium/files/patch-base_test_launcher_test__launcher.cc b/www/chromium/files/patch-base_test_launcher_test__launcher.cc index e205455fbc37..4bd0a3131490 100644 --- a/www/chromium/files/patch-base_test_launcher_test__launcher.cc +++ b/www/chromium/files/patch-base_test_launcher_test__launcher.cc @@ -1,6 +1,6 @@ ---- base/test/launcher/test_launcher.cc.orig 2020-07-07 21:58:11 UTC +--- base/test/launcher/test_launcher.cc.orig 2020-09-08 19:13:57 UTC +++ base/test/launcher/test_launcher.cc -@@ -55,6 +55,7 @@ +@@ -56,6 +56,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" -@@ -557,7 +558,7 @@ ChildProcessResults DoLaunchChildTestProcess( +@@ -582,7 +583,7 @@ ChildProcessResults DoLaunchChildTestProcess( #if !defined(OS_FUCHSIA) options.new_process_group = true; #endif diff --git a/www/chromium/files/patch-base_test_test__suite.cc b/www/chromium/files/patch-base_test_test__suite.cc index 3afe0098808a..6d79cd1cba93 100644 --- a/www/chromium/files/patch-base_test_test__suite.cc +++ b/www/chromium/files/patch-base_test_test__suite.cc @@ -1,6 +1,6 @@ ---- base/test/test_suite.cc.orig 2020-05-13 18:39:35 UTC +--- base/test/test_suite.cc.orig 2020-09-08 19:13:57 UTC +++ base/test/test_suite.cc -@@ -69,7 +69,7 @@ +@@ -70,7 +70,7 @@ #include "base/test/test_support_ios.h" #endif @@ -9,7 +9,7 @@ #include "base/test/fontconfig_util_linux.h" #endif -@@ -385,14 +385,14 @@ void TestSuite::PreInitialize() { +@@ -386,14 +386,14 @@ void TestSuite::PreInitialize() { testing::GTEST_FLAG(catch_exceptions) = false; #endif EnableTerminationOnHeapCorruption(); @@ -26,7 +26,7 @@ // On Android, AtExitManager is created in // testing/android/native_test_wrapper.cc before main() is called. -@@ -623,7 +623,7 @@ void TestSuite::Initialize() { +@@ -634,7 +634,7 @@ void TestSuite::Initialize() { // TODO(jshin): Should we set the locale via an OS X locale API here? i18n::SetICUDefaultLocale("en_US"); diff --git a/www/chromium/files/patch-base_trace__event_process__memory__dump.cc b/www/chromium/files/patch-base_trace__event_process__memory__dump.cc index 6624e1d04af6..c7c28dd9c9e9 100644 --- a/www/chromium/files/patch-base_trace__event_process__memory__dump.cc +++ b/www/chromium/files/patch-base_trace__event_process__memory__dump.cc @@ -1,6 +1,6 @@ ---- base/trace_event/process_memory_dump.cc.orig 2019-03-11 22:00:51 UTC +--- base/trace_event/process_memory_dump.cc.orig 2020-09-08 19:13:57 UTC +++ base/trace_event/process_memory_dump.cc -@@ -94,7 +94,7 @@ size_t ProcessMemoryDump::CountResidentBytes(void* sta +@@ -95,7 +95,7 @@ size_t ProcessMemoryDump::CountResidentBytes(void* sta #if defined(OS_WIN) std::unique_ptr<PSAPI_WORKING_SET_EX_INFORMATION[]> vec( new PSAPI_WORKING_SET_EX_INFORMATION[max_vec_size]); diff --git a/www/chromium/files/patch-build_config_BUILDCONFIG.gn b/www/chromium/files/patch-build_config_BUILDCONFIG.gn index 7c6d307fbd22..57897b6ae110 100644 --- a/www/chromium/files/patch-build_config_BUILDCONFIG.gn +++ b/www/chromium/files/patch-build_config_BUILDCONFIG.gn @@ -1,4 +1,4 @@ ---- build/config/BUILDCONFIG.gn.orig 2019-06-04 18:55:15 UTC +--- build/config/BUILDCONFIG.gn.orig 2020-09-21 18:39:01 UTC +++ build/config/BUILDCONFIG.gn @@ -131,10 +131,10 @@ declare_args() { is_official_build = false @@ -33,8 +33,13 @@ # See comments in build/toolchain/cros/BUILD.gn about board compiles. if (is_clang) { _default_toolchain = "//build/toolchain/linux:clang_$target_cpu" -@@ -288,10 +288,11 @@ is_android = current_os == "android" +@@ -285,10 +285,12 @@ if (custom_toolchain != "") { + # current_os value directly. + + is_android = current_os == "android" ++is_bsd = current_os == "freebsd" || current_os == "netbsd" || current_os == "openbsd" is_chromeos = current_os == "chromeos" ++is_freebsd = current_os == "freebsd" is_fuchsia = current_os == "fuchsia" is_ios = current_os == "ios" -is_linux = current_os == "chromeos" || current_os == "linux" @@ -42,7 +47,3 @@ is_mac = current_os == "mac" is_nacl = current_os == "nacl" is_win = current_os == "win" || current_os == "winuwp" -+is_bsd = current_os == "freebsd" - - is_posix = !is_win && !is_fuchsia - diff --git a/www/chromium/files/patch-build_config_compiler_BUILD.gn b/www/chromium/files/patch-build_config_compiler_BUILD.gn index 732c4ac683d7..38f9f35457e2 100644 --- a/www/chromium/files/patch-build_config_compiler_BUILD.gn +++ b/www/chromium/files/patch-build_config_compiler_BUILD.gn @@ -1,6 +1,6 @@ ---- build/config/compiler/BUILD.gn.orig 2020-07-07 21:58:11 UTC +--- build/config/compiler/BUILD.gn.orig 2020-09-08 19:13:57 UTC +++ build/config/compiler/BUILD.gn -@@ -133,7 +133,7 @@ declare_args() { +@@ -130,7 +130,7 @@ declare_args() { # 'is_android' breaks content_shell_test_apk on android-kitkat-arm-rel. # 'use_xcode_clang' may call old clang. init_stack_vars = @@ -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 -@@ -287,7 +287,7 @@ config("compiler") { +@@ -293,7 +293,7 @@ config("compiler") { } # Linker warnings. @@ -18,7 +18,7 @@ ldflags += [ "-Wl,--fatal-warnings" ] } if (fatal_linker_warnings && (is_mac || is_ios)) { -@@ -381,7 +381,7 @@ config("compiler") { +@@ -389,7 +389,7 @@ config("compiler") { # Compiler instrumentation can introduce dependencies in DSOs to symbols in # the executable they are loaded into, so they are unresolved at link-time. @@ -27,7 +27,7 @@ ldflags += [ "-Wl,-z,defs", "-Wl,--as-needed", -@@ -472,7 +472,7 @@ config("compiler") { +@@ -480,7 +480,7 @@ config("compiler") { ldflags += [ "-Wl,-z,keep-text-section-prefix" ] } @@ -36,7 +36,7 @@ cflags += [ "-fcrash-diagnostics-dir=" + rebase_path("//tools/clang/crashreports", root_build_dir) ] -@@ -735,7 +735,7 @@ config("compiler_cpu_abi") { +@@ -760,7 +760,7 @@ config("compiler_cpu_abi") { cflags += [ "-mtune=$arm_tune" ] } } else if (current_cpu == "arm64") { @@ -45,7 +45,7 @@ cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] } -@@ -1085,7 +1085,7 @@ config("compiler_deterministic") { +@@ -1110,7 +1110,7 @@ config("compiler_deterministic") { "-Xclang", ".", ] @@ -54,8 +54,8 @@ # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167) asmflags = [ "-Wa,-fdebug-compilation-dir,." ] } -@@ -1476,7 +1476,7 @@ config("default_warnings") { - cflags += [ "-Wno-max-tokens" ] +@@ -1493,7 +1493,7 @@ config("default_warnings") { + cflags += [ "-Wno-nonportable-include-path" ] } - if (current_toolchain == host_toolchain || !use_xcode_clang) { @@ -63,7 +63,7 @@ # Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not # recognize. cflags += [ -@@ -1638,7 +1638,7 @@ config("no_chromium_code") { +@@ -1662,7 +1662,7 @@ config("no_chromium_code") { # suppressing them individually, we just blanket suppress them here. "-Wno-unused-variable", ] @@ -72,7 +72,7 @@ cflags += [ # TODO(https://crbug.com/1031169): Clean up and enable. "-Wno-misleading-indentation", -@@ -1716,7 +1716,7 @@ config("thin_archive") { +@@ -1740,7 +1740,7 @@ config("thin_archive") { # Mac and iOS use the mac-specific "libtool" command, not ar, which doesn't # have a "thin archive" mode (it does accept -T, but it means truncating # archive names to 16 characters, which is not what we want). @@ -81,7 +81,7 @@ arflags = [ "-T" ] } else if (is_win && use_lld) { arflags = [ "/llvmlibthin" ] -@@ -2246,7 +2246,7 @@ config("symbols") { +@@ -2284,7 +2284,7 @@ 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) { @@ -89,8 +89,8 @@ + cflags += [ "-g0" ] } - if (is_clang && !is_nacl && !use_xcode_clang) { -@@ -2274,7 +2274,7 @@ config("symbols") { + # TODO(https://crbug.com/1050118): Investigate missing debug info on mac. +@@ -2313,7 +2313,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_mac && !is_ios && !is_nacl && current_cpu != "x86" && diff --git a/www/chromium/files/patch-cc_BUILD.gn b/www/chromium/files/patch-cc_BUILD.gn index 4678bfd491de..bd528b6a1723 100644 --- a/www/chromium/files/patch-cc_BUILD.gn +++ b/www/chromium/files/patch-cc_BUILD.gn @@ -1,4 +1,4 @@ ---- cc/BUILD.gn.orig 2020-07-07 21:58:11 UTC +--- cc/BUILD.gn.orig 2020-09-08 19:13:57 UTC +++ cc/BUILD.gn @@ -599,7 +599,7 @@ cc_test_static_library("test_support") { if (enable_vulkan) { @@ -9,7 +9,7 @@ data_deps = [ "//third_party/mesa_headers" ] } } -@@ -801,7 +801,6 @@ cc_test("cc_unittests") { +@@ -800,7 +800,6 @@ cc_test("cc_unittests") { ] data_deps = [ "//testing/buildbot/filters:cc_unittests_filters", diff --git a/www/chromium/files/patch-cc_test_layer__tree__test.cc b/www/chromium/files/patch-cc_test_layer__tree__test.cc index d3df654755cb..320cf7a7ce75 100644 --- a/www/chromium/files/patch-cc_test_layer__tree__test.cc +++ b/www/chromium/files/patch-cc_test_layer__tree__test.cc @@ -1,6 +1,6 @@ ---- cc/test/layer_tree_test.cc.orig 2020-07-13 09:14:49 UTC +--- cc/test/layer_tree_test.cc.orig 2020-09-08 19:13:57 UTC +++ cc/test/layer_tree_test.cc -@@ -645,7 +645,7 @@ LayerTreeTest::LayerTreeTest(LayerTreeTest::RendererTy +@@ -654,7 +654,7 @@ LayerTreeTest::LayerTreeTest(LayerTreeTest::RendererTy init_vulkan = true; } else if (renderer_type_ == RENDERER_SKIA_DAWN) { scoped_feature_list_.InitAndEnableFeature(features::kSkiaDawn); diff --git a/www/chromium/files/patch-cc_trees_property__tree.cc b/www/chromium/files/patch-cc_trees_property__tree.cc index 19a809976d50..11ee832d59a7 100644 --- a/www/chromium/files/patch-cc_trees_property__tree.cc +++ b/www/chromium/files/patch-cc_trees_property__tree.cc @@ -1,6 +1,6 @@ ---- cc/trees/property_tree.cc.orig 2020-07-07 21:58:11 UTC +--- cc/trees/property_tree.cc.orig 2020-09-08 19:13:57 UTC +++ cc/trees/property_tree.cc -@@ -1245,13 +1245,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro +@@ -1260,13 +1260,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro gfx::Size clip_layer_bounds = container_bounds(scroll_node->id); diff --git a/www/chromium/files/patch-chrome_app_chrome__main.cc b/www/chromium/files/patch-chrome_app_chrome__main.cc index c4e0477762da..24bef986e2ed 100644 --- a/www/chromium/files/patch-chrome_app_chrome__main.cc +++ b/www/chromium/files/patch-chrome_app_chrome__main.cc @@ -1,6 +1,6 @@ ---- chrome/app/chrome_main.cc.orig 2019-09-09 21:55:07 UTC +--- chrome/app/chrome_main.cc.orig 2020-09-08 19:13:58 UTC +++ chrome/app/chrome_main.cc -@@ -101,11 +101,11 @@ int ChromeMain(int argc, const char** argv) { +@@ -109,11 +109,11 @@ int ChromeMain(int argc, const char** argv) { MainThreadStackSamplingProfiler scoped_sampling_profiler; // Chrome-specific process modes. diff --git a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc index aa0cbdac9e82..d5cd6768995a 100644 --- a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc +++ b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc @@ -1,4 +1,4 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2020-07-07 21:58:12 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2020-09-08 19:13:58 UTC +++ chrome/app/chrome_main_delegate.cc @@ -107,7 +107,7 @@ #include "chrome/app/shutdown_signal_handlers_posix.h" @@ -9,7 +9,7 @@ #include "components/nacl/common/nacl_paths.h" #include "components/nacl/zygote/nacl_fork_delegate_linux.h" #endif -@@ -144,12 +144,12 @@ +@@ -145,12 +145,12 @@ #include "v8/include/v8.h" #endif @@ -24,7 +24,7 @@ #include "chrome/browser/policy/policy_path_parser.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -266,7 +266,7 @@ void SetUpExtendedCrashReporting(bool is_browser_proce +@@ -267,7 +267,7 @@ void SetUpExtendedCrashReporting(bool is_browser_proce #endif // defined(OS_WIN) @@ -33,7 +33,7 @@ void AdjustLinuxOOMScore(const std::string& process_type) { int score = -1; -@@ -306,13 +306,13 @@ void AdjustLinuxOOMScore(const std::string& process_ty +@@ -307,13 +307,13 @@ void AdjustLinuxOOMScore(const std::string& process_ty if (score > -1) base::AdjustOOMScore(base::GetCurrentProcId(), score); } @@ -49,7 +49,7 @@ // The zygote process opens the resources for the renderers. process_type == service_manager::switches::kZygoteProcess || #endif -@@ -351,7 +351,7 @@ bool HandleVersionSwitches(const base::CommandLine& co +@@ -352,7 +352,7 @@ bool HandleVersionSwitches(const base::CommandLine& co return false; } @@ -58,7 +58,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) || -@@ -361,7 +361,7 @@ void HandleHelpSwitches(const base::CommandLine& comma +@@ -362,7 +362,7 @@ void HandleHelpSwitches(const base::CommandLine& comma PLOG(FATAL) << "execlp failed"; } } @@ -67,7 +67,7 @@ #if !defined(OS_MACOSX) && !defined(OS_ANDROID) void SIGTERMProfilingShutdown(int signal) { -@@ -415,7 +415,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -416,7 +416,7 @@ void InitializeUserDataDir(base::CommandLine* command_ std::string process_type = command_line->GetSwitchValueASCII(switches::kProcessType); @@ -76,7 +76,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. -@@ -427,7 +427,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -428,7 +428,7 @@ void InitializeUserDataDir(base::CommandLine* command_ user_data_dir = base::FilePath::FromUTF8Unsafe(user_data_dir_string); } } @@ -85,7 +85,7 @@ #if defined(OS_MACOSX) policy::path_parser::CheckUserDataDirPolicy(&user_data_dir); #endif // OS_MAC -@@ -498,7 +498,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat +@@ -499,7 +499,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat startup_metric_utils::RecordApplicationStartTime(now); #endif @@ -94,7 +94,7 @@ // Record the startup process creation time on supported platforms. startup_metric_utils::RecordStartupProcessCreationTime( base::Process::Current().CreationTime()); -@@ -691,7 +691,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -693,7 +693,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi v8_crashpad_support::SetUp(); #endif @@ -103,7 +103,7 @@ if (!crash_reporter::IsCrashpadEnabled()) { breakpad::SetFirstChanceExceptionHandler(v8::TryHandleWebAssemblyTrapPosix); } -@@ -702,7 +702,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -704,7 +704,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi *exit_code = 0; return true; // Got a --version switch; exit with a success error code. } @@ -112,7 +112,7 @@ // This will directly exit if the user asked for help. HandleHelpSwitches(command_line); #endif -@@ -726,7 +726,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -728,7 +728,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi #if defined(OS_CHROMEOS) chromeos::RegisterPathProvider(); #endif @@ -121,7 +121,7 @@ nacl::RegisterPathProvider(); #endif -@@ -906,7 +906,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -908,7 +908,7 @@ void ChromeMainDelegate::PreSandboxStartup() { crash_reporter::InitializeCrashKeys(); @@ -130,7 +130,7 @@ ChromeCrashReporterClient::Create(); #endif -@@ -918,7 +918,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -920,7 +920,7 @@ void ChromeMainDelegate::PreSandboxStartup() { #if defined(OS_WIN) child_process_logging::Init(); #endif @@ -139,7 +139,7 @@ // Create an instance of the CPU class to parse /proc/cpuinfo and cache // cpu_brand info. base::CPU cpu_info; -@@ -1037,7 +1037,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1039,7 +1039,7 @@ void ChromeMainDelegate::PreSandboxStartup() { locale; } @@ -148,16 +148,16 @@ // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != service_manager::switches::kZygoteProcess) { #if defined(OS_ANDROID) -@@ -1058,7 +1058,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1060,7 +1060,7 @@ void ChromeMainDelegate::PreSandboxStartup() { } #endif // defined(OS_ANDROID) } -#endif // defined(OS_POSIX) && !defined(OS_MACOSX) +#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) - // After all the platform Breakpads have been initialized, store the command - // line for crash reporting. -@@ -1072,7 +1072,7 @@ void ChromeMainDelegate::PreSandboxStartup() { + #if defined(OS_ANDROID) + CHECK_EQ(base::android::GetLibraryProcessType(), +@@ -1080,7 +1080,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. @@ -166,7 +166,7 @@ AdjustLinuxOOMScore(process_type); #endif #if defined(OS_WIN) -@@ -1114,7 +1114,7 @@ int ChromeMainDelegate::RunProcess( +@@ -1122,7 +1122,7 @@ int ChromeMainDelegate::RunProcess( // This entry is not needed on Linux, where the NaCl loader // process is launched via nacl_helper instead. @@ -175,16 +175,16 @@ {switches::kNaClLoaderProcess, NaClMain}, #else {"<invalid>", nullptr}, // To avoid constant array of size 0 -@@ -1142,7 +1142,7 @@ void ChromeMainDelegate::ProcessExiting(const std::str +@@ -1150,7 +1150,7 @@ void ChromeMainDelegate::ProcessExiting(const std::str #endif // !defined(OS_ANDROID) } -#if defined(OS_LINUX) +#if defined(OS_LINUX) && !defined(OS_BSD) void ChromeMainDelegate::ZygoteStarting( - std::vector<std::unique_ptr<service_manager::ZygoteForkDelegate>>* - delegates) { -@@ -1180,7 +1180,7 @@ void ChromeMainDelegate::ZygoteForked() { + std::vector<std::unique_ptr<content::ZygoteForkDelegate>>* delegates) { + #if defined(OS_CHROMEOS) +@@ -1187,7 +1187,7 @@ void ChromeMainDelegate::ZygoteForked() { crash_keys::SetCrashKeysFromCommandLine(*command_line); } diff --git a/www/chromium/files/patch-chrome_app_generated__resources.grd b/www/chromium/files/patch-chrome_app_generated__resources.grd index 4e2871b96ffb..e3c71429d1ef 100644 --- a/www/chromium/files/patch-chrome_app_generated__resources.grd +++ b/www/chromium/files/patch-chrome_app_generated__resources.grd @@ -1,6 +1,6 @@ ---- chrome/app/generated_resources.grd.orig 2020-07-07 21:58:12 UTC +--- chrome/app/generated_resources.grd.orig 2020-09-08 19:13:58 UTC +++ chrome/app/generated_resources.grd -@@ -5181,7 +5181,7 @@ Keep your key file in a safe place. You will need it t +@@ -5215,7 +5215,7 @@ Keep your key file in a safe place. You will need it t </if> <!-- chrome://browser-switch strings --> @@ -9,7 +9,7 @@ <message name="IDS_ABOUT_BROWSER_SWITCH_TITLE" desc="about:browser-switch page title"> Legacy Browser Support </message> -@@ -6928,7 +6928,7 @@ the Bookmarks menu."> +@@ -6993,7 +6993,7 @@ the Bookmarks menu."> Google Pay </message> @@ -18,7 +18,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> -@@ -7854,7 +7854,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -7950,7 +7950,7 @@ Please help our engineers fix this problem. Tell us wh Set as default </message> diff --git a/www/chromium/files/patch-chrome_app_settings__strings.grdp b/www/chromium/files/patch-chrome_app_settings__strings.grdp index bed697f91496..a5ebb56badf9 100644 --- a/www/chromium/files/patch-chrome_app_settings__strings.grdp +++ b/www/chromium/files/patch-chrome_app_settings__strings.grdp @@ -1,6 +1,6 @@ ---- chrome/app/settings_strings.grdp.orig 2020-07-07 21:58:13 UTC +--- chrome/app/settings_strings.grdp.orig 2020-09-08 19:13:59 UTC +++ chrome/app/settings_strings.grdp -@@ -83,7 +83,7 @@ +@@ -88,7 +88,7 @@ Themes </message> </if> @@ -9,7 +9,7 @@ <message name="IDS_SETTINGS_SYSTEM_THEME" desc="Text of the label describing the system (GTK+) browser theme on Linux"> GTK+ </message> -@@ -97,7 +97,7 @@ +@@ -102,7 +102,7 @@ Use Classic </message> </if> diff --git a/www/chromium/files/patch-chrome_browser_BUILD.gn b/www/chromium/files/patch-chrome_browser_BUILD.gn index 69f475ebc373..8315c4c59d46 100644 --- a/www/chromium/files/patch-chrome_browser_BUILD.gn +++ b/www/chromium/files/patch-chrome_browser_BUILD.gn @@ -1,17 +1,6 @@ --- chrome/browser/BUILD.gn.orig 2020-07-07 21:58:13 UTC +++ chrome/browser/BUILD.gn -@@ -4209,7 +4209,9 @@ static_library("browser") { - if (use_x11) { - deps += [ "//ui/gfx/x" ] - } -- deps += [ "//services/service_manager/zygote" ] -+ if (!is_bsd) { -+ deps += [ "//services/service_manager/zygote" ] -+ } - - if (use_allocator == "tcmalloc") { - deps += [ "//chrome/common/performance_manager/mojom" ] -@@ -4424,7 +4426,7 @@ static_library("browser") { +@@ -4582,7 +4582,7 @@ static_library("browser") { ] } diff --git a/www/chromium/files/patch-chrome_browser_about__flags.cc b/www/chromium/files/patch-chrome_browser_about__flags.cc index aef1d325eaa1..40a20edecf65 100644 --- a/www/chromium/files/patch-chrome_browser_about__flags.cc +++ b/www/chromium/files/patch-chrome_browser_about__flags.cc @@ -1,6 +1,6 @@ ---- chrome/browser/about_flags.cc.orig 2020-08-18 18:40:04 UTC +--- chrome/browser/about_flags.cc.orig 2020-09-08 19:13:59 UTC +++ chrome/browser/about_flags.cc -@@ -179,7 +179,7 @@ +@@ -184,7 +184,7 @@ #include "ui/gl/gl_switches.h" #include "ui/native_theme/native_theme_features.h" @@ -9,7 +9,7 @@ #include "base/allocator/buildflags.h" #endif -@@ -879,7 +879,7 @@ const FeatureEntry::Choice kMemlogSamplingRateChoices[ +@@ -840,7 +840,7 @@ const FeatureEntry::Choice kMemlogSamplingRateChoices[ heap_profiling::kMemlogSamplingRate5MB}, }; @@ -18,7 +18,7 @@ const FeatureEntry::FeatureParam kOmniboxDocumentProviderServerScoring[] = { {"DocumentUseServerScore", "true"}, {"DocumentUseClientScore", "false"}, -@@ -1044,7 +1044,7 @@ const FeatureEntry::FeatureVariation kOmniboxRichAutoc +@@ -1005,7 +1005,7 @@ const FeatureEntry::FeatureVariation kOmniboxRichAutoc nullptr, }}; @@ -27,7 +27,7 @@ const FeatureEntry::FeatureParam kOmniboxOnFocusSuggestionsParamSERP[] = { {"ZeroSuggestVariant:6:*", "RemoteSendUrl"}, -@@ -2485,13 +2485,13 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2495,13 +2495,13 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kCloudPrintXpsDescription, kOsWin, SINGLE_VALUE_TYPE(switches::kEnableCloudPrintXps)}, #endif // OS_WIN @@ -43,23 +43,7 @@ {"enable-webgl-draft-extensions", flag_descriptions::kWebglDraftExtensionsName, flag_descriptions::kWebglDraftExtensionsDescription, kOsAll, -@@ -2614,13 +2614,13 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kTerminalSystemAppSplitsDescription, kOsCrOS, - FEATURE_VALUE_TYPE(features::kTerminalSystemAppSplits)}, - #endif // OS_CHROMEOS --#if defined(OS_CHROMEOS) || defined(OS_LINUX) -+#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) - #if BUILDFLAG(USE_TCMALLOC) - {"dynamic-tcmalloc-tuning", flag_descriptions::kDynamicTcmallocName, - flag_descriptions::kDynamicTcmallocDescription, kOsCrOS | kOsLinux, - FEATURE_VALUE_TYPE(performance_manager::features::kDynamicTcmallocTuning)}, - #endif // BUILDFLAG(USE_TCMALLOC) --#endif // OS_CHROMEOS || OS_LINUX -+#endif // OS_CHROMEOS || OS_LINUX || defined(OS_BSD) - #if defined(OS_ANDROID) - {"enable-credit-card-assist", flag_descriptions::kCreditCardAssistName, - flag_descriptions::kCreditCardAssistDescription, kOsAndroid, -@@ -2675,7 +2675,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2689,7 +2689,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kEnableOfflinePreviewsDescription, kOsAndroid, FEATURE_VALUE_TYPE(previews::features::kOfflinePreviews)}, #endif // OS_ANDROID @@ -68,7 +52,7 @@ {"enable-save-data", flag_descriptions::kEnableSaveDataName, flag_descriptions::kEnableSaveDataDescription, kOsCrOS | kOsLinux, SINGLE_VALUE_TYPE( -@@ -2685,7 +2685,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2699,7 +2699,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kEnableNavigationPredictorDescription, kOsCrOS | kOsLinux, FEATURE_VALUE_TYPE(blink::features::kNavigationPredictor)}, @@ -77,7 +61,7 @@ {"enable-preconnect-to-search", flag_descriptions::kEnablePreconnectToSearchName, flag_descriptions::kEnablePreconnectToSearchDescription, kOsAll, -@@ -3403,7 +3403,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3437,7 +3437,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE( omnibox::kHistoryQuickProviderAllowMidwordContinuations)}, @@ -86,7 +70,7 @@ {"omnibox-experimental-keyword-mode", flag_descriptions::kOmniboxExperimentalKeywordModeName, flag_descriptions::kOmniboxExperimentalKeywordModeDescription, kOsDesktop, -@@ -3458,7 +3458,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3487,7 +3487,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_WITH_PARAMS_VALUE_TYPE(omnibox::kRichAutocompletion, kOmniboxRichAutocompletionVariations, "OmniboxBundledExperimentV1")}, @@ -95,7 +79,7 @@ {"enable-speculative-service-worker-start-on-query-input", flag_descriptions::kSpeculativeServiceWorkerStartOnQueryInputName, -@@ -3674,13 +3674,13 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3731,13 +3731,13 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kClickToOpenPDFDescription, kOsAll, FEATURE_VALUE_TYPE(features::kClickToOpenPDFPlaceholder)}, @@ -111,7 +95,7 @@ #if !defined(OS_ANDROID) {"ntp-confirm-suggestion-removals", -@@ -4365,7 +4365,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4423,7 +4423,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(kClickToCallUI)}, #endif // BUILDFLAG(ENABLE_CLICK_TO_CALL) @@ -120,7 +104,7 @@ defined(OS_CHROMEOS) {"remote-copy-receiver", flag_descriptions::kRemoteCopyReceiverName, flag_descriptions::kRemoteCopyReceiverDescription, kOsDesktop, -@@ -4382,7 +4382,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4440,7 +4440,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kRemoteCopyProgressNotificationName, flag_descriptions::kRemoteCopyProgressNotificationDescription, kOsDesktop, FEATURE_VALUE_TYPE(kRemoteCopyProgressNotification)}, @@ -129,7 +113,7 @@ // defined(OS_CHROMEOS) {"shared-clipboard-ui", flag_descriptions::kSharedClipboardUIName, -@@ -4408,7 +4408,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4466,7 +4466,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE( send_tab_to_self::kSendTabToSelfOmniboxSendingAnimation)}, @@ -138,16 +122,16 @@ defined(OS_CHROMEOS) {"sharing-peer-connection-receiver", flag_descriptions::kSharingPeerConnectionReceiverName, -@@ -4419,7 +4419,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4477,7 +4477,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kSharingPeerConnectionSenderName, flag_descriptions::kSharingPeerConnectionSenderDescription, kOsDesktop, FEATURE_VALUE_TYPE(kSharingPeerConnectionSender)}, -#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || -+#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || // defined(OS_CHROMEOS) {"sharing-prefer-vapid", flag_descriptions::kSharingPreferVapidName, -@@ -4494,13 +4494,13 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4552,13 +4552,13 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(printing::features::kEnableCustomMacPaperSizes)}, #endif @@ -163,19 +147,19 @@ // defined(OS_CHROMEOS) {"enable-audio-focus-enforcement", -@@ -4941,7 +4941,7 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kEnableSyncUSSNigoriDescription, kOsAll, - FEATURE_VALUE_TYPE(switches::kSyncUSSNigori)}, +@@ -5020,7 +5020,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kEnableSyncTrustedVaultDescription, kOsAll, + FEATURE_VALUE_TYPE(switches::kSyncSupportTrustedVaultPassphrase)}, -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) {"global-media-controls", flag_descriptions::kGlobalMediaControlsName, flag_descriptions::kGlobalMediaControlsDescription, kOsWin | kOsMac | kOsLinux, -@@ -4958,7 +4958,7 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kGlobalMediaControlsPictureInPictureDescription, - kOsWin | kOsMac | kOsLinux | kOsCrOS, - FEATURE_VALUE_TYPE(media::kGlobalMediaControlsPictureInPicture)}, +@@ -5043,7 +5043,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kGlobalMediaControlsSeamlessTransferDescription, + kOsWin | kOsMac | kOsLinux, + FEATURE_VALUE_TYPE(media::kGlobalMediaControlsSeamlessTransfer)}, -#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) diff --git a/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc b/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc index fb5b5d6cd963..9c54009d6710 100644 --- a/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc +++ b/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc @@ -1,6 +1,6 @@ ---- chrome/browser/after_startup_task_utils.cc.orig 2020-03-16 18:39:43 UTC +--- chrome/browser/after_startup_task_utils.cc.orig 2020-09-08 19:13:59 UTC +++ chrome/browser/after_startup_task_utils.cc -@@ -33,7 +33,7 @@ +@@ -32,7 +32,7 @@ #include "chrome/browser/ui/tabs/tab_strip_model.h" #endif @@ -9,7 +9,7 @@ #include "ui/views/linux_ui/linux_ui.h" #endif -@@ -120,7 +120,7 @@ void QueueTask(std::unique_ptr<AfterStartupTask> queue +@@ -119,7 +119,7 @@ void QueueTask(std::unique_ptr<AfterStartupTask> queue void SetBrowserStartupIsComplete() { DCHECK_CURRENTLY_ON(BrowserThread::UI); @@ -18,7 +18,7 @@ // Process::Current().CreationTime() is not available on all platforms. const base::Time process_creation_time = base::Process::Current().CreationTime(); -@@ -128,7 +128,7 @@ void SetBrowserStartupIsComplete() { +@@ -127,7 +127,7 @@ void SetBrowserStartupIsComplete() { UMA_HISTOGRAM_LONG_TIMES("Startup.AfterStartupTaskDelayedUntilTime", base::Time::Now() - process_creation_time); } @@ -27,7 +27,7 @@ UMA_HISTOGRAM_COUNTS_10000("Startup.AfterStartupTaskCount", g_after_startup_tasks.Get().size()); g_startup_complete_flag.Get().Set(); -@@ -137,7 +137,7 @@ void SetBrowserStartupIsComplete() { +@@ -136,7 +136,7 @@ void SetBrowserStartupIsComplete() { g_after_startup_tasks.Get().clear(); g_after_startup_tasks.Get().shrink_to_fit(); diff --git a/www/chromium/files/patch-chrome_browser_browser__resources.grd b/www/chromium/files/patch-chrome_browser_browser__resources.grd index b8411abaa1cd..64bb4018d894 100644 --- a/www/chromium/files/patch-chrome_browser_browser__resources.grd +++ b/www/chromium/files/patch-chrome_browser_browser__resources.grd @@ -1,11 +1,11 @@ ---- chrome/browser/browser_resources.grd.orig 2020-07-07 21:58:13 UTC +--- chrome/browser/browser_resources.grd.orig 2020-09-08 19:13:59 UTC +++ chrome/browser/browser_resources.grd @@ -64,7 +64,7 @@ - <include name="IDR_DISCARDS_SITE_DATA_MOJOM_LITE_JS" file="${root_gen_dir}\chrome\browser\ui\webui\discards\site_data.mojom-lite.js" compress="gzip" use_base_dir="false" type="BINDATA" /> - <include name="IDR_DISCARDS_SORTED_TABLE_BEHAVIOR_JS" file="resources\discards\sorted_table_behavior.js" compress="gzip" type="BINDATA" /> + <include name="IDR_DISCARDS_SITE_DATA_MOJOM_LITE_JS" file="${root_gen_dir}\chrome\browser\ui\webui\discards\site_data.mojom-lite.js" use_base_dir="false" type="BINDATA" /> + <include name="IDR_DISCARDS_SORTED_TABLE_BEHAVIOR_JS" file="resources\discards\sorted_table_behavior.js" type="BINDATA" /> </if> - <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)"> - <include name="IDR_BROWSER_SWITCH_APP_JS" file="${root_gen_dir}\chrome\browser\resources\browser_switch\app.js" compress="gzip" use_base_dir="false" type="BINDATA" /> - <include name="IDR_BROWSER_SWITCH_PROXY_JS" file="resources\browser_switch\browser_switch_proxy.js" compress="gzip" type="BINDATA" /> - <include name="IDR_BROWSER_SWITCH_HTML" file="resources\browser_switch\browser_switch.html" compress="gzip" allowexternalscript="true" type="BINDATA" /> + <include name="IDR_BROWSER_SWITCH_APP_JS" file="${root_gen_dir}\chrome\browser\resources\browser_switch\app.js" use_base_dir="false" type="BINDATA" /> + <include name="IDR_BROWSER_SWITCH_PROXY_JS" file="resources\browser_switch\browser_switch_proxy.js" type="BINDATA" /> + <include name="IDR_BROWSER_SWITCH_HTML" file="resources\browser_switch\browser_switch.html" allowexternalscript="true" type="BINDATA" /> diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc index fd63dec830de..50897ec1c273 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_interface_binders.cc.orig 2020-07-07 21:58:13 UTC +--- chrome/browser/chrome_browser_interface_binders.cc.orig 2020-09-08 19:13:59 UTC +++ chrome/browser/chrome_browser_interface_binders.cc -@@ -113,7 +113,7 @@ +@@ -119,7 +119,7 @@ #include "media/mojo/mojom/speech_recognition_service.mojom.h" #endif @@ -9,8 +9,8 @@ defined(OS_CHROMEOS) #include "chrome/browser/ui/webui/discards/discards.mojom.h" #include "chrome/browser/ui/webui/discards/discards_ui.h" -@@ -551,7 +551,7 @@ void PopulateChromeWebUIFrameBinders( - media_app_ui::mojom::PageHandlerFactory, chromeos::MediaAppUI>(map); +@@ -577,7 +577,7 @@ void PopulateChromeWebUIFrameBinders( + } #endif -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc index 7c8276fc2158..018f78459fda 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc @@ -1,4 +1,4 @@ ---- chrome/browser/chrome_browser_main.cc.orig 2020-07-07 21:58:13 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2020-09-08 19:13:59 UTC +++ chrome/browser/chrome_browser_main.cc @@ -207,11 +207,11 @@ #include "components/arc/metrics/stability_metrics_manager.h" @@ -22,9 +22,9 @@ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + (defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)) #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" - #endif -@@ -918,7 +918,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -924,7 +924,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { AddFirstRunNewTabs(browser_creator_.get(), master_prefs_->new_tabs); } @@ -33,7 +33,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 . -@@ -927,7 +927,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -933,7 +933,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { &user_native_messaging_dir)); if (!base::PathExists(user_native_messaging_dir)) base::CreateDirectory(user_native_messaging_dir); @@ -42,26 +42,26 @@ } #endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS) -@@ -954,7 +954,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { - #endif // BUILDFLAG(ENABLE_VR) && OS_WIN +@@ -955,7 +955,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { + #endif // defined(OS_MACOSX) #if defined(OS_WIN) || defined(OS_MACOSX) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + (defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)) metrics::DesktopSessionDurationTracker::Initialize(); ProfileActivityMetricsRecorder::Initialize(); - #endif -@@ -1107,6 +1107,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { + TouchModeStatsTracker::Initialize( +@@ -1111,6 +1111,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { base::TimeDelta::FromMinutes(1)); #if !defined(OS_ANDROID) +#if !defined(OS_BSD) if (base::FeatureList::IsEnabled(features::kWebUsb)) { web_usb_detector_.reset(new WebUsbDetector()); - base::PostTask( -@@ -1115,6 +1116,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { - base::BindOnce(&WebUsbDetector::Initialize, - base::Unretained(web_usb_detector_.get()))); + content::GetUIThreadTaskRunner({base::TaskPriority::BEST_EFFORT}) +@@ -1118,6 +1119,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { + base::BindOnce(&WebUsbDetector::Initialize, + base::Unretained(web_usb_detector_.get()))); } +#endif if (base::FeatureList::IsEnabled(features::kTabMetricsLogging)) { diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc index d7386b1bb87f..b30d06c505c8 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_main_linux.cc.orig 2020-05-13 18:39:37 UTC +--- chrome/browser/chrome_browser_main_linux.cc.orig 2020-09-08 19:13:59 UTC +++ chrome/browser/chrome_browser_main_linux.cc -@@ -83,6 +83,7 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() { +@@ -81,6 +81,7 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() { void ChromeBrowserMainPartsLinux::PostProfileInit() { ChromeBrowserMainPartsPosix::PostProfileInit(); @@ -8,7 +8,7 @@ bool breakpad_registered; if (crash_reporter::IsCrashpadEnabled()) { // If we're using crashpad, there's no breakpad and crashpad is always -@@ -100,10 +101,11 @@ void ChromeBrowserMainPartsLinux::PostProfileInit() { +@@ -98,10 +99,11 @@ void ChromeBrowserMainPartsLinux::PostProfileInit() { } g_browser_process->metrics_service()->RecordBreakpadRegistration( breakpad_registered); @@ -21,7 +21,7 @@ bluez::BluezDBusManager::Initialize(nullptr /* system_bus */); #endif -@@ -111,7 +113,7 @@ void ChromeBrowserMainPartsLinux::PostMainMessageLoopS +@@ -109,7 +111,7 @@ void ChromeBrowserMainPartsLinux::PostMainMessageLoopS } void ChromeBrowserMainPartsLinux::PostDestroyThreads() { diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc index e2a0324ea2d0..f41b82610c5f 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_main_posix.cc.orig 2020-07-07 21:58:13 UTC +--- chrome/browser/chrome_browser_main_posix.cc.orig 2020-09-08 19:13:59 UTC +++ chrome/browser/chrome_browser_main_posix.cc -@@ -71,7 +71,7 @@ void ExitHandler::ExitWhenPossibleOnUIThread(int signa +@@ -70,7 +70,7 @@ void ExitHandler::ExitWhenPossibleOnUIThread(int signa // ExitHandler takes care of deleting itself. new ExitHandler(); } else { @@ -9,7 +9,7 @@ switch (signal) { case SIGINT: case SIGHUP: -@@ -167,7 +167,7 @@ void ChromeBrowserMainPartsPosix::PostMainMessageLoopS +@@ -166,7 +166,7 @@ void ChromeBrowserMainPartsPosix::PostMainMessageLoopS void ChromeBrowserMainPartsPosix::ShowMissingLocaleMessageBox() { #if defined(OS_CHROMEOS) NOTREACHED(); // Should not ever happen on ChromeOS. diff --git a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc index f4725b2779ae..151c06137f52 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_content_browser_client.cc.orig 2020-07-07 21:58:13 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2020-09-08 19:13:59 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -407,7 +407,7 @@ +@@ -410,7 +410,7 @@ #include "components/user_manager/user.h" #include "components/user_manager/user_manager.h" #include "services/service_manager/public/mojom/interface_provider_spec.mojom.h" @@ -9,7 +9,7 @@ #include "chrome/browser/chrome_browser_main_linux.h" #elif defined(OS_ANDROID) #include "base/android/application_status_listener.h" -@@ -460,12 +460,12 @@ +@@ -471,12 +471,12 @@ #endif // !defined(OS_ANDROID) #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -24,7 +24,7 @@ #include "components/crash/core/app/crash_switches.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -493,7 +493,7 @@ +@@ -504,7 +504,7 @@ #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h" #endif @@ -33,7 +33,7 @@ #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h" #endif -@@ -801,11 +801,13 @@ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHos +@@ -819,11 +819,13 @@ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHos } int GetCrashSignalFD(const base::CommandLine& command_line) { @@ -47,7 +47,7 @@ // Extensions have the same process type as renderers. if (command_line.HasSwitch(extensions::switches::kExtensionProcess)) { -@@ -1311,7 +1313,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( +@@ -1330,7 +1332,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( #elif defined(OS_CHROMEOS) main_parts = std::make_unique<chromeos::ChromeBrowserMainPartsChromeos>( parameters, startup_data_); @@ -56,7 +56,7 @@ main_parts = std::make_unique<ChromeBrowserMainPartsLinux>(parameters, startup_data_); #elif defined(OS_ANDROID) -@@ -1337,7 +1339,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( +@@ -1356,7 +1358,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( // Construct additional browser parts. Stages are called in the order in // which they are added. #if defined(TOOLKIT_VIEWS) @@ -65,7 +65,7 @@ main_parts->AddParts(new ChromeBrowserMainExtraPartsViewsLinux()); #else main_parts->AddParts(new ChromeBrowserMainExtraPartsViews()); -@@ -2082,7 +2084,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2114,7 +2116,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin command_line->AppendSwitchASCII(switches::kMetricsClientID, client_info->client_id); } @@ -74,7 +74,7 @@ #if defined(OS_ANDROID) bool enable_crash_reporter = true; #else -@@ -2377,7 +2379,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2414,7 +2416,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin StackSamplingConfiguration::Get()->AppendCommandLineSwitchForChildProcess( process_type, command_line); @@ -83,7 +83,7 @@ // Processes may only query perf_event_open with the BPF sandbox disabled. if (browser_command_line.HasSwitch(switches::kEnableThreadInstructionCount) && command_line->HasSwitch(service_manager::switches::kNoSandbox)) { -@@ -3638,7 +3640,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst +@@ -3686,7 +3688,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst } } @@ -92,7 +92,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -3758,7 +3760,7 @@ bool ChromeContentBrowserClient::IsRendererCodeIntegri +@@ -3807,7 +3809,7 @@ bool ChromeContentBrowserClient::IsRendererCodeIntegri #endif // defined(OS_WIN) #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -101,7 +101,7 @@ bool ShouldEnableAudioSandbox(const policy::PolicyMap& policies) { const base::Value* audio_sandbox_enabled_policy_value = policies.GetValue(policy::key::kAudioSandboxEnabled); -@@ -3776,7 +3778,7 @@ bool ShouldEnableAudioSandbox(const policy::PolicyMap& +@@ -3825,7 +3827,7 @@ bool ShouldEnableAudioSandbox(const policy::PolicyMap& void ChromeContentBrowserClient::WillStartServiceManager() { #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -110,7 +110,7 @@ if (startup_data_) { auto* chrome_feature_list_creator = startup_data_->chrome_feature_list_creator(); -@@ -4043,7 +4045,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -4071,7 +4073,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati } #if defined(OS_WIN) || defined(OS_MACOSX) || \ diff --git a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h index 289d5a459dee..31940f2cec12 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h +++ b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_content_browser_client.h.orig 2020-07-07 21:58:13 UTC +--- chrome/browser/chrome_content_browser_client.h.orig 2020-09-08 19:13:59 UTC +++ chrome/browser/chrome_content_browser_client.h -@@ -377,12 +377,12 @@ class ChromeContentBrowserClient : public content::Con +@@ -381,12 +381,12 @@ class ChromeContentBrowserClient : public content::Con void OverridePageVisibilityState( content::RenderFrameHost* render_frame_host, content::PageVisibilityState* visibility_state) override; diff --git a/www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd b/www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd index b57482f51663..c036a3d37932 100644 --- a/www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd +++ b/www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd @@ -1,11 +1,11 @@ ---- chrome/browser/dev_ui_browser_resources.grd.orig 2020-05-13 18:40:22 UTC +--- chrome/browser/dev_ui_browser_resources.grd.orig 2020-09-08 19:13:59 UTC +++ chrome/browser/dev_ui_browser_resources.grd @@ -61,7 +61,7 @@ This file specifies browser resources for developer-fa - <include name="IDR_MEDIA_SESSION_MOJOM_LITE_JS" file="${root_gen_dir}\services\media_session\public\mojom\media_session.mojom-lite.js" use_base_dir="false" type="BINDATA" compress="gzip" /> - <include name="IDR_UI_GEOMETRY_MOJOM_LITE_JS" file="${root_gen_dir}\ui\gfx\geometry\mojom\geometry.mojom-lite.js" use_base_dir="false" type="BINDATA" compress="gzip" /> + <include name="IDR_MEDIA_SESSION_MOJOM_LITE_JS" file="${root_gen_dir}\services\media_session\public\mojom\media_session.mojom-lite.js" use_base_dir="false" type="BINDATA" /> + <include name="IDR_UI_GEOMETRY_MOJOM_LITE_JS" file="${root_gen_dir}\ui\gfx\geometry\mojom\geometry.mojom-lite.js" use_base_dir="false" type="BINDATA" /> - <if expr="is_android or is_linux"> + <if expr="is_android or is_posix"> - <include name="IDR_SANDBOX_INTERNALS_HTML" file="resources\sandbox_internals\sandbox_internals.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" compress="gzip" /> - <include name="IDR_SANDBOX_INTERNALS_JS" file="resources\sandbox_internals\sandbox_internals.js" type="BINDATA" compress="gzip" /> + <include name="IDR_SANDBOX_INTERNALS_HTML" file="resources\sandbox_internals\sandbox_internals.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> + <include name="IDR_SANDBOX_INTERNALS_JS" file="resources\sandbox_internals\sandbox_internals.js" type="BINDATA" /> </if> diff --git a/www/chromium/files/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc b/www/chromium/files/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc index 45d466568060..9c1bf5a9fd8d 100644 --- a/www/chromium/files/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc +++ b/www/chromium/files/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc @@ -1,4 +1,4 @@ ---- chrome/browser/device_identity/device_oauth2_token_service_factory.cc.orig 2020-05-15 14:52:43 UTC +--- chrome/browser/device_identity/device_oauth2_token_service_factory.cc.orig 2020-09-08 19:13:59 UTC +++ chrome/browser/device_identity/device_oauth2_token_service_factory.cc @@ -28,7 +28,7 @@ std::unique_ptr<DeviceOAuth2TokenStore> CreatePlatform #if defined(OS_CHROMEOS) @@ -6,6 +6,6 @@ local_state); -#elif defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#elif defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - DCHECK(base::FeatureList::IsEnabled(policy::features::kCBCMServiceAccounts)); + DCHECK( + base::FeatureList::IsEnabled(policy::features::kCBCMPolicyInvalidations)); return std::make_unique<DeviceOAuth2TokenStoreDesktop>(local_state); - #else diff --git a/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc b/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc index 77a0fc6ac2ed..842526bdf319 100644 --- a/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc +++ b/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2020-07-07 21:58:13 UTC +--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2020-09-08 19:13:59 UTC +++ chrome/browser/download/chrome_download_manager_delegate.cc -@@ -1266,7 +1266,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1338,7 +1338,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 -@@ -1290,7 +1290,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1387,7 +1387,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile( const base::FilePath& path) { diff --git a/www/chromium/files/patch-chrome_browser_download_download__item__model.cc b/www/chromium/files/patch-chrome_browser_download_download__item__model.cc index ff25c7af87ec..f111d9af8c65 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__item__model.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__item__model.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_item_model.cc.orig 2020-07-07 21:58:13 UTC +--- chrome/browser/download/download_item_model.cc.orig 2020-09-08 19:13:59 UTC +++ chrome/browser/download/download_item_model.cc -@@ -599,7 +599,7 @@ bool DownloadItemModel::IsCommandChecked( +@@ -601,7 +601,7 @@ bool DownloadItemModel::IsCommandChecked( return download_->GetOpenWhenComplete() || download_crx_util::IsExtensionDownload(*download_); case DownloadCommands::ALWAYS_OPEN_TYPE: @@ -9,7 +9,7 @@ if (download_commands->CanOpenPdfInSystemViewer()) { DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile()); return prefs->ShouldOpenPdfInSystemReader(); -@@ -639,7 +639,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand +@@ -641,7 +641,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand bool is_checked = IsCommandChecked(download_commands, DownloadCommands::ALWAYS_OPEN_TYPE); DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile()); diff --git a/www/chromium/files/patch-chrome_browser_download_download__prefs.cc b/www/chromium/files/patch-chrome_browser_download_download__prefs.cc index d25ba4cc5354..beb146678699 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__prefs.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__prefs.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_prefs.cc.orig 2020-07-07 21:58:13 UTC +--- chrome/browser/download/download_prefs.cc.orig 2020-09-08 19:13:59 UTC +++ chrome/browser/download/download_prefs.cc -@@ -66,7 +66,7 @@ namespace { +@@ -67,7 +67,7 @@ namespace { // Consider downloads 'dangerous' if they go to the home directory on Linux and // to the desktop on any platform. bool DownloadPathIsDangerous(const base::FilePath& download_path) { @@ -9,7 +9,7 @@ base::FilePath home_dir = base::GetHomeDir(); if (download_path == home_dir) { return true; -@@ -171,7 +171,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi +@@ -172,7 +172,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi GetDefaultDownloadDirectoryForProfile())); #endif // defined(OS_CHROMEOS) @@ -18,7 +18,7 @@ should_open_pdf_in_system_reader_ = prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader); #endif -@@ -291,7 +291,7 @@ void DownloadPrefs::RegisterProfilePrefs( +@@ -299,7 +299,7 @@ void DownloadPrefs::RegisterProfilePrefs( default_download_path); registry->RegisterFilePathPref(prefs::kSaveFileDefaultDirectory, default_download_path); @@ -27,7 +27,7 @@ registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false); #endif #if defined(OS_ANDROID) -@@ -391,7 +391,7 @@ bool DownloadPrefs::IsDownloadPathManaged() const { +@@ -417,7 +417,7 @@ bool DownloadPrefs::IsDownloadPathManaged() const { } bool DownloadPrefs::IsAutoOpenByUserUsed() const { @@ -36,7 +36,7 @@ if (ShouldOpenPdfInSystemReader()) return true; #endif -@@ -405,7 +405,7 @@ bool DownloadPrefs::IsAutoOpenEnabled(const GURL& url, +@@ -431,7 +431,7 @@ bool DownloadPrefs::IsAutoOpenEnabled(const GURL& url, return false; DCHECK(extension[0] == base::FilePath::kExtensionSeparator); extension.erase(0, 1); @@ -45,7 +45,7 @@ if (base::FilePath::CompareEqualIgnoreCase(extension, FILE_PATH_LITERAL("pdf")) && ShouldOpenPdfInSystemReader()) -@@ -455,7 +455,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens +@@ -481,7 +481,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens SaveAutoOpenState(); } @@ -54,7 +54,7 @@ void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) { if (should_open_pdf_in_system_reader_ == should_open) return; -@@ -476,7 +476,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons +@@ -502,7 +502,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons #endif void DownloadPrefs::ResetAutoOpenByUser() { diff --git a/www/chromium/files/patch-chrome_browser_download_download__prefs.h b/www/chromium/files/patch-chrome_browser_download_download__prefs.h index d95f14067c16..f433a11dd83c 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__prefs.h +++ b/www/chromium/files/patch-chrome_browser_download_download__prefs.h @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_prefs.h.orig 2020-07-07 21:57:32 UTC +--- chrome/browser/download/download_prefs.h.orig 2020-09-08 19:13:59 UTC +++ chrome/browser/download/download_prefs.h -@@ -110,7 +110,7 @@ class DownloadPrefs { +@@ -114,7 +114,7 @@ class DownloadPrefs { // Disables auto-open based on file extension. void DisableAutoOpenByUserBasedOnExtension(const base::FilePath& file_name); @@ -9,7 +9,7 @@ // Store the user preference to disk. If |should_open| is true, also disable // the built-in PDF plugin. If |should_open| is false, enable the PDF plugin. void SetShouldOpenPdfInSystemReader(bool should_open); -@@ -167,7 +167,7 @@ class DownloadPrefs { +@@ -172,7 +172,7 @@ class DownloadPrefs { std::unique_ptr<policy::URLBlacklist> auto_open_allowed_by_urls_; diff --git a/www/chromium/files/patch-chrome_browser_download_download__shelf__context__menu.cc b/www/chromium/files/patch-chrome_browser_download_download__shelf__context__menu.cc index 0eed36ca0a25..d234f93f2756 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__shelf__context__menu.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__shelf__context__menu.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_shelf_context_menu.cc.orig 2020-07-07 21:58:13 UTC +--- chrome/browser/download/download_shelf_context_menu.cc.orig 2020-09-08 19:13:59 UTC +++ chrome/browser/download/download_shelf_context_menu.cc -@@ -149,7 +149,7 @@ base::string16 DownloadShelfContextMenu::GetLabelForCo +@@ -146,7 +146,7 @@ base::string16 DownloadShelfContextMenu::GetLabelForCo : IDS_DOWNLOAD_MENU_PLATFORM_OPEN_ALWAYS; break; } diff --git a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn index ef846d58e94b..98e0cb1bc133 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn +++ b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/BUILD.gn.orig 2020-07-07 21:58:13 UTC +--- chrome/browser/extensions/BUILD.gn.orig 2020-09-08 19:13:59 UTC +++ chrome/browser/extensions/BUILD.gn -@@ -1186,6 +1186,12 @@ static_library("extensions") { +@@ -1187,6 +1187,12 @@ static_library("extensions") { deps += [ "//chrome/common:service_process_mojom" ] } diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_erp_chrome_desktop_report_request_helper.cc b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_chrome__desktop__report__request__helper.cc index d51374308ff4..a80b451536a4 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_erp_chrome_desktop_report_request_helper.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_chrome__desktop__report__request__helper.cc @@ -1,4 +1,4 @@ ---- chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc.orig 2020-07-07 21:58:13 UTC +--- chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc.orig 2020-09-21 18:39:07 UTC +++ chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc @@ -40,7 +40,7 @@ #include "base/win/registry.h" @@ -9,7 +9,7 @@ #include "base/environment.h" #include "base/nix/xdg_util.h" #endif -@@ -384,7 +384,7 @@ base::FilePath GetEndpointVerificationDir() { +@@ -386,7 +386,7 @@ base::FilePath GetEndpointVerificationDir() { return *GetEndpointVerificationDirOverride(); #if defined(OS_WIN) if (!base::PathService::Get(base::DIR_LOCAL_APP_DATA, &path)) @@ -18,7 +18,7 @@ std::unique_ptr<base::Environment> env(base::Environment::Create()); path = base::nix::GetXDGDirectory(env.get(), base::nix::kXdgConfigHomeEnvVar, base::nix::kDotConfigDir); -@@ -395,7 +395,7 @@ base::FilePath GetEndpointVerificationDir() { +@@ -397,7 +397,7 @@ base::FilePath GetEndpointVerificationDir() { if (true) #endif return path; diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_input__ime_input__ime__api.h b/www/chromium/files/patch-chrome_browser_extensions_api_input__ime_input__ime__api.h deleted file mode 100644 index 1cb62fbbfdce..000000000000 --- a/www/chromium/files/patch-chrome_browser_extensions_api_input__ime_input__ime__api.h +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/extensions/api/input_ime/input_ime_api.h.orig 2019-03-11 22:00:53 UTC -+++ chrome/browser/extensions/api/input_ime/input_ime_api.h -@@ -31,7 +31,7 @@ - - #if defined(OS_CHROMEOS) - #include "chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.h" --#elif defined(OS_LINUX) || defined(OS_WIN) -+#elif defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) - #include "chrome/browser/extensions/api/input_ime/input_ime_api_nonchromeos.h" - #endif // defined(OS_CHROMEOS) - diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc b/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc index 587dbc716c43..45a2e86b5c2a 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2020-05-13 18:40:22 UTC +--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2020-09-08 19:13:59 UTC +++ chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -161,7 +161,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist +@@ -163,7 +163,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist (*s_whitelist)[bookmarks::prefs::kShowBookmarkBar] = settings_api::PrefType::PREF_TYPE_BOOLEAN; @@ -9,7 +9,7 @@ (*s_whitelist)[::prefs::kUseCustomChromeFrame] = settings_api::PrefType::PREF_TYPE_BOOLEAN; #endif -@@ -171,7 +171,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist +@@ -173,7 +173,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist // Appearance settings. (*s_whitelist)[::prefs::kCurrentThemeID] = settings_api::PrefType::PREF_TYPE_STRING; diff --git a/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc b/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc index 70190902f4bb..d64c0c28081b 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc @@ -1,4 +1,4 @@ ---- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2020-07-07 21:58:13 UTC +--- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2020-09-08 19:13:59 UTC +++ chrome/browser/extensions/browser_context_keyed_service_factories.cc @@ -53,7 +53,7 @@ #include "extensions/browser/api/networking_private/networking_private_delegate_factory.h" @@ -9,12 +9,3 @@ #include "chrome/browser/extensions/api/input_ime/input_ime_api.h" #endif -@@ -103,7 +103,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() - extensions::IdentityAPI::GetFactoryInstance(); - extensions::InstallTrackerFactory::GetInstance(); - extensions::InstallVerifierFactory::GetInstance(); --#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) -+#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) - extensions::InputImeAPI::GetFactoryInstance(); - #endif - extensions::LanguageSettingsPrivateDelegateFactory::GetInstance(); diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc index 8761ec1f68c9..5e53322baacc 100644 --- a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc +++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc @@ -1,24 +1,6 @@ ---- chrome/browser/flag_descriptions.cc.orig 2020-08-18 18:40:05 UTC +--- chrome/browser/flag_descriptions.cc.orig 2020-09-08 19:14:00 UTC +++ chrome/browser/flag_descriptions.cc -@@ -3929,7 +3929,7 @@ const char kZeroCopyVideoCaptureDescription[] = - - #endif // defined(OS_CHROMEOS) - --#if defined(OS_CHROMEOS) || defined(OS_LINUX) -+#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) - - #if BUILDFLAG(USE_TCMALLOC) - const char kDynamicTcmallocName[] = "Dynamic Tcmalloc Tuning"; -@@ -3938,7 +3938,7 @@ const char kDynamicTcmallocDescription[] = - "utilization."; - #endif // BUILDFLAG(USE_TCMALLOC) - --#endif // #if defined(OS_CHROMEOS) || defined(OS_LINUX) -+#endif // #if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) - - // All views-based platforms -------------------------------------------------- - -@@ -3968,13 +3968,13 @@ const char kReopenTabInProductHelpDescription[] = +@@ -4103,15 +4103,15 @@ const char kEnableNewBadgeOnMenuItemsDescription[] = // Random platform combinations ----------------------------------------------- @@ -32,18 +14,12 @@ -#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - #if BUILDFLAG(ENABLE_CLICK_TO_CALL) - -@@ -3986,7 +3986,7 @@ const char kClickToCallUIDescription[] = - - #endif // BUILDFLAG(ENABLE_CLICK_TO_CALL) - -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) const char kEnableMediaFeedsName[] = "Enables Media Feeds"; -@@ -4018,16 +4018,16 @@ const char kRemoteCopyProgressNotificationDescription[ +@@ -4143,16 +4143,16 @@ const char kRemoteCopyProgressNotificationDescription[ "Enables progress notifications to be shown for the remote copy feature " "when receiving a message."; @@ -63,3 +39,20 @@ #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS) +@@ -4163,14 +4163,14 @@ const char kWebContentsOcclusionDescription[] = + + #endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS) + +-#if defined(OS_CHROMEOS) || defined(OS_LINUX) ++#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) + #if BUILDFLAG(USE_TCMALLOC) + const char kDynamicTcmallocName[] = "Dynamic Tcmalloc Tuning"; + const char kDynamicTcmallocDescription[] = + "Allows tcmalloc to dynamically adjust tunables based on system resource " + "utilization."; + #endif // BUILDFLAG(USE_TCMALLOC) +-#endif // #if defined(OS_CHROMEOS) || defined(OS_LINUX) ++#endif // #if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) + + #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) + const char kUserDataSnapshotName[] = "Enable user data snapshots"; diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.h b/www/chromium/files/patch-chrome_browser_flag__descriptions.h index f3856cddbf7e..ff87d9f16c70 100644 --- a/www/chromium/files/patch-chrome_browser_flag__descriptions.h +++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.h @@ -1,4 +1,4 @@ ---- chrome/browser/flag_descriptions.h.orig 2020-08-18 18:40:05 UTC +--- chrome/browser/flag_descriptions.h.orig 2020-09-08 19:14:00 UTC +++ chrome/browser/flag_descriptions.h @@ -19,9 +19,9 @@ #include "ppapi/buildflags/buildflags.h" @@ -12,24 +12,7 @@ // This file declares strings used in chrome://flags. These messages are not // translated, because instead of end-users they target Chromium developers and -@@ -2306,14 +2306,14 @@ extern const char kZeroStateFilesDescription[]; - - #endif // #if defined(OS_CHROMEOS) - --#if defined(OS_CHROMEOS) || defined(OS_LINUX) -+#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) - - #if BUILDFLAG(USE_TCMALLOC) - extern const char kDynamicTcmallocName[]; - extern const char kDynamicTcmallocDescription[]; - #endif // BUILDFLAG(USE_TCMALLOC) - --#endif // #if defined(OS_CHROMEOS) || defined(OS_LINUX) -+#endif // #if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) - - // All views-based platforms -------------------------------------------------- - -@@ -2335,12 +2335,12 @@ extern const char kReopenTabInProductHelpDescription[] +@@ -2402,14 +2402,14 @@ extern const char kEnableNewBadgeOnMenuItemsDescriptio // Random platform combinations ----------------------------------------------- @@ -42,23 +25,17 @@ -#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - #if BUILDFLAG(ENABLE_CLICK_TO_CALL) - -@@ -2349,7 +2349,7 @@ extern const char kClickToCallUIDescription[]; - - #endif // BUILDFLAG(ENABLE_CLICK_TO_CALL) - -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) extern const char kEnableMediaFeedsName[]; -@@ -2367,15 +2367,15 @@ extern const char kRemoteCopyPersistentNotificationDes +@@ -2427,15 +2427,15 @@ extern const char kRemoteCopyPersistentNotificationDes extern const char kRemoteCopyProgressNotificationName[]; extern const char kRemoteCopyProgressNotificationDescription[]; -#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || -+#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || // defined(OS_CHROMEOS) -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) @@ -72,3 +49,18 @@ #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS) +@@ -2444,12 +2444,12 @@ extern const char kWebContentsOcclusionDescription[]; + + #endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS) + +-#if defined(OS_CHROMEOS) || defined(OS_LINUX) ++#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) + #if BUILDFLAG(USE_TCMALLOC) + extern const char kDynamicTcmallocName[]; + extern const char kDynamicTcmallocDescription[]; + #endif // BUILDFLAG(USE_TCMALLOC) +-#endif // #if defined(OS_CHROMEOS) || defined(OS_LINUX) ++#endif // #if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) + + #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) + extern const char kUserDataSnapshotName[]; diff --git a/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc b/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc index a390dbde142e..1d9f023ba609 100644 --- a/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc +++ b/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc @@ -1,6 +1,6 @@ ---- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2020-07-07 21:58:13 UTC +--- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2020-09-08 19:14:00 UTC +++ chrome/browser/media_galleries/media_file_system_registry.cc -@@ -736,7 +736,10 @@ class MediaFileSystemRegistry::MediaFileSystemContextI +@@ -735,7 +735,10 @@ class MediaFileSystemRegistry::MediaFileSystemContextI // Constructor in 'private' section because depends on private class definition. MediaFileSystemRegistry::MediaFileSystemRegistry() : file_system_context_(new MediaFileSystemContextImpl) { diff --git a/www/chromium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__posix.cc b/www/chromium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__posix.cc index c131ed5d1aa8..9a13223f1b2b 100644 --- a/www/chromium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__posix.cc +++ b/www/chromium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__posix.cc @@ -1,4 +1,4 @@ ---- chrome/browser/media/router/discovery/discovery_network_list_posix.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/media/router/discovery/discovery_network_list_posix.cc.orig 2020-09-08 19:14:00 UTC +++ chrome/browser/media/router/discovery/discovery_network_list_posix.cc @@ -10,6 +10,7 @@ #include <netinet/in.h> @@ -8,7 +8,7 @@ #include <algorithm> -@@ -19,7 +20,7 @@ +@@ -18,7 +19,7 @@ #include "chrome/browser/media/router/discovery/discovery_network_list_wifi.h" #include "net/base/net_errors.h" @@ -17,7 +17,7 @@ #include <netpacket/packet.h> #else #include <net/if_dl.h> -@@ -28,7 +29,7 @@ +@@ -27,7 +28,7 @@ namespace media_router { namespace { diff --git a/www/chromium/files/patch-chrome_browser_media_router_providers_wired__display_wired__display__media__route__provider.cc b/www/chromium/files/patch-chrome_browser_media_router_providers_wired__display_wired__display__media__route__provider.cc index 9b007ae67c87..7aade132d19b 100644 --- a/www/chromium/files/patch-chrome_browser_media_router_providers_wired__display_wired__display__media__route__provider.cc +++ b/www/chromium/files/patch-chrome_browser_media_router_providers_wired__display_wired__display__media__route__provider.cc @@ -1,7 +1,7 @@ ---- chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.cc.orig 2019-09-09 21:55:09 UTC +--- chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.cc.orig 2020-09-08 19:14:00 UTC +++ chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.cc @@ -112,6 +112,12 @@ void WiredDisplayMediaRouteProvider::CreateRoute( - bool incognito, + bool off_the_record, CreateRouteCallback callback) { DCHECK(!base::Contains(presentations_, presentation_id)); +#if defined(OS_BSD) diff --git a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc index 76fb8bab73c0..9e03073fc6e0 100644 --- a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc +++ b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc @@ -1,6 +1,6 @@ ---- chrome/browser/media/webrtc/webrtc_event_log_uploader.cc.orig 2020-02-03 21:52:40 UTC +--- chrome/browser/media/webrtc/webrtc_event_log_uploader.cc.orig 2020-09-08 19:14:00 UTC +++ chrome/browser/media/webrtc/webrtc_event_log_uploader.cc -@@ -38,7 +38,7 @@ constexpr size_t kExpectedMimeOverheadBytes = 1000; / +@@ -36,7 +36,7 @@ constexpr size_t kExpectedMimeOverheadBytes = 1000; / const char kProduct[] = "Chrome"; #elif defined(OS_MACOSX) const char kProduct[] = "Chrome_Mac"; diff --git a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc index 942756201d7b..d745cafa47ef 100644 --- a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc +++ b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc @@ -1,4 +1,4 @@ ---- chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig 2020-07-07 21:58:13 UTC +--- chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig 2020-09-08 19:14:00 UTC +++ chrome/browser/media/webrtc/webrtc_logging_controller.cc @@ -23,10 +23,10 @@ #include "content/public/browser/browser_context.h" @@ -13,7 +13,7 @@ using webrtc_event_logging::WebRtcEventLogManager; -@@ -269,7 +269,7 @@ void WebRtcLoggingController::StartEventLogging( +@@ -272,7 +272,7 @@ void WebRtcLoggingController::StartEventLogging( web_app_id, callback); } @@ -22,7 +22,7 @@ void WebRtcLoggingController::GetLogsDirectory( const LogsDirectoryCallback& callback, const LogsDirectoryErrorCallback& error_callback) { -@@ -314,7 +314,7 @@ void WebRtcLoggingController::GrantLogsDirectoryAccess +@@ -317,7 +317,7 @@ void WebRtcLoggingController::GrantLogsDirectoryAccess base::SequencedTaskRunnerHandle::Get()->PostTask( FROM_HERE, base::BindOnce(callback, file_system.id(), registered_name)); } diff --git a/www/chromium/files/patch-chrome_browser_memory__details.cc b/www/chromium/files/patch-chrome_browser_memory__details.cc index d482b53d7d5e..4e26809d804c 100644 --- a/www/chromium/files/patch-chrome_browser_memory__details.cc +++ b/www/chromium/files/patch-chrome_browser_memory__details.cc @@ -1,20 +1,20 @@ ---- chrome/browser/memory_details.cc.orig 2020-07-07 21:58:13 UTC +--- chrome/browser/memory_details.cc.orig 2020-09-08 19:14:00 UTC +++ chrome/browser/memory_details.cc -@@ -39,7 +39,7 @@ +@@ -38,7 +38,7 @@ #include "services/resource_coordinator/public/cpp/memory_instrumentation/memory_instrumentation.h" #include "ui/base/l10n/l10n_util.h" -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) - #include "services/service_manager/zygote/zygote_host_linux.h" + #include "content/public/browser/zygote_host/zygote_host_linux.h" #endif -@@ -340,7 +340,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() { +@@ -339,7 +339,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() { process.titles.push_back(title); } -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) - if (service_manager::ZygoteHost::GetInstance()->IsZygotePid(process.pid)) { + if (content::ZygoteHost::GetInstance()->IsZygotePid(process.pid)) { process.process_type = content::PROCESS_TYPE_ZYGOTE; } diff --git a/www/chromium/files/patch-chrome_browser_memory__details__linux.cc b/www/chromium/files/patch-chrome_browser_memory__details__linux.cc index 1112bd81ffcc..8809783bd19a 100644 --- a/www/chromium/files/patch-chrome_browser_memory__details__linux.cc +++ b/www/chromium/files/patch-chrome_browser_memory__details__linux.cc @@ -1,6 +1,6 @@ ---- chrome/browser/memory_details_linux.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/memory_details_linux.cc.orig 2020-09-08 19:14:00 UTC +++ chrome/browser/memory_details_linux.cc -@@ -72,8 +72,10 @@ ProcessData GetProcessDataMemoryInformation( +@@ -69,8 +69,10 @@ ProcessData GetProcessDataMemoryInformation( std::unique_ptr<base::ProcessMetrics> metrics( base::ProcessMetrics::CreateProcessMetrics(pid)); diff --git a/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc b/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc index 8ea61636f679..f65c841a161d 100644 --- a/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc +++ b/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc @@ -1,6 +1,6 @@ ---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2020-07-07 21:58:13 UTC +--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2020-09-08 19:14:00 UTC +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc -@@ -51,7 +51,9 @@ +@@ -50,7 +50,9 @@ #if defined(OS_LINUX) && !defined(OS_CHROMEOS) #include <gnu/libc-version.h> @@ -11,7 +11,7 @@ #include "base/strings/string_split.h" #include "base/strings/string_util.h" @@ -59,7 +61,7 @@ - #if defined(USE_X11) + #include "ui/base/ui_base_features.h" #include "ui/base/x/x11_util.h" #endif -#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) diff --git a/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc b/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc index 33a03a24cd15..3ab9f9d61217 100644 --- a/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc +++ b/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2020-07-07 21:58:13 UTC +--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2020-09-08 19:14:00 UTC +++ chrome/browser/metrics/chrome_metrics_service_client.cc -@@ -680,11 +680,11 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -685,11 +685,11 @@ void ChromeMetricsServiceClient::RegisterMetricsServic #endif // defined(OS_WIN) #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -14,7 +14,7 @@ #if BUILDFLAG(ENABLE_PLUGINS) plugin_metrics_provider_ = new PluginMetricsProvider(local_state); -@@ -942,7 +942,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve +@@ -951,7 +951,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve } #endif #if defined(OS_WIN) || defined(OS_MACOSX) || \ diff --git a/www/chromium/files/patch-chrome_browser_metrics_process__memory__metrics__emitter.cc b/www/chromium/files/patch-chrome_browser_metrics_process__memory__metrics__emitter.cc index 263c484e7d66..dc0ea509029d 100644 --- a/www/chromium/files/patch-chrome_browser_metrics_process__memory__metrics__emitter.cc +++ b/www/chromium/files/patch-chrome_browser_metrics_process__memory__metrics__emitter.cc @@ -1,6 +1,6 @@ ---- chrome/browser/metrics/process_memory_metrics_emitter.cc.orig 2020-07-07 21:58:13 UTC +--- chrome/browser/metrics/process_memory_metrics_emitter.cc.orig 2020-09-08 19:14:00 UTC +++ chrome/browser/metrics/process_memory_metrics_emitter.cc -@@ -489,7 +489,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc +@@ -492,7 +492,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc builder->SetPrivateMemoryFootprint(pmd.os_dump().private_footprint_kb / kKiB); builder->SetSharedMemoryFootprint(pmd.os_dump().shared_footprint_kb / kKiB); @@ -9,7 +9,7 @@ builder->SetPrivateSwapFootprint(pmd.os_dump().private_footprint_swap_kb / kKiB); #endif -@@ -512,7 +512,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc +@@ -515,7 +515,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc MEMORY_METRICS_HISTOGRAM_MB(std::string(kMemoryHistogramPrefix) + process_name + ".SharedMemoryFootprint", pmd.os_dump().shared_footprint_kb / kKiB); diff --git a/www/chromium/files/patch-chrome_browser_native__file__system_chrome__native__file__system__permission__context.cc b/www/chromium/files/patch-chrome_browser_native__file__system_chrome__native__file__system__permission__context.cc index cea7509438b9..e6db3e75166e 100644 --- a/www/chromium/files/patch-chrome_browser_native__file__system_chrome__native__file__system__permission__context.cc +++ b/www/chromium/files/patch-chrome_browser_native__file__system_chrome__native__file__system__permission__context.cc @@ -1,6 +1,6 @@ ---- chrome/browser/native_file_system/chrome_native_file_system_permission_context.cc.orig 2020-05-13 18:39:37 UTC +--- chrome/browser/native_file_system/chrome_native_file_system_permission_context.cc.orig 2020-09-08 19:14:00 UTC +++ chrome/browser/native_file_system/chrome_native_file_system_permission_context.cc -@@ -150,7 +150,7 @@ const struct { +@@ -120,7 +120,7 @@ const struct { {base::DIR_APP_DATA, nullptr, true}, {base::DIR_HOME, FILE_PATH_LITERAL("Library"), true}, #endif diff --git a/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc index 36513267e9bc..d78ddf44d9d0 100644 --- a/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc +++ b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/net/system_network_context_manager.cc.orig 2020-07-07 21:58:13 UTC +--- chrome/browser/net/system_network_context_manager.cc.orig 2020-09-08 19:14:00 UTC +++ chrome/browser/net/system_network_context_manager.cc -@@ -75,11 +75,11 @@ +@@ -77,11 +77,11 @@ #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" #endif // defined(OS_CHROMEOS) @@ -14,7 +14,7 @@ #if BUILDFLAG(ENABLE_EXTENSIONS) #include "extensions/common/constants.h" -@@ -138,10 +138,10 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut +@@ -140,10 +140,10 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut auth_dynamic_params->enable_negotiate_port = local_state->GetBoolean(prefs::kEnableAuthNegotiatePort); @@ -27,7 +27,7 @@ #if defined(OS_POSIX) auth_dynamic_params->ntlm_v2_enabled = -@@ -352,10 +352,10 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -355,10 +355,10 @@ SystemNetworkContextManager::SystemNetworkContextManag pref_change_registrar_.Add(prefs::kEnableAuthNegotiatePort, auth_pref_callback); @@ -40,7 +40,7 @@ #if defined(OS_POSIX) pref_change_registrar_.Add(prefs::kNtlmV2Enabled, auth_pref_callback); -@@ -402,10 +402,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -405,10 +405,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe registry->RegisterStringPref(prefs::kAuthServerWhitelist, std::string()); registry->RegisterStringPref(prefs::kAuthNegotiateDelegateWhitelist, std::string()); @@ -53,7 +53,7 @@ #if defined(OS_POSIX) registry->RegisterBooleanPref( -@@ -490,7 +490,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea +@@ -491,7 +491,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea // NetworkContext is created, but before anything has the chance to use it. stub_resolver_config_reader_.UpdateNetworkService(true /* record_metrics */); diff --git a/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc b/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc index 481088dd59a3..b6b8ef04888f 100644 --- a/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc +++ b/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2020-07-07 21:58:13 UTC +--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2020-09-08 19:14:00 UTC +++ chrome/browser/password_manager/chrome_password_manager_client.cc -@@ -92,7 +92,11 @@ +@@ -95,7 +95,11 @@ #include "net/base/url_util.h" #include "net/cert/cert_status_flags.h" #include "services/metrics/public/cpp/ukm_recorder.h" diff --git a/www/chromium/files/patch-chrome_browser_password__manager_password__store__factory.cc b/www/chromium/files/patch-chrome_browser_password__manager_password__store__factory.cc index 4489325c6ff8..6a8408919168 100644 --- a/www/chromium/files/patch-chrome_browser_password__manager_password__store__factory.cc +++ b/www/chromium/files/patch-chrome_browser_password__manager_password__store__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/password_manager/password_store_factory.cc.orig 2020-07-07 21:58:13 UTC +--- chrome/browser/password_manager/password_store_factory.cc.orig 2020-09-08 19:14:00 UTC +++ chrome/browser/password_manager/password_store_factory.cc -@@ -189,7 +189,7 @@ PasswordStoreFactory::BuildServiceInstanceFor( +@@ -193,7 +193,7 @@ PasswordStoreFactory::BuildServiceInstanceFor( base::TimeDelta::FromSeconds(20)); #if defined(OS_WIN) || defined(OS_MACOSX) || \ diff --git a/www/chromium/files/patch-chrome_browser_pdf_pdf__extension__test.cc b/www/chromium/files/patch-chrome_browser_pdf_pdf__extension__test.cc index ad1ebe848aa1..27ec14243b21 100644 --- a/www/chromium/files/patch-chrome_browser_pdf_pdf__extension__test.cc +++ b/www/chromium/files/patch-chrome_browser_pdf_pdf__extension__test.cc @@ -1,6 +1,6 @@ ---- chrome/browser/pdf/pdf_extension_test.cc.orig 2020-07-13 09:21:17 UTC +--- chrome/browser/pdf/pdf_extension_test.cc.orig 2020-09-08 19:14:00 UTC +++ chrome/browser/pdf/pdf_extension_test.cc -@@ -1796,7 +1796,7 @@ class PDFExtensionClipboardTest : public PDFExtensionT +@@ -1926,7 +1926,7 @@ class PDFExtensionClipboardTest : public PDFExtensionT // Checks the Linux selection clipboard by polling. void CheckSelectionClipboard(const std::string& expected) { diff --git a/www/chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller.cc b/www/chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller.cc new file mode 100644 index 000000000000..b56bde752003 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller.cc @@ -0,0 +1,11 @@ +--- chrome/browser/policy/chrome_browser_cloud_management_controller.cc.orig 2020-09-16 29:32:49 UTC ++++ chrome/browser/policy/chrome_browser_cloud_management_controller.cc +@@ -228,7 +228,7 @@ + storage_delegate = std::make_unique<BrowserDMTokenStorageWin>(); + #elif defined(OS_MACOSX) + storage_delegate = std::make_unique<BrowserDMTokenStorageMac>(); +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + storage_delegate = std::make_unique<BrowserDMTokenStorageLinux>(); + #else + NOT_REACHED(); diff --git a/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc b/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc index 1a57e52ccde7..2ec02f12f4cf 100644 --- a/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc +++ b/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2020-07-07 21:58:13 UTC +--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2020-09-08 19:14:00 UTC +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -1193,11 +1193,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1232,11 +1232,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // !defined(OS_MACOSX) && !defined(OS_CHROMEOS) @@ -14,7 +14,7 @@ #if !defined(OS_MACOSX) { key::kFullscreenAllowed, -@@ -1265,11 +1265,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1304,11 +1304,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(ENABLE_SPELLCHECK) @@ -26,5 +26,5 @@ -#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) +#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - #if defined(OS_CHROMEOS) - { key::kRequiredClientCertificateForUser, + { key::kScrollToTextFragmentEnabled, + prefs::kScrollToTextFragmentEnabled, diff --git a/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc b/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc index bef24c9e0321..a255fffc8af1 100644 --- a/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc +++ b/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc @@ -1,6 +1,6 @@ ---- chrome/browser/prefs/browser_prefs.cc.orig 2020-07-07 21:58:13 UTC +--- chrome/browser/prefs/browser_prefs.cc.orig 2020-09-08 19:14:00 UTC +++ chrome/browser/prefs/browser_prefs.cc -@@ -380,7 +380,7 @@ +@@ -385,7 +385,7 @@ #endif #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -9,7 +9,7 @@ #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" #endif -@@ -1075,7 +1075,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync +@@ -1100,7 +1100,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync #endif #if defined(OS_WIN) || defined(OS_MACOSX) || \ diff --git a/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__whitelist.cc b/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc index e394a24d2267..d2731c24d789 100644 --- a/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__whitelist.cc +++ b/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc @@ -1,6 +1,6 @@ ---- chrome/browser/prefs/pref_service_incognito_whitelist.cc.orig 2020-05-13 18:39:38 UTC -+++ chrome/browser/prefs/pref_service_incognito_whitelist.cc -@@ -133,7 +133,7 @@ const char* const kPersistentPrefNames[] = { +--- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2020-09-16 14:55:57 UTC ++++ chrome/browser/prefs/pref_service_incognito_allowlist.cc +@@ -135,7 +135,7 @@ const char* const kPersistentPrefNames[] = { prefs::kShowFullscreenToolbar, #endif diff --git a/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc b/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc index f8a7db8e85a3..2edccc70dfa2 100644 --- a/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc +++ b/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc @@ -1,6 +1,6 @@ ---- chrome/browser/process_singleton_posix.cc.orig 2019-10-21 19:06:22 UTC +--- chrome/browser/process_singleton_posix.cc.orig 2020-09-08 19:14:00 UTC +++ chrome/browser/process_singleton_posix.cc -@@ -95,11 +95,11 @@ +@@ -94,11 +94,11 @@ #include "net/base/network_interfaces.h" #include "ui/base/l10n/l10n_util.h" @@ -14,7 +14,7 @@ #include "ui/views/linux_ui/linux_ui.h" #endif -@@ -296,7 +296,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo +@@ -295,7 +295,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo if (g_disable_prompt) return g_user_opted_unlock_in_use_profile; @@ -23,7 +23,7 @@ base::string16 relaunch_button_text = l10n_util::GetStringUTF16( IDS_PROFILE_IN_USE_LINUX_RELAUNCH); return ShowProcessSingletonDialog(error, relaunch_button_text); -@@ -872,7 +872,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::Notif +@@ -871,7 +871,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::Notif SendRemoteProcessInteractionResultHistogram(REMOTE_PROCESS_SHUTTING_DOWN); return PROCESS_NONE; } else if (strncmp(buf, kACKToken, base::size(kACKToken) - 1) == 0) { diff --git a/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc b/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc index ecef81b85a8f..cb479cedb27e 100644 --- a/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc +++ b/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc @@ -1,6 +1,6 @@ ---- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2020-07-07 21:58:13 UTC +--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2020-09-08 19:14:00 UTC +++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -301,7 +301,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -310,7 +310,7 @@ void ChromeBrowserMainExtraPartsProfiles:: media_router::MediaRouterUIServiceFactory::GetInstance(); #endif #if defined(OS_WIN) || defined(OS_MACOSX) || \ diff --git a/www/chromium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc b/www/chromium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc index 081583a855ac..b7a28d343e26 100644 --- a/www/chromium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc +++ b/www/chromium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc @@ -1,6 +1,6 @@ ---- chrome/browser/profiles/profile_attributes_entry.cc.orig 2020-07-07 21:58:13 UTC +--- chrome/browser/profiles/profile_attributes_entry.cc.orig 2020-09-08 19:14:00 UTC +++ chrome/browser/profiles/profile_attributes_entry.cc -@@ -136,7 +136,7 @@ void ProfileAttributesEntry::Initialize(ProfileInfoCac +@@ -137,7 +137,7 @@ void ProfileAttributesEntry::Initialize(ProfileInfoCac if (is_force_signin_enabled_) { if (!IsAuthenticated()) is_force_signin_profile_locked_ = true; diff --git a/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc b/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc index 418a29f77142..b8af4ee2558b 100644 --- a/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc +++ b/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc @@ -1,6 +1,6 @@ ---- chrome/browser/renderer_context_menu/render_view_context_menu.cc.orig 2020-07-07 21:58:13 UTC +--- chrome/browser/renderer_context_menu/render_view_context_menu.cc.orig 2020-09-08 19:14:00 UTC +++ chrome/browser/renderer_context_menu/render_view_context_menu.cc -@@ -1700,7 +1700,7 @@ void RenderViewContextMenu::AppendEditableItems() { +@@ -1655,7 +1655,7 @@ void RenderViewContextMenu::AppendEditableItems() { // 'Undo' and 'Redo' for text input with no suggestions and no text selected. // We make an exception for OS X as context clicking will select the closest // word. In this case both items are always shown. @@ -9,7 +9,7 @@ menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_UNDO, IDS_CONTENT_CONTEXT_UNDO); menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_REDO, -@@ -1742,7 +1742,7 @@ void RenderViewContextMenu::AppendLanguageSettings() { +@@ -1697,7 +1697,7 @@ void RenderViewContextMenu::AppendLanguageSettings() { if (!use_spelling) return; @@ -18,7 +18,7 @@ menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_LANGUAGE_SETTINGS, IDS_CONTENT_CONTEXT_LANGUAGE_SETTINGS); #else -@@ -2083,7 +2083,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) +@@ -2038,7 +2038,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) case IDC_CHECK_SPELLING_WHILE_TYPING: return prefs->GetBoolean(spellcheck::prefs::kSpellCheckEnable); diff --git a/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc b/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc index d7938b671069..2dbf80eee6f5 100644 --- a/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc +++ b/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc @@ -1,14 +1,14 @@ ---- chrome/browser/sync/chrome_sync_client.cc.orig 2020-07-07 21:58:14 UTC +--- chrome/browser/sync/chrome_sync_client.cc.orig 2020-09-08 19:14:00 UTC +++ chrome/browser/sync/chrome_sync_client.cc -@@ -450,7 +450,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy +@@ -449,7 +449,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy // Chrome prefers OS provided spell checkers where they exist. So only sync the // custom dictionary on platforms that typically don't provide one. -#if defined(OS_LINUX) || defined(OS_WIN) +#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) // Dictionary sync is enabled by default. - if (!disabled_types.Has(syncer::DICTIONARY)) { - controllers.push_back( + if (!disabled_types.Has(syncer::DICTIONARY) && + GetPrefService()->GetBoolean(spellcheck::prefs::kSpellCheckEnable)) { @@ -458,7 +458,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy syncer::DICTIONARY, model_type_store_factory, GetSyncableServiceForType(syncer::DICTIONARY), dump_stack)); diff --git a/www/chromium/files/patch-chrome_browser_sync_test_integration_single__client__wallet__sync__test.cc b/www/chromium/files/patch-chrome_browser_sync_test_integration_single__client__wallet__sync__test.cc index 834f4d92f514..37173581441d 100644 --- a/www/chromium/files/patch-chrome_browser_sync_test_integration_single__client__wallet__sync__test.cc +++ b/www/chromium/files/patch-chrome_browser_sync_test_integration_single__client__wallet__sync__test.cc @@ -1,6 +1,6 @@ ---- chrome/browser/sync/test/integration/single_client_wallet_sync_test.cc.orig 2020-07-13 09:22:37 UTC +--- chrome/browser/sync/test/integration/single_client_wallet_sync_test.cc.orig 2020-09-08 19:14:00 UTC +++ chrome/browser/sync/test/integration/single_client_wallet_sync_test.cc -@@ -814,7 +814,7 @@ IN_PROC_BROWSER_TEST_F(SingleClientWalletSyncTest, Cha +@@ -821,7 +821,7 @@ IN_PROC_BROWSER_TEST_F(SingleClientWalletSyncTest, Cha IN_PROC_BROWSER_TEST_F(SingleClientWalletSyncTest, SameUpdatesAreIgnoredWhenLocalCardsUnmasked) { // We need to allow storing full server cards for this test to work properly. diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc index 1e077a7ff46c..030c86515479 100644 --- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc +++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc @@ -1,6 +1,6 @@ ---- chrome/browser/task_manager/sampling/task_group.cc.orig 2019-09-09 21:55:10 UTC +--- chrome/browser/task_manager/sampling/task_group.cc.orig 2020-09-08 19:14:00 UTC +++ chrome/browser/task_manager/sampling/task_group.cc -@@ -33,9 +33,9 @@ const int kBackgroundRefreshTypesMask = +@@ -32,9 +32,9 @@ const int kBackgroundRefreshTypesMask = #if defined(OS_WIN) REFRESH_TYPE_START_TIME | REFRESH_TYPE_CPU_TIME | #endif // defined(OS_WIN) @@ -12,7 +12,7 @@ #if BUILDFLAG(ENABLE_NACL) REFRESH_TYPE_NACL | #endif // BUILDFLAG(ENABLE_NACL) -@@ -114,9 +114,9 @@ TaskGroup::TaskGroup( +@@ -113,9 +113,9 @@ TaskGroup::TaskGroup( #if BUILDFLAG(ENABLE_NACL) nacl_debug_stub_port_(nacl::kGdbDebugStubPortUnknown), #endif // BUILDFLAG(ENABLE_NACL) @@ -24,7 +24,7 @@ idle_wakeups_per_second_(-1), gpu_memory_has_duplicates_(false), is_backgrounded_(false) { -@@ -129,10 +129,10 @@ TaskGroup::TaskGroup( +@@ -128,10 +128,10 @@ TaskGroup::TaskGroup( weak_ptr_factory_.GetWeakPtr()), base::Bind(&TaskGroup::OnIdleWakeupsRefreshDone, weak_ptr_factory_.GetWeakPtr()), @@ -37,7 +37,7 @@ base::Bind(&TaskGroup::OnProcessPriorityDone, weak_ptr_factory_.GetWeakPtr())); -@@ -300,14 +300,14 @@ void TaskGroup::OnRefreshNaClDebugStubPortDone(int nac +@@ -299,14 +299,14 @@ void TaskGroup::OnRefreshNaClDebugStubPortDone(int nac } #endif // BUILDFLAG(ENABLE_NACL) diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc index cb287277caa7..95d714f32cdf 100644 --- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc +++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig 2019-10-21 19:06:23 UTC +--- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig 2020-09-08 19:14:00 UTC +++ chrome/browser/task_manager/sampling/task_manager_impl.cc -@@ -219,11 +219,11 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id, +@@ -229,11 +229,11 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id, } int TaskManagerImpl::GetOpenFdCount(TaskId task_id) const { diff --git a/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc b/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc index f0b784e8df46..64ff8e0052e2 100644 --- a/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc +++ b/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc @@ -1,6 +1,6 @@ ---- chrome/browser/tracing/crash_service_uploader.cc.orig 2020-05-13 18:39:38 UTC +--- chrome/browser/tracing/crash_service_uploader.cc.orig 2020-09-08 19:14:00 UTC +++ chrome/browser/tracing/crash_service_uploader.cc -@@ -161,6 +161,8 @@ void TraceCrashServiceUploader::DoCompressOnBackground +@@ -160,6 +160,8 @@ void TraceCrashServiceUploader::DoCompressOnBackground const char product[] = "Chrome_Linux"; #elif defined(OS_ANDROID) const char product[] = "Chrome_Android"; diff --git a/www/chromium/files/patch-chrome_browser_ui_BUILD.gn b/www/chromium/files/patch-chrome_browser_ui_BUILD.gn index 017c12ccf8cc..a7ddcebb34fe 100644 --- a/www/chromium/files/patch-chrome_browser_ui_BUILD.gn +++ b/www/chromium/files/patch-chrome_browser_ui_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/browser/ui/BUILD.gn.orig 2020-07-07 21:58:14 UTC +--- chrome/browser/ui/BUILD.gn.orig 2020-09-08 19:14:00 UTC +++ chrome/browser/ui/BUILD.gn -@@ -641,12 +641,15 @@ static_library("ui") { +@@ -621,12 +621,15 @@ static_library("ui") { deps += [ "//components/autofill/content/browser/webauthn" ] } diff --git a/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc b/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc index 54cc03271d7d..9c17eb84ffec 100644 --- a/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc +++ b/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/browser_command_controller.cc.orig 2020-07-07 21:58:14 UTC +--- chrome/browser/ui/browser_command_controller.cc.orig 2020-09-08 19:14:01 UTC +++ chrome/browser/ui/browser_command_controller.cc @@ -83,7 +83,7 @@ #include "components/session_manager/core/session_manager.h" @@ -6,10 +6,10 @@ -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) - #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" + #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" // nogncheck #endif -@@ -253,7 +253,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( +@@ -254,7 +254,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( #endif } @@ -18,7 +18,7 @@ // If this key was registered by the user as a content editing hotkey, then // it is not reserved. ui::TextEditKeyBindingsDelegateAuraLinux* delegate = -@@ -479,7 +479,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -480,7 +480,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo break; #endif @@ -27,7 +27,7 @@ case IDC_MINIMIZE_WINDOW: browser_->window()->Minimize(); break; -@@ -981,7 +981,7 @@ void BrowserCommandController::InitCommandState() { +@@ -953,7 +953,7 @@ void BrowserCommandController::InitCommandState() { command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_4, true); command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_5, true); #endif diff --git a/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc b/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc index c393ceb5d02d..583e02ec9c75 100644 --- a/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc +++ b/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc @@ -1,20 +1,24 @@ ---- chrome/browser/ui/browser_view_prefs.cc.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/ui/browser_view_prefs.cc.orig 2020-09-08 19:14:01 UTC +++ chrome/browser/ui/browser_view_prefs.cc -@@ -34,7 +34,7 @@ void RegisterBrowserViewLocalPrefs(PrefRegistrySimple* +@@ -26,7 +26,7 @@ namespace { + // Old values: 0 = SHRINK (default), 1 = STACKED. + const char kTabStripLayoutType[] = "tab_strip_layout_type"; + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + bool GetCustomFramePrefDefault() { + #if defined(USE_OZONE) + if (features::IsUsingOzonePlatform()) { +@@ -51,10 +51,10 @@ void RegisterBrowserViewLocalPrefs(PrefRegistrySimple* void RegisterBrowserViewProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - bool custom_frame_pref_default = false; - #if defined(USE_X11) - custom_frame_pref_default = ui::GetCustomFramePrefDefault(); -@@ -45,7 +45,7 @@ void RegisterBrowserViewProfilePrefs( - #endif ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) registry->RegisterBooleanPref(prefs::kUseCustomChromeFrame, - custom_frame_pref_default); --#endif // OS_LINUX && !OS_CHROMEOS -+#endif // (OS_LINUX && !OS_CHROMEOS) || defined(OS_BSD) + GetCustomFramePrefDefault()); +-#endif // defined(OS_LINUX) && defined(!OS_CHROMEOS) ++#endif // (defined(OS_LINUX) || defined(OS_BSD)) && defined(!OS_CHROMEOS) } void MigrateBrowserTabStripPrefs(PrefService* prefs) { diff --git a/www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine__base.cc b/www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine__base.cc deleted file mode 100644 index fd379c49386c..000000000000 --- a/www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine__base.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/ui/input_method/input_method_engine_base.cc.orig 2020-02-03 21:53:29 UTC -+++ chrome/browser/ui/input_method/input_method_engine_base.cc -@@ -31,7 +31,7 @@ - #include "ui/base/ime/chromeos/ime_keymap.h" - #elif defined(OS_WIN) - #include "ui/events/keycodes/keyboard_codes_win.h" --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) - #include "ui/events/keycodes/keyboard_codes_posix.h" - #endif - diff --git a/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc index d9af1ba13eb7..3f61c1b3ea81 100644 --- a/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc +++ b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc @@ -1,15 +1,6 @@ ---- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2020-07-07 21:58:14 UTC +--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2020-09-08 19:14:01 UTC +++ chrome/browser/ui/startup/startup_browser_creator.cc -@@ -85,7 +85,7 @@ - #include "chrome/browser/ui/user_manager.h" - #endif - --#if defined(TOOLKIT_VIEWS) && defined(OS_LINUX) -+#if defined(TOOLKIT_VIEWS) && (defined(OS_LINUX) || defined(OS_BSD)) - #include "ui/events/devices/x11/touch_factory_x11.h" // nogncheck - #endif - -@@ -300,7 +300,7 @@ bool IsSilentLaunchEnabled(const base::CommandLine& co +@@ -303,7 +303,7 @@ bool IsSilentLaunchEnabled(const base::CommandLine& co // true, send a warning if guest mode is requested but not allowed by policy. bool IsGuestModeEnforced(const base::CommandLine& command_line, bool show_warning) { @@ -18,13 +9,17 @@ PrefService* service = g_browser_process->local_state(); DCHECK(service); -@@ -684,8 +684,10 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -687,12 +687,14 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( } #endif // OS_CHROMEOS +#if 0 /* XXX */ #if defined(TOOLKIT_VIEWS) && defined(USE_X11) - ui::TouchFactory::SetTouchDeviceListFromCommandLine(); + // TODO(https://crbug.com/1097696): make it available on ozone/linux. + if (!features::IsUsingOzonePlatform()) + ui::TouchFactory::SetTouchDeviceListFromCommandLine(); + else + NOTIMPLEMENTED_LOG_ONCE(); +#endif #endif diff --git a/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc index a301a76dea6c..9d6364ec173c 100644 --- a/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc +++ b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/tab_helpers.cc.orig 2020-07-07 21:58:14 UTC +--- chrome/browser/ui/tab_helpers.cc.orig 2020-09-08 19:14:01 UTC +++ chrome/browser/ui/tab_helpers.cc -@@ -143,7 +143,7 @@ +@@ -144,7 +144,7 @@ #include "chrome/browser/ui/app_list/search/cros_action_history/cros_action_recorder_tab_tracker.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h" #include "chrome/browser/ui/hats/hats_helper.h" #endif -@@ -392,11 +392,11 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con +@@ -384,11 +384,11 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con #endif #if defined(OS_WIN) || defined(OS_MACOSX) || \ diff --git a/www/chromium/files/patch-chrome_browser_ui_test_test__browser__ui.cc b/www/chromium/files/patch-chrome_browser_ui_test_test__browser__ui.cc index ff9d6ec0005d..53d8203cfc02 100644 --- a/www/chromium/files/patch-chrome_browser_ui_test_test__browser__ui.cc +++ b/www/chromium/files/patch-chrome_browser_ui_test_test__browser__ui.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/test/test_browser_ui.cc.orig 2020-07-13 09:23:57 UTC +--- chrome/browser/ui/test/test_browser_ui.cc.orig 2020-09-08 19:14:01 UTC +++ chrome/browser/ui/test/test_browser_ui.cc @@ -10,7 +10,7 @@ #include "build/build_config.h" @@ -7,14 +7,23 @@ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) #include "chrome/test/pixel/browser_skia_gold_pixel_diff.h" + #include "ui/base/test/skia_gold_matching_algorithm.h" #include "ui/compositor/test/draw_waiter_for_test.h" - #include "ui/views/widget/widget.h" -@@ -37,7 +37,7 @@ bool TestBrowserUi::VerifyPixelUi(views::Widget* widge - const std::string& screenshot_prefix, - const std::string& screenshot_name) { +@@ -32,7 +32,7 @@ std::string NameFromTestCase() { + } // namespace + + TestBrowserUi::TestBrowserUi() { +-#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // Default to fuzzy diff. The magic number is chosen based on + // past experiments. + SetPixelMatchAlgorithm( +@@ -43,7 +43,7 @@ TestBrowserUi::TestBrowserUi() { + TestBrowserUi::~TestBrowserUi() = default; + // TODO(https://crbug.com/958242) support Mac for pixel tests. -#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) +#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - if (!base::CommandLine::ForCurrentProcess()->HasSwitch( - "browser-ui-tests-verify-pixels")) - return true; + bool TestBrowserUi::VerifyPixelUi(views::Widget* widget, + const std::string& screenshot_prefix, + const std::string& screenshot_name) { diff --git a/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc b/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc index 5b89c27e8d36..0c843eb40a13 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/accelerator_table.cc.orig 2019-09-09 21:55:11 UTC +--- chrome/browser/ui/views/accelerator_table.cc.orig 2020-09-08 19:14:01 UTC +++ chrome/browser/ui/views/accelerator_table.cc -@@ -51,7 +51,7 @@ const AcceleratorMapping kAcceleratorMap[] = { +@@ -52,7 +52,7 @@ const AcceleratorMapping kAcceleratorMap[] = { {ui::VKEY_S, ui::EF_PLATFORM_ACCELERATOR, IDC_SAVE_PAGE}, {ui::VKEY_9, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_LAST_TAB}, {ui::VKEY_NUMPAD9, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_LAST_TAB}, @@ -9,7 +9,7 @@ {ui::VKEY_9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB}, {ui::VKEY_NUMPAD9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB}, {ui::VKEY_NEXT, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, IDC_MOVE_TAB_NEXT}, -@@ -81,7 +81,7 @@ const AcceleratorMapping kAcceleratorMap[] = { +@@ -82,7 +82,7 @@ const AcceleratorMapping kAcceleratorMap[] = { {ui::VKEY_NUMPAD7, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_6}, {ui::VKEY_8, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_7}, {ui::VKEY_NUMPAD8, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_7}, @@ -18,7 +18,7 @@ {ui::VKEY_1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0}, {ui::VKEY_NUMPAD1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0}, {ui::VKEY_2, ui::EF_ALT_DOWN, IDC_SELECT_TAB_1}, -@@ -99,7 +99,7 @@ const AcceleratorMapping kAcceleratorMap[] = { +@@ -100,7 +100,7 @@ const AcceleratorMapping kAcceleratorMap[] = { {ui::VKEY_8, ui::EF_ALT_DOWN, IDC_SELECT_TAB_7}, {ui::VKEY_NUMPAD8, ui::EF_ALT_DOWN, IDC_SELECT_TAB_7}, {ui::VKEY_BROWSER_FAVORITES, ui::EF_NONE, IDC_SHOW_BOOKMARK_BAR}, @@ -27,7 +27,7 @@ {ui::VKEY_B, ui::EF_SHIFT_DOWN | ui::EF_PLATFORM_ACCELERATOR, IDC_SHOW_BOOKMARK_BAR}, {ui::VKEY_OEM_MINUS, ui::EF_PLATFORM_ACCELERATOR, IDC_ZOOM_MINUS}, -@@ -125,14 +125,14 @@ const AcceleratorMapping kAcceleratorMap[] = { +@@ -126,14 +126,14 @@ const AcceleratorMapping kAcceleratorMap[] = { IDC_SHOW_AVATAR_MENU}, // Platform-specific key maps. diff --git a/www/chromium/files/patch-chrome_browser_ui_views_bookmarks_bookmark__bar__view__test.cc b/www/chromium/files/patch-chrome_browser_ui_views_bookmarks_bookmark__bar__view__test.cc index eb2aa8604f95..ed4c495990ac 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_bookmarks_bookmark__bar__view__test.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_bookmarks_bookmark__bar__view__test.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc.orig 2020-07-13 09:24:43 UTC +--- chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc.orig 2020-09-08 19:14:01 UTC +++ chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc -@@ -1833,7 +1833,7 @@ class BookmarkBarViewTest20 : public BookmarkBarViewEv +@@ -1835,7 +1835,7 @@ class BookmarkBarViewTest20 : public BookmarkBarViewEv } void Step3() { diff --git a/www/chromium/files/patch-chrome_browser_ui_views_download_download__item__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_download_download__item__view.cc index d9b14d21e1f2..631921933797 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_download_download__item__view.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_download_download__item__view.cc @@ -1,20 +1,20 @@ ---- chrome/browser/ui/views/download/download_item_view.cc.orig 2020-07-07 21:58:14 UTC +--- chrome/browser/ui/views/download/download_item_view.cc.orig 2020-09-08 19:14:01 UTC +++ chrome/browser/ui/views/download/download_item_view.cc -@@ -235,7 +235,7 @@ DownloadItemView::DownloadItemView(DownloadUIModel::Do - open_button_ = AddChildView(std::move(open_button)); +@@ -207,7 +207,7 @@ class TransparentButton : public views::Button { + }; - int file_name_style = views::style::STYLE_PRIMARY; + int GetFilenameStyle(const views::StyledLabel& label) { -#if !defined(OS_LINUX) +#if !defined(OS_LINUX) && !defined(OS_BSD) if (base::FeatureList::IsEnabled(safe_browsing::kUseNewDownloadWarnings)) - file_name_style = STYLE_EMPHASIZED; + return STYLE_EMPHASIZED; #endif -@@ -1636,7 +1636,7 @@ void DownloadItemView::StyleFilenameInLabel(views::Sty - if (!base::FeatureList::IsEnabled(safe_browsing::kUseNewDownloadWarnings)) - return; +@@ -276,7 +276,7 @@ DownloadItemView::DownloadItemView(DownloadUIModel::Do + open_button_ = AddChildView(std::move(open_button)); + int file_name_style = views::style::STYLE_PRIMARY; -#if !defined(OS_LINUX) +#if !defined(OS_LINUX) && !defined(OS_BSD) - base::string16 filename = ElidedFilename(); - size_t file_name_position = label->GetText().find(filename); - if (file_name_position != std::string::npos) { + if (base::FeatureList::IsEnabled(safe_browsing::kUseNewDownloadWarnings)) + file_name_style = STYLE_EMPHASIZED; + #endif diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc index 492f58d424af..11886d8393ad 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/browser_view.cc.orig 2020-07-07 21:58:14 UTC +--- chrome/browser/ui/views/frame/browser_view.cc.orig 2020-09-08 19:14:01 UTC +++ chrome/browser/ui/views/frame/browser_view.cc -@@ -1729,7 +1729,7 @@ void BrowserView::UserChangedTheme(BrowserThemeChangeT +@@ -1766,7 +1766,7 @@ void BrowserView::UserChangedTheme(BrowserThemeChangeT const bool should_use_native_frame = frame_->ShouldUseNativeFrame(); bool must_regenerate_frame; diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc index 753ace3963ed..1db35d661221 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2020-07-07 21:58:14 UTC +--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2020-09-08 19:14:01 UTC +++ chrome/browser/ui/views/tabs/tab_drag_controller.cc -@@ -444,7 +444,7 @@ void TabDragController::Init(TabDragContext* source_co +@@ -445,7 +445,7 @@ void TabDragController::Init(TabDragContext* source_co // synchronous on desktop Linux, so use that. // - Chrome OS // Releasing capture on Ash cancels gestures so avoid it. @@ -9,7 +9,7 @@ can_release_capture_ = false; #endif start_point_in_screen_ = gfx::Point(source_view_offset, mouse_offset.y()); -@@ -889,7 +889,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon +@@ -890,7 +890,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon else SetCapture(target_context); @@ -18,7 +18,7 @@ // EndMoveLoop is going to snap the window back to its original location. // Hide it so users don't see this. Hiding a window in Linux aura causes // it to lose capture so skip it. -@@ -2076,7 +2076,7 @@ TabDragController::Liveness TabDragController::GetLoca +@@ -2080,7 +2080,7 @@ TabDragController::Liveness TabDragController::GetLoca if (dragged_window) exclude.insert(dragged_window); } diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc b/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc index 4db7812d21a2..1a172df2a0cf 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/about_ui.cc.orig 2020-07-07 21:58:14 UTC +--- chrome/browser/ui/webui/about_ui.cc.orig 2020-09-08 19:14:01 UTC +++ chrome/browser/ui/webui/about_ui.cc -@@ -563,7 +563,7 @@ std::string ChromeURLs() { +@@ -564,7 +564,7 @@ std::string ChromeURLs() { return html; } @@ -9,7 +9,7 @@ std::string AboutLinuxProxyConfig() { std::string data; AppendHeader(&data, 0, -@@ -619,7 +619,7 @@ void AboutUIHTMLSource::StartDataRequest( +@@ -620,7 +620,7 @@ void AboutUIHTMLSource::StartDataRequest( response = ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(idr); } diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc b/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc index aa12ea3fe72c..d31b8b3038fe 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2020-07-07 21:58:14 UTC +--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2020-09-08 19:14:01 UTC +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -228,11 +228,11 @@ +@@ -234,11 +234,11 @@ #include "chrome/browser/ui/webui/conflicts/conflicts_ui.h" #endif @@ -14,7 +14,7 @@ #include "chrome/browser/ui/webui/sandbox/sandbox_internals_ui.h" #endif -@@ -376,7 +376,7 @@ bool IsAboutUI(const GURL& url) { +@@ -382,7 +382,7 @@ bool IsAboutUI(const GURL& url) { #if !defined(OS_ANDROID) || url.host_piece() == chrome::kChromeUITermsHost #endif @@ -23,7 +23,7 @@ || url.host_piece() == chrome::kChromeUILinuxProxyConfigHost #endif #if defined(OS_CHROMEOS) -@@ -725,7 +725,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -755,7 +755,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we if (url.host_piece() == chrome::kChromeUINaClHost) return &NewWebUI<NaClUI>; #endif @@ -32,7 +32,7 @@ if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost) return &NewWebUI<ConstrainedWebDialogUI>; #endif -@@ -773,17 +773,17 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -803,17 +803,17 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we return &NewWebUI<media_router::MediaRouterInternalsUI>; } #endif diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc b/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc index a7c79e5ce249..c2a5f83ccf89 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2020-07-07 21:58:14 UTC +--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2020-09-08 19:14:01 UTC +++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -319,7 +319,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -332,7 +332,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht {"minimumFont", IDS_SETTINGS_MINIMUM_FONT_SIZE_LABEL}, {"tiny", IDS_SETTINGS_TINY_FONT_SIZE}, {"huge", IDS_SETTINGS_HUGE_FONT_SIZE}, diff --git a/www/chromium/files/patch-chrome_common_BUILD.gn b/www/chromium/files/patch-chrome_common_BUILD.gn index 8942c1e2054c..fb6978347931 100644 --- a/www/chromium/files/patch-chrome_common_BUILD.gn +++ b/www/chromium/files/patch-chrome_common_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/common/BUILD.gn.orig 2020-07-07 21:58:14 UTC +--- chrome/common/BUILD.gn.orig 2020-09-08 19:14:01 UTC +++ chrome/common/BUILD.gn -@@ -273,6 +273,11 @@ static_library("common") { +@@ -271,6 +271,11 @@ static_library("common") { public_deps += [ "//ppapi/shared_impl" ] } diff --git a/www/chromium/files/patch-chrome_common_chrome__features.cc b/www/chromium/files/patch-chrome_common_chrome__features.cc index 72c78872e51f..2dc97b8465c1 100644 --- a/www/chromium/files/patch-chrome_common_chrome__features.cc +++ b/www/chromium/files/patch-chrome_common_chrome__features.cc @@ -1,6 +1,6 @@ ---- chrome/common/chrome_features.cc.orig 2020-07-07 21:58:14 UTC +--- chrome/common/chrome_features.cc.orig 2020-09-08 19:14:01 UTC +++ chrome/common/chrome_features.cc -@@ -68,13 +68,13 @@ const base::Feature kAsyncDns { +@@ -70,13 +70,13 @@ const base::Feature kAsyncDns { #endif }; diff --git a/www/chromium/files/patch-chrome_common_chrome__features.h b/www/chromium/files/patch-chrome_common_chrome__features.h index 2ca11194fafc..2a2c4c63571d 100644 --- a/www/chromium/files/patch-chrome_common_chrome__features.h +++ b/www/chromium/files/patch-chrome_common_chrome__features.h @@ -1,6 +1,6 @@ ---- chrome/common/chrome_features.h.orig 2020-07-07 21:58:14 UTC +--- chrome/common/chrome_features.h.orig 2020-09-08 19:14:01 UTC +++ chrome/common/chrome_features.h -@@ -61,10 +61,10 @@ extern const base::Feature kAppServiceIntentHandling; +@@ -63,10 +63,10 @@ extern const base::Feature kAppServiceAdaptiveIcon; COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kAsyncDns; diff --git a/www/chromium/files/patch-chrome_common_chrome__paths.cc b/www/chromium/files/patch-chrome_common_chrome__paths.cc index 8f8695168ae5..57658ced23b4 100644 --- a/www/chromium/files/patch-chrome_common_chrome__paths.cc +++ b/www/chromium/files/patch-chrome_common_chrome__paths.cc @@ -1,6 +1,6 @@ ---- chrome/common/chrome_paths.cc.orig 2020-02-03 21:52:41 UTC +--- chrome/common/chrome_paths.cc.orig 2020-09-08 19:14:01 UTC +++ chrome/common/chrome_paths.cc -@@ -51,21 +51,21 @@ const base::FilePath::CharType kPepperFlashSystemBaseD +@@ -52,21 +52,21 @@ const base::FilePath::CharType kPepperFlashSystemBaseD FILE_PATH_LITERAL("Internet Plug-Ins/PepperFlashPlayer"); #endif @@ -26,7 +26,7 @@ #if defined(OS_LINUX) && BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) // The name of the hint file that tells the latest component updated Widevine -@@ -204,7 +204,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -205,7 +205,7 @@ bool PathProvider(int key, base::FilePath* result) { return false; break; case chrome::DIR_DEFAULT_DOWNLOADS_SAFE: @@ -35,7 +35,7 @@ if (!GetUserDownloadsDirectorySafe(&cur)) return false; break; -@@ -495,6 +495,9 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -490,6 +490,9 @@ bool PathProvider(int key, base::FilePath* result) { case chrome::DIR_POLICY_FILES: { #if BUILDFLAG(GOOGLE_CHROME_BRANDING) cur = base::FilePath(FILE_PATH_LITERAL("/etc/opt/chrome/policies")); @@ -45,7 +45,7 @@ #else cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies")); #endif -@@ -502,7 +505,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -497,7 +500,7 @@ bool PathProvider(int key, base::FilePath* result) { } #endif #if defined(OS_CHROMEOS) || \ @@ -54,7 +54,7 @@ case chrome::DIR_USER_EXTERNAL_EXTENSIONS: { if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) return false; -@@ -510,7 +513,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -505,7 +508,7 @@ bool PathProvider(int key, base::FilePath* result) { break; } #endif @@ -63,7 +63,7 @@ case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: { cur = base::FilePath(kFilepathSinglePrefExtensions); break; -@@ -545,7 +548,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -540,7 +543,7 @@ bool PathProvider(int key, base::FilePath* result) { #endif break; @@ -72,7 +72,7 @@ case chrome::DIR_NATIVE_MESSAGING: #if defined(OS_MACOSX) #if BUILDFLAG(GOOGLE_CHROME_BRANDING) -@@ -559,6 +562,9 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -554,6 +557,9 @@ bool PathProvider(int key, base::FilePath* result) { #if BUILDFLAG(GOOGLE_CHROME_BRANDING) cur = base::FilePath(FILE_PATH_LITERAL( "/etc/opt/chrome/native-messaging-hosts")); @@ -82,7 +82,7 @@ #else cur = base::FilePath(FILE_PATH_LITERAL( "/etc/chromium/native-messaging-hosts")); -@@ -571,7 +577,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -566,7 +572,7 @@ bool PathProvider(int key, base::FilePath* result) { return false; cur = cur.Append(FILE_PATH_LITERAL("NativeMessagingHosts")); break; @@ -91,7 +91,7 @@ #if !defined(OS_ANDROID) case chrome::DIR_GLOBAL_GCM_STORE: if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) -@@ -579,7 +585,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -574,7 +580,7 @@ bool PathProvider(int key, base::FilePath* result) { cur = cur.Append(kGCMStoreDirname); break; #endif // !defined(OS_ANDROID) @@ -100,7 +100,7 @@ case chrome::FILE_COMPONENT_FLASH_HINT: if (!base::PathService::Get( chrome::DIR_COMPONENT_UPDATED_PEPPER_FLASH_PLUGIN, &cur)) { -@@ -587,7 +593,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -582,7 +588,7 @@ bool PathProvider(int key, base::FilePath* result) { } cur = cur.Append(kComponentUpdatedFlashHint); break; diff --git a/www/chromium/files/patch-chrome_common_chrome__paths.h b/www/chromium/files/patch-chrome_common_chrome__paths.h index 703fb6677e76..00fe1c7dc510 100644 --- a/www/chromium/files/patch-chrome_common_chrome__paths.h +++ b/www/chromium/files/patch-chrome_common_chrome__paths.h @@ -1,6 +1,6 @@ ---- chrome/common/chrome_paths.h.orig 2019-12-16 21:50:44 UTC +--- chrome/common/chrome_paths.h.orig 2020-09-08 19:14:01 UTC +++ chrome/common/chrome_paths.h -@@ -53,7 +53,7 @@ enum { +@@ -51,7 +51,7 @@ enum { // contains subdirectories. #endif #if defined(OS_CHROMEOS) || \ @@ -9,7 +9,7 @@ DIR_USER_EXTERNAL_EXTENSIONS, // Directory for per-user external extensions // on Chrome Mac and Chromium Linux. // On Chrome OS, this path is used for OEM -@@ -61,7 +61,7 @@ enum { +@@ -59,7 +59,7 @@ enum { // create it. #endif @@ -18,7 +18,7 @@ DIR_STANDALONE_EXTERNAL_EXTENSIONS, // Directory for 'per-extension' // definition manifest files that // describe extensions which are to be -@@ -122,7 +122,7 @@ enum { +@@ -120,7 +120,7 @@ enum { DIR_SUPERVISED_USER_INSTALLED_WHITELISTS, // Directory where sanitized // supervised user whitelists are // installed. @@ -27,7 +27,7 @@ DIR_NATIVE_MESSAGING, // System directory where native messaging host // manifest files are stored. DIR_USER_NATIVE_MESSAGING, // Directory with Native Messaging Hosts -@@ -137,10 +137,10 @@ enum { +@@ -135,10 +135,10 @@ enum { DIR_GEN_TEST_DATA, // Directory where generated test data resides. DIR_TEST_DATA, // Directory where unit test data resides. DIR_TEST_TOOLS, // Directory where unit test tools reside. diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.cc b/www/chromium/files/patch-chrome_common_chrome__switches.cc index de52fa804ea8..e271d73c8a20 100644 --- a/www/chromium/files/patch-chrome_common_chrome__switches.cc +++ b/www/chromium/files/patch-chrome_common_chrome__switches.cc @@ -1,6 +1,6 @@ ---- chrome/common/chrome_switches.cc.orig 2020-07-07 21:58:14 UTC +--- chrome/common/chrome_switches.cc.orig 2020-09-08 19:14:01 UTC +++ chrome/common/chrome_switches.cc -@@ -833,7 +833,7 @@ const char kAllowNaClFileHandleAPI[] = "allow-n +@@ -834,7 +834,7 @@ const char kAllowNaClFileHandleAPI[] = "allow-n const char kAllowNaClSocketAPI[] = "allow-nacl-socket-api"; #endif diff --git a/www/chromium/files/patch-chrome_common_extensions_api_api__sources.gni b/www/chromium/files/patch-chrome_common_extensions_api_api__sources.gni index 52d07bac4945..69991fa7280c 100644 --- a/www/chromium/files/patch-chrome_common_extensions_api_api__sources.gni +++ b/www/chromium/files/patch-chrome_common_extensions_api_api__sources.gni @@ -1,8 +1,8 @@ ---- chrome/common/extensions/api/api_sources.gni.orig 2020-02-03 21:52:41 UTC +--- chrome/common/extensions/api/api_sources.gni.orig 2020-09-08 19:14:01 UTC +++ chrome/common/extensions/api/api_sources.gni -@@ -113,7 +113,7 @@ if (is_chromeos) { - if (use_cups) { - schema_sources_ += [ "printing.idl" ] +@@ -112,7 +112,7 @@ if (is_chromeos) { + "printing_metrics.idl", + ] } -} else if (is_linux || is_win) { +} else if (is_linux || is_bsd || is_win) { diff --git a/www/chromium/files/patch-chrome_common_features.gni b/www/chromium/files/patch-chrome_common_features.gni index b93907d17968..42ca700cf4af 100644 --- a/www/chromium/files/patch-chrome_common_features.gni +++ b/www/chromium/files/patch-chrome_common_features.gni @@ -1,8 +1,8 @@ ---- chrome/common/features.gni.orig 2020-07-07 21:58:14 UTC +--- chrome/common/features.gni.orig 2020-09-08 19:14:01 UTC +++ chrome/common/features.gni -@@ -54,7 +54,7 @@ declare_args() { - # Enables password change in leaked password dialog, disabled by default. - enable_password_change_in_leaked_dialog = false +@@ -51,7 +51,7 @@ declare_args() { + enable_one_click_signin = + is_win || is_mac || (is_linux && !is_chromeos && !is_chromecast) - enable_service_discovery = (enable_mdns && !is_android) || is_mac + enable_service_discovery = (enable_mdns && !is_android) || is_mac || is_bsd diff --git a/www/chromium/files/patch-chrome_common_media_cdm__host__file__path.cc b/www/chromium/files/patch-chrome_common_media_cdm__host__file__path.cc index dc060950d123..a03912849e24 100644 --- a/www/chromium/files/patch-chrome_common_media_cdm__host__file__path.cc +++ b/www/chromium/files/patch-chrome_common_media_cdm__host__file__path.cc @@ -1,6 +1,6 @@ ---- chrome/common/media/cdm_host_file_path.cc.orig 2020-07-07 21:58:14 UTC +--- chrome/common/media/cdm_host_file_path.cc.orig 2020-09-08 19:14:01 UTC +++ chrome/common/media/cdm_host_file_path.cc -@@ -93,7 +93,7 @@ void AddCdmHostFilePaths( +@@ -95,7 +95,7 @@ void AddCdmHostFilePaths( cdm_host_file_paths->emplace_back(chrome_framework_path, chrome_framework_sig_path); diff --git a/www/chromium/files/patch-chrome_common_pref__names.cc b/www/chromium/files/patch-chrome_common_pref__names.cc index 26f2e59870e8..6e2324daf11c 100644 --- a/www/chromium/files/patch-chrome_common_pref__names.cc +++ b/www/chromium/files/patch-chrome_common_pref__names.cc @@ -1,6 +1,6 @@ ---- chrome/common/pref_names.cc.orig 2020-07-07 21:58:14 UTC +--- chrome/common/pref_names.cc.orig 2020-09-08 19:14:01 UTC +++ chrome/common/pref_names.cc -@@ -1076,7 +1076,7 @@ const char kForceYouTubeRestrict[] = "settings.force_y +@@ -1081,7 +1081,7 @@ const char kForceYouTubeRestrict[] = "settings.force_y // only using an account that belongs to one of the domains from this pref. const char kAllowedDomainsForApps[] = "settings.allowed_domains_for_apps"; @@ -9,7 +9,7 @@ // Linux specific preference on whether we should match the system theme. const char kUsesSystemTheme[] = "extensions.theme.use_system"; #endif -@@ -1213,7 +1213,7 @@ const char kShowUpdatePromotionInfoBar[] = +@@ -1224,7 +1224,7 @@ const char kShowUpdatePromotionInfoBar[] = "browser.show_update_promotion_info_bar"; #endif @@ -18,7 +18,7 @@ // Boolean that is false if we should show window manager decorations. If // true, we draw a custom chrome frame (thicker title bar and blue border). const char kUseCustomChromeFrame[] = "browser.custom_chrome_frame"; -@@ -1651,7 +1651,7 @@ const char kDownloadDefaultDirectory[] = "download.def +@@ -1673,7 +1673,7 @@ const char kDownloadDefaultDirectory[] = "download.def // upgrade a unsafe location to a safe location. const char kDownloadDirUpgraded[] = "download.directory_upgrade"; @@ -27,7 +27,7 @@ const char kOpenPdfDownloadInSystemReader[] = "download.open_pdf_in_system_reader"; #endif -@@ -1962,12 +1962,12 @@ const char kGloballyScopeHTTPAuthCacheEnabled[] = +@@ -1988,12 +1988,12 @@ const char kGloballyScopeHTTPAuthCacheEnabled[] = const char kAmbientAuthenticationInPrivateModesEnabled[] = "auth.ambient_auth_in_private_modes"; @@ -42,7 +42,7 @@ #if defined(OS_POSIX) // Boolean that specifies whether NTLMv2 is enabled. -@@ -2874,7 +2874,7 @@ const char kAutoplayWhitelist[] = "media.autoplay_whit +@@ -2914,7 +2914,7 @@ const char kAutoplayWhitelist[] = "media.autoplay_whit const char kBlockAutoplayEnabled[] = "media.block_autoplay"; #endif // !defined(OS_ANDROID) diff --git a/www/chromium/files/patch-chrome_common_pref__names.h b/www/chromium/files/patch-chrome_common_pref__names.h index 36585ecd88ca..a8bfca1a5142 100644 --- a/www/chromium/files/patch-chrome_common_pref__names.h +++ b/www/chromium/files/patch-chrome_common_pref__names.h @@ -1,6 +1,6 @@ ---- chrome/common/pref_names.h.orig 2020-07-07 21:58:14 UTC +--- chrome/common/pref_names.h.orig 2020-09-08 19:14:01 UTC +++ chrome/common/pref_names.h -@@ -345,7 +345,7 @@ extern const char kHistoryMenuPromoShown[]; +@@ -349,7 +349,7 @@ extern const char kHistoryMenuPromoShown[]; extern const char kForceGoogleSafeSearch[]; extern const char kForceYouTubeRestrict[]; extern const char kAllowedDomainsForApps[]; @@ -9,7 +9,7 @@ extern const char kUsesSystemTheme[]; #endif extern const char kCurrentThemePackFilename[]; -@@ -376,7 +376,7 @@ extern const char kDefaultBrowserSettingEnabled[]; +@@ -380,7 +380,7 @@ extern const char kDefaultBrowserSettingEnabled[]; #if defined(OS_MACOSX) extern const char kShowUpdatePromotionInfoBar[]; #endif @@ -18,7 +18,7 @@ extern const char kUseCustomChromeFrame[]; #endif #if BUILDFLAG(ENABLE_PLUGINS) -@@ -550,7 +550,7 @@ extern const char kDownloadExtensionsToOpen[]; +@@ -556,7 +556,7 @@ extern const char kDownloadExtensionsToOpen[]; extern const char kDownloadExtensionsToOpenByPolicy[]; extern const char kDownloadAllowedURLsForOpenByPolicy[]; extern const char kDownloadDirUpgraded[]; @@ -27,7 +27,7 @@ extern const char kOpenPdfDownloadInSystemReader[]; #endif #if defined(OS_ANDROID) -@@ -764,9 +764,9 @@ extern const char kAllowCrossOriginAuthPrompt[]; +@@ -776,9 +776,9 @@ extern const char kAllowCrossOriginAuthPrompt[]; extern const char kGloballyScopeHTTPAuthCacheEnabled[]; extern const char kAmbientAuthenticationInPrivateModesEnabled[]; @@ -39,7 +39,7 @@ #if defined(OS_POSIX) extern const char kNtlmV2Enabled[]; -@@ -999,7 +999,7 @@ extern const char kAutoplayWhitelist[]; +@@ -1010,7 +1010,7 @@ extern const char kAutoplayWhitelist[]; extern const char kBlockAutoplayEnabled[]; #endif diff --git a/www/chromium/files/patch-chrome_common_webui__url__constants.cc b/www/chromium/files/patch-chrome_common_webui__url__constants.cc index 629d91c9e0ff..acd8ebd46c0b 100644 --- a/www/chromium/files/patch-chrome_common_webui__url__constants.cc +++ b/www/chromium/files/patch-chrome_common_webui__url__constants.cc @@ -1,4 +1,4 @@ ---- chrome/common/webui_url_constants.cc.orig 2020-07-07 21:58:14 UTC +--- chrome/common/webui_url_constants.cc.orig 2020-09-08 19:14:01 UTC +++ chrome/common/webui_url_constants.cc @@ -318,7 +318,7 @@ bool IsSystemWebUIHost(base::StringPiece host) { } @@ -9,7 +9,7 @@ const char kChromeUIDiscardsHost[] = "discards"; const char kChromeUIDiscardsURL[] = "chrome://discards/"; const char kChromeUIHatsHost[] = "hats"; -@@ -330,17 +330,17 @@ const char kChromeUIProfilePickerHost[] = "profile-pic +@@ -335,17 +335,17 @@ const char kChromeUINearbyShareURL[] = "chrome://nearb const char kChromeUILinuxProxyConfigHost[] = "linux-proxy-config"; #endif @@ -30,7 +30,7 @@ const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog"; #endif -@@ -500,13 +500,13 @@ const char* const kChromeHostURLs[] = { +@@ -511,13 +511,13 @@ const char* const kChromeHostURLs[] = { kChromeUIInternetDetailDialogHost, kChromeUIAssistantOptInHost, #endif diff --git a/www/chromium/files/patch-chrome_common_webui__url__constants.h b/www/chromium/files/patch-chrome_common_webui__url__constants.h index c8f720a222c5..fc8077abd264 100644 --- a/www/chromium/files/patch-chrome_common_webui__url__constants.h +++ b/www/chromium/files/patch-chrome_common_webui__url__constants.h @@ -1,6 +1,6 @@ ---- chrome/common/webui_url_constants.h.orig 2020-07-07 21:58:14 UTC +--- chrome/common/webui_url_constants.h.orig 2020-09-08 19:14:01 UTC +++ chrome/common/webui_url_constants.h -@@ -282,7 +282,7 @@ bool IsSystemWebUIHost(base::StringPiece host); +@@ -277,7 +277,7 @@ bool IsSystemWebUIHost(base::StringPiece host); #endif // defined(OS_CHROMEOS) @@ -9,7 +9,7 @@ extern const char kChromeUIDiscardsHost[]; extern const char kChromeUIDiscardsURL[]; extern const char kChromeUIHatsHost[]; -@@ -295,17 +295,17 @@ extern const char kChromeUIProfilePickerHost[]; +@@ -294,17 +294,17 @@ extern const char kChromeUINearbyShareURL[]; extern const char kChromeUILinuxProxyConfigHost[]; #endif diff --git a/www/chromium/files/patch-chrome_renderer_chrome__content__renderer__client.cc b/www/chromium/files/patch-chrome_renderer_chrome__content__renderer__client.cc index cc91d54a387b..a09d7a06c16e 100644 --- a/www/chromium/files/patch-chrome_renderer_chrome__content__renderer__client.cc +++ b/www/chromium/files/patch-chrome_renderer_chrome__content__renderer__client.cc @@ -1,6 +1,6 @@ ---- chrome/renderer/chrome_content_renderer_client.cc.orig 2020-07-07 21:58:14 UTC +--- chrome/renderer/chrome_content_renderer_client.cc.orig 2020-09-08 19:14:01 UTC +++ chrome/renderer/chrome_content_renderer_client.cc -@@ -1078,7 +1078,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( +@@ -1089,7 +1089,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( } case chrome::mojom::PluginStatus::kRestartRequired: { diff --git a/www/chromium/files/patch-chrome_test_BUILD.gn b/www/chromium/files/patch-chrome_test_BUILD.gn index 5a45c5e3f160..064cf0010d96 100644 --- a/www/chromium/files/patch-chrome_test_BUILD.gn +++ b/www/chromium/files/patch-chrome_test_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/test/BUILD.gn.orig 2020-07-07 21:58:14 UTC +--- chrome/test/BUILD.gn.orig 2020-09-08 19:14:01 UTC +++ chrome/test/BUILD.gn -@@ -6191,7 +6191,7 @@ test("chrome_app_unittests") { +@@ -6228,7 +6228,7 @@ test("chrome_app_unittests") { "//components/heap_profiling/in_process", "//components/safe_browsing:buildflags", ] diff --git a/www/chromium/files/patch-chrome_test_base_chrome__test__launcher.cc b/www/chromium/files/patch-chrome_test_base_chrome__test__launcher.cc index b1edf8f80ebd..578b36827a02 100644 --- a/www/chromium/files/patch-chrome_test_base_chrome__test__launcher.cc +++ b/www/chromium/files/patch-chrome_test_base_chrome__test__launcher.cc @@ -1,4 +1,4 @@ ---- chrome/test/base/chrome_test_launcher.cc.orig 2020-07-07 21:58:14 UTC +--- chrome/test/base/chrome_test_launcher.cc.orig 2020-09-08 19:14:01 UTC +++ chrome/test/base/chrome_test_launcher.cc @@ -61,7 +61,7 @@ #endif @@ -9,7 +9,7 @@ #include "chrome/browser/first_run/scoped_relaunch_chrome_browser_override.h" #include "chrome/browser/upgrade_detector/installed_version_poller.h" #include "testing/gtest/include/gtest/gtest.h" -@@ -81,7 +81,7 @@ int ChromeTestSuiteRunner::RunTestSuite(int argc, char +@@ -79,7 +79,7 @@ int ChromeTestSuiteRunner::RunTestSuite(int argc, char content::ContentTestSuiteBase::RegisterInProcessThreads(); #endif #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -18,7 +18,7 @@ InstalledVersionPoller::ScopedDisableForTesting disable_polling( InstalledVersionPoller::MakeScopedDisableForTesting()); #endif -@@ -231,7 +231,7 @@ int LaunchChromeTests(size_t parallel_jobs, +@@ -229,7 +229,7 @@ int LaunchChromeTests(size_t parallel_jobs, } #if defined(OS_WIN) || defined(OS_MACOSX) || \ diff --git a/www/chromium/files/patch-chrome_test_base_interactive__ui__tests__main.cc b/www/chromium/files/patch-chrome_test_base_interactive__ui__tests__main.cc index f80c31dcc8d4..e86c4b8a3229 100644 --- a/www/chromium/files/patch-chrome_test_base_interactive__ui__tests__main.cc +++ b/www/chromium/files/patch-chrome_test_base_interactive__ui__tests__main.cc @@ -1,4 +1,4 @@ ---- chrome/test/base/interactive_ui_tests_main.cc.orig 2020-04-06 07:47:38 UTC +--- chrome/test/base/interactive_ui_tests_main.cc.orig 2020-09-08 19:14:01 UTC +++ chrome/test/base/interactive_ui_tests_main.cc @@ -16,7 +16,7 @@ #if defined(USE_AURA) @@ -6,20 +6,15 @@ #include "ui/base/test/ui_controls_aura.h" -#if defined(USE_OZONE) && defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if defined(USE_OZONE) && ((defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)) + #include "ui/base/ui_base_features.h" #include "ui/ozone/public/ozone_platform.h" #endif - #if defined(USE_X11) -@@ -54,11 +54,11 @@ class InteractiveUITestSuite : public ChromeTestSuite +@@ -53,7 +53,7 @@ class InteractiveUITestSuite : public ChromeTestSuite com_initializer_.reset(new base::win::ScopedCOMInitializer()); ui_controls::InstallUIControlsAura( aura::test::CreateUIControlsAura(nullptr)); --#elif defined(USE_OZONE) && defined(OS_LINUX) -+#elif defined(USE_OZONE) && (defined(OS_LINUX) || defined(OS_BSD)) - ui::OzonePlatform::InitParams params; - params.single_process = true; - ui::OzonePlatform::InitializeForUI(params); -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) - ui_controls::InstallUIControlsAura( - views::test::CreateUIControlsDesktopAura()); - #else + #if defined(USE_OZONE) + if (features::IsUsingOzonePlatform()) { + ui::OzonePlatform::InitParams params; diff --git a/www/chromium/files/patch-chrome_test_base_testing__browser__process.h b/www/chromium/files/patch-chrome_test_base_testing__browser__process.h index 6a67fa4771e1..941601ef56e1 100644 --- a/www/chromium/files/patch-chrome_test_base_testing__browser__process.h +++ b/www/chromium/files/patch-chrome_test_base_testing__browser__process.h @@ -1,6 +1,6 @@ ---- chrome/test/base/testing_browser_process.h.orig 2020-07-07 21:58:14 UTC +--- chrome/test/base/testing_browser_process.h.orig 2020-09-08 19:14:01 UTC +++ chrome/test/base/testing_browser_process.h -@@ -118,8 +118,8 @@ class TestingBrowserProcess : public BrowserProcess { +@@ -119,8 +119,8 @@ class TestingBrowserProcess : public BrowserProcess { DownloadRequestLimiter* download_request_limiter() override; StartupData* startup_data() override; diff --git a/www/chromium/files/patch-chrome_test_chromedriver_chrome__launcher.cc b/www/chromium/files/patch-chrome_test_chromedriver_chrome__launcher.cc index bf350970aa84..7a7cf69c8925 100644 --- a/www/chromium/files/patch-chrome_test_chromedriver_chrome__launcher.cc +++ b/www/chromium/files/patch-chrome_test_chromedriver_chrome__launcher.cc @@ -1,6 +1,6 @@ ---- chrome/test/chromedriver/chrome_launcher.cc.orig 2020-05-13 18:40:25 UTC +--- chrome/test/chromedriver/chrome_launcher.cc.orig 2020-09-08 19:14:01 UTC +++ chrome/test/chromedriver/chrome_launcher.cc -@@ -70,6 +70,10 @@ +@@ -69,6 +69,10 @@ #include "chrome/test/chromedriver/keycode_text_conversion.h" #endif diff --git a/www/chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc b/www/chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc index 1aa645203816..e7165c7caf65 100644 --- a/www/chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc +++ b/www/chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc @@ -1,6 +1,6 @@ ---- chrome/test/chromedriver/chrome/chrome_finder.cc.orig 2020-02-24 18:39:10 UTC +--- chrome/test/chromedriver/chrome/chrome_finder.cc.orig 2020-09-08 19:14:01 UTC +++ chrome/test/chromedriver/chrome/chrome_finder.cc -@@ -50,7 +50,7 @@ void GetApplicationDirs(std::vector<base::FilePath>* l +@@ -53,7 +53,7 @@ void GetApplicationDirs(std::vector<base::FilePath>* l installation_locations[i].Append(L"Chromium\\Application")); } } @@ -9,7 +9,7 @@ void GetApplicationDirs(std::vector<base::FilePath>* locations) { // TODO: Respect users' PATH variables. // Until then, we use an approximation of the most common defaults. -@@ -136,7 +136,7 @@ bool FindChrome(base::FilePath* browser_exe) { +@@ -139,7 +139,7 @@ bool FindChrome(base::FilePath* browser_exe) { #if defined(OS_WIN) || defined(OS_MACOSX) base::FilePath(chrome::kBrowserProcessExecutablePath), base::FilePath(chrome::kBrowserProcessExecutablePathChromium) diff --git a/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc b/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc index af10c34c339f..785b8558391f 100644 --- a/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc +++ b/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc @@ -1,4 +1,4 @@ ---- chromecast/browser/cast_browser_main_parts.cc.orig 2020-07-07 21:58:14 UTC +--- chromecast/browser/cast_browser_main_parts.cc.orig 2020-09-08 19:14:03 UTC +++ chromecast/browser/cast_browser_main_parts.cc @@ -75,7 +75,7 @@ #include "ui/base/ui_base_switches.h" @@ -9,6 +9,15 @@ #include <fontconfig/fontconfig.h> #include <signal.h> #include <sys/prctl.h> +@@ -130,7 +130,7 @@ + #include "extensions/browser/extension_prefs.h" // nogncheck + #endif + +-#if defined(OS_LINUX) && defined(USE_OZONE) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_OZONE) + #include "chromecast/browser/exo/wayland_server_controller.h" + #endif + @@ -272,7 +272,7 @@ class CastViewsDelegate : public views::ViewsDelegate #endif // defined(USE_AURA) @@ -42,10 +51,10 @@ #endif -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) - // It's better to start GPU process on demand. For example, for TV platforms - // cast starts in background and can't render until TV switches to cast - // input. -@@ -479,7 +479,7 @@ void CastBrowserMainParts::ToolkitInitialized() { + #if BUILDFLAG(USE_CHROMEOS_MEDIA_ACCELERATION) + // Force disable new video decoder, since it uses slice H.264, which is + // not currently supported on Linux-based Cast devices. +@@ -484,7 +484,7 @@ void CastBrowserMainParts::ToolkitInitialized() { views_delegate_ = std::make_unique<CastViewsDelegate>(); #endif // defined(USE_AURA) @@ -54,3 +63,21 @@ base::FilePath dir_font = GetApplicationFontsDir(); const FcChar8 *dir_font_char8 = reinterpret_cast<const FcChar8*>(dir_font.value().data()); if (!FcConfigAppFontAddDir(gfx::GetGlobalFontConfig(), dir_font_char8)) { +@@ -666,7 +666,7 @@ void CastBrowserMainParts::PreMainMessageLoopRun() { + cast_browser_process_->browser_context()); + #endif + +-#if defined(OS_LINUX) && defined(USE_OZONE) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_OZONE) + wayland_server_controller_ = + std::make_unique<WaylandServerController>(window_manager_.get()); + #endif +@@ -748,7 +748,7 @@ bool CastBrowserMainParts::MainMessageLoopRun(int* res + } + + void CastBrowserMainParts::PostMainMessageLoopRun() { +-#if defined(OS_LINUX) && defined(USE_OZONE) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_OZONE) + wayland_server_controller_.reset(); + #endif + #if BUILDFLAG(ENABLE_CHROMECAST_EXTENSIONS) diff --git a/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc b/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc index b24788bca45a..9f69afa3e3d2 100644 --- a/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc +++ b/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc @@ -1,6 +1,6 @@ ---- chromecast/browser/cast_content_browser_client.cc.orig 2020-07-07 21:58:14 UTC +--- chromecast/browser/cast_content_browser_client.cc.orig 2020-09-08 19:14:03 UTC +++ chromecast/browser/cast_content_browser_client.cc -@@ -457,7 +457,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS +@@ -475,7 +475,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS switches::kAudioOutputChannels)); } } else if (process_type == switches::kGpuProcess) { diff --git a/www/chromium/files/patch-chromecast_external__mojo_public_cpp_external__mojo__broker.cc b/www/chromium/files/patch-chromecast_external__mojo_public_cpp_external__mojo__broker.cc index 381734887dcb..5bc4f9de6088 100644 --- a/www/chromium/files/patch-chromecast_external__mojo_public_cpp_external__mojo__broker.cc +++ b/www/chromium/files/patch-chromecast_external__mojo_public_cpp_external__mojo__broker.cc @@ -1,4 +1,4 @@ ---- chromecast/external_mojo/public/cpp/external_mojo_broker.cc.orig 2020-02-03 21:52:43 UTC +--- chromecast/external_mojo/public/cpp/external_mojo_broker.cc.orig 2020-09-08 19:14:03 UTC +++ chromecast/external_mojo/public/cpp/external_mojo_broker.cc @@ -7,7 +7,7 @@ #include <map> @@ -9,7 +9,7 @@ #include <sys/stat.h> #endif -@@ -393,7 +393,7 @@ ExternalMojoBroker::ExternalMojoBroker(const std::stri +@@ -400,7 +400,7 @@ ExternalMojoBroker::ExternalMojoBroker(const std::stri named_channel.TakeServerEndpoint(); DCHECK(server_endpoint.is_valid()); diff --git a/www/chromium/files/patch-chromecast_renderer_cast__content__renderer__client.cc b/www/chromium/files/patch-chromecast_renderer_cast__content__renderer__client.cc index 5bfd53bc2903..eed3bf7f6dd6 100644 --- a/www/chromium/files/patch-chromecast_renderer_cast__content__renderer__client.cc +++ b/www/chromium/files/patch-chromecast_renderer_cast__content__renderer__client.cc @@ -1,6 +1,6 @@ ---- chromecast/renderer/cast_content_renderer_client.cc.orig 2020-05-13 18:40:25 UTC +--- chromecast/renderer/cast_content_renderer_client.cc.orig 2020-09-08 19:14:03 UTC +++ chromecast/renderer/cast_content_renderer_client.cc -@@ -204,7 +204,7 @@ void CastContentRendererClient::RenderFrameCreated( +@@ -207,7 +207,7 @@ void CastContentRendererClient::RenderFrameCreated( dispatcher->OnRenderFrameCreated(render_frame); #endif diff --git a/www/chromium/files/patch-components_BUILD.gn b/www/chromium/files/patch-components_BUILD.gn index cd067e4c8780..c8c28ebe700c 100644 --- a/www/chromium/files/patch-components_BUILD.gn +++ b/www/chromium/files/patch-components_BUILD.gn @@ -1,6 +1,6 @@ ---- components/BUILD.gn.orig 2020-07-07 21:58:14 UTC +--- components/BUILD.gn.orig 2020-09-08 19:14:03 UTC +++ components/BUILD.gn -@@ -290,9 +290,14 @@ test("components_unittests") { +@@ -294,9 +294,14 @@ test("components_unittests") { ] if (!is_fuchsia) { diff --git a/www/chromium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc b/www/chromium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc index 9d4aed4e9def..35aaac39785c 100644 --- a/www/chromium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc +++ b/www/chromium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc @@ -1,6 +1,6 @@ ---- components/autofill/content/renderer/password_form_conversion_utils.cc.orig 2020-07-07 21:58:14 UTC +--- components/autofill/content/renderer/password_form_conversion_utils.cc.orig 2020-09-08 19:14:03 UTC +++ components/autofill/content/renderer/password_form_conversion_utils.cc -@@ -20,7 +20,11 @@ +@@ -19,7 +19,11 @@ #include "third_party/blink/public/web/web_form_control_element.h" #include "third_party/blink/public/web/web_input_element.h" #include "third_party/blink/public/web/web_local_frame.h" diff --git a/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.cc b/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.cc deleted file mode 100644 index 097d0570f2e7..000000000000 --- a/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- components/autofill/core/browser/autofill_experiments.cc.orig 2020-07-07 21:58:14 UTC -+++ components/autofill/core/browser/autofill_experiments.cc -@@ -226,7 +226,7 @@ bool IsInAutofillSuggestionsDisabledExperiment() { - } - - bool OfferStoreUnmaskedCards(bool is_off_the_record) { --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - // The checkbox can be forced on with a flag, but by default we don't store - // on Linux due to lack of system keychain integration. See crbug.com/162735 - return base::CommandLine::ForCurrentProcess()->HasSwitch( diff --git a/www/chromium/files/patch-components_autofill_core_browser_autofill__external__delegate.cc b/www/chromium/files/patch-components_autofill_core_browser_autofill__external__delegate.cc index f1910897dfd2..614a6628c679 100644 --- a/www/chromium/files/patch-components_autofill_core_browser_autofill__external__delegate.cc +++ b/www/chromium/files/patch-components_autofill_core_browser_autofill__external__delegate.cc @@ -1,6 +1,6 @@ ---- components/autofill/core/browser/autofill_external_delegate.cc.orig 2020-07-07 21:58:14 UTC +--- components/autofill/core/browser/autofill_external_delegate.cc.orig 2020-09-08 19:14:03 UTC +++ components/autofill/core/browser/autofill_external_delegate.cc -@@ -118,7 +118,7 @@ void AutofillExternalDelegate::OnSuggestionsReturned( +@@ -121,7 +121,7 @@ void AutofillExternalDelegate::OnSuggestionsReturned( // Append the "Hide Suggestions" menu item for only Autofill Address and // Autocomplete popups. diff --git a/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc b/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc index 7a7e321027de..0b27919a05fc 100644 --- a/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc +++ b/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc @@ -1,6 +1,6 @@ ---- components/autofill/core/browser/personal_data_manager.cc.orig 2020-07-07 21:58:14 UTC +--- components/autofill/core/browser/personal_data_manager.cc.orig 2020-09-08 19:14:03 UTC +++ components/autofill/core/browser/personal_data_manager.cc -@@ -1921,7 +1921,7 @@ bool PersonalDataManager::IsServerCard(const CreditCar +@@ -1916,7 +1916,7 @@ bool PersonalDataManager::IsServerCard(const CreditCar bool PersonalDataManager::ShouldShowCardsFromAccountOption() const { // The feature is only for Linux, Windows and Mac. @@ -9,7 +9,7 @@ defined(OS_CHROMEOS) return false; #else -@@ -1945,7 +1945,7 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp +@@ -1940,7 +1940,7 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp // The option should only be shown if the user has not already opted-in. return !is_opted_in; diff --git a/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc b/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc index 92bdc3d3b18c..dafbb33fbc5f 100644 --- a/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc +++ b/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc @@ -1,6 +1,6 @@ ---- components/autofill/core/common/autofill_payments_features.cc.orig 2020-07-07 21:58:14 UTC +--- components/autofill/core/common/autofill_payments_features.cc.orig 2020-09-08 19:14:03 UTC +++ components/autofill/core/common/autofill_payments_features.cc -@@ -115,7 +115,7 @@ const base::Feature kAutofillUpstreamEditableExpiratio +@@ -124,7 +124,7 @@ const base::Feature kAutofillUpstreamAllowAllEmailDoma bool ShouldShowImprovedUserConsentForCreditCardSave() { #if defined(OS_WIN) || defined(OS_MACOSX) || \ diff --git a/www/chromium/files/patch-components_feature__engagement_public_event__constants.cc b/www/chromium/files/patch-components_feature__engagement_public_event__constants.cc index ea4af4e91c50..981ed70884c9 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_event__constants.cc +++ b/www/chromium/files/patch-components_feature__engagement_public_event__constants.cc @@ -1,4 +1,4 @@ ---- components/feature_engagement/public/event_constants.cc.orig 2020-02-03 21:52:44 UTC +--- components/feature_engagement/public/event_constants.cc.orig 2020-09-08 19:14:03 UTC +++ components/feature_engagement/public/event_constants.cc @@ -12,12 +12,12 @@ namespace feature_engagement { namespace events { @@ -14,9 +14,9 @@ -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) - const char kReopenTabConditionsMet[] = "reopen_tab_conditions_met"; - const char kTabReopened[] = "tab_reopened"; -@@ -42,7 +42,7 @@ const char kIncognitoWindowOpened[] = "incognito_windo + const char kSixthTabOpened[] = "sixth_tab_opened"; + const char kTabGroupCreated[] = "tab_group_created"; +@@ -45,7 +45,7 @@ const char kIncognitoWindowOpened[] = "incognito_windo const char kIncognitoWindowSessionTimeMet[] = "incognito_window_session_time_met"; #endif // BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP) diff --git a/www/chromium/files/patch-components_feature__engagement_public_event__constants.h b/www/chromium/files/patch-components_feature__engagement_public_event__constants.h index 96b274df41fb..3383c1498651 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_event__constants.h +++ b/www/chromium/files/patch-components_feature__engagement_public_event__constants.h @@ -1,4 +1,4 @@ ---- components/feature_engagement/public/event_constants.h.orig 2020-02-03 21:52:44 UTC +--- components/feature_engagement/public/event_constants.h.orig 2020-09-08 19:14:03 UTC +++ components/feature_engagement/public/event_constants.h @@ -14,15 +14,15 @@ namespace events { @@ -17,9 +17,9 @@ -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) - // All conditions for reopen closed tab IPH were met. Since this IPH needs to - // track user events (opening/closing tabs, focusing the omnibox, etc) on the -@@ -80,7 +80,7 @@ extern const char kIncognitoWindowOpened[]; + // A new tab was opened when 5 (or more) tabs were already open. + extern const char kSixthTabOpened[]; +@@ -85,7 +85,7 @@ extern const char kIncognitoWindowOpened[]; extern const char kIncognitoWindowSessionTimeMet[]; #endif // BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP) diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc index 699be09ed7b4..dfe66cef9875 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc @@ -1,4 +1,4 @@ ---- components/feature_engagement/public/feature_constants.cc.orig 2020-02-03 21:53:30 UTC +--- components/feature_engagement/public/feature_constants.cc.orig 2020-09-08 19:14:03 UTC +++ components/feature_engagement/public/feature_constants.cc @@ -14,7 +14,7 @@ const base::Feature kIPHDemoMode{"IPH_DemoMode", const base::Feature kIPHDummyFeature{"IPH_Dummy", @@ -7,9 +7,9 @@ -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) - const base::Feature kIPHFocusModeFeature{"IPH_FocusMode", - base::FEATURE_DISABLED_BY_DEFAULT}; -@@ -33,7 +33,7 @@ const base::Feature kIPHIncognitoWindowFeature{ + const base::Feature kIPHDesktopTabGroupsNewGroupFeature{ + "IPH_DesktopTabGroupsNewGroup", base::FEATURE_DISABLED_BY_DEFAULT}; +@@ -37,7 +37,7 @@ const base::Feature kIPHIncognitoWindowFeature{ const base::Feature kIPHNewTabFeature{"IPH_NewTab", base::FEATURE_DISABLED_BY_DEFAULT}; #endif // BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP) diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h index 415b6f1d8c71..6a8346096656 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h @@ -1,4 +1,4 @@ ---- components/feature_engagement/public/feature_constants.h.orig 2020-02-03 21:53:30 UTC +--- components/feature_engagement/public/feature_constants.h.orig 2020-09-08 19:14:03 UTC +++ components/feature_engagement/public/feature_constants.h @@ -17,7 +17,7 @@ extern const base::Feature kIPHDemoMode; // A feature to ensure all arrays can contain at least one feature. @@ -7,9 +7,9 @@ -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) + extern const base::Feature kIPHDesktopTabGroupsNewGroupFeature; extern const base::Feature kIPHFocusModeFeature; - extern const base::Feature kIPHGlobalMediaControlsFeature; -@@ -29,7 +29,7 @@ extern const base::Feature kIPHBookmarkFeature; +@@ -31,7 +31,7 @@ extern const base::Feature kIPHBookmarkFeature; extern const base::Feature kIPHIncognitoWindowFeature; extern const base::Feature kIPHNewTabFeature; #endif // BUILDFLAG(ENABLE_LEGACY_DESKTOP_IPH) diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc b/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc index 135ee2a3937a..d3bd664bc2a0 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc @@ -1,15 +1,15 @@ ---- components/feature_engagement/public/feature_list.cc.orig 2020-08-18 18:40:09 UTC +--- components/feature_engagement/public/feature_list.cc.orig 2020-09-08 19:14:03 UTC +++ components/feature_engagement/public/feature_list.cc -@@ -63,7 +63,7 @@ const base::Feature* const kAllFeatures[] = { +@@ -64,7 +64,7 @@ const base::Feature* const kAllFeatures[] = { &kIPHBadgedReadingListFeature, &kIPHBadgedTranslateManualTriggerFeature, #endif // defined(OS_IOS) -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) + &kIPHDesktopTabGroupsNewGroupFeature, &kIPHFocusModeFeature, - &kIPHGlobalMediaControlsFeature, -@@ -74,7 +74,7 @@ const base::Feature* const kAllFeatures[] = { +@@ -77,7 +77,7 @@ const base::Feature* const kAllFeatures[] = { &kIPHIncognitoWindowFeature, &kIPHNewTabFeature, #endif // BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP) diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__list.h b/www/chromium/files/patch-components_feature__engagement_public_feature__list.h index f6d474bded01..55289aba6a13 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_feature__list.h +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__list.h @@ -1,15 +1,15 @@ ---- components/feature_engagement/public/feature_list.h.orig 2020-08-18 18:40:09 UTC +--- components/feature_engagement/public/feature_list.h.orig 2020-09-08 19:14:03 UTC +++ components/feature_engagement/public/feature_list.h -@@ -119,7 +119,7 @@ DEFINE_VARIATION_PARAM(kIPHBadgedTranslateManualTrigge +@@ -121,7 +121,7 @@ DEFINE_VARIATION_PARAM(kIPHBadgedTranslateManualTrigge "IPH_BadgedTranslateManualTrigger"); #endif // defined(OS_IOS) -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) - DEFINE_VARIATION_PARAM(kIPHFocusModeFeature, "IPH_FocusMode"); - DEFINE_VARIATION_PARAM(kIPHGlobalMediaControls, "IPH_GlobalMediaControls"); -@@ -130,7 +130,7 @@ DEFINE_VARIATION_PARAM(kIPHBookmarkFeature, "IPH_Bookm + DEFINE_VARIATION_PARAM(kIPHDesktopTabGroupsNewGroupFeature, + "IPH_DesktopTabGroupsNewGroup"); +@@ -136,7 +136,7 @@ DEFINE_VARIATION_PARAM(kIPHBookmarkFeature, "IPH_Bookm DEFINE_VARIATION_PARAM(kIPHIncognitoWindowFeature, "IPH_IncognitoWindow"); DEFINE_VARIATION_PARAM(kIPHNewTabFeature, "IPH_NewTab"); #endif // BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP) @@ -18,16 +18,16 @@ // defined(OS_CHROMEOS) } // namespace -@@ -185,7 +185,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation +@@ -192,7 +192,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation VARIATION_ENTRY(kIPHNewIncognitoTabTipFeature), VARIATION_ENTRY(kIPHBadgedReadingListFeature), VARIATION_ENTRY(kIPHBadgedTranslateManualTriggerFeature), -#elif defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ +#elif defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) + VARIATION_ENTRY(kIPHDesktopTabGroupsNewGroupFeature), VARIATION_ENTRY(kIPHFocusModeFeature), - VARIATION_ENTRY(kIPHGlobalMediaControls), -@@ -196,7 +196,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation +@@ -204,7 +204,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation VARIATION_ENTRY(kIPHIncognitoWindowFeature), VARIATION_ENTRY(kIPHNewTabFeature), #endif // BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP) diff --git a/www/chromium/files/patch-components_flags__ui_flags__state.cc b/www/chromium/files/patch-components_flags__ui_flags__state.cc index fdaa3f2f453c..89657a76a354 100644 --- a/www/chromium/files/patch-components_flags__ui_flags__state.cc +++ b/www/chromium/files/patch-components_flags__ui_flags__state.cc @@ -1,6 +1,6 @@ ---- components/flags_ui/flags_state.cc.orig 2020-02-03 21:53:30 UTC +--- components/flags_ui/flags_state.cc.orig 2020-09-08 19:14:03 UTC +++ components/flags_ui/flags_state.cc -@@ -693,7 +693,7 @@ int FlagsState::GetCurrentPlatform() { +@@ -684,7 +684,7 @@ int FlagsState::GetCurrentPlatform() { return kOsWin; #elif defined(OS_CHROMEOS) // Needs to be before the OS_LINUX check. return kOsCrOS; diff --git a/www/chromium/files/patch-components_metrics_BUILD.gn b/www/chromium/files/patch-components_metrics_BUILD.gn index adf2e64f115b..18c99de6125c 100644 --- a/www/chromium/files/patch-components_metrics_BUILD.gn +++ b/www/chromium/files/patch-components_metrics_BUILD.gn @@ -1,6 +1,6 @@ ---- components/metrics/BUILD.gn.orig 2020-07-07 21:58:15 UTC +--- components/metrics/BUILD.gn.orig 2020-09-08 19:14:03 UTC +++ components/metrics/BUILD.gn -@@ -177,6 +177,11 @@ jumbo_static_library("metrics") { +@@ -178,6 +178,11 @@ jumbo_static_library("metrics") { if (is_fuchsia) { sources += [ "drive_metrics_provider_fuchsia.cc" ] } diff --git a/www/chromium/files/patch-components_metrics_metrics__log.cc b/www/chromium/files/patch-components_metrics_metrics__log.cc index 579e92430da3..6dccd0f8b3a3 100644 --- a/www/chromium/files/patch-components_metrics_metrics__log.cc +++ b/www/chromium/files/patch-components_metrics_metrics__log.cc @@ -1,6 +1,6 @@ ---- components/metrics/metrics_log.cc.orig 2020-07-07 21:58:15 UTC +--- components/metrics/metrics_log.cc.orig 2020-09-08 19:14:03 UTC +++ components/metrics/metrics_log.cc -@@ -214,7 +214,7 @@ void MetricsLog::RecordCoreSystemProfile( +@@ -215,7 +215,7 @@ void MetricsLog::RecordCoreSystemProfile( // OperatingSystemVersion refers to the ChromeOS release version. #if defined(OS_CHROMEOS) os->set_kernel_version(base::SysInfo::KernelVersion()); diff --git a/www/chromium/files/patch-components_neterror_resources_neterror.js b/www/chromium/files/patch-components_neterror_resources_neterror.js index 0aec56a3e621..89938cbf4794 100644 --- a/www/chromium/files/patch-components_neterror_resources_neterror.js +++ b/www/chromium/files/patch-components_neterror_resources_neterror.js @@ -1,6 +1,6 @@ ---- components/neterror/resources/neterror.js.orig 2020-07-07 21:58:15 UTC +--- components/neterror/resources/neterror.js.orig 2020-09-08 19:14:03 UTC +++ components/neterror/resources/neterror.js -@@ -202,7 +202,7 @@ function setUpCachedButton(buttonStrings) { +@@ -204,7 +204,7 @@ function setUpCachedButton(buttonStrings) { } let primaryControlOnLeft = true; diff --git a/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc b/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc index 7bea87ef5488..9e3149822f11 100644 --- a/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc +++ b/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc @@ -1,6 +1,6 @@ ---- components/network_session_configurator/browser/network_session_configurator.cc.orig 2020-07-07 21:58:15 UTC +--- components/network_session_configurator/browser/network_session_configurator.cc.orig 2020-09-08 19:14:03 UTC +++ components/network_session_configurator/browser/network_session_configurator.cc -@@ -703,7 +703,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C +@@ -717,7 +717,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C } #endif // #if !defined(OS_ANDROID) diff --git a/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc b/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc index 13d0c5eb1a3a..2766504a3eb5 100644 --- a/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc +++ b/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc @@ -1,4 +1,4 @@ ---- components/policy/core/common/cloud/cloud_policy_util.cc.orig 2020-07-07 21:58:15 UTC +--- components/policy/core/common/cloud/cloud_policy_util.cc.orig 2020-09-08 19:14:04 UTC +++ components/policy/core/common/cloud/cloud_policy_util.cc @@ -16,7 +16,7 @@ #include <wincred.h> @@ -18,7 +18,7 @@ #include <limits.h> // For HOST_NAME_MAX #endif -@@ -61,7 +61,7 @@ +@@ -62,7 +62,7 @@ #include "base/system/sys_info.h" #endif @@ -27,7 +27,7 @@ #include "base/system/sys_info.h" #endif -@@ -70,11 +70,24 @@ namespace policy { +@@ -71,11 +71,24 @@ namespace policy { namespace em = enterprise_management; std::string GetMachineName() { @@ -53,7 +53,7 @@ #elif defined(OS_MACOSX) // TODO(crbug.com/1024115): Find a different replacement for -[NSHost // currentHost] on iOS. -@@ -124,7 +137,7 @@ std::string GetMachineName() { +@@ -125,7 +138,7 @@ std::string GetMachineName() { } std::string GetOSVersion() { @@ -62,7 +62,7 @@ return base::SysInfo::OperatingSystemVersion(); #elif defined(OS_WIN) base::win::OSInfo::VersionNumber version_number = -@@ -147,7 +160,7 @@ std::string GetOSArchitecture() { +@@ -148,7 +161,7 @@ std::string GetOSArchitecture() { } std::string GetOSUsername() { diff --git a/www/chromium/files/patch-components_policy_resources_policy__templates.json b/www/chromium/files/patch-components_policy_resources_policy__templates.json index a0d8ee1b04c9..703186d21a0b 100644 --- a/www/chromium/files/patch-components_policy_resources_policy__templates.json +++ b/www/chromium/files/patch-components_policy_resources_policy__templates.json @@ -1,6 +1,6 @@ ---- components/policy/resources/policy_templates.json.orig 2020-07-07 21:58:15 UTC +--- components/policy/resources/policy_templates.json.orig 2020-09-08 19:14:04 UTC +++ components/policy/resources/policy_templates.json -@@ -1127,7 +1127,7 @@ +@@ -1144,7 +1144,7 @@ 'owners': ['file://components/policy/resources/OWNERS'], 'type': 'string', 'schema': { 'type': 'string' }, @@ -9,7 +9,7 @@ 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -1157,7 +1157,7 @@ +@@ -1174,7 +1174,7 @@ 'owners': ['file://components/policy/resources/OWNERS'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -18,7 +18,7 @@ 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -1184,7 +1184,7 @@ +@@ -1201,7 +1201,7 @@ 'owners': ['file://components/policy/resources/OWNERS'], 'type': 'string', 'schema': { 'type': 'string' }, @@ -27,7 +27,7 @@ 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -2013,7 +2013,7 @@ +@@ -2012,7 +2012,7 @@ 'owners': ['jamiewalch@chromium.org', 'rkjnsn@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -36,7 +36,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -4151,7 +4151,7 @@ +@@ -4182,7 +4182,7 @@ 'owners': ['file://components/policy/resources/OWNERS'], 'type': 'string', 'schema': { 'type': 'string' }, @@ -45,7 +45,7 @@ 'features': { 'dynamic_refresh': False, 'per_profile': False, -@@ -4205,7 +4205,7 @@ +@@ -4236,7 +4236,7 @@ 'owners': ['file://components/policy/resources/OWNERS'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -54,7 +54,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -7781,7 +7781,7 @@ +@@ -7852,7 +7852,7 @@ 'owners': ['file://src/net/cert/OWNERS'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -63,7 +63,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -9179,7 +9179,7 @@ +@@ -9337,7 +9337,7 @@ 'owners': ['file://components/policy/resources/OWNERS'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -72,7 +72,7 @@ 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -9928,7 +9928,7 @@ +@@ -10066,7 +10066,7 @@ 'owners': ['file://components/policy/resources/OWNERS'], 'type': 'main', 'schema': { 'type': 'boolean' }, diff --git a/www/chromium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc b/www/chromium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc index d1eedad301dd..09990a90ed7e 100644 --- a/www/chromium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc +++ b/www/chromium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc @@ -1,6 +1,6 @@ ---- components/url_formatter/spoof_checks/idn_spoof_checker.cc.orig 2020-07-07 21:58:15 UTC +--- components/url_formatter/spoof_checks/idn_spoof_checker.cc.orig 2020-09-08 19:14:05 UTC +++ components/url_formatter/spoof_checks/idn_spoof_checker.cc -@@ -272,7 +272,7 @@ IDNSpoofChecker::IDNSpoofChecker() { +@@ -291,7 +291,7 @@ IDNSpoofChecker::IDNSpoofChecker() { // The ideal fix would be to change the omnibox font used for Thai. In // that case, the Linux-only list should be revisited and potentially // removed. diff --git a/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__device__dawn.cc b/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__device__dawn.cc deleted file mode 100644 index c04afee015a3..000000000000 --- a/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__device__dawn.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- components/viz/service/display_embedder/skia_output_device_dawn.cc.orig 2020-07-13 09:36:15 UTC -+++ components/viz/service/display_embedder/skia_output_device_dawn.cc -@@ -14,7 +14,7 @@ - #if defined(OS_WIN) - #include "third_party/dawn/src/include/dawn_native/D3D12Backend.h" - #include "ui/gl/vsync_provider_win.h" --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) - #include "third_party/dawn/src/include/dawn_native/VulkanBackend.h" - #endif - diff --git a/www/chromium/files/patch-components_viz_test_fake__output__surface.h b/www/chromium/files/patch-components_viz_test_fake__output__surface.h index d4118ff7d302..c21b501fbae4 100644 --- a/www/chromium/files/patch-components_viz_test_fake__output__surface.h +++ b/www/chromium/files/patch-components_viz_test_fake__output__surface.h @@ -1,6 +1,6 @@ ---- components/viz/test/fake_output_surface.h.orig 2020-05-13 18:39:42 UTC +--- components/viz/test/fake_output_surface.h.orig 2020-09-08 19:14:05 UTC +++ components/viz/test/fake_output_surface.h -@@ -83,7 +83,7 @@ class FakeOutputSurface : public OutputSurface { +@@ -82,7 +82,7 @@ class FakeOutputSurface : public OutputSurface { UpdateVSyncParametersCallback callback) override; void SetDisplayTransformHint(gfx::OverlayTransform transform) override; gfx::OverlayTransform GetDisplayTransform() override; diff --git a/www/chromium/files/patch-content_app_content__main__runner__impl.cc b/www/chromium/files/patch-content_app_content__main__runner__impl.cc index 5d872cbc0665..c1eb96489c27 100644 --- a/www/chromium/files/patch-content_app_content__main__runner__impl.cc +++ b/www/chromium/files/patch-content_app_content__main__runner__impl.cc @@ -1,17 +1,17 @@ ---- content/app/content_main_runner_impl.cc.orig 2020-07-07 21:58:15 UTC +--- content/app/content_main_runner_impl.cc.orig 2020-09-08 19:14:05 UTC +++ content/app/content_main_runner_impl.cc -@@ -114,17 +114,17 @@ +@@ -121,17 +121,17 @@ #include "base/posix/global_descriptors.h" #include "content/public/common/content_descriptors.h" -#if !defined(OS_MACOSX) +#if !defined(OS_MACOSX) && !defined(OS_BSD) - #include "services/service_manager/zygote/common/zygote_fork_delegate_linux.h" + #include "content/public/common/zygote/zygote_fork_delegate_linux.h" #endif -#if !defined(OS_MACOSX) && !defined(OS_ANDROID) +#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) + #include "content/zygote/zygote_main.h" #include "sandbox/linux/services/libc_interceptor.h" - #include "services/service_manager/zygote/zygote_main.h" #endif #endif // OS_POSIX || OS_FUCHSIA @@ -20,17 +20,17 @@ +#if defined(OS_LINUX) || defined(OS_BSD) #include "base/native_library.h" #include "base/rand_util.h" - #include "services/service_manager/zygote/common/common_sandbox_support_linux.h" -@@ -145,7 +145,7 @@ + #include "content/public/common/zygote/sandbox_support_linux.h" +@@ -151,7 +151,7 @@ #include "content/public/common/content_client.h" #endif -#endif // OS_LINUX -+#endif // OS_LINUX || defined(OS_BSD) ++#endif // OS_LINUX || OS_BSD #if BUILDFLAG(USE_ZYGOTE_HANDLE) #include "content/browser/sandbox_host_linux.h" -@@ -289,7 +289,7 @@ void InitializeZygoteSandboxForBrowserProcess( +@@ -300,7 +300,7 @@ void InitializeZygoteSandboxForBrowserProcess( } #endif // BUILDFLAG(USE_ZYGOTE_HANDLE) @@ -39,16 +39,16 @@ #if BUILDFLAG(ENABLE_PLUGINS) // Loads the (native) libraries but does not initialize them (i.e., does not -@@ -386,7 +386,7 @@ void PreSandboxInit() { +@@ -391,7 +391,7 @@ void PreSandboxInit() { } #endif // BUILDFLAG(USE_ZYGOTE_HANDLE) -#endif // OS_LINUX +#endif // OS_LINUX || OS_BSD - } // namespace - -@@ -450,7 +450,7 @@ int RunZygote(ContentMainDelegate* delegate) { + class ControlInterfaceBinderImpl : public mojo_base::mojom::Binder { + public: +@@ -472,7 +472,7 @@ int RunZygote(ContentMainDelegate* delegate) { delegate->ZygoteStarting(&zygote_fork_delegates); media::InitializeMediaLibrary(); @@ -57,17 +57,3 @@ PreSandboxInit(); #endif -@@ -594,11 +594,11 @@ int ContentMainRunnerImpl::Initialize(const ContentMai - base::GlobalDescriptors::kBaseDescriptor); - #endif // !OS_ANDROID - --#if defined(OS_LINUX) || defined(OS_OPENBSD) -+#if defined(OS_LINUX) - g_fds->Set(service_manager::kCrashDumpSignal, - service_manager::kCrashDumpSignal + - base::GlobalDescriptors::kBaseDescriptor); --#endif // OS_LINUX || OS_OPENBSD -+#endif // OS_LINUX - - #endif // !OS_WIN - diff --git a/www/chromium/files/patch-content_browser_BUILD.gn b/www/chromium/files/patch-content_browser_BUILD.gn deleted file mode 100644 index 29faa4677fd0..000000000000 --- a/www/chromium/files/patch-content_browser_BUILD.gn +++ /dev/null @@ -1,12 +0,0 @@ ---- content/browser/BUILD.gn.orig 2020-07-07 21:58:15 UTC -+++ content/browser/BUILD.gn -@@ -2044,6 +2044,9 @@ jumbo_source_set("browser") { - "//third_party/blink/public/mojom:memory_usage_monitor_linux_mojo_bindings", - ] - } -+ if (is_bsd) { -+ deps -= [ "//services/service_manager/zygote" ] -+ } - - if (is_desktop_linux) { - sources += [ "speech/tts_linux.cc" ] diff --git a/www/chromium/files/patch-content_browser_browser__main__loop.cc b/www/chromium/files/patch-content_browser_browser__main__loop.cc index 28bf251f55ca..a8de32019296 100644 --- a/www/chromium/files/patch-content_browser_browser__main__loop.cc +++ b/www/chromium/files/patch-content_browser_browser__main__loop.cc @@ -1,12 +1,12 @@ ---- content/browser/browser_main_loop.cc.orig 2020-07-07 21:58:15 UTC +--- content/browser/browser_main_loop.cc.orig 2020-09-08 19:14:05 UTC +++ content/browser/browser_main_loop.cc -@@ -241,6 +241,13 @@ +@@ -240,6 +240,13 @@ #include "mojo/public/cpp/bindings/lib/test_random_mojo_delays.h" #endif +#if defined(OS_BSD) +#include "content/browser/sandbox_host_linux.h" -+#include "services/service_manager/zygote/common/common_sandbox_support_linux.h" ++#include "content/public/common/zygote/sandbox_support_linux.h" +#include "content/public/common/common_sandbox_support_linux.h" +#include "services/service_manager/sandbox/sandbox.h" +#endif @@ -14,7 +14,7 @@ // One of the linux specific headers defines this as a macro. #ifdef DestroyAll #undef DestroyAll -@@ -654,7 +661,7 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -610,7 +617,7 @@ int BrowserMainLoop::EarlyInitialization() { } #endif // !defined(OS_MACOSX) @@ -23,7 +23,7 @@ defined(OS_ANDROID) // We use quite a few file descriptors for our IPC as well as disk the disk // cache,and the default limit on the Mac is low (256), so bump it up. -@@ -664,7 +671,7 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -620,7 +627,7 @@ int BrowserMainLoop::EarlyInitialization() { // users can easily hit this limit with many open tabs. Bump up the limit to // an arbitrarily high number. See https://crbug.com/539567 base::IncreaseFdLimitTo(8192); diff --git a/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc b/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc index 5ef3bf43c843..19aa1e320e01 100644 --- a/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc +++ b/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc @@ -1,53 +1,37 @@ ---- content/browser/child_process_launcher_helper_linux.cc.orig 2020-05-13 18:39:42 UTC +--- content/browser/child_process_launcher_helper_linux.cc.orig 2020-09-08 19:14:05 UTC +++ content/browser/child_process_launcher_helper_linux.cc -@@ -18,7 +18,9 @@ +@@ -19,7 +19,9 @@ + #include "content/public/common/result_codes.h" #include "content/public/common/sandboxed_process_launcher_delegate.h" - #include "services/service_manager/sandbox/linux/sandbox_linux.h" - #include "services/service_manager/zygote/common/common_sandbox_support_linux.h" + #include "content/public/common/zygote/sandbox_support_linux.h" +#if !defined(OS_BSD) - #include "services/service_manager/zygote/common/zygote_handle.h" + #include "content/public/common/zygote/zygote_handle.h" +#endif - #include "services/service_manager/zygote/host/zygote_communication_linux.h" - #include "services/service_manager/zygote/host/zygote_host_impl_linux.h" + #include "services/service_manager/sandbox/linux/sandbox_linux.h" -@@ -50,11 +52,13 @@ bool ChildProcessLauncherHelper::BeforeLaunchOnLaunche + namespace content { +@@ -50,10 +52,12 @@ bool ChildProcessLauncherHelper::BeforeLaunchOnLaunche options->fds_to_remap = files_to_register.GetMappingWithIDAdjustment( base::GlobalDescriptors::kBaseDescriptor); +#if !defined(OS_BSD) if (GetProcessType() == switches::kRendererProcess) { const int sandbox_fd = SandboxHostLinux::GetInstance()->GetChildSocket(); - options->fds_to_remap.push_back( - std::make_pair(sandbox_fd, service_manager::GetSandboxFD())); + options->fds_to_remap.push_back(std::make_pair(sandbox_fd, GetSandboxFD())); } +#endif options->environment = delegate_->GetEnvironment(); -@@ -69,6 +73,7 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr +@@ -68,6 +72,7 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr int* launch_result) { *is_synchronous_launch = true; +#if !defined(OS_BSD) - service_manager::ZygoteHandle zygote_handle = + ZygoteHandle zygote_handle = base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoZygote) ? nullptr -@@ -82,7 +87,6 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr - GetProcessType()); - *launch_result = LAUNCH_RESULT_SUCCESS; - --#if !defined(OS_OPENBSD) - if (handle) { - // It could be a renderer process or an utility process. - int oom_score = content::kMiscOomScore; -@@ -92,13 +96,13 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr - service_manager::ZygoteHostImpl::GetInstance()->AdjustRendererOOMScore( - handle, oom_score); - } --#endif - - Process process; - process.process = base::Process(handle); +@@ -97,6 +102,7 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr process.zygote = zygote_handle; return process; } @@ -55,7 +39,7 @@ Process process; process.process = base::LaunchProcess(*command_line(), options); -@@ -116,10 +120,14 @@ ChildProcessTerminationInfo ChildProcessLauncherHelper +@@ -114,10 +120,14 @@ ChildProcessTerminationInfo ChildProcessLauncherHelper const ChildProcessLauncherHelper::Process& process, bool known_dead) { ChildProcessTerminationInfo info; @@ -70,7 +54,7 @@ info.status = base::GetKnownDeadTerminationStatus(process.process.Handle(), &info.exit_code); } else { -@@ -143,13 +151,17 @@ void ChildProcessLauncherHelper::ForceNormalProcessTer +@@ -141,13 +151,17 @@ void ChildProcessLauncherHelper::ForceNormalProcessTer DCHECK(CurrentlyOnProcessLauncherTaskRunner()); process.process.Terminate(service_manager::RESULT_CODE_NORMAL_EXIT, false); // On POSIX, we must additionally reap the child. diff --git a/www/chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc b/www/chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc index 645022d83e96..5e41858cfcce 100644 --- a/www/chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc +++ b/www/chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc @@ -1,6 +1,6 @@ ---- content/browser/compositor/viz_process_transport_factory.cc.orig 2020-05-15 15:06:49 UTC +--- content/browser/compositor/viz_process_transport_factory.cc.orig 2020-09-08 19:14:05 UTC +++ content/browser/compositor/viz_process_transport_factory.cc -@@ -109,7 +109,7 @@ class HostDisplayClient : public viz::HostDisplayClien +@@ -108,7 +108,7 @@ class HostDisplayClient : public viz::HostDisplayClien HostDisplayClient& operator=(const HostDisplayClient&) = delete; // viz::HostDisplayClient: diff --git a/www/chromium/files/patch-content_browser_devtools_protocol_system__info__handler.cc b/www/chromium/files/patch-content_browser_devtools_protocol_system__info__handler.cc index 07b3d2a70f08..d2acda12b43d 100644 --- a/www/chromium/files/patch-content_browser_devtools_protocol_system__info__handler.cc +++ b/www/chromium/files/patch-content_browser_devtools_protocol_system__info__handler.cc @@ -1,6 +1,6 @@ ---- content/browser/devtools/protocol/system_info_handler.cc.orig 2020-07-07 21:58:15 UTC +--- content/browser/devtools/protocol/system_info_handler.cc.orig 2020-09-08 19:14:05 UTC +++ content/browser/devtools/protocol/system_info_handler.cc -@@ -48,7 +48,7 @@ std::unique_ptr<SystemInfo::Size> GfxSizeToSystemInfoS +@@ -47,7 +47,7 @@ std::unique_ptr<SystemInfo::Size> GfxSizeToSystemInfoS // Give the GPU process a few seconds to provide GPU info. // Linux Debug builds need more time -- see Issue 796437 and 1046598. // Windows builds need more time -- see Issue 873112 and 1004472. diff --git a/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc b/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc index 76e451bc26d3..0fb5aae10f9f 100644 --- a/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc +++ b/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc @@ -1,6 +1,6 @@ ---- content/browser/gpu/gpu_process_host.cc.orig 2020-07-07 21:58:15 UTC +--- content/browser/gpu/gpu_process_host.cc.orig 2020-09-08 19:14:05 UTC +++ content/browser/gpu/gpu_process_host.cc -@@ -215,7 +215,7 @@ static const char* const kSwitchNames[] = { +@@ -220,7 +220,7 @@ static const char* const kSwitchNames[] = { service_manager::switches::kGpuSandboxFailuresFatal, service_manager::switches::kDisableGpuSandbox, service_manager::switches::kNoSandbox, @@ -9,7 +9,7 @@ switches::kDisableDevShmUsage, #endif #if defined(OS_WIN) -@@ -1094,7 +1094,7 @@ bool GpuProcessHost::LaunchGpuProcess() { +@@ -1117,7 +1117,7 @@ bool GpuProcessHost::LaunchGpuProcess() { std::unique_ptr<base::CommandLine> cmd_line = std::make_unique<base::CommandLine>(base::CommandLine::NO_PROGRAM); #else diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc index b18e2476eb81..b5b2ba661f68 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc @@ -1,7 +1,7 @@ ---- content/browser/renderer_host/render_process_host_impl.cc.orig 2020-07-07 21:58:15 UTC +--- content/browser/renderer_host/render_process_host_impl.cc.orig 2020-09-21 18:39:16 UTC +++ content/browser/renderer_host/render_process_host_impl.cc -@@ -243,7 +243,7 @@ - #include "content/browser/gpu/gpu_data_manager_impl.h" +@@ -239,7 +239,7 @@ + #include "media/audio/android/audio_manager_android.h" #endif -#if defined(OS_LINUX) @@ -9,7 +9,7 @@ #include <sys/resource.h> #include <sys/time.h> -@@ -1200,7 +1200,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = +@@ -1223,7 +1223,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = // to indicate failure and std::numeric_limits<size_t>::max() to indicate // unlimited. size_t GetPlatformProcessLimit() { @@ -18,7 +18,7 @@ struct rlimit limit; if (getrlimit(RLIMIT_NPROC, &limit) != 0) return kUnknownPlatformProcessLimit; -@@ -1211,7 +1211,7 @@ size_t GetPlatformProcessLimit() { +@@ -1234,7 +1234,7 @@ size_t GetPlatformProcessLimit() { #else // TODO(https://crbug.com/104689): Implement on other platforms. return kUnknownPlatformProcessLimit; @@ -27,7 +27,7 @@ } #endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS) -@@ -1305,7 +1305,7 @@ class RenderProcessHostImpl::IOThreadHostImpl +@@ -1328,7 +1328,7 @@ class RenderProcessHostImpl::IOThreadHostImpl return; } @@ -36,7 +36,7 @@ if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) { ConnectToFontService(std::move(font_receiver)); return; -@@ -1739,7 +1739,7 @@ bool RenderProcessHostImpl::Init() { +@@ -1762,7 +1762,7 @@ bool RenderProcessHostImpl::Init() { renderer_prefix = browser_command_line.GetSwitchValueNative(switches::kRendererCmdPrefix); @@ -45,7 +45,7 @@ int flags = renderer_prefix.empty() ? ChildProcessHost::CHILD_ALLOW_SELF : ChildProcessHost::CHILD_NORMAL; #elif defined(OS_MACOSX) -@@ -3232,7 +3232,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin +@@ -3271,7 +3271,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin service_manager::switches::kDisableInProcessStackTraces, service_manager::switches::kDisableSeccompFilterSandbox, service_manager::switches::kNoSandbox, diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc b/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc index d2a8a1c2bcab..67f8bb3ed38c 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_view_host_impl.cc.orig 2020-07-07 21:58:15 UTC +--- content/browser/renderer_host/render_view_host_impl.cc.orig 2020-09-08 19:14:05 UTC +++ content/browser/renderer_host/render_view_host_impl.cc -@@ -227,7 +227,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs( +@@ -230,7 +230,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs( display::win::ScreenWin::GetSystemMetricsInDIP(SM_CYVSCROLL); prefs->arrow_bitmap_width_horizontal_scroll_bar_in_dips = display::win::ScreenWin::GetSystemMetricsInDIP(SM_CXHSCROLL); diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc index d9956498f67e..25080975e9ae 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2020-07-07 21:58:15 UTC +--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2020-09-08 19:14:05 UTC +++ content/browser/renderer_host/render_widget_host_view_aura.cc -@@ -111,11 +111,11 @@ +@@ -110,11 +110,11 @@ #include "ui/gfx/gdi_util.h" #endif @@ -11,10 +11,10 @@ -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - #include "ui/base/ime/linux/text_edit_command_auralinux.h" - #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" + #include "ui/base/ime/linux/text_edit_command_auralinux.h" // nogncheck + #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" // nogncheck #endif -@@ -557,7 +557,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge +@@ -489,7 +489,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge if (manager) return ToBrowserAccessibilityWin(manager->GetRoot())->GetCOM(); @@ -23,7 +23,7 @@ BrowserAccessibilityManager* manager = host()->GetOrCreateRootBrowserAccessibilityManager(); if (manager && manager->GetRoot()) -@@ -2187,7 +2187,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { +@@ -2150,7 +2150,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { } bool RenderWidgetHostViewAura::NeedsMouseCapture() { @@ -32,7 +32,7 @@ return NeedsInputGrab(); #else return false; -@@ -2357,7 +2357,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit +@@ -2326,7 +2326,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit if (!target_host) return; diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc index 459ab2bcbe82..d30312d446a7 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig 2020-05-13 18:40:31 UTC +--- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig 2020-09-08 19:14:05 UTC +++ content/browser/renderer_host/render_widget_host_view_event_handler.cc -@@ -641,7 +641,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand +@@ -653,7 +653,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand if (event->type() == ui::ET_MOUSE_EXITED) { if (mouse_locked || selection_popup) return false; diff --git a/www/chromium/files/patch-content_browser_scheduler_responsiveness_watcher.cc b/www/chromium/files/patch-content_browser_scheduler_responsiveness_watcher.cc deleted file mode 100644 index 397c2691e0c0..000000000000 --- a/www/chromium/files/patch-content_browser_scheduler_responsiveness_watcher.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- content/browser/scheduler/responsiveness/watcher.cc.orig 2020-07-07 21:58:15 UTC -+++ content/browser/scheduler/responsiveness/watcher.cc -@@ -102,7 +102,7 @@ void Watcher::DidRunTask(const base::PendingTask* task - // in context menus, among others). Simply ignore the mismatches for now. - // See https://crbug.com/929813 for the details of why the mismatch - // happens. --#if !defined(OS_CHROMEOS) && defined(OS_LINUX) && defined(USE_OZONE) -+#if !defined(OS_CHROMEOS) && (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_OZONE) - return currently_running_metadata_ui_.clear(); - #endif - DCHECK_LE(*mismatched_task_identifiers, 1); -@@ -171,7 +171,7 @@ void Watcher::DidRunEventOnUIThread(const void* opaque - mismatched_event_identifiers_ui_ += 1; - // See comment in DidRunTask() for why |currently_running_metadata_ui_| may - // be reset. --#if !defined(OS_CHROMEOS) && defined(OS_LINUX) && defined(USE_OZONE) -+#if !defined(OS_CHROMEOS) && (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_OZONE) - return currently_running_metadata_ui_.clear(); - #endif - DCHECK_LE(mismatched_event_identifiers_ui_, 1); diff --git a/www/chromium/files/patch-content_browser_utility__process__host.cc b/www/chromium/files/patch-content_browser_utility__process__host.cc index 9e2464bcc5d5..1dc0ff8f6df2 100644 --- a/www/chromium/files/patch-content_browser_utility__process__host.cc +++ b/www/chromium/files/patch-content_browser_utility__process__host.cc @@ -1,6 +1,6 @@ ---- content/browser/utility_process_host.cc.orig 2020-07-07 21:58:15 UTC +--- content/browser/utility_process_host.cc.orig 2020-09-08 19:14:05 UTC +++ content/browser/utility_process_host.cc -@@ -248,7 +248,7 @@ UtilityProcessHost::UtilityProcessHost() +@@ -275,7 +275,7 @@ UtilityProcessHost::UtilityProcessHost() UtilityProcessHost::UtilityProcessHost(std::unique_ptr<Client> client) : sandbox_type_(service_manager::SandboxType::kUtility), @@ -9,7 +9,7 @@ child_flags_(ChildProcessHost::CHILD_ALLOW_SELF), #else child_flags_(ChildProcessHost::CHILD_NORMAL), -@@ -420,7 +420,7 @@ bool UtilityProcessHost::StartProcess() { +@@ -446,7 +446,7 @@ bool UtilityProcessHost::StartProcess() { network::switches::kNetLogCaptureMode, network::switches::kExplicitlyAllowedPorts, service_manager::switches::kNoSandbox, diff --git a/www/chromium/files/patch-content_browser_utility__process__host__receiver__bindings.cc b/www/chromium/files/patch-content_browser_utility__process__host__receiver__bindings.cc index a69a1ccfe8b3..56fcc2b7339e 100644 --- a/www/chromium/files/patch-content_browser_utility__process__host__receiver__bindings.cc +++ b/www/chromium/files/patch-content_browser_utility__process__host__receiver__bindings.cc @@ -1,15 +1,15 @@ ---- content/browser/utility_process_host_receiver_bindings.cc.orig 2020-02-26 13:18:37 UTC +--- content/browser/utility_process_host_receiver_bindings.cc.orig 2020-09-08 19:14:05 UTC +++ content/browser/utility_process_host_receiver_bindings.cc -@@ -8,7 +8,7 @@ - - #include "build/build_config.h" +@@ -10,7 +10,7 @@ + #include "content/public/browser/content_browser_client.h" + #include "content/public/common/content_client.h" -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) #include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck #include "content/browser/font_service.h" // nogncheck #endif -@@ -17,7 +17,7 @@ namespace content { +@@ -19,7 +19,7 @@ namespace content { void UtilityProcessHost::BindHostReceiver( mojo::GenericPendingReceiver receiver) { diff --git a/www/chromium/files/patch-content_browser_webui_shared__resources__data__source.cc b/www/chromium/files/patch-content_browser_webui_shared__resources__data__source.cc index 28bd0af475ef..bbb5013dcab5 100644 --- a/www/chromium/files/patch-content_browser_webui_shared__resources__data__source.cc +++ b/www/chromium/files/patch-content_browser_webui_shared__resources__data__source.cc @@ -1,6 +1,6 @@ ---- content/browser/webui/shared_resources_data_source.cc.orig 2020-07-07 21:58:15 UTC +--- content/browser/webui/shared_resources_data_source.cc.orig 2020-09-08 19:14:05 UTC +++ content/browser/webui/shared_resources_data_source.cc -@@ -130,13 +130,13 @@ const std::map<int, std::string> CreateMojoResourceIdT +@@ -134,13 +134,13 @@ const std::map<int, std::string> CreateMojoResourceIdT "mojo/mojo/public/mojom/base/text_direction.mojom.html"}, {IDR_MOJO_TEXT_DIRECTION_MOJOM_LITE_JS, "mojo/mojo/public/mojom/base/text_direction.mojom-lite.js"}, diff --git a/www/chromium/files/patch-services_service__manager_zygote_host_zygote__host__impl__linux.cc b/www/chromium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.cc index 84d77a3074f4..7756c2e302a1 100644 --- a/www/chromium/files/patch-services_service__manager_zygote_host_zygote__host__impl__linux.cc +++ b/www/chromium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.cc @@ -1,36 +1,36 @@ ---- services/service_manager/zygote/host/zygote_host_impl_linux.cc.orig 2020-05-13 18:39:47 UTC -+++ services/service_manager/zygote/host/zygote_host_impl_linux.cc -@@ -72,6 +72,7 @@ ZygoteHostImpl* ZygoteHostImpl::GetInstance() { +--- content/browser/zygote_host/zygote_host_impl_linux.cc.orig 2020-09-16 15:03:02 UTC ++++ content/browser/zygote_host/zygote_host_impl_linux.cc +@@ -73,6 +73,7 @@ ZygoteHostImpl* ZygoteHostImpl::GetInstance() { } void ZygoteHostImpl::Init(const base::CommandLine& command_line) { -+#if !defined(OS_BSD) ++#if !defined(OS_BSD) if (command_line.HasSwitch(service_manager::switches::kNoSandbox)) { return; } -@@ -122,6 +123,7 @@ void ZygoteHostImpl::Init(const base::CommandLine& com +@@ -123,6 +124,7 @@ void ZygoteHostImpl::Init(const base::CommandLine& com "you can try using --" << service_manager::switches::kNoSandbox << "."; } -+#endif ++#endif // !defined(OS_BSD) } void ZygoteHostImpl::AddZygotePid(pid_t pid) { -@@ -146,6 +148,7 @@ pid_t ZygoteHostImpl::LaunchZygote( - base::CommandLine* cmd_line, +@@ -148,6 +150,7 @@ pid_t ZygoteHostImpl::LaunchZygote( base::ScopedFD* control_fd, base::FileHandleMappingVector additional_remapped_fds) { -+#if !defined(OS_BSD) int fds[2]; ++#if !defined(OS_BSD) CHECK_EQ(0, socketpair(AF_UNIX, SOCK_SEQPACKET, 0, fds)); CHECK(base::UnixDomainSocket::EnableReceiveProcessId(fds[0])); -@@ -213,9 +216,12 @@ pid_t ZygoteHostImpl::LaunchZygote( + +@@ -214,9 +217,12 @@ pid_t ZygoteHostImpl::LaunchZygote( AddZygotePid(pid); return pid; +#else + return 0; -+#endif ++#endif // !defined(OS_BSD) } -#if !defined(OS_OPENBSD) diff --git a/www/chromium/files/patch-services_service__manager_zygote_host_zygote__host__impl__linux.h b/www/chromium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.h index 2d846ba1732e..8fe28c844368 100644 --- a/www/chromium/files/patch-services_service__manager_zygote_host_zygote__host__impl__linux.h +++ b/www/chromium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.h @@ -1,6 +1,6 @@ ---- services/service_manager/zygote/host/zygote_host_impl_linux.h.orig 2019-03-11 22:01:02 UTC -+++ services/service_manager/zygote/host/zygote_host_impl_linux.h -@@ -44,8 +44,10 @@ class COMPONENT_EXPORT(SERVICE_MANAGER_ZYGOTE) ZygoteH +--- content/browser/zygote_host/zygote_host_impl_linux.h.orig 2020-09-16 15:22:06 UTC ++++ content/browser/zygote_host/zygote_host_impl_linux.h +@@ -42,8 +42,10 @@ class CONTENT_EXPORT ZygoteHostImpl : public ZygoteHos base::ScopedFD* control_fd, base::FileHandleMappingVector additional_remapped_fds); diff --git a/www/chromium/files/patch-content_child_BUILD.gn b/www/chromium/files/patch-content_child_BUILD.gn deleted file mode 100644 index 88966886db74..000000000000 --- a/www/chromium/files/patch-content_child_BUILD.gn +++ /dev/null @@ -1,16 +0,0 @@ ---- content/child/BUILD.gn.orig 2020-05-19 08:30:28 UTC -+++ content/child/BUILD.gn -@@ -147,8 +147,12 @@ target(link_target_type, "child") { - deps += [ - "//components/services/font/public/cpp", - "//components/services/font/public/mojom", -- "//services/service_manager/zygote", - ] -+ if (!is_bsd) { -+ deps += [ -+ "//services/service_manager/zygote", -+ ] -+ } - } - - if (is_win) { diff --git a/www/chromium/files/patch-content_common_BUILD.gn b/www/chromium/files/patch-content_common_BUILD.gn index f9cf481ecfa9..e4ef0a8ff0f4 100644 --- a/www/chromium/files/patch-content_common_BUILD.gn +++ b/www/chromium/files/patch-content_common_BUILD.gn @@ -1,6 +1,6 @@ ---- content/common/BUILD.gn.orig 2020-07-07 21:58:15 UTC +--- content/common/BUILD.gn.orig 2020-09-08 19:14:05 UTC +++ content/common/BUILD.gn -@@ -340,6 +340,12 @@ source_set("common") { +@@ -335,6 +335,12 @@ source_set("common") { libs += [ "android" ] } diff --git a/www/chromium/files/patch-content_gpu_BUILD.gn b/www/chromium/files/patch-content_gpu_BUILD.gn index f51961d30857..7e5931ff8881 100644 --- a/www/chromium/files/patch-content_gpu_BUILD.gn +++ b/www/chromium/files/patch-content_gpu_BUILD.gn @@ -1,15 +1,6 @@ ---- content/gpu/BUILD.gn.orig 2020-05-13 18:39:43 UTC +--- content/gpu/BUILD.gn.orig 2020-09-08 19:14:05 UTC +++ content/gpu/BUILD.gn -@@ -96,7 +96,7 @@ target(link_target_type, "gpu_sources") { - ] - } - -- if (is_linux) { -+ if (is_linux && !is_bsd) { - deps += [ "//services/service_manager/zygote" ] - } - -@@ -130,7 +130,7 @@ target(link_target_type, "gpu_sources") { +@@ -126,7 +126,7 @@ target(link_target_type, "gpu_sources") { # Use DRI on desktop Linux builds. if (current_cpu != "s390x" && current_cpu != "ppc64" && is_desktop_linux && diff --git a/www/chromium/files/patch-content_gpu_gpu__main.cc b/www/chromium/files/patch-content_gpu_gpu__main.cc index ff722f4a3504..6cd9d288eef2 100644 --- a/www/chromium/files/patch-content_gpu_gpu__main.cc +++ b/www/chromium/files/patch-content_gpu_gpu__main.cc @@ -1,6 +1,6 @@ ---- content/gpu/gpu_main.cc.orig 2020-07-07 21:58:15 UTC +--- content/gpu/gpu_main.cc.orig 2020-09-08 19:14:05 UTC +++ content/gpu/gpu_main.cc -@@ -83,7 +83,7 @@ +@@ -85,7 +85,7 @@ #include "ui/gfx/x/x11_types.h" // nogncheck #endif @@ -9,7 +9,7 @@ #include "content/gpu/gpu_sandbox_hook_linux.h" #include "content/public/common/sandbox_init.h" #include "services/service_manager/sandbox/linux/sandbox_linux.h" -@@ -108,7 +108,7 @@ namespace content { +@@ -109,7 +109,7 @@ namespace content { namespace { @@ -18,7 +18,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread*, const gpu::GPUInfo*, const gpu::GpuPreferences&); -@@ -161,7 +161,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel +@@ -162,7 +162,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel bool EnsureSandboxInitialized(gpu::GpuWatchdogThread* watchdog_thread, const gpu::GPUInfo* gpu_info, const gpu::GpuPreferences& gpu_prefs) override { @@ -27,16 +27,16 @@ return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs); #elif defined(OS_WIN) return StartSandboxWindows(sandbox_info_); -@@ -282,7 +282,7 @@ int GpuMain(const MainFunctionParams& parameters) { - main_thread_task_executor = - std::make_unique<base::SingleThreadTaskExecutor>( - gpu_preferences.message_pump_type); +@@ -297,7 +297,7 @@ int GpuMain(const MainFunctionParams& parameters) { + gpu_preferences.message_pump_type); + } + #endif -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) #error "Unsupported Linux platform." #elif defined(OS_MACOSX) // Cross-process CoreAnimation requires a CFRunLoop to function at all, and -@@ -424,7 +424,7 @@ int GpuMain(const MainFunctionParams& parameters) { +@@ -450,7 +450,7 @@ int GpuMain(const MainFunctionParams& parameters) { namespace { @@ -45,7 +45,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdog_thread, const gpu::GPUInfo* gpu_info, const gpu::GpuPreferences& gpu_prefs) { -@@ -461,7 +461,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo +@@ -487,7 +487,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo return res; } diff --git a/www/chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc b/www/chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc index 52a6fced51be..9a296dc9094d 100644 --- a/www/chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc +++ b/www/chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc @@ -1,6 +1,6 @@ ---- content/gpu/gpu_sandbox_hook_linux.cc.orig 2020-07-07 21:58:15 UTC +--- content/gpu/gpu_sandbox_hook_linux.cc.orig 2020-09-08 19:14:05 UTC +++ content/gpu/gpu_sandbox_hook_linux.cc -@@ -97,8 +97,9 @@ static const char kLibV4lEncPluginPath[] = +@@ -98,8 +98,9 @@ static const char kLibV4lEncPluginPath[] = "/usr/lib/libv4l/plugins/libv4l-encplugin.so"; #endif @@ -11,7 +11,7 @@ void AddV4L2GpuWhitelist( std::vector<BrokerFilePermission>* permissions, const service_manager::SandboxSeccompBPF::Options& options) { -@@ -339,8 +340,10 @@ std::vector<BrokerFilePermission> FilePermissionsForGp +@@ -356,8 +357,10 @@ std::vector<BrokerFilePermission> FilePermissionsForGp AddStandardGpuWhiteList(&permissions); return permissions; } @@ -22,7 +22,7 @@ // Preload the Mali library. if (UseChromecastSandboxWhitelist()) { for (const char* path : kWhitelistedChromecastPaths) { -@@ -355,6 +358,7 @@ void LoadArmGpuLibraries() { +@@ -372,6 +375,7 @@ void LoadArmGpuLibraries() { // Preload the Tegra V4L2 (video decode acceleration) library. dlopen(kLibTegraPath, dlopen_flag); } @@ -30,7 +30,7 @@ } bool LoadAmdGpuLibraries() { -@@ -394,12 +398,14 @@ void LoadV4L2Libraries( +@@ -411,12 +415,14 @@ void LoadV4L2Libraries( } void LoadChromecastV4L2Libraries() { @@ -45,7 +45,7 @@ } bool LoadLibrariesForGpu( -@@ -421,6 +427,7 @@ bool LoadLibrariesForGpu( +@@ -438,6 +444,7 @@ bool LoadLibrariesForGpu( return true; } @@ -53,7 +53,7 @@ sandbox::syscall_broker::BrokerCommandSet CommandSetForGPU( const service_manager::SandboxLinux::Options& options) { sandbox::syscall_broker::BrokerCommandSet command_set; -@@ -442,13 +449,17 @@ bool BrokerProcessPreSandboxHook( +@@ -459,13 +466,17 @@ bool BrokerProcessPreSandboxHook( service_manager::SetProcessTitleFromCommandLine(nullptr); return true; } diff --git a/www/chromium/files/patch-content_public_app_content__main__delegate.cc b/www/chromium/files/patch-content_public_app_content__main__delegate.cc index c0daa3c2f628..bda24cdadd9b 100644 --- a/www/chromium/files/patch-content_public_app_content__main__delegate.cc +++ b/www/chromium/files/patch-content_public_app_content__main__delegate.cc @@ -1,6 +1,6 @@ ---- content/public/app/content_main_delegate.cc.orig 2020-07-07 21:58:15 UTC +--- content/public/app/content_main_delegate.cc.orig 2020-09-08 19:14:05 UTC +++ content/public/app/content_main_delegate.cc -@@ -24,13 +24,13 @@ int ContentMainDelegate::RunProcess( +@@ -24,12 +24,12 @@ int ContentMainDelegate::RunProcess( return -1; } @@ -8,8 +8,7 @@ +#if defined(OS_LINUX) || defined(OS_BSD) void ContentMainDelegate::ZygoteStarting( - std::vector<std::unique_ptr<service_manager::ZygoteForkDelegate>>* - delegates) {} + std::vector<std::unique_ptr<ZygoteForkDelegate>>* delegates) {} -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) diff --git a/www/chromium/files/patch-content_public_app_content__main__delegate.h b/www/chromium/files/patch-content_public_app_content__main__delegate.h index 7fdad01e5ccf..106614ee471f 100644 --- a/www/chromium/files/patch-content_public_app_content__main__delegate.h +++ b/www/chromium/files/patch-content_public_app_content__main__delegate.h @@ -1,4 +1,4 @@ ---- content/public/app/content_main_delegate.h.orig 2020-05-13 18:40:32 UTC +--- content/public/app/content_main_delegate.h.orig 2020-09-08 19:14:05 UTC +++ content/public/app/content_main_delegate.h @@ -60,7 +60,7 @@ class CONTENT_EXPORT ContentMainDelegate { // Called right before the process exits. @@ -9,7 +9,7 @@ // Tells the embedder that the zygote process is starting, and allows it to // specify one or more zygote delegates if it wishes by storing them in // |*delegates|. -@@ -70,7 +70,7 @@ class CONTENT_EXPORT ContentMainDelegate { +@@ -69,7 +69,7 @@ class CONTENT_EXPORT ContentMainDelegate { // Called every time the zygote process forks. virtual void ZygoteForked() {} diff --git a/www/chromium/files/patch-services_service__manager_zygote_zygote__host__linux.h b/www/chromium/files/patch-content_public_browser_zygote__host_zygote__host__linux.h index bdf4e5ff2926..83a038f3aefe 100644 --- a/www/chromium/files/patch-services_service__manager_zygote_zygote__host__linux.h +++ b/www/chromium/files/patch-content_public_browser_zygote__host_zygote__host__linux.h @@ -1,8 +1,8 @@ ---- services/service_manager/zygote/zygote_host_linux.h.orig 2019-03-11 22:01:02 UTC -+++ services/service_manager/zygote/zygote_host_linux.h +--- content/public/browser/zygote_host/zygote_host_linux.h.orig 2020-09-16 15:24:35 UTC ++++ content/public/browser/zygote_host/zygote_host_linux.h @@ -30,11 +30,13 @@ class ZygoteHost { // after the first render has been forked. - virtual int GetRendererSandboxStatus() const = 0; + virtual int GetRendererSandboxStatus() = 0; +#if !defined(OS_BSD) // Adjust the OOM score of the given renderer's PID. The allowed @@ -13,4 +13,4 @@ +#endif }; - } // namespace service_manager + } // namespace content diff --git a/www/chromium/files/patch-content_public_common_BUILD.gn b/www/chromium/files/patch-content_public_common_BUILD.gn deleted file mode 100644 index 5ec304a9b7d1..000000000000 --- a/www/chromium/files/patch-content_public_common_BUILD.gn +++ /dev/null @@ -1,11 +0,0 @@ ---- content/public/common/BUILD.gn.orig 2020-07-07 21:58:15 UTC -+++ content/public/common/BUILD.gn -@@ -255,7 +255,7 @@ jumbo_source_set("common_sources") { - deps += [ "//content/public/android:jni" ] - } - -- if (is_linux) { -+ if (is_linux && !is_bsd) { - deps += [ "//services/service_manager/zygote" ] - } - diff --git a/www/chromium/files/patch-content_public_common_common__param__traits__macros.h b/www/chromium/files/patch-content_public_common_common__param__traits__macros.h index bd87d06db5b6..392dfcc26cde 100644 --- a/www/chromium/files/patch-content_public_common_common__param__traits__macros.h +++ b/www/chromium/files/patch-content_public_common_common__param__traits__macros.h @@ -1,6 +1,6 @@ ---- content/public/common/common_param_traits_macros.h.orig 2020-07-07 21:58:15 UTC +--- content/public/common/common_param_traits_macros.h.orig 2020-09-08 19:14:05 UTC +++ content/public/common/common_param_traits_macros.h -@@ -318,7 +318,7 @@ IPC_STRUCT_TRAITS_BEGIN(blink::mojom::RendererPreferen +@@ -315,7 +315,7 @@ IPC_STRUCT_TRAITS_BEGIN(blink::mojom::RendererPreferen IPC_STRUCT_TRAITS_MEMBER(accept_languages) IPC_STRUCT_TRAITS_MEMBER(disable_client_blocked_error_page) IPC_STRUCT_TRAITS_MEMBER(plugin_fullscreen_allowed) diff --git a/www/chromium/files/patch-content_public_common_content__features.cc b/www/chromium/files/patch-content_public_common_content__features.cc index d0a541e86aeb..aa6ed70bed68 100644 --- a/www/chromium/files/patch-content_public_common_content__features.cc +++ b/www/chromium/files/patch-content_public_common_content__features.cc @@ -1,4 +1,4 @@ ---- content/public/common/content_features.cc.orig 2020-07-07 21:58:15 UTC +--- content/public/common/content_features.cc.orig 2020-09-08 19:14:05 UTC +++ content/public/common/content_features.cc @@ -48,7 +48,7 @@ const base::Feature kAudioServiceLaunchOnStartup{ const base::Feature kAudioServiceOutOfProcess { @@ -9,7 +9,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -730,7 +730,7 @@ const base::Feature kWebAssemblyThreads { +@@ -727,7 +727,7 @@ const base::Feature kWebAssemblyThreads { }; // Enable WebAssembly trap handler. @@ -18,7 +18,7 @@ defined(ARCH_CPU_X86_64) const base::Feature kWebAssemblyTrapHandler{"WebAssemblyTrapHandler", base::FEATURE_ENABLED_BY_DEFAULT}; -@@ -760,7 +760,7 @@ const base::Feature kWebAuth{"WebAuthentication", +@@ -757,7 +757,7 @@ const base::Feature kWebAuth{"WebAuthentication", // https://w3c.github.io/webauthn const base::Feature kWebAuthCable { "WebAuthenticationCable", diff --git a/www/chromium/files/patch-content_public_common_content__switches.cc b/www/chromium/files/patch-content_public_common_content__switches.cc index 2717008affee..35de33275e96 100644 --- a/www/chromium/files/patch-content_public_common_content__switches.cc +++ b/www/chromium/files/patch-content_public_common_content__switches.cc @@ -1,6 +1,6 @@ ---- content/public/common/content_switches.cc.orig 2020-07-07 21:58:15 UTC +--- content/public/common/content_switches.cc.orig 2020-09-08 19:14:05 UTC +++ content/public/common/content_switches.cc -@@ -1032,7 +1032,7 @@ const char kEnableAggressiveDOMStorageFlushing[] = +@@ -975,7 +975,7 @@ const char kEnableAggressiveDOMStorageFlushing[] = // Enable indication that browser is controlled by automation. const char kEnableAutomation[] = "enable-automation"; diff --git a/www/chromium/files/patch-content_public_common_content__switches.h b/www/chromium/files/patch-content_public_common_content__switches.h index 13f119841dcf..17671357a3df 100644 --- a/www/chromium/files/patch-content_public_common_content__switches.h +++ b/www/chromium/files/patch-content_public_common_content__switches.h @@ -1,6 +1,6 @@ ---- content/public/common/content_switches.h.orig 2020-07-07 21:58:15 UTC +--- content/public/common/content_switches.h.orig 2020-09-08 19:14:05 UTC +++ content/public/common/content_switches.h -@@ -284,7 +284,7 @@ CONTENT_EXPORT extern const char kRemoteDebuggingSocke +@@ -267,7 +267,7 @@ CONTENT_EXPORT extern const char kRemoteDebuggingSocke CONTENT_EXPORT extern const char kRendererWaitForJavaDebugger[]; #endif diff --git a/www/chromium/files/patch-services_service__manager_zygote_common_zygote__features.gni b/www/chromium/files/patch-content_public_common_zygote_features.gni index d6dc2aed4fb6..ea642ce3e5ef 100644 --- a/www/chromium/files/patch-services_service__manager_zygote_common_zygote__features.gni +++ b/www/chromium/files/patch-content_public_common_zygote_features.gni @@ -1,5 +1,5 @@ ---- services/service_manager/zygote/common/zygote_features.gni.orig 2019-03-11 22:01:02 UTC -+++ services/service_manager/zygote/common/zygote_features.gni +--- content/public/common/zygote/features.gni.orig 2020-09-16 15:26:35 UTC ++++ content/public/common/zygote/features.gni @@ -2,4 +2,4 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/www/chromium/files/patch-content_public_test_browser__test__base.cc b/www/chromium/files/patch-content_public_test_browser__test__base.cc index 42e45dc869e8..026f244e5a8a 100644 --- a/www/chromium/files/patch-content_public_test_browser__test__base.cc +++ b/www/chromium/files/patch-content_public_test_browser__test__base.cc @@ -1,6 +1,6 @@ ---- content/public/test/browser_test_base.cc.orig 2020-07-07 21:58:15 UTC +--- content/public/test/browser_test_base.cc.orig 2020-09-08 19:14:05 UTC +++ content/public/test/browser_test_base.cc -@@ -74,7 +74,7 @@ +@@ -73,7 +73,7 @@ #include "ui/gl/gl_implementation.h" #include "ui/gl/gl_switches.h" @@ -9,7 +9,7 @@ #include "ui/platform_window/common/platform_window_defaults.h" // nogncheck #endif -@@ -100,6 +100,10 @@ +@@ -99,6 +99,10 @@ #include "ui/views/test/event_generator_delegate_mac.h" #endif @@ -20,7 +20,7 @@ #if defined(OS_POSIX) #include "base/process/process_handle.h" #endif -@@ -186,7 +190,7 @@ BrowserTestBase::BrowserTestBase() +@@ -185,7 +189,7 @@ BrowserTestBase::BrowserTestBase() "a new browser test suite that runs on Android, please add it to " "//build/android/pylib/gtest/gtest_test_instance.py."; g_instance_already_created = true; diff --git a/www/chromium/files/patch-content_renderer_BUILD.gn b/www/chromium/files/patch-content_renderer_BUILD.gn deleted file mode 100644 index c0d1e3c03069..000000000000 --- a/www/chromium/files/patch-content_renderer_BUILD.gn +++ /dev/null @@ -1,18 +0,0 @@ ---- content/renderer/BUILD.gn.orig 2020-07-07 21:58:15 UTC -+++ content/renderer/BUILD.gn -@@ -454,10 +454,11 @@ target(link_target_type, "renderer") { - } - - if (is_linux) { -- deps += [ -- "//components/services/font/public/cpp", -- "//services/service_manager/zygote", -- ] -+ deps += [ "//components/services/font/public/cpp" ] -+ -+ if (!is_bsd) { -+ deps += [ "//services/service_manager/zygote" ] -+ } - } - - if (is_mac) { diff --git a/www/chromium/files/patch-content_renderer_render__thread__impl.cc b/www/chromium/files/patch-content_renderer_render__thread__impl.cc index aed580dbffd6..ed09fca723ee 100644 --- a/www/chromium/files/patch-content_renderer_render__thread__impl.cc +++ b/www/chromium/files/patch-content_renderer_render__thread__impl.cc @@ -1,4 +1,4 @@ ---- content/renderer/render_thread_impl.cc.orig 2020-07-07 21:58:16 UTC +--- content/renderer/render_thread_impl.cc.orig 2020-09-08 19:14:05 UTC +++ content/renderer/render_thread_impl.cc @@ -177,7 +177,7 @@ @@ -9,7 +9,7 @@ #include <malloc.h> #endif -@@ -744,7 +744,7 @@ void RenderThreadImpl::Init() { +@@ -752,7 +752,7 @@ void RenderThreadImpl::Init() { DCHECK(parsed_num_raster_threads) << string_value; DCHECK_GT(num_raster_threads, 0); @@ -18,7 +18,7 @@ categorized_worker_pool_->SetBackgroundingCallback( main_thread_scheduler_->DefaultTaskRunner(), base::BindOnce( -@@ -767,7 +767,7 @@ void RenderThreadImpl::Init() { +@@ -775,7 +775,7 @@ void RenderThreadImpl::Init() { base::DiscardableMemoryAllocator::SetInstance( discardable_memory_allocator_.get()); @@ -27,7 +27,7 @@ if (base::FeatureList::IsEnabled( blink::features::kBlinkCompositorUseDisplayThreadPriority)) { render_message_filter()->SetThreadPriority( -@@ -1151,7 +1151,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1161,7 +1161,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: !cmd_line->HasSwitch(switches::kDisableGpuMemoryBufferVideoFrames); #else cmd_line->HasSwitch(switches::kEnableGpuMemoryBufferVideoFrames); diff --git a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc index c9c79f4f1826..6ed8cf4ac5cd 100644 --- a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc +++ b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc @@ -1,4 +1,4 @@ ---- content/renderer/renderer_blink_platform_impl.cc.orig 2020-07-07 21:58:16 UTC +--- content/renderer/renderer_blink_platform_impl.cc.orig 2020-09-08 19:14:05 UTC +++ content/renderer/renderer_blink_platform_impl.cc @@ -97,7 +97,7 @@ @@ -9,16 +9,16 @@ #include "content/child/child_process_sandbox_support_impl_linux.h" #endif -@@ -172,7 +172,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -169,7 +169,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( + + // RenderThread may not exist in some tests. if (RenderThreadImpl::current()) { - io_runner_ = RenderThreadImpl::current()->GetIOTaskRunner(); - thread_safe_sender_ = RenderThreadImpl::current()->thread_safe_sender(); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) mojo::PendingRemote<font_service::mojom::FontService> font_service; RenderThreadImpl::current()->BindHostReceiver( font_service.InitWithNewPipeAndPassReceiver()); -@@ -182,7 +182,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -179,7 +179,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( #endif } @@ -27,7 +27,7 @@ if (sandboxEnabled()) { #if defined(OS_MACOSX) sandbox_support_ = std::make_unique<WebSandboxSupportMac>(); -@@ -264,7 +264,7 @@ RendererBlinkPlatformImpl::CreateNetworkURLLoaderFacto +@@ -261,7 +261,7 @@ RendererBlinkPlatformImpl::CreateNetworkURLLoaderFacto void RendererBlinkPlatformImpl::SetDisplayThreadPriority( base::PlatformThreadId thread_id) { @@ -36,7 +36,7 @@ if (RenderThreadImpl* render_thread = RenderThreadImpl::current()) { render_thread->render_message_filter()->SetThreadPriority( thread_id, base::ThreadPriority::DISPLAY); -@@ -277,7 +277,7 @@ blink::BlameContext* RendererBlinkPlatformImpl::GetTop +@@ -274,7 +274,7 @@ blink::BlameContext* RendererBlinkPlatformImpl::GetTop } blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() { diff --git a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h index 4d33c7856bc3..ec94b7cb2401 100644 --- a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h +++ b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h @@ -1,4 +1,4 @@ ---- content/renderer/renderer_blink_platform_impl.h.orig 2020-05-13 18:39:43 UTC +--- content/renderer/renderer_blink_platform_impl.h.orig 2020-09-08 19:14:05 UTC +++ content/renderer/renderer_blink_platform_impl.h @@ -30,7 +30,7 @@ #include "third_party/blink/public/mojom/cache_storage/cache_storage.mojom.h" @@ -9,16 +9,16 @@ #include "components/services/font/public/cpp/font_loader.h" // nogncheck #include "third_party/skia/include/core/SkRefCnt.h" // nogncheck #endif -@@ -219,7 +219,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi - - scoped_refptr<base::SingleThreadTaskRunner> io_runner_; +@@ -218,7 +218,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi + // Return the mojo interface for making CodeCache calls. + blink::mojom::CodeCacheHost& GetCodeCacheHost(); -#if defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) std::unique_ptr<blink::WebSandboxSupport> sandbox_support_; #endif -@@ -243,7 +243,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -239,7 +239,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi mojo::PendingRemote<blink::mojom::CodeCacheHost> code_cache_host_remote_; mojo::SharedRemote<blink::mojom::CodeCacheHost> code_cache_host_; diff --git a/www/chromium/files/patch-content_shell_BUILD.gn b/www/chromium/files/patch-content_shell_BUILD.gn index 6b4a3928ef91..5c21cf76c0f1 100644 --- a/www/chromium/files/patch-content_shell_BUILD.gn +++ b/www/chromium/files/patch-content_shell_BUILD.gn @@ -1,6 +1,6 @@ ---- content/shell/BUILD.gn.orig 2020-07-07 21:58:16 UTC +--- content/shell/BUILD.gn.orig 2020-09-08 19:14:05 UTC +++ content/shell/BUILD.gn -@@ -227,7 +227,7 @@ static_library("content_shell_app") { +@@ -226,7 +226,7 @@ static_library("content_shell_app") { "//content/public/app", "//v8", ] @@ -9,7 +9,7 @@ deps += [ "//components/crash/core/app", "//components/crash/core/app:test_support", -@@ -495,6 +495,13 @@ static_library("content_shell_lib") { +@@ -489,6 +489,13 @@ static_library("content_shell_lib") { ] deps += [ "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.ui.policy" ] } @@ -23,7 +23,7 @@ if (enable_plugins) { deps += [ -@@ -1070,7 +1077,7 @@ group("content_shell_crash_test") { +@@ -1066,7 +1073,7 @@ group("content_shell_crash_test") { if (is_win) { data_deps += [ "//build/win:copy_cdb_to_output" ] } diff --git a/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc b/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc index d9388fc9f1d2..0928be518449 100644 --- a/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc +++ b/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc @@ -1,6 +1,6 @@ ---- content/shell/browser/shell_browser_context.cc.orig 2019-10-21 19:06:33 UTC +--- content/shell/browser/shell_browser_context.cc.orig 2020-09-08 19:14:05 UTC +++ content/shell/browser/shell_browser_context.cc -@@ -32,7 +32,7 @@ +@@ -31,7 +31,7 @@ #if defined(OS_WIN) #include "base/base_paths_win.h" @@ -9,7 +9,7 @@ #include "base/nix/xdg_util.h" #elif defined(OS_MACOSX) #include "base/base_paths_mac.h" -@@ -107,7 +107,7 @@ void ShellBrowserContext::InitWhileIOAllowed() { +@@ -106,7 +106,7 @@ void ShellBrowserContext::InitWhileIOAllowed() { #if defined(OS_WIN) CHECK(base::PathService::Get(base::DIR_LOCAL_APP_DATA, &path_)); path_ = path_.Append(std::wstring(L"content_shell")); diff --git a/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc b/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc index 5d67147c3284..7f1f684a92d6 100644 --- a/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc +++ b/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc @@ -1,6 +1,6 @@ ---- content/shell/browser/shell_browser_main_parts.cc.orig 2020-07-07 21:58:16 UTC +--- content/shell/browser/shell_browser_main_parts.cc.orig 2020-09-08 19:14:05 UTC +++ content/shell/browser/shell_browser_main_parts.cc -@@ -47,7 +47,7 @@ +@@ -50,7 +50,7 @@ #if defined(USE_AURA) && defined(USE_X11) #include "ui/events/devices/x11/touch_factory_x11.h" // nogncheck #endif @@ -9,9 +9,9 @@ #include "ui/base/ime/init/input_method_initializer.h" #endif #if defined(OS_CHROMEOS) -@@ -132,7 +132,7 @@ int ShellBrowserMainParts::PreEarlyInitialization() { - #if defined(USE_X11) - ui::SetDefaultX11ErrorHandlers(); +@@ -137,7 +137,7 @@ int ShellBrowserMainParts::PreEarlyInitialization() { + if (!features::IsUsingOzonePlatform()) + ui::SetDefaultX11ErrorHandlers(); #endif -#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX) +#if !defined(OS_CHROMEOS) && defined(USE_AURA) && (defined(OS_BSD) || defined(OS_LINUX)) diff --git a/www/chromium/files/patch-content_shell_browser_web__test_web__test__browser__main__runner.cc b/www/chromium/files/patch-content_shell_browser_web__test_web__test__browser__main__runner.cc index fded6524feb6..97aa492047d1 100644 --- a/www/chromium/files/patch-content_shell_browser_web__test_web__test__browser__main__runner.cc +++ b/www/chromium/files/patch-content_shell_browser_web__test_web__test__browser__main__runner.cc @@ -1,6 +1,6 @@ ---- content/shell/browser/web_test/web_test_browser_main_runner.cc.orig 2020-07-13 09:42:59 UTC +--- content/shell/browser/web_test/web_test_browser_main_runner.cc.orig 2020-09-08 19:14:05 UTC +++ content/shell/browser/web_test/web_test_browser_main_runner.cc -@@ -205,7 +205,7 @@ void WebTestBrowserMainRunner::Initialize() { +@@ -208,7 +208,7 @@ void WebTestBrowserMainRunner::Initialize() { command_line.AppendSwitch( switches::kDisableGpuProcessForDX12VulkanInfoCollection); diff --git a/www/chromium/files/patch-content_shell_renderer_web__test_test__runner.cc b/www/chromium/files/patch-content_shell_renderer_web__test_test__runner.cc index 3e2eefb3df6d..4f653115aa83 100644 --- a/www/chromium/files/patch-content_shell_renderer_web__test_test__runner.cc +++ b/www/chromium/files/patch-content_shell_renderer_web__test_test__runner.cc @@ -1,6 +1,6 @@ ---- content/shell/renderer/web_test/test_runner.cc.orig 2020-07-07 21:58:16 UTC +--- content/shell/renderer/web_test/test_runner.cc.orig 2020-09-08 19:14:05 UTC +++ content/shell/renderer/web_test/test_runner.cc -@@ -73,7 +73,7 @@ +@@ -80,7 +80,7 @@ #include "ui/gfx/skia_util.h" #include "ui/gfx/test/icc_profiles.h" @@ -9,7 +9,7 @@ #include "third_party/blink/public/platform/web_font_render_style.h" #endif -@@ -1842,7 +1842,7 @@ void TestRunner::Reset() { +@@ -2198,7 +2198,7 @@ void TestRunner::Reset() { drag_image_.reset(); blink::WebSecurityPolicy::ClearOriginAccessList(); @@ -18,7 +18,7 @@ blink::WebFontRenderStyle::SetSubpixelPositioning(false); #endif blink::ResetDomainRelaxationForTest(); -@@ -2426,7 +2426,7 @@ void TestRunner::AddOriginAccessAllowListEntry( +@@ -2782,7 +2782,7 @@ void TestRunner::AddOriginAccessAllowListEntry( } void TestRunner::SetTextSubpixelPositioning(bool value) { diff --git a/www/chromium/files/patch-content_test_BUILD.gn b/www/chromium/files/patch-content_test_BUILD.gn index 4c053ec97b0a..d89e6cbdb890 100644 --- a/www/chromium/files/patch-content_test_BUILD.gn +++ b/www/chromium/files/patch-content_test_BUILD.gn @@ -1,34 +1,19 @@ ---- content/test/BUILD.gn.orig 2020-07-07 21:58:16 UTC +--- content/test/BUILD.gn.orig 2020-09-08 19:14:05 UTC +++ content/test/BUILD.gn -@@ -1330,15 +1330,22 @@ test("content_browsertests") { +@@ -1387,10 +1387,12 @@ test("content_browsertests") { } if (is_linux) { - sources += [ - "../browser/utility_process_sandbox_browsertest.cc", -- "../zygote/zygote_browsertest.cc", +- "../browser/zygote_host/zygote_browsertest.cc", - ] -- deps += [ -- "//services/service_manager/tests:interfaces", -- "//services/service_manager/zygote", -- "//ui/gfx:test_support", -- ] -+ if (is_bsd) { -+ deps += [ -+ "//services/service_manager/tests:interfaces", -+ "//ui/gfx:test_support", -+ ] -+ } else { ++ if (!is_bsd) { + sources += [ + "../browser/utility_process_sandbox_browsertest.cc", -+ "../zygote/zygote_browsertest.cc", -+ ] -+ deps += [ -+ "//services/service_manager/tests:interfaces", -+ "//services/service_manager/zygote", -+ "//ui/gfx:test_support", ++ "../browser/zygote_host/zygote_browsertest.cc", + ] + } - - if (use_atk) { - sources += [ + deps += [ + "//services/service_manager/tests:interfaces", + "//ui/gfx:test_support", diff --git a/www/chromium/files/patch-content_utility_BUILD.gn b/www/chromium/files/patch-content_utility_BUILD.gn index af5f3ef3326b..54cebbf57be7 100644 --- a/www/chromium/files/patch-content_utility_BUILD.gn +++ b/www/chromium/files/patch-content_utility_BUILD.gn @@ -1,6 +1,6 @@ ---- content/utility/BUILD.gn.orig 2020-07-07 21:58:16 UTC +--- content/utility/BUILD.gn.orig 2020-09-08 19:14:06 UTC +++ content/utility/BUILD.gn -@@ -82,7 +82,7 @@ jumbo_source_set("utility") { +@@ -85,7 +85,7 @@ jumbo_source_set("utility") { deps += [ "//services/proxy_resolver:lib" ] } diff --git a/www/chromium/files/patch-content_zygote_zygote__linux.cc b/www/chromium/files/patch-content_zygote_zygote__linux.cc new file mode 100644 index 000000000000..e4fdd0a4a1a7 --- /dev/null +++ b/www/chromium/files/patch-content_zygote_zygote__linux.cc @@ -0,0 +1,16 @@ +--- content/zygote/zygote_linux.cc.orig 2020-09-16 15:28:21 UTC ++++ content/zygote/zygote_linux.cc +@@ -1,7 +1,7 @@ + // Copyright (c) 2012 The Chromium Authors. All rights reserved. + // Use of this source code is governed by a BSD-style license that can be + // found in the LICENSE file. +- ++#if 0 + #include "content/zygote/zygote_linux.h" + + #include <errno.h> +@@ -658,3 +658,4 @@ bool Zygote::HandleGetSandboxStatus(int fd, base::Pick + } + + } // namespace content ++#endif diff --git a/www/chromium/files/patch-services_service__manager_zygote_zygote__main__linux.cc b/www/chromium/files/patch-content_zygote_zygote__main__linux.cc index d643ceecc85f..90b7852c2028 100644 --- a/www/chromium/files/patch-services_service__manager_zygote_zygote__main__linux.cc +++ b/www/chromium/files/patch-content_zygote_zygote__main__linux.cc @@ -1,5 +1,5 @@ ---- services/service_manager/zygote/zygote_main_linux.cc.orig 2020-05-13 18:39:47 UTC -+++ services/service_manager/zygote/zygote_main_linux.cc +--- content/zygote/zygote_main_linux.cc.orig 2020-09-16 15:49:35 UTC ++++ content/zygote/zygote_main_linux.cc @@ -11,7 +11,9 @@ #include <stddef.h> #include <stdint.h> @@ -10,7 +10,7 @@ #include <sys/socket.h> #include <sys/types.h> #include <unistd.h> -@@ -99,6 +101,7 @@ static bool CreateInitProcessReaper( +@@ -100,6 +102,7 @@ static bool CreateInitProcessReaper( // created through the setuid sandbox. static bool EnterSuidSandbox(sandbox::SetuidSandboxClient* setuid_sandbox, base::OnceClosure post_fork_parent_callback) { @@ -18,17 +18,17 @@ DCHECK(setuid_sandbox); DCHECK(setuid_sandbox->IsSuidSandboxChild()); -@@ -131,6 +134,9 @@ static bool EnterSuidSandbox(sandbox::SetuidSandboxCli +@@ -132,6 +135,9 @@ static bool EnterSuidSandbox(sandbox::SetuidSandboxCli CHECK(service_manager::SandboxDebugHandling::SetDumpableStatusAndHandlers()); return true; +#else + return false; -+#endif ++#endif // !defined(OS_BSD) } static void DropAllCapabilities(int proc_fd) { -@@ -176,6 +182,7 @@ static void EnterLayerOneSandbox(service_manager::Sand +@@ -177,6 +183,7 @@ static void EnterLayerOneSandbox(service_manager::Sand bool ZygoteMain( std::vector<std::unique_ptr<ZygoteForkDelegate>> fork_delegates) { @@ -36,13 +36,13 @@ sandbox::SetAmZygoteOrRenderer(true, GetSandboxFD()); auto* linux_sandbox = service_manager::SandboxLinux::GetInstance(); -@@ -240,6 +247,9 @@ bool ZygoteMain( +@@ -242,6 +249,9 @@ bool ZygoteMain( // This function call can return multiple times, once per fork(). return zygote.ProcessRequests(); +#else + return false; -+#endif ++#endif // !defined(OS_BSD) } - } // namespace service_manager + } // namespace content diff --git a/www/chromium/files/patch-extensions_common_api___permission__features.json b/www/chromium/files/patch-extensions_common_api___permission__features.json index 6f4c1ea4a82e..0b8cb001e30d 100644 --- a/www/chromium/files/patch-extensions_common_api___permission__features.json +++ b/www/chromium/files/patch-extensions_common_api___permission__features.json @@ -1,4 +1,4 @@ ---- extensions/common/api/_permission_features.json.orig 2020-07-07 21:58:16 UTC +--- extensions/common/api/_permission_features.json.orig 2020-09-08 19:14:06 UTC +++ extensions/common/api/_permission_features.json @@ -135,7 +135,7 @@ { @@ -9,16 +9,16 @@ "whitelist": [ "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80", // http://crbug.com/387169 "A3BC37E2148AC4E99BE4B16AF9D42DD1E592BBBE", // http://crbug.com/387169 -@@ -483,7 +483,7 @@ - "platform_app", - "login_screen_extension" - ], +@@ -480,7 +480,7 @@ + }, { + "channel": "stable", + "extension_types": ["extension", "legacy_packaged_app", "platform_app"], - "platforms": ["chromeos", "mac", "win", "linux"], + "platforms": ["chromeos", "mac", "win", "linux", "bsd"], "whitelist": [ "0DE0F05680A4A056BCEC864ED8DDA84296F82B40", // http://crbug.com/434651 "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80", // http://crbug.com/293683 -@@ -522,7 +522,7 @@ +@@ -515,7 +515,7 @@ "networkingPrivate": { "channel": "stable", "extension_types": ["extension", "legacy_packaged_app", "platform_app"], diff --git a/www/chromium/files/patch-extensions_shell_BUILD.gn b/www/chromium/files/patch-extensions_shell_BUILD.gn index 7c0cc29f2729..3940703ecaff 100644 --- a/www/chromium/files/patch-extensions_shell_BUILD.gn +++ b/www/chromium/files/patch-extensions_shell_BUILD.gn @@ -1,6 +1,6 @@ ---- extensions/shell/BUILD.gn.orig 2020-05-18 11:01:17 UTC +--- extensions/shell/BUILD.gn.orig 2020-09-08 19:14:06 UTC +++ extensions/shell/BUILD.gn -@@ -193,7 +193,7 @@ source_set("app_shell_lib") { +@@ -195,7 +195,7 @@ source_set("app_shell_lib") { } } diff --git a/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc b/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc index 2d079b4a4239..50c15028cef7 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc +++ b/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/external_vk_image_backing.cc.orig 2020-07-07 21:58:16 UTC +--- gpu/command_buffer/service/external_vk_image_backing.cc.orig 2020-09-08 19:14:06 UTC +++ gpu/command_buffer/service/external_vk_image_backing.cc -@@ -29,7 +29,7 @@ +@@ -28,7 +28,7 @@ #include "ui/gl/gl_version_info.h" #include "ui/gl/scoped_binders.h" @@ -9,7 +9,7 @@ #include "gpu/command_buffer/service/external_vk_image_dawn_representation.h" #endif -@@ -503,7 +503,7 @@ std::unique_ptr<SharedImageRepresentationDawn> +@@ -484,7 +484,7 @@ std::unique_ptr<SharedImageRepresentationDawn> ExternalVkImageBacking::ProduceDawn(SharedImageManager* manager, MemoryTypeTracker* tracker, WGPUDevice wgpuDevice) { @@ -18,7 +18,7 @@ auto wgpu_format = viz::ToWGPUFormat(format()); if (wgpu_format == WGPUTextureFormat_Undefined) { -@@ -522,7 +522,7 @@ ExternalVkImageBacking::ProduceDawn(SharedImageManager +@@ -503,7 +503,7 @@ ExternalVkImageBacking::ProduceDawn(SharedImageManager return std::make_unique<ExternalVkImageDawnRepresentation>( manager, this, tracker, wgpuDevice, wgpu_format, std::move(memory_fd)); @@ -27,7 +27,7 @@ NOTIMPLEMENTED_LOG_ONCE(); return nullptr; #endif -@@ -535,7 +535,7 @@ GLuint ExternalVkImageBacking::ProduceGLTextureInterna +@@ -516,7 +516,7 @@ GLuint ExternalVkImageBacking::ProduceGLTextureInterna gl::GLApi* api = gl::g_current_gl_context; base::Optional<ScopedDedicatedMemoryObject> memory_object; if (!use_separate_gl_texture()) { diff --git a/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.h b/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.h index 70b970e2aab2..4b104bf6e874 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.h +++ b/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.h @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/external_vk_image_backing.h.orig 2020-05-13 18:40:32 UTC +--- gpu/command_buffer/service/external_vk_image_backing.h.orig 2020-09-08 19:14:06 UTC +++ gpu/command_buffer/service/external_vk_image_backing.h -@@ -151,7 +151,7 @@ class ExternalVkImageBacking final : public ClearTrack +@@ -154,7 +154,7 @@ class ExternalVkImageBacking final : public ClearTrack private: diff --git a/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__gl__representation.cc b/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__gl__representation.cc index 321531baa60d..a54ce2caef9b 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__gl__representation.cc +++ b/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__gl__representation.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/external_vk_image_gl_representation.cc.orig 2020-07-07 21:58:16 UTC +--- gpu/command_buffer/service/external_vk_image_gl_representation.cc.orig 2020-09-08 19:14:06 UTC +++ gpu/command_buffer/service/external_vk_image_gl_representation.cc -@@ -178,7 +178,7 @@ GLuint ExternalVkImageGLRepresentationShared::ImportVk +@@ -179,7 +179,7 @@ GLuint ExternalVkImageGLRepresentationShared::ImportVk SemaphoreHandle handle) { if (!handle.is_valid()) return 0; diff --git a/www/chromium/files/patch-gpu_command__buffer_tests_gl__copy__texture__CHROMIUM__unittest.cc b/www/chromium/files/patch-gpu_command__buffer_tests_gl__copy__texture__CHROMIUM__unittest.cc index efb8db3c0dc3..6dcca7ad642b 100644 --- a/www/chromium/files/patch-gpu_command__buffer_tests_gl__copy__texture__CHROMIUM__unittest.cc +++ b/www/chromium/files/patch-gpu_command__buffer_tests_gl__copy__texture__CHROMIUM__unittest.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc.orig 2020-03-16 18:39:51 UTC +--- gpu/command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc.orig 2020-09-08 19:14:06 UTC +++ gpu/command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc -@@ -642,7 +642,7 @@ class GLCopyTextureCHROMIUMES3Test : public GLCopyText +@@ -643,7 +643,7 @@ class GLCopyTextureCHROMIUMES3Test : public GLCopyText bool ShouldSkipNorm16() const { DCHECK(!ShouldSkipTest()); diff --git a/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc b/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc index 9867201456bf..9f906d6b31a2 100644 --- a/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc +++ b/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/tests/gl_test_utils.cc.orig 2020-03-16 18:39:51 UTC +--- gpu/command_buffer/tests/gl_test_utils.cc.orig 2020-09-08 19:14:06 UTC +++ gpu/command_buffer/tests/gl_test_utils.cc -@@ -23,7 +23,7 @@ +@@ -24,7 +24,7 @@ #include "ui/gl/gl_version_info.h" #include "ui/gl/init/gl_factory.h" @@ -9,7 +9,7 @@ #include "ui/gl/gl_image_native_pixmap.h" #endif -@@ -445,7 +445,7 @@ void GpuCommandBufferTestEGL::RestoreGLDefault() { +@@ -446,7 +446,7 @@ void GpuCommandBufferTestEGL::RestoreGLDefault() { window_system_binding_info_ = gl::GLWindowSystemBindingInfo(); } diff --git a/www/chromium/files/patch-gpu_config_gpu__control__list.cc b/www/chromium/files/patch-gpu_config_gpu__control__list.cc index 2001389bf837..ffe78718e36e 100644 --- a/www/chromium/files/patch-gpu_config_gpu__control__list.cc +++ b/www/chromium/files/patch-gpu_config_gpu__control__list.cc @@ -1,6 +1,6 @@ ---- gpu/config/gpu_control_list.cc.orig 2020-07-07 21:58:16 UTC +--- gpu/config/gpu_control_list.cc.orig 2020-09-08 19:14:06 UTC +++ gpu/config/gpu_control_list.cc -@@ -16,7 +16,11 @@ +@@ -17,7 +17,11 @@ #include "base/values.h" #include "build/build_config.h" #include "gpu/config/gpu_util.h" @@ -12,7 +12,7 @@ namespace gpu { namespace { -@@ -247,7 +251,7 @@ bool GpuControlList::More::GLVersionInfoMismatch( +@@ -275,7 +279,7 @@ bool GpuControlList::More::GLVersionInfoMismatch( GpuControlList::GLType GpuControlList::More::GetDefaultGLType() { #if defined(OS_CHROMEOS) return kGLTypeGL; @@ -21,7 +21,7 @@ return kGLTypeGL; #elif defined(OS_MACOSX) return kGLTypeGL; -@@ -748,7 +752,7 @@ GpuControlList::OsType GpuControlList::GetOsType() { +@@ -781,7 +785,7 @@ GpuControlList::OsType GpuControlList::GetOsType() { return kOsAndroid; #elif defined(OS_FUCHSIA) return kOsFuchsia; diff --git a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc index f33260dc9b3e..48e886d75137 100644 --- a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc +++ b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc @@ -1,6 +1,6 @@ ---- gpu/ipc/service/gpu_init.cc.orig 2020-07-07 21:58:16 UTC +--- gpu/ipc/service/gpu_init.cc.orig 2020-09-08 19:14:06 UTC +++ gpu/ipc/service/gpu_init.cc -@@ -92,7 +92,7 @@ void InitializePlatformOverlaySettings(GPUInfo* gpu_in +@@ -94,7 +94,7 @@ void InitializePlatformOverlaySettings(GPUInfo* gpu_in #endif } @@ -9,7 +9,7 @@ bool CanAccessNvidiaDeviceFile() { bool res = true; base::ScopedBlockingCall scoped_blocking_call(FROM_HERE, -@@ -103,7 +103,7 @@ bool CanAccessNvidiaDeviceFile() { +@@ -105,7 +105,7 @@ bool CanAccessNvidiaDeviceFile() { } return res; } @@ -18,7 +18,7 @@ class GpuWatchdogInit { public: -@@ -160,7 +160,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -178,7 +178,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL device_perf_info_ = device_perf_info; } @@ -27,7 +27,7 @@ if (gpu_info_.gpu.vendor_id == 0x10de && // NVIDIA gpu_info_.gpu.driver_vendor == "NVIDIA" && !CanAccessNvidiaDeviceFile()) return false; -@@ -212,7 +212,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -230,7 +230,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL delayed_watchdog_enable = true; #endif @@ -36,7 +36,7 @@ // PreSandbox is mainly for resource handling and not related to the GPU // driver, it doesn't need the GPU watchdog. The loadLibrary may take long // time that killing and restarting the GPU process will not help. -@@ -257,7 +257,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -275,7 +275,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } bool attempted_startsandbox = false; @@ -45,7 +45,7 @@ // On Chrome OS ARM Mali, GPU driver userspace creates threads when // initializing a GL context, so start the sandbox early. // TODO(zmo): Need to collect OS version before this. -@@ -266,7 +266,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -284,7 +284,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL watchdog_thread_.get(), &gpu_info_, gpu_preferences_); attempted_startsandbox = true; } @@ -54,9 +54,9 @@ base::TimeTicks before_initialize_one_off = base::TimeTicks::Now(); -@@ -289,14 +289,14 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -307,14 +307,14 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } - if (gl_initialized && use_swiftshader && + if (gl_initialized && gl_use_swiftshader_ && gl::GetGLImplementation() != gl::kGLImplementationSwiftShaderGL) { -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) @@ -71,34 +71,34 @@ } if (!gl_initialized) { -@@ -322,7 +322,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -340,7 +340,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } } -#if defined(OS_LINUX) +#if defined(OS_LINUX) && !defined(OS_BSD) // The ContentSandboxHelper is currently the only one implementation of - // gpu::GpuSandboxHelper and it has no dependency. Except on Linux where + // GpuSandboxHelper and it has no dependency. Except on Linux where // VaapiWrapper checks the GL implementation to determine which display -@@ -373,7 +373,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -392,7 +392,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL command_line, gpu_feature_info_, gpu_preferences_.disable_software_rasterizer, false); - if (use_swiftshader) { + if (gl_use_swiftshader_) { -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly " << "on Linux"; return false; -@@ -387,7 +387,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -406,7 +406,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL << "failed"; return false; } -#endif // OS_LINUX +#endif // OS_LINUX || OS_BSD } - } else { // use_swiftshader == true + } else { // gl_use_swiftshader_ == true switch (gpu_preferences_.use_vulkan) { -@@ -443,7 +443,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -482,7 +482,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL InitializePlatformOverlaySettings(&gpu_info_); @@ -107,16 +107,16 @@ // Driver may create a compatibility profile context when collect graphics // information on Linux platform. Try to collect graphics information // based on core profile context after disabling platform extensions. -@@ -462,7 +462,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -501,7 +501,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL return false; } } -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) - if (use_swiftshader) { + if (gl_use_swiftshader_) { AdjustInfoToSwiftShader(); -@@ -628,7 +628,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -667,7 +667,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c InitializePlatformOverlaySettings(&gpu_info_); @@ -125,12 +125,12 @@ // Driver may create a compatibility profile context when collect graphics // information on Linux platform. Try to collect graphics information // based on core profile context after disabling platform extensions. -@@ -648,7 +648,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -687,7 +687,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c } } } -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) - if (use_swiftshader) { + if (gl_use_swiftshader_) { AdjustInfoToSwiftShader(); diff --git a/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc b/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc index 9cd7f68d1d12..e7b7d00ffd1a 100644 --- a/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc +++ b/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc @@ -1,15 +1,15 @@ ---- gpu/ipc/service/gpu_watchdog_thread.cc.orig 2020-05-13 18:39:44 UTC +--- gpu/ipc/service/gpu_watchdog_thread.cc.orig 2020-09-08 19:14:06 UTC +++ gpu/ipc/service/gpu_watchdog_thread.cc -@@ -64,7 +64,7 @@ void GpuWatchdogTimeoutHistogram(GpuWatchdogTimeoutEve - base::UmaHistogramEnumeration("GPU.WatchdogThread.V1.Timeout", timeout_event); - } +@@ -54,7 +54,7 @@ const int kNewGpuTimeout = 17000; + const int kNewGpuTimeout = 15000; + #endif -#if defined(USE_X11) +#if defined(USE_X11) && !defined(OS_BSD) const base::FilePath::CharType kTtyFilePath[] = FILE_PATH_LITERAL("/sys/class/tty/tty0/active"); #endif -@@ -82,7 +82,7 @@ GpuWatchdogThreadImplV1::GpuWatchdogThreadImplV1() +@@ -72,7 +72,7 @@ GpuWatchdogThreadImplV1::GpuWatchdogThreadImplV1() arm_cpu_time_(), #endif suspension_counter_(this) @@ -18,7 +18,7 @@ , host_tty_(-1) #endif -@@ -104,7 +104,7 @@ GpuWatchdogThreadImplV1::GpuWatchdogThreadImplV1() +@@ -94,7 +94,7 @@ GpuWatchdogThreadImplV1::GpuWatchdogThreadImplV1() DCHECK(result); #endif @@ -27,7 +27,7 @@ tty_file_ = base::OpenFile(base::FilePath(kTtyFilePath), "r"); UpdateActiveTTY(); host_tty_ = active_tty_; -@@ -252,7 +252,7 @@ GpuWatchdogThreadImplV1::~GpuWatchdogThreadImplV1() { +@@ -236,7 +236,7 @@ GpuWatchdogThreadImplV1::~GpuWatchdogThreadImplV1() { base::PowerMonitor::RemoveObserver(this); @@ -36,7 +36,7 @@ if (tty_file_) fclose(tty_file_); #endif -@@ -435,7 +435,7 @@ void GpuWatchdogThreadImplV1::DeliberatelyTerminateToR +@@ -385,7 +385,7 @@ void GpuWatchdogThreadImplV1::DeliberatelyTerminateToR return; #endif @@ -45,7 +45,7 @@ // Don't crash if we're not on the TTY of our host X11 server. UpdateActiveTTY(); if (host_tty_ != -1 && active_tty_ != -1 && host_tty_ != active_tty_) { -@@ -610,7 +610,7 @@ base::ThreadTicks GpuWatchdogThreadImplV1::GetWatchedT +@@ -541,7 +541,7 @@ base::ThreadTicks GpuWatchdogThreadImplV1::GetWatchedT } #endif diff --git a/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h b/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h index efcc11f3008d..6147f449647c 100644 --- a/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h +++ b/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h @@ -1,6 +1,6 @@ ---- gpu/ipc/service/gpu_watchdog_thread.h.orig 2020-07-07 21:58:16 UTC +--- gpu/ipc/service/gpu_watchdog_thread.h.orig 2020-09-08 19:14:06 UTC +++ gpu/ipc/service/gpu_watchdog_thread.h -@@ -216,7 +216,7 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThreadImplV1 +@@ -213,7 +213,7 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThreadImplV1 base::ThreadTicks GetWatchedThreadTime(); #endif @@ -9,9 +9,9 @@ void UpdateActiveTTY(); #endif -@@ -274,7 +274,7 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThreadImplV1 - // whether GpuWatchdogThreadEvent::kGpuWatchdogStart has been recorded. - bool is_watchdog_start_histogram_recorded = false; +@@ -261,7 +261,7 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThreadImplV1 + base::Time check_time_; + base::TimeTicks check_timeticks_; -#if defined(USE_X11) +#if defined(USE_X11) && !defined(OS_BSD) diff --git a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc index e9e398152dbe..31d76c921b0b 100644 --- a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc +++ b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc @@ -1,4 +1,4 @@ ---- gpu/vulkan/vulkan_function_pointers.cc.orig 2020-07-07 21:58:16 UTC +--- gpu/vulkan/vulkan_function_pointers.cc.orig 2020-09-08 19:14:06 UTC +++ gpu/vulkan/vulkan_function_pointers.cc @@ -862,7 +862,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer } @@ -8,7 +8,7 @@ +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) if (gfx::HasExtension(enabled_extensions, VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME)) { - vkGetSemaphoreFdKHRFn = reinterpret_cast<PFN_vkGetSemaphoreFdKHR>( + vkGetSemaphoreFdKHR = reinterpret_cast<PFN_vkGetSemaphoreFdKHR>( @@ -881,7 +881,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer return false; } @@ -26,7 +26,7 @@ +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) if (gfx::HasExtension(enabled_extensions, VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME)) { - vkGetMemoryFdKHRFn = reinterpret_cast<PFN_vkGetMemoryFdKHR>( + vkGetMemoryFdKHR = reinterpret_cast<PFN_vkGetMemoryFdKHR>( @@ -926,7 +926,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer return false; } diff --git a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h index 22094637bcf5..e6c38ccd4bfa 100644 --- a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h +++ b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h @@ -1,32 +1,32 @@ ---- gpu/vulkan/vulkan_function_pointers.h.orig 2020-07-07 21:58:16 UTC +--- gpu/vulkan/vulkan_function_pointers.h.orig 2020-09-08 19:14:06 UTC +++ gpu/vulkan/vulkan_function_pointers.h -@@ -235,10 +235,10 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers - vkGetAndroidHardwareBufferPropertiesANDROIDFn; +@@ -234,10 +234,10 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers + vkGetAndroidHardwareBufferPropertiesANDROID; #endif // defined(OS_ANDROID) -#if defined(OS_LINUX) || defined(OS_ANDROID) +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) - VulkanFunction<PFN_vkGetSemaphoreFdKHR> vkGetSemaphoreFdKHRFn; - VulkanFunction<PFN_vkImportSemaphoreFdKHR> vkImportSemaphoreFdKHRFn; + VulkanFunction<PFN_vkGetSemaphoreFdKHR> vkGetSemaphoreFdKHR; + VulkanFunction<PFN_vkImportSemaphoreFdKHR> vkImportSemaphoreFdKHR; -#endif // defined(OS_LINUX) || defined(OS_ANDROID) +#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) #if defined(OS_WIN) - VulkanFunction<PFN_vkGetSemaphoreWin32HandleKHR> -@@ -247,10 +247,10 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers - vkImportSemaphoreWin32HandleKHRFn; + VulkanFunction<PFN_vkGetSemaphoreWin32HandleKHR> vkGetSemaphoreWin32HandleKHR; +@@ -245,10 +245,10 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers + vkImportSemaphoreWin32HandleKHR; #endif // defined(OS_WIN) -#if defined(OS_LINUX) || defined(OS_ANDROID) +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) - VulkanFunction<PFN_vkGetMemoryFdKHR> vkGetMemoryFdKHRFn; - VulkanFunction<PFN_vkGetMemoryFdPropertiesKHR> vkGetMemoryFdPropertiesKHRFn; + VulkanFunction<PFN_vkGetMemoryFdKHR> vkGetMemoryFdKHR; + VulkanFunction<PFN_vkGetMemoryFdPropertiesKHR> vkGetMemoryFdPropertiesKHR; -#endif // defined(OS_LINUX) || defined(OS_ANDROID) +#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) #if defined(OS_WIN) - VulkanFunction<PFN_vkGetMemoryWin32HandleKHR> vkGetMemoryWin32HandleKHRFn; -@@ -950,7 +950,7 @@ ALWAYS_INLINE VkResult vkGetAndroidHardwareBufferPrope + VulkanFunction<PFN_vkGetMemoryWin32HandleKHR> vkGetMemoryWin32HandleKHR; +@@ -953,7 +953,7 @@ ALWAYS_INLINE VkResult vkGetAndroidHardwareBufferPrope } #endif // defined(OS_ANDROID) @@ -35,8 +35,8 @@ ALWAYS_INLINE VkResult vkGetSemaphoreFdKHR(VkDevice device, const VkSemaphoreGetFdInfoKHR* pGetFdInfo, -@@ -964,7 +964,7 @@ ALWAYS_INLINE VkResult vkImportSemaphoreFdKHR( - return gpu::GetVulkanFunctionPointers()->vkImportSemaphoreFdKHRFn( +@@ -967,7 +967,7 @@ ALWAYS_INLINE VkResult vkImportSemaphoreFdKHR( + return gpu::GetVulkanFunctionPointers()->vkImportSemaphoreFdKHR( device, pImportSemaphoreFdInfo); } -#endif // defined(OS_LINUX) || defined(OS_ANDROID) @@ -44,7 +44,7 @@ #if defined(OS_WIN) ALWAYS_INLINE VkResult vkGetSemaphoreWin32HandleKHR( -@@ -983,7 +983,7 @@ vkImportSemaphoreWin32HandleKHR(VkDevice device, +@@ -986,7 +986,7 @@ vkImportSemaphoreWin32HandleKHR(VkDevice device, } #endif // defined(OS_WIN) @@ -53,8 +53,8 @@ ALWAYS_INLINE VkResult vkGetMemoryFdKHR(VkDevice device, const VkMemoryGetFdInfoKHR* pGetFdInfo, int* pFd) { -@@ -998,7 +998,7 @@ vkGetMemoryFdPropertiesKHR(VkDevice device, - return gpu::GetVulkanFunctionPointers()->vkGetMemoryFdPropertiesKHRFn( +@@ -1001,7 +1001,7 @@ vkGetMemoryFdPropertiesKHR(VkDevice device, + return gpu::GetVulkanFunctionPointers()->vkGetMemoryFdPropertiesKHR( device, handleType, fd, pMemoryFdProperties); } -#endif // defined(OS_LINUX) || defined(OS_ANDROID) @@ -62,8 +62,8 @@ #if defined(OS_WIN) ALWAYS_INLINE VkResult vkGetMemoryWin32HandleKHR( -@@ -1079,4 +1079,4 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR(VkQueue queue - pPresentInfo); +@@ -1081,4 +1081,4 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR(VkQueue queue + pPresentInfo); } -#endif // GPU_VULKAN_VULKAN_FUNCTION_POINTERS_H_ diff --git a/www/chromium/files/patch-headless_BUILD.gn b/www/chromium/files/patch-headless_BUILD.gn index 3cf1b71d4df7..558481555ab1 100644 --- a/www/chromium/files/patch-headless_BUILD.gn +++ b/www/chromium/files/patch-headless_BUILD.gn @@ -1,6 +1,6 @@ ---- headless/BUILD.gn.orig 2020-07-07 21:58:16 UTC +--- headless/BUILD.gn.orig 2020-09-08 19:14:06 UTC +++ headless/BUILD.gn -@@ -264,7 +264,7 @@ source_set("headless_shared_sources") { +@@ -268,7 +268,7 @@ source_set("headless_shared_sources") { sources += generated_devtools_api sources += get_target_outputs(":protocol_sources") @@ -9,7 +9,7 @@ sources += [ "lib/headless_crash_reporter_client.cc", "lib/headless_crash_reporter_client.h", -@@ -284,7 +284,7 @@ source_set("headless_shared_sources") { +@@ -288,7 +288,7 @@ source_set("headless_shared_sources") { "//url", ] @@ -18,7 +18,7 @@ deps += [ "//components/crash/content/browser" ] } if (is_component_build && is_win) { -@@ -435,7 +435,7 @@ component("headless_non_renderer") { +@@ -441,7 +441,7 @@ component("headless_non_renderer") { "//v8", ] @@ -27,7 +27,7 @@ deps += [ "//components/crash/content/browser" ] } if (is_win) { -@@ -710,7 +710,7 @@ static_library("headless_shell_lib") { +@@ -721,7 +721,7 @@ static_library("headless_shell_lib") { public_deps += [ ":headless_non_renderer" ] } diff --git a/www/chromium/files/patch-headless_lib_browser_headless__browser__main__parts.h b/www/chromium/files/patch-headless_lib_browser_headless__browser__main__parts.h new file mode 100644 index 000000000000..4c489ef5793f --- /dev/null +++ b/www/chromium/files/patch-headless_lib_browser_headless__browser__main__parts.h @@ -0,0 +1,11 @@ +--- headless/lib/browser/headless_browser_main_parts.h.orig 2020-09-21 18:39:18 UTC ++++ headless/lib/browser/headless_browser_main_parts.h +@@ -32,7 +32,7 @@ class HeadlessBrowserMainParts : public content::Brows + #if defined(OS_MACOSX) + void PreMainMessageLoopStart() override; + #endif +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + void PostMainMessageLoopStart() override; + #endif + void QuitMainMessageLoop(); diff --git a/www/chromium/files/patch-headless_lib_browser_headless__browser__main__parts__linux.cc b/www/chromium/files/patch-headless_lib_browser_headless__browser__main__parts__linux.cc new file mode 100644 index 000000000000..ec406e47d11b --- /dev/null +++ b/www/chromium/files/patch-headless_lib_browser_headless__browser__main__parts__linux.cc @@ -0,0 +1,11 @@ +--- headless/lib/browser/headless_browser_main_parts_linux.cc.orig 2020-09-08 19:14:06 UTC ++++ headless/lib/browser/headless_browser_main_parts_linux.cc +@@ -10,7 +10,7 @@ + namespace headless { + + void HeadlessBrowserMainParts::PostMainMessageLoopStart() { +-#if defined(USE_DBUS) && !defined(OS_CHROMEOS) ++#if defined(USE_DBUS) && !defined(OS_CHROMEOS) && !defined(OS_BSD) + bluez::BluezDBusManager::Initialize(/*system_bus=*/nullptr); + #endif + } diff --git a/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc b/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc index 5c79311cf636..8a9d8fe30032 100644 --- a/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc +++ b/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc @@ -1,6 +1,6 @@ ---- headless/lib/browser/headless_request_context_manager.cc.orig 2020-07-07 21:58:16 UTC +--- headless/lib/browser/headless_request_context_manager.cc.orig 2020-09-08 19:14:06 UTC +++ headless/lib/browser/headless_request_context_manager.cc -@@ -27,7 +27,7 @@ namespace headless { +@@ -26,7 +26,7 @@ namespace headless { namespace { @@ -9,7 +9,7 @@ constexpr char kProductName[] = "HeadlessChrome"; #endif -@@ -57,7 +57,7 @@ net::NetworkTrafficAnnotationTag GetProxyConfigTraffic +@@ -56,7 +56,7 @@ net::NetworkTrafficAnnotationTag GetProxyConfigTraffic return traffic_annotation; } @@ -18,7 +18,7 @@ ::network::mojom::CryptConfigPtr BuildCryptConfigOnce( const base::FilePath& user_data_path) { static bool done_once = false; -@@ -215,7 +215,7 @@ HeadlessRequestContextManager::HeadlessRequestContextM +@@ -213,7 +213,7 @@ HeadlessRequestContextManager::HeadlessRequestContextM proxy_config_monitor_ = std::make_unique<HeadlessProxyConfigMonitor>( base::ThreadTaskRunnerHandle::Get()); } diff --git a/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc b/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc index 8b7349c15ece..d52baf5c996f 100644 --- a/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc +++ b/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc @@ -1,6 +1,6 @@ ---- headless/lib/headless_content_main_delegate.cc.orig 2020-07-07 21:58:16 UTC +--- headless/lib/headless_content_main_delegate.cc.orig 2020-09-08 19:14:06 UTC +++ headless/lib/headless_content_main_delegate.cc -@@ -317,7 +317,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( +@@ -324,7 +324,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( const base::CommandLine& command_line) { if (command_line.HasSwitch(::switches::kDisableBreakpad)) return; @@ -9,7 +9,7 @@ // TODO(fuchsia): Implement this when crash reporting/Breakpad are available // in Fuchsia. (crbug.com/753619) NOTIMPLEMENTED(); -@@ -346,7 +346,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( +@@ -353,7 +353,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( crash_reporter::InitializeCrashpadWithEmbeddedHandler( process_type.empty(), process_type, "", base::FilePath()); #endif // defined(HEADLESS_USE_BREAKPAD) @@ -18,7 +18,7 @@ } -@@ -398,7 +398,7 @@ int HeadlessContentMainDelegate::RunProcess( +@@ -405,7 +405,7 @@ int HeadlessContentMainDelegate::RunProcess( return 0; } @@ -27,7 +27,7 @@ void SIGTERMProfilingShutdown(int signal) { content::Profiling::Stop(); struct sigaction sigact; -@@ -433,7 +433,7 @@ void HeadlessContentMainDelegate::ZygoteForked() { +@@ -440,7 +440,7 @@ void HeadlessContentMainDelegate::ZygoteForked() { breakpad::InitCrashReporter(process_type); #endif } diff --git a/www/chromium/files/patch-ipc_ipc__channel.h b/www/chromium/files/patch-ipc_ipc__channel.h index 81baee2eca8d..64dc5f980629 100644 --- a/www/chromium/files/patch-ipc_ipc__channel.h +++ b/www/chromium/files/patch-ipc_ipc__channel.h @@ -1,6 +1,6 @@ ---- ipc/ipc_channel.h.orig 2020-02-03 21:53:32 UTC +--- ipc/ipc_channel.h.orig 2020-09-08 19:14:07 UTC +++ ipc/ipc_channel.h -@@ -282,7 +282,7 @@ class COMPONENT_EXPORT(IPC) Channel : public Sender { +@@ -244,7 +244,7 @@ class COMPONENT_EXPORT(IPC) Channel : public Sender { static std::string GenerateUniqueRandomChannelID(); #endif diff --git a/www/chromium/files/patch-ipc_ipc__message__utils.cc b/www/chromium/files/patch-ipc_ipc__message__utils.cc index 00d57043fb58..b43c0f6f3c68 100644 --- a/www/chromium/files/patch-ipc_ipc__message__utils.cc +++ b/www/chromium/files/patch-ipc_ipc__message__utils.cc @@ -1,6 +1,6 @@ ---- ipc/ipc_message_utils.cc.orig 2019-07-24 18:58:29 UTC +--- ipc/ipc_message_utils.cc.orig 2020-09-08 19:14:07 UTC +++ ipc/ipc_message_utils.cc -@@ -355,7 +355,7 @@ void ParamTraits<unsigned int>::Log(const param_type& +@@ -356,7 +356,7 @@ void ParamTraits<unsigned int>::Log(const param_type& l->append(base::NumberToString(p)); } diff --git a/www/chromium/files/patch-media_audio_audio__input__device.cc b/www/chromium/files/patch-media_audio_audio__input__device.cc index 59aaa7fab815..e21c86dd5f36 100644 --- a/www/chromium/files/patch-media_audio_audio__input__device.cc +++ b/www/chromium/files/patch-media_audio_audio__input__device.cc @@ -1,9 +1,9 @@ ---- media/audio/audio_input_device.cc.orig 2020-07-07 21:58:16 UTC +--- media/audio/audio_input_device.cc.orig 2020-09-08 19:14:07 UTC +++ media/audio/audio_input_device.cc -@@ -247,7 +247,7 @@ void AudioInputDevice::OnStreamCreated( - // also a risk of false positives if we are suspending when starting the stream +@@ -253,7 +253,7 @@ void AudioInputDevice::OnStreamCreated( // here. See comments in AliveChecker and PowerObserverHelper for details and // todos. + if (detect_dead_stream_ == DeadStreamDetection::kEnabled) { -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) const bool stop_at_first_alive_notification = true; diff --git a/www/chromium/files/patch-media_base_media__switches.cc b/www/chromium/files/patch-media_base_media__switches.cc index d04079357bca..3f870d49cca3 100644 --- a/www/chromium/files/patch-media_base_media__switches.cc +++ b/www/chromium/files/patch-media_base_media__switches.cc @@ -1,6 +1,6 @@ ---- media/base/media_switches.cc.orig 2020-07-07 21:58:16 UTC +--- media/base/media_switches.cc.orig 2020-09-08 19:14:07 UTC +++ media/base/media_switches.cc -@@ -343,7 +343,7 @@ const base::Feature kGav1VideoDecoder{"Gav1VideoDecode +@@ -354,7 +354,7 @@ const base::Feature kGav1VideoDecoder{"Gav1VideoDecode const base::Feature kGlobalMediaControls { "GlobalMediaControls", #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -9,8 +9,8 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -368,7 +368,7 @@ const base::Feature kGlobalMediaControlsOverlayControl - const base::Feature kGlobalMediaControlsPictureInPicture{ +@@ -379,7 +379,7 @@ const base::Feature kGlobalMediaControlsOverlayControl + const base::Feature kGlobalMediaControlsPictureInPicture { "GlobalMediaControlsPictureInPicture", #if defined(OS_WIN) || defined(OS_MACOSX) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) diff --git a/www/chromium/files/patch-media_base_video__frame.cc b/www/chromium/files/patch-media_base_video__frame.cc index 8e84e08c288c..cde1851f2975 100644 --- a/www/chromium/files/patch-media_base_video__frame.cc +++ b/www/chromium/files/patch-media_base_video__frame.cc @@ -1,4 +1,4 @@ ---- media/base/video_frame.cc.orig 2020-05-13 18:39:45 UTC +--- media/base/video_frame.cc.orig 2020-09-08 19:14:07 UTC +++ media/base/video_frame.cc @@ -57,7 +57,7 @@ std::string VideoFrame::StorageTypeToString( return "OWNED_MEMORY"; @@ -36,7 +36,7 @@ // static bool VideoFrame::IsValidConfig(VideoPixelFormat format, -@@ -590,7 +590,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM +@@ -589,7 +589,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM return frame; } @@ -45,7 +45,7 @@ // static scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs( const VideoFrameLayout& layout, -@@ -726,7 +726,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame( +@@ -725,7 +725,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame( } } @@ -54,7 +54,7 @@ DCHECK(frame->dmabuf_fds_); // If there are any |dmabuf_fds_| plugged in, we should refer them too. wrapping_frame->dmabuf_fds_ = frame->dmabuf_fds_; -@@ -1059,7 +1059,7 @@ VideoFrame::mailbox_holder(size_t texture_index) const +@@ -1058,7 +1058,7 @@ VideoFrame::mailbox_holder(size_t texture_index) const : mailbox_holders_[texture_index]; } @@ -63,7 +63,7 @@ const std::vector<base::ScopedFD>& VideoFrame::DmabufFds() const { DCHECK_EQ(storage_type_, STORAGE_DMABUFS); -@@ -1142,7 +1142,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout, +@@ -1141,7 +1141,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout, storage_type_(storage_type), visible_rect_(Intersection(visible_rect, gfx::Rect(layout.coded_size()))), natural_size_(natural_size), diff --git a/www/chromium/files/patch-media_base_video__frame.h b/www/chromium/files/patch-media_base_video__frame.h index 4606b563e730..f7bdcf27d028 100644 --- a/www/chromium/files/patch-media_base_video__frame.h +++ b/www/chromium/files/patch-media_base_video__frame.h @@ -1,4 +1,4 @@ ---- media/base/video_frame.h.orig 2020-07-07 21:58:16 UTC +--- media/base/video_frame.h.orig 2020-09-08 19:14:07 UTC +++ media/base/video_frame.h @@ -40,9 +40,9 @@ #include "base/mac/scoped_cftyperef.h" @@ -39,7 +39,7 @@ // Returns a vector containing the backing DmaBufs for this frame. The number // of returned DmaBufs will be equal or less than the number of planes of // the frame. If there are less, this means that the last FD contains the -@@ -663,7 +663,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -671,7 +671,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte // GPU memory buffer, if this frame is STORAGE_GPU_MEMORY_BUFFER. std::unique_ptr<gfx::GpuMemoryBuffer> gpu_memory_buffer_; diff --git a/www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc b/www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc index 76d95eebd304..d0e412817562 100644 --- a/www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc +++ b/www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc @@ -1,4 +1,4 @@ ---- media/capture/video/fake_video_capture_device_factory.cc.orig 2019-12-16 21:50:49 UTC +--- media/capture/video/fake_video_capture_device_factory.cc.orig 2020-09-08 19:14:07 UTC +++ media/capture/video/fake_video_capture_device_factory.cc @@ -208,7 +208,7 @@ void FakeVideoCaptureDeviceFactory::GetDeviceDescripto for (const auto& entry : devices_config_) { @@ -6,6 +6,6 @@ base::StringPrintf("fake_device_%d", entry_index), entry.device_id, -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - VideoCaptureApi::LINUX_V4L2_SINGLE_PLANE + VideoCaptureApi::LINUX_V4L2_SINGLE_PLANE, #elif defined(OS_MACOSX) - VideoCaptureApi::MACOSX_AVFOUNDATION + VideoCaptureApi::MACOSX_AVFOUNDATION, diff --git a/www/chromium/files/patch-media_formats_common_offset__byte__queue.cc b/www/chromium/files/patch-media_formats_common_offset__byte__queue.cc index 38994431f986..caa688a346c6 100644 --- a/www/chromium/files/patch-media_formats_common_offset__byte__queue.cc +++ b/www/chromium/files/patch-media_formats_common_offset__byte__queue.cc @@ -1,6 +1,6 @@ ---- media/formats/common/offset_byte_queue.cc.orig 2019-03-11 22:00:59 UTC +--- media/formats/common/offset_byte_queue.cc.orig 2020-09-08 19:14:07 UTC +++ media/formats/common/offset_byte_queue.cc -@@ -46,13 +46,13 @@ void OffsetByteQueue::PeekAt(int64_t offset, const uin +@@ -47,13 +47,13 @@ void OffsetByteQueue::PeekAt(int64_t offset, const uin *size = tail() - offset; } diff --git a/www/chromium/files/patch-media_media__options.gni b/www/chromium/files/patch-media_media__options.gni index a8d84a5ba3eb..e2e80c1a5eef 100644 --- a/www/chromium/files/patch-media_media__options.gni +++ b/www/chromium/files/patch-media_media__options.gni @@ -1,6 +1,6 @@ ---- media/media_options.gni.orig 2020-07-07 21:58:16 UTC +--- media/media_options.gni.orig 2020-09-08 19:14:07 UTC +++ media/media_options.gni -@@ -120,6 +120,9 @@ declare_args() { +@@ -119,6 +119,9 @@ declare_args() { # Enables runtime selection of ALSA library for audio. use_alsa = false diff --git a/www/chromium/files/patch-media_video_fake__gpu__memory__buffer.cc b/www/chromium/files/patch-media_video_fake__gpu__memory__buffer.cc index 684c9adbd4b4..d675247bbc2a 100644 --- a/www/chromium/files/patch-media_video_fake__gpu__memory__buffer.cc +++ b/www/chromium/files/patch-media_video_fake__gpu__memory__buffer.cc @@ -1,15 +1,15 @@ ---- media/video/fake_gpu_memory_buffer.cc.orig 2019-12-17 19:43:52 UTC +--- media/video/fake_gpu_memory_buffer.cc.orig 2020-09-08 19:14:07 UTC +++ media/video/fake_gpu_memory_buffer.cc -@@ -6,7 +6,7 @@ - - #include "build/build_config.h" +@@ -10,7 +10,7 @@ + #include "media/base/format_utils.h" + #include "media/base/video_frame.h" -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) #include <fcntl.h> #include <sys/stat.h> #include <sys/types.h> -@@ -44,7 +44,7 @@ class FakeGpuMemoryBufferImpl : public gpu::GpuMemoryB +@@ -48,7 +48,7 @@ class FakeGpuMemoryBufferImpl : public gpu::GpuMemoryB } // namespace @@ -18,25 +18,25 @@ base::ScopedFD GetDummyFD() { base::ScopedFD fd(open("/dev/zero", O_RDWR)); DCHECK(fd.is_valid()); -@@ -67,7 +67,7 @@ FakeGpuMemoryBuffer::FakeGpuMemoryBuffer(const gfx::Si - // Set a dummy id since this is for testing only. - handle_.id = gfx::GpuMemoryBufferId(0); +@@ -73,7 +73,7 @@ FakeGpuMemoryBuffer::FakeGpuMemoryBuffer(const gfx::Si + static base::NoDestructor<base::AtomicSequenceNumber> buffer_id_generator; + handle_.id = gfx::GpuMemoryBufferId(buffer_id_generator->GetNext()); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - // Set a dummy fd since this is for testing only. - handle_.native_pixmap_handle.planes.push_back( - gfx::NativePixmapPlane(size_.width(), 0, y_plane_size, GetDummyFD())); -@@ -76,7 +76,7 @@ FakeGpuMemoryBuffer::FakeGpuMemoryBuffer(const gfx::Si - size_.width(), handle_.native_pixmap_handle.planes[0].size, - uv_plane_size, GetDummyFD())); + for (size_t i = 0; i < VideoFrame::NumPlanes(video_pixel_format_); i++) { + const gfx::Size plane_size_in_bytes = + VideoFrame::PlaneSize(video_pixel_format_, i, size_); +@@ -81,7 +81,7 @@ FakeGpuMemoryBuffer::FakeGpuMemoryBuffer(const gfx::Si + plane_size_in_bytes.width(), 0, plane_size_in_bytes.GetArea(), + GetDummyFD()); } -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) } FakeGpuMemoryBuffer::~FakeGpuMemoryBuffer() = default; -@@ -135,7 +135,7 @@ gfx::GpuMemoryBufferHandle FakeGpuMemoryBuffer::CloneH +@@ -129,7 +129,7 @@ gfx::GpuMemoryBufferHandle FakeGpuMemoryBuffer::CloneH gfx::GpuMemoryBufferHandle handle; handle.type = gfx::NATIVE_PIXMAP; handle.id = handle_.id; diff --git a/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc b/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc index 3941ed5af217..b0ebec300959 100644 --- a/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc +++ b/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc @@ -1,6 +1,6 @@ ---- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2020-02-03 21:53:32 UTC +--- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2020-09-08 19:14:07 UTC +++ media/video/gpu_memory_buffer_video_frame_pool.cc -@@ -572,7 +572,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa +@@ -573,7 +573,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa } bool is_software_backed_video_frame = !video_frame->HasTextures(); diff --git a/www/chromium/files/patch-mojo_public_c_system_thunks.cc b/www/chromium/files/patch-mojo_public_c_system_thunks.cc index dec03d588689..e1adc8b60375 100644 --- a/www/chromium/files/patch-mojo_public_c_system_thunks.cc +++ b/www/chromium/files/patch-mojo_public_c_system_thunks.cc @@ -1,49 +1,46 @@ ---- mojo/public/c/system/thunks.cc.orig 2020-02-03 21:52:48 UTC +--- mojo/public/c/system/thunks.cc.orig 2020-09-08 19:14:08 UTC +++ mojo/public/c/system/thunks.cc -@@ -15,7 +15,7 @@ - #include "build/build_config.h" +@@ -20,7 +20,7 @@ #include "mojo/public/c/system/core.h" + #include "mojo/public/c/system/macros.h" -#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) +#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) #include "base/environment.h" #include "base/files/file_path.h" #include "base/optional.h" -@@ -58,7 +58,7 @@ namespace mojo { - class CoreLibraryInitializer { - public: - CoreLibraryInitializer(const MojoInitializeOptions* options) { +@@ -68,7 +68,7 @@ class CoreLibraryInitializer { + ~CoreLibraryInitializer() = default; + + MojoResult LoadLibrary(base::FilePath library_path) { -#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) +#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) - bool application_provided_path = false; - base::Optional<base::FilePath> library_path; - if (options && options->struct_size >= sizeof(*options) && -@@ -77,7 +77,7 @@ class CoreLibraryInitializer { + if (library_ && library_->is_valid()) + return MOJO_RESULT_OK; + +@@ -82,7 +82,7 @@ class CoreLibraryInitializer { - if (!library_path) { + if (library_path.empty()) { // Default to looking for the library in the current working directory. -#if defined(OS_CHROMEOS) || defined(OS_LINUX) +#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) const base::FilePath::CharType kDefaultLibraryPathValue[] = FILE_PATH_LITERAL("./libmojo_core.so"); #elif defined(OS_WIN) -@@ -127,16 +127,16 @@ class CoreLibraryInitializer { +@@ -126,13 +126,13 @@ class CoreLibraryInitializer { - CHECK_GT(g_thunks.size, 0u) - << "Invalid mojo_core library: " << library_path->value(); --#else // defined(OS_CHROMEOS) || defined(OS_LINUX) -+#else // defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) - NOTREACHED() - << "Dynamic mojo_core loading is not supported on this platform."; --#endif // defined(OS_CHROMEOS) || defined(OS_LINUX) -+#endif // defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) + library_ = std::move(library); + return MOJO_RESULT_OK; +-#else // defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) ++#else // defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) + return MOJO_RESULT_UNIMPLEMENTED; +-#endif // defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) ++#endif // defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) } - ~CoreLibraryInitializer() = default; - private: -#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) +#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) base::Optional<base::ScopedNativeLibrary> library_; #endif - + }; diff --git a/www/chromium/files/patch-net_BUILD.gn b/www/chromium/files/patch-net_BUILD.gn index 0793a036c42e..95db38d89687 100644 --- a/www/chromium/files/patch-net_BUILD.gn +++ b/www/chromium/files/patch-net_BUILD.gn @@ -1,6 +1,6 @@ ---- net/BUILD.gn.orig 2020-07-07 21:58:16 UTC +--- net/BUILD.gn.orig 2020-09-08 19:14:08 UTC +++ net/BUILD.gn -@@ -103,7 +103,7 @@ net_configs = [ +@@ -99,7 +99,7 @@ net_configs = [ "//build/config/compiler:wexit_time_destructors", ] @@ -9,7 +9,7 @@ net_configs += [ "//build/config/linux:libresolv" ] } -@@ -1251,6 +1251,16 @@ component("net") { +@@ -1253,6 +1253,16 @@ component("net") { ] } @@ -26,7 +26,7 @@ if (is_mac) { sources += [ "base/network_notification_thread_mac.cc", -@@ -1381,7 +1391,7 @@ component("net") { +@@ -1383,7 +1393,7 @@ component("net") { } } @@ -35,12 +35,12 @@ sources += [ "base/network_change_notifier_posix.cc", "base/network_change_notifier_posix.h", -@@ -1414,7 +1424,7 @@ component("net") { +@@ -1416,7 +1426,7 @@ component("net") { } - # Use getifaddrs() on POSIX platforms, except Linux and Android. -- if (is_posix && !is_linux && !is_android) { -+ if (is_posix && ((!is_linux && !is_android) || (is_bsd))) { + # Use getifaddrs() on POSIX platforms, except Linux. +- if (is_posix && !is_linux) { ++ if (is_posix && (!is_linux || is_bsd)) { sources += [ "base/network_interfaces_getifaddrs.cc", "base/network_interfaces_getifaddrs.h", diff --git a/www/chromium/files/patch-net_base_address__tracker__linux.cc b/www/chromium/files/patch-net_base_address__tracker__linux.cc index 01047dcf1d20..ee5ca1520ebc 100644 --- a/www/chromium/files/patch-net_base_address__tracker__linux.cc +++ b/www/chromium/files/patch-net_base_address__tracker__linux.cc @@ -1,4 +1,4 @@ ---- net/base/address_tracker_linux.cc.orig 2020-03-03 18:53:55 UTC +--- net/base/address_tracker_linux.cc.orig 2020-09-08 19:14:08 UTC +++ net/base/address_tracker_linux.cc @@ -5,7 +5,9 @@ #include "net/base/address_tracker_linux.h" @@ -10,15 +10,23 @@ #include <stdint.h> #include <sys/ioctl.h> #include <utility> -@@ -177,6 +179,7 @@ AddressTrackerLinux::AddressTrackerLinux( - AddressTrackerLinux::~AddressTrackerLinux() = default; - - void AddressTrackerLinux::Init() { +@@ -190,6 +192,7 @@ void AddressTrackerLinux::Init() { + DCHECK_LT(base::android::BuildInfo::GetInstance()->sdk_int(), + base::android::SDK_VERSION_P); + #endif +#if !defined(OS_FREEBSD) netlink_fd_.reset(socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE)); if (!netlink_fd_.is_valid()) { PLOG(ERROR) << "Could not create NETLINK socket"; -@@ -272,6 +275,7 @@ void AddressTrackerLinux::AbortAndForceOnline() { +@@ -274,6 +277,7 @@ void AddressTrackerLinux::Init() { + base::BindRepeating(&AddressTrackerLinux::OnFileCanReadWithoutBlocking, + base::Unretained(this))); + } ++#endif // !OS_FREEBSD + } + + void AddressTrackerLinux::AbortAndForceOnline() { +@@ -285,6 +289,7 @@ void AddressTrackerLinux::AbortAndForceOnline() { connection_type_initialized_cv_.Broadcast(); } @@ -26,7 +34,7 @@ AddressTrackerLinux::AddressMap AddressTrackerLinux::GetAddressMap() const { AddressTrackerAutoLock lock(*this, address_map_lock_); return address_map_; -@@ -290,6 +294,7 @@ bool AddressTrackerLinux::IsInterfaceIgnored(int inter +@@ -303,6 +308,7 @@ bool AddressTrackerLinux::IsInterfaceIgnored(int inter const char* interface_name = get_interface_name_(interface_index, buf); return ignored_interfaces_.find(interface_name) != ignored_interfaces_.end(); } @@ -34,7 +42,7 @@ NetworkChangeNotifier::ConnectionType AddressTrackerLinux::GetCurrentConnectionType() { -@@ -348,6 +353,7 @@ void AddressTrackerLinux::HandleMessage(const char* bu +@@ -361,6 +367,7 @@ void AddressTrackerLinux::HandleMessage(const char* bu bool* address_changed, bool* link_changed, bool* tunnel_changed) { @@ -42,7 +50,7 @@ DCHECK(buffer); // Note that NLMSG_NEXT decrements |length| to reflect the number of bytes // remaining in |buffer|. -@@ -460,6 +466,10 @@ void AddressTrackerLinux::HandleMessage(const char* bu +@@ -473,6 +480,10 @@ void AddressTrackerLinux::HandleMessage(const char* bu break; } } @@ -53,36 +61,21 @@ } void AddressTrackerLinux::OnFileCanReadWithoutBlocking() { -@@ -487,31 +497,7 @@ bool AddressTrackerLinux::IsTunnelInterfaceName(const +@@ -500,6 +511,7 @@ bool AddressTrackerLinux::IsTunnelInterfaceName(const } void AddressTrackerLinux::UpdateCurrentConnectionType() { -- AddressTrackerLinux::AddressMap address_map = GetAddressMap(); -- std::unordered_set<int> online_links = GetOnlineLinks(); -- -- // Strip out tunnel interfaces from online_links -- for (auto it = online_links.cbegin(); it != online_links.cend();) { -- if (IsTunnelInterface(*it)) { -- it = online_links.erase(it); -- } else { -- ++it; -- } -- } -- -- NetworkInterfaceList networks; -- NetworkChangeNotifier::ConnectionType type = -- NetworkChangeNotifier::CONNECTION_NONE; -- if (GetNetworkListImpl(&networks, 0, online_links, address_map, -- get_interface_name_)) { -- type = NetworkChangeNotifier::ConnectionTypeFromInterfaceList(networks); -- } else { -- type = online_links.empty() ? NetworkChangeNotifier::CONNECTION_NONE -- : NetworkChangeNotifier::CONNECTION_UNKNOWN; -- } -- -- AddressTrackerAutoLock lock(*this, connection_type_lock_); -- current_connection_type_ = type; ++#if !defined(OS_FREEBSD) + AddressTrackerLinux::AddressMap address_map = GetAddressMap(); + std::unordered_set<int> online_links = GetOnlineLinks(); + +@@ -525,6 +537,9 @@ void AddressTrackerLinux::UpdateCurrentConnectionType( + + AddressTrackerAutoLock lock(*this, connection_type_lock_); + current_connection_type_ = type; ++#else + NOTIMPLEMENTED(); ++#endif } int AddressTrackerLinux::GetThreadsWaitingForConnectionTypeInitForTesting() { diff --git a/www/chromium/files/patch-net_cert_test__root__certs.h b/www/chromium/files/patch-net_cert_test__root__certs.h new file mode 100644 index 000000000000..fa39b64faa22 --- /dev/null +++ b/www/chromium/files/patch-net_cert_test__root__certs.h @@ -0,0 +1,26 @@ +--- net/cert/test_root_certs.h.orig 2020-09-08 19:14:08 UTC ++++ net/cert/test_root_certs.h +@@ -75,7 +75,7 @@ + // engine is appropriate. The caller is responsible for freeing the + // returned HCERTCHAINENGINE. + HCERTCHAINENGINE GetChainEngine() const; +-#elif defined(OS_FUCHSIA) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#elif defined(OS_BSD) || defined(OS_FUCHSIA) || defined(OS_LINUX) || defined(OS_CHROMEOS) + TrustStore* test_trust_store() { return &test_trust_store_; } + #endif + +@@ -93,12 +93,12 @@ + #elif defined(OS_MACOSX) + base::ScopedCFTypeRef<CFMutableArrayRef> temporary_roots_; + TrustStoreInMemory test_trust_store_; +-#elif defined(OS_FUCHSIA) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#elif defined(OS_BSD) || defined(OS_FUCHSIA) || defined(OS_LINUX) || defined(OS_CHROMEOS) + TrustStoreInMemory test_trust_store_; + #endif + + #if defined(OS_WIN) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || \ +- defined(OS_LINUX) || defined(OS_CHROMEOS) ++ defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + // True if there are no temporarily trusted root certificates. + bool empty_ = true; + #endif diff --git a/www/chromium/files/patch-net_proxy__resolution_configured__proxy__resolution__service.cc b/www/chromium/files/patch-net_proxy__resolution_configured__proxy__resolution__service.cc index ed8fc03ddcf0..ab0301df7820 100644 --- a/www/chromium/files/patch-net_proxy__resolution_configured__proxy__resolution__service.cc +++ b/www/chromium/files/patch-net_proxy__resolution_configured__proxy__resolution__service.cc @@ -1,4 +1,4 @@ ---- net/proxy_resolution/configured_proxy_resolution_service.cc.orig 2020-07-07 21:58:16 UTC +--- net/proxy_resolution/configured_proxy_resolution_service.cc.orig 2020-09-08 19:14:08 UTC +++ net/proxy_resolution/configured_proxy_resolution_service.cc @@ -47,7 +47,7 @@ #elif defined(OS_MACOSX) @@ -18,7 +18,7 @@ constexpr net::NetworkTrafficAnnotationTag kSystemProxyConfigTrafficAnnotation = net::DefineNetworkTrafficAnnotation("proxy_config_system", R"( semantics { -@@ -1438,7 +1438,7 @@ ConfiguredProxyResolutionService::CreateSystemProxyCon +@@ -1410,7 +1410,7 @@ ConfiguredProxyResolutionService::CreateSystemProxyCon << "profile_io_data.cc::CreateProxyConfigService and this should " << "be used only for examples."; return std::make_unique<UnsetProxyConfigService>(); diff --git a/www/chromium/files/patch-net_socket_udp__socket__posix.h b/www/chromium/files/patch-net_socket_udp__socket__posix.h index 373c468ca84d..b8fc4b3df95f 100644 --- a/www/chromium/files/patch-net_socket_udp__socket__posix.h +++ b/www/chromium/files/patch-net_socket_udp__socket__posix.h @@ -1,6 +1,6 @@ ---- net/socket/udp_socket_posix.h.orig 2019-06-07 19:57:25 UTC +--- net/socket/udp_socket_posix.h.orig 2020-09-08 19:14:08 UTC +++ net/socket/udp_socket_posix.h -@@ -33,7 +33,7 @@ +@@ -34,7 +34,7 @@ #if defined(__ANDROID__) && defined(__aarch64__) #define HAVE_SENDMMSG 1 diff --git a/www/chromium/files/patch-net_traffic__annotation_network__traffic__annotation.h b/www/chromium/files/patch-net_traffic__annotation_network__traffic__annotation.h index 7f70fcc54ea6..75625af8dcd1 100644 --- a/www/chromium/files/patch-net_traffic__annotation_network__traffic__annotation.h +++ b/www/chromium/files/patch-net_traffic__annotation_network__traffic__annotation.h @@ -1,6 +1,6 @@ ---- net/traffic_annotation/network_traffic_annotation.h.orig 2019-09-16 09:58:42 UTC +--- net/traffic_annotation/network_traffic_annotation.h.orig 2020-09-08 19:14:08 UTC +++ net/traffic_annotation/network_traffic_annotation.h -@@ -356,7 +356,7 @@ struct MutablePartialNetworkTrafficAnnotationTag { +@@ -359,7 +359,7 @@ struct MutablePartialNetworkTrafficAnnotationTag { } // namespace net // Placeholder for unannotated usages. @@ -9,7 +9,7 @@ #define TRAFFIC_ANNOTATION_WITHOUT_PROTO(ANNOTATION_ID) \ net::DefineNetworkTrafficAnnotation(ANNOTATION_ID, "No proto yet.") #endif -@@ -367,7 +367,7 @@ struct MutablePartialNetworkTrafficAnnotationTag { +@@ -370,7 +370,7 @@ struct MutablePartialNetworkTrafficAnnotationTag { // // On Linux and Windows, use MISSING_TRAFFIC_ANNOTATION or // TRAFFIC_ANNOTATION_FOR_TESTS. diff --git a/www/chromium/files/patch-net_url__request_url__request__context__builder.cc b/www/chromium/files/patch-net_url__request_url__request__context__builder.cc index f69727d63b47..acdb553e32cd 100644 --- a/www/chromium/files/patch-net_url__request_url__request__context__builder.cc +++ b/www/chromium/files/patch-net_url__request_url__request__context__builder.cc @@ -1,6 +1,6 @@ ---- net/url_request/url_request_context_builder.cc.orig 2020-07-07 21:58:16 UTC +--- net/url_request/url_request_context_builder.cc.orig 2020-09-08 19:14:08 UTC +++ net/url_request/url_request_context_builder.cc -@@ -486,7 +486,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu +@@ -485,7 +485,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu } if (!proxy_resolution_service_) { @@ -9,7 +9,7 @@ // TODO(willchan): Switch to using this code when // ConfiguredProxyResolutionService::CreateSystemProxyConfigService()'s // signature doesn't suck. -@@ -495,7 +495,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu +@@ -494,7 +494,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu ConfiguredProxyResolutionService::CreateSystemProxyConfigService( base::ThreadTaskRunnerHandle::Get().get()); } diff --git a/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc b/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc index a3e9a92305b1..e5b0dafacb5f 100644 --- a/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc +++ b/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc @@ -1,6 +1,6 @@ ---- pdf/pdfium/pdfium_engine.cc.orig 2020-07-07 21:58:16 UTC +--- pdf/pdfium/pdfium_engine.cc.orig 2020-09-08 19:14:08 UTC +++ pdf/pdfium/pdfium_engine.cc -@@ -57,7 +57,7 @@ +@@ -58,7 +58,7 @@ #include "ui/gfx/geometry/rect.h" #include "v8/include/v8.h" @@ -9,7 +9,7 @@ #include "pdf/pdfium/pdfium_font_linux.h" #endif -@@ -381,7 +381,7 @@ void InitializeSDK(bool enable_v8) { +@@ -396,7 +396,7 @@ void InitializeSDK(bool enable_v8) { config.m_v8EmbedderSlot = gin::kEmbedderPDFium; FPDF_InitLibraryWithConfig(&config); @@ -18,7 +18,7 @@ InitializeLinuxFontMapper(); #endif -@@ -422,7 +422,7 @@ PDFiumEngine::PDFiumEngine(PDFEngine::Client* client, +@@ -437,7 +437,7 @@ PDFiumEngine::PDFiumEngine(PDFEngine::Client* client, IFSDK_PAUSE::user = nullptr; IFSDK_PAUSE::NeedToPauseNow = Pause_NeedToPauseNow; @@ -27,7 +27,7 @@ // PreviewModeClient does not know its pp::Instance. SetLastInstance(client_->GetPluginInstance()); #endif -@@ -896,7 +896,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesAsRasterPdf( +@@ -913,7 +913,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesAsRasterPdf( KillFormFocus(); @@ -36,7 +36,7 @@ SetLastInstance(client_->GetPluginInstance()); #endif -@@ -2919,7 +2919,7 @@ bool PDFiumEngine::ContinuePaint(int progressive_index +@@ -2960,7 +2960,7 @@ bool PDFiumEngine::ContinuePaint(int progressive_index DCHECK(image_data); last_progressive_start_time_ = base::Time::Now(); @@ -45,7 +45,7 @@ SetLastInstance(client_->GetPluginInstance()); #endif -@@ -3415,7 +3415,7 @@ void PDFiumEngine::SetCurrentPage(int index) { +@@ -3456,7 +3456,7 @@ void PDFiumEngine::SetCurrentPage(int index) { FORM_DoPageAAction(old_page, form(), FPDFPAGE_AACTION_CLOSE); } most_visible_page_ = index; diff --git a/www/chromium/files/patch-printing_print__settings.h b/www/chromium/files/patch-printing_print__settings.h new file mode 100644 index 000000000000..e508d33e39ca --- /dev/null +++ b/www/chromium/files/patch-printing_print__settings.h @@ -0,0 +1,38 @@ +--- printing/print_settings.h.orig 2020-09-08 19:14:09 UTC ++++ printing/print_settings.h +@@ -20,7 +20,7 @@ + #include "ui/gfx/geometry/rect.h" + #include "ui/gfx/geometry/size.h" + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include <map> + + #include "base/values.h" +@@ -69,7 +69,7 @@ + } + }; + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + using AdvancedSettings = std::map<std::string, base::Value>; + #endif // defined(OS_LINUX) + +@@ -206,7 +206,7 @@ + pages_per_sheet_ = pages_per_sheet; + } + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + AdvancedSettings& advanced_settings() { return advanced_settings_; } + const AdvancedSettings& advanced_settings() const { + return advanced_settings_; +@@ -305,7 +305,7 @@ + // Number of pages per sheet. + int pages_per_sheet_; + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Advanced settings. + AdvancedSettings advanced_settings_; + #endif // defined(OS_LINUX) diff --git a/www/chromium/files/patch-remoting_host_evaluate__capability.cc b/www/chromium/files/patch-remoting_host_evaluate__capability.cc index 565d577bd91b..ccbd923af965 100644 --- a/www/chromium/files/patch-remoting_host_evaluate__capability.cc +++ b/www/chromium/files/patch-remoting_host_evaluate__capability.cc @@ -1,6 +1,6 @@ ---- remoting/host/evaluate_capability.cc.orig 2019-03-11 22:01:01 UTC +--- remoting/host/evaluate_capability.cc.orig 2020-09-08 19:14:09 UTC +++ remoting/host/evaluate_capability.cc -@@ -50,7 +50,7 @@ base::FilePath BuildHostBinaryPath() { +@@ -51,7 +51,7 @@ base::FilePath BuildHostBinaryPath() { } #endif diff --git a/www/chromium/files/patch-sandbox_linux_BUILD.gn b/www/chromium/files/patch-sandbox_linux_BUILD.gn index 3b9d933a14cd..eedfc408b83a 100644 --- a/www/chromium/files/patch-sandbox_linux_BUILD.gn +++ b/www/chromium/files/patch-sandbox_linux_BUILD.gn @@ -1,4 +1,4 @@ ---- sandbox/linux/BUILD.gn.orig 2020-03-16 18:39:54 UTC +--- sandbox/linux/BUILD.gn.orig 2020-09-08 19:14:09 UTC +++ sandbox/linux/BUILD.gn @@ -12,12 +12,12 @@ if (is_android) { } @@ -16,7 +16,7 @@ } if (is_nacl_nonsfi) { -@@ -370,7 +370,7 @@ component("sandbox_services") { +@@ -371,7 +371,7 @@ component("sandbox_services") { public_deps += [ ":sandbox_services_headers" ] } @@ -25,7 +25,7 @@ cflags = [ "-fgnu-inline-asm" ] sources -= [ -@@ -378,6 +378,8 @@ component("sandbox_services") { +@@ -379,6 +379,8 @@ component("sandbox_services") { "services/init_process_reaper.h", "services/scoped_process.cc", "services/scoped_process.h", @@ -34,7 +34,7 @@ "services/yama.cc", "services/yama.h", "syscall_broker/broker_channel.cc", -@@ -396,6 +398,10 @@ component("sandbox_services") { +@@ -397,6 +399,10 @@ component("sandbox_services") { "syscall_broker/broker_process.h", "syscall_broker/broker_simple_message.cc", "syscall_broker/broker_simple_message.h", diff --git a/www/chromium/files/patch-services_network_BUILD.gn b/www/chromium/files/patch-services_network_BUILD.gn index 1bbb99196176..4b0f73cf55d3 100644 --- a/www/chromium/files/patch-services_network_BUILD.gn +++ b/www/chromium/files/patch-services_network_BUILD.gn @@ -1,6 +1,6 @@ ---- services/network/BUILD.gn.orig 2020-07-07 21:58:16 UTC +--- services/network/BUILD.gn.orig 2020-09-08 19:14:09 UTC +++ services/network/BUILD.gn -@@ -261,7 +261,6 @@ jumbo_component("network_service") { +@@ -259,7 +259,6 @@ jumbo_component("network_service") { if (is_linux) { deps += [ diff --git a/www/chromium/files/patch-services_network_network__context.cc b/www/chromium/files/patch-services_network_network__context.cc index 89ffe2c5fb63..6cedcd68f7d0 100644 --- a/www/chromium/files/patch-services_network_network__context.cc +++ b/www/chromium/files/patch-services_network_network__context.cc @@ -1,6 +1,6 @@ ---- services/network/network_context.cc.orig 2020-07-07 21:58:16 UTC +--- services/network/network_context.cc.orig 2020-09-08 19:14:09 UTC +++ services/network/network_context.cc -@@ -1756,7 +1756,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestC +@@ -1819,7 +1819,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestC net::CookieCryptoDelegate* crypto_delegate = nullptr; if (params_->enable_encrypted_cookies) { diff --git a/www/chromium/files/patch-services_network_network__service.cc b/www/chromium/files/patch-services_network_network__service.cc index 8ed8a125c504..a19fae2c1ff4 100644 --- a/www/chromium/files/patch-services_network_network__service.cc +++ b/www/chromium/files/patch-services_network_network__service.cc @@ -1,6 +1,6 @@ ---- services/network/network_service.cc.orig 2020-05-13 18:40:33 UTC +--- services/network/network_service.cc.orig 2020-09-08 19:14:09 UTC +++ services/network/network_service.cc -@@ -67,7 +67,7 @@ +@@ -68,7 +68,7 @@ #include "third_party/boringssl/src/include/openssl/cpu.h" #endif @@ -9,7 +9,7 @@ #include "components/os_crypt/key_storage_config_linux.h" #endif -@@ -630,7 +630,7 @@ void NetworkService::OnCertDBChanged() { +@@ -656,7 +656,7 @@ void NetworkService::OnCertDBChanged() { net::CertDatabase::GetInstance()->NotifyObserversCertDBChanged(); } diff --git a/www/chromium/files/patch-services_network_network__service.h b/www/chromium/files/patch-services_network_network__service.h index 4645795c9a67..a8d0fb3a6136 100644 --- a/www/chromium/files/patch-services_network_network__service.h +++ b/www/chromium/files/patch-services_network_network__service.h @@ -1,6 +1,6 @@ ---- services/network/network_service.h.orig 2020-05-13 18:40:33 UTC +--- services/network/network_service.h.orig 2020-09-08 19:14:09 UTC +++ services/network/network_service.h -@@ -156,7 +156,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService +@@ -192,7 +192,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService base::span<const uint8_t> config, mojom::NetworkService::UpdateLegacyTLSConfigCallback callback) override; void OnCertDBChanged() override; diff --git a/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h b/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h index f8b2542dae6e..4dd8427d2bfe 100644 --- a/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h +++ b/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h @@ -1,4 +1,4 @@ ---- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h.orig 2019-07-24 18:58:35 UTC +--- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h.orig 2020-09-08 19:14:09 UTC +++ services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h @@ -28,9 +28,9 @@ class COMPONENT_EXPORT( mojom::RawOSMemDump*); @@ -18,10 +18,10 @@ -#if defined(OS_LINUX) || defined(OS_ANDROID) +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) - // Provides information on the dump state of resident pages. - enum class MappedAndResidentPagesDumpState { - // Access to /proc/<pid>/pagemap can be denied for android devices running -@@ -68,7 +68,7 @@ class COMPONENT_EXPORT( + // Provides information on the dump state of resident pages. These values are + // written to logs. New enum values can be added, but existing enums must + // never be renumbered or deleted and reused. +@@ -79,7 +79,7 @@ class COMPONENT_EXPORT( // TODO(chiniforooshan): move to /base/process/process_metrics_linux.cc after // making sure that peak RSS is useful. static size_t GetPeakResidentSetSize(base::ProcessId pid); diff --git a/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__linux.cc b/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__linux.cc index 440b79e2bffa..4f88b4d71a34 100644 --- a/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__linux.cc +++ b/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__linux.cc @@ -1,6 +1,6 @@ ---- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc.orig 2020-07-07 21:58:16 UTC +--- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc.orig 2020-09-08 19:14:09 UTC +++ services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc -@@ -22,8 +22,10 @@ +@@ -23,8 +23,10 @@ #include "build/build_config.h" #include "services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h" @@ -11,7 +11,7 @@ namespace memory_instrumentation { -@@ -86,6 +88,7 @@ struct ModuleData { +@@ -87,6 +89,7 @@ struct ModuleData { ModuleData GetMainModuleData() { ModuleData module_data; @@ -19,7 +19,7 @@ Dl_info dl_info; if (dladdr(&__ehdr_start, &dl_info)) { base::debug::ElfBuildIdBuffer build_id; -@@ -96,6 +99,7 @@ ModuleData GetMainModuleData() { +@@ -97,6 +100,7 @@ ModuleData GetMainModuleData() { module_data.build_id = std::string(build_id, build_id_length); } } @@ -27,7 +27,7 @@ return module_data; } -@@ -143,14 +147,14 @@ bool ParseSmapsHeader(const char* header_line, +@@ -144,14 +148,14 @@ bool ParseSmapsHeader(const char* header_line, // Build ID is needed to symbolize heap profiles, and is generated only on // official builds. Build ID is only added for the current library (chrome) // since it is racy to read other libraries which can be unmapped any time. @@ -44,7 +44,7 @@ return res; } -@@ -241,6 +245,7 @@ bool OSMetrics::FillOSMemoryDump(base::ProcessId pid, +@@ -242,6 +246,7 @@ bool OSMetrics::FillOSMemoryDump(base::ProcessId pid, mojom::RawOSMemDump* dump) { // TODO(chiniforooshan): There is no need to read both /statm and /status // files. Refactor to get everything from /status using ProcessMetric. @@ -52,7 +52,7 @@ auto statm_file = GetProcPidDir(pid).Append("statm"); auto autoclose = base::ScopedFD(open(statm_file.value().c_str(), O_RDONLY)); int statm_fd = autoclose.get(); -@@ -255,6 +260,10 @@ bool OSMetrics::FillOSMemoryDump(base::ProcessId pid, +@@ -256,6 +261,10 @@ bool OSMetrics::FillOSMemoryDump(base::ProcessId pid, if (!success) return false; @@ -63,7 +63,7 @@ auto process_metrics = CreateProcessMetrics(pid); -@@ -295,6 +304,10 @@ bool OSMetrics::FillOSMemoryDump(base::ProcessId pid, +@@ -300,6 +309,10 @@ bool OSMetrics::FillOSMemoryDump(base::ProcessId pid, // static std::vector<VmRegionPtr> OSMetrics::GetProcessMemoryMaps(base::ProcessId pid) { @@ -74,7 +74,7 @@ std::vector<VmRegionPtr> maps; uint32_t res = 0; if (g_proc_smaps_for_testing) { -@@ -312,6 +325,7 @@ std::vector<VmRegionPtr> OSMetrics::GetProcessMemoryMa +@@ -317,6 +330,7 @@ std::vector<VmRegionPtr> OSMetrics::GetProcessMemoryMa return std::vector<VmRegionPtr>(); return maps; @@ -82,7 +82,7 @@ } // static -@@ -319,6 +333,10 @@ OSMetrics::MappedAndResidentPagesDumpState OSMetrics:: +@@ -324,6 +338,10 @@ OSMetrics::MappedAndResidentPagesDumpState OSMetrics:: const size_t start_address, const size_t end_address, std::vector<uint8_t>* accessed_pages_bitmap) { @@ -93,7 +93,7 @@ const char* kPagemap = "/proc/self/pagemap"; base::ScopedFILE pagemap_file(fopen(kPagemap, "r")); -@@ -360,6 +378,7 @@ OSMetrics::MappedAndResidentPagesDumpState OSMetrics:: +@@ -365,6 +383,7 @@ OSMetrics::MappedAndResidentPagesDumpState OSMetrics:: } } return OSMetrics::MappedAndResidentPagesDumpState::kSuccess; diff --git a/www/chromium/files/patch-services_service__manager_sandbox_switches.cc b/www/chromium/files/patch-services_service__manager_sandbox_switches.cc new file mode 100644 index 000000000000..48c83a98d65e --- /dev/null +++ b/www/chromium/files/patch-services_service__manager_sandbox_switches.cc @@ -0,0 +1,11 @@ +--- services/service_manager/sandbox/switches.cc.orig 2020-09-21 18:39:22 UTC ++++ services/service_manager/sandbox/switches.cc +@@ -85,7 +85,7 @@ const char kGpuSandboxFailuresFatal[] = "gpu-sandbox-f + // Meant to be used as a browser-level switch for testing purposes only. + const char kNoSandbox[] = "no-sandbox"; + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Instructs the zygote to launch without a sandbox. Processes forked from this + // type of zygote will apply their own custom sandboxes later. + const char kNoZygoteSandbox[] = "no-zygote-sandbox"; diff --git a/www/chromium/files/patch-services_service__manager_sandbox_switches.h b/www/chromium/files/patch-services_service__manager_sandbox_switches.h new file mode 100644 index 000000000000..03af539a26af --- /dev/null +++ b/www/chromium/files/patch-services_service__manager_sandbox_switches.h @@ -0,0 +1,11 @@ +--- services/service_manager/sandbox/switches.h.orig 2020-09-21 18:39:22 UTC ++++ services/service_manager/sandbox/switches.h +@@ -55,7 +55,7 @@ SERVICE_MANAGER_SANDBOX_EXPORT extern const char kEnab + SERVICE_MANAGER_SANDBOX_EXPORT extern const char kGpuSandboxAllowSysVShm[]; + SERVICE_MANAGER_SANDBOX_EXPORT extern const char kGpuSandboxFailuresFatal[]; + SERVICE_MANAGER_SANDBOX_EXPORT extern const char kNoSandbox[]; +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + SERVICE_MANAGER_SANDBOX_EXPORT extern const char kNoZygoteSandbox[]; + #endif + #if defined(OS_WIN) diff --git a/www/chromium/files/patch-services_service__manager_zygote_zygote__linux.cc b/www/chromium/files/patch-services_service__manager_zygote_zygote__linux.cc deleted file mode 100644 index 3a2ff8db55e7..000000000000 --- a/www/chromium/files/patch-services_service__manager_zygote_zygote__linux.cc +++ /dev/null @@ -1,15 +0,0 @@ ---- services/service_manager/zygote/zygote_linux.cc.orig 2019-06-04 18:55:28 UTC -+++ services/service_manager/zygote/zygote_linux.cc -@@ -1,6 +1,7 @@ - // Copyright (c) 2012 The Chromium Authors. All rights reserved. - // Use of this source code is governed by a BSD-style license that can be - // found in the LICENSE file. -+#if 0 - - #include "services/service_manager/zygote/zygote_linux.h" - -@@ -657,3 +658,4 @@ bool Zygote::HandleGetSandboxStatus(int fd, base::Pick - } - - } // namespace service_manager -+#endif diff --git a/www/chromium/files/patch-services_tracing_public_cpp_BUILD.gn b/www/chromium/files/patch-services_tracing_public_cpp_BUILD.gn deleted file mode 100644 index 5dd58766265e..000000000000 --- a/www/chromium/files/patch-services_tracing_public_cpp_BUILD.gn +++ /dev/null @@ -1,11 +0,0 @@ ---- services/tracing/public/cpp/BUILD.gn.orig 2020-07-13 12:06:56 UTC -+++ services/tracing/public/cpp/BUILD.gn -@@ -141,7 +141,7 @@ target(tracing_lib_type, "cpp") { - ] - } - -- if (is_linux && !is_fuchsia) { -+ if (is_linux && !is_fuchsia && !is_bsd) { - deps += [ "//components/crash/core/app:app" ] - } - diff --git a/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp b/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp index ae471f19d258..b72b36096e2d 100644 --- a/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp +++ b/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp @@ -1,47 +1,47 @@ ---- third_party/angle/src/libANGLE/Display.cpp.orig 2020-07-07 22:03:18 UTC +--- third_party/angle/src/libANGLE/Display.cpp.orig 2020-09-08 19:19:53 UTC +++ third_party/angle/src/libANGLE/Display.cpp -@@ -54,7 +54,7 @@ +@@ -55,7 +55,7 @@ # include "libANGLE/renderer/gl/cgl/DisplayCGL.h" # elif defined(ANGLE_PLATFORM_IOS) # include "libANGLE/renderer/gl/eagl/DisplayEAGL.h" -# elif defined(ANGLE_PLATFORM_LINUX) +# elif defined(ANGLE_PLATFORM_POSIX) - # if defined(ANGLE_USE_OZONE) - # include "libANGLE/renderer/gl/egl/ozone/DisplayOzone.h" - # else -@@ -252,7 +252,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di + # include "libANGLE/renderer/gl/egl/DisplayEGL.h" + # if defined(ANGLE_USE_GBM) + # include "libANGLE/renderer/gl/egl/gbm/DisplayGbm.h" +@@ -264,7 +264,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di impl = new rx::DisplayCGL(state); # elif defined(ANGLE_PLATFORM_IOS) impl = new rx::DisplayEAGL(state); -# elif defined(ANGLE_PLATFORM_LINUX) +# elif defined(ANGLE_PLATFORM_POSIX) - # if defined(ANGLE_USE_OZONE) - // This might work but has never been tried, so disallow for now. - impl = nullptr; -@@ -284,7 +284,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di + # if defined(ANGLE_USE_GBM) + if (platformType == 0) + { +@@ -305,7 +305,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di #if defined(ANGLE_ENABLE_OPENGL) # if defined(ANGLE_PLATFORM_WINDOWS) impl = new rx::DisplayWGL(state); -# elif defined(ANGLE_PLATFORM_LINUX) +# elif defined(ANGLE_PLATFORM_POSIX) - # if defined(ANGLE_USE_OZONE) - impl = new rx::DisplayOzone(state); - # else -@@ -315,7 +315,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di + # if defined(ANGLE_USE_GBM) + if (platformType == 0) + { +@@ -346,7 +346,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di { impl = rx::CreateVulkanWin32Display(state); } -# elif defined(ANGLE_PLATFORM_LINUX) +# elif defined(ANGLE_PLATFORM_POSIX) - if (rx::IsVulkanXcbDisplayAvailable()) + # if defined(ANGLE_USE_X11) + if (platformType == EGL_PLATFORM_X11_EXT && rx::IsVulkanXcbDisplayAvailable()) { - impl = rx::CreateVulkanXcbDisplay(state); -@@ -1395,7 +1395,7 @@ static ClientExtensions GenerateClientExtensions() +@@ -1508,7 +1508,7 @@ static ClientExtensions GenerateClientExtensions() extensions.x11Visual = true; #endif --#if defined(ANGLE_PLATFORM_LINUX) && !defined(ANGLE_USE_OZONE) -+#if defined(ANGLE_PLATFORM_POSIX) && !defined(ANGLE_USE_OZONE) +-#if defined(ANGLE_PLATFORM_LINUX) ++#if defined(ANGLE_PLATFORM_POSIX) extensions.platformANGLEDeviceTypeEGLANGLE = true; #endif diff --git a/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h b/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h index 1b7b10632f71..c3fa5a03c779 100644 --- a/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h +++ b/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h @@ -1,6 +1,6 @@ ---- third_party/angle/src/libANGLE/renderer/driver_utils.h.orig 2020-05-13 18:41:47 UTC +--- third_party/angle/src/libANGLE/renderer/driver_utils.h.orig 2020-09-08 19:19:53 UTC +++ third_party/angle/src/libANGLE/renderer/driver_utils.h -@@ -133,7 +133,7 @@ inline bool IsWindows() +@@ -139,7 +139,7 @@ inline bool IsWindows() inline bool IsLinux() { diff --git a/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_loader.c b/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_loader.c index 95d1dd2edfc9..3648af82827e 100644 --- a/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_loader.c +++ b/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_loader.c @@ -1,6 +1,6 @@ ---- third_party/angle/third_party/vulkan-loader/src/loader/loader.c.orig 2020-07-07 22:03:29 UTC +--- third_party/angle/third_party/vulkan-loader/src/loader/loader.c.orig 2020-09-08 19:20:05 UTC +++ third_party/angle/third_party/vulkan-loader/src/loader/loader.c -@@ -241,7 +241,7 @@ void *loader_device_heap_realloc(const struct loader_d +@@ -246,7 +246,7 @@ void *loader_device_heap_realloc(const struct loader_d } // Environment variables diff --git a/www/chromium/files/patch-third__party_blink_public_common_privacy__budget_identifiable__token.h b/www/chromium/files/patch-third__party_blink_public_common_privacy__budget_identifiable__token.h new file mode 100644 index 000000000000..60722d39f184 --- /dev/null +++ b/www/chromium/files/patch-third__party_blink_public_common_privacy__budget_identifiable__token.h @@ -0,0 +1,11 @@ +--- third_party/blink/public/common/privacy_budget/identifiable_token.h.orig 2020-10-20 16:51:58 UTC ++++ third_party/blink/public/common/privacy_budget/identifiable_token.h +@@ -115,7 +115,7 @@ class IdentifiableToken { + + // Enums. Punt to the underlying type. + template <typename T, +- typename U = typename std::underlying_type<T>::type, ++ typename U = typename std::__sfinae_underlying_type<T>::type, + typename std::enable_if_t<std::is_enum<T>::value>* = nullptr> + constexpr IdentifiableToken(T in) // NOLINT(google-explicit-constructor) + : IdentifiableToken(static_cast<U>(in)) {} diff --git a/www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc b/www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc index b904b155325c..a56351767349 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/controller/blink_initializer.cc.orig 2020-07-07 21:58:17 UTC +--- third_party/blink/renderer/controller/blink_initializer.cc.orig 2020-09-08 19:14:10 UTC +++ third_party/blink/renderer/controller/blink_initializer.cc @@ -66,11 +66,11 @@ #include "third_party/blink/renderer/controller/oom_intervention_impl.h" @@ -14,7 +14,7 @@ defined(OS_WIN) #include "third_party/blink/renderer/controller/highest_pmf_reporter.h" #include "third_party/blink/renderer/controller/user_level_memory_pressure_signal_generator.h" -@@ -147,7 +147,7 @@ void InitializeCommon(Platform* platform, mojo::Binder +@@ -142,7 +142,7 @@ void InitializeCommon(Platform* platform, mojo::Binder CrashMemoryMetricsReporterImpl::Instance(); #endif diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__frame__test.cc b/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__frame__test.cc index 10d93b4ff97d..2512e50fd191 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__frame__test.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__frame__test.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/exported/web_frame_test.cc.orig 2020-07-13 10:01:14 UTC +--- third_party/blink/renderer/core/exported/web_frame_test.cc.orig 2020-09-08 19:14:10 UTC +++ third_party/blink/renderer/core/exported/web_frame_test.cc -@@ -5964,7 +5964,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) { +@@ -5977,7 +5977,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) { EXPECT_EQ(64, ComputeOffset(layout_object, 1000, 1000)); } @@ -9,7 +9,7 @@ TEST_F(WebFrameTest, SelectRangeStaysHorizontallyAlignedWhenMoved) { RegisterMockedHttpURLLoad("move_caret.html"); -@@ -6297,7 +6297,7 @@ TEST_F(CompositedSelectionBoundsTest, Editable) { +@@ -6310,7 +6310,7 @@ TEST_F(CompositedSelectionBoundsTest, Editable) { TEST_F(CompositedSelectionBoundsTest, EditableDiv) { RunTest("composited_selection_bounds_editable_div.html"); } diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc b/www/chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc index a42d176dc91e..4d8e60f37ce8 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig 2020-05-13 18:40:34 UTC +--- third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig 2020-09-08 19:14:11 UTC +++ third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc -@@ -40,7 +40,7 @@ constexpr base::TimeDelta kEncodeRowSlackBeforeDeadlin +@@ -43,7 +43,7 @@ constexpr base::TimeDelta kEncodeRowSlackBeforeDeadlin base::TimeDelta::FromMicroseconds(100); /* The value is based on user statistics on Nov 2017. */ diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc b/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc index c0d73aa54377..877b9f9e227d 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/layout/layout_view.cc.orig 2020-07-07 21:58:17 UTC +--- third_party/blink/renderer/core/layout/layout_view.cc.orig 2020-09-08 19:14:11 UTC +++ third_party/blink/renderer/core/layout/layout_view.cc -@@ -61,7 +61,7 @@ +@@ -62,7 +62,7 @@ #include "third_party/blink/renderer/platform/instrumentation/tracing/traced_value.h" #include "third_party/blink/renderer/platform/runtime_enabled_features.h" @@ -9,7 +9,7 @@ #include "third_party/blink/renderer/platform/fonts/font_cache.h" #endif -@@ -329,7 +329,7 @@ void LayoutView::UpdateLayout() { +@@ -330,7 +330,7 @@ void LayoutView::UpdateLayout() { DCHECK(!layout_state_); LayoutState root_layout_state(*this); diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_mediastream_processed__local__audio__source.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_mediastream_processed__local__audio__source.cc index 700447cffeaa..622025de56f5 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_modules_mediastream_processed__local__audio__source.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_modules_mediastream_processed__local__audio__source.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/mediastream/processed_local_audio_source.cc.orig 2020-07-07 21:58:17 UTC +--- third_party/blink/renderer/modules/mediastream/processed_local_audio_source.cc.orig 2020-09-08 19:14:11 UTC +++ third_party/blink/renderer/modules/mediastream/processed_local_audio_source.cc -@@ -407,7 +407,7 @@ void ProcessedLocalAudioSource::CaptureUsingProcessor( +@@ -408,7 +408,7 @@ void ProcessedLocalAudioSource::CaptureUsingProcessor( bool key_pressed) { #if defined(OS_WIN) || defined(OS_MACOSX) DCHECK_LE(volume, 1.0); diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc index 2fe87557e6d5..509c3e5fa74d 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2020-07-07 21:58:17 UTC +--- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2020-09-08 19:14:11 UTC +++ third_party/blink/renderer/platform/fonts/font_cache.cc -@@ -83,7 +83,7 @@ static const char kColorEmojiLocale[] = "und-Zsye"; +@@ -80,7 +80,7 @@ const char kColorEmojiLocale[] = "und-Zsye"; SkFontMgr* FontCache::static_font_manager_ = nullptr; @@ -9,7 +9,7 @@ float FontCache::device_scale_factor_ = 1.0; #endif -@@ -123,7 +123,7 @@ FontCache::FontCache() +@@ -120,7 +120,7 @@ FontCache::FontCache() FontPlatformData* FontCache::SystemFontPlatformData( const FontDescription& font_description) { const AtomicString& family = FontCache::SystemFontFamily(); diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h index 42d7e8063d30..637d329a62f7 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/platform/fonts/font_cache.h.orig 2020-07-07 21:58:17 UTC +--- third_party/blink/renderer/platform/fonts/font_cache.h.orig 2020-09-08 19:14:11 UTC +++ third_party/blink/renderer/platform/fonts/font_cache.h @@ -58,7 +58,7 @@ #include "third_party/skia/include/core/SkFontMgr.h" @@ -9,7 +9,7 @@ #include "ui/gfx/font_fallback_linux.h" #endif -@@ -170,7 +170,7 @@ class PLATFORM_EXPORT FontCache { +@@ -174,7 +174,7 @@ class PLATFORM_EXPORT FontCache { sk_sp<SkFontMgr> FontManager() { return font_manager_; } static void SetFontManager(sk_sp<SkFontMgr>); @@ -18,7 +18,7 @@ // These are needed for calling QueryRenderStyleForStrike, since // gfx::GetFontRenderParams makes distinctions based on DSF. static float DeviceScaleFactor() { return device_scale_factor_; } -@@ -245,11 +245,11 @@ class PLATFORM_EXPORT FontCache { +@@ -249,11 +249,11 @@ class PLATFORM_EXPORT FontCache { const FontDescription&); #endif // defined(OS_ANDROID) @@ -32,7 +32,7 @@ scoped_refptr<SimpleFontData> FontDataFromFontPlatformData( const FontPlatformData*, -@@ -330,12 +330,12 @@ class PLATFORM_EXPORT FontCache { +@@ -334,12 +334,12 @@ class PLATFORM_EXPORT FontCache { const FontFaceCreationParams&, std::string& name); @@ -47,7 +47,7 @@ scoped_refptr<SimpleFontData> FallbackOnStandardFontStyle( const FontDescription&, -@@ -375,7 +375,7 @@ class PLATFORM_EXPORT FontCache { +@@ -379,7 +379,7 @@ class PLATFORM_EXPORT FontCache { std::unique_ptr<FallbackFamilyStyleCache> fallback_params_cache_; #endif // defined(OS_WIN) diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc index ac15b14a300e..d2b0a00ccf04 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc @@ -1,9 +1,9 @@ ---- third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig 2020-07-07 21:58:17 UTC +--- third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig 2020-09-08 19:14:11 UTC +++ third_party/blink/renderer/platform/graphics/video_frame_submitter.cc -@@ -196,7 +196,7 @@ void VideoFrameSubmitter::OnBeginFrame( +@@ -195,7 +195,7 @@ void VideoFrameSubmitter::OnBeginFrame( if (viz::FrameTokenGT(pair.key, *next_frame_token_)) continue; - + auto& feedback = pair.value.presentation_feedback; -#ifdef OS_LINUX +#if defined(OS_LINUX) || defined(OS_BSD) // TODO: On Linux failure flag is unreliable, and perfectly rendered frames diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc index 24a812ce5223..01bd38137760 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/wtf/stack_util.cc.orig 2019-06-04 18:55:30 UTC +--- third_party/blink/renderer/platform/wtf/stack_util.cc.orig 2020-09-08 19:14:11 UTC +++ third_party/blink/renderer/platform/wtf/stack_util.cc -@@ -17,6 +17,11 @@ +@@ -18,6 +18,11 @@ extern "C" void* __libc_stack_end; // NOLINT #endif diff --git a/www/chromium/files/patch-third__party_crashpad_crashpad_client_crashpad__client__posix.cc b/www/chromium/files/patch-third__party_crashpad_crashpad_client_crashpad__client__posix.cc index 9cafc79f1aff..dc747e334138 100644 --- a/www/chromium/files/patch-third__party_crashpad_crashpad_client_crashpad__client__posix.cc +++ b/www/chromium/files/patch-third__party_crashpad_crashpad_client_crashpad__client__posix.cc @@ -1,6 +1,6 @@ ---- third_party/crashpad/crashpad/client/crashpad_client_posix.cc.orig 2019-03-17 01:47:14 UTC +--- third_party/crashpad/crashpad/client/crashpad_client_posix.cc.orig 2020-09-16 19:36:07 UTC +++ third_party/crashpad/crashpad/client/crashpad_client_posix.cc -@@ -0,0 +1,38 @@ +@@ -0,0 +1,39 @@ +// Copyright 2017 The Crashpad Authors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); @@ -18,6 +18,7 @@ +#include "client/crashpad_client.h" + +#include "base/logging.h" ++#include "base/notreached.h" + +namespace crashpad { + diff --git a/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_uuid.cc b/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_uuid.cc index d7a1ca9a0fd0..278b4c3cda81 100644 --- a/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_uuid.cc +++ b/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_uuid.cc @@ -1,6 +1,6 @@ ---- third_party/crashpad/crashpad/util/misc/uuid.cc.orig 2019-03-11 22:01:15 UTC +--- third_party/crashpad/crashpad/util/misc/uuid.cc.orig 2020-09-08 19:14:24 UTC +++ third_party/crashpad/crashpad/util/misc/uuid.cc -@@ -95,7 +95,7 @@ bool UUID::InitializeWithNew() { +@@ -94,7 +94,7 @@ bool UUID::InitializeWithNew() { InitializeFromBytes(uuid); return true; #elif defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) || \ diff --git a/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_close__multiple.cc b/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_close__multiple.cc index e7dc2e3561db..754600cdd13b 100644 --- a/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_close__multiple.cc +++ b/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_close__multiple.cc @@ -1,4 +1,4 @@ ---- third_party/crashpad/crashpad/util/posix/close_multiple.cc.orig 2019-03-11 22:01:15 UTC +--- third_party/crashpad/crashpad/util/posix/close_multiple.cc.orig 2020-09-08 19:14:24 UTC +++ third_party/crashpad/crashpad/util/posix/close_multiple.cc @@ -31,7 +31,7 @@ #include "util/file/directory_reader.h" @@ -9,7 +9,7 @@ #include <sys/sysctl.h> #endif -@@ -72,7 +72,7 @@ void CloseNowOrOnExec(int fd, bool ebadf_ok) { +@@ -72,7 +72,7 @@ // This is an advantage over looping over all possible file descriptors, because // no attempt needs to be made to close file descriptors that are not open. bool CloseMultipleNowOrOnExecUsingFDDir(int min_fd, int preserve_fd) { @@ -18,7 +18,7 @@ static constexpr char kFDDir[] = "/dev/fd"; #elif defined(OS_LINUX) || defined(OS_ANDROID) static constexpr char kFDDir[] = "/proc/self/fd"; -@@ -146,7 +146,7 @@ void CloseMultipleNowOrOnExec(int fd, int preserve_fd) +@@ -146,7 +146,7 @@ // while the system is running, but it’s still a better upper bound than the // current RLIMIT_NOFILE value. @@ -27,3 +27,41 @@ // See 10.11.6 xnu-3248.60.10/bsd/kern/kern_resource.c maxfilesperproc, // referenced by dosetrlimit(). int oid[] = {CTL_KERN, KERN_MAXFILESPERPROC}; +@@ -180,11 +180,37 @@ + } + #endif + ++#if defined(OS_BSD) ++ // If preserve_fd is in the space to be freed, copy it down. ++ bool copied = false; ++ if (preserve_fd >= fd) { ++ if (preserve_fd > fd) { ++ int rv = dup2(preserve_fd, fd); ++ if (rv != 0) ++ PLOG(WARNING) << "dup2"; ++ copied = true; ++ } ++ fd++; ++ } ++ // Cloexec is only used for MACOS... ++ closefrom(fd); ++ // Put it back. ++ if (copied) { ++ fd--; ++ int rv = dup2(fd, preserve_fd); ++ if (rv != 0) ++ PLOG(WARNING) << "dup2"; ++ rv = IGNORE_EINTR(close(fd)); ++ if (rv != 0) ++ PLOG(WARNING) << "close"; ++ } ++#else + for (int entry_fd = fd; entry_fd < max_fd; ++entry_fd) { + if (entry_fd != preserve_fd) { + CloseNowOrOnExec(entry_fd, true); + } + } ++#endif + } + + } // namespace crashpad diff --git a/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_drop__privileges.cc b/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_drop__privileges.cc index 42ba7366e3cb..c9f1c71ee939 100644 --- a/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_drop__privileges.cc +++ b/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_drop__privileges.cc @@ -1,6 +1,6 @@ ---- third_party/crashpad/crashpad/util/posix/drop_privileges.cc.orig 2019-03-11 22:01:15 UTC +--- third_party/crashpad/crashpad/util/posix/drop_privileges.cc.orig 2020-09-08 19:14:24 UTC +++ third_party/crashpad/crashpad/util/posix/drop_privileges.cc -@@ -23,7 +23,7 @@ void DropPrivileges() { +@@ -25,7 +25,7 @@ void DropPrivileges() { gid_t gid = getgid(); uid_t uid = getuid(); diff --git a/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_signals.cc b/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_signals.cc index 911ec6d61ccd..5cfcfd2b5519 100644 --- a/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_signals.cc +++ b/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_signals.cc @@ -1,6 +1,6 @@ ---- third_party/crashpad/crashpad/util/posix/signals.cc.orig 2019-12-16 21:51:05 UTC +--- third_party/crashpad/crashpad/util/posix/signals.cc.orig 2020-09-08 19:14:24 UTC +++ third_party/crashpad/crashpad/util/posix/signals.cc -@@ -45,10 +45,10 @@ constexpr int kCrashSignals[] = { +@@ -46,10 +46,10 @@ constexpr int kCrashSignals[] = { #if defined(SIGEMT) SIGEMT, #endif // defined(SIGEMT) @@ -13,7 +13,7 @@ }; // These are the non-core-generating but terminating signals. -@@ -85,9 +85,9 @@ constexpr int kTerminateSignals[] = { +@@ -86,9 +86,9 @@ constexpr int kTerminateSignals[] = { SIGXCPU, SIGXFSZ, #endif // defined(OS_MACOSX) @@ -25,7 +25,7 @@ }; bool InstallHandlers(const std::vector<int>& signals, -@@ -224,8 +224,12 @@ bool Signals::WillSignalReraiseAutonomously(const sigi +@@ -225,8 +225,12 @@ bool Signals::WillSignalReraiseAutonomously(const sigi // remains. See 10.12.3 xnu-3789.41.3/bsd/kern/kern_sig.c // psignal_internal(). (code > 0 && diff --git a/www/chromium/files/patch-third__party_googletest_src_googletest_include_gtest_internal_gtest-port.h b/www/chromium/files/patch-third__party_googletest_src_googletest_include_gtest_internal_gtest-port.h index a7505f370c19..5ed57fc7bff1 100644 --- a/www/chromium/files/patch-third__party_googletest_src_googletest_include_gtest_internal_gtest-port.h +++ b/www/chromium/files/patch-third__party_googletest_src_googletest_include_gtest_internal_gtest-port.h @@ -1,6 +1,6 @@ ---- third_party/googletest/src/googletest/include/gtest/internal/gtest-port.h.orig 2020-07-13 13:11:01 UTC +--- third_party/googletest/src/googletest/include/gtest/internal/gtest-port.h.orig 2020-09-08 19:19:55 UTC +++ third_party/googletest/src/googletest/include/gtest/internal/gtest-port.h -@@ -1631,6 +1631,8 @@ class ThreadLocal : public ThreadLocalBase { +@@ -1641,6 +1641,8 @@ class ThreadLocal : public ThreadLocalBase { // MutexBase and Mutex implement mutex on pthreads-based platforms. class MutexBase { public: @@ -9,7 +9,7 @@ // Acquires this mutex. void Lock() { GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_lock(&mutex_)); -@@ -1647,6 +1649,7 @@ class MutexBase { +@@ -1657,6 +1659,7 @@ class MutexBase { has_owner_ = false; GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_unlock(&mutex_)); } diff --git a/www/chromium/files/patch-third__party_googletest_src_googletest_src_gtest.cc b/www/chromium/files/patch-third__party_googletest_src_googletest_src_gtest.cc index 54433ee2b928..09a2676c1953 100644 --- a/www/chromium/files/patch-third__party_googletest_src_googletest_src_gtest.cc +++ b/www/chromium/files/patch-third__party_googletest_src_googletest_src_gtest.cc @@ -1,6 +1,6 @@ ---- third_party/googletest/src/googletest/src/gtest.cc.orig 2020-07-07 22:03:20 UTC +--- third_party/googletest/src/googletest/src/gtest.cc.orig 2020-09-08 19:19:55 UTC +++ third_party/googletest/src/googletest/src/gtest.cc -@@ -119,6 +119,7 @@ +@@ -117,6 +117,7 @@ #if GTEST_CAN_STREAM_RESULTS_ # include <arpa/inet.h> // NOLINT diff --git a/www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc b/www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc index f9943f71d1d5..e254e190b723 100644 --- a/www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc +++ b/www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc @@ -1,6 +1,6 @@ ---- third_party/leveldatabase/env_chromium.cc.orig 2020-07-07 21:58:18 UTC +--- third_party/leveldatabase/env_chromium.cc.orig 2020-09-08 19:14:25 UTC +++ third_party/leveldatabase/env_chromium.cc -@@ -36,7 +36,11 @@ +@@ -37,7 +37,11 @@ #include "third_party/leveldatabase/leveldb_chrome.h" #include "third_party/leveldatabase/leveldb_features.h" #include "third_party/leveldatabase/src/include/leveldb/options.h" diff --git a/www/chromium/files/patch-third__party_pdfium_core_fxge_fx__ge__linux.cpp b/www/chromium/files/patch-third__party_pdfium_core_fxge_fx__ge__linux.cpp index 272bf7a50bf9..cf79879a85ad 100644 --- a/www/chromium/files/patch-third__party_pdfium_core_fxge_fx__ge__linux.cpp +++ b/www/chromium/files/patch-third__party_pdfium_core_fxge_fx__ge__linux.cpp @@ -1,8 +1,8 @@ ---- third_party/pdfium/core/fxge/fx_ge_linux.cpp.orig 2020-03-16 18:42:12 UTC +--- third_party/pdfium/core/fxge/fx_ge_linux.cpp.orig 2020-09-08 19:19:59 UTC +++ third_party/pdfium/core/fxge/fx_ge_linux.cpp @@ -155,9 +155,8 @@ std::unique_ptr<SystemFontInfoIface> SystemFontInfoIfa const char** pUserPaths) { - auto pInfo = pdfium::MakeUnique<CFX_LinuxFontInfo>(); + auto pInfo = std::make_unique<CFX_LinuxFontInfo>(); if (!pInfo->ParseFontCfg(pUserPaths)) { - pInfo->AddPath("/usr/share/fonts"); - pInfo->AddPath("/usr/share/X11/fonts/Type1"); diff --git a/www/chromium/files/patch-third__party_pdfium_fxjs_cjs__publicmethods.cpp b/www/chromium/files/patch-third__party_pdfium_fxjs_cjs__publicmethods.cpp index 292afa1968d0..f659c82b1afc 100644 --- a/www/chromium/files/patch-third__party_pdfium_fxjs_cjs__publicmethods.cpp +++ b/www/chromium/files/patch-third__party_pdfium_fxjs_cjs__publicmethods.cpp @@ -1,6 +1,6 @@ ---- third_party/pdfium/fxjs/cjs_publicmethods.cpp.orig 2019-06-04 18:58:01 UTC +--- third_party/pdfium/fxjs/cjs_publicmethods.cpp.orig 2020-09-08 19:19:59 UTC +++ third_party/pdfium/fxjs/cjs_publicmethods.cpp -@@ -86,6 +86,103 @@ constexpr const wchar_t* kDateFormats[] = {L"m/d", +@@ -87,6 +87,103 @@ constexpr const wchar_t* kDateFormats[] = {L"m/d", constexpr const wchar_t* kTimeFormats[] = {L"HH:MM", L"h:MM tt", L"HH:MM:ss", L"h:MM:ss tt"}; diff --git a/www/chromium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp b/www/chromium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp index 425ec0a4bc9a..85312c591e6d 100644 --- a/www/chromium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp +++ b/www/chromium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp @@ -1,6 +1,6 @@ ---- third_party/pdfium/fxjs/fx_date_helpers.cpp.orig 2019-07-24 19:03:29 UTC +--- third_party/pdfium/fxjs/fx_date_helpers.cpp.orig 2020-09-08 19:19:59 UTC +++ third_party/pdfium/fxjs/fx_date_helpers.cpp -@@ -35,6 +35,11 @@ double GetLocalTZA() { +@@ -36,6 +36,11 @@ double GetLocalTZA() { return 0; time_t t = 0; FXSYS_time(&t); @@ -12,7 +12,7 @@ FXSYS_localtime(&t); #if defined(OS_WIN) // In gcc 'timezone' is a global variable declared in time.h. In VC++, that -@@ -43,6 +48,7 @@ double GetLocalTZA() { +@@ -44,6 +49,7 @@ double GetLocalTZA() { _get_timezone(&timezone); #endif return (double)(-(timezone * 1000)); diff --git a/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_build__config.h b/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_build__config.h index 02a9c66ed8e5..537e47091694 100644 --- a/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_build__config.h +++ b/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_build__config.h @@ -1,4 +1,4 @@ ---- third_party/perfetto/include/perfetto/base/build_config.h.orig 2020-03-16 18:42:11 UTC +--- third_party/perfetto/include/perfetto/base/build_config.h.orig 2020-09-08 19:20:00 UTC +++ third_party/perfetto/include/perfetto/base/build_config.h @@ -28,6 +28,7 @@ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 1 @@ -16,7 +16,7 @@ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 0 -@@ -50,15 +52,27 @@ +@@ -52,15 +54,27 @@ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MACOSX() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 1 @@ -44,7 +44,7 @@ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 1 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 0 -@@ -68,6 +82,7 @@ +@@ -70,6 +84,7 @@ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MACOSX() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0 @@ -52,7 +52,7 @@ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 1 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 0 -@@ -77,6 +92,7 @@ +@@ -79,6 +94,7 @@ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MACOSX() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0 @@ -60,7 +60,7 @@ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 1 -@@ -86,6 +102,7 @@ +@@ -88,6 +104,7 @@ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MACOSX() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0 diff --git a/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_thread__utils.h b/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_thread__utils.h index c8947d13ecbf..29775e32a49c 100644 --- a/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_thread__utils.h +++ b/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_thread__utils.h @@ -1,8 +1,8 @@ ---- third_party/perfetto/include/perfetto/base/thread_utils.h.orig 2020-03-16 18:42:11 UTC +--- third_party/perfetto/include/perfetto/base/thread_utils.h.orig 2020-09-08 19:20:00 UTC +++ third_party/perfetto/include/perfetto/base/thread_utils.h -@@ -33,6 +33,9 @@ - #include <sys/types.h> - #include <unistd.h> +@@ -35,6 +35,9 @@ + #else + #include <pthread.h> #endif +#if PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD) +#include <pthread_np.h> @@ -10,7 +10,7 @@ namespace perfetto { namespace base { -@@ -41,6 +44,11 @@ namespace base { +@@ -43,6 +46,11 @@ namespace base { using PlatformThreadId = pid_t; inline PlatformThreadId GetThreadId() { return gettid(); diff --git a/www/chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc b/www/chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc index f14075502887..6332f6454242 100644 --- a/www/chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc +++ b/www/chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc @@ -1,4 +1,4 @@ ---- third_party/perfetto/src/base/unix_socket.cc.orig 2020-03-16 18:42:11 UTC +--- third_party/perfetto/src/base/unix_socket.cc.orig 2020-09-08 19:20:00 UTC +++ third_party/perfetto/src/base/unix_socket.cc @@ -37,7 +37,7 @@ #include "perfetto/ext/base/string_utils.h" @@ -9,7 +9,7 @@ #include <sys/ucred.h> #endif -@@ -601,7 +601,7 @@ void UnixSocket::ReadPeerCredentials() { +@@ -606,7 +606,7 @@ void UnixSocket::ReadPeerCredentials() { if (sock_raw_.family() != SockFamily::kUnix) return; diff --git a/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc b/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc index db04ed1d1388..e0c2c9a6191d 100644 --- a/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc +++ b/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc @@ -1,6 +1,6 @@ ---- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2020-07-07 22:03:25 UTC +--- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2020-09-08 19:20:01 UTC +++ third_party/perfetto/src/tracing/core/tracing_service_impl.cc -@@ -2410,6 +2410,7 @@ void TracingServiceImpl::SnapshotClocks(std::vector<Tr +@@ -2458,6 +2458,7 @@ void TracingServiceImpl::SnapshotClocks( #if !PERFETTO_BUILDFLAG(PERFETTO_OS_MACOSX) && \ !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN) && \ diff --git a/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-10.0_configs_linux_include_llvm_Config_llvm-config.h b/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-10.0_configs_linux_include_llvm_Config_llvm-config.h deleted file mode 100644 index 772325119c9b..000000000000 --- a/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-10.0_configs_linux_include_llvm_Config_llvm-config.h +++ /dev/null @@ -1,20 +0,0 @@ ---- third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/llvm-config.h.orig 2020-08-18 18:42:46 UTC -+++ third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/llvm-config.h -@@ -35,7 +35,7 @@ - #elif defined(__arm__) - #define LLVM_DEFAULT_TARGET_TRIPLE "armv7-linux-gnueabihf" - #elif defined(__aarch64__) --#define LLVM_DEFAULT_TARGET_TRIPLE "aarch64-linux-gnu" -+#define LLVM_DEFAULT_TARGET_TRIPLE "aarch64-portbld-freebsd" - #elif defined(__mips__) - #define LLVM_DEFAULT_TARGET_TRIPLE "mipsel-linux-gnu" - #elif defined(__mips64) -@@ -60,7 +60,7 @@ - #elif defined(__arm__) - #define LLVM_HOST_TRIPLE "armv7-linux-gnueabihf" - #elif defined(__aarch64__) --#define LLVM_HOST_TRIPLE "aarch64-linux-gnu" -+#define LLVM_HOST_TRIPLE "aarch64-portbld-freebsd" - #elif defined(__mips__) - #define LLVM_HOST_TRIPLE "mipsel-linux-gnu" - #elif defined(__mips64) diff --git a/www/chromium/files/patch-third__party_webrtc_rtc__base_platform__thread__types.cc b/www/chromium/files/patch-third__party_webrtc_rtc__base_platform__thread__types.cc index 9d0e6fdcc5fd..bbc20e78c91a 100644 --- a/www/chromium/files/patch-third__party_webrtc_rtc__base_platform__thread__types.cc +++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_platform__thread__types.cc @@ -1,4 +1,4 @@ ---- third_party/webrtc/rtc_base/platform_thread_types.cc.orig 2019-12-16 21:56:20 UTC +--- third_party/webrtc/rtc_base/platform_thread_types.cc.orig 2020-09-08 19:20:05 UTC +++ third_party/webrtc/rtc_base/platform_thread_types.cc @@ -11,7 +11,11 @@ #include "rtc_base/platform_thread_types.h" @@ -12,7 +12,7 @@ #include <sys/syscall.h> #endif -@@ -27,6 +31,8 @@ PlatformThreadId CurrentThreadId() { +@@ -37,6 +41,8 @@ PlatformThreadId CurrentThreadId() { return gettid(); #elif defined(WEBRTC_FUCHSIA) return zx_thread_self(); @@ -21,15 +21,15 @@ #elif defined(WEBRTC_LINUX) return syscall(__NR_gettid); #elif defined(__EMSCRIPTEN__) -@@ -57,6 +63,7 @@ bool IsThreadRefEqual(const PlatformThreadRef& a, cons +@@ -67,6 +73,7 @@ bool IsThreadRefEqual(const PlatformThreadRef& a, cons } void SetCurrentThreadName(const char* name) { +#if !defined(__FreeBSD__) #if defined(WEBRTC_WIN) - // For details see: - // https://docs.microsoft.com/en-us/visualstudio/debugger/how-to-set-a-thread-name-in-native-code -@@ -81,6 +88,7 @@ void SetCurrentThreadName(const char* name) { + // The SetThreadDescription API works even if no debugger is attached. + // The names set with this API also show up in ETW traces. Very handy. +@@ -109,6 +116,7 @@ void SetCurrentThreadName(const char* name) { prctl(PR_SET_NAME, reinterpret_cast<unsigned long>(name)); // NOLINT #elif defined(WEBRTC_MAC) || defined(WEBRTC_IOS) pthread_setname_np(name); diff --git a/www/chromium/files/patch-tools_gn_src_gn_version.h b/www/chromium/files/patch-tools_gn_src_gn_version.h new file mode 100644 index 000000000000..acde299817ce --- /dev/null +++ b/www/chromium/files/patch-tools_gn_src_gn_version.h @@ -0,0 +1,15 @@ +--- tools/gn/src/gn/version.h.orig 2020-10-22 13:59:48 UTC ++++ tools/gn/src/gn/version.h +@@ -15,9 +15,9 @@ class Version { + + static std::optional<Version> FromString(std::string s); + +- int major() const { return major_; } +- int minor() const { return minor_; } +- int patch() const { return patch_; } ++ int gmajor() const { return major_; } ++ int gminor() const { return minor_; } ++ int gpatch() const { return patch_; } + + bool operator==(const Version& other) const; + bool operator<(const Version& other) const; diff --git a/www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn b/www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn index afd3d6b08b0d..2d86515d8989 100644 --- a/www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn +++ b/www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn @@ -1,4 +1,4 @@ ---- tools/perf/chrome_telemetry_build/BUILD.gn.orig 2020-05-13 18:40:02 UTC +--- tools/perf/chrome_telemetry_build/BUILD.gn.orig 2020-09-08 19:14:27 UTC +++ tools/perf/chrome_telemetry_build/BUILD.gn @@ -47,7 +47,7 @@ group("telemetry_chrome_test") { data_deps += [ "//chrome:reorder_imports" ] @@ -6,6 +6,6 @@ - if (is_linux) { + if (is_linux && !is_bsd) { - data_deps += [ - "//third_party/breakpad:dump_syms($host_toolchain)", - "//third_party/crashpad/crashpad/tools:crashpad_database_util", + data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] + + # CrOS currently has issues with the locally compiled version of diff --git a/www/chromium/files/patch-ui_base_ime_init_input__method__initializer.cc b/www/chromium/files/patch-ui_base_ime_init_input__method__initializer.cc index 8a1ebb0848a0..f8ed9f79c7a0 100644 --- a/www/chromium/files/patch-ui_base_ime_init_input__method__initializer.cc +++ b/www/chromium/files/patch-ui_base_ime_init_input__method__initializer.cc @@ -1,15 +1,15 @@ ---- ui/base/ime/init/input_method_initializer.cc.orig 2020-07-07 21:58:19 UTC +--- ui/base/ime/init/input_method_initializer.cc.orig 2020-09-08 19:14:28 UTC +++ ui/base/ime/init/input_method_initializer.cc @@ -10,7 +10,7 @@ #if defined(OS_CHROMEOS) - #include "ui/base/ime/ime_bridge.h" + #include "ui/base/ime/chromeos/ime_bridge.h" -#elif defined(USE_AURA) && defined(OS_LINUX) +#elif defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD)) #include "base/check.h" - #include "ui/base/ime/linux/fake_input_method_context_factory.h" - #elif defined(OS_WIN) -@@ -20,7 +20,7 @@ + // TODO(crbug.com/1085700): Remove nogncheck when we can build both Ozone + // Wayland and X11 on Linux codesearch-gen bots. +@@ -22,7 +22,7 @@ namespace { @@ -18,7 +18,7 @@ const ui::LinuxInputMethodContextFactory* g_linux_input_method_context_factory_for_testing; #endif -@@ -48,7 +48,7 @@ void ShutdownInputMethod() { +@@ -50,7 +50,7 @@ void ShutdownInputMethod() { void InitializeInputMethodForTesting() { #if defined(OS_CHROMEOS) IMEBridge::Initialize(); @@ -27,7 +27,7 @@ if (!g_linux_input_method_context_factory_for_testing) g_linux_input_method_context_factory_for_testing = new FakeInputMethodContextFactory(); -@@ -67,7 +67,7 @@ void InitializeInputMethodForTesting() { +@@ -69,7 +69,7 @@ void InitializeInputMethodForTesting() { void ShutdownInputMethodForTesting() { #if defined(OS_CHROMEOS) IMEBridge::Shutdown(); diff --git a/www/chromium/files/patch-ui_base_resource_resource__bundle.cc b/www/chromium/files/patch-ui_base_resource_resource__bundle.cc index 211e06ccf1d5..4aa74afbac6e 100644 --- a/www/chromium/files/patch-ui_base_resource_resource__bundle.cc +++ b/www/chromium/files/patch-ui_base_resource_resource__bundle.cc @@ -1,6 +1,6 @@ ---- ui/base/resource/resource_bundle.cc.orig 2020-05-13 18:40:03 UTC +--- ui/base/resource/resource_bundle.cc.orig 2020-09-08 19:14:28 UTC +++ ui/base/resource/resource_bundle.cc -@@ -830,7 +830,7 @@ void ResourceBundle::ReloadFonts() { +@@ -841,7 +841,7 @@ void ResourceBundle::ReloadFonts() { } ScaleFactor ResourceBundle::GetMaxScaleFactor() const { @@ -9,7 +9,7 @@ return max_scale_factor_; #else return GetSupportedScaleFactors().back(); -@@ -883,7 +883,7 @@ void ResourceBundle::InitSharedInstance(Delegate* dele +@@ -894,7 +894,7 @@ void ResourceBundle::InitSharedInstance(Delegate* dele // On platforms other than iOS, 100P is always a supported scale factor. // For Windows we have a separate case in this function. supported_scale_factors.push_back(SCALE_FACTOR_100P); diff --git a/www/chromium/files/patch-ui_base_ui__base__features.cc b/www/chromium/files/patch-ui_base_ui__base__features.cc index 74f63f6db820..89db3cf50f24 100644 --- a/www/chromium/files/patch-ui_base_ui__base__features.cc +++ b/www/chromium/files/patch-ui_base_ui__base__features.cc @@ -1,4 +1,4 @@ ---- ui/base/ui_base_features.cc.orig 2020-07-07 21:58:19 UTC +--- ui/base/ui_base_features.cc.orig 2020-09-08 19:14:28 UTC +++ ui/base/ui_base_features.cc @@ -98,7 +98,7 @@ const base::Feature kCompositorThreadedScrollbarScroll // native apps on Windows. @@ -27,7 +27,7 @@ // Enables forced colors mode for web content. const base::Feature kForcedColors{"ForcedColors", -@@ -166,7 +166,7 @@ bool IsEyeDropperEnabled() { +@@ -178,7 +178,7 @@ bool IsCSSColorSchemeUARenderingEnabled() { // crbug.com/1012106 for the Windows launch bug, and crbug.com/1012108 for the // Mac launch bug. const base::Feature kFormControlsRefresh = {"FormControlsRefresh", diff --git a/www/chromium/files/patch-ui_base_webui_web__ui__util.cc b/www/chromium/files/patch-ui_base_webui_web__ui__util.cc index 422ea71485b9..fd2f6f07debf 100644 --- a/www/chromium/files/patch-ui_base_webui_web__ui__util.cc +++ b/www/chromium/files/patch-ui_base_webui_web__ui__util.cc @@ -1,6 +1,6 @@ ---- ui/base/webui/web_ui_util.cc.orig 2020-03-16 18:40:15 UTC +--- ui/base/webui/web_ui_util.cc.orig 2020-09-08 19:14:28 UTC +++ ui/base/webui/web_ui_util.cc -@@ -236,7 +236,7 @@ std::string GetFontFamily() { +@@ -228,7 +228,7 @@ std::string GetFontFamily() { // TODO(dnicoara) Remove Ozone check when PlatformFont support is introduced // into Ozone: crbug.com/320050 diff --git a/www/chromium/files/patch-ui_compositor_compositor.cc b/www/chromium/files/patch-ui_compositor_compositor.cc index 0eee152db4c4..db2d20a870a7 100644 --- a/www/chromium/files/patch-ui_compositor_compositor.cc +++ b/www/chromium/files/patch-ui_compositor_compositor.cc @@ -1,6 +1,6 @@ ---- ui/compositor/compositor.cc.orig 2020-07-07 21:58:19 UTC +--- ui/compositor/compositor.cc.orig 2020-09-08 19:14:28 UTC +++ ui/compositor/compositor.cc -@@ -740,7 +740,7 @@ void Compositor::CancelThroughtputTracker(TrackerId tr +@@ -731,7 +731,7 @@ void Compositor::CancelThroughtputTracker(TrackerId tr throughput_tracker_map_.erase(tracker_id); } diff --git a/www/chromium/files/patch-ui_compositor_compositor.h b/www/chromium/files/patch-ui_compositor_compositor.h index b812a2cd1ddf..930224c928eb 100644 --- a/www/chromium/files/patch-ui_compositor_compositor.h +++ b/www/chromium/files/patch-ui_compositor_compositor.h @@ -1,6 +1,6 @@ ---- ui/compositor/compositor.h.orig 2020-07-07 21:58:19 UTC +--- ui/compositor/compositor.h.orig 2020-09-08 19:14:28 UTC +++ ui/compositor/compositor.h -@@ -363,7 +363,7 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerT +@@ -370,7 +370,7 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerT void StopThroughtputTracker(TrackerId tracker_id) override; void CancelThroughtputTracker(TrackerId tracker_id) override; diff --git a/www/chromium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc b/www/chromium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc index 3e96b3e5b3b1..0c5ace10c0ae 100644 --- a/www/chromium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc +++ b/www/chromium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc @@ -1,6 +1,6 @@ ---- ui/events/devices/x11/device_data_manager_x11.cc.orig 2020-07-07 21:58:19 UTC +--- ui/events/devices/x11/device_data_manager_x11.cc.orig 2020-09-08 19:14:28 UTC +++ ui/events/devices/x11/device_data_manager_x11.cc -@@ -816,6 +816,8 @@ void DeviceDataManagerX11::SetDisabledKeyboardAllowedK +@@ -875,6 +875,8 @@ void DeviceDataManagerX11::SetDisabledKeyboardAllowedK } void DeviceDataManagerX11::DisableDevice(int deviceid) { @@ -9,7 +9,7 @@ blocked_devices_.set(deviceid, true); // TODO(rsadam@): Support blocking touchscreen devices. std::vector<InputDevice> keyboards = GetKeyboardDevices(); -@@ -826,6 +828,7 @@ void DeviceDataManagerX11::DisableDevice(int deviceid) +@@ -885,6 +887,7 @@ void DeviceDataManagerX11::DisableDevice(int deviceid) keyboards.erase(it); DeviceDataManager::OnKeyboardDevicesUpdated(keyboards); } diff --git a/www/chromium/files/patch-ui_gfx_BUILD.gn b/www/chromium/files/patch-ui_gfx_BUILD.gn index e9b8d932f94d..7259f7e642c6 100644 --- a/www/chromium/files/patch-ui_gfx_BUILD.gn +++ b/www/chromium/files/patch-ui_gfx_BUILD.gn @@ -1,6 +1,6 @@ ---- ui/gfx/BUILD.gn.orig 2020-07-07 21:58:19 UTC +--- ui/gfx/BUILD.gn.orig 2020-09-08 19:14:28 UTC +++ ui/gfx/BUILD.gn -@@ -580,7 +580,7 @@ jumbo_source_set("memory_buffer_sources") { +@@ -579,7 +579,7 @@ jumbo_source_set("memory_buffer_sources") { deps += [ "//build/config/linux/libdrm" ] } diff --git a/www/chromium/files/patch-ui_gfx_codec_jpeg__codec.cc b/www/chromium/files/patch-ui_gfx_codec_jpeg__codec.cc index 1bd5ac55ec9e..e0413e4f6625 100644 --- a/www/chromium/files/patch-ui_gfx_codec_jpeg__codec.cc +++ b/www/chromium/files/patch-ui_gfx_codec_jpeg__codec.cc @@ -1,6 +1,6 @@ ---- ui/gfx/codec/jpeg_codec.cc.orig 2019-03-11 22:01:19 UTC +--- ui/gfx/codec/jpeg_codec.cc.orig 2020-09-08 19:14:28 UTC +++ ui/gfx/codec/jpeg_codec.cc -@@ -207,6 +207,7 @@ bool JPEGCodec::Decode(const unsigned char* input, siz +@@ -208,6 +208,7 @@ bool JPEGCodec::Decode(const unsigned char* input, siz case JCS_GRAYSCALE: case JCS_RGB: case JCS_YCbCr: @@ -8,7 +8,7 @@ // Choose an output colorspace and return if it is an unsupported one. // Same as JPEGCodec::Encode(), libjpeg-turbo supports all input formats // used by Chromium (i.e. RGBA and BGRA) and we just map the input -@@ -223,6 +224,9 @@ bool JPEGCodec::Decode(const unsigned char* input, siz +@@ -224,6 +225,9 @@ bool JPEGCodec::Decode(const unsigned char* input, siz NOTREACHED() << "Invalid pixel format"; return false; } diff --git a/www/chromium/files/patch-ui_gfx_linux_client__native__pixmap__dmabuf.cc b/www/chromium/files/patch-ui_gfx_linux_client__native__pixmap__dmabuf.cc index 1741c4d863e8..b556f661c67e 100644 --- a/www/chromium/files/patch-ui_gfx_linux_client__native__pixmap__dmabuf.cc +++ b/www/chromium/files/patch-ui_gfx_linux_client__native__pixmap__dmabuf.cc @@ -1,4 +1,4 @@ ---- ui/gfx/linux/client_native_pixmap_dmabuf.cc.orig 2020-03-16 18:40:43 UTC +--- ui/gfx/linux/client_native_pixmap_dmabuf.cc.orig 2020-09-08 19:14:28 UTC +++ ui/gfx/linux/client_native_pixmap_dmabuf.cc @@ -5,7 +5,9 @@ #include "ui/gfx/linux/client_native_pixmap_dmabuf.h" @@ -10,7 +10,7 @@ #include <stddef.h> #include <sys/ioctl.h> #include <sys/mman.h> -@@ -26,11 +28,7 @@ +@@ -27,11 +29,7 @@ #include "ui/gfx/buffer_format_util.h" #include "ui/gfx/switches.h" diff --git a/www/chromium/files/patch-ui_gfx_native__widget__types.h b/www/chromium/files/patch-ui_gfx_native__widget__types.h index 4525fc9ce0e2..f08698a4d6d6 100644 --- a/www/chromium/files/patch-ui_gfx_native__widget__types.h +++ b/www/chromium/files/patch-ui_gfx_native__widget__types.h @@ -1,6 +1,6 @@ ---- ui/gfx/native_widget_types.h.orig 2020-05-15 15:30:28 UTC +--- ui/gfx/native_widget_types.h.orig 2020-09-08 19:14:28 UTC +++ ui/gfx/native_widget_types.h -@@ -104,7 +104,7 @@ class ViewAndroid; +@@ -103,7 +103,7 @@ class ViewAndroid; #endif class SkBitmap; @@ -9,7 +9,7 @@ extern "C" { struct _AtkObject; typedef struct _AtkObject AtkObject; -@@ -205,7 +205,7 @@ typedef id NativeViewAccessible; +@@ -210,7 +210,7 @@ typedef id NativeViewAccessible; #elif defined(OS_MACOSX) typedef NSFont* NativeFont; typedef id NativeViewAccessible; diff --git a/www/chromium/files/patch-ui_gfx_render__text.cc b/www/chromium/files/patch-ui_gfx_render__text.cc index 1d624f958cea..750a8756e2d8 100644 --- a/www/chromium/files/patch-ui_gfx_render__text.cc +++ b/www/chromium/files/patch-ui_gfx_render__text.cc @@ -1,6 +1,6 @@ ---- ui/gfx/render_text.cc.orig 2020-07-07 21:58:19 UTC +--- ui/gfx/render_text.cc.orig 2020-09-08 19:14:28 UTC +++ ui/gfx/render_text.cc -@@ -1179,32 +1179,33 @@ void RenderText::SetDisplayOffset(int horizontal_offse +@@ -1192,32 +1192,33 @@ void RenderText::SetDisplayOffset(int horizontal_offse const int extra_content = GetContentWidth() - display_rect_.width(); const int cursor_width = cursor_enabled_ ? 1 : 0; diff --git a/www/chromium/files/patch-ui_gfx_x_BUILD.gn b/www/chromium/files/patch-ui_gfx_x_BUILD.gn deleted file mode 100644 index f70d74f17804..000000000000 --- a/www/chromium/files/patch-ui_gfx_x_BUILD.gn +++ /dev/null @@ -1,11 +0,0 @@ ---- ui/gfx/x/BUILD.gn.orig 2020-07-13 11:08:01 UTC -+++ ui/gfx/x/BUILD.gn -@@ -16,6 +16,8 @@ declare_args() { - if (xcbproto_path == "") { - if (use_sysroot) { - xcbproto_path = "$sysroot/usr/share/xcb" -+ } else if (is_bsd) { -+ xcbproto_path = "/usr/local/share/xcb" - } else { - xcbproto_path = "/usr/share/xcb" - } diff --git a/www/chromium/files/patch-ui_gfx_x_gen__xproto.py b/www/chromium/files/patch-ui_gfx_x_gen__xproto.py deleted file mode 100644 index 1a9d08c9d938..000000000000 --- a/www/chromium/files/patch-ui_gfx_x_gen__xproto.py +++ /dev/null @@ -1,13 +0,0 @@ ---- ui/gfx/x/gen_xproto.py.orig 2020-07-13 16:58:52 UTC -+++ ui/gfx/x/gen_xproto.py -@@ -1015,6 +1015,10 @@ def main(): - 'dist-packages') - sys.path.insert(1, path) - -+ # Workaround to use the xcb-proto package, which installs using the default python version -+ # Remove this as soon as chromium builds with python3! -+ sys.path.append(os.path.join('..', '..', '..', 'site-packages')) -+ - import xcbgen.xtypes - import xcbgen.state - diff --git a/www/chromium/files/patch-ui_gl_BUILD.gn b/www/chromium/files/patch-ui_gl_BUILD.gn index 9266552d908a..6fec2c996849 100644 --- a/www/chromium/files/patch-ui_gl_BUILD.gn +++ b/www/chromium/files/patch-ui_gl_BUILD.gn @@ -1,6 +1,6 @@ ---- ui/gl/BUILD.gn.orig 2020-07-07 21:58:19 UTC +--- ui/gl/BUILD.gn.orig 2020-09-08 19:14:28 UTC +++ ui/gl/BUILD.gn -@@ -229,7 +229,7 @@ jumbo_component("gl") { +@@ -230,7 +230,7 @@ jumbo_component("gl") { ] } diff --git a/www/chromium/files/patch-ui_gl_generate__bindings.py b/www/chromium/files/patch-ui_gl_generate__bindings.py index 4881f35df4c7..4353d9ae9913 100644 --- a/www/chromium/files/patch-ui_gl_generate__bindings.py +++ b/www/chromium/files/patch-ui_gl_generate__bindings.py @@ -1,6 +1,6 @@ ---- ui/gl/generate_bindings.py.orig 2020-07-07 21:58:19 UTC +--- ui/gl/generate_bindings.py.orig 2020-09-08 19:14:28 UTC +++ ui/gl/generate_bindings.py -@@ -2813,6 +2813,9 @@ GLX_FUNCTIONS = [ +@@ -2891,6 +2891,9 @@ GLX_FUNCTIONS = [ 'arguments': 'Display* dpy, GLXDrawable drawable, int32_t* numerator, ' 'int32_t* denominator' }, diff --git a/www/chromium/files/patch-ui_gtk_print__dialog__gtk.cc b/www/chromium/files/patch-ui_gtk_printing_print__dialog__gtk.cc index 8088210e0936..43b8a14f0740 100644 --- a/www/chromium/files/patch-ui_gtk_print__dialog__gtk.cc +++ b/www/chromium/files/patch-ui_gtk_printing_print__dialog__gtk.cc @@ -1,6 +1,6 @@ ---- ui/gtk/print_dialog_gtk.cc.orig 2020-07-07 21:58:19 UTC -+++ ui/gtk/print_dialog_gtk.cc -@@ -341,7 +341,7 @@ void PrintDialogGtk::ShowDialog( +--- ui/gtk/printing/print_dialog_gtk.cc.orig 2020-09-16 15:53:32 UTC ++++ ui/gtk/printing/print_dialog_gtk.cc +@@ -352,7 +352,7 @@ void PrintDialogGtk::ShowDialog( // Since we only generate PDF, only show printers that support PDF. // TODO(thestig) Add more capabilities to support? GtkPrintCapabilities cap = static_cast<GtkPrintCapabilities>( diff --git a/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate__view.cc b/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate__view.cc index 3e4380cfcbf7..0b32bd86785d 100644 --- a/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate__view.cc +++ b/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate__view.cc @@ -1,6 +1,6 @@ ---- ui/views/bubble/bubble_dialog_delegate_view.cc.orig 2020-07-07 21:58:19 UTC +--- ui/views/bubble/bubble_dialog_delegate_view.cc.orig 2020-09-08 19:14:28 UTC +++ ui/views/bubble/bubble_dialog_delegate_view.cc -@@ -170,7 +170,7 @@ Widget* BubbleDialogDelegateView::CreateBubble( +@@ -283,7 +283,7 @@ Widget* BubbleDialogDelegate::CreateBubble( bubble_delegate->SetAnchorView(bubble_delegate->GetAnchorView()); Widget* bubble_widget = CreateBubbleWidget(bubble_delegate); diff --git a/www/chromium/files/patch-ui_views_controls_label.cc b/www/chromium/files/patch-ui_views_controls_label.cc index 9e8e9bd90dd6..b4a41508ef63 100644 --- a/www/chromium/files/patch-ui_views_controls_label.cc +++ b/www/chromium/files/patch-ui_views_controls_label.cc @@ -1,6 +1,6 @@ ---- ui/views/controls/label.cc.orig 2020-07-07 21:58:19 UTC +--- ui/views/controls/label.cc.orig 2020-09-08 19:14:28 UTC +++ ui/views/controls/label.cc -@@ -689,7 +689,7 @@ bool Label::OnMousePressed(const ui::MouseEvent& event +@@ -710,7 +710,7 @@ bool Label::OnMousePressed(const ui::MouseEvent& event GetFocusManager()->SetFocusedView(this); } @@ -9,7 +9,7 @@ if (event.IsOnlyMiddleMouseButton() && GetFocusManager() && !had_focus) GetFocusManager()->SetFocusedView(this); #endif -@@ -875,7 +875,7 @@ bool Label::PasteSelectionClipboard() { +@@ -896,7 +896,7 @@ bool Label::PasteSelectionClipboard() { } void Label::UpdateSelectionClipboard() { diff --git a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc index 2ff071560d33..f1c334eff63a 100644 --- a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc +++ b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc @@ -1,4 +1,4 @@ ---- ui/views/controls/textfield/textfield.cc.orig 2020-07-07 21:58:19 UTC +--- ui/views/controls/textfield/textfield.cc.orig 2020-09-08 19:14:28 UTC +++ ui/views/controls/textfield/textfield.cc @@ -64,7 +64,7 @@ #include "base/win/win_util.h" @@ -6,8 +6,8 @@ -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - #include "ui/base/ime/linux/text_edit_command_auralinux.h" - #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" + #include "ui/base/ime/linux/text_edit_command_auralinux.h" // nogncheck + #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" // nogncheck #endif @@ -185,14 +185,14 @@ ui::TextEditCommand GetCommandForKeyEvent(const ui::Ke #endif @@ -35,7 +35,7 @@ return flags & ui::EF_CONTROL_DOWN; #else return false; -@@ -709,7 +709,7 @@ bool Textfield::OnMousePressed(const ui::MouseEvent& e +@@ -717,7 +717,7 @@ bool Textfield::OnMousePressed(const ui::MouseEvent& e #endif } @@ -44,7 +44,7 @@ if (!handled && !had_focus && event.IsOnlyMiddleMouseButton()) RequestFocusWithPointer(ui::EventPointerType::kMouse); #endif -@@ -755,7 +755,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event +@@ -763,7 +763,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event if (!textfield) return handled; @@ -53,7 +53,7 @@ ui::TextEditKeyBindingsDelegateAuraLinux* delegate = ui::GetTextEditKeyBindingsDelegate(); std::vector<ui::TextEditCommandAuraLinux> commands; -@@ -907,7 +907,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo +@@ -915,7 +915,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo } bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) { @@ -62,7 +62,7 @@ // Skip any accelerator handling that conflicts with custom keybindings. ui::TextEditKeyBindingsDelegateAuraLinux* delegate = ui::GetTextEditKeyBindingsDelegate(); -@@ -2182,7 +2182,7 @@ bool Textfield::PasteSelectionClipboard() { +@@ -2202,7 +2202,7 @@ bool Textfield::PasteSelectionClipboard() { } void Textfield::UpdateSelectionClipboard() { diff --git a/www/chromium/files/patch-v8_BUILD.gn b/www/chromium/files/patch-v8_BUILD.gn index 582adbf52d53..90c248e8feaa 100644 --- a/www/chromium/files/patch-v8_BUILD.gn +++ b/www/chromium/files/patch-v8_BUILD.gn @@ -1,6 +1,6 @@ ---- v8/BUILD.gn.orig 2020-07-07 22:03:31 UTC +--- v8/BUILD.gn.orig 2020-09-08 19:20:07 UTC +++ v8/BUILD.gn -@@ -3839,7 +3839,7 @@ v8_component("v8_libbase") { +@@ -3922,7 +3922,7 @@ v8_component("v8_libbase") { } } @@ -9,7 +9,7 @@ sources += [ "src/base/debug/stack_trace_posix.cc", "src/base/platform/platform-linux.cc", -@@ -3859,6 +3859,12 @@ v8_component("v8_libbase") { +@@ -3942,6 +3942,12 @@ v8_component("v8_libbase") { "dl", "rt", ] @@ -22,7 +22,7 @@ } else if (is_android) { if (current_toolchain == host_toolchain) { libs = [ -@@ -4232,6 +4238,7 @@ if (current_toolchain == v8_snapshot_toolchain) { +@@ -4353,6 +4359,7 @@ if (current_toolchain == v8_snapshot_toolchain) { "src/snapshot/mksnapshot.cc", "src/snapshot/snapshot-empty.cc", ] diff --git a/www/chromium/files/patch-v8_src_api_api.cc b/www/chromium/files/patch-v8_src_api_api.cc index ad2d9bc6e0d8..8e774348f5d9 100644 --- a/www/chromium/files/patch-v8_src_api_api.cc +++ b/www/chromium/files/patch-v8_src_api_api.cc @@ -1,6 +1,6 @@ ---- v8/src/api/api.cc.orig 2020-07-07 22:03:31 UTC +--- v8/src/api/api.cc.orig 2020-09-08 19:20:07 UTC +++ v8/src/api/api.cc -@@ -5640,7 +5640,7 @@ bool v8::V8::Initialize(const int build_config) { +@@ -5674,7 +5674,7 @@ bool v8::V8::Initialize(const int build_config) { return true; } diff --git a/www/chromium/files/patch-v8_src_base_cpu.cc b/www/chromium/files/patch-v8_src_base_cpu.cc index 7b67e85c5587..3e51e63d69ac 100644 --- a/www/chromium/files/patch-v8_src_base_cpu.cc +++ b/www/chromium/files/patch-v8_src_base_cpu.cc @@ -1,6 +1,6 @@ ---- v8/src/base/cpu.cc.orig 2020-05-13 18:41:59 UTC +--- v8/src/base/cpu.cc.orig 2020-09-08 19:20:07 UTC +++ v8/src/base/cpu.cc -@@ -427,6 +427,7 @@ CPU::CPU() +@@ -475,6 +475,7 @@ CPU::CPU() #if V8_OS_LINUX @@ -8,7 +8,7 @@ CPUInfo cpu_info; // Extract implementor from the "CPU implementer" field. -@@ -460,6 +461,7 @@ CPU::CPU() +@@ -508,6 +509,7 @@ CPU::CPU() } delete[] part; } diff --git a/www/chromium/files/patch-weblayer_BUILD.gn b/www/chromium/files/patch-weblayer_BUILD.gn index 1dad413ec5ac..0c0052fc4138 100644 --- a/www/chromium/files/patch-weblayer_BUILD.gn +++ b/www/chromium/files/patch-weblayer_BUILD.gn @@ -1,6 +1,6 @@ ---- weblayer/BUILD.gn.orig 2020-07-07 21:58:19 UTC +--- weblayer/BUILD.gn.orig 2020-09-08 19:14:28 UTC +++ weblayer/BUILD.gn -@@ -511,6 +511,14 @@ source_set("weblayer_lib_base") { +@@ -592,6 +592,14 @@ source_set("weblayer_lib_base") { ] } diff --git a/www/chromium/files/patch-weblayer_app_content__main__delegate__impl.cc b/www/chromium/files/patch-weblayer_app_content__main__delegate__impl.cc index 733a0acf27d1..53f1981acf44 100644 --- a/www/chromium/files/patch-weblayer_app_content__main__delegate__impl.cc +++ b/www/chromium/files/patch-weblayer_app_content__main__delegate__impl.cc @@ -1,6 +1,6 @@ ---- weblayer/app/content_main_delegate_impl.cc.orig 2020-07-07 21:58:19 UTC +--- weblayer/app/content_main_delegate_impl.cc.orig 2020-09-08 19:14:28 UTC +++ weblayer/app/content_main_delegate_impl.cc -@@ -173,7 +173,7 @@ bool ContentMainDelegateImpl::ShouldCreateFeatureList( +@@ -219,7 +219,7 @@ bool ContentMainDelegateImpl::ShouldCreateFeatureList( } void ContentMainDelegateImpl::PreSandboxStartup() { diff --git a/www/chromium/files/patch-weblayer_browser_browser__main__parts__impl.cc b/www/chromium/files/patch-weblayer_browser_browser__main__parts__impl.cc index 16d8033cd983..dacb4f62b1a8 100644 --- a/www/chromium/files/patch-weblayer_browser_browser__main__parts__impl.cc +++ b/www/chromium/files/patch-weblayer_browser_browser__main__parts__impl.cc @@ -1,6 +1,6 @@ ---- weblayer/browser/browser_main_parts_impl.cc.orig 2020-07-07 21:58:19 UTC +--- weblayer/browser/browser_main_parts_impl.cc.orig 2020-09-08 19:14:28 UTC +++ weblayer/browser/browser_main_parts_impl.cc -@@ -53,7 +53,7 @@ +@@ -56,7 +56,7 @@ #if defined(USE_AURA) && defined(USE_X11) #include "ui/events/devices/x11/touch_factory_x11.h" // nogncheck #endif @@ -9,7 +9,7 @@ #include "ui/base/ime/init/input_method_initializer.h" #endif -@@ -128,7 +128,7 @@ int BrowserMainPartsImpl::PreEarlyInitialization() { +@@ -140,7 +140,7 @@ int BrowserMainPartsImpl::PreEarlyInitialization() { #if defined(USE_X11) ui::SetDefaultX11ErrorHandlers(); #endif diff --git a/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.cc b/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.cc index d55b1f819953..c1f7a2deef2b 100644 --- a/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.cc +++ b/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.cc @@ -1,6 +1,6 @@ ---- weblayer/browser/content_browser_client_impl.cc.orig 2020-07-07 21:58:19 UTC +--- weblayer/browser/content_browser_client_impl.cc.orig 2020-09-08 19:14:28 UTC +++ weblayer/browser/content_browser_client_impl.cc -@@ -102,7 +102,7 @@ +@@ -120,7 +120,7 @@ #include "weblayer/browser/safe_browsing/safe_browsing_service.h" #endif @@ -9,7 +9,7 @@ #include "content/public/common/content_descriptors.h" #endif -@@ -339,7 +339,7 @@ void ContentBrowserClientImpl::ConfigureNetworkContext +@@ -355,7 +355,7 @@ void ContentBrowserClientImpl::ConfigureNetworkContext void ContentBrowserClientImpl::OnNetworkServiceCreated( network::mojom::NetworkService* network_service) { @@ -18,7 +18,7 @@ network::mojom::CryptConfigPtr config = network::mojom::CryptConfig::New(); content::GetNetworkService()->SetCryptConfig(std::move(config)); #endif -@@ -608,7 +608,7 @@ SafeBrowsingService* ContentBrowserClientImpl::GetSafe +@@ -712,7 +712,7 @@ SafeBrowsingService* ContentBrowserClientImpl::GetSafe } #endif @@ -27,7 +27,7 @@ void ContentBrowserClientImpl::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -642,7 +642,7 @@ void ContentBrowserClientImpl::GetAdditionalMappedFile +@@ -746,7 +746,7 @@ void ContentBrowserClientImpl::GetAdditionalMappedFile mappings->Share(service_manager::kCrashDumpSignal, crash_signal_fd); #endif // defined(OS_ANDROID) } diff --git a/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.h b/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.h index 32bb154eec2a..7a4ce8a4ae4c 100644 --- a/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.h +++ b/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.h @@ -1,6 +1,6 @@ ---- weblayer/browser/content_browser_client_impl.h.orig 2020-07-07 21:58:19 UTC +--- weblayer/browser/content_browser_client_impl.h.orig 2020-09-08 19:14:28 UTC +++ weblayer/browser/content_browser_client_impl.h -@@ -101,12 +101,12 @@ class ContentBrowserClientImpl : public content::Conte +@@ -111,12 +111,12 @@ class ContentBrowserClientImpl : public content::Conte void RenderProcessWillLaunch(content::RenderProcessHost* host) override; scoped_refptr<content::QuotaPermissionContext> CreateQuotaPermissionContext() override; diff --git a/www/chromium/files/sndio_input.cc b/www/chromium/files/sndio_input.cc index 6c7bc8b8025b..ef5439b49a07 100644 --- a/www/chromium/files/sndio_input.cc +++ b/www/chromium/files/sndio_input.cc @@ -5,7 +5,6 @@ #include "base/bind.h" #include "base/logging.h" #include "base/macros.h" -#include "base/message_loop/message_loop.h" #include "media/base/audio_timestamp_helper.h" #include "media/audio/openbsd/audio_manager_openbsd.h" #include "media/audio/audio_manager.h" |